merge r5977 from trunk (using old themerc files)

diff --git a/Makefile.am b/Makefile.am
index d0082370ab97c9374867575f2aec13d89474d89b..770ab78d201035b2c924f26b058e256d6e462c01 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 
-theme = bear2
+theme = Clearlooks
 
 AUTOMAKE_OPTIONS = subdir-objects foreign
 
@@ -222,6 +222,28 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \
 
 ## themes ##
 
+clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks_theme_DATA= \
+       themes/Clearlooks/openbox-3/bullet.xbm \
+       themes/Clearlooks/openbox-3/close.xbm \
+       themes/Clearlooks/openbox-3/desk_toggled.xbm \
+       themes/Clearlooks/openbox-3/desk.xbm \
+       themes/Clearlooks/openbox-3/iconify.xbm \
+       themes/Clearlooks/openbox-3/max_toggled.xbm \
+       themes/Clearlooks/openbox-3/max.xbm \
+       themes/Clearlooks/openbox-3/themerc.xml
+
+clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
+dist_clearlooksolive_theme_DATA= \
+       themes/Clearlooks-Olive/openbox-3/bullet.xbm \
+       themes/Clearlooks-Olive/openbox-3/close.xbm \
+       themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm \
+       themes/Clearlooks-Olive/openbox-3/desk.xbm \
+       themes/Clearlooks-Olive/openbox-3/iconify.xbm \
+       themes/Clearlooks-Olive/openbox-3/max_toggled.xbm \
+       themes/Clearlooks-Olive/openbox-3/max.xbm \
+       themes/Clearlooks-Olive/openbox-3/themerc.xml
+
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
 dist_mikachu_theme_DATA= \
        themes/Mikachu/openbox-3/bullet.xbm \
@@ -258,7 +280,7 @@ dist_artwizboxed_theme_DATA= \
        themes/artwiz-boxed/openbox-3/max_toggled.xbm \
        themes/artwiz-boxed/openbox-3/max.xbm \
        themes/artwiz-boxed/openbox-3/themerc
- 
+
 bear2_themedir = $(themedir)/bear2/openbox-3
 dist_bear2_theme_DATA= \
        themes/bear2/openbox-3/close_pressed.xbm \
@@ -275,7 +297,7 @@ dist_bear2_theme_DATA= \
        themes/bear2/openbox-3/shade_pressed.xbm \
        themes/bear2/openbox-3/shade.xbm \
        themes/bear2/openbox-3/themerc
- 
+
 orang_themedir = $(themedir)/orang/openbox-3
 dist_orang_theme_DATA= \
        themes/orang/openbox-3/themerc

diff --git a/data/rc.xml.in b/data/rc.xml.in
index d42c3135587fb1398e1c0f08747710055d90f148..69b2484bb6ff326b39eeba3553fbc285a0867b0e 100644 (file)
--- a/data/rc.xml.in
+++ b/data/rc.xml.in
@@ -28,7 +28,7 @@
 </placement>
 
 <theme>
-  <name>bear2</name>
+  <name>Clearlooks</name>
   <titleLayout>NLIMC</titleLayout>
   <titleNumber>yes</titleNumber>
   <!--

diff --git a/themes/Clearlooks-Olive/openbox-3/bullet.xbm b/themes/Clearlooks-Olive/openbox-3/bullet.xbm
new file mode 100644 (file)
index 0000000..88481ec
--- /dev/null
+++ b/themes/Clearlooks-Olive/openbox-3/bullet.xbm
@@ -0,0 +1,4 @@
+#define bullet_width 4
+#define bullet_height 7
+static unsigned char bullet_bits[] = {
+   0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 };

diff --git a/themes/Clearlooks-Olive/openbox-3/close.xbm b/themes/Clearlooks-Olive/openbox-3/close.xbm
new file mode 100644 (file)
index 0000000..4a88cff
--- /dev/null
+++ b/themes/Clearlooks-Olive/openbox-3/close.xbm
@@ -0,0 +1,4 @@
+#define close_width 6
+#define close_height 6
+static unsigned char close_bits[] = {
+   0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 };

