* reorganized the themes-folders of the desktop-plugin as discussed with Michael

  recently: now it's kdm/<theme> and gdm/<theme> instead of <theme>/kdm and
  <theme>/gdm, as that makes handling of GDM less cumbersome
* renamed actual theme description files to theme.xml instead of being
  named like the theme (in this case: openslx.xml)
Tested with GDM and KDM on SUSE-10.2

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1838 95ad53e4-c205-0410-b2fa-d234c58c8868

44 files changed, 1 insertions, 27 deletions

diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/GdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/gdm/openslx/GdmGreeterTheme.desktop
index cb2fb30c..08e5efce 100755
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/GdmGreeterTheme.desktop
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/GdmGreeterTheme.desktop
@@ -1,6 +1,6 @@
 [GdmGreeterTheme]
 Encoding=UTF-8
-Greeter=openslx.xml
+Greeter=theme.xml
 Name=OpenSLX GDM theme
 Description=GDM Port of Daemonic KDM theme for FreeBSD
 Author=MJanc / KDM by aceph <aceph@ventcore.net>
diff --git a/os-plugins/plugins/desktop/themes/openslx/color.png b/os-plugins/plugins/desktop/themes/gdm/openslx/color.png
index 7a0feb03..7a0feb03 100644
--- a/os-plugins/plugins/desktop/themes/openslx/color.png
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/color.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/environment.png b/os-plugins/plugins/desktop/themes/gdm/openslx/environment.png
index 7ad6783a..7ad6783a 100644
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/environment.png
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/environment.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/main-runner.png b/os-plugins/plugins/desktop/themes/gdm/openslx/main-runner.png
index 5b3cf656..5b3cf656 100644
--- a/os-plugins/plugins/desktop/themes/openslx/main-runner.png
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/main-runner.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo-main.png
index f98e6517..f98e6517 100644
--- a/os-plugins/plugins/desktop/themes/openslx/openslx-logo-main.png
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo-main.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/openslx-logo.png b/os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo.png
index 8cfaaf94..8cfaaf94 100644
--- a/os-plugins/plugins/desktop/themes/openslx/openslx-logo.png
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/sessions.png b/os-plugins/plugins/desktop/themes/gdm/openslx/sessions.png
index 00d05f29..00d05f29 100644
--- a/os-plugins/plugins/desktop/themes/openslx/sessions.png
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/sessions.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/sessions_inactive.png b/os-plugins/plugins/desktop/themes/gdm/openslx/sessions_inactive.png
index 86bbe642..86bbe642 100644
--- a/os-plugins/plugins/desktop/themes/openslx/sessions_inactive.png
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/sessions_inactive.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/system.png b/os-plugins/plugins/desktop/themes/gdm/openslx/system.png
index f7b9e71f..f7b9e71f 100644
--- a/os-plugins/plugins/desktop/themes/openslx/system.png
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/system.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/system_inactive.png b/os-plugins/plugins/desktop/themes/gdm/openslx/system_inactive.png
index c3e1719b..c3e1719b 100644
--- a/os-plugins/plugins/desktop/themes/openslx/system_inactive.png
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/system_inactive.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx.xml b/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
index 2a1708c3..2a1708c3 100755
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx.xml
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
diff --git a/os-plugins/plugins/desktop/themes/openslx/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/gdm/openslx/welcome-time-shadowed.png
index 79e872c3..79e872c3 100644
--- a/os-plugins/plugins/desktop/themes/openslx/welcome-time-shadowed.png
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/welcome-time-shadowed.png
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/color.png b/os-plugins/plugins/desktop/themes/kdm/openslx/color.png
new file mode 100644
index 00000000..7a0feb03
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/color.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/enter.png b/os-plugins/plugins/desktop/themes/kdm/openslx/enter.png
index b646e851..b646e851 100644
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/enter.png
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/enter.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/enter_inactive.png b/os-plugins/plugins/desktop/themes/kdm/openslx/enter_inactive.png
index e12cfb8e..e12cfb8e 100644
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/enter_inactive.png
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/enter_inactive.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/environment.png b/os-plugins/plugins/desktop/themes/kdm/openslx/environment.png
index b9682822..b9682822 100644
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/environment.png
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/environment.png
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/main-runner.png b/os-plugins/plugins/desktop/themes/kdm/openslx/main-runner.png
new file mode 100644
index 00000000..5b3cf656
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/main-runner.png
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo-main.png
new file mode 100644
index 00000000..f98e6517
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo-main.png
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo.png b/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo.png
new file mode 100644
index 00000000..8cfaaf94
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo.png
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/sessions.png b/os-plugins/plugins/desktop/themes/kdm/openslx/sessions.png
new file mode 100644
index 00000000..00d05f29
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/sessions.png
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/sessions_inactive.png b/os-plugins/plugins/desktop/themes/kdm/openslx/sessions_inactive.png
new file mode 100644
index 00000000..86bbe642
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/sessions_inactive.png
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/system.png b/os-plugins/plugins/desktop/themes/kdm/openslx/system.png
new file mode 100644
index 00000000..f7b9e71f
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/system.png
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/system_inactive.png b/os-plugins/plugins/desktop/themes/kdm/openslx/system_inactive.png
new file mode 100644
index 00000000..c3e1719b
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/system_inactive.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx.xml b/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
index 437f988f..437f988f 100644
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx.xml
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/kdm/openslx/welcome-time-shadowed.png
new file mode 100644
index 00000000..79e872c3
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/welcome-time-shadowed.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/color.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/color.png
deleted file mode 120000
index 1057c17f..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/color.png
+++ /dev/null
@@ -1 +0,0 @@
-../../color.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/main-runner.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/main-runner.png
deleted file mode 120000
index 0fa7562b..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/main-runner.png
+++ /dev/null
@@ -1 +0,0 @@
-../../main-runner.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo-main.png
deleted file mode 120000
index 3a924e43..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo-main.png
+++ /dev/null
@@ -1 +0,0 @@
-../../openslx-logo-main.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo.png
deleted file mode 120000
index 4827aeeb..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo.png
+++ /dev/null
@@ -1 +0,0 @@
-../../openslx-logo.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions.png
deleted file mode 120000
index 77757de8..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions.png
+++ /dev/null
@@ -1 +0,0 @@
-../../sessions.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions_inactive.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions_inactive.png
deleted file mode 120000
index 24f13608..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-../../sessions_inactive.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system.png
deleted file mode 120000
index 89c4bca4..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system.png
+++ /dev/null
@@ -1 +0,0 @@
-../../system.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system_inactive.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system_inactive.png
deleted file mode 120000
index 03f8e2c4..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-../../system_inactive.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/welcome-time-shadowed.png
deleted file mode 120000
index e2f45853..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/welcome-time-shadowed.png
+++ /dev/null
@@ -1 +0,0 @@
-../../welcome-time-shadowed.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/GdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/openslx/kdm/GdmGreeterTheme.desktop
deleted file mode 100644
index 5c174195..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/GdmGreeterTheme.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[GdmGreeterTheme]
-Encoding=UTF-8
-Greeter=openslx.xml
-Name=OpenSLX KDM theme
-Description=OpenSLX Theme based on Daemonic KDM theme for FreeBSD
-Author=aceph <aceph@ventcore.net> and modified by MJanc
-Copyright=Creative Commons
-Screenshot=screenshot.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/color.png b/os-plugins/plugins/desktop/themes/openslx/kdm/color.png
deleted file mode 120000
index f722f460..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/color.png
+++ /dev/null
@@ -1 +0,0 @@
-../color.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/main-runner.png b/os-plugins/plugins/desktop/themes/openslx/kdm/main-runner.png
deleted file mode 120000
index d4e8561a..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/main-runner.png
+++ /dev/null
@@ -1 +0,0 @@
-../main-runner.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo-main.png
deleted file mode 120000
index b97fd167..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo-main.png
+++ /dev/null
@@ -1 +0,0 @@
-../openslx-logo-main.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo.png b/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo.png
deleted file mode 120000
index 2be492e2..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo.png
+++ /dev/null
@@ -1 +0,0 @@
-../openslx-logo.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/sessions.png b/os-plugins/plugins/desktop/themes/openslx/kdm/sessions.png
deleted file mode 120000
index cec27dfa..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/sessions.png
+++ /dev/null
@@ -1 +0,0 @@
-../sessions.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/sessions_inactive.png b/os-plugins/plugins/desktop/themes/openslx/kdm/sessions_inactive.png
deleted file mode 120000
index 70eabd7c..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/sessions_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-../sessions_inactive.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/system.png b/os-plugins/plugins/desktop/themes/openslx/kdm/system.png
deleted file mode 120000
index ad8ab6ee..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/system.png
+++ /dev/null
@@ -1 +0,0 @@
-../system.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/system_inactive.png b/os-plugins/plugins/desktop/themes/openslx/kdm/system_inactive.png
deleted file mode 120000
index 0184c19d..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/system_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-../system_inactive.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/openslx/kdm/welcome-time-shadowed.png
deleted file mode 120000
index 87596c2c..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/welcome-time-shadowed.png
+++ /dev/null
@@ -1 +0,0 @@
-../welcome-time-shadowed.png
\ No newline at end of file