[gnome-system-monitor] Remove deprecated GtkAlignments.



commit 343255e5f82b8e5df7ae5fcf5f757bf2e0c30035
Author: Benoit Dejean <bdejean gmail com>
Date:   Fri Sep 30 00:16:39 2016 +0200

    Remove deprecated GtkAlignments.

 data/interface.ui |   42 +++---------------------------------------
 src/interface.cpp |    8 +++-----
 2 files changed, 6 insertions(+), 44 deletions(-)
---
diff --git a/data/interface.ui b/data/interface.ui
index 13bb7e7..da23f79 100644
--- a/data/interface.ui
+++ b/data/interface.ui
@@ -468,49 +468,13 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="spacer">
-                                <property name="width_request">38</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">3</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">2</property>
-                              </packing>
+                              <placeholder/>
                             </child>
                             <child>
-                              <object class="GtkAlignment" id="receiving_picker_alignment">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="border_width">6</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">2</property>
-                              </packing>
+                              <placeholder/>
                             </child>
                             <child>
-                              <object class="GtkAlignment" id="sending_picker_alignment">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="border_width">6</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">4</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">2</property>
-                              </packing>
+                              <placeholder/>
                             </child>
                             <child>
                               <placeholder/>
diff --git a/src/interface.cpp b/src/interface.cpp
index 57ba4b1..a9f2752 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -175,7 +175,6 @@ create_sys_view (GsmApplication *app, GtkBuilder * builder)
     GtkLabel *label,*cpu_label;
     GtkGrid *table;
     GsmColorButton *color_picker;
-    GtkAlignment *picker_alignment;
     LoadGraph *cpu_graph, *mem_graph, *net_graph;
 
     gint i;
@@ -300,8 +299,8 @@ create_sys_view (GsmApplication *app, GtkBuilder * builder)
     title_text = g_strdup_printf(title_template, _("Receiving"));
     gsm_color_button_set_title(color_picker, title_text);
     g_free(title_text);
-    picker_alignment = GTK_ALIGNMENT (gtk_builder_get_object (builder, "receiving_picker_alignment"));
-    gtk_container_add (GTK_CONTAINER (picker_alignment), GTK_WIDGET (color_picker));
+
+    gtk_grid_attach (table, GTK_WIDGET (color_picker), 0, 0, 1, 2);
 
     label = GTK_LABEL (gtk_builder_get_object(builder, "receiving_label"));
     gtk_grid_attach_next_to (table, GTK_WIDGET (load_graph_get_labels(net_graph)->net_in), GTK_WIDGET 
(label), GTK_POS_RIGHT, 1, 1);
@@ -316,8 +315,7 @@ create_sys_view (GsmApplication *app, GtkBuilder * builder)
     gsm_color_button_set_title(color_picker, title_text);
     g_free(title_text);
 
-    picker_alignment = GTK_ALIGNMENT (gtk_builder_get_object (builder, "sending_picker_alignment"));
-    gtk_container_add (GTK_CONTAINER (picker_alignment), GTK_WIDGET (color_picker));
+    gtk_grid_attach (table, GTK_WIDGET (color_picker), 4, 0, 1, 2);
 
     label = GTK_LABEL (gtk_builder_get_object(builder, "sending_label"));
     gtk_grid_attach_next_to (table, GTK_WIDGET (load_graph_get_labels(net_graph)->net_out), GTK_WIDGET 
(label), GTK_POS_RIGHT, 1, 1);


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