diff options
author | monsta <[email protected]> | 2016-11-03 14:02:34 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2016-11-03 14:02:34 +0300 |
commit | 86ff81c8026d12736888883982e3dcf6a706776e (patch) | |
tree | 44a4c748a2126ab1250eaa0b165ba480e3356c88 /capplets/mouse/mate-mouse-properties.ui | |
parent | 2ab64ee8ec12a3e1de4da9b25b8834cc978640ba (diff) | |
download | mate-control-center-86ff81c8026d12736888883982e3dcf6a706776e.tar.bz2 mate-control-center-86ff81c8026d12736888883982e3dcf6a706776e.tar.xz |
mouse: use GtkAlignment instead of labels with spaces
even though that widget is deprecated, this change makes touchpad
tab more consistent with mouse tab, and so it will be a bit easier
to replace the deprecations later
Diffstat (limited to 'capplets/mouse/mate-mouse-properties.ui')
-rw-r--r-- | capplets/mouse/mate-mouse-properties.ui | 226 |
1 files changed, 40 insertions, 186 deletions
diff --git a/capplets/mouse/mate-mouse-properties.ui b/capplets/mouse/mate-mouse-properties.ui index 6acf58a1..acf10be9 100644 --- a/capplets/mouse/mate-mouse-properties.ui +++ b/capplets/mouse/mate-mouse-properties.ui @@ -840,7 +840,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> - <property name="spacing">6</property> <child> <object class="GtkLabel" id="label18"> <property name="visible">True</property> @@ -860,25 +859,12 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox6"> + <object class="GtkAlignment" id="alignment10"> <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="GtkLabel" id="label19"> - <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="label"> </property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> <object class="GtkCheckButton" id="disable_w_typing_toggle"> <property name="label" translatable="yes">Disable touchpad _while typing</property> @@ -892,39 +878,21 @@ <property name="active">True</property> <property name="draw_indicator">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox11"> + <object class="GtkAlignment" id="alignment11"> <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="GtkLabel" id="label22"> - <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="label"> </property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> <object class="GtkCheckButton" id="tap_to_click_toggle"> <property name="label" translatable="yes">Enable _mouse clicks with touchpad</property> @@ -938,39 +906,21 @@ <property name="active">True</property> <property name="draw_indicator">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkAlignment" id="alignment12"> <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="GtkLabel" id="label3"> - <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="label"> </property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> @@ -1034,16 +984,11 @@ </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">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> @@ -1059,7 +1004,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> - <property name="spacing">6</property> <child> <object class="GtkLabel" id="label34"> <property name="visible">True</property> @@ -1079,25 +1023,12 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox5"> + <object class="GtkAlignment" id="alignment13"> <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="GtkLabel" id="label7"> - <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="label"> </property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> <object class="GtkCheckButton" id="vert_edge_scroll_toggle"> <property name="label" translatable="yes">_Vertical edge scrolling</property> @@ -1110,39 +1041,21 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox16"> + <object class="GtkAlignment" id="alignment14"> <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="GtkLabel" id="label36"> - <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="label"> </property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> <object class="GtkCheckButton" id="horiz_edge_scroll_toggle"> <property name="label" translatable="yes">H_orizontal edge scrolling</property> @@ -1155,39 +1068,21 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox7"> + <object class="GtkAlignment" id="alignment15"> <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="GtkLabel" id="label10"> - <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="label"> </property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> <object class="GtkCheckButton" id="vert_twofinger_scroll_toggle"> <property name="label" translatable="yes">V_ertical two-finger scrolling</property> @@ -1200,39 +1095,21 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox8"> + <object class="GtkAlignment" id="alignment16"> <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="GtkLabel" id="label11"> - <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="label"> </property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> <object class="GtkCheckButton" id="horiz_twofinger_scroll_toggle"> <property name="label" translatable="yes">Hor_izontal two-finger scrolling</property> @@ -1245,39 +1122,21 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">4</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkAlignment" id="alignment17"> <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="GtkLabel" id="label2"> - <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="label"> </property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> <object class="GtkCheckButton" id="natural_scroll_toggle"> <property name="label" translatable="yes">Enable _natural scrolling</property> @@ -1290,16 +1149,11 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">5</property> </packing> </child> |