Merge branch 'master' into gui-gtk3

4 files changed, 43 insertions, 21 deletions

diff --git a/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs b/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs
index 23edc50..a503ae0 100644
--- a/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs
+++ b/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs
@@ -51,6 +51,8 @@ namespace Mono.Addins.Gui
 		Label installedTabLabel;
 		Label updatesTabLabel;
 		Label galleryTabLabel;
+
+		static bool firstLoad = true;
 		
 		const string AllRepoMarker = "__ALL";
 		const string ManageRepoMarker = "__MANAGE";
@@ -412,13 +414,14 @@ namespace Mono.Addins.Gui
 		{
 			UpdateAddinInfo ();
 		}
-		
-		protected virtual void OnButtonRefreshClicked (object sender, System.EventArgs e)
+
+		void UpdateRepositories ()
 		{
 			ProgressDialog pdlg = new ProgressDialog (this);
-			pdlg.Show ();
+			if (!firstLoad)
+				pdlg.Show ();
 			pdlg.SetMessage (AddinManager.CurrentLocalizer.GetString ("Updating repository"));
-			bool updateDone = false;
+			bool updateDone = buttonRefresh.Sensitive = false;
 
 			Thread t = new Thread (delegate () {
 				try {
@@ -433,7 +436,13 @@ namespace Mono.Addins.Gui
 					Gtk.Application.RunIteration ();
 				Thread.Sleep (50);
 			}
+			buttonRefresh.Sensitive = true;
 			pdlg.Destroy ();
+		}
+
+		protected virtual void OnButtonRefreshClicked (object sender, System.EventArgs e)
+		{
+			UpdateRepositories ();
 			LoadGallery ();
 			LoadUpdates ();
 		}
@@ -548,5 +557,13 @@ namespace Mono.Addins.Gui
 				idlg.Destroy ();
 			}
 		}
+
+		protected void OnNotebookSwitchPage (object o, SwitchPageArgs args)
+		{
+			if (args.PageNum == 2 && firstLoad) {
+				UpdateRepositories ();
+				firstLoad = false;
+			}
+		}
 	}
 }
diff --git a/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs b/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs
index 4259f4e..bd90d7b 100644
--- a/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs
+++ b/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs
@@ -139,6 +139,9 @@ namespace Mono.Addins.Gui
 		/// <summary>Centers a window relative to its parent.</summary>
 		static void CenterWindow (Window child, Window parent)
 		{
+			if (child == null || parent == null)
+				return;
+
 			child.Child.Show ();
 			int w, h, winw, winh, x, y, winx, winy;
 			child.GetSize (out w, out h);
diff --git a/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs b/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
index 206e9af..d619ccd 100644
--- a/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
+++ b/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
@@ -27,7 +27,7 @@ namespace Mono.Addins.Gui
 		private global::Gtk.EventBox eventbox3;
 		private global::Mono.Addins.Gui.AddinInfoView addininfoUpdates;
 		private global::Gtk.Label label4;
-		private global::Gtk.HBox hbox6;
+		private global::Gtk.HBox hbox8;
 		private global::Gtk.VBox vboxGallery;
 		private global::Gtk.EventBox eboxRepo;
 		private global::Gtk.HBox hbox66;
@@ -224,11 +224,11 @@ namespace Mono.Addins.Gui
 			this.notebook.SetTabLabel (this.boxUpdates, this.label4);
 			this.label4.ShowAll ();
 			// Container child notebook.Gtk.Notebook+NotebookChild
-			this.hbox6 = new global::Gtk.HBox ();
-			this.hbox6.Name = "hbox6";
-			this.hbox6.Spacing = 9;
-			this.hbox6.BorderWidth = ((uint)(9));
-			// Container child hbox6.Gtk.Box+BoxChild
+			this.hbox8 = new global::Gtk.HBox ();
+			this.hbox8.Name = "hbox8";
+			this.hbox8.Spacing = 9;
+			this.hbox8.BorderWidth = ((uint)(9));
+			// Container child hbox8.Gtk.Box+BoxChild
 			this.vboxGallery = new global::Gtk.VBox ();
 			this.vboxGallery.Name = "vboxGallery";
 			// Container child vboxGallery.Gtk.Box+BoxChild
@@ -259,7 +259,7 @@ namespace Mono.Addins.Gui
 			this.buttonRefresh.Name = "buttonRefresh";
 			this.buttonRefresh.UseUnderline = true;
 			this.buttonRefresh.Relief = ((global::Gtk.ReliefStyle)(2));
-			this.buttonRefresh.Label = "";
+			this.buttonRefresh.Label = global::Mono.Unix.Catalog.GetString ("Refresh");
 			global::Gtk.Image w23 = new global::Gtk.Image ();
 			w23.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-refresh", global::Gtk.IconSize.Menu);
 			this.buttonRefresh.Image = w23;
@@ -287,10 +287,10 @@ namespace Mono.Addins.Gui
 			this.vboxGallery.Add (this.scrolledGallery);
 			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vboxGallery [this.scrolledGallery]));
 			w28.Position = 1;
