re-enabled support of layout changes

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index 9bc6743..b41c956 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -173,7 +173,7 @@ static void on_slog_enabled_cb(GConfClient *client,
 
 void ui_window_create(struct ui_psensor *ui)
 {
-       GtkWidget *window, *menubar;
+       GtkWidget *window;
        GdkPixbuf *icon;
        GtkIconTheme *icon_theme;
        struct config *cfg;
@@ -225,19 +225,34 @@ void ui_window_create(struct ui_psensor *ui)
        gtk_window_set_keep_below(GTK_WINDOW(window),
                                  cfg->window_keep_below_enabled);
 
-       /* main box */
-       menubar = GTK_WIDGET(gtk_builder_get_object(builder, "menu_bar"));
-
+       ui->menu_bar = GTK_WIDGET(gtk_builder_get_object(builder, "menu_bar"));
        ui->main_box = GTK_WIDGET(gtk_builder_get_object(builder, "main_box"));
-       gtk_box_pack_start(GTK_BOX(ui->main_box), menubar,
-                          FALSE, TRUE, 0);
-
-       gtk_container_add(GTK_CONTAINER(window), ui->main_box);
-
+       ui->popup_menu = GTK_WIDGET(gtk_builder_get_object(builder,
+                                                          "popup_menu"));
+       g_object_ref(G_OBJECT(ui->popup_menu));
        ui->main_window = window;
-       ui->menu_bar = menubar;
-
+       ui->w_graph = GTK_WIDGET(gtk_builder_get_object(builder,
+                                                       "graph"));
+       ui_graph_create(ui);
+
+       ui->sensor_box = GTK_PANED(gtk_builder_get_object(builder,
+                                                         "sensor_box"));
+       ui->sensors_store = GTK_LIST_STORE(gtk_builder_get_object
+                                          (builder, "sensors_store"));
+       ui->sensors_tree = GTK_TREE_VIEW(gtk_builder_get_object
+                                        (builder, "sensors_tree"));
+       ui->sensors_scrolled_tree
+               = GTK_SCROLLED_WINDOW(gtk_builder_get_object
+                                     (builder, "sensors_scrolled_tree"));
+
+       ui_sensorlist_create(ui);
+
+       log_debug("ui_window_create(): show_all");
        gtk_widget_show_all(ui->main_box);
+
+       g_object_unref(G_OBJECT(builder));
+
+       log_debug("ui_window_create() ends");
 }
 
 static void menu_bar_show(unsigned int show, struct ui_psensor *ui)
@@ -251,53 +266,56 @@ static void menu_bar_show(unsigned int show, struct ui_psensor *ui)
 void ui_window_update(struct ui_psensor *ui)
 {
        struct config *cfg;
-       int init = 1;
 
-       cfg = ui->config;
+       log_debug("ui_window_update()");
 
-       if (ui->sensor_box) {
-               g_object_ref(GTK_WIDGET(ui->ui_sensorlist->widget));
+       cfg = ui->config;
 
-               gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
-                                    ui->ui_sensorlist->widget);
+       g_object_ref(GTK_WIDGET(ui->sensors_scrolled_tree));
+       g_object_ref(GTK_WIDGET(ui->w_graph));
 
-               gtk_container_remove(GTK_CONTAINER(ui->main_box),
-                                    ui->sensor_box);
+       gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
+                            GTK_WIDGET(ui->sensors_scrolled_tree));
 
-               ui->w_graph = ui_graph_create(ui);
+       gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
+                            ui->w_graph);
 
-               init = 0;
-       }
+       gtk_container_remove(GTK_CONTAINER(ui->main_box),
+                            GTK_WIDGET(ui->sensor_box));
 
        if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT
            || cfg->sensorlist_position == SENSORLIST_POSITION_LEFT)
-               ui->sensor_box = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
+               ui->sensor_box
+                       = GTK_PANED(gtk_paned_new(GTK_ORIENTATION_HORIZONTAL));
        else
-               ui->sensor_box = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
+               ui->sensor_box
+                       = GTK_PANED(gtk_paned_new(GTK_ORIENTATION_VERTICAL));
 
-       gtk_box_pack_end(GTK_BOX(ui->main_box), ui->sensor_box, TRUE, TRUE, 2);
+       gtk_box_pack_end(GTK_BOX(ui->main_box),
+                        GTK_WIDGET(ui->sensor_box), TRUE, TRUE, 2);
 
        if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT
            || cfg->sensorlist_position == SENSORLIST_POSITION_BOTTOM) {
-               gtk_paned_pack1(GTK_PANED(ui->sensor_box),
+               gtk_paned_pack1(ui->sensor_box,
                                GTK_WIDGET(ui->w_graph), TRUE, TRUE);
-               gtk_paned_pack2(GTK_PANED(ui->sensor_box),
-                               ui->ui_sensorlist->widget, FALSE, TRUE);
+               gtk_paned_pack2(ui->sensor_box,
+                               GTK_WIDGET(ui->sensors_scrolled_tree),
+                               FALSE, TRUE);
        } else {
-               gtk_paned_pack1(GTK_PANED(ui->sensor_box),
-                               ui->ui_sensorlist->widget, FALSE, TRUE);
-               gtk_paned_pack2(GTK_PANED(ui->sensor_box),
+               gtk_paned_pack1(ui->sensor_box,
+                               GTK_WIDGET(ui->sensors_scrolled_tree),
+                               FALSE, TRUE);
+               gtk_paned_pack2(ui->sensor_box,
                                GTK_WIDGET(ui->w_graph), TRUE, TRUE);
        }
 
        if (cfg->window_restore_enabled)
-               gtk_paned_set_position(GTK_PANED(ui->sensor_box),
-                                      ui->config->window_divider_pos);
+               gtk_paned_set_position(ui->sensor_box, cfg->window_divider_pos);
 
-       if (!init)
-               g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget));
+       g_object_unref(GTK_WIDGET(ui->sensors_scrolled_tree));
+       g_object_unref(GTK_WIDGET(ui->w_graph));
 
-       gtk_widget_show_all(ui->sensor_box);
+       gtk_widget_show_all(GTK_WIDGET(ui->sensor_box));
 
        if (cfg->menu_bar_disabled)
                menu_bar_show(0, ui);