diff options
| -rw-r--r-- | capplets/mouse/mate-mouse-properties.ui | 307 |
1 files changed, 151 insertions, 156 deletions
diff --git a/capplets/mouse/mate-mouse-properties.ui b/capplets/mouse/mate-mouse-properties.ui index 2efb1de8..f32ac0da 100644 --- a/capplets/mouse/mate-mouse-properties.ui +++ b/capplets/mouse/mate-mouse-properties.ui @@ -1,7 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> - <requires lib="gtk+" version="2.16"/> + <requires lib="gtk+" version="3.14"/> + <!-- interface-license-type gplv2 --> + <!-- interface-name mate-mouse-properties --> + <!-- interface-description mouse properties dialog window --> + <!-- interface-copyright MATE Developers --> + <!-- interface-authors Wolfgang Ulbrich --> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">10</property> @@ -45,6 +50,7 @@ <property name="page_increment">100</property> </object> <object class="GtkDialog" id="mouse_properties_dialog"> + <property name="name">mouse-properties</property> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">Mouse Preferences</property> @@ -55,6 +61,7 @@ <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> @@ -64,7 +71,6 @@ <child> <object class="GtkButton" id="helpbutton1"> <property name="label">gtk-help</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -80,7 +86,6 @@ <child> <object class="GtkButton" id="closebutton1"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -107,24 +112,26 @@ <property name="can_focus">True</property> <property name="border_width">5</property> <child> - <object class="GtkVBox" id="general_vbox"> + <object class="GtkBox" id="general_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> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">18</property> <child> - <object class="GtkVBox" id="orientation_vbox"> + <object class="GtkBox" id="orientation_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> + <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="label27"> <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="halign">start</property> <property name="label" translatable="yes">Mouse Orientation</property> - <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -143,21 +150,21 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="vbox29"> + <object class="GtkBox" id="vbox29"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="right_handed_radio"> <property name="label" translatable="yes">_Right-handed</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -170,13 +177,12 @@ <child> <object class="GtkRadioButton" id="left_handed_radio"> <property name="label" translatable="yes">_Left-handed</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">right_handed_radio</property> @@ -204,17 +210,18 @@ </packing> </child> <child> - <object class="GtkVBox" id="locate_pointer_vbox"> + <object class="GtkBox" id="locate_pointer_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> + <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="label5"> <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="halign">start</property> <property name="label" translatable="yes">Locate Pointer</property> - <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -235,13 +242,12 @@ <child> <object class="GtkCheckButton" id="locate_pointer_toggle"> <property name="label" translatable="yes">Sh_ow position of pointer when the Control key is pressed</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> </child> @@ -260,17 +266,18 @@ </packing> </child> <child> - <object class="GtkVBox" id="pointer_speed_vbox"> + <object class="GtkBox" id="pointer_speed_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> + <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="label29"> <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="halign">start</property> <property name="label" translatable="yes">Pointer Speed</property> - <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -289,58 +296,40 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table2"> + <object class="GtkGrid" id="table2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">2</property> - <property name="n_columns">3</property> - <property name="column_spacing">12</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="acceleration_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">_Acceleration:</property> <property name="use_underline">True</property> <property name="justify">center</property> <property name="mnemonic_widget">accel_scale</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="sensitivity_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Sensitivity:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">sensitivity_scale</property> - <property name="xalign">0</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> <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="hexpand">True</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="acceleration_slow_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> <property name="label" translatable="yes" comments="slow acceleration">Slow</property> <property name="justify">center</property> - <property name="xalign">1</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -353,7 +342,7 @@ </packing> </child> <child> - <object class="GtkHScale" id="accel_scale"> + <object class="GtkScale" id="accel_scale"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="adjustment">adjustment1</property> @@ -370,9 +359,9 @@ <object class="GtkLabel" id="acceleration_fast_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes" comments="fast acceleration">Fast</property> <property name="justify">center</property> - <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -387,22 +376,23 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">3</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox3"> + <object class="GtkBox" id="hbox3"> <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="hexpand">True</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="sensitivity_low_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> <property name="label" translatable="yes" comments="low sensitivity">Low</property> <property name="justify">center</property> - <property name="xalign">1</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -415,7 +405,7 @@ </packing> </child> <child> - <object class="GtkHScale" id="sensitivity_scale"> + <object class="GtkScale" id="sensitivity_scale"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="adjustment">adjustment2</property> @@ -432,9 +422,9 @@ <object class="GtkLabel" id="sensitivity_high_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes" comments="high sensitivity">High</property> <property name="justify">center</property> - <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -449,9 +439,22 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">3</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="sensitivity_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">_Sensitivity:</property> + <property name="use_underline">True</property> + <property name="justify">center</property> + <property name="mnemonic_widget">sensitivity_scale</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> </object> @@ -471,17 +474,18 @@ </packing> </child> <child> - <object class="GtkVBox" id="dnd_vbox"> + <object class="GtkBox" id="dnd_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> + <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="label8"> <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="halign">start</property> <property name="label" translatable="yes">Drag and Drop</property> - <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -500,13 +504,14 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="vbox7"> + <object class="GtkBox" id="vbox7"> <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="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkHBox" id="cursor_hbox2"> + <object class="GtkBox" id="cursor_hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> @@ -514,11 +519,11 @@ <object class="GtkLabel" id="threshold_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Thr_eshold:</property> <property name="use_underline">True</property> <property name="justify">center</property> <property name="mnemonic_widget">drag_threshold_scale</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -527,7 +532,7 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox9"> + <object class="GtkBox" id="hbox9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -535,9 +540,9 @@ <object class="GtkLabel" id="threshold_small_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> <property name="label" translatable="yes" comments="small threshold">Small</property> <property name="justify">center</property> - <property name="xalign">1</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -550,7 +555,7 @@ </packing> </child> <child> - <object class="GtkHScale" id="drag_threshold_scale"> + <object class="GtkScale" id="drag_threshold_scale"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="adjustment">adjustment3</property> @@ -572,8 +577,8 @@ <object class="GtkLabel" id="threshold_large_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes" comments="large threshold">Large</property> - <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -616,17 +621,18 @@ </packing> </child> <child> - <object class="GtkVBox" id="double_click_timeout_vbox"> + <object class="GtkBox" id="double_click_timeout_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> + <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="label31"> <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="halign">start</property> <property name="label" translatable="yes">Double-Click Timeout</property> - <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -645,13 +651,14 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="vbox32"> + <object class="GtkBox" id="vbox32"> <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="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkHBox" id="cursor_hbox4"> + <object class="GtkBox" id="cursor_hbox4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> @@ -659,11 +666,11 @@ <object class="GtkLabel" id="timeout_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">_Timeout:</property> <property name="use_underline">True</property> <property name="justify">center</property> <property name="mnemonic_widget">delay_scale</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -672,7 +679,7 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox21"> + <object class="GtkBox" id="hbox21"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -680,8 +687,8 @@ <object class="GtkLabel" id="timeout_short_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> <property name="label" translatable="yes">Short</property> - <property name="xalign">1</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -694,7 +701,7 @@ </packing> </child> <child> - <object class="GtkHScale" id="delay_scale"> + <object class="GtkScale" id="delay_scale"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="adjustment">adjustment4</property> @@ -715,8 +722,8 @@ <object class="GtkLabel" id="timeout_long_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Long</property> - <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -743,7 +750,7 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox22"> + <object class="GtkBox" id="hbox22"> <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> @@ -754,9 +761,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="halign">start</property> <property name="label" translatable="yes">To test your double-click settings, try to double-click on the light bulb.</property> <property name="wrap">True</property> - <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> </attributes> @@ -825,22 +832,22 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox3"> + <object class="GtkBox" id="vbox3"> <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="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">18</property> <child> <object class="GtkCheckButton" id="touchpad_enable"> <property name="label" translatable="yes">Enable _touchpad</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> @@ -850,18 +857,19 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_touchpad_general"> + <object class="GtkBox" id="vbox_touchpad_general"> <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="orientation">vertical</property> <child> <object class="GtkLabel" id="label18"> <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="halign">start</property> + <property name="valign">start</property> <property name="label" translatable="yes">General</property> - <property name="xalign">0</property> - <property name="yalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -882,13 +890,12 @@ <child> <object class="GtkCheckButton" id="disable_w_typing_toggle"> <property name="label" translatable="yes">Disable touchpad _while typing</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -910,13 +917,12 @@ <child> <object class="GtkCheckButton" id="tap_to_click_toggle"> <property name="label" translatable="yes">Enable _mouse clicks with touchpad</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -936,65 +942,61 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table1"> + <object class="GtkGrid" id="table1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="column_spacing">3</property> <property name="row_spacing">3</property> + <property name="column_spacing">3</property> <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Two-finger click emulation:</property> - <property name="xalign">0</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label9"> + <object class="GtkBox" id="hbox_three_finger_click"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Three-finger click emulation:</property> - <property name="xalign">0</property> + <property name="hexpand">True</property> + <child> + <placeholder/> + </child> </object> <packing> + <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox_three_finger_click"> + <object class="GtkBox" id="hbox_two_finger_click"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <child> <placeholder/> </child> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox_two_finger_click"> + <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <placeholder/> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes">Three-finger click emulation:</property> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> </object> @@ -1014,18 +1016,19 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_touchpad_scrolling"> + <object class="GtkBox" id="vbox_touchpad_scrolling"> <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="orientation">vertical</property> <child> <object class="GtkLabel" id="label34"> <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="halign">start</property> + <property name="valign">start</property> <property name="label" translatable="yes">Scrolling</property> - <property name="xalign">0</property> - <property name="yalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1046,13 +1049,12 @@ <child> <object class="GtkCheckButton" id="vert_edge_scroll_toggle"> <property name="label" translatable="yes">_Vertical edge scrolling</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> </child> @@ -1073,13 +1075,12 @@ <child> <object class="GtkCheckButton" id="horiz_edge_scroll_toggle"> <property name="label" translatable="yes">H_orizontal edge scrolling</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> </child> @@ -1100,13 +1101,12 @@ <child> <object class="GtkCheckButton" id="vert_twofinger_scroll_toggle"> <property name="label" translatable="yes">V_ertical two-finger scrolling</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> </child> @@ -1127,13 +1127,12 @@ <child> <object class="GtkCheckButton" id="horiz_twofinger_scroll_toggle"> <property name="label" translatable="yes">Hor_izontal two-finger scrolling</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> </child> @@ -1154,13 +1153,12 @@ <child> <object class="GtkCheckButton" id="natural_scroll_toggle"> <property name="label" translatable="yes">Enable _natural scrolling</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> </child> @@ -1179,17 +1177,18 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_touchpad_pointer_speed"> + <object class="GtkBox" id="vbox_touchpad_pointer_speed"> <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="orientation">vertical</property> <child> <object class="GtkLabel" id="label40"> <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="halign">start</property> <property name="label" translatable="yes">Pointer Speed</property> - <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1208,58 +1207,40 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table3"> + <object class="GtkGrid" id="table3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">2</property> - <property name="n_columns">3</property> - <property name="column_spacing">12</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="touchpad_acceleration_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">_Acceleration:</property> <property name="use_underline">True</property> <property name="justify">center</property> <property name="mnemonic_widget">touchpad_accel_scale</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="touchpad_sensitivity_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Sensitivity:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">touchpad_sensitivity_scale</property> - <property name="xalign">0</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox30"> + <object class="GtkBox" id="hbox30"> <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="hexpand">True</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="touchpad_acceleration_slow_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> <property name="label" translatable="yes" comments="slow acceleration">Slow</property> <property name="justify">center</property> - <property name="xalign">1</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -1272,7 +1253,7 @@ </packing> </child> <child> - <object class="GtkHScale" id="touchpad_accel_scale"> + <object class="GtkScale" id="touchpad_accel_scale"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="adjustment">adjustment11</property> @@ -1289,9 +1270,9 @@ <object class="GtkLabel" id="touchpad_acceleration_fast_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes" comments="fast acceleration">Fast</property> <property name="justify">center</property> - <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -1306,22 +1287,23 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">3</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox31"> + <object class="GtkBox" id="hbox31"> <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="hexpand">True</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="touchpad_sensitivity_low_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> <property name="label" translatable="yes" comments="low sensitivity">Low</property> <property name="justify">center</property> - <property name="xalign">1</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -1334,7 +1316,7 @@ </packing> </child> <child> - <object class="GtkHScale" id="touchpad_sensitivity_scale"> + <object class="GtkScale" id="touchpad_sensitivity_scale"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="adjustment">adjustment22</property> @@ -1351,9 +1333,9 @@ <object class="GtkLabel" id="touchpad_sensitivity_high_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes" comments="high sensitivity">High</property> <property name="justify">center</property> - <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.82999999999999996"/> @@ -1368,9 +1350,22 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">3</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="touchpad_sensitivity_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">_Sensitivity:</property> + <property name="use_underline">True</property> + <property name="justify">center</property> + <property name="mnemonic_widget">touchpad_sensitivity_scale</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> </object> |