diff --git a/themes/Clearlooks-Olive/openbox-3/desk.xbm b/themes/Clearlooks-Olive/openbox-3/desk.xbm
new file mode 100644 (file)
index 0000000..3e327e3
--- /dev/null
+++ b/themes/Clearlooks-Olive/openbox-3/desk.xbm
@@ -0,0 +1,4 @@
+#define desk_width 6
+#define desk_height 6
+static unsigned char desk_bits[] = {
+   0x33, 0x33, 0x00, 0x00, 0x33, 0x33 };

diff --git a/themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm b/themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm
new file mode 100644 (file)
index 0000000..d7e045e
--- /dev/null
+++ b/themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm
@@ -0,0 +1,4 @@
+#define desk_toggle_width 6
+#define desk_toggle_height 6
+static unsigned char desk_toggle_bits[] = {
+   0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 };

diff --git a/themes/Clearlooks-Olive/openbox-3/iconify.xbm b/themes/Clearlooks-Olive/openbox-3/iconify.xbm
new file mode 100644 (file)
index 0000000..2304866
--- /dev/null
+++ b/themes/Clearlooks-Olive/openbox-3/iconify.xbm
@@ -0,0 +1,4 @@
+#define iconify_width 6
+#define iconify_height 6
+static unsigned char iconify_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f };

diff --git a/themes/Clearlooks-Olive/openbox-3/max.xbm b/themes/Clearlooks-Olive/openbox-3/max.xbm
new file mode 100644 (file)
index 0000000..6d030af
--- /dev/null
+++ b/themes/Clearlooks-Olive/openbox-3/max.xbm
@@ -0,0 +1,4 @@
+#define max_width 6
+#define max_height 6
+static unsigned char max_bits[] = {
+   0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f };

diff --git a/themes/Clearlooks-Olive/openbox-3/max_toggled.xbm b/themes/Clearlooks-Olive/openbox-3/max_toggled.xbm
new file mode 100644 (file)
index 0000000..44c7cef
--- /dev/null
+++ b/themes/Clearlooks-Olive/openbox-3/max_toggled.xbm
@@ -0,0 +1,4 @@
+#define max_width 6
+#define max_height 6
+static unsigned char max_bits[] = {
+   0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f };

