[gnome-system-monitor] Do not use show_all for the main window, use show for widgets as required



commit 0213b57a9107c63a3ab7254af63df9a980a57f6c
Author: Robert Roth <robert roth off gmail com>
Date:   Wed Jul 31 01:35:56 2013 +0300

    Do not use show_all for the main window, use show for widgets as required

 src/disks.cpp          |    4 ++--
 src/gsm_color_button.c |    2 +-
 src/interface.cpp      |   22 +++++++++++++---------
 src/load-graph.cpp     |   10 ++++++++++
 src/proctable.cpp      |    2 ++
 5 files changed, 28 insertions(+), 12 deletions(-)
---
diff --git a/src/disks.cpp b/src/disks.cpp
index e01c66a..3df5e9e 100644
--- a/src/disks.cpp
+++ b/src/disks.cpp
@@ -459,7 +459,7 @@ create_disk_view(ProcmanApp *app, GtkBuilder *builder)
 
     /* numeric sort */
 
-    procman_get_tree_state(app->settings, disk_tree,
+    procman_get_tree_state (app->settings, disk_tree,
                            "disktreenew");
 
     g_signal_connect (G_OBJECT(disk_tree), "destroy",
@@ -468,5 +468,5 @@ create_disk_view(ProcmanApp *app, GtkBuilder *builder)
 
     g_signal_connect (G_OBJECT(disk_tree), "columns-changed",
                       G_CALLBACK(cb_disk_columns_changed), app);
-
+    gtk_widget_show (disk_tree);
 }
diff --git a/src/gsm_color_button.c b/src/gsm_color_button.c
index a13e270..1aa49d9 100644
--- a/src/gsm_color_button.c
+++ b/src/gsm_color_button.c
@@ -683,7 +683,7 @@ GtkWidget *
 gsm_color_button_new (const GdkRGBA * color, guint type)
 {
   return g_object_new (GSM_TYPE_COLOR_BUTTON, "color", color, "type", type,
-                      NULL);
+                              "visible", TRUE, NULL);
 }
 
 static void
diff --git a/src/interface.cpp b/src/interface.cpp
index 044abc2..f96efb0 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -177,6 +177,7 @@ create_sys_view (ProcmanApp *app, GtkBuilder * builder)
         GtkWidget *temp_hbox;
 
         temp_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+        gtk_widget_show (temp_hbox);
         if (i < cols) {
             gtk_grid_insert_column(GTK_GRID(cpu_table), i%cols);
         }
@@ -199,11 +200,14 @@ create_sys_view (ProcmanApp *app, GtkBuilder * builder)
         gsm_color_button_set_title(GSM_COLOR_BUTTON(color_picker), title_text);
         g_free(title_text);
         gtk_box_pack_start (GTK_BOX (temp_hbox), label, FALSE, FALSE, 6);
+        gtk_widget_show (label);
         g_free (label_text);
 
         cpu_label = gtk_label_new (NULL);
+
         gtk_misc_set_alignment (GTK_MISC (cpu_label), 0.0, 0.5);
         gtk_box_pack_start (GTK_BOX (temp_hbox), cpu_label, FALSE, FALSE, 0);
+        gtk_widget_show (cpu_label);
         load_graph_get_labels(cpu_graph)->cpu[i] = cpu_label;
 
     }
@@ -294,20 +298,20 @@ create_sys_view (ProcmanApp *app, GtkBuilder * builder)
     gtk_grid_attach_next_to (GTK_GRID (table),  load_graph_get_labels(net_graph)->net_out_total, label, 
GTK_POS_RIGHT, 1, 1);
 
     app->net_graph = net_graph;
-    g_free(title_template);
+    g_free (title_template);
 
     cpu_exp = GTK_WIDGET (gtk_builder_get_object (builder, "cpu_exp"));
     mem_exp = GTK_WIDGET (gtk_builder_get_object (builder, "mem_exp"));
     net_exp = GTK_WIDGET (gtk_builder_get_object (builder, "net_exp"));
 
