[gnome-control-center] mouse: avoid using deprecated GtkAlignment and GtkMisc
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] mouse: avoid using deprecated GtkAlignment and GtkMisc
- Date: Fri, 31 Oct 2014 07:54:54 +0000 (UTC)
commit 2640a9dfd7ac5ac51ac4aeb73e82916839bf8294
Author: Ondrej Holy <oholy redhat com>
Date: Mon Oct 20 11:29:55 2014 +0200
mouse: avoid using deprecated GtkAlignment and GtkMisc
https://bugzilla.gnome.org/show_bug.cgi?id=736013
panels/mouse/gnome-mouse-properties.c | 2 +-
panels/mouse/gnome-mouse-properties.ui | 178 ++++++++++++--------------------
panels/mouse/gnome-mouse-test.c | 2 +-
panels/mouse/gnome-mouse-test.ui | 4 +-
4 files changed, 72 insertions(+), 114 deletions(-)
---
diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
index 3102e55..56d0d35 100644
--- a/panels/mouse/gnome-mouse-properties.c
+++ b/panels/mouse/gnome-mouse-properties.c
@@ -58,7 +58,7 @@ struct _CcMousePropertiesPrivate
gboolean changing_scroll;
};
-G_DEFINE_TYPE (CcMouseProperties, cc_mouse_properties, GTK_TYPE_ALIGNMENT);
+G_DEFINE_TYPE (CcMouseProperties, cc_mouse_properties, GTK_TYPE_BIN);
static void
orientation_radio_button_release_event (GtkWidget *widget,
diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui
index 5575586..8da94db 100644
--- a/panels/mouse/gnome-mouse-properties.ui
+++ b/panels/mouse/gnome-mouse-properties.ui
@@ -39,12 +39,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">5</property>
- <property name="right_padding">5</property>
<child>
<object class="GtkLabel" id="label27">
<property name="visible">True</property>
@@ -52,35 +46,29 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">General</property>
+ <property name="margin_start">5</property>
+ <property name="margin_end">5</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">5</property>
- <property name="left_padding">20</property>
- <property name="right_padding">20</property>
<child>
<object class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_end">220</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="column_spacing">40</property>
<property name="row_spacing">10</property>
+ <property name="margin_top">5</property>
+ <property name="margin_start">20</property>
+ <property name="margin_end">240</property>
<child>
<object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
@@ -231,44 +219,35 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="mouse_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkSeparator" id="separator2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkVBox" id="mouse_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">10</property>
- <property name="left_padding">5</property>
- <property name="right_padding">5</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkSeparator" id="separator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkLabel" id="label29">
<property name="visible">True</property>
@@ -276,34 +255,29 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Mouse</property>
+ <property name="margin_top">10</property>
+ <property name="margin_start">5</property>
+ <property name="margin_end">5</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">5</property>
- <property name="left_padding">20</property>
- <property name="right_padding">20</property>
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_end">220</property>
<property name="n_columns">3</property>
<property name="column_spacing">40</property>
<property name="row_spacing">5</property>
+ <property name="margin_top">5</property>
+ <property name="margin_start">20</property>
+ <property name="margin_end">240</property>
<child>
<object class="GtkLabel" id="pointer_speed_label">
<property name="visible">True</property>
@@ -384,6 +358,11 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
<packing>
@@ -392,40 +371,29 @@
<property name="position">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="touchpad_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <object class="GtkSeparator" id="separator1">
+ <object class="GtkVBox" id="touchpad_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">10</property>
- <property name="left_padding">5</property>
- <property name="right_padding">5</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkSeparator" id="separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_top">10</property>
+ <property name="margin_start">5</property>
+ <property name="margin_end">5</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
@@ -459,28 +427,21 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">5</property>
- <property name="left_padding">20</property>
- <property name="right_padding">20</property>
<child>
<object class="GtkBox" id="touchpad_options_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">15</property>
+ <property name="margin_top">5</property>
+ <property name="margin_start">20</property>
+ <property name="margin_end">20</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
@@ -653,7 +614,6 @@
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="yalign">0.49000000953674316</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -671,8 +631,6 @@
<property name="position">1</property>
</packing>
</child>
- </object>
- </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/panels/mouse/gnome-mouse-test.c b/panels/mouse/gnome-mouse-test.c
index 4ee8a77..b09d22b 100644
--- a/panels/mouse/gnome-mouse-test.c
+++ b/panels/mouse/gnome-mouse-test.c
@@ -72,7 +72,7 @@ struct _CcMouseTestPrivate
gint scroll_image_timeout_id;
};
-G_DEFINE_TYPE (CcMouseTest, cc_mouse_test, GTK_TYPE_ALIGNMENT);
+G_DEFINE_TYPE (CcMouseTest, cc_mouse_test, GTK_TYPE_BIN);
/* Timeout for the double click test */
diff --git a/panels/mouse/gnome-mouse-test.ui b/panels/mouse/gnome-mouse-test.ui
index d3ffdad..eed9283 100644
--- a/panels/mouse/gnome-mouse-test.ui
+++ b/panels/mouse/gnome-mouse-test.ui
@@ -18,9 +18,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="margin_top">5</property>
+ <property name="margin_top">10</property>
+ <property name="margin_bottom">5</property>
<property name="hexpand">True</property>
- <property name="ypad">5</property>
<property name="label" translatable="yes">Try clicking, double clicking, scrolling</property>
<property name="wrap">True</property>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
