[gnome-control-center/wip/gbsneto/keyboard-improvements: 14/16] shortcut-editor: move widgets into a stack
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/gbsneto/keyboard-improvements: 14/16] shortcut-editor: move widgets into a stack
- Date: Tue, 6 Sep 2016 15:07:53 +0000 (UTC)
commit 1d5df4b20dab0585b870f1776ad872bc08a647ed
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Aug 31 20:55:42 2016 -0300
shortcut-editor: move widgets into a stack
The stack will be used by the next patches to show
an call for action page.
https://bugzilla.gnome.org/show_bug.cgi?id=769314
panels/keyboard/shortcut-editor.ui | 80 ++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 30 deletions(-)
---
diff --git a/panels/keyboard/shortcut-editor.ui b/panels/keyboard/shortcut-editor.ui
index 3d0b48f..b6ba41d 100644
--- a/panels/keyboard/shortcut-editor.ui
+++ b/panels/keyboard/shortcut-editor.ui
@@ -38,51 +38,71 @@
</object>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkStack" id="standard_shortcut_stack">
<property name="visible">True</property>
<property name="can_focus">False</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>
+ <property name="expand">True</property>
+ <property name="transition_type">crossfade</property>
<child>
- <object class="GtkButton" id="reset_button">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">none</property>
- <property name="halign">end</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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>
- <object class="GtkImage">
+ <object class="GtkLabel" id="shortcut_conflict_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">edit-clear-symbolic</property>
+ <property name="hexpand">True</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="width_chars">15</property>
+ <property name="max_width_chars">20</property>
+ <property name="xalign">0</property>
</object>
</child>
- <signal name="clicked" handler="reset_item_clicked_cb"
object="CcKeyboardShortcutEditor" swapped="yes" />
</object>
<packing>
- <property name="pack_type">end</property>
+ <property name="name">main</property>
</packing>
</child>
</object>
</child>
- <child>
- <object class="GtkLabel" id="shortcut_conflict_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="wrap">True</property>
- <property name="wrap_mode">word-char</property>
- <property name="width_chars">15</property>
- <property name="max_width_chars">20</property>
- <property name="xalign">0</property>
- </object>
- </child>
</object>
<packing>
<property name="name">edit</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]