Author: lluis
Date: 2007-03-30 10:37:26 -0500 (Fri, 30 Mar 2007)
New Revision: 75209

Modified:
   trunk/mono-addins/Mono.Addins.Gui/ChangeLog
   trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs
   trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/NewSiteDialog.cs
   trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs
   
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
   
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
   trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs
   
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs
   trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs
   trunk/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic
Log:
* gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs,
  gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs,
  gtk-gui/Mono.Addins.Gui.ErrorDialog.cs,
  gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs,
  gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs,
  gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs, gtk-gui/gui.stetic:
  Updated.
* Mono.Addins.Gui/NewSiteDialog.cs: Implement missing bits in the
  dialog.
* Mono.Addins.Gui/AddinInstallDialog.cs: Fixed nullref. Removed
  "restart" message.

Modified: trunk/mono-addins/Mono.Addins.Gui/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/ChangeLog 2007-03-30 15:37:18 UTC (rev 
75208)
+++ trunk/mono-addins/Mono.Addins.Gui/ChangeLog 2007-03-30 15:37:26 UTC (rev 
75209)
@@ -1,3 +1,17 @@
+2007-03-30  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs,
+         gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs,
+         gtk-gui/Mono.Addins.Gui.ErrorDialog.cs,
+         gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs,
+         gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs,
+         gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs, gtk-gui/gui.stetic:
+         Updated.
+       * Mono.Addins.Gui/NewSiteDialog.cs: Implement missing bits in the
+         dialog.
+       * Mono.Addins.Gui/AddinInstallDialog.cs: Fixed nullref. Removed
+         "restart" message.
+
 2007-03-23  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * Makefile.am, Mono.Addins.Gui.mdp: Enabled conditional compilation of

Modified: 
trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs     
2007-03-30 15:37:18 UTC (rev 75208)
+++ trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs     
2007-03-30 15:37:26 UTC (rev 75209)
@@ -124,7 +124,7 @@
                        
                        foreach (AddinRepositoryEntry arep in reps) {
                                Addin sinfo = AddinManager.Registry.GetAddin 
(arep.Addin.Id);
-                               if (!Services.InApplicationNamespace (service, 
sinfo.Id))
+                               if (!Services.InApplicationNamespace (service, 
arep.Addin.Id))
                                        continue;
                                
                                if (sinfo == null) {
@@ -447,7 +447,6 @@
                                imageError.Visible = false;
                                imageInfo.Visible = true;
                                txt = "<b>" + okmessage + "</b>\n\n";
-                               txt += Catalog.GetString ("You need to restart 
MonoDevelop for the changes to take effect.");
                        } else {
                                imageError.Visible = true;
                                imageInfo.Visible = false;

Modified: trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/NewSiteDialog.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/NewSiteDialog.cs  
2007-03-30 15:37:18 UTC (rev 75208)
+++ trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/NewSiteDialog.cs  
2007-03-30 15:37:26 UTC (rev 75209)
@@ -37,6 +37,7 @@
                public NewSiteDialog ()
                {
                        Build ();
+                       pathEntry.Sensitive = false;
                        CheckValues ();
                }
                
@@ -68,11 +69,6 @@
                        return ((ResponseType) base.Run ()) == ResponseType.Ok;
                }
                
-               protected void OnTextChanged (object sender, EventArgs args)
-               {
-                       CheckValues ();
-               }
-               
                protected void OnClose (object sender, EventArgs args)
                {
                        Destroy ();
@@ -89,5 +85,23 @@
                        }
                        CheckValues ();
                }
+
+               protected virtual void OnButtonBrowseClicked(object sender, 
System.EventArgs e)
+               {
+                       FileChooserDialog dlg = new FileChooserDialog ("Select 
Folder", this, FileChooserAction.SelectFolder);
+                       dlg.AddButton (Gtk.Stock.Cancel, 
Gtk.ResponseType.Cancel);
+                       dlg.AddButton (Gtk.Stock.Open, Gtk.ResponseType.Ok);
+                       
+                       dlg.SetFilename (Environment.GetFolderPath 
(Environment.SpecialFolder.Personal));
+                       if (dlg.Run () == (int) ResponseType.Ok) {
+                               pathEntry.Text = dlg.Filename;
+                       }
+                       dlg.Destroy ();
+               }
+
+               protected virtual void OnPathEntryChanged(object sender, 
System.EventArgs e)
+               {
+                       CheckValues ();
+               }
        }
 }

