X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Faweather-gui.c;h=b59aa0caf516bdf20ea2c1d55b09bb7658913c06;hb=b669a540beef89cb39fa1f7ec195002eca47440b;hp=5e25535a49d711eb56ec9551b690f7aca283c45f;hpb=61fb0b58c4801a2b904fd38a64708c8a13f98dd3;p=aweather

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 5e25535..b59aa0c 100644
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -128,10 +128,17 @@ G_MODULE_EXPORT void on_cleancache(GtkMenuItem *menu, AWeatherGui *self)
 	cleancache_r(cache);
 }
 
-G_MODULE_EXPORT void on_contents(GtkMenuItem *menu, AWeatherGui *self)
+G_MODULE_EXPORT void on_help(GtkMenuItem *menu, AWeatherGui *self)
 {
 	GError *err = NULL;
-	gchar *path = g_strdup(HTMLDIR "/aweather.html");
+	const gchar *name = gtk_buildable_get_name(GTK_BUILDABLE(menu));
+	gchar *page = g_str_has_suffix(name, "userguide") ? "userguide" :
+	              g_str_has_suffix(name, "manpage")   ? "aweather"  : NULL;
+	if (page == NULL) {
+		g_warning("Unknown help page: %s", page);
+		return;
+	}
+	gchar *path = g_strdup_printf("%s/%s.html", HTMLDIR, page);
 	g_strdelimit(path, "/", G_DIR_SEPARATOR);
 	gchar *argv[] = {"xdg-open", path, NULL};
 	g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err);
@@ -180,7 +187,9 @@ G_MODULE_EXPORT void on_fullscreen(GtkToggleAction *action, AWeatherGui *self)
 	GtkWidget *toolbar = aweather_gui_get_widget(self, "main_toolbar");
 	GtkWidget *sidebar = aweather_gui_get_widget(self, "main_sidebar");
 	GtkWidget *tabs    = aweather_gui_get_widget(self, "main_tabs");
+	static gboolean menushow = TRUE; // Toolbar can be always disabled
 	if (gtk_toggle_action_get_active(action)) {
+		menushow = gtk_widget_get_visible(menu);
 		gtk_window_fullscreen(GTK_WINDOW(self));
 		gtk_widget_hide(menu);
 		_gtk_widget_autohide(toolbar, GTK_WIDGET(self->viewer), GTK_POS_TOP);
@@ -188,7 +197,7 @@ G_MODULE_EXPORT void on_fullscreen(GtkToggleAction *action, AWeatherGui *self)
 		_gtk_widget_autohide(tabs,    GTK_WIDGET(self->viewer), GTK_POS_BOTTOM);
 	} else {
 		gtk_window_unfullscreen(GTK_WINDOW(self));
-		gtk_widget_show(menu);
+		gtk_widget_set_visible(menu, menushow);
 		_gtk_widget_autoshow(toolbar);
 		_gtk_widget_autoshow(sidebar);
 		_gtk_widget_autoshow(tabs);
@@ -258,13 +267,15 @@ G_MODULE_EXPORT void on_time_changed(AWeatherGui *self)
 			(guint*)&tm.tm_mon, (guint*)&tm.tm_mday);
 	tm.tm_year -= 1900;
 
-	GtkTreeIter   iter;
-	GtkTreePath  *path  = NULL;
-	GtkWidget    *view  = aweather_gui_get_widget(self, "main_time");
-	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+	GtkTreePath *path = NULL;
+	GtkWidget   *view = aweather_gui_get_widget(self, "main_time");
 	gtk_tree_view_get_cursor(GTK_TREE_VIEW(view), &path, NULL);
-	gtk_tree_model_get_iter(model, &iter, path);
-	gtk_tree_model_get(model, &iter, 1, &tm.tm_hour, 2, &tm.tm_min, -1);
+	if (path) {
+		GtkTreeIter   iter;
+		GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+		gtk_tree_model_get_iter(model, &iter, path);
+		gtk_tree_model_get(model, &iter, 1, &tm.tm_hour, 2, &tm.tm_min, -1);
+	}
 
 	grits_viewer_set_time(self->viewer, mktime(&tm));
 }
@@ -306,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)
 {
@@ -387,7 +406,7 @@ static void site_setup(AWeatherGui *self)
 static void menu_setup(AWeatherGui *self)
 {
 	GtkWidget *menu = aweather_gui_get_widget(self, "main_menu_radar");
-	GtkWidget *states, *state, *sites, *site;
+	GtkWidget *states=NULL, *state=NULL, *sites=NULL, *site=NULL;
 
 	states = gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), states);
@@ -606,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",
@@ -642,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);
 }