]> Pileus Git - aweather/blobdiff - src/aweather-gui.c
Win32 fixes and improvements
[aweather] / src / aweather-gui.c
index ef87c475317bcb40b5590aa3475dbdf0c73814d7..f93a2ea8c6f0ee9d864c24e312681f3ab4c08985 100644 (file)
@@ -29,7 +29,7 @@
 /*************
  * Callbacks *
  *************/
-gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *self)
+G_MODULE_EXPORT gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *self)
 {
        g_debug("AWeatherGui: on_gui_key_press - key=%x, state=%x",
                        event->keyval, event->state);
@@ -49,27 +49,27 @@ gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *se
        return FALSE;
 }
 
-void on_quit(GtkMenuItem *menu, AWeatherGui *self)
+G_MODULE_EXPORT void on_quit(GtkMenuItem *menu, AWeatherGui *self)
 {
        gtk_widget_destroy(GTK_WIDGET(self));
 }
 
-void on_zoomin(GtkAction *action, AWeatherGui *self)
+G_MODULE_EXPORT void on_zoomin(GtkAction *action, AWeatherGui *self)
 {
        gis_viewer_zoom(self->viewer, 3./4);
 }
 
-void on_zoomout(GtkAction *action, AWeatherGui *self)
+G_MODULE_EXPORT void on_zoomout(GtkAction *action, AWeatherGui *self)
 {
        gis_viewer_zoom(self->viewer, 4./3);
 }
 
-void on_refresh(GtkAction *action, AWeatherGui *self)
+G_MODULE_EXPORT void on_refresh(GtkAction *action, AWeatherGui *self)
 {
        gis_viewer_refresh(self->viewer);
 }
 
-void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui *self)
+G_MODULE_EXPORT void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui *self)
 {
        GtkWidget    *tview = aweather_gui_get_widget(self, "prefs_plugins_view");
        GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(tview));
@@ -87,16 +87,25 @@ void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui
        g_free(name);
 }
 
-void on_time_changed(GtkTreeView *view, GtkTreePath *path,
-               GtkTreeViewColumn *column, AWeatherGui *self)
+G_MODULE_EXPORT void on_time_changed(AWeatherGui *self)
 {
-       gchar *time;
-       GtkTreeIter iter;
-       GtkTreeModel *model = gtk_tree_view_get_model(view);
+       g_debug("AWeatherGui: on_time_changed");
+       struct tm tm = {};
+
+       GtkWidget *cal = aweather_gui_get_widget(self, "main_date_cal");
+       gtk_calendar_get_date(GTK_CALENDAR(cal), (guint*)&tm.tm_year,
+                       (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));
+       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, 0, &time, -1);
-       //gis_viewer_set_time(self->viewer, time);
-       g_free(time);
+       gtk_tree_model_get(model, &iter, 1, &tm.tm_hour, 2, &tm.tm_min, -1);
+
+       gis_viewer_set_time(self->viewer, mktime(&tm));
 }
 
 static gboolean gtk_tree_model_find_string(GtkTreeModel *model,
@@ -122,35 +131,48 @@ static gboolean gtk_tree_model_find_string(GtkTreeModel *model,
        return FALSE;
 }
 
-static void update_time_widget(GisViewer *viewer, const char *time, AWeatherGui *self)
+static void update_time_widget(GisViewer *viewer, time_t time, AWeatherGui *self)
 {
-       g_debug("AWeatherGui: update_time_widget - time=%s", time);
-       GtkTreeView  *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "main_time"));
-       GtkTreeModel *model = GTK_TREE_MODEL(gtk_tree_view_get_model(tview));
-       GtkTreeIter iter;
-       if (gtk_tree_model_find_string(model, &iter, NULL, 0, time)) {
-               GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
-               gtk_tree_view_set_cursor(tview, path, NULL, FALSE);
-               gtk_tree_path_free(path);
-       }
+       g_debug("AWeatherGui: update_time_widget - time=%u", (guint)time);
+       // FIXME
+       //GtkTreeView  *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "main_time"));
+       //GtkTreeModel *model = GTK_TREE_MODEL(gtk_tree_view_get_model(tview));
+       //GtkTreeIter iter;
+       //if (gtk_tree_model_find_string(model, &iter, NULL, 0, time)) {
+       //      GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
+       //      gtk_tree_view_set_cursor(tview, path, NULL, FALSE);
+       //      gtk_tree_path_free(path);
+       //}
 }
 
 /* Prefs callbacks */