Modified: 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs
===================================================================
--- 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs    
    2007-03-30 15:37:18 UTC (rev 75208)
+++ 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs    
    2007-03-30 15:37:26 UTC (rev 75209)
@@ -31,10 +31,8 @@
             this.Name = "Mono.Addins.Gui.AddinInfoDialog";
             this.Title = Mono.Unix.Catalog.GetString("MonoDevelop Package");
             this.TypeHint = ((Gdk.WindowTypeHint)(1));
-            this.WindowPosition = ((Gtk.WindowPosition)(4));
             this.DefaultWidth = 550;
             this.DefaultHeight = 400;
-            this.HasSeparator = false;
             // Internal child Mono.Addins.Gui.AddinInfoDialog.VBox
             Gtk.VBox w1 = this.VBox;
             w1.Name = "dialog-vbox12";

Modified: 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
===================================================================
--- 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs 
    2007-03-30 15:37:18 UTC (rev 75208)
+++ 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs 
    2007-03-30 15:37:26 UTC (rev 75209)
@@ -109,11 +109,9 @@
             this.Name = "Mono.Addins.Gui.AddinInstallDialog";
             this.Title = Mono.Unix.Catalog.GetString("Add-in Installation");
             this.TypeHint = ((Gdk.WindowTypeHint)(1));
-            this.WindowPosition = ((Gtk.WindowPosition)(4));
             this.Modal = true;
             this.DefaultWidth = 725;
             this.DefaultHeight = 550;
-            this.HasSeparator = false;
             // Internal child Mono.Addins.Gui.AddinInstallDialog.VBox
             Gtk.VBox w1 = this.VBox;
             w1.Name = "dialog-vbox9";
@@ -215,9 +213,9 @@
             this.hbox83.Spacing = 6;
             // Container child hbox83.Gtk.Box+BoxChild
             this.filterComboBox = Gtk.ComboBox.NewText();
