[gnome-control-center/wip/gbsneto/keyboard-improvements: 13/16] shortcut-editor: update reset button position and style
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/gbsneto/keyboard-improvements: 13/16] shortcut-editor: update reset button position and style
- Date: Tue, 6 Sep 2016 15:07:48 +0000 (UTC)
commit 1c7d3611d6b4976f7cc07a9d4a8ad5d269e07644
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Aug 31 20:44:28 2016 -0300
shortcut-editor: update reset button position and style
The Reset button, according to the mockups, should be placed
at the right side (left on rtl) of the shortcut label. Also,
rather than a plain string, the button should use a symbolic
icon for 'edit-clear' action.
This patch moves and updates the Reset button to match the
mockups.
https://bugzilla.gnome.org/show_bug.cgi?id=769314
panels/keyboard/shortcut-editor.ui | 42 ++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 13 deletions(-)
---
diff --git a/panels/keyboard/shortcut-editor.ui b/panels/keyboard/shortcut-editor.ui
index c67f167..3d0b48f 100644
--- a/panels/keyboard/shortcut-editor.ui
+++ b/panels/keyboard/shortcut-editor.ui
@@ -38,11 +38,37 @@
</object>
</child>
<child>
- <object class="GtkShortcutLabel" id="shortcut_accel_label">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="disabled-text" translatable="yes">Disabled</property>
+ <property name="spacing">18</property>
+ <child type="center">
+ <object class="GtkShortcutLabel" id="shortcut_accel_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="disabled-text" translatable="yes">Disabled</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="reset_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">none</property>
+ <property name="halign">end</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon-name">edit-clear-symbolic</property>
+ </object>
+ </child>
+ <signal name="clicked" handler="reset_item_clicked_cb"
object="CcKeyboardShortcutEditor" swapped="yes" />
+ </object>
+ <packing>
+ <property name="pack_type">end</property>
+ </packing>
+ </child>
</object>
</child>
<child>
@@ -57,16 +83,6 @@
<property name="xalign">0</property>
</object>
</child>
- <child>
- <object class="GtkButton" id="reset_button">
- <property name="label" translatable="yes">Reset</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="halign">end</property>
- <signal name="clicked" handler="reset_item_clicked_cb" object="CcKeyboardShortcutEditor"
swapped="yes" />
- </object>
- </child>
</object>
<packing>
<property name="name">edit</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]