/*
- * Copyright (C) 2009-201
0 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-201
1 Andy Spencer <andy753421@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
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);
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);
g_free(path);
}
+void on_radar_changed(GtkMenuItem *menu, AWeatherGui *self)
+{
+ city_t *city = g_object_get_data(G_OBJECT(menu), "city");
+ grits_viewer_set_location(self->viewer,
+ city->pos.lat, city->pos.lon, EARTH_R/35);
+ /* Focus radar tab */
+ GtkWidget *config = aweather_gui_get_widget(self, "main_tabs");
+ gint npages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(config));
+ for (int i = 0; i < npages; i++) {
+ GtkWidget *child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(config), i);
+ const gchar *plugin = gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(config), child);
+ if (g_str_equal(plugin, "radar"))
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(config), i);
+ }
+}
+
G_MODULE_EXPORT void on_quit(GtkMenuItem *menu, AWeatherGui *self)
{
gtk_widget_destroy(GTK_WIDGET(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);
_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);
(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));
}
//}
}
+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)
{
gtk_tree_store_append(store, &state, NULL);
gtk_tree_store_set (store, &state, 0, cities[i].code,
1, cities[i].name, -1);
- } else {
+ } else if (cities[i].type == LOCATION_CITY) {
gtk_tree_store_append(store, &city, &state);
gtk_tree_store_set (store, &city, 0, cities[i].code,
1, cities[i].name, -1);
GTK_CELL_RENDERER(renderer), combo_sensitive, NULL, NULL);
}
+static void menu_setup(AWeatherGui *self)
+{
+ GtkWidget *menu = aweather_gui_get_widget(self, "main_menu_radar");
+ GtkWidget *states=NULL, *state=NULL, *sites=NULL, *site=NULL;
+
+ states = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), states);
+
+ for (int i = 0; cities[i].type; i++) {
+ if (cities[i].type == LOCATION_STATE) {
+ state = gtk_menu_item_new_with_label(cities[i].name);
+ sites = gtk_menu_new();
+ gtk_menu_shell_append(GTK_MENU_SHELL(states), state);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(state), sites);
+ } else if (cities[i].type == LOCATION_CITY) {
+ site = gtk_menu_item_new_with_label(cities[i].name);
+ gtk_menu_shell_append(GTK_MENU_SHELL(sites), site);
+ g_object_set_data(G_OBJECT(site), "city", &cities[i]);
+ g_signal_connect(site, "activate", G_CALLBACK(on_radar_changed), self);
+ }
+ }
+}
+
static void prefs_setup(AWeatherGui *self)
{
/* Set values */
GtkTreeIter iter;
if (gtk_tree_model_find_string(model, &iter, NULL, 0, is))
gtk_combo_box_set_active_iter(GTK_COMBO_BOX(isw), &iter);
+ g_free(is);
}
/* Load Plugins */
gtk_tree_view_append_column(tview, col2);
g_signal_connect(rend2, "toggled", G_CALLBACK(on_plugin_toggled), self);
gtk_tree_view_set_model(GTK_TREE_VIEW(tview), GTK_TREE_MODEL(self->gtk_plugins));
-
- /* Setup auto update enable */
- gboolean auto_update = grits_prefs_get_boolean(self->prefs, "aweather/update_enab", NULL);
- GObject *action = aweather_gui_get_object(self, "update");
- gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), auto_update);
- g_signal_connect_swapped(self->viewer, "refresh", G_CALLBACK(set_update_timeout), self);
- set_update_timeout(self);
}
static void time_setup(AWeatherGui *self)
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)
{
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)
{
/* Misc, helpers */
site_setup(self);
+ menu_setup(self);
time_setup(self);
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",
g_signal_connect_swapped(self->viewer, "offline",
G_CALLBACK(gtk_toggle_action_set_active),
aweather_gui_get_object(self, "offline"));
+ g_signal_connect_swapped(self->viewer, "refresh",
+ G_CALLBACK(set_update_timeout), self);
g_signal_connect_swapped(self->viewer, "realize",
G_CALLBACK(aweather_gui_load_plugins), 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);
}
projects / aweather / blobdiff