Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=791f040fec86c979695061af6c2bf9efc1275874

commit 791f040fec86c979695061af6c2bf9efc1275874
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Tue Oct 5 21:21:36 2010 +0200

*reload ignorepkg
*fixes clean ignorepkg

diff --git a/frugal-mono-tools/PacmanG2.cs b/frugal-mono-tools/PacmanG2.cs
index 42c6e02..899a3cf 100644
--- a/frugal-mono-tools/PacmanG2.cs
+++ b/frugal-mono-tools/PacmanG2.cs
@@ -153,9 +153,14 @@ namespace frugalmonotools
//public
public string repoSelected="";
public List<string> fwRepo = new List<string>();
-               public List<string> ignorePkg = new List<string>();
public const string repoInstalled= "Installed";

+               private List<string> ignorePkg = new List<string>();
+               public List<string> GetignorePkg ()
+               {
+                       _ReadIgnorePkg();
+                       return ignorePkg;
+               }
private void EnumRepoProc(string section, string lParam)
{
if(Debug.ModeDebug) Console.WriteLine(section);
@@ -166,7 +171,6 @@ namespace frugalmonotools
{
try{
//load ignore pkg
-                               _ReadIgnorePkg();
EnumRepoProcDelegate _cd_db = new EnumRepoProcDelegate(EnumRepoProc);
if (pacman_initialize(ROOT_PATH)!=pm_errno)
{
@@ -180,8 +184,7 @@ namespace frugalmonotools
public void SetIgnorePkg(string packagename,bool updateAllIgnore )
{
try
-                       {
-                               if(packagename=="") return;
+                       {
string strPacmanConf =Outils.ReadFile(cch_pacmanconf);
string[] lines = strPacmanConf.Split('\n');
string[] result= new string[lines.Length];
diff --git a/frugal-mono-tools/Update.cs b/frugal-mono-tools/Update.cs
index a5b2afd..54c5ef0 100644
--- a/frugal-mono-tools/Update.cs
+++ b/frugal-mono-tools/Update.cs
@@ -126,7 +126,7 @@ namespace frugalmonotools
else
{
bool AddIt = true;
-                                       foreach (string pkgignore in 
MainClass.pacmanG2.ignorePkg)
+                                       foreach (string pkgignore in 
MainClass.pacmanG2.GetignorePkg())
{
if(pkgignore==MainClass.pacmanG2.extractNamePackage(package.GetPkgname())) 
AddIt =false;
if(MainClass.pacmanG2.extractNamePackage(pkgignore)==MainClass.pacmanG2.extractNamePackage(package.GetPkgname()))
 AddIt =false;
diff --git a/frugal-mono-tools/WID_Update.cs b/frugal-mono-tools/WID_Update.cs
index 89732f1..1bf59e3 100644
--- a/frugal-mono-tools/WID_Update.cs
+++ b/frugal-mono-tools/WID_Update.cs
@@ -94,7 +94,7 @@ namespace frugalmonotools
private void IgnorepkgToSAI()
{
SAI_ignorePkg.Text="";
-               foreach(string ignore in MainClass.pacmanG2.ignorePkg)
+               foreach(string ignore in MainClass.pacmanG2.GetignorePkg())
{
SAI_ignorePkg.Text+=" "+ignore;
}
diff --git a/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Grub.cs 
b/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Grub.cs
index ade1fd8..8931b19 100644
--- a/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Grub.cs
+++ b/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Grub.cs
@@ -239,6 +239,7 @@ namespace frugalmonotools
this.Entrys.ShowAll ();
// Container child notebook1.Gtk.Notebook+NotebookChild
this.vbox3 = new global::Gtk.VBox ();
+                       this.vbox3.Name = "vbox3";
this.vbox3.Spacing = 6;
// Container child vbox3.Gtk.Box+BoxChild
this.hbox3 = new global::Gtk.HBox ();
diff --git a/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Update.cs 
b/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Update.cs
index 220a83c..2f41939 100644
--- a/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Update.cs
+++ b/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Update.cs
@@ -58,7 +58,7 @@ namespace frugalmonotools
this.notebook1 = new global::Gtk.Notebook ();
this.notebook1.CanFocus = true;
this.notebook1.Name = "notebook1";
-                       this.notebook1.CurrentPage = 1;
+                       this.notebook1.CurrentPage = 0;
// Container child notebook1.Gtk.Notebook+NotebookChild
this.vbox10 = new global::Gtk.VBox ();
this.vbox10.Name = "vbox10";
diff --git a/frugal-mono-tools/gtk-gui/gui.stetic 
b/frugal-mono-tools/gtk-gui/gui.stetic
index 1909998..cdbbb9c 100644
--- a/frugal-mono-tools/gtk-gui/gui.stetic
+++ b/frugal-mono-tools/gtk-gui/gui.stetic
@@ -487,7 +487,7 @@
<widget class="Gtk.Notebook" id="notebook1">
<property name="MemberName" />
<property name="CanFocus">True</property>
-        <property name="CurrentPage">1</property>
+        <property name="CurrentPage">0</property>
<child>
<widget class="Gtk.VBox" id="vbox10">
<property name="MemberName" />
@@ -2838,73 +2838,306 @@ Public License instead of this License.
</widget>
</child>
</widget>
-  <widget class="Gtk.Bin" id="frugalmonotools.WID_Grub" design-size="300 300">
+  <widget class="Gtk.Bin" id="frugalmonotools.WID_Grub" design-size="337 300">
<property name="MemberName" />
<property name="Visible">False</property>
<child>
-      <widget class="Gtk.VBox" id="vbox1">
+      <widget class="Gtk.VBox" id="vbox2">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
-          <widget class="Gtk.ComboBox" id="CBO_Entry">
-            <property name="MemberName" />
-            <property name="IsTextCombo">True</property>
-            <property name="Items" translatable="yes" />
-            <signal name="Changed" handler="OnCBOEntryChanged" />
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="LIB_Title">
-            <property name="MemberName" />
-            <property name="LabelProp" translatable="yes">Title</property>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Entry" id="SAI_Title">
+          <widget class="Gtk.Notebook" id="notebook1">
<property name="MemberName" />
<property name="CanFocus">True</property>
-            <property name="IsEditable">True</property>
-            <property name="InvisibleChar">•</property>
-          </widget>
-          <packing>
-            <property name="Position">2</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
-            <property name="MemberName" />
-            <property name="ShadowType">In</property>
+            <property name="CurrentPage">0</property>
<child>
-              <widget class="Gtk.TextView" id="TXT_Options">
+              <widget class="Gtk.VBox" id="vbox1">
<property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="ShowScrollbars">True</property>
-                <property name="Text" translatable="yes" />
+                <property name="Spacing">6</property>
+                <child>
+                  <widget class="Gtk.ComboBox" id="CBO_Entry">
+                    <property name="MemberName" />
+                    <property name="IsTextCombo">True</property>
+                    <property name="Items" translatable="yes" />
+                    <signal name="Changed" handler="OnCBOEntryChanged" />
+                  </widget>
+                  <packing>
+                    <property name="Position">0</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.Label" id="LIB_Title">
+                    <property name="MemberName" />
+                    <property name="LabelProp" 
translatable="yes">Title</property>
+                  </widget>
+                  <packing>
+                    <property name="Position">1</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.Entry" id="SAI_Title">
+                    <property name="MemberName" />
+                    <property name="CanFocus">True</property>
+                    <property name="IsEditable">True</property>
+                    <property name="InvisibleChar">•</property>
+                  </widget>
+                  <packing>
+                    <property name="Position">2</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
+                    <property name="MemberName" />
+                    <property name="ShadowType">In</property>
+                    <child>
+                      <widget class="Gtk.TextView" id="TXT_Options">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="ShowScrollbars">True</property>
+                        <property name="Text" translatable="yes" />
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">3</property>
+                    <property name="AutoSize">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox2">
+                    <property name="MemberName" />
+                    <property name="Spacing">6</property>
+                    <child>
+                      <widget class="Gtk.Button" id="BTN_RemoveEntry">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="Type">TextAndIcon</property>
+                        <property name="Icon">stock:gtk-remove Menu</property>
+                        <property name="Label" translatable="yes">Remove 
entry</property>
+                        <property name="UseUnderline">True</property>
+                        <signal name="Clicked" 
handler="OnBTNRemoveEntryClicked" />
+                      </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Button" id="BTN_AddEntry">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="Type">TextAndIcon</property>
+                        <property name="Icon">stock:gtk-add Menu</property>
+                        <property name="Label" translatable="yes">Add 
entry</property>
+                        <property name="UseUnderline">True</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Button" id="BTN_Cancel">
+                        <property name="MemberName" />
+                        <property name="Visible">False</property>
+                        <property name="CanFocus">True</property>
+                        <property name="Type">TextAndIcon</property>
+                        <property name="Icon">stock:gtk-cancel Menu</property>
+                        <property name="Label" 
translatable="yes">Cancel</property>
+                        <property name="UseUnderline">True</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">2</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Button" id="BTN_Save">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="Type">TextAndIcon</property>
+                        <property name="Icon">stock:gtk-save Menu</property>
+                        <property name="Label" 
translatable="yes">Save</property>
+                        <property name="UseUnderline">True</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">3</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">4</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
</widget>
</child>
+            <child>
+              <widget class="Gtk.Label" id="Entrys">
+                <property name="MemberName" />
+                <property name="LabelProp" translatable="yes">Entrys</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.VBox" id="vbox3">
+                <property name="MemberName" />
+                <property name="Spacing">6</property>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox3">
+                    <property name="MemberName" />
+                    <property name="Spacing">6</property>
+                    <child>
+                      <widget class="Gtk.Label" id="label3">
+                        <property name="MemberName" />
+                        <property name="LabelProp" 
translatable="yes">Default</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Entry" id="SAI_Default">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="IsEditable">True</property>
+                        <property name="InvisibleChar">•</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">True</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">0</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox4">
+                    <property name="MemberName" />
+                    <property name="Spacing">6</property>
+                    <child>
+                      <widget class="Gtk.Label" id="label4">
+                        <property name="MemberName" />
+                        <property name="LabelProp" translatable="yes">Time 
out</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Entry" id="SAI_TimeOut">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="IsEditable">True</property>
+                        <property name="InvisibleChar">•</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">True</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">1</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox5">
+                    <property name="MemberName" />
+                    <property name="Spacing">6</property>
+                    <child>
+                      <widget class="Gtk.Label" id="label5">
+                        <property name="MemberName" />
+                        <property name="LabelProp" 
translatable="yes">Gfx</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Entry" id="SAI_Gfx">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="IsEditable">True</property>
+                        <property name="InvisibleChar">•</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">True</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">2</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder />
+                </child>
+              </widget>
+              <packing>
+                <property name="Position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.Label" id="label2">
+                <property name="MemberName" />
+                <property name="LabelProp" 
translatable="yes">Options</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+              </packing>
+            </child>
</widget>
<packing>
-            <property name="Position">3</property>
+            <property name="Position">0</property>
<property name="AutoSize">True</property>
</packing>
</child>
<child>
-          <widget class="Gtk.HBox" id="hbox1">
+          <widget class="Gtk.HBox" id="hbox6">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
@@ -2921,6 +3154,7 @@ Public License instead of this License.
<property name="Icon">stock:gtk-apply Menu</property>
<property name="Label" translatable="yes">Apply</property>
<property name="UseUnderline">True</property>
+                <signal name="Clicked" handler="OnBTNApplyClicked" />
</widget>
<packing>
<property name="PackType">End</property>
@@ -2932,8 +3166,7 @@ Public License instead of this License.
</child>
</widget>
<packing>
-            <property name="PackType">End</property>
-            <property name="Position">4</property>
+            <property name="Position">1</property>
<property name="AutoSize">True</property>
<property name="Expand">False</property>
<property name="Fill">False</property>
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to