-void on_offline(GtkToggleAction *action, AWeatherGui *self)
+G_MODULE_EXPORT void on_offline(GtkToggleAction *action, AWeatherGui *self)
 {
        gboolean value = gtk_toggle_action_get_active(action);
        g_debug("AWeatherGui: on_offline - offline=%d", value);
        gis_viewer_set_offline(self->viewer, value);
 }
 
-void on_nexrad_url_changed(GtkEntry *entry, AWeatherGui *self)
+G_MODULE_EXPORT void on_initial_site_changed(GtkComboBox *combo, AWeatherGui *self)
+{
+       gchar *code;
+       GtkTreeIter iter;
+       GtkTreeModel *model = gtk_combo_box_get_model(combo);
+       gtk_combo_box_get_active_iter(combo, &iter);
+       gtk_tree_model_get(model, &iter, 0, &code, -1);
+       g_debug("AWeatherGui: on_initial_site_changed - code=%s", code);
+       gis_prefs_set_string(self->prefs, "aweather/initial_site", code);
+       g_free(code);
+}
+
+G_MODULE_EXPORT void on_nexrad_url_changed(GtkEntry *entry, AWeatherGui *self)
 {
        const gchar *text = gtk_entry_get_text(entry);
        g_debug("AWeatherGui: on_nexrad_url_changed - url=%s", text);
        gis_prefs_set_string(self->prefs, "aweather/nexrad_url", text);
 }
 
-int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
+G_MODULE_EXPORT int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 {
        gint value = gtk_spin_button_get_value_as_int(spinner);
        g_debug("AWeatherGui: on_log_level_changed - %p, level=%d", self, value);
@@ -162,6 +184,34 @@ int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 /*****************
  * Setup helpers *
  *****************/
+static void combo_sensitive(GtkCellLayout *cell_layout, GtkCellRenderer *cell,
+               GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+{
+       gboolean sensitive = !gtk_tree_model_iter_has_child(tree_model, iter);
+       g_object_set(cell, "sensitive", sensitive, NULL);
+}
+static void site_setup(AWeatherGui *self)
+{
+       GtkTreeIter state, city;
+       GtkTreeStore *store = GTK_TREE_STORE(aweather_gui_get_object(self, "sites"));
+       for (int i = 0; cities[i].type; i++) {
+               if (cities[i].type == LOCATION_STATE) {
+                       gtk_tree_store_append(store, &state, NULL);
+                       gtk_tree_store_set   (store, &state, 0, cities[i].code,
+                                                            1, cities[i].name, -1);
+               } else {
+                       gtk_tree_store_append(store, &city, &state);
+                       gtk_tree_store_set   (store, &city, 0, cities[i].code,
+                                                           1, cities[i].name, -1);
+               }
+       }
+
+       GtkWidget *combo    = aweather_gui_get_widget(self, "prefs_general_site");
+       GObject   *renderer = aweather_gui_get_object(self, "prefs_general_site_rend");
+       gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo),
+                       GTK_CELL_RENDERER(renderer), combo_sensitive, NULL, NULL);
+}
+
 static void prefs_setup(AWeatherGui *self)
 {
        /* Set values */
@@ -176,7 +226,7 @@ static void prefs_setup(AWeatherGui *self)
        if (is) {
                GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(isw));
                GtkTreeIter iter;
-               if (gtk_tree_model_find_string(model, &iter, NULL, 1, is))
+               if (gtk_tree_model_find_string(model, &iter, NULL, 0, is))
                        gtk_combo_box_set_active_iter(GTK_COMBO_BOX(isw), &iter);
        }
 
