From d706e67c559f82a5cd2300b35b23812fd08832c5 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sat, 24 Oct 2009 15:55:04 +0000 Subject: [PATCH] Rewrite Glade ids using prefixes - id=/foo_\d/ is a layout container - Prefix ids with their parents (e.g. main_menu_offline) --- data/main.ui | 173 +++++++++++++++++++++++---------------------- src/aweather-gui.c | 38 +++++----- src/main.c | 2 +- 3 files changed, 107 insertions(+), 106 deletions(-) diff --git a/data/main.ui b/data/main.ui index f37784b..18d705b 100644 --- a/data/main.ui +++ b/data/main.ui @@ -1,7 +1,7 @@ - + @@ -27,46 +27,47 @@ AWeather - + True + vertical - + True - + True _File True - + True - + True Work offline - True offline + True - + True - True prefs + True True True - + True - + True - True quit + True True True @@ -76,41 +77,41 @@ - + True _View True - + True - + True - True zoomin + True True True - + True - True zoomout + True True True - + True - + True - True refresh + True True True @@ -120,18 +121,18 @@ - + True _Help True - + True - + True - True about + True True True @@ -147,14 +148,14 @@ - + True icons - + True - True zoomin + True False @@ -162,10 +163,10 @@ - + True - True zoomout + True False @@ -173,7 +174,7 @@ - + True @@ -182,10 +183,10 @@ - + True - True offline + True toolbutton3 True @@ -195,10 +196,10 @@ - + True - True refresh + True True @@ -207,7 +208,7 @@ - + True @@ -216,10 +217,10 @@ - + True - True prefs + True toolbutton1 True @@ -235,15 +236,15 @@ - + True True - + True True - + True placeholder (it's buggy with blank placeholders) @@ -255,23 +256,24 @@ - + True + vertical 5 - + True True True True - + True sites True - + 0 @@ -279,7 +281,7 @@ - + True <b>Site</b> True @@ -292,19 +294,19 @@ - + True True True - + True True never automatic in - + True True times @@ -315,7 +317,7 @@ - + True <b>Time</b> True @@ -339,7 +341,7 @@ - + True True bottom @@ -400,34 +402,34 @@ - + True vertical 2 - + True True - + True vertical - + True 0 none - + True 12 - + True vertical 5 - + Work offline True True @@ -440,11 +442,11 @@ - + True 5 - + True 0 Initial site @@ -455,12 +457,12 @@ - + True sites - + 0 @@ -476,11 +478,11 @@ - + True 5 - + True 0 NEXRAD URL @@ -491,7 +493,7 @@ - + True True ● @@ -507,11 +509,11 @@ - + True 5 - + True 0 Debug level @@ -522,11 +524,11 @@ - + True True ● - adjustment + prefs_general_log_adj True @@ -544,7 +546,7 @@ - + True <b>Preferences</b> True @@ -559,7 +561,7 @@ - + True General @@ -568,7 +570,7 @@ - + True True @@ -577,7 +579,7 @@ - + True Plugins @@ -592,12 +594,12 @@ - + True end - - gtk-close + + gtk-close True True True @@ -619,7 +621,7 @@ - button1 + prefs_action_close @@ -883,14 +885,15 @@ The hypothetical commands `show w' and `show c' should show the appropriate part - + True + vertical 2 - + True end @@ -903,17 +906,15 @@ The hypothetical commands `show w' and `show c' should show the appropriate part - + - - - + + + - + 8 1 - 1 - 1 diff --git a/src/aweather-gui.c b/src/aweather-gui.c index 0c3204d..88bd966 100644 --- a/src/aweather-gui.c +++ b/src/aweather-gui.c @@ -38,7 +38,7 @@ gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *se else if (event->keyval == GDK_r && event->state & GDK_CONTROL_MASK) gis_world_refresh(self->world); else if (event->keyval == GDK_Tab || event->keyval == GDK_ISO_Left_Tab) { - GtkNotebook *tabs = GTK_NOTEBOOK(aweather_gui_get_widget(self, "tabs")); + 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); if (event->state & GDK_SHIFT_MASK) @@ -71,7 +71,7 @@ void on_refresh(GtkAction *action, AWeatherGui *self) void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui *self) { - GtkWidget *tview = aweather_gui_get_widget(self, "plugins_view"); + GtkWidget *tview = aweather_gui_get_widget(self, "prefs_plugins_view"); GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(tview)); gboolean state; gchar *name; @@ -137,7 +137,7 @@ static gboolean gtk_tree_model_find_string(GtkTreeModel *model, static void update_time_widget(GisView *view, const char *time, AWeatherGui *self) { g_debug("AWeatherGui: update_time_widget - time=%s", time); - GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "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)) { @@ -154,7 +154,7 @@ static void update_time_widget(GisView *view, const char *time, AWeatherGui *sel static void update_site_widget(GisView *view, char *site, AWeatherGui *self) { g_debug("AWeatherGui: update_site_widget - site=%s", site); - GtkComboBox *combo = GTK_COMBO_BOX(aweather_gui_get_widget(self, "site")); + GtkComboBox *combo = GTK_COMBO_BOX(aweather_gui_get_widget(self, "main_site")); GtkTreeModel *model = GTK_TREE_MODEL(gtk_combo_box_get_model(combo)); GtkTreeIter iter; if (gtk_tree_model_find_string(model, &iter, NULL, 1, site)) { @@ -212,9 +212,9 @@ static void prefs_setup(AWeatherGui *self) gchar *nu = gis_prefs_get_string (self->prefs, "aweather/nexrad_url"); gint ll = gis_prefs_get_integer(self->prefs, "aweather/log_level"); gchar *is = gis_prefs_get_string (self->prefs, "aweather/initial_site"); - GtkWidget *nuw = aweather_gui_get_widget(self, "nexrad_url"); - GtkWidget *llw = aweather_gui_get_widget(self, "log_level"); - GtkWidget *isw = aweather_gui_get_widget(self, "initial_site"); + GtkWidget *nuw = aweather_gui_get_widget(self, "prefs_general_url"); + GtkWidget *llw = aweather_gui_get_widget(self, "prefs_general_log"); + GtkWidget *isw = aweather_gui_get_widget(self, "prefs_general_site"); if (nu) gtk_entry_set_text(GTK_ENTRY(nuw), nu), g_free(nu); if (ll) gtk_spin_button_set_value(GTK_SPIN_BUTTON(llw), ll); if (is) { @@ -225,7 +225,7 @@ static void prefs_setup(AWeatherGui *self) } /* Load Plugins */ - GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "plugins_view")); + GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "prefs_plugins_view")); GtkCellRenderer *rend1 = gtk_cell_renderer_text_new(); GtkCellRenderer *rend2 = gtk_cell_renderer_toggle_new(); GtkTreeViewColumn *col1 = gtk_tree_view_column_new_with_attributes( @@ -261,8 +261,8 @@ static void site_setup(AWeatherGui *self) } } - GtkWidget *combo = aweather_gui_get_widget(self, "site"); - GObject *renderer = aweather_gui_get_object(self, "site_rend"); + GtkWidget *combo = aweather_gui_get_widget(self, "main_site"); + GObject *renderer = aweather_gui_get_object(self, "main_site_rend"); gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), GTK_CELL_RENDERER(renderer), combo_sensitive, NULL, NULL); @@ -272,7 +272,7 @@ static void site_setup(AWeatherGui *self) static void time_setup(AWeatherGui *self) { - GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "time")); + 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( "Time", rend, "text", 0, NULL); @@ -295,7 +295,7 @@ static void update_times_gtk(AWeatherGui *self, GList *times) GRegex *regex = g_regex_new("^[A-Z]{4}_([0-9]{8}_[0-9]{4})$", 0, 0, NULL); // KLSX_20090622_2113 GMatchInfo *info; - GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "time")); + GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "main_time")); GtkListStore *lstore = GTK_LIST_STORE(gtk_tree_view_get_model(tview)); gtk_list_store_clear(lstore); GtkTreeIter iter; @@ -417,7 +417,7 @@ void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name) { GisPlugin *plugin = gis_plugins_load(self->plugins, name, self->world, self->view, self->opengl, self->prefs); - GtkWidget *config = aweather_gui_get_widget(self, "tabs"); + GtkWidget *config = aweather_gui_get_widget(self, "main_tabs"); GtkWidget *tab = gtk_label_new(name); GtkWidget *body = gis_plugin_get_config(plugin); gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab); @@ -426,7 +426,7 @@ void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name) } void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name) { - GtkWidget *config = aweather_gui_get_widget(self, "tabs"); + GtkWidget *config = aweather_gui_get_widget(self, "main_tabs"); guint n_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(config)); for (int i = 0; i < n_pages; i++) { g_debug("testing tab %d", i); @@ -463,10 +463,10 @@ static void aweather_gui_init(AWeatherGui *self) GError *error = NULL; if (!gtk_builder_add_from_file(self->builder, DATADIR "/aweather/main.ui", &error)) g_error("Failed to create gtk builder: %s", error->message); - gtk_widget_reparent(aweather_gui_get_widget(self, "body"), GTK_WIDGET(self)); - GtkWidget *hpaned = aweather_gui_get_widget(self, "hpaned"); - gtk_widget_destroy(gtk_paned_get_child1(GTK_PANED(hpaned))); - gtk_paned_pack1(GTK_PANED(hpaned), GTK_WIDGET(self->opengl), TRUE, FALSE); + gtk_widget_reparent(aweather_gui_get_widget(self, "main_body"), GTK_WIDGET(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->opengl), TRUE, FALSE); /* Plugins */ GtkTreeIter iter; @@ -510,7 +510,7 @@ static void aweather_gui_dispose(GObject *_self) AWeatherGui *self = AWEATHER_GUI(_self); if (self->builder) { /* Reparent to avoid double unrefs */ - GtkWidget *body = aweather_gui_get_widget(self, "body"); + 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); diff --git a/src/main.c b/src/main.c index 35a6ffb..09a3bfd 100644 --- a/src/main.c +++ b/src/main.c @@ -93,7 +93,7 @@ int main(int argc, char *argv[]) gis_world_set_offline(gui->world, offline); log_levels = (1 << (debug+1))-1; - GObject *action = aweather_gui_get_object(gui, "log_level"); + GObject *action = aweather_gui_get_object(gui, "prefs_general_log"); g_signal_connect(action, "changed", G_CALLBACK(on_log_level_changed), NULL); gtk_widget_show_all(GTK_WIDGET(gui)); -- 2.43.2