[Xfce4-commits] <xfwm4:master> Add special icons for the button layout in settings.
Nick Schermer
noreply at xfce.org
Sun Oct 30 11:02:03 CET 2011
Updating branch refs/heads/master
to db85f7be9187b435d344ea4c331a19527bf21da5 (commit)
from da9464448902ab9ea2a9c248237c07aad63fc634 (commit)
commit db85f7be9187b435d344ea4c331a19527bf21da5
Author: Nick Schermer <nick at xfce.org>
Date: Sun Oct 30 10:44:21 2011 +0100
Add special icons for the button layout in settings.
This makes it a lot easier to distinct the various actions.
Icons based on the default theme icons, created by Simon Steinbeiß.
Also add the active and hidden layout in a sizegroup and drop
the fixed size, this makes the buttons a bit bigger, but this
way the icons are not chopped.
Also rename the Hide action to Minimize, this is how it's call in
the menu too.
configure.ac.in | 1 +
icons/22x22/Makefile.am | 10 ++++++++++
icons/22x22/xfwm4-settings-close.png | Bin 0 -> 451 bytes
icons/22x22/xfwm4-settings-maximize.png | Bin 0 -> 345 bytes
icons/22x22/xfwm4-settings-menu.png | Bin 0 -> 295 bytes
icons/22x22/xfwm4-settings-minimize.png | Bin 0 -> 264 bytes
icons/22x22/xfwm4-settings-shade.png | Bin 0 -> 470 bytes
icons/22x22/xfwm4-settings-stick.png | Bin 0 -> 407 bytes
icons/Makefile.am | 1 +
settings-dialogs/xfwm4-dialog.glade | 27 +++++++++++++++------------
10 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index b643a23..afd56b5 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -259,6 +259,7 @@ doc/manual/po/Makefile
defaults/Makefile
helper-dialog/Makefile
icons/Makefile
+icons/22x22/Makefile
icons/48x48/Makefile
icons/scalable/Makefile
po/Makefile.in
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
new file mode 100644
index 0000000..f17695d
--- /dev/null
+++ b/icons/22x22/Makefile.am
@@ -0,0 +1,10 @@
+iconsdir = $(datadir)/icons/hicolor/22x22/actions
+icons_DATA = \
+ xfwm4-settings-close.png \
+ xfwm4-settings-maximize.png \
+ xfwm4-settings-menu.png \
+ xfwm4-settings-minimize.png \
+ xfwm4-settings-shade.png \
+ xfwm4-settings-stick.png
+
+EXTRA_DIST = $(icons_DATA)
diff --git a/icons/22x22/xfwm4-settings-close.png b/icons/22x22/xfwm4-settings-close.png
new file mode 100644
index 0000000..b7d9123
Binary files /dev/null and b/icons/22x22/xfwm4-settings-close.png differ
diff --git a/icons/22x22/xfwm4-settings-maximize.png b/icons/22x22/xfwm4-settings-maximize.png
new file mode 100644
index 0000000..ae20e47
Binary files /dev/null and b/icons/22x22/xfwm4-settings-maximize.png differ
diff --git a/icons/22x22/xfwm4-settings-menu.png b/icons/22x22/xfwm4-settings-menu.png
new file mode 100644
index 0000000..3823e52
Binary files /dev/null and b/icons/22x22/xfwm4-settings-menu.png differ
diff --git a/icons/22x22/xfwm4-settings-minimize.png b/icons/22x22/xfwm4-settings-minimize.png
new file mode 100644
index 0000000..f51b3b6
Binary files /dev/null and b/icons/22x22/xfwm4-settings-minimize.png differ
diff --git a/icons/22x22/xfwm4-settings-shade.png b/icons/22x22/xfwm4-settings-shade.png
new file mode 100644
index 0000000..67d4255
Binary files /dev/null and b/icons/22x22/xfwm4-settings-shade.png differ
diff --git a/icons/22x22/xfwm4-settings-stick.png b/icons/22x22/xfwm4-settings-stick.png
new file mode 100644
index 0000000..58e81f7
Binary files /dev/null and b/icons/22x22/xfwm4-settings-stick.png differ
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 19f8461..e6631a0 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,3 +1,4 @@
SUBDIRS = \
+ 22x22 \
48x48 \
scalable
diff --git a/settings-dialogs/xfwm4-dialog.glade b/settings-dialogs/xfwm4-dialog.glade
index 0286258..96f6aa8 100644
--- a/settings-dialogs/xfwm4-dialog.glade
+++ b/settings-dialogs/xfwm4-dialog.glade
@@ -198,14 +198,12 @@
<object class="GtkFrame" id="active-frame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
<child>
<object class="GtkAlignment" id="alignment17">
<property name="visible">True</property>
<property name="border_width">6</property>
<child>
<object class="GtkHBox" id="active-box">
- <property name="height_request">26</property>
<property name="visible">True</property>
<child>
<object class="GtkButton" id="button-layout-|">
@@ -241,16 +239,14 @@
<object class="GtkFrame" id="hidden-frame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
<child>
<object class="GtkAlignment" id="alignment18">
<property name="visible">True</property>
<property name="border_width">6</property>
<child>
<object class="GtkHBox" id="hidden-box">
- <property name="height_request">26</property>
<property name="visible">True</property>
- <property name="spacing">5</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkButton" id="button-layout-O">
<property name="visible">True</property>
@@ -260,7 +256,7 @@
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="stock">gtk-index</property>
+ <property name="icon_name">xfwm4-settings-menu</property>
</object>
</child>
</object>
@@ -279,7 +275,7 @@
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="stock">gtk-add</property>
+ <property name="icon_name">xfwm4-settings-stick</property>
</object>
</child>
</object>
@@ -298,7 +294,7 @@
<child>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="stock">gtk-goto-top</property>
+ <property name="icon_name">xfwm4-settings-shade</property>
</object>
</child>
</object>
@@ -313,11 +309,11 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Hide</property>
+ <property name="tooltip_text" translatable="yes">Minimize</property>
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
- <property name="stock">gtk-undo</property>
+ <property name="icon_name">xfwm4-settings-minimize</property>
</object>
</child>
</object>
@@ -336,7 +332,7 @@
<child>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
- <property name="stock">gtk-zoom-100</property>
+ <property name="icon_name">xfwm4-settings-maximize</property>
</object>
</child>
</object>
@@ -355,7 +351,7 @@
<child>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
- <property name="stock">gtk-close</property>
+ <property name="icon_name">xfwm4-settings-close</property>
</object>
</child>
</object>
@@ -1316,4 +1312,11 @@
<action-widget response="0">close_button</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="mode">vertical</property>
+ <widgets>
+ <widget name="alignment17"/>
+ <widget name="alignment18"/>
+ </widgets>
+ </object>
</interface>
More information about the Xfce4-commits
mailing list