X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Faweather-gui.c;h=b0cc5d5638fa477dcdb9f786b92752678dd03ca6;hb=72842797f3fddb8ddb3c309ba9ceec889c4ec4e2;hp=9c88987f8eff424d7bd7282de98809366fe983eb;hpb=f45856566635a97514c4ddb89522ffa35ecc3fba;p=aweather

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 9c88987..b0cc5d5 100644
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -80,14 +80,14 @@ G_MODULE_EXPORT gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event,
 			event->keyval, event->state);
 	GObject *action = aweather_gui_get_object(self, "fullscreen");
 	gboolean full   = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
-	if (event->keyval == GDK_q)
+	if (event->keyval == GDK_KEY_q)
 		gtk_widget_destroy(GTK_WIDGET(self));
-	else if (event->keyval == GDK_F11 ||
-	        (event->keyval == GDK_Escape && full))
+	else if (event->keyval == GDK_KEY_F11 ||
+	        (event->keyval == GDK_KEY_Escape && full))
 		gtk_action_activate(GTK_ACTION(action));
-	else if (event->keyval == GDK_r && event->state & GDK_CONTROL_MASK)
+	else if (event->keyval == GDK_KEY_r && event->state & GDK_CONTROL_MASK)
 		grits_viewer_refresh(self->viewer);
-	else if (event->keyval == GDK_Tab || event->keyval == GDK_ISO_Left_Tab) {
+	else if (event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_ISO_Left_Tab) {
 		GtkNotebook *tabs = GTK_NOTEBOOK(aweather_gui_get_widget(self, "main_tabs"));
 		gint num_tabs = gtk_notebook_get_n_pages(tabs);
 		gint cur_tab  = gtk_notebook_get_current_page(tabs);
@@ -317,6 +317,14 @@ static void update_time_widget(GritsViewer *viewer, time_t time, AWeatherGui *se
 	//}
 }
 
+G_MODULE_EXPORT gboolean on_configure(AWeatherGui *self, GdkEventConfigure *config)
+{
+	g_debug("AWeatherGui: on_configure - %dx%d", config->width, config->height);
+	grits_prefs_set_integer(self->prefs, "aweather/width",  config->width);
+	grits_prefs_set_integer(self->prefs, "aweather/height", config->height);
+	return FALSE;
+}
+
 /* Prefs callbacks */
 G_MODULE_EXPORT void on_offline(GtkToggleAction *action, AWeatherGui *self)
 {
@@ -552,7 +560,7 @@ void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name)
 		gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab);
 		gtk_widget_show_all(config);
 	}
-	gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
+	grits_viewer_queue_draw(self->viewer);
 }
 void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name)
 {
@@ -569,7 +577,7 @@ void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name)
 			gtk_notebook_remove_page(GTK_NOTEBOOK(config), i);
 	}
 	grits_plugins_disable(self->plugins, name);
-	gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
+	grits_viewer_queue_draw(self->viewer);
 }
 void aweather_gui_load_plugins(AWeatherGui *self)
 {
@@ -617,6 +625,12 @@ static void aweather_gui_parser_finished(GtkBuildable *_self, GtkBuilder *builde
 	prefs_setup(self);
 	icons_setup(self);
 
+	/* Default size */
+	gint width  = grits_prefs_get_integer(self->prefs, "aweather/width",  NULL);
+	gint height = grits_prefs_get_integer(self->prefs, "aweather/height", NULL);
+	if (width && height)
+		gtk_window_set_default_size(GTK_WINDOW(self), width, height);
+
 	/* Connect signals */
 	gtk_builder_connect_signals(self->builder, self);
 	g_signal_connect(self, "key-press-event",
@@ -653,16 +667,19 @@ static void aweather_gui_dispose(GObject *_self)
 	g_debug("AWeatherGui: dispose");
 	AWeatherGui *self = AWEATHER_GUI(_self);
 	if (self->plugins) {
-		grits_plugins_free(self->plugins);
+		GritsPlugins *plugins = self->plugins;
 		self->plugins = NULL;
+		grits_plugins_free(plugins);
 	}
 	if (self->builder) {
-		g_object_unref(self->builder);
+		GtkBuilder *builder = self->builder;
 		self->builder = NULL;
+		g_object_unref(builder);
 	}
 	if (self->prefs) {
-		g_object_unref(self->prefs);
+		GritsPrefs *prefs = self->prefs;
 		self->prefs = NULL;
+		g_object_unref(prefs);
 	}
 	G_OBJECT_CLASS(aweather_gui_parent_class)->dispose(_self);
 }