{
g_debug("AWeatherGui: dispose");
AWeatherGui *gui = AWEATHER_GUI(gobject);
- g_object_unref(gui->view );
- g_object_unref(gui->builder);
+ if (gui->view) {
+ g_object_unref(gui->view);
+ gui->view = NULL;
+ }
+ if (gui->builder) {
+ /* Reparent to avoid double unrefs */
+ GtkWidget *body = aweather_gui_get_widget(gui, "body");
+ GtkWidget *window = aweather_gui_get_widget(gui, "window");
+ gtk_widget_reparent(body, window);
+ g_object_unref(gui->builder);
+ gui->builder = NULL;
+ }
+ if (gui->plugins) {
+ g_list_foreach(gui->plugins, (GFunc)g_object_unref, NULL);
+ g_list_free(gui->plugins);
+ gui->plugins = NULL;
+ }
+ //for (GList *cur = gui->plugins; cur; cur = cur->next)
+ // g_object_unref(cur->data);
G_OBJECT_CLASS(aweather_gui_parent_class)->dispose(gobject);
}
static void aweather_gui_finalize(GObject *gobject)
{
g_debug("AWeatherGui: finalize");
G_OBJECT_CLASS(aweather_gui_parent_class)->finalize(gobject);
+ gtk_main_quit();
+
}
static void aweather_gui_class_init(AWeatherGuiClass *klass)
{
/*************
* Callbacks *
*************/
-gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *gui)
+gboolean on_drawing_button_press(GtkWidget *widget, GdkEventButton *event, AWeatherGui *gui)
+{
+ g_debug("AWeatherGui: on_drawing_button_press - Grabbing focus");
+ GtkWidget *drawing = aweather_gui_get_widget(gui, "drawing");
+ gtk_widget_grab_focus(drawing);
+ return TRUE;
+}
+gboolean on_drawing_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *gui)
{
- g_debug("AWeatherGui: on_key_press - key=%x, state=%x", event->keyval, event->state);
+ g_debug("AWeatherGui: on_drawing_key_press - key=%x, state=%x",
+ event->keyval, event->state);
AWeatherView *view = aweather_gui_get_view(gui);
double x,y,z;
aweather_view_get_location(view, &x, &y, &z);
+ guint kv = event->keyval;
+ if (kv == GDK_Right || kv == GDK_l) aweather_view_pan(view, z/10, 0, 0);
+ else if (kv == GDK_Left || kv == GDK_h) aweather_view_pan(view, -z/10, 0, 0);
+ else if (kv == GDK_Up || kv == GDK_k) aweather_view_pan(view, 0, z/10, 0);
+ else if (kv == GDK_Down || kv == GDK_j) aweather_view_pan(view, 0, -z/10, 0);
+ else if (kv == GDK_minus || kv == GDK_o) aweather_view_zoom(view, 10./9);
+ else if (kv == GDK_plus || kv == GDK_i) aweather_view_zoom(view, 9./10);
+ return TRUE;
+}
+
+gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *gui)
+{
+ g_debug("AWeatherGui: on_gui_key_press - key=%x, state=%x",
+ event->keyval, event->state);
+ AWeatherView *view = aweather_gui_get_view(gui);
if (event->keyval == GDK_q)
- gtk_main_quit();
+ gtk_widget_destroy(GTK_WIDGET(gui));
else if (event->keyval == GDK_r && event->state & GDK_CONTROL_MASK)
aweather_view_refresh(view);
- else if (event->keyval == GDK_Right) aweather_view_pan(view, z/10, 0, 0);
- else if (event->keyval == GDK_Left) aweather_view_pan(view, -z/10, 0, 0);
- else if (event->keyval == GDK_Up) aweather_view_pan(view, 0, z/10, 0);
- else if (event->keyval == GDK_Down) aweather_view_pan(view, 0, -z/10, 0);
- else if (event->keyval == GDK_minus) aweather_view_zoom(view, 10./9);
- else if (event->keyval == GDK_plus) aweather_view_zoom(view, 9./10);
else if (event->keyval == GDK_Tab || event->keyval == GDK_ISO_Left_Tab) {
GtkNotebook *tabs = GTK_NOTEBOOK(aweather_gui_get_widget(gui, "tabs"));
gint num_tabs = gtk_notebook_get_n_pages(tabs);
else
gtk_notebook_set_current_page(tabs, (cur_tab+1)%num_tabs);
};
- return TRUE;
+ return FALSE;
+}
+
+void on_quit(GtkMenuItem *menu, AWeatherGui *gui)
+{
+ gtk_widget_destroy(GTK_WIDGET(gui));
}
-void on_refresh(GtkToolButton *button, AWeatherGui *gui)
+void on_offline(GtkToggleAction *action, AWeatherGui *gui)
{
AWeatherView *view = aweather_gui_get_view(gui);
- aweather_view_refresh(view);
+ aweather_view_set_offline(view,
+ gtk_toggle_action_get_active(action));
}
-void on_zoomin(GtkToolButton *button, AWeatherGui *gui)
+void on_zoomin(GtkAction *action, AWeatherGui *gui)
{
AWeatherView *view = aweather_gui_get_view(gui);
aweather_view_zoom(view, 3./4);
}
-void on_zoomout(GtkToolButton *button, AWeatherGui *gui)
+void on_zoomout(GtkAction *action, AWeatherGui *gui)
{
AWeatherView *view = aweather_gui_get_view(gui);
aweather_view_zoom(view, 4./3);
}
+void on_refresh(GtkAction *action, AWeatherGui *gui)
+{
+ AWeatherView *view = aweather_gui_get_view(gui);
+ aweather_view_refresh(view);
+}
+
+void on_about(GtkAction *action, AWeatherGui *gui)
+{
+ // TODO: use gtk_widget_hide_on_delete()
+ GError *error = NULL;
+ GtkBuilder *builder = gtk_builder_new();
+ if (!gtk_builder_add_from_file(builder, DATADIR "/aweather/about.ui", &error))
+ g_error("Failed to create gtk builder: %s", error->message);
+ gtk_builder_connect_signals(builder, NULL);
+ GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
+ gtk_window_set_transient_for(GTK_WINDOW(window),
+ GTK_WINDOW(aweather_gui_get_widget(gui, "window")));
+ gtk_widget_show_all(window);
+ g_object_unref(builder);
+}
+
void on_time_changed(GtkTreeView *view, GtkTreePath *path,
GtkTreeViewColumn *column, AWeatherGui *gui)
{
return FALSE;
}
-void on_about(GtkMenuItem *item, AWeatherGui *gui)
-{
- GError *error = NULL;
- GtkBuilder *builder = gtk_builder_new();
- if (!gtk_builder_add_from_file(builder, DATADIR "/aweather/about.xml", &error))
- g_error("Failed to create gtk builder: %s", error->message);
- gtk_builder_connect_signals(builder, NULL);
- GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
- gtk_window_set_transient_for(GTK_WINDOW(window),
- GTK_WINDOW(aweather_gui_get_widget(gui, "window")));
- gtk_widget_show_all(window);
- g_object_unref(builder);
-}
-
void on_location_changed(AWeatherView *view,
gdouble x, gdouble y, gdouble z, AWeatherGui *gui)
{
}
/* TODO: replace the code in these with `gtk_tree_model_find' utility */
-static void update_time_widget(AWeatherView *view, char *time, AWeatherGui *gui)
+static void update_time_widget(AWeatherView *view, const char *time, AWeatherGui *gui)
{
- g_debug("AWeatherGui: update_time_widget");
+ g_debug("AWeatherGui: update_time_widget - time=%s", time);
GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
GtkTreeModel *model = GTK_TREE_MODEL(gtk_tree_view_get_model(tview));
for (int i = 0; i < gtk_tree_model_iter_n_children(model, NULL); i++) {
gtk_tree_model_iter_nth_child(model, &iter2, &iter1, i);
char *text;
gtk_tree_model_get(model, &iter2, 1, &text, -1);
+ if (text == NULL)
+ continue;
if (g_str_equal(text, site)) {
g_signal_handlers_block_by_func(combo,
G_CALLBACK(on_site_changed), gui);
static void site_setup(AWeatherGui *gui)
{
GtkTreeIter state, city;
- GtkTreeStore *store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+ GtkTreeStore *store = GTK_TREE_STORE(aweather_gui_get_object(gui, "sites"));
for (int i = 0; cities[i].label; i++) {
if (cities[i].type == LOCATION_STATE) {
gtk_tree_store_append(store, &state, NULL);
}
}
- GtkWidget *combo = aweather_gui_get_widget(gui, "site");
- GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
- gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, FALSE);
- gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer, "text", 0, NULL);
- gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store));
- gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), renderer,
- combo_sensitive, NULL, NULL);
- g_object_unref(renderer);
- g_object_unref(store);
+ GtkWidget *combo = aweather_gui_get_widget(gui, "site");
+ GObject *renderer = aweather_gui_get_object(gui, "site_rend");
+ gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo),
+ GTK_CELL_RENDERER(renderer), combo_sensitive, NULL, NULL);
AWeatherView *aview = aweather_gui_get_view(gui);
g_signal_connect(aview, "site-changed", G_CALLBACK(update_site_widget), gui);
static void time_setup(AWeatherGui *gui)
{
- GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
- GtkTreeModel *store = GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_STRING));
- gtk_tree_view_set_model(tview, store);
-
- GtkCellRenderer *rend = gtk_cell_renderer_text_new();
- GtkTreeViewColumn *col = gtk_tree_view_column_new_with_attributes(
+ GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
+ GtkCellRenderer *rend = gtk_cell_renderer_text_new();
+ GtkTreeViewColumn *col = gtk_tree_view_column_new_with_attributes(
"Time", rend, "text", 0, NULL);
+
gtk_tree_view_append_column(tview, col);
+ g_object_set(rend, "size-points", 8.0, NULL);
AWeatherView *aview = aweather_gui_get_view(gui);
g_signal_connect(aview, "time-changed", G_CALLBACK(update_time_widget), gui);
self->view = aweather_view_new();
self->builder = gtk_builder_new();
- if (!gtk_builder_add_from_file(self->builder, DATADIR "/aweather/main.xml", &error))
+ if (!gtk_builder_add_from_file(self->builder, DATADIR "/aweather/main.ui", &error))
g_error("Failed to create gtk builder: %s", error->message);
gtk_builder_connect_signals(self->builder, self);
- g_signal_connect(self, "delete-event", G_CALLBACK(gtk_main_quit), self);
- g_signal_connect(self, "key-press-event", G_CALLBACK(on_key_press), self);
+ g_signal_connect(self, "key-press-event", G_CALLBACK(on_gui_key_press), self);
gtk_widget_reparent(aweather_gui_get_widget(self, "body"), GTK_WIDGET(self));
/* Load components */
}
GtkBuilder *aweather_gui_get_builder(AWeatherGui *gui)
{
+ g_debug("AWeatherGui: get_builder");
g_assert(AWEATHER_IS_GUI(gui));
return gui->builder;
}
GtkWidget *aweather_gui_get_widget(AWeatherGui *gui, const gchar *name)
{
+ g_debug("AWeatherGui: get_widget - name=%s", name);
g_assert(AWEATHER_IS_GUI(gui));
GObject *widget = gtk_builder_get_object(gui->builder, name);
if (!GTK_IS_WIDGET(widget))
g_error("Failed to get widget `%s'", name);
return GTK_WIDGET(widget);
}
+GObject *aweather_gui_get_object(AWeatherGui *gui, const gchar *name)
+{
+ g_debug("AWeatherGui: get_widget - name=%s", name);
+ g_assert(AWEATHER_IS_GUI(gui));
+ return gtk_builder_get_object(gui->builder, name);
+}
void aweather_gui_register_plugin(AWeatherGui *gui, AWeatherPlugin *plugin)
{
g_debug("AWeatherGui: register_plugin");
projects / grits / blobdiff