[Goodies-commits] r7895 - in xfce4-notes-plugin/trunk: . panel-plugin

Mike Massonnet mmassonnet at xfce.org
Sat Aug 8 01:59:01 CEST 2009


Author: mmassonnet
Date: 2009-08-07 23:59:01 +0000 (Fri, 07 Aug 2009)
New Revision: 7895

Modified:
   xfce4-notes-plugin/trunk/ChangeLog
   xfce4-notes-plugin/trunk/panel-plugin/application.vala
   xfce4-notes-plugin/trunk/panel-plugin/note.vala
Log:
Rework default window visibility (bug #4055)

Modified: xfce4-notes-plugin/trunk/ChangeLog
===================================================================
--- xfce4-notes-plugin/trunk/ChangeLog	2009-08-06 14:00:55 UTC (rev 7894)
+++ xfce4-notes-plugin/trunk/ChangeLog	2009-08-07 23:59:01 UTC (rev 7895)
@@ -1,3 +1,11 @@
+2009-08-08  Mike Massonnet <mmassonnet at xfce.org>
+
+Rework default window visibility (bug #4055)
+	* panel-plugin/application.vala:
+	  - Return pointer to window in create_window() to be able to call
+	  Widget.show() on specific cases.
+	  - Only hide (don't show actually) window on initial creation.
+
 2009-07-29  Mike Massonnet <mmassonnet at xfce.org>
 
 Fix tabs option

Modified: xfce4-notes-plugin/trunk/panel-plugin/application.vala
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/application.vala	2009-08-06 14:00:55 UTC (rev 7894)
+++ xfce4-notes-plugin/trunk/panel-plugin/application.vala	2009-08-07 23:59:01 UTC (rev 7895)
@@ -78,7 +78,7 @@
 		 * Creates a new Xnp.Window and stores it inside window_list.
 		 * If a name is given, it assumes it can load existing notes.
 		 */
-		public void create_window (string? name = null) {
+		public Xnp.Window create_window (string? name = null) {
 			var window = new Xnp.Window ();
 
 			/* Global settings */
@@ -136,8 +136,6 @@
 				}
 				catch (FileError e) {
 				}
-
-				window.show ();
 			}
 			else {
 				this.load_window_data (window);
@@ -152,7 +150,8 @@
 					delete_window (win);
 				}
 				else if (action == "create-new-window") {
-					create_window ();
+					var new_win = create_window ();
+					new_win.show ();
 				}
 				else if (action == "properties") {
 					open_settings_dialog ();
@@ -185,6 +184,8 @@
 				string new_path = "%s/%s/%s".printf (notes_path, win.name, note.name);
 				GLib.FileUtils.rename (old_path, new_path);
 			};
+
+			return window;
 		}
 
 		/**
@@ -218,7 +219,7 @@
 			catch (FileError e) {
 			}
 
-			/* Load configuration */
+			/* Load window configuration */
 			var keyfile = new GLib.KeyFile ();
 			try {
 				keyfile.load_from_file (config_file, GLib.KeyFileFlags.NONE);
@@ -242,7 +243,7 @@
 					window.show ();
 			}
 			catch (GLib.Error e) {
-				warning ("%s: %s", config_file, e.message);
+				warning ("Unable to load window configuration from %s: %s", config_file, e.message);
 				window.show ();
 			}
 		}
@@ -391,7 +392,8 @@
 				}
 			}
 			else {
-				create_window ();
+				var new_win = create_window ();
+				new_win.show ();
 			}
 		}
 

Modified: xfce4-notes-plugin/trunk/panel-plugin/note.vala
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/note.vala	2009-08-06 14:00:55 UTC (rev 7894)
+++ xfce4-notes-plugin/trunk/panel-plugin/note.vala	2009-08-07 23:59:01 UTC (rev 7895)
@@ -73,7 +73,7 @@
 		}
 
 		~Note () {
-            this.dirty = false;
+			this.dirty = false;
 		}
 
 		public override void size_request (ref Gtk.Requisition requisition) {




More information about the Goodies-commits mailing list