@@ -195,23 +245,34 @@ static void prefs_setup(AWeatherGui *self)
        gtk_tree_view_set_model(GTK_TREE_VIEW(tview), GTK_TREE_MODEL(self->gtk_plugins));
 }
 
-static void combo_sensitive(GtkCellLayout *cell_layout, GtkCellRenderer *cell,
-               GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
-{
-       gboolean sensitive = !gtk_tree_model_iter_has_child(tree_model, iter);
-       g_object_set(cell, "sensitive", sensitive, NULL);
-}
-
 static void time_setup(AWeatherGui *self)
 {
-       GtkTreeView       *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "main_time"));
-       GtkCellRenderer   *rend  = gtk_cell_renderer_text_new();
-       GtkTreeViewColumn *col   = gtk_tree_view_column_new_with_attributes(
+       /* Setup UI */
+       GtkCalendar       *cal  = GTK_CALENDAR(aweather_gui_get_widget(self, "main_date_cal"));
+       GtkTreeView       *view = GTK_TREE_VIEW(aweather_gui_get_widget(self, "main_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);
+       gtk_tree_view_append_column(view, col);
        g_object_set(rend, "size-points", 8.0, NULL);
 
+       /* Add times */
+       GtkListStore *store = GTK_LIST_STORE(aweather_gui_get_object(self, "times"));
+       for (int hour = 0; hour < 24; hour++) {
+               for (int min = 0; min < 60; min += 10) {
+                       GtkTreeIter iter;
+                       gchar *str = g_strdup_printf("%02d:%02d", hour, min);
+                       gtk_list_store_append(store, &iter);
+                       gtk_list_store_set(store, &iter, 0, str, 1, hour, 2, min, -1);
+                       g_free(str);
+               }
+       }
+
+       /* Connect signals */
+       g_signal_connect_swapped(cal,  "day-selected-double-click",
+                       G_CALLBACK(on_time_changed), self);
+       g_signal_connect_swapped(view, "row-activated",
+                       G_CALLBACK(on_time_changed), self);
        g_signal_connect(self->viewer, "time-changed",
                        G_CALLBACK(update_time_widget), self);
 }
@@ -309,6 +370,7 @@ static void aweather_gui_init(AWeatherGui *self)
        GtkWidget *paned = aweather_gui_get_widget(self, "main_paned");
        gtk_widget_destroy(gtk_paned_get_child1(GTK_PANED(paned)));
        gtk_paned_pack1(GTK_PANED(paned), GTK_WIDGET(self->viewer), TRUE, FALSE);
+       gtk_widget_set_size_request(GTK_WIDGET(self->viewer), 600, 400);
        gtk_widget_show_all(GTK_WIDGET(self));
 
        /* Plugins */
@@ -327,6 +389,7 @@ static void aweather_gui_init(AWeatherGui *self)
        }
 
        /* Misc, helpers */
+       site_setup(self);
        time_setup(self);
        prefs_setup(self);
 
@@ -349,22 +412,14 @@ static void aweather_gui_dispose(GObject *_self)
 {
        g_debug("AWeatherGui: dispose");
        AWeatherGui *self = AWEATHER_GUI(_self);
-       if (self->builder) {
-               /* Reparent to avoid double unrefs */
-               GtkWidget *body   = aweather_gui_get_widget(self, "main_body");
-               GtkWidget *window = aweather_gui_get_widget(self, "main_window");
-               gtk_widget_reparent(body, window);
-               g_object_unref(self->builder);
-               self->builder = NULL;
-       }
-       if (self->viewer) {
-               g_object_unref(self->viewer);
-               self->viewer = NULL;
-       }
        if (self->plugins) {
                gis_plugins_free(self->plugins);
                self->plugins = NULL;
        }
+       if (self->builder) {
+               g_object_unref(self->builder);
+               self->builder = NULL;
+       }
        if (self->prefs) {
                g_object_unref(self->prefs);
                self->prefs = NULL;