Updating branch refs/heads/master to 6b8259ee4c95c9d9fb7c642821df5926c3de514e (commit) from 5b473cf697eab460c157619d5c1c0c12cd2313b0 (commit)
commit 6b8259ee4c95c9d9fb7c642821df5926c3de514e Author: Jérôme Guelfucci <jero...@xfce.org> Date: Sun Dec 30 15:21:24 2012 +0100 Improve main shortcuts view as per Nick's suggestions. Don't use a GtkFrame and put everything in a GtkAlignment instead. This is consistent with xfce4-keyboard-settings. settings-dialogs/xfwm4-dialog.glade | 163 +++++++++++++++++++---------------- 1 files changed, 88 insertions(+), 75 deletions(-) diff --git a/settings-dialogs/xfwm4-dialog.glade b/settings-dialogs/xfwm4-dialog.glade index d623b7b..09c457c 100644 --- a/settings-dialogs/xfwm4-dialog.glade +++ b/settings-dialogs/xfwm4-dialog.glade @@ -506,20 +506,34 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame9"> + <object class="GtkAlignment" id="alignment12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="top_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment12"> + <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="left_padding">12</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Define shortcuts to perform _window manager actions:</property> + <property name="use_markup">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkVBox" id="vbox10"> + <object class="GtkVBox" id="vbox11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -544,85 +558,84 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment15"> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="yalign">0</property> + <property name="xscale">0</property> + <child> + <object class="GtkHBox" id="hbox5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="yalign">0</property> - <property name="xscale">0</property> + <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox5"> + <object class="GtkButton" id="shortcuts_edit_button"> + <property name="label">gtk-edit</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkButton" id="shortcuts_edit_button"> - <property name="label">gtk-edit</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="shortcuts_clear_button"> - <property name="label">gtk-clear</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="shortcuts_reset_button"> - <property name="label" translatable="yes">_Reset to Defaults</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">15</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="shortcuts_clear_button"> + <property name="label">gtk-clear</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="shortcuts_reset_button"> + <property name="label" translatable="yes">_Reset to Defaults</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">15</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label22"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>_Window shortcuts</b></property> - <property name="use_markup">True</property> - <property name="use_underline">True</property> - </object> - </child> </object> <packing> <property name="position">1</property> _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits