merge r5980-5981 from trunk (using old themerc files)

diff --git a/AUTHORS b/AUTHORS
index 37240ab0c2697582dd204ef2e58bc6ef96787f9b..e4df36e0c06961d407480bea26ce2323403d7eee 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,3 +14,5 @@ Marius Nita (marius@cs.pdx.edu)
  - Otk prototype code, design ideas.
 Mike Bacso (smakwel@yahoo.com)
  - Themes
+John McKnight (jmcknight@gmail.com)
+ - Clearlooks Themes

diff --git a/Makefile.am b/Makefile.am
index 2ca3a5fb1be5e290582e0446dbc7e5b1c8321614..b2efae99d5637ab12db9f97c49979951346f140e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -270,52 +270,52 @@ dist_natura_theme_DATA= \
        themes/Natura/openbox-3/shade.xbm \
        themes/Natura/openbox-3/themerc
 
-artwizboxed_themedir = $(themedir)/artwiz-boxed/openbox-3
+artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
-       themes/artwiz-boxed/openbox-3/bullet.xbm \
-       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
-
-bear2_themedir = $(themedir)/bear2/openbox-3
+       themes/Artwiz-boxed/openbox-3/bullet.xbm \
+       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
+
+bear2_themedir = $(themedir)/Bear2/openbox-3
 dist_bear2_theme_DATA= \
-       themes/bear2/openbox-3/close_pressed.xbm \
-       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 \
-       themes/bear2/openbox-3/shade_pressed.xbm \
-       themes/bear2/openbox-3/shade.xbm \
-       themes/bear2/openbox-3/themerc
-
-orang_themedir = $(themedir)/orang/openbox-3
+       themes/Bear2/openbox-3/close_pressed.xbm \
+       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 \
+       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
+       themes/Orang/openbox-3/themerc
 
-syscrash_themedir = $(themedir)/syscrash/openbox-3
+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
+       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
 
 ## public headers ##
 

diff --git a/themes/artwiz-boxed/openbox-3/bullet.xbm b/themes/Artwiz-boxed/openbox-3/bullet.xbm
similarity index 100%
rename from themes/artwiz-boxed/openbox-3/bullet.xbm
rename to themes/Artwiz-boxed/openbox-3/bullet.xbm

diff --git a/themes/artwiz-boxed/openbox-3/close.xbm b/themes/Artwiz-boxed/openbox-3/close.xbm
similarity index 100%
rename from themes/artwiz-boxed/openbox-3/close.xbm
rename to themes/Artwiz-boxed/openbox-3/close.xbm

diff --git a/themes/artwiz-boxed/openbox-3/desk.xbm b/themes/Artwiz-boxed/openbox-3/desk.xbm
similarity index 100%
rename from themes/artwiz-boxed/openbox-3/desk.xbm
rename to themes/Artwiz-boxed/openbox-3/desk.xbm

diff --git a/themes/artwiz-boxed/openbox-3/desk_toggled.xbm b/themes/Artwiz-boxed/openbox-3/desk_toggled.xbm
similarity index 100%
rename from themes/artwiz-boxed/openbox-3/desk_toggled.xbm
rename to themes/Artwiz-boxed/openbox-3/desk_toggled.xbm

diff --git a/themes/artwiz-boxed/openbox-3/iconify.xbm b/themes/Artwiz-boxed/openbox-3/iconify.xbm
similarity index 100%
rename from themes/artwiz-boxed/openbox-3/iconify.xbm
rename to themes/Artwiz-boxed/openbox-3/iconify.xbm

diff --git a/themes/artwiz-boxed/openbox-3/max.xbm b/themes/Artwiz-boxed/openbox-3/max.xbm
similarity index 100%
rename from themes/artwiz-boxed/openbox-3/max.xbm
rename to themes/Artwiz-boxed/openbox-3/max.xbm

diff --git a/themes/artwiz-boxed/openbox-3/max_toggled.xbm b/themes/Artwiz-boxed/openbox-3/max_toggled.xbm
similarity index 100%
rename from themes/artwiz-boxed/openbox-3/max_toggled.xbm
rename to themes/Artwiz-boxed/openbox-3/max_toggled.xbm

diff --git a/themes/artwiz-boxed/openbox-3/themerc b/themes/Artwiz-boxed/openbox-3/themerc
similarity index 100%
rename from themes/artwiz-boxed/openbox-3/themerc
rename to themes/Artwiz-boxed/openbox-3/themerc

diff --git a/themes/bear2/openbox-3/close.xbm b/themes/Bear2/openbox-3/close.xbm
similarity index 100%
rename from themes/bear2/openbox-3/close.xbm
rename to themes/Bear2/openbox-3/close.xbm

diff --git a/themes/bear2/openbox-3/close_pressed.xbm b/themes/Bear2/openbox-3/close_pressed.xbm
similarity index 100%
rename from themes/bear2/openbox-3/close_pressed.xbm
rename to themes/Bear2/openbox-3/close_pressed.xbm

diff --git a/themes/bear2/openbox-3/desk.xbm b/themes/Bear2/openbox-3/desk.xbm
similarity index 100%
rename from themes/bear2/openbox-3/desk.xbm
rename to themes/Bear2/openbox-3/desk.xbm

diff --git a/themes/bear2/openbox-3/desk_toggled.xbm b/themes/Bear2/openbox-3/desk_toggled.xbm
similarity index 100%
rename from themes/bear2/openbox-3/desk_toggled.xbm
rename to themes/Bear2/openbox-3/desk_toggled.xbm

diff --git a/themes/bear2/openbox-3/iconify.xbm b/themes/Bear2/openbox-3/iconify.xbm
similarity index 100%
rename from themes/bear2/openbox-3/iconify.xbm
rename to themes/Bear2/openbox-3/iconify.xbm

diff --git a/themes/bear2/openbox-3/iconify_disabled.xbm b/themes/Bear2/openbox-3/iconify_disabled.xbm
similarity index 100%
rename from themes/bear2/openbox-3/iconify_disabled.xbm
rename to themes/Bear2/openbox-3/iconify_disabled.xbm

diff --git a/themes/bear2/openbox-3/iconify_pressed.xbm b/themes/Bear2/openbox-3/iconify_pressed.xbm
similarity index 100%
rename from themes/bear2/openbox-3/iconify_pressed.xbm
rename to themes/Bear2/openbox-3/iconify_pressed.xbm

diff --git a/themes/bear2/openbox-3/max.xbm b/themes/Bear2/openbox-3/max.xbm
similarity index 100%
rename from themes/bear2/openbox-3/max.xbm
rename to themes/Bear2/openbox-3/max.xbm

diff --git a/themes/bear2/openbox-3/max_disabled.xbm b/themes/Bear2/openbox-3/max_disabled.xbm
similarity index 100%
rename from themes/bear2/openbox-3/max_disabled.xbm
rename to themes/Bear2/openbox-3/max_disabled.xbm

diff --git a/themes/bear2/openbox-3/max_pressed.xbm b/themes/Bear2/openbox-3/max_pressed.xbm
similarity index 100%
rename from themes/bear2/openbox-3/max_pressed.xbm
rename to themes/Bear2/openbox-3/max_pressed.xbm

diff --git a/themes/bear2/openbox-3/max_toggled.xbm b/themes/Bear2/openbox-3/max_toggled.xbm
similarity index 100%
rename from themes/bear2/openbox-3/max_toggled.xbm
rename to themes/Bear2/openbox-3/max_toggled.xbm

diff --git a/themes/bear2/openbox-3/shade.xbm b/themes/Bear2/openbox-3/shade.xbm
similarity index 100%
rename from themes/bear2/openbox-3/shade.xbm
rename to themes/Bear2/openbox-3/shade.xbm

diff --git a/themes/bear2/openbox-3/shade_pressed.xbm b/themes/Bear2/openbox-3/shade_pressed.xbm
similarity index 100%
rename from themes/bear2/openbox-3/shade_pressed.xbm
rename to themes/Bear2/openbox-3/shade_pressed.xbm

diff --git a/themes/bear2/openbox-3/themerc b/themes/Bear2/openbox-3/themerc
similarity index 100%
rename from themes/bear2/openbox-3/themerc
rename to themes/Bear2/openbox-3/themerc

diff --git a/themes/orang/openbox-3/themerc b/themes/Orang/openbox-3/themerc
similarity index 100%
rename from themes/orang/openbox-3/themerc
rename to themes/Orang/openbox-3/themerc

diff --git a/themes/syscrash/openbox-3/bullet.xbm b/themes/Syscrash/openbox-3/bullet.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/bullet.xbm
rename to themes/Syscrash/openbox-3/bullet.xbm

diff --git a/themes/syscrash/openbox-3/close.xbm b/themes/Syscrash/openbox-3/close.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/close.xbm
rename to themes/Syscrash/openbox-3/close.xbm

diff --git a/themes/syscrash/openbox-3/close_disabled.xbm b/themes/Syscrash/openbox-3/close_disabled.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/close_disabled.xbm
rename to themes/Syscrash/openbox-3/close_disabled.xbm

diff --git a/themes/syscrash/openbox-3/desk.xbm b/themes/Syscrash/openbox-3/desk.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/desk.xbm
rename to themes/Syscrash/openbox-3/desk.xbm

diff --git a/themes/syscrash/openbox-3/desk_toggled.xbm b/themes/Syscrash/openbox-3/desk_toggled.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/desk_toggled.xbm
rename to themes/Syscrash/openbox-3/desk_toggled.xbm

diff --git a/themes/syscrash/openbox-3/iconify.xbm b/themes/Syscrash/openbox-3/iconify.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/iconify.xbm
rename to themes/Syscrash/openbox-3/iconify.xbm

diff --git a/themes/syscrash/openbox-3/max.xbm b/themes/Syscrash/openbox-3/max.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/max.xbm
rename to themes/Syscrash/openbox-3/max.xbm

diff --git a/themes/syscrash/openbox-3/max_disabled.xbm b/themes/Syscrash/openbox-3/max_disabled.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/max_disabled.xbm
rename to themes/Syscrash/openbox-3/max_disabled.xbm

diff --git a/themes/syscrash/openbox-3/max_pressed.xbm b/themes/Syscrash/openbox-3/max_pressed.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/max_pressed.xbm
rename to themes/Syscrash/openbox-3/max_pressed.xbm

diff --git a/themes/syscrash/openbox-3/max_toggled.xbm b/themes/Syscrash/openbox-3/max_toggled.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/max_toggled.xbm
rename to themes/Syscrash/openbox-3/max_toggled.xbm

diff --git a/themes/syscrash/openbox-3/shade.xbm b/themes/Syscrash/openbox-3/shade.xbm
similarity index 100%
rename from themes/syscrash/openbox-3/shade.xbm
rename to themes/Syscrash/openbox-3/shade.xbm

diff --git a/themes/syscrash/openbox-3/themerc b/themes/Syscrash/openbox-3/themerc
similarity index 100%
rename from themes/syscrash/openbox-3/themerc
rename to themes/Syscrash/openbox-3/themerc