-    g_object_bind_property(cpu_exp, "expanded", cpu_graph_box, "visible", G_BINDING_SYNC_CREATE);
-    g_object_bind_property(mem_exp, "expanded", mem_graph_box, "visible", G_BINDING_SYNC_CREATE);
-    g_object_bind_property(net_exp, "expanded", net_graph_box, "visible", G_BINDING_SYNC_CREATE);
+    g_object_bind_property (cpu_exp, "expanded", cpu_graph_box, "visible", G_BINDING_SYNC_CREATE);
+    g_object_bind_property (mem_exp, "expanded", mem_graph_box, "visible", G_BINDING_SYNC_CREATE);
+    g_object_bind_property (net_exp, "expanded", net_graph_box, "visible", G_BINDING_SYNC_CREATE);
+
+    g_settings_bind (app->settings, "show-cpu", cpu_exp, "expanded", G_SETTINGS_BIND_DEFAULT);
+    g_settings_bind (app->settings, "show-mem", mem_exp, "expanded", G_SETTINGS_BIND_DEFAULT);
+    g_settings_bind (app->settings, "show-network", net_exp, "expanded", G_SETTINGS_BIND_DEFAULT);
 
-    g_settings_bind(app->settings, "show-cpu", cpu_exp, "expanded", G_SETTINGS_BIND_DEFAULT);
-    g_settings_bind(app->settings, "show-mem", mem_exp, "expanded", G_SETTINGS_BIND_DEFAULT);
-    g_settings_bind(app->settings, "show-network", net_exp, "expanded", G_SETTINGS_BIND_DEFAULT);
-    
 }
 
 static void
@@ -636,7 +640,7 @@ create_main_window (ProcmanApp *app)
     g_action_change_state (action,
                            g_settings_get_value (app->settings, "show-whose-processes"));
 
-    gtk_widget_show_all(main_window);
+    gtk_widget_show (main_window);
     
     update_page_activities (app);
 
diff --git a/src/load-graph.cpp b/src/load-graph.cpp
index c456029..a1539e8 100644
--- a/src/load-graph.cpp
+++ b/src/load-graph.cpp
@@ -737,8 +737,10 @@ LoadGraph::LoadGraph(guint type)
             n = 2;
             labels.memory = gtk_label_new(NULL);
             gtk_misc_set_alignment (GTK_MISC (labels.memory), 0.0, 0.5);
+            gtk_widget_show (labels.memory);
             labels.swap = gtk_label_new(NULL);
             gtk_misc_set_alignment (GTK_MISC (labels.swap), 0.0, 0.5);
+            gtk_widget_show (labels.swap);
             break;
 
         case LOAD_GRAPH_NET:
@@ -748,15 +750,23 @@ LoadGraph::LoadGraph(guint type)
             labels.net_in = gtk_label_new(NULL);
             gtk_label_set_width_chars(GTK_LABEL(labels.net_in), 15);
             gtk_misc_set_alignment (GTK_MISC (labels.net_in), 1.0, 0.5);
+            gtk_widget_show (labels.net_in);
+
             labels.net_in_total = gtk_label_new(NULL);
             gtk_misc_set_alignment (GTK_MISC (labels.net_in_total), 1.0, 0.5);
             gtk_label_set_width_chars(GTK_LABEL(labels.net_in_total), 15);
+            gtk_widget_show (labels.net_in_total);
+
             labels.net_out = gtk_label_new(NULL);
             gtk_misc_set_alignment (GTK_MISC (labels.net_out), 1.0, 0.5);
             gtk_label_set_width_chars(GTK_LABEL(labels.net_out), 15);
+            gtk_widget_show (labels.net_out);
+
             labels.net_out_total = gtk_label_new(NULL);
             gtk_misc_set_alignment (GTK_MISC (labels.net_out_total), 1.0, 0.5);
             gtk_label_set_width_chars(GTK_LABEL(labels.net_out_total), 15);
+            gtk_widget_show (labels.net_out_total);
+
             break;
     }
 
diff --git a/src/proctable.cpp b/src/proctable.cpp
index 0f34935..17b05d8 100644
--- a/src/proctable.cpp
+++ b/src/proctable.cpp
@@ -576,6 +576,8 @@ proctable_new (ProcmanApp * const app)
     g_signal_connect (G_OBJECT(proctree), "columns-changed",
                       G_CALLBACK(cb_columns_changed), app);
 
+    gtk_widget_show (proctree);
+
     return proctree;
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]