[Xfce4-commits] r25705 - squeeze/trunk/src

[Stephan Arts]

Author: stephan
Date: 2007-05-11 08:17:27 +0000 (Fri, 11 May 2007)
New Revision: 25705

Modified:
   squeeze/trunk/src/application.c
   squeeze/trunk/src/main_window.c
   squeeze/trunk/src/settings.c
   squeeze/trunk/src/settings.h
Log:
Applied patches by Diego Ongardie <ongardie at gmail dot com>

Rememeber window-size when squeeze quit's. ( Bug #3147 )



Modified: squeeze/trunk/src/application.c
===================================================================
--- squeeze/trunk/src/application.c	2007-05-11 02:59:28 UTC (rev 25704)
+++ squeeze/trunk/src/application.c	2007-05-11 08:17:27 UTC (rev 25705)
@@ -143,7 +143,6 @@
 sq_application_new_window(SQApplication *app)
 {
 	GtkWidget *window = sq_main_window_new(app, app->icon_theme);
-	gtk_widget_set_size_request(window, 500, 300);
 	return window;
 }
 

Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c	2007-05-11 02:59:28 UTC (rev 25704)
+++ squeeze/trunk/src/main_window.c	2007-05-11 08:17:27 UTC (rev 25705)
@@ -194,6 +194,7 @@
 sq_main_window_dispose(GObject *object)
 {
 	SQMainWindow *window = SQ_MAIN_WINDOW(object);
+	gint width, height;
 
 	if(window->main_vbox && window->notebook)
 	{
@@ -235,6 +236,13 @@
 			sq_settings_write_entry(window->settings, "NavigationBar", "None");
 		}
 
+		if(&window->parent != NULL)
+		{
+			gtk_window_get_size(&window->parent, &width, &height);
+			sq_settings_write_int_entry(window->settings, "LastWindowWidth", width);
+			sq_settings_write_int_entry(window->settings, "LastWindowHeight", height);
+		}
+
 		sq_settings_save(window->settings);
 
 		g_object_unref(G_OBJECT(window->settings));
@@ -275,6 +283,10 @@
 
 	show_menubar = sq_settings_read_bool_entry(window->settings, "MenuBar", TRUE);
 
+	gtk_window_set_default_size (GTK_WINDOW(window), 
+	                             sq_settings_read_int_entry(window->settings, "LastWindowWidth", 500),
+	                             sq_settings_read_int_entry(window->settings, "LastWindowHeight", 300));
+
 	if(show_menubar)
 	{
 		window->menu_bar = gtk_menu_bar_new();

Modified: squeeze/trunk/src/settings.c
===================================================================
--- squeeze/trunk/src/settings.c	2007-05-11 02:59:28 UTC (rev 25704)
+++ squeeze/trunk/src/settings.c	2007-05-11 08:17:27 UTC (rev 25705)
@@ -137,6 +137,16 @@
 #endif /* HAVE_LIBXFCE4UTIL */
 }
 
+void
+sq_settings_write_int_entry(SQSettings *settings, const gchar *key, const gint value)
+{
+#ifdef HAVE_LIBXFCE4UTIL
+	xfce_rc_write_int_entry(XFCE_RC(settings->xfce_rc), key, value);
+#else
+
+#endif /* HAVE_LIBXFCE4UTIL */
+}
+
 const gchar *
 sq_settings_read_entry(SQSettings *settings, const gchar *key, const gchar *fallback)
 {
@@ -157,6 +167,16 @@
 #endif /* HAVE_LIBXFCE4UTIL */
 }
 
+gboolean
+sq_settings_read_int_entry(SQSettings *settings, const gchar *key, const gint fallback)
+{
+#ifdef HAVE_LIBXFCE4UTIL
+	return xfce_rc_read_int_entry(XFCE_RC(settings->xfce_rc), key, fallback);
+#else
+	return fallback;
+#endif /* HAVE_LIBXFCE4UTIL */
+}
+
 static GObject *
 sq_settings_singleton_constuctor(GType type, guint n_construct_params, GObjectConstructParam *construct_params)
 {

Modified: squeeze/trunk/src/settings.h
===================================================================
--- squeeze/trunk/src/settings.h	2007-05-11 02:59:28 UTC (rev 25704)
+++ squeeze/trunk/src/settings.h	2007-05-11 08:17:27 UTC (rev 25705)
@@ -62,9 +62,11 @@
 
 const gchar  *sq_settings_read_entry(SQSettings *settings, const gchar *key, const gchar *fallback);
 gboolean      sq_settings_read_bool_entry(SQSettings *settings, const gchar *key, const gboolean fallback);
+gint          sq_settings_read_int_entry(SQSettings *settings, const gchar *key, const gint fallback);
 
 void          sq_settings_write_entry(SQSettings *settings, const gchar *key, const gchar *value);
 void          sq_settings_write_bool_entry(SQSettings *settings, const gchar *key, const gboolean value);
+void          sq_settings_write_int_entry(SQSettings *settings, const gchar *key, const gint value);
 
 void          sq_settings_set_group(SQSettings *settings, const gchar *group);