[gnome-control-center] mouse: Use HdyActionRow
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] mouse: Use HdyActionRow
- Date: Wed, 12 May 2021 04:10:15 +0000 (UTC)
commit 1e917d0033e326ef1ad4fe994ace23a0b8649571
Author: Ian Douglas Scott <idscott system76 com>
Date: Fri May 7 12:54:42 2021 -0700
mouse: Use HdyActionRow
More consistent styling with other panels, and removes a lot of xml.
panels/mouse/cc-mouse-panel.ui | 489 ++++++-----------------------------------
1 file changed, 62 insertions(+), 427 deletions(-)
---
diff --git a/panels/mouse/cc-mouse-panel.ui b/panels/mouse/cc-mouse-panel.ui
index 58c7b1046..4a6e9d555 100644
--- a/panels/mouse/cc-mouse-panel.ui
+++ b/panels/mouse/cc-mouse-panel.ui
@@ -52,10 +52,13 @@
<property name="can_focus">True</property>
<property name="selection_mode">none</property>
<child>
- <object class="GtkListBoxRow" id="primary_button_row">
+ <object class="HdyActionRow" id="primary_button_row">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">false</property>
+ <property name="title" translatable="yes">Primary Button</property>
+ <property name="subtitle" translatable="yes">Sets the order of physical
buttons on mice and touchpads.</property>
+ <property name="subtitle-lines">0</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
@@ -66,46 +69,6 @@
<property name="margin_end">20</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Primary Button</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">primary_button_row</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="max-width-chars">20</property>
- <property name="wrap">True</property>
- <property name="wrap-mode">word</property>
- <property name="label" translatable="yes">Sets the order of physical
buttons on mice and touchpads.</property>
- <style>
- <class name="dim-label"/>
- </style>
- <attributes>
- <attribute name="scale" value="0.9"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
<child>
<object class="GtkBox" id="primary_button_box">
<property name="visible">True</property>
@@ -137,12 +100,6 @@
</object>
</child>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
</child>
</object>
</child>
@@ -184,131 +141,42 @@
<property name="can_focus">True</property>
<property name="selection_mode">none</property>
<child>
- <object class="GtkListBoxRow" id="mouse_row">
+ <object class="HdyActionRow" id="mouse_row">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">false</property>
+ <property name="title" translatable="yes">Mouse Speed</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkScale" id="mouse_speed_scale">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">32</property>
- <property name="margin_start">20</property>
- <property name="margin_end">20</property>
- <property name="margin_top">8</property>
- <property name="margin_bottom">8</property>
- <property name="valign">center</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="valign">end</property>
- <property name="label" translatable="yes">Mouse Speed</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">mouse_speed_scale</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="mouse_speed_scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">mouse_speed_adjustment</property>
- <property name="draw_value">False</property>
- <property name="width-request">300</property>
- <property name="halign">end</property>
- <property name="expand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject">
- <property name="AtkObject::accessible-description"
translatable="yes">Double-click timeout</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="adjustment">mouse_speed_adjustment</property>
+ <property name="draw_value">False</property>
+ <property name="width-request">300</property>
+ <property name="halign">end</property>
+ <property name="expand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="AtkObject::accessible-description"
translatable="yes">Double-click timeout</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
</child>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkListBoxRow" id="mouse_natural_scrolling_row">
+ <object class="HdyActionRow" id="mouse_natural_scrolling_row">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">false</property>
+ <property name="title" translatable="yes" comments="Translators: This switch
reverses the scrolling direction for mices. The term used comes from OS X so use the same translation if
possible.">Natural Scrolling</property>
+ <property name="subtitle" translatable="yes">Scrolling moves the content,
not the view.</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkSwitch" id="mouse_natural_scrolling_switch">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">2</property>
- <property name="column_spacing">16</property>
- <property name="margin_start">20</property>
- <property name="margin_end">20</property>
- <property name="margin_top">6</property>
- <property name="margin_bottom">6</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
<property name="valign">center</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Translators:
This switch reverses the scrolling direction for mices. The term used comes from OS X so use the same
translation if possible.">Natural Scrolling</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">mouse_natural_scrolling_switch</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Scrolling moves the
content, not the view.</property>
- <style>
- <class name="dim-label"/>
- </style>
- <attributes>
- <attribute name="scale" value="0.9"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="mouse_natural_scrolling_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
- </child>
</object>
</child>
</object>
@@ -353,341 +221,108 @@
<property name="can_focus">True</property>
<property name="selection_mode">none</property>
<child>
- <object class="GtkListBoxRow" id="touchpad_toggle_row">
+ <object class="HdyActionRow" id="touchpad_toggle_row">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">false</property>
+ <property name="title" translatable="yes">Touchpad</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkSwitch" id="touchpad_toggle_switch">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">32</property>
- <property name="margin_start">20</property>
- <property name="margin_end">20</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
<property name="valign">center</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="valign">end</property>
- <property name="label" translatable="yes">Touchpad</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">touchpad_toggle_switch</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="touchpad_toggle_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
- </child>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkListBoxRow" id="touchpad_natural_scrolling_row">
+ <object class="HdyActionRow" id="touchpad_natural_scrolling_row">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">false</property>
+ <property name="title" translatable="yes" comments="Translators: This
switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same
translation if possible. ">Natural Scrolling</property>
+ <property name="subtitle" translatable="yes">Scrolling moves the
content, not the view.</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkSwitch" id="touchpad_natural_scrolling_switch">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">2</property>
- <property name="column_spacing">16</property>
- <property name="margin_start">20</property>
- <property name="margin_end">20</property>
- <property name="margin_top">6</property>
- <property name="margin_bottom">6</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
<property name="valign">center</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Translators:
This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same
translation if possible. ">Natural Scrolling</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">touchpad_natural_scrolling_switch</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Scrolling moves the
content, not the view.</property>
- <style>
- <class name="dim-label"/>
- </style>
- <attributes>
- <attribute name="scale" value="0.9"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="touchpad_natural_scrolling_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
- </child>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkListBoxRow" id="touchpad_speed_row">
+ <object class="HdyActionRow" id="touchpad_speed_row">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">false</property>
+ <property name="title" translatable="yes">Touchpad Speed</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkScale" id="touchpad_speed_scale">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">16</property>
- <property name="margin_start">20</property>
- <property name="margin_end">20</property>
- <property name="margin_top">8</property>
- <property name="margin_bottom">8</property>
- <property name="valign">center</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="valign">end</property>
- <property name="label" translatable="yes">Touchpad
Speed</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">touchpad_speed_scale</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="touchpad_speed_scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">touchpad_speed_adjustment</property>
- <property name="draw_value">False</property>
- <property name="expand">True</property>
- <property name="halign">end</property>
- <child internal-child="accessible">
- <object class="AtkObject">
- <property name="AtkObject::accessible-description"
translatable="yes">Double-click timeout</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="adjustment">touchpad_speed_adjustment</property>
+ <property name="draw_value">False</property>
+ <property name="expand">True</property>
+ <property name="halign">end</property>
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="AtkObject::accessible-description"
translatable="yes">Double-click timeout</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
</child>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkListBoxRow" id="tap_to_click_row">
+ <object class="HdyActionRow" id="tap_to_click_row">
<property name="visible">False</property>
<property name="can_focus">True</property>
<property name="activatable">false</property>
+ <property name="title" translatable="yes">Tap to Click</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkSwitch" id="tap_to_click_switch">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">32</property>
- <property name="margin_start">20</property>
- <property name="margin_end">20</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
<property name="valign">center</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="valign">end</property>
- <property name="label" translatable="yes">Tap to Click</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">tap_to_click_switch</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="tap_to_click_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
- </child>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkListBoxRow" id="two_finger_scrolling_row">
+ <object class="HdyActionRow" id="two_finger_scrolling_row">
<property name="visible">False</property>
<property name="can_focus">True</property>
<property name="activatable">false</property>
+ <property name="title" translatable="yes">Two-finger Scrolling</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkSwitch" id="two_finger_scrolling_switch">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">32</property>
- <property name="margin_start">20</property>
- <property name="margin_end">20</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
<property name="valign">center</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="valign">end</property>
- <property name="label" translatable="yes">Two-finger
Scrolling</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">two_finger_scrolling_switch</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="two_finger_scrolling_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <signal name="state-set"
handler="two_finger_scrolling_changed_event" object="CcMousePanel" swapped="yes"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
- </child>
+ <signal name="state-set"
handler="two_finger_scrolling_changed_event" object="CcMousePanel" swapped="yes"/>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkListBoxRow" id="edge_scrolling_row">
+ <object class="HdyActionRow" id="edge_scrolling_row">
<property name="visible">False</property>
<property name="can_focus">True</property>
<property name="activatable">false</property>
+ <property name="title" translatable="yes">Edge Scrolling</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkSwitch" id="edge_scrolling_switch">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">32</property>
- <property name="margin_start">20</property>
- <property name="margin_end">20</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
<property name="valign">center</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="valign">end</property>
- <property name="label" translatable="yes">Edge
Scrolling</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">edge_scrolling_switch</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="edge_scrolling_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <signal name="state-set" handler="edge_scrolling_changed_event"
object="CcMousePanel" swapped="yes"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
- </child>
+ <signal name="state-set" handler="edge_scrolling_changed_event"
object="CcMousePanel" swapped="yes"/>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