diff --git a/themes/Clearlooks-Olive/openbox-3/themerc b/themes/Clearlooks-Olive/openbox-3/themerc
new file mode 100644 (file)
index 0000000..d1aaad5
--- /dev/null
+++ b/themes/Clearlooks-Olive/openbox-3/themerc
@@ -0,0 +1,119 @@
+# Name: Clearlooks-Olive
+# Author: John McKnight <jmcknight@gmail.com>
+# Note: This is a port of the Clearlooks-Olive metacity theme to Openbox.
+
+# Menu settings
+menu.title.bg: Raised Gradient Vertical
+menu.title.bg.color: #95ad70
+menu.title.bg.colorTo: #7d925d
+menu.title.text.color: #ffffff
+menu.title.text.justify: Left
+
+menu.items.bg: Flat Solid
+menu.items.bg.color: #f1eee0
+menu.items.text.color: #444444
+menu.items.disabled.text.color: #999999
+
+menu.items.active.bg: Flat Gradient Vertical Border
+menu.items.active.bg.color: #b4c994
+menu.items.active.bg.colorTo: #92aa6d
+menu.items.active.bg.border.color: #92aa6d
+menu.items.active.text.color: #ffffff
+
+
+# Window settings (focused)
+window.active.title.bg: Raised Gradient Vertical
+window.active.title.bg.color: #95ad70
+window.active.title.bg.colorTo: #7d925d
+
+window.active.label.bg: Parentrelative
+window.active.label.text.color: #ffffff
+
+window.active.handle.bg: Raised Gradient Vertical
+window.active.handle.bg.color: #95ad70
+window.active.handle.bg.colorTo: #7d925d
+
+window.active.grip.bg: Raised Gradient Vertical
+window.active.grip.bg.color: #95ad70
+window.active.grip.bg.colorTo: #7d925d
+
+window.active.button.unpressed.bg: Flat Gradient Vertical Border
+window.active.button.unpressed.bg.color: #65744e
+window.active.button.unpressed.bg.colorTo: #5b6846
+window.active.button.unpressed.bg.border.color: #abbc91
+window.active.button.unpressed.image.color: #ffffff
+
+window.active.button.pressed.bg: Flat Gradient Vertical Border
+window.active.button.pressed.bg.color: #373d2b
+window.active.button.pressed.bg.colorTo: #333828
+window.active.button.pressed.bg.border.color: #abbc91
+window.active.button.pressed.image.color: #ffffff
+
+window.active.button.disabled.bg: Flat Gradient Vertical Border
+window.active.button.disabled.bg.color: #373d2b
+window.active.button.disabled.bg.colorTo: #333828
+window.active.button.disabled.bg.border.color: #abbc91
+window.active.button.disabled.image.color: #abbc91
+
+window.active.button.toggled.bg: Flat Gradient Vertical Border
+window.active.button.toggled.bg.color: #65744e
+window.active.button.toggled.bg.colorTo: #5b6846
+window.active.button.toggled.bg.border.color: #abbc91
+window.active.button.toggled.image.color: #b9b7a7
+
+
+# Window settings (unfocused)
+window.inactive.title.bg: Raised Gradient Vertical
+window.inactive.title.bg.color: #f1eeea
+window.inactive.title.bg.colorTo: #d8cfc7
+
+window.inactive.label.bg: Parentrelative
+window.inactive.label.text.color: #000000
+
+window.inactive.handle.bg: Raised Gradient Vertical
+window.inactive.handle.bg.color: #f1eeea
+window.inactive.handle.bg.colorTo: #d8cfc7
+
+window.inactive.grip.bg: Raised Gradient Vertical
+window.inactive.grip.bg.color: #f1eeea
+window.inactive.grip.bg.colorTo: #d8cfc7
+
+window.inactive.button.unpressed.bg: Flat Gradient Vertical Border
+window.inactive.button.unpressed.bg.color: #efebe7
+window.inactive.button.unpressed.bg.colorTo: #ddd6ce
+window.inactive.button.unpressed.bg.border.color: #8f8173
+window.inactive.button.unpressed.image.color: #000000
+
+window.inactive.button.pressed.bg: Flat Gradient Vertical Border
+window.inactive.button.pressed.bg.color: #efebe7
+window.inactive.button.pressed.bg.colorTo: #ddd6ce
+window.inactive.button.pressed.bg.border.color: #8f8173
+window.inactive.button.pressed.image.color: #000000
+
+window.inactive.button.disabled.bg: Flat Gradient Vertical Border
+window.inactive.button.disabled.bg.color: #efebe7
+window.inactive.button.disabled.bg.colorTo: #ddd6ce
+window.inactive.button.disabled.bg.border.color: #8f8173
+window.inactive.button.disabled.image.color: #8f8173
+
+window.inactive.button.toggled.bg: Flat Gradient Vertical Border
+window.inactive.button.toggled.bg.color: #efebe7
+window.inactive.button.toggled.bg.colorTo: #ddd6ce
+window.inactive.button.toggled.bg.border.color: #8f8173
+window.inactive.button.toggled.image.color: #000000
+
+
+### Everything else
+border.width: 1
+padding.width: 2
+window.handle.width: 3
+window.client.padding.width: 0
+border.color: #000000
+menu.overlap: 0
+
+
+### Fonts
+window.active.label.text.font:Bitstream Vera Sans:pixelsize=10:bold:shadow=y:shadowtint=70:shadowoffset=1
+window.inactive.label.text.font:Bitstream Vera Sans:pixelsize=10:bold:shadow=y:shadowtint=20:shadowoffset=1
+menu.items.font:Bitstream Vera Sans:pixelsize=10
+menu.title.text.font:Bitstream Vera Sans:bold:pixelsize=10:shadow=y:shadowtint=70

diff --git a/themes/Clearlooks/openbox-3/bullet.xbm b/themes/Clearlooks/openbox-3/bullet.xbm
new file mode 100644 (file)
index 0000000..88481ec
--- /dev/null
+++ b/themes/Clearlooks/openbox-3/bullet.xbm
@@ -0,0 +1,4 @@
+#define bullet_width 4
+#define bullet_height 7
+static unsigned char bullet_bits[] = {
+   0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 };

