[gnome-system-monitor] Use GtkWidget alignment instead of GtkMisc alignment
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor] Use GtkWidget alignment instead of GtkMisc alignment
- Date: Sun, 20 Jul 2014 12:47:16 +0000 (UTC)
commit a538b8687ef762186da0def29c84fb48ea700222
Author: Robert Roth <robert roth off gmail com>
Date: Sun Jul 20 15:47:03 2014 +0300
Use GtkWidget alignment instead of GtkMisc alignment
data/interface.ui | 19 +++++++++----------
data/lsof.ui | 2 +-
data/preferences.ui | 27 +++++++++++++--------------
data/renice.ui | 3 +--
src/interface.cpp | 3 ++-
src/load-graph.cpp | 18 ++++++++++++------
src/util.cpp | 3 ++-
7 files changed, 40 insertions(+), 35 deletions(-)
---
diff --git a/data/interface.ui b/data/interface.ui
index f152b60..43335a7 100644
--- a/data/interface.ui
+++ b/data/interface.ui
@@ -6,7 +6,6 @@
<property name="title" translatable="yes">System Monitor</property>
<property name="default_width">440</property>
<property name="default_height">495</property>
- <property name="has_resize_grip">False</property>
<child type="titlebar">
<object class="GtkHeaderBar" id="header_bar">
<property name="visible">True</property>
@@ -176,7 +175,7 @@
<object class="GtkLabel" id="cpu_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">CPU History</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -268,7 +267,7 @@
<object class="GtkLabel" id="mem_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Memory and Swap History</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -308,7 +307,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Memory</property>
</object>
<packing>
@@ -323,7 +322,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Swap</property>
</object>
<packing>
@@ -368,7 +367,7 @@
<object class="GtkLabel" id="net_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Network History</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -409,7 +408,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Receiving</property>
</object>
<packing>
@@ -424,7 +423,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Total Received</property>
</object>
<packing>
@@ -439,7 +438,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Sending</property>
</object>
<packing>
@@ -454,7 +453,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Total Sent</property>
</object>
<packing>
diff --git a/data/lsof.ui b/data/lsof.ui
index 3dbf8ae..208b376 100644
--- a/data/lsof.ui
+++ b/data/lsof.ui
@@ -44,7 +44,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
diff --git a/data/preferences.ui b/data/preferences.ui
index 45dad36..16b6b78 100644
--- a/data/preferences.ui
+++ b/data/preferences.ui
@@ -10,7 +10,6 @@
<property name="default_height">495</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
- <property name="has_resize_grip">False</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog_layout">
<property name="can_focus">False</property>
@@ -48,7 +47,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Behavior</property>
<property name="justify">fill</property>
<property name="ellipsize">end</property>
@@ -123,7 +122,7 @@
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -141,7 +140,7 @@
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -159,7 +158,7 @@
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -197,7 +196,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Information Fields</property>
<property name="justify">fill</property>
<property name="ellipsize">end</property>
@@ -226,7 +225,7 @@
<object class="GtkLabel" id="processes_fields_table_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Process i_nformation shown in
list:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">proctree_columns</property>
@@ -312,7 +311,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Graphs</property>
<property name="justify">fill</property>
<property name="ellipsize">end</property>
@@ -388,7 +387,7 @@
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -406,7 +405,7 @@
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -467,7 +466,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Behavior</property>
<property name="justify">fill</property>
<property name="ellipsize">end</property>
@@ -542,7 +541,7 @@
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -580,7 +579,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Information Fields</property>
<property name="justify">fill</property>
<property name="ellipsize">end</property>
@@ -609,7 +608,7 @@
<object class="GtkLabel" id="devices_fields_table_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">File system i_nformation shown in
list:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">disktreenew_columns</property>
diff --git a/data/renice.ui b/data/renice.ui
index a282c8b..a03da22 100644
--- a/data/renice.ui
+++ b/data/renice.ui
@@ -13,7 +13,6 @@
<property name="resizable">False</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
- <property name="has_resize_grip">False</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox4">
<property name="can_focus">False</property>
@@ -139,7 +138,7 @@
<object class="GtkLabel" id="note_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes"><small><i><b>Note:</b> The
priority of a process is given by its nice value. A lower nice value corresponds to a higher
priority.</i></small></property>
<property name="use_markup">True</property>
</object>
diff --git a/src/interface.cpp b/src/interface.cpp
index f255c36..a9410b3 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -231,7 +231,8 @@ create_sys_view (GsmApplication *app, GtkBuilder * builder)
cpu_label = gtk_label_new (NULL);
- gtk_misc_set_alignment (GTK_MISC (cpu_label), 0.0, 0.5);
+ gtk_widget_set_valign (cpu_label, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (cpu_label, GTK_ALIGN_START);
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;
diff --git a/src/load-graph.cpp b/src/load-graph.cpp
index e06d5d4..af2eb78 100644
--- a/src/load-graph.cpp
+++ b/src/load-graph.cpp
@@ -724,10 +724,12 @@ LoadGraph::LoadGraph(guint type)
case LOAD_GRAPH_MEM:
n = 2;
labels.memory = gtk_label_new(NULL);
- gtk_misc_set_alignment (GTK_MISC (labels.memory), 0.0, 0.5);
+ gtk_widget_set_valign (labels.memory, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (labels.memory, GTK_ALIGN_START);
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_set_valign (labels.swap, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (labels.swap, GTK_ALIGN_START);
gtk_widget_show (labels.swap);
break;
@@ -737,21 +739,25 @@ LoadGraph::LoadGraph(guint type)
net.max = 1;
labels.net_in = gtk_label_new(NULL);
gtk_label_set_width_chars(GTK_LABEL(labels.net_in), 10);
- gtk_misc_set_alignment (GTK_MISC (labels.net_in), 1.0, 0.5);
+ gtk_widget_set_valign (labels.net_in, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (labels.net_in, GTK_ALIGN_END);
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_widget_set_valign (labels.net_in_total, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (labels.net_in_total, GTK_ALIGN_END);
gtk_label_set_width_chars(GTK_LABEL(labels.net_in_total), 10);
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_widget_set_valign (labels.net_out, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (labels.net_out, GTK_ALIGN_END);
gtk_label_set_width_chars(GTK_LABEL(labels.net_out), 10);
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_widget_set_valign (labels.net_out_total, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (labels.net_out, GTK_ALIGN_END);
gtk_label_set_width_chars(GTK_LABEL(labels.net_out_total), 10);
gtk_widget_show (labels.net_out_total);
diff --git a/src/util.cpp b/src/util.cpp
index a34050b..6bf2a54 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -122,7 +122,8 @@ procman_make_label_for_mmaps_or_ofiles(const char *format,
name = mnemonic_safe_process_name (process_name);
title = g_strdup_printf(format, name, pid);
label = gtk_label_new_with_mnemonic (title);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
g_free (title);
g_free (name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