-            this.filterComboBox.AppendText("Show all packages");
-            this.filterComboBox.AppendText("Show new versions only");
-            this.filterComboBox.AppendText("Show updates only");
+            this.filterComboBox.AppendText(Mono.Unix.Catalog.GetString("Show 
all packages"));
+            this.filterComboBox.AppendText(Mono.Unix.Catalog.GetString("Show 
new versions only"));
+            this.filterComboBox.AppendText(Mono.Unix.Catalog.GetString("Show 
updates only"));
             this.filterComboBox.Name = "filterComboBox";
             this.hbox83.Add(this.filterComboBox);
             Gtk.Box.BoxChild w10 = 
((Gtk.Box.BoxChild)(this.hbox83[this.filterComboBox]));
@@ -441,7 +439,7 @@
             this.labelResult.Name = "labelResult";
             this.labelResult.Ypad = 9;
             this.labelResult.Yalign = 0F;
-            this.labelResult.LabelProp = "You need to restart 
MonoDevelop\nsdfsdf\nsdfsf";
+            this.labelResult.LabelProp = "Done";
             this.labelResult.UseMarkup = true;
             this.labelResult.Wrap = true;
             this.labelResult.Justify = ((Gtk.Justification)(2));
@@ -540,6 +538,7 @@
             w46.Fill = false;
             // Internal child Mono.Addins.Gui.AddinInstallDialog.ActionArea
             Gtk.HButtonBox w47 = this.ActionArea;
+            w47.Name = "hbuttonbox1";
             w47.Spacing = 10;
             w47.BorderWidth = ((uint)(5));
             w47.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));

Modified: 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
===================================================================
--- 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs 
    2007-03-30 15:37:18 UTC (rev 75208)
+++ 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs 
    2007-03-30 15:37:26 UTC (rev 75209)
@@ -57,10 +57,8 @@
             this.Name = "Mono.Addins.Gui.AddinManagerDialog";
             this.Title = Mono.Unix.Catalog.GetString("MonoDevelop Add-in 
Manager");
             this.TypeHint = ((Gdk.WindowTypeHint)(1));
-            this.WindowPosition = ((Gtk.WindowPosition)(4));
             this.DefaultWidth = 700;
             this.DefaultHeight = 550;
-            this.HasSeparator = false;
             // Internal child Mono.Addins.Gui.AddinManagerDialog.VBox
             Gtk.VBox w1 = this.VBox;
             w1.Name = "dialog-vbox8";
@@ -159,7 +157,7 @@
             w10.Spacing = 2;
             // Container child GtkHBox.Gtk.Container+ContainerChild
             Gtk.Image w11 = new Gtk.Image();
-            w11.Name = "image12";
+            w11.Name = "image14";
             w11.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-add", 20, 0);
             w10.Add(w11);
             // Container child GtkHBox.Gtk.Container+ContainerChild
@@ -208,7 +206,7 @@
             w21.Spacing = 2;
             // Container child GtkHBox1.Gtk.Container+ContainerChild
             Gtk.Image w22 = new Gtk.Image();
-            w22.Name = "image13";
+            w22.Name = "image15";
             w22.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-remove", 20, 0);
             w21.Add(w22);
             // Container child GtkHBox1.Gtk.Container+ContainerChild
@@ -238,7 +236,7 @@
             w30.Spacing = 2;
             // Container child GtkHBox2.Gtk.Container+ContainerChild
             Gtk.Image w31 = new Gtk.Image();
-            w31.Name = "image14";
+            w31.Name = "image16";
             w31.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-yes", 20, 0);
             w30.Add(w31);
             // Container child GtkHBox2.Gtk.Container+ContainerChild
@@ -268,7 +266,7 @@
             w39.Spacing = 2;
             // Container child GtkHBox3.Gtk.Container+ContainerChild
             Gtk.Image w40 = new Gtk.Image();
-            w40.Name = "image15";
+            w40.Name = "image17";
             w40.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-no", 20, 0);
             w39.Add(w40);
             // Container child GtkHBox3.Gtk.Container+ContainerChild

Modified: 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs    
2007-03-30 15:37:18 UTC (rev 75208)
+++ trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs    
2007-03-30 15:37:26 UTC (rev 75209)
@@ -40,7 +40,6 @@
             this.Title = Mono.Unix.Catalog.GetString("MonoDevelop");
             this.TypeHint = ((Gdk.WindowTypeHint)(1));
             this.BorderWidth = ((uint)(6));
-            this.HasSeparator = false;
             // Internal child Mono.Addins.Gui.ErrorDialog.VBox
             Gtk.VBox w1 = this.VBox;
             w1.Name = "dialog-vbox5";

Modified: 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs
===================================================================
--- 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs  
    2007-03-30 15:37:18 UTC (rev 75208)
+++ 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs  
    2007-03-30 15:37:26 UTC (rev 75209)
@@ -33,10 +33,8 @@
             this.Name = "Mono.Addins.Gui.ManageSitesDialog";
             this.Title = Mono.Unix.Catalog.GetString("Add-in Repository 
Management");
             this.TypeHint = ((Gdk.WindowTypeHint)(1));
-            this.WindowPosition = ((Gtk.WindowPosition)(4));
             this.DefaultWidth = 600;
             this.DefaultHeight = 300;
-            this.HasSeparator = false;
             // Internal child Mono.Addins.Gui.ManageSitesDialog.VBox
             Gtk.VBox w1 = this.VBox;
             w1.Name = "dialog-vbox10";

Modified: 
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs  
2007-03-30 15:37:18 UTC (rev 75208)
+++ trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs  
2007-03-30 15:37:26 UTC (rev 75209)
@@ -39,7 +39,7 @@
         
         private Gtk.Entry pathEntry;
         
-        private Gtk.Button button88;
+        private Gtk.Button buttonBrowse;
         
         private Gtk.Button cancelbutton1;
         
@@ -52,7 +52,6 @@
             this.Title = Mono.Unix.Catalog.GetString("Add New Repository");
             this.TypeHint = ((Gdk.WindowTypeHint)(1));
             this.DefaultWidth = 550;
-            this.HasSeparator = false;
             // Internal child Mono.Addins.Gui.NewSiteDialog.VBox
             Gtk.VBox w1 = this.VBox;
             w1.Name = "dialog-vbox11";
@@ -171,13 +170,13 @@
             Gtk.Box.BoxChild w11 = 
((Gtk.Box.BoxChild)(this.hbox1[this.pathEntry]));
             w11.Position = 0;
             // Container child hbox1.Gtk.Box+BoxChild
-            this.button88 = new Gtk.Button();
-            this.button88.CanFocus = true;
-            this.button88.Name = "button88";
-            this.button88.UseUnderline = true;
-            this.button88.Label = Mono.Unix.Catalog.GetString("Browse...");
-            this.hbox1.Add(this.button88);
-            Gtk.Box.BoxChild w12 = 
((Gtk.Box.BoxChild)(this.hbox1[this.button88]));
+            this.buttonBrowse = new Gtk.Button();
+            this.buttonBrowse.CanFocus = true;
+            this.buttonBrowse.Name = "buttonBrowse";
+            this.buttonBrowse.UseUnderline = true;
+            this.buttonBrowse.Label = Mono.Unix.Catalog.GetString("Browse...");
+            this.hbox1.Add(this.buttonBrowse);
+            Gtk.Box.BoxChild w12 = 
((Gtk.Box.BoxChild)(this.hbox1[this.buttonBrowse]));
             w12.Position = 1;
             w12.Expand = false;
             w12.Fill = false;
@@ -224,8 +223,9 @@
             this.DefaultHeight = 235;
             this.Show();
             this.btnOnlineRep.Clicked += new 
System.EventHandler(this.OnOptionClicked);
-            this.urlText.Changed += new 
System.EventHandler(this.OnTextChanged);
             this.btnLocalRep.Clicked += new 
System.EventHandler(this.OnOptionClicked);
+            this.pathEntry.Changed += new 
System.EventHandler(this.OnPathEntryChanged);
+            this.buttonBrowse.Clicked += new 
System.EventHandler(this.OnButtonBrowseClicked);
         }
     }
 }

Modified: trunk/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic        2007-03-30 
15:37:18 UTC (rev 75208)
+++ trunk/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic        2007-03-30 
15:37:26 UTC (rev 75209)
@@ -5,7 +5,6 @@
     <property name="GeneratePublic">False</property>
     <property name="Title" translatable="yes">MonoDevelop</property>
     <property name="TypeHint">Dialog</property>
-    <property name="WindowPosition">None</property>
     <property name="BorderWidth">6</property>
     <property name="Buttons">1</property>
     <property name="HelpButton">False</property>
@@ -966,9 +965,7 @@
                                 <property name="GeneratePublic">True</property>
                                 <property name="Ypad">9</property>
                                 <property name="Yalign">0</property>
-                                <property name="LabelProp">You need to restart 
MonoDevelop
-sdfsdf
-sdfsf</property>
+                                <property name="LabelProp">Done</property>
                                 <property name="UseMarkup">True</property>
                                 <property name="Wrap">True</property>
                                 <property name="Justify">Center</property>
@@ -1262,7 +1259,6 @@
     <property name="GeneratePublic">False</property>
     <property name="Title" translatable="yes">Add New Repository</property>
     <property name="TypeHint">Dialog</property>
-    <property name="WindowPosition">None</property>
     <property name="DefaultWidth">550</property>
     <property name="Buttons">2</property>
     <property name="HelpButton">False</property>
@@ -1350,7 +1346,6 @@
                     <property name="GeneratePublic">True</property>
                     <property name="IsEditable">True</property>
                     <property name="InvisibleChar">●</property>
-                    <signal name="Changed" handler="OnTextChanged" />
                   </widget>
                   <packing>
                     <property name="Position">2</property>
@@ -1428,6 +1423,7 @@
                         <property name="GeneratePublic">True</property>
                         <property name="IsEditable">True</property>
                         <property name="InvisibleChar">●</property>
+                        <signal name="Changed" handler="OnPathEntryChanged" />
                       </widget>
                       <packing>
                         <property name="Position">0</property>
@@ -1435,7 +1431,7 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="Gtk.Button" id="button88">
+                      <widget class="Gtk.Button" id="buttonBrowse">
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
                         <property name="GeneratePublic">True</property>
@@ -1443,6 +1439,7 @@
                         <property name="Label" 
translatable="yes">Browse...</property>
                         <property name="UseUnderline">True</property>
                         <property name="IsDialogButton">False</property>
+                        <signal name="Clicked" handler="OnButtonBrowseClicked" 
/>
                       </widget>
                       <packing>
                         <property name="Position">1</property>

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to