From: Dana Jansens Date: Sat, 12 May 2007 00:48:06 +0000 (+0000) Subject: remove buttons from themes when they are using the defaults already for clarity X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=3bee91aaf9c9893fb4a516432ad195a117baf1ce;p=chaz%2Fopenbox remove buttons from themes when they are using the defaults already for clarity some small changes to themes.. buttons can hide themselves now, so removed the empty disabled masks for Bear2 and Natura install the default xbms for reference to the doc dir install some basic documentation to the doc dir --- diff --git a/Makefile.am b/Makefile.am index 1d31a73b..553fcb92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = m4 po +docxbmdir = $(docdir)/xbm themedir = $(datadir)/themes localedir = $(datadir)/locale configdir = $(sysconfdir)/xdg @@ -247,28 +248,27 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ tools/gnome-panel-control/gnome-panel-control.c +## default button masks ## +dist_docxbm_DATA = \ + data/xbm/bullet.xbm \ + data/xbm/close.xbm \ + data/xbm/desk_toggled.xbm \ + data/xbm/desk.xbm \ + data/xbm/iconify.xbm \ + data/xbm/max_toggled.xbm \ + data/xbm/max.xbm \ + data/xbm/shade_toggled.xbm \ + data/xbm/shade.xbm + + ## 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 @@ -286,25 +286,19 @@ dist_natura_theme_DATA= \ themes/Natura/openbox-3/close_hover.xbm \ themes/Natura/openbox-3/close.xbm \ themes/Natura/openbox-3/desk_toggled.xbm \ + themes/Natura/openbox-3/desk_hover.xbm \ themes/Natura/openbox-3/desk.xbm \ - themes/Natura/openbox-3/iconify_disabled.xbm \ themes/Natura/openbox-3/iconify_hover.xbm \ themes/Natura/openbox-3/iconify.xbm \ - themes/Natura/openbox-3/max_disabled.xbm \ themes/Natura/openbox-3/max_hover.xbm \ themes/Natura/openbox-3/max_toggled.xbm \ themes/Natura/openbox-3/max.xbm \ themes/Natura/openbox-3/shade.xbm \ + themes/Natura/openbox-3/shade_hover.xbm \ themes/Natura/openbox-3/themerc.xml artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3 dist_artwizboxed_theme_DATA= \ - themes/Artwiz-boxed/openbox-3/close.xbm \ - themes/Artwiz-boxed/openbox-3/desk_toggled.xbm \ - themes/Artwiz-boxed/openbox-3/desk.xbm \ - themes/Artwiz-boxed/openbox-3/iconify.xbm \ - themes/Artwiz-boxed/openbox-3/max_toggled.xbm \ - themes/Artwiz-boxed/openbox-3/max.xbm \ themes/Artwiz-boxed/openbox-3/themerc.xml bear2_themedir = $(themedir)/Bear2/openbox-3 @@ -313,10 +307,8 @@ dist_bear2_theme_DATA= \ themes/Bear2/openbox-3/close.xbm \ themes/Bear2/openbox-3/desk_toggled.xbm \ themes/Bear2/openbox-3/desk.xbm \ - themes/Bear2/openbox-3/iconify_disabled.xbm \ themes/Bear2/openbox-3/iconify_pressed.xbm \ themes/Bear2/openbox-3/iconify.xbm \ - themes/Bear2/openbox-3/max_disabled.xbm \ themes/Bear2/openbox-3/max_pressed.xbm \ themes/Bear2/openbox-3/max_toggled.xbm \ themes/Bear2/openbox-3/max.xbm \ @@ -330,17 +322,10 @@ dist_orang_theme_DATA= \ syscrash_themedir = $(themedir)/Syscrash/openbox-3 dist_syscrash_theme_DATA= \ - themes/Syscrash/openbox-3/bullet.xbm \ - themes/Syscrash/openbox-3/close_disabled.xbm \ - themes/Syscrash/openbox-3/close.xbm \ - themes/Syscrash/openbox-3/desk_toggled.xbm \ - themes/Syscrash/openbox-3/desk.xbm \ - themes/Syscrash/openbox-3/iconify.xbm \ themes/Syscrash/openbox-3/max_disabled.xbm \ themes/Syscrash/openbox-3/max_pressed.xbm \ themes/Syscrash/openbox-3/max_toggled.xbm \ themes/Syscrash/openbox-3/max.xbm \ - themes/Syscrash/openbox-3/shade.xbm \ themes/Syscrash/openbox-3/themerc.xml ## public headers ## @@ -432,14 +417,16 @@ dist_noinst_DATA = \ tests/title.c \ tests/urgent.c +dist_doc_DATA = \ + COMPLIANCE \ + README \ + AUTHORS + EXTRA_DIST = \ config.rpath \ mkinstalldirs \ CHANGELOG \ - COMPLIANCE \ - README \ - COPYING \ - AUTHORS + COPYING #doc: # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc diff --git a/themes/Clearlooks-Olive/openbox-3/bullet.xbm b/data/xbm/bullet.xbm similarity index 100% rename from themes/Clearlooks-Olive/openbox-3/bullet.xbm rename to data/xbm/bullet.xbm diff --git a/themes/Clearlooks-Olive/openbox-3/close.xbm b/data/xbm/close.xbm similarity index 100% rename from themes/Clearlooks-Olive/openbox-3/close.xbm rename to data/xbm/close.xbm diff --git a/themes/Clearlooks-Olive/openbox-3/desk.xbm b/data/xbm/desk.xbm similarity index 100% rename from themes/Clearlooks-Olive/openbox-3/desk.xbm rename to data/xbm/desk.xbm diff --git a/themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm b/data/xbm/desk_toggled.xbm similarity index 100% rename from themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm rename to data/xbm/desk_toggled.xbm diff --git a/themes/Clearlooks-Olive/openbox-3/iconify.xbm b/data/xbm/iconify.xbm similarity index 100% rename from themes/Clearlooks-Olive/openbox-3/iconify.xbm rename to data/xbm/iconify.xbm diff --git a/themes/Clearlooks-Olive/openbox-3/max.xbm b/data/xbm/max.xbm similarity index 100% rename from themes/Clearlooks-Olive/openbox-3/max.xbm rename to data/xbm/max.xbm diff --git a/themes/Clearlooks-Olive/openbox-3/max_toggled.xbm b/data/xbm/max_toggled.xbm similarity index 100% rename from themes/Clearlooks-Olive/openbox-3/max_toggled.xbm rename to data/xbm/max_toggled.xbm diff --git a/themes/Clearlooks/openbox-3/iconify.xbm b/data/xbm/shade.xbm similarity index 68% rename from themes/Clearlooks/openbox-3/iconify.xbm rename to data/xbm/shade.xbm index 23048669..edb3b171 100644 --- a/themes/Clearlooks/openbox-3/iconify.xbm +++ b/data/xbm/shade.xbm @@ -1,4 +1,4 @@ #define iconify_width 6 #define iconify_height 6 static unsigned char iconify_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; + 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; diff --git a/themes/Syscrash/openbox-3/iconify.xbm b/data/xbm/shade_toggled.xbm similarity index 68% rename from themes/Syscrash/openbox-3/iconify.xbm rename to data/xbm/shade_toggled.xbm index 23048669..edb3b171 100644 --- a/themes/Syscrash/openbox-3/iconify.xbm +++ b/data/xbm/shade_toggled.xbm @@ -1,4 +1,4 @@ #define iconify_width 6 #define iconify_height 6 static unsigned char iconify_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; + 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; diff --git a/themes/Artwiz-boxed/openbox-3/close.xbm b/themes/Artwiz-boxed/openbox-3/close.xbm deleted file mode 100644 index 0f085f73..00000000 --- a/themes/Artwiz-boxed/openbox-3/close.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define close_width 7 -#define close_height 7 -static unsigned char close_bits[] = { - 0x41, 0x22, 0x14, 0x08, 0x14, 0x22, 0x41 }; diff --git a/themes/Artwiz-boxed/openbox-3/desk.xbm b/themes/Artwiz-boxed/openbox-3/desk.xbm deleted file mode 100644 index 4a462003..00000000 --- a/themes/Artwiz-boxed/openbox-3/desk.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define desk_width 7 -#define desk_height 7 -static unsigned char desk_bits[] = { - 0x00, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00 }; diff --git a/themes/Artwiz-boxed/openbox-3/desk_toggled.xbm b/themes/Artwiz-boxed/openbox-3/desk_toggled.xbm deleted file mode 100644 index 509d16e0..00000000 --- a/themes/Artwiz-boxed/openbox-3/desk_toggled.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define desk_toggled_width 7 -#define desk_toggled_height 7 -static unsigned char desk_toggled_bits[] = { - 0x00, 0x22, 0x00, 0x00, 0x00, 0x22, 0x00 }; diff --git a/themes/Artwiz-boxed/openbox-3/iconify.xbm b/themes/Artwiz-boxed/openbox-3/iconify.xbm deleted file mode 100644 index c16a8934..00000000 --- a/themes/Artwiz-boxed/openbox-3/iconify.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define iconify_width 7 -#define iconify_height 7 -static unsigned char iconify_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x7f, 0x41, 0x7f }; diff --git a/themes/Artwiz-boxed/openbox-3/max.xbm b/themes/Artwiz-boxed/openbox-3/max.xbm deleted file mode 100644 index 402b1cf5..00000000 --- a/themes/Artwiz-boxed/openbox-3/max.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define max_width 7 -#define max_height 7 -static unsigned char max_bits[] = { - 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x41, 0x7f }; diff --git a/themes/Artwiz-boxed/openbox-3/max_toggled.xbm b/themes/Artwiz-boxed/openbox-3/max_toggled.xbm deleted file mode 100644 index d486135a..00000000 --- a/themes/Artwiz-boxed/openbox-3/max_toggled.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define max_toggled_width 7 -#define max_toggled_height 7 -static unsigned char max_toggled_bits[] = { - 0x7c, 0x44, 0x5f, 0x55, 0x7d, 0x11, 0x1f }; diff --git a/themes/Bear2/openbox-3/iconify_disabled.xbm b/themes/Bear2/openbox-3/iconify_disabled.xbm deleted file mode 100644 index 550a4a3c..00000000 --- a/themes/Bear2/openbox-3/iconify_disabled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define iconify_disabled_width 10 -#define iconify_disabled_height 10 -static unsigned char iconify_disabled_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/themes/Bear2/openbox-3/max_disabled.xbm b/themes/Bear2/openbox-3/max_disabled.xbm deleted file mode 100644 index cb671bbf..00000000 --- a/themes/Bear2/openbox-3/max_disabled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define max_disabled_width 10 -#define max_disabled_height 10 -static unsigned char max_disabled_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/themes/Bear2/openbox-3/themerc.xml b/themes/Bear2/openbox-3/themerc.xml index 68b0adac..bca1b0b5 100644 --- a/themes/Bear2/openbox-3/themerc.xml +++ b/themes/Bear2/openbox-3/themerc.xml @@ -42,7 +42,7 @@ - + @@ -93,7 +93,7 @@ - + diff --git a/themes/Clearlooks/openbox-3/bullet.xbm b/themes/Clearlooks/openbox-3/bullet.xbm deleted file mode 100644 index 88481ec8..00000000 --- a/themes/Clearlooks/openbox-3/bullet.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#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 deleted file mode 100644 index 4a88cff6..00000000 --- a/themes/Clearlooks/openbox-3/close.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#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 deleted file mode 100644 index 3e327e36..00000000 --- a/themes/Clearlooks/openbox-3/desk.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#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 deleted file mode 100644 index d7e045ee..00000000 --- a/themes/Clearlooks/openbox-3/desk_toggled.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#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/max.xbm b/themes/Clearlooks/openbox-3/max.xbm deleted file mode 100644 index 6d030af4..00000000 --- a/themes/Clearlooks/openbox-3/max.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#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 deleted file mode 100644 index 44c7cefc..00000000 --- a/themes/Clearlooks/openbox-3/max_toggled.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define max_width 6 -#define max_height 6 -static unsigned char max_bits[] = { - 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; diff --git a/themes/Natura/openbox-3/desk.xbm b/themes/Natura/openbox-3/desk.xbm index f6e24ce6..6cdbbf11 100644 --- a/themes/Natura/openbox-3/desk.xbm +++ b/themes/Natura/openbox-3/desk.xbm @@ -1,4 +1,4 @@ #define desk_width 8 #define desk_height 8 static unsigned char desk_bits[] = { - 0x00, 0x00, 0x48, 0x78, 0x7f, 0x78, 0x48, 0x00 }; + 0x00, 0x00, 0x48, 0x78, 0x7e, 0x78, 0x48, 0x00 }; diff --git a/themes/Natura/openbox-3/desk_hover.xbm b/themes/Natura/openbox-3/desk_hover.xbm new file mode 100644 index 00000000..5e385d66 --- /dev/null +++ b/themes/Natura/openbox-3/desk_hover.xbm @@ -0,0 +1,4 @@ +#define desk_hover_width 8 +#define desk_hover_height 8 +static unsigned char desk_hover_bits[] = { + 0x00, 0x88, 0x88, 0xf8, 0xff, 0xf8, 0x88, 0x88 }; diff --git a/themes/Natura/openbox-3/iconify_disabled.xbm b/themes/Natura/openbox-3/iconify_disabled.xbm deleted file mode 100644 index 550a4a3c..00000000 --- a/themes/Natura/openbox-3/iconify_disabled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define iconify_disabled_width 10 -#define iconify_disabled_height 10 -static unsigned char iconify_disabled_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/themes/Natura/openbox-3/max_disabled.xbm b/themes/Natura/openbox-3/max_disabled.xbm deleted file mode 100644 index cb671bbf..00000000 --- a/themes/Natura/openbox-3/max_disabled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define max_disabled_width 10 -#define max_disabled_height 10 -static unsigned char max_disabled_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/themes/Natura/openbox-3/shade.xbm b/themes/Natura/openbox-3/shade.xbm index ff774f89..aaf1ec76 100644 --- a/themes/Natura/openbox-3/shade.xbm +++ b/themes/Natura/openbox-3/shade.xbm @@ -1,4 +1,4 @@ #define shade_width 8 #define shade_height 8 static unsigned char shade_bits[] = { - 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x7e, 0x7e, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/themes/Natura/openbox-3/shade_hover.xbm b/themes/Natura/openbox-3/shade_hover.xbm new file mode 100644 index 00000000..756842af --- /dev/null +++ b/themes/Natura/openbox-3/shade_hover.xbm @@ -0,0 +1,4 @@ +#define shade_hover_width 8 +#define shade_hover_height 8 +static unsigned char shade_hover_bits[] = { + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/themes/Natura/openbox-3/themerc.xml b/themes/Natura/openbox-3/themerc.xml index c4332e8b..6ba88e16 100644 --- a/themes/Natura/openbox-3/themerc.xml +++ b/themes/Natura/openbox-3/themerc.xml @@ -43,10 +43,10 @@ - + - + @@ -107,13 +107,13 @@ - + - + diff --git a/themes/Syscrash/openbox-3/bullet.xbm b/themes/Syscrash/openbox-3/bullet.xbm deleted file mode 100644 index 88481ec8..00000000 --- a/themes/Syscrash/openbox-3/bullet.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define bullet_width 4 -#define bullet_height 7 -static unsigned char bullet_bits[] = { - 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; diff --git a/themes/Syscrash/openbox-3/close.xbm b/themes/Syscrash/openbox-3/close.xbm deleted file mode 100644 index 4a88cff6..00000000 --- a/themes/Syscrash/openbox-3/close.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define close_width 6 -#define close_height 6 -static unsigned char close_bits[] = { - 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; diff --git a/themes/Syscrash/openbox-3/close_disabled.xbm b/themes/Syscrash/openbox-3/close_disabled.xbm deleted file mode 100644 index 082582b9..00000000 --- a/themes/Syscrash/openbox-3/close_disabled.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define close_width 5 -#define close_height 5 -static unsigned char close_bits[] = { - 0x1b, 0x1f, 0x0e, 0x1f, 0x1b }; diff --git a/themes/Syscrash/openbox-3/desk.xbm b/themes/Syscrash/openbox-3/desk.xbm deleted file mode 100644 index 3e327e36..00000000 --- a/themes/Syscrash/openbox-3/desk.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define desk_width 6 -#define desk_height 6 -static unsigned char desk_bits[] = { - 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; diff --git a/themes/Syscrash/openbox-3/desk_toggled.xbm b/themes/Syscrash/openbox-3/desk_toggled.xbm deleted file mode 100644 index d7e045ee..00000000 --- a/themes/Syscrash/openbox-3/desk_toggled.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#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/Syscrash/openbox-3/max_pressed.xbm b/themes/Syscrash/openbox-3/max_pressed.xbm index dd8e57e3..6d030af4 100644 --- a/themes/Syscrash/openbox-3/max_pressed.xbm +++ b/themes/Syscrash/openbox-3/max_pressed.xbm @@ -1,4 +1,4 @@ -#define max_width 5 -#define max_height 5 +#define max_width 6 +#define max_height 6 static unsigned char max_bits[] = { - 0x1f, 0x1f, 0x11, 0x11, 0x1f }; + 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; diff --git a/themes/Syscrash/openbox-3/shade.xbm b/themes/Syscrash/openbox-3/shade.xbm deleted file mode 100644 index 7d65a3c0..00000000 --- a/themes/Syscrash/openbox-3/shade.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define shade_width 7 -#define shade_height 7 -static unsigned char shade_bits[] = { - 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00 };