Updating branch refs/heads/master
to 01703ffc931f214ccc229911a17fc44977b13a2e (commit)
from 61d93aa6b9bbf238c8a7afec93bf5e0624503cb3 (commit)
commit 01703ffc931f214ccc229911a17fc44977b13a2e
Author: Jérôme Guelfucci <[email protected]>
Date: Sun Dec 30 23:43:40 2012 +0100
Make the xfwm4-settings dialog use less height.
Reduce the height of the 'Advanced' tab which was one taking the most
space. Makes the dialog usable on netbooks and other small screens.
settings-dialogs/xfwm4-dialog.glade | 145 ++++++++++++++++++++---------------
1 files changed, 83 insertions(+), 62 deletions(-)
diff --git a/settings-dialogs/xfwm4-dialog.glade
b/settings-dialogs/xfwm4-dialog.glade
index 09c457c..c6f8c76 100644
--- a/settings-dialogs/xfwm4-dialog.glade
+++ b/settings-dialogs/xfwm4-dialog.glade
@@ -1080,38 +1080,49 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCheckButton"
id="snap_to_border_check">
- <property name="label" translatable="yes">Snap
windows to screen _border</property>
- <property
name="use_action_appearance">False</property>
+ <object class="GtkHBox" id="hbox8">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton"
id="snap_to_border_check">
+ <property name="label"
translatable="yes">To screen _borders</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="use_underline">True</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="snap_to_window_check">
+ <property name="label"
translatable="yes">To other _windows</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="use_underline">True</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton"
id="snap_to_window_check">
- <property name="label" translatable="yes">Snap
windows to other _windows</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="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1195,7 +1206,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1236,14 +1247,41 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCheckButton"
id="wrap_workspaces_check">
- <property name="label" translatable="yes">Wrap
workspaces when the _pointer reaches the screen edge</property>
- <property
name="use_action_appearance">False</property>
+ <object class="GtkHBox" id="hbox9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton"
id="wrap_workspaces_check">
+ <property name="label"
translatable="yes">With the mouse _pointer</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="use_underline">True</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="wrap_windows_check">
+ <property name="label"
translatable="yes">With a _dragged window</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="use_underline">True</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -1252,22 +1290,6 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton"
id="wrap_windows_check">
- <property name="label" translatable="yes">Wrap
workspaces when _dragging a window off the screen</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="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1352,7 +1374,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1363,7 +1385,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Wrap workspaces</b></property>
+ <property name="label"
translatable="yes"><b>Wrap workspaces when reaching the screen
edge</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -1388,13 +1410,12 @@
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkCheckButton"
id="box_resize_check">
- <property name="label" translatable="yes">Hide
content of windows when _resizing</property>
+ <object class="GtkCheckButton"
id="box_move_check">
+ <property name="label" translatable="yes">When
_moving</property>
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1403,14 +1424,14 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton"
id="box_move_check">
- <property name="label" translatable="yes">Hide
content of windows when _moving</property>
+ <object class="GtkCheckButton"
id="box_resize_check">
+ <property name="label" translatable="yes">When
_resizing</property>
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1419,8 +1440,8 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1432,7 +1453,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Box
move and resize</b></property>
+ <property name="label"
translatable="yes"><b>Hide content of windows</b></property>
<property name="use_markup">True</property>
</object>
</child>
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
