adjust the themes with buttons to match how they are read now

diff --git a/configure.ac b/configure.ac
index e7bc737016a66852bfbaea74b55c9f50c5586b7c..8f4a68ea28ff3e34b346cd5a1314ebc998aa5ebb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,9 @@ X11_EXT_XINERAMA
 AC_CONFIG_FILES([Makefile
                  po/Makefile.in
                  themes/Makefile
+                 themes/ebox_data/Makefile
+                 themes/fieron_data/Makefile
+                 themes/fieron2_data/Makefile
                 data/Makefile
                  render/Makefile
                 parser/Makefile

diff --git a/themes/Makefile.am b/themes/Makefile.am
index 2a4e6b7a38fb81c5c3d8546ce306f8a036fe5e1e..9bcd07c96fca7202e18a707951d2496b4a47236b 100644 (file)
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -1,5 +1,7 @@
 themedir=$(datadir)/openbox/themes
 
+SUBDIRS=ebox_data fieron_data fieron2_data
+
 theme_DATA=artwiz bbs bluebox cthulhain deep ebox fieron fieron2 flux frobozz \
            frobust mbdtex miklos nyz nyzclone ob20 operation outcomes paper \
            purplehaaze shade steelblue steelblue2 the_orange trisb twice \

diff --git a/themes/ebox_buttons/bulletbc.xbm b/themes/ebox_buttons/bulletbc.xbm
deleted file mode 100644 (file)
index f74daa6..0000000
--- a/themes/ebox_buttons/bulletbc.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Created with The GIMP */
-#define bulletbc_width 8
-#define bulletbc_height 8
-static unsigned char bulletbc_bits[] = {
-   0x00, 0x04, 0x0e, 0x1c, 0x3c, 0x1c, 0x0e, 0x04 };

diff --git a/themes/ebox_buttons/bulletl.xbm b/themes/ebox_buttons/bulletl.xbm
deleted file mode 100644 (file)
index b136694..0000000
--- a/themes/ebox_buttons/bulletl.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Created with The GIMP */
-#define bulletl_width 8
-#define bulletl_height 8
-static unsigned char bulletl_bits[] = {
-   0x00, 0x20, 0x70, 0x38, 0x3c, 0x38, 0x70, 0x20 };

diff --git a/themes/ebox_buttons/bulletr.xbm b/themes/ebox_buttons/bulletr.xbm
deleted file mode 100644 (file)
index 5b2d6fd..0000000
--- a/themes/ebox_buttons/bulletr.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Created with The GIMP */
-#define bulletr_width 8
-#define bulletr_height 8
-static unsigned char bulletr_bits[] = {
-   0x00, 0x04, 0x0e, 0x1c, 0x3c, 0x1c, 0x0e, 0x04 };

diff --git a/themes/ebox_buttons/close.xbm b/themes/ebox_data/close.xbm
similarity index 100%
rename from themes/ebox_buttons/close.xbm
rename to themes/ebox_data/close.xbm

diff --git a/themes/ebox_buttons/icon.xbm b/themes/ebox_data/iconify.xbm
similarity index 100%
rename from themes/ebox_buttons/icon.xbm
rename to themes/ebox_data/iconify.xbm

diff --git a/themes/ebox_buttons/max.xbm b/themes/ebox_data/max.xbm
similarity index 100%
rename from themes/ebox_buttons/max.xbm
rename to themes/ebox_data/max.xbm

diff --git a/themes/fieron2_buttons/close.xbm b/themes/fieron2_data/close.xbm
similarity index 100%
rename from themes/fieron2_buttons/close.xbm
rename to themes/fieron2_data/close.xbm

diff --git a/themes/fieron2_buttons/icon.xbm b/themes/fieron2_data/iconify.xbm
similarity index 100%
rename from themes/fieron2_buttons/icon.xbm
rename to themes/fieron2_data/iconify.xbm

diff --git a/themes/fieron2_buttons/max.xbm b/themes/fieron2_data/max.xbm
similarity index 100%
rename from themes/fieron2_buttons/max.xbm
rename to themes/fieron2_data/max.xbm

diff --git a/themes/fieron2_buttons/stick.xbm b/themes/fieron2_data/stick.xbm
similarity index 100%
rename from themes/fieron2_buttons/stick.xbm
rename to themes/fieron2_data/stick.xbm

diff --git a/themes/fieron_buttons/close.xbm b/themes/fieron_data/close.xbm
similarity index 100%
rename from themes/fieron_buttons/close.xbm
rename to themes/fieron_data/close.xbm

diff --git a/themes/fieron_buttons/icon.xbm b/themes/fieron_data/iconify.xbm
similarity index 100%
rename from themes/fieron_buttons/icon.xbm
rename to themes/fieron_data/iconify.xbm

diff --git a/themes/fieron_buttons/max.xbm b/themes/fieron_data/max.xbm
similarity index 100%
rename from themes/fieron_buttons/max.xbm
rename to themes/fieron_data/max.xbm

diff --git a/themes/fieron_buttons/stick.xbm b/themes/fieron_data/stick.xbm
similarity index 100%
rename from themes/fieron_buttons/stick.xbm
rename to themes/fieron_data/stick.xbm