diff --git a/themes/Clearlooks/openbox-3/close.xbm b/themes/Clearlooks/openbox-3/close.xbm
new file mode 100644 (file)
index 0000000..4a88cff
--- /dev/null
+++ b/themes/Clearlooks/openbox-3/close.xbm
@@ -0,0 +1,4 @@
+#define close_width 6
+#define close_height 6
+static unsigned char close_bits[] = {
+   0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 };

diff --git a/themes/Clearlooks/openbox-3/desk.xbm b/themes/Clearlooks/openbox-3/desk.xbm
new file mode 100644 (file)
index 0000000..3e327e3
--- /dev/null
+++ b/themes/Clearlooks/openbox-3/desk.xbm
@@ -0,0 +1,4 @@
+#define desk_width 6
+#define desk_height 6
+static unsigned char desk_bits[] = {
+   0x33, 0x33, 0x00, 0x00, 0x33, 0x33 };

diff --git a/themes/Clearlooks/openbox-3/desk_toggled.xbm b/themes/Clearlooks/openbox-3/desk_toggled.xbm
new file mode 100644 (file)
index 0000000..d7e045e
--- /dev/null
+++ b/themes/Clearlooks/openbox-3/desk_toggled.xbm
@@ -0,0 +1,4 @@
+#define desk_toggle_width 6
+#define desk_toggle_height 6
+static unsigned char desk_toggle_bits[] = {
+   0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 };

diff --git a/themes/Clearlooks/openbox-3/iconify.xbm b/themes/Clearlooks/openbox-3/iconify.xbm
new file mode 100644 (file)
index 0000000..2304866
--- /dev/null
+++ b/themes/Clearlooks/openbox-3/iconify.xbm
@@ -0,0 +1,4 @@
+#define iconify_width 6
+#define iconify_height 6
+static unsigned char iconify_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f };

diff --git a/themes/Clearlooks/openbox-3/max.xbm b/themes/Clearlooks/openbox-3/max.xbm
new file mode 100644 (file)
index 0000000..6d030af
--- /dev/null
+++ b/themes/Clearlooks/openbox-3/max.xbm
@@ -0,0 +1,4 @@
+#define max_width 6
+#define max_height 6
+static unsigned char max_bits[] = {
+   0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f };

diff --git a/themes/Clearlooks/openbox-3/max_toggled.xbm b/themes/Clearlooks/openbox-3/max_toggled.xbm
new file mode 100644 (file)
index 0000000..44c7cef
--- /dev/null
+++ b/themes/Clearlooks/openbox-3/max_toggled.xbm
@@ -0,0 +1,4 @@
+#define max_width 6
+#define max_height 6
+static unsigned char max_bits[] = {
+   0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f };