-			this.hbox6.Add (this.vboxGallery);
-			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.vboxGallery]));
+			this.hbox8.Add (this.vboxGallery);
+			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.hbox8 [this.vboxGallery]));
 			w29.Position = 0;
-			// Container child hbox6.Gtk.Box+BoxChild
+			// Container child hbox8.Gtk.Box+BoxChild
 			this.eventbox1 = new global::Gtk.EventBox ();
 			this.eventbox1.Name = "eventbox1";
 			// Container child eventbox1.Gtk.Container+ContainerChild
@@ -299,19 +299,19 @@ namespace Mono.Addins.Gui
 			this.addininfoGallery.Name = "addininfoGallery";
 			this.addininfoGallery.AllowInstall = false;
 			this.eventbox1.Add (this.addininfoGallery);
-			this.hbox6.Add (this.eventbox1);
-			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.eventbox1]));
+			this.hbox8.Add (this.eventbox1);
+			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.hbox8 [this.eventbox1]));
 			w31.Position = 1;
 			w31.Expand = false;
 			w31.Fill = false;
-			this.notebook.Add (this.hbox6);
-			global::Gtk.Notebook.NotebookChild w32 = ((global::Gtk.Notebook.NotebookChild)(this.notebook [this.hbox6]));
+			this.notebook.Add (this.hbox8);
+			global::Gtk.Notebook.NotebookChild w32 = ((global::Gtk.Notebook.NotebookChild)(this.notebook [this.hbox8]));
 			w32.Position = 2;
 			// Notebook tab
 			this.label8 = new global::Gtk.Label ();
 			this.label8.Name = "label8";
 			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Gallery");
-			this.notebook.SetTabLabel (this.hbox6, this.label8);
+			this.notebook.SetTabLabel (this.hbox8, this.label8);
 			this.label8.ShowAll ();
 			this.hbox72.Add (this.notebook);
 			global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.hbox72 [this.notebook]));
@@ -358,6 +358,7 @@ namespace Mono.Addins.Gui
 				this.Child.ShowAll ();
 			}
 			this.Hide ();
+			this.notebook.SwitchPage += new global::Gtk.SwitchPageHandler (this.OnNotebookSwitchPage);
 			this.addininfoInstalled.InstallClicked += new global::System.EventHandler (this.OnInstallClicked);
 			this.addininfoInstalled.UninstallClicked += new global::System.EventHandler (this.OnUninstallClicked);
 			this.addininfoInstalled.UpdateClicked += new global::System.EventHandler (this.OnUpdateClicked);
diff --git a/Mono.Addins.Gui/gtk-gui/gui.stetic b/Mono.Addins.Gui/gtk-gui/gui.stetic
index 16ca37b..39dc435 100644
--- a/Mono.Addins.Gui/gtk-gui/gui.stetic
+++ b/Mono.Addins.Gui/gtk-gui/gui.stetic
@@ -181,6 +181,7 @@
                         <property name="CanFocus">True</property>
                         <property name="CurrentPage">0</property>
                         <property name="ShowBorder">False</property>
+                        <signal name="SwitchPage" handler="OnNotebookSwitchPage" />
                         <child>
                           <widget class="Gtk.HBox" id="hbox2">
                             <property name="MemberName" />
@@ -381,7 +382,7 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="Gtk.HBox" id="hbox6">
+                          <widget class="Gtk.HBox" id="hbox8">
                             <property name="MemberName" />
                             <property name="Spacing">9</property>
                             <property name="BorderWidth">9</property>
@@ -425,7 +426,7 @@
                                             <property name="CanFocus">True</property>
                                             <property name="Type">TextAndIcon</property>
                                             <property name="Icon">stock:gtk-refresh Menu</property>
-                                            <property name="Label" translatable="yes" />
+                                            <property name="Label" translatable="yes">Refresh</property>
                                             <property name="UseUnderline">True</property>
                                             <property name="Relief">None</property>
                                             <signal name="Clicked" handler="OnButtonRefreshClicked" />