diff --git a/themes/Clearlooks/openbox-3/themerc b/themes/Clearlooks/openbox-3/themerc
new file mode 100644 (file)
index 0000000..7db02e0
--- /dev/null
+++ b/themes/Clearlooks/openbox-3/themerc
@@ -0,0 +1,118 @@
+# Name: Clearlooks
+# Author: John McKnight <jmcknight@gmail.com>
+# Note: This is a port of the Clearlooks metacity theme to Openbox.
+
+# Menu settings
+menu.title.bg: Raised Gradient Vertical
+menu.title.bg.color: #658fb5
+menu.title.bg.colorTo: #4d6982
+menu.title.text.color: #ffffff
+menu.title.text.justify: Left
+
+menu.items.bg: Flat Solid
+menu.items.bg.color: #f8f5f2
+menu.items.text.color: #000000
+menu.items.disabled.text.color: #999999
+
+menu.items.active.bg: Flat Gradient Vertical
+menu.items.active.bg.color: #628cb2
+menu.items.active.bg.colorTo: #50708d
+menu.items.active.text.color: #ffffff
+
+
+# Window settings (focused)
+window.active.title.bg: Raised Gradient Vertical
+window.active.title.bg.color: #658fb5
+window.active.title.bg.colorTo: #4d6982
+
+window.active.label.bg: Parentrelative
+window.active.label.text.color: #ffffff
+
+window.active.handle.bg: Raised Gradient Vertical
+window.active.handle.bg.color: #658fb5
+window.active.handle.bg.colorTo: #4d6982
+
+window.active.grip.bg: Raised Gradient Vertical
+window.active.grip.bg.color: #658fb5
+window.active.grip.bg.colorTo: #4d6982
+
+window.active.button.unpressed.bg: Flat Gradient Vertical Border
+window.active.button.unpressed.bg.color: #6993b9
+window.active.button.unpressed.bg.colorTo: #55799a
+window.active.button.unpressed.bg.border.color: #3d4c5a
+window.active.button.unpressed.image.color: #ffffff
+
+window.active.button.pressed.bg: Flat Gradient Vertical Border
+window.active.button.pressed.bg.color: #537797
+window.active.button.pressed.bg.colorTo: #50708e
+window.active.button.pressed.bg.border.color: #3d4c5a
+window.active.button.pressed.image.color: #ffffff
+
+window.active.button.disabled.bg: Flat Gradient Vertical Border
+window.active.button.disabled.bg.color: #537797
+window.active.button.disabled.bg.colorTo: #50708e
+window.active.button.disabled.bg.border.color: #3d4c5a
+window.active.button.disabled.image.color: #3d4c5a
+
+window.active.button.toggled.bg: Flat Gradient Vertical Border
+window.active.button.toggled.bg.color: #6993b9
+window.active.button.toggled.bg.colorTo: #55799a
+window.active.button.toggled.bg.border.color: #3d4c5a
+window.active.button.toggled.image.color: #cccccc
+
+
+# Window settings (unfocused)
+window.inactive.title.bg: Raised Gradient Vertical
+window.inactive.title.bg.color: #f1eeea
+window.inactive.title.bg.colorTo: #d8cfc7
+
+window.inactive.label.bg: Parentrelative
+window.inactive.label.text.color: #000000
+
+window.inactive.handle.bg: Raised Gradient Vertical
+window.inactive.handle.bg.color: #f1eeea
+window.inactive.handle.bg.colorTo: #d8cfc7
+
+window.inactive.grip.bg: Raised Gradient Vertical
+window.inactive.grip.bg.color: #f1eeea
+window.inactive.grip.bg.colorTo: #d8cfc7
+
+window.inactive.button.unpressed.bg: Flat Gradient Vertical Border
+window.inactive.button.unpressed.bg.color: #efebe7
+window.inactive.button.unpressed.bg.colorTo: #ddd6ce
+window.inactive.button.unpressed.bg.border.color: #8f8173
+window.inactive.button.unpressed.image.color: #000000
+
+window.inactive.button.pressed.bg: Flat Gradient Vertical Border
+window.inactive.button.pressed.bg.color: #efebe7
+window.inactive.button.pressed.bg.colorTo: #ddd6ce
+window.inactive.button.pressed.bg.border.color: #8f8173
+window.inactive.button.pressed.image.color: #000000
+
+window.inactive.button.disabled.bg: Flat Gradient Vertical Border
+window.inactive.button.disabled.bg.color: #efebe7
+window.inactive.button.disabled.bg.colorTo: #ddd6ce
+window.inactive.button.disabled.bg.border.color: #8f8173
+window.inactive.button.disabled.image.color: #8f8173
+
+window.inactive.button.toggled.bg: Flat Gradient Vertical Border
+window.inactive.button.toggled.bg.color: #efebe7
+window.inactive.button.toggled.bg.colorTo: #ddd6ce
+window.inactive.button.toggled.bg.border.color: #8f8173
+window.inactive.button.toggled.image.color: #000000
+
+
+### Everything else
+border.width: 1
+padding.width: 2
+window.handle.width: 3
+window.client.padding.width: 0
+border.color: #000000
+menu.overlap: 0
+
+
+### Fonts
+window.active.label.text.font:Bitstream Vera Sans:pixelsize=10:bold:shadow=y:shadowtint=70:shadowoffset=1
+window.inactive.label.text.font:Bitstream Vera Sans:pixelsize=10:bold:shadow=y:shadowtint=20:shadowoffset=1
+menu.items.font:Bitstream Vera Sans:pixelsize=10
+menu.title.text.font:Bitstream Vera Sans:bold:pixelsize=10:shadow=y:shadowtint=70