* intermediate commit of desktop plugin, preparing for travel ...

* copied displaymanager themes into desktop plugin (original files will be
  removed once the desktop plugin is working)

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

43 files changed, 512 insertions, 66 deletions

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index 80be8bcf..b9bf5f03 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -18,6 +18,8 @@ use warnings;
 
 our $VERSION = 1.01;        # API-version . implementation-version
 
+use File::Basename;
+
 use OpenSLX::Basics;
 use OpenSLX::Utils;
 
@@ -106,12 +108,40 @@ sub GDMPathInfo
     return $pathInfo;
 }
 
-sub patchGDMScript
+sub setupGDMScript
 {
-    my $self   = shift;
-    my $script = shift;
+    my $self     = shift;
+    my $repoPath = shift;
+
+    my $pathInfo   = $self->GDMPathInfo();
+    my $configFile = $pathInfo->{config};
     
-    # default implementation does nothing!
+    my $paths 
+        = join(
+            ' ', 
+            map  { '/mnt' . $_ } ( dirname($configFile), @{$pathInfo->{paths}} )
+        );
+    my $script = unshiftHereDoc(<<"    End-of-Here");
+        #!/bin/ash
+        # written by OpenSLX-plugin 'desktop'
+
+        mkdir -p $paths 2>/dev/null
+
+        cp /mnt/$repoPath/gdm/\$desktop_mode/gdm.conf /mnt$configFile
+
+        # activate theme only if the corresponding xml file is found
+        # (otherwise fall back to default theme of vendor-OS)
+        if [ -n "\$desktop_theme" ]; then
+          thdir=/opt/openslx/plugin-repo/desktop/themes/openslx/gdm
+          theme=\$desktop_theme
+          if [ -e /mnt\$thdir/\$theme/\$theme.xml ]; then
+            sed -i "s,\\[greeter\\],[greeter]\\nGraphicalThemeDir=\$thdir," \\
+              /mnt$configFile
+            sed -i "s,\\[greeter\\],[greeter]\\nGraphicalTheme=\$theme," \\
+              /mnt$configFile
+          fi
+        fi
+    End-of-Here
     
     return $script;
 }
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
index d8503973..bb8d2ee5 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
@@ -26,15 +26,18 @@ use OpenSLX::Utils;
 ### interface methods
 ################################################################################
 
-sub patchGDMScript
+sub setupGDMScript
 {
-    my $self   = shift;
-    my $script = shift;
+    my $self     = shift;
+    my $repoPath = shift;
+
+    my $script = $self->SUPER::setupGDMScript($repoPath);
     
     $script .= unshiftHereDoc(<<'    End-of-Here');
         rllinker gdm 1 1
         echo '/usr/bin/gdm' > /mnt/etc/X11/default-display-manager
     End-of-Here
+
     return $script;
 }
 
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
index 99d8dc70..cbfbf83f 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
@@ -38,16 +38,19 @@ sub GDMPathInfo
     return $pathInfo;
 }
 
-sub patchGDMScript
+sub setupGDMScript
 {
-    my $self   = shift;
-    my $script = shift;
+    my $self     = shift;
+    my $repoPath = shift;
+
+    my $script = $self->SUPER::setupGDMScript($repoPath);
     
     $script .= unshiftHereDoc(<<'    End-of-Here');
         rllinker xdm 1 1
         sed -i 's/DISPLAYMANAGER=.*/DISPLAYMANAGER="gdm"/' \
             /mnt/etc/sysconfig/displaymanager
     End-of-Here
+
     return $script;
 }
 
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index bcbfe768..effd165e 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -38,15 +38,18 @@ sub GDMPathInfo
     return $pathInfo;
 }
 
-sub patchGDMScript
+sub setupGDMScript
 {
-    my $self   = shift;
-    my $script = shift;
+    my $self     = shift;
+    my $repoPath = shift;
+
+    my $script = $self->SUPER::setupGDMScript($repoPath);
     
     $script .= unshiftHereDoc(<<'    End-of-Here');
         rllinker gdm 1 1
         echo '/usr/sbin/gdm' > /mnt/etc/X11/default-display-manager
     End-of-Here
+
     return $script;
 }
 
diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
index a3ce54ee..610e0583 100644
--- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
@@ -110,7 +110,7 @@ sub getAttrInfo
                 that they can be selected via 'desktop::theme' in stage 3).
             End-of-Here
             content_descr => 'a comma-separated list of theme names',
-            default => 'openslx,blue,circles',
+            default => 'openslx',
         },
         'desktop::gdm' => {
             applies_to_vendor_os => 1,
@@ -251,26 +251,27 @@ sub copyRequiredFilesIntoInitramfs
     my $attrs               = shift;
     my $makeInitRamFSEngine = shift;
     
-    my $themeDir = "$openslxConfig{'base-path'}/share/themes";
-        my $desktopXdmcp = $attrs->{'desktop::xdmcp'} || '';
-    my $xdmcpConfigDir = "$openslxConfig{'base-path'}/lib/plugins/desktop/files/$desktopXdmcp";
+    my $themeDir     = "$openslxConfig{'base-path'}/share/themes";
+    my $desktopXdmcp = $attrs->{'desktop::xdmcp'} || '';
+    my $xdmcpConfigDir 
+        = "$openslxConfig{'base-path'}/lib/plugins/desktop/files/$desktopXdmcp";
     my $desktopTheme = $attrs->{'desktop::theme'} || '';
     if ($desktopTheme) {
         my $desktopThemeDir 
             = "$themeDir/$desktopTheme/desktop/$desktopXdmcp";
         if (-d $desktopThemeDir) {
-                        $makeInitRamFSEngine->addCMD(
-                                "mkdir -p $targetPath/usr/share/files"
-                        );
+            $makeInitRamFSEngine->addCMD(
+                "mkdir -p $targetPath/usr/share/files"
+            );
             $makeInitRamFSEngine->addCMD(
                 "mkdir -p $targetPath/usr/share/themes"
             );
             $makeInitRamFSEngine->addCMD(
                 "cp -a $desktopThemeDir $targetPath/usr/share/themes/"
             );
-                        $makeInitRamFSEngine->addCMD(
-                                "cp -a $xdmcpConfigDir $targetPath/usr/share/files"
-                        );
+            $makeInitRamFSEngine->addCMD(
+                "cp -a $xdmcpConfigDir $targetPath/usr/share/files"
+            );
         }
     }
     else {
@@ -388,8 +389,7 @@ sub _setupGDM
         "$repoPath/gdm/chooser",
     ]);
     
-    my $pathInfo   = $self->{distro}->GDMPathInfo();
-    $self->_setupGDMScript($pathInfo);
+    $self->_setupGDMScript();
 
     my $configHash = $self->{distro}->GDMConfigHashForWorkstation();
     $self->_writeConfigHash($configHash, "$repoPath/gdm/workstation/gdm.conf");
@@ -406,39 +406,12 @@ sub _setupGDM
 sub _setupGDMScript
 {
     my $self = shift;
-    my $pathInfo = shift;
     
     my $repoPath = $self->{pluginRepositoryPath};
-    my $configFile = $pathInfo->{config};
-    my $paths 
-        = join(
-            ' ', 
-            map  { '/mnt' . $_ } ( dirname($configFile), @{$pathInfo->{paths}} )
-        );
-    my $script = unshiftHereDoc(<<"    End-of-Here");
-        #!/bin/ash
-        # written by OpenSLX-plugin 'desktop'
-
-        mkdir -p $paths 2>/dev/null
-
-        mkdir -p \$(dirname /mnt$configFile) 2>/dev/null
-        cp /mnt/$repoPath/gdm/\$desktop_mode/gdm.conf /mnt$configFile
-
-        # activate theme only if the corresponding xml file is found
-        # (otherwise fall back to default theme of vendor-OS)
-        if [ -n "\$desktop_theme" ]; then
-          thdir=/opt/openslx/plugin-repo/desktop/themes
-          theme=\$desktop_theme
-          if [ -e /mnt\$thdir/\$desktop_theme/gdm/\${theme}.xml ]; then
-            sed -i "s,\\[greeter\\],[greeter]\\nGraphicalThemeDir=\$thdir," \\
-              /mnt/$configFile
-            sed -i "s,\\[greeter\\],[greeter]\\nGraphicalTheme=\$theme," \\
-              /mnt/$configFile
-          fi
-        fi
-    End-of-Here
-    $script = $self->{distro}->patchGDMScript($script);
+    my $script = $self->{distro}->setupGDMScript($repoPath);
+
     spitFile("$repoPath/gdm/desktop.sh", $script);
+
     return;
 }
 
@@ -481,15 +454,15 @@ sub _setupSupportedThemes
     my @supportedThemes = split m{\s*,\s*}, $supportedThemes;
     return if !@supportedThemes;
 
-    my $themeBaseDir = "$self->{openslxPath}/share/themes";
+    my $themeBaseDir = "$self->{openslxPath}/lib/plugins/desktop/themes";
     THEME:
     for my $theme (@supportedThemes) {
-        my $themeDir = "$themeBaseDir/$theme/displaymanager";
+        my $themeDir = "$themeBaseDir/$theme";
         if (!-e $themeDir) {
             warn _tr('theme "%s" not found - skipped!', $theme);
             next;
         }
-        my $themeTargetPath = "$self->{pluginRepositoryPath}/themes/";
+        my $themeTargetPath = "$self->{pluginRepositoryPath}/themes";
         mkpath($themeTargetPath);
         vlog(1, "installing theme '$theme'...");
         slxsystem("cp -a $themeDir $themeTargetPath/$theme") == 0
diff --git a/os-plugins/plugins/desktop/XX_desktop.sh b/os-plugins/plugins/desktop/XX_desktop.sh
index 2e062bf8..cfea19b0 100644
--- a/os-plugins/plugins/desktop/XX_desktop.sh
+++ b/os-plugins/plugins/desktop/XX_desktop.sh
@@ -13,7 +13,7 @@ if [ -e /initramfs/plugin-conf/desktop.conf ]; then
     testmkd /mnt/var/lib/openslx/themes
     testmkd /mnt/var/lib/openslx/config
 
-    # problem which occures if exporting was forgotten (quick fix code)
+    # problem which occurs if exporting was forgotten (quick fix code)
     if [ -e /mnt/opt/openslx/plugin-repo/desktop/${desktop_manager}/desktop.sh ]
       then . /mnt/opt/openslx/plugin-repo/desktop/${desktop_manager}/desktop.sh
     else
@@ -23,13 +23,6 @@ your system."
 
     # TODO: move the following stuff into the gdm-specific desktop.sh
     #       (and perhaps handle through a template?)
-    if [ "${desktop_manager}" = "XXXgdm" ]; then
-      cp -a /usr/share/themes/gdm /mnt/var/lib/openslx/themes
-      sed -i "s,GraphicalThemeDir=.*,GraphicalThemeDir=/var/lib/openslx/themes," \
-        /mnt/etc/gdm/gdm.conf
-      sed -i "s,GraphicalTheme=.*GraphicalTheme=gdm," /mnt/etc/gdm/gdm.conf
-    fi
-
     if [ "${desktop_manager}" = "XXXkdm" ]; then
       cp -a /usr/share/themes/kdm /mnt/var/lib/openslx/themes
       sed -i "s,Theme=.*,Theme=/var/lib/openslx/themes/kdm," /mnt/etc/kde3/kdm/kdmrc
diff --git a/os-plugins/plugins/desktop/themes/openslx/color.png b/os-plugins/plugins/desktop/themes/openslx/color.png
new file mode 100644
index 00000000..7a0feb03
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/color.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/enter.png b/os-plugins/plugins/desktop/themes/openslx/enter.png
new file mode 100644
index 00000000..b646e851
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/enter.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/enter_inactive.png b/os-plugins/plugins/desktop/themes/openslx/enter_inactive.png
new file mode 100644
index 00000000..e12cfb8e
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/enter_inactive.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/GdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/GdmGreeterTheme.desktop
new file mode 100755
index 00000000..cb2fb30c
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=openslx.xml
+Name=OpenSLX GDM theme
+Description=GDM Port of Daemonic KDM theme for FreeBSD
+Author=MJanc / KDM by aceph <aceph@ventcore.net>
+Copyright=Creative Commons
+Screenshot=screenshot.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/color.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/color.png
new file mode 120000
index 00000000..1057c17f
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/color.png
@@ -0,0 +1 @@
+../../color.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/environment.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/environment.png
new file mode 100644
index 00000000..7ad6783a
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/environment.png
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
new file mode 120000
index 00000000..0fa7562b
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/main-runner.png
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 00000000..3a924e43
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo-main.png
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 00000000..4827aeeb
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo.png
@@ -0,0 +1 @@
+../../openslx-logo.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx.xml b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx.xml
new file mode 100755
index 00000000..2a1708c3
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+	<item type="pixmap">
+		<normal file="color.png"/>
+		<pos x="0" y="0" width="100%" height="100%"/>
+		<box orientation="vertical" homogeneous="true">
+			
+			<item type="rect">
+				<normal color="#000000" alpha="0.0"/>
+				<pos anchor="n" x="50%" y="0%" width="100%" height="80%"/>
+				<box orientation="vertical" homogeneous="true">
+				
+					<item type="pixmap">
+						<normal file="welcome-time-shadowed.png"/>
+						<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
+						<box orientation="horizontal" homogeneous="true">
+						
+							<!-- Wellcome on ... -->
+							<item type="label">
+								<pos anchor="w" x="10%" y="30%"/>
+								<normal color="#f0f0f0" font="Sans 11"/>
+								<stock type="welcome-label"/>
+							</item>
+						
+							<!-- clock -->
+							<item type="label" id="clock">
+								<pos anchor="e" x="90%" y="30%"/>
+								<normal color="#f0f0f0" font="Sans 11"/>
+								<text>%c</text>
+							</item>
+						
+						</box>
+					</item>
+				
+					<item type="rect">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="c" x="50%" y="10%" width="100%" height="160%"/>
+						<box orientation="vertical" homogeneous="true">
+							<item type="pixmap">
+								<normal file="openslx-logo-main.png"/>
+								<pos anchor="c" x="50%" y="50%" height="box"/>
+							</item>
+						</box>
+					</item>
+					
+				</box>
+			</item>
+			
+			<item type="pixmap">
+				<normal file="main-runner.png"/>
+				<pos anchor="c" x="50%" y="0%" width="100%" height="160"/>
+				<box orientation="horizontal" homogeneous="true">
+					
+					<item type="rect">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="w" x="0%" y="50%" width="100%" height="100%"/>
+						<box orientation="horizontal" homogeneous="true">
+					
+							<item type="pixmap">
+								<normal file="openslx-logo.png"/>
+								<pos anchor="c" x="70" y="50%"/>
+							</item>
+							
+							<item type="rect">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="c" x="50" y="50%" width="100%" height="100%"/>
+								<box orientation="vertical" homogeneous="true">
+								
+									<!-- username-label -->
+									<item type="label" id="pam-prompt">
+										<pos anchor="sw" x="5" y="80%"/>
+										<normal color="#f0f0f0" font="Sans 11"/>
+										<stock type="username-label"/>
+									</item>
+									
+									
+									<!-- username-entry -->
+									<item type="entry" id="user-pw-entry">
+										<normal color="#0f0f0f" font="Sans 11"/>
+										<pos anchor="nw" y="-10%" height="22" width="160"/>
+									</item>
+								
+								</box>
+							</item>
+						
+						</box>
+					</item>
+					
+					<item type="rect">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="c" x="50%" y="50%" width="100%" height="100%"/>
+						<box orientation="vertical" homogeneous="true">
+							
+							<item type="rect" id="caps-lock-warning">
+								<normal color="#000000" alpha="0.4"/>
+								<pos anchor="c" x="50%" y="50%" width="100%" height="30"/>
+								<box orientation="vertical" homogeneous="true">
+									
+									<item type="label">
+										<normal color="#ff8b00" font="Sans 11"/>
+										<pos anchor="c" x="50%" y="50%"/>
+										<stock type="caps-lock-warning"/>
+									</item>
+								
+								</box>
+							</item>
+							
+							<item type="pixmap">
+								<normal file="environment.png"/>
+								<pos anchor="c" x="50%" y="50%"/>
+							</item>
+							
+							<item type="rect">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="c" x="50%" y="50%" width="100%" height="40"/>
+								<box orientation="vertical" homogeneous="true">
+									<item type="label" id="pam-error">
+										<normal color="#ff8b00" font="Sans 11"/>
+										<pos anchor="c" x="50%" y="50%"/>
+										<text/>
+									</item>
+								</box>
+							</item>
+							
+						</box>
+					</item>
+					
+					
+					
+					<item type="rect">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="e" x="100%" y="50%" width="100%" height="100%"/>
+						<box orientation="vertical" homogeneous="true">
+						
+							<!-- session-button -->
+							<item type="rect" id="session_button" button="true">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="se" x="80%" y="95%" width="box" height="box"/>
+								<box orientation="horizontal">
+								
+									<item type="label">
+										<normal color="#bbbbbb" font="Sans 11"/>
+										<prelight color="#f0f0f0" font="Sans 11"/>
+										<active color="#ff8b00" font="Sans 11"/>
+										<pos anchor="e" x="100%" y="-24"/>
+										<text>Session</text>
+										<text xml:lang="en">Session</text>
+										<text xml:lang="de">Sitzung</text>
+									</item>
+									
+									<item type="rect" id="session_button" button="true">
+										<normal color="#000000" alpha="0.0"/>
+										<pos anchor="c" x="50%" y="50%" width="10"/>
+									</item>
+									
+									<item type="pixmap" id="session_button" button="true">
+										<normal file="sessions_inactive.png"/>
+										<prelight file="sessions.png"/>
+										<pos anchor="se" x="100%" y="100%"/>
+									</item>
+								
+								</box>
+							</item>
+							
+							<!-- menu-button -->
+							<item type="rect" id="system_button" button="true">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="ne" x="80%" y="5%" width="box" height="box"/>
+								<box orientation="horizontal">
+								
+									<item type="label">
+										<normal color="#bbbbbb" font="Sans 11"/>
+										<prelight color="#f0f0f0" font="Sans 11"/>
+										<active color="#ff8b00" font="Sans 11"/>
+										<pos anchor="e" x="100%" y="24"/>
+										<text>System Menu</text>
+										<text xml:lang="en">System Menu</text>
+										<text xml:lang="de">System Menü</text>
+									</item>
+									
+									<item type="rect" id="session_button" button="true">
+										<normal color="#000000" alpha="0.0"/>
+										<pos anchor="c" x="50%" y="50%" width="10"/>
+									</item>
+									
+									<item type="pixmap" id="system_button" button="true">
+										<normal file="system_inactive.png"/>
+										<prelight file="system.png"/>
+										<pos anchor="ne" x="100%" y="0%"/>
+									</item>
+								
+								</box>
+							</item>
+							
+						</box>
+					</item>
+
+				</box>
+			</item>
+			
+		</box>
+	</item>
+
+</greeter>
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions.png
new file mode 120000
index 00000000..77757de8
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions.png
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 00000000..24f13608
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions_inactive.png
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 00000000..89c4bca4
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system.png
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 00000000..03f8e2c4
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system_inactive.png
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 00000000..e2f45853
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/welcome-time-shadowed.png
@@ -0,0 +1 @@
+../../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
new file mode 100644
index 00000000..224692a1
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=theme.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
new file mode 120000
index 00000000..f722f460
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/color.png
@@ -0,0 +1 @@
+../color.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/enter.png b/os-plugins/plugins/desktop/themes/openslx/kdm/enter.png
new file mode 120000
index 00000000..b30c91fa
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/enter.png
@@ -0,0 +1 @@
+../enter.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/enter_inactive.png b/os-plugins/plugins/desktop/themes/openslx/kdm/enter_inactive.png
new file mode 120000
index 00000000..ec097c27
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/enter_inactive.png
@@ -0,0 +1 @@
+../enter_inactive.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/environment.png b/os-plugins/plugins/desktop/themes/openslx/kdm/environment.png
new file mode 100644
index 00000000..b9682822
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/environment.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/main-runner.png b/os-plugins/plugins/desktop/themes/openslx/kdm/main-runner.png
new file mode 120000
index 00000000..d4e8561a
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/main-runner.png
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000..b97fd167
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo-main.png
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000..2be492e2
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo.png
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000..cec27dfa
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/sessions.png
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000..70eabd7c
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/sessions_inactive.png
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000..ad8ab6ee
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/system.png
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000..0184c19d
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/system_inactive.png
@@ -0,0 +1 @@
+../system_inactive.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/theme.xml b/os-plugins/plugins/desktop/themes/openslx/kdm/theme.xml
new file mode 100644
index 00000000..437f988f
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/theme.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+	<!-- main pic, login pic -->
+	<item type="pixmap">
+		<normal file="color.png"/>
+		<pos x="0" y="0" width="100%" height="100%"/>
+		<item type="rect">
+			<normal color="#000000" alpha="0.0"/>
+			<pos anchor="n" x="50%" y="0" width="100%" height="40%"/>
+			
+			<item type="pixmap">
+				<normal file="welcome-time-shadowed.png"/>
+				<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
+				
+				<!-- Wellcome on ... -->
+				<item type="label">
+					<pos anchor="w" x="5%" y="33%"/>
+					<normal color="#f0f0f0" font="Sans 12"/>
+					<stock type="welcome-label"/>
+				</item>
+				
+				<!-- clock -->
+				<item type="label" id="clock">
+					<normal color="#f0f0f0" font="Sans 12"/>
+					<pos anchor="e" x="95%" y="33%"/>
+					<text>%c</text>
+				</item>
+				
+			</item>
+			
+			<item type="pixmap">
+				<normal file="openslx-logo-main.png"/>
+				<pos anchor="n" x="50%" y="20%" height="70%"/>
+			</item>
+			
+		</item>
+		
+		<item type="pixmap">
+			<normal file="main-runner.png"/>
+			<pos anchor="c" x="50%" y="50%" width="100%" height="160"/>
+			
+			<item type="rect">
+				<normal color="#000000" alpha="0.0"/>
+				<pos anchor="w" x="0" y="50%" width="35%" height="100%"/>
+				
+				<item type="rect">
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="w" x="0" y="50%" width="120" height="100%"/>
+					<item type="pixmap">
+						<normal file="openslx-logo.png"/>
+						<pos anchor="e" x="100%" y="50%"/>
+					</item>
+				</item>
+				
+				<item type="rect">
+					<normal color="#000000" alpha="0.0"/>
+                                        <pos anchor="e" x="-140" y="50%" width="100%" height="100%"/>
+					
+					<!-- username-label -->
+					<item type="label">
+						<pos anchor="e" x="-5" y="40%"/>
+						<normal color="#f0f0f0" font="Sans 11"/>
+						<stock type="username-label"/>
+					</item>
+					
+					<!-- password-label -->
+					<item type="label">
+						<pos anchor="e" x="-5" y="60%"/>
+						<normal color="#f0f0f0" font="Sans 11"/>
+						<stock type="password-label"/>
+					</item>
+					
+				</item>
+				
+				<item type="rect">
+					<normal color="#000000" alpha="0.0"/>
+                                        <pos anchor="e" x="100%" y="50%" width="140" height="100%"/>
+					
+					<!-- username-entry -->
+					<item type="entry" id="user-entry">
+						<pos anchor="w" x="0" y="40%" height="22" width="114"/>
+					</item>
+					
+					<!-- password-entry -->
+					<item type="entry" id="pw-entry">
+						<pos anchor="w" x="0" y="60%" height="22" width="114"/>
+					</item>
+					
+					<item type="pixmap" button="true" id="login_button">
+						<pos anchor="e" x="100%" y="60%" height="22" width="22"/>
+						<normal file="enter_inactive.png"/>
+						<prelight file="enter.png"/>
+					</item>
+					
+				</item>
+				
+			</item>
+			
+			<item type="rect">
+				<normal color="#ff0000" alpha="0.0"/>
+				<pos anchor="c" x="50%" y="50%" width="30%" height="160"/>
+				
+				<!-- capslock-warning -->
+				<item type="pixmap" id="caps-lock-warning">
+					<normal file="error.png"/>
+					<pos anchor="c" x="50%" y="22" width="100%" height="70"/>
+					<item type="rect" id="caps-lock-warning">
+						<normal color="#000000" alpha="0.4"/>
+						<pos anchor="c" x="50%" y="50%" width="100%" height="box"/>
+						<box orientation="vertical" xpadding="10" ypadding="5" spacing="0">
+							<item type="label">
+								<normal color="#ff8b00" font="Sans 11"/>
+								<pos x="50%" anchor="n"/>
+								<stock type="caps-lock-warning"/>
+							</item>
+						</box>
+					</item>
+				</item>
+				
+				<item type="pixmap">
+					<normal file="environment.png"/>
+					<pos anchor="c" x="50%" y="50%" width="186" height="100"/>
+				</item>
+				
+				<!-- Login-Error -->
+				<item type="pixmap" id="pam-error">
+					<normal file="error.png"/>
+					<pos anchor="c" x="50%" y="-22" width="100%" height="70"/>
+					<item type="rect">
+						<normal color="#000000" alpha="0.4"/>
+						<pos anchor="c" x="50%" y="50%" width="100%" height="box"/>
+						<box orientation="vertical" xpadding="10" ypadding="5" spacing="0">
+							<item type="label">
+								<normal color="#ff8b00" font="Sans 11"/>
+								<pos anchor="n" x="50%"/>
+								<text>Login failed!</text>
+								<text xml:lang="en">Login failed!</text>
+								<text xml:lang="de">Login fehlgeschlagen!</text>
+							</item>
+						</box>
+					</item>
+				</item>
+				
+			</item>
+			
+			<!-- icons and text on the left -->
+			<item type="rect">
+				<normal color="#000000" alpha="0.0"/>
+				<pos anchor="e" x="100%" y="50%" width="35%" height="100%"/>
+				
+				<!-- session-button -->
+				<item type="rect" id="session_button" button="true">
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="se" x="80%" y="50%" width="160" height="50%"/>
+					
+					<item type="pixmap" id="session_button" button="true">
+						<normal file="sessions_inactive.png"/>
+						<prelight file="sessions.png"/>
+						<pos anchor="se" x="94%" y="-8" width="48" height="48"/>
+					</item>
+					
+					<item type="label">
+						<normal color="#bbbbbb" font="Sans 11"/>
+						<prelight color="#f0f0f0" font="Sans 11"/>
+						<active color="#ff8b00" font="Sans 11"/>
+						<pos anchor="e" x="-70" y="-32"/>
+						<text>Session</text>
+						<text xml:lang="en">Session</text>
+						<text xml:lang="de">Sitzung</text>
+					</item>
+					
+				</item>
+				
+				<!-- menu-button -->
+				<item type="rect" id="system_button" button="true">
+					<show modes="console" type="system"/>
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="ne" x="80%" y="50%" width="160" height="50%"/>
+					<item type="pixmap" id="system_button" button="true">
+						<normal file="system_inactive.png"/>
+						<prelight file="system.png"/>
+						<pos anchor="ne" x="94%" y="8" width="48" height="48"/>
+					</item>
+					<item type="label">
+						<normal color="#bbbbbb" font="Sans 11"/>
+						<prelight color="#f0f0f0" font="Sans 11"/>
+						<active color="#ff8b00" font="Sans 11"/>
+						<pos anchor="e" x="-70" y="32"/>
+						<text>System Menu</text>
+						<text xml:lang="en">System Menu</text>
+						<text xml:lang="de">System Menü</text>
+					</item>
+				</item>
+				
+			</item>
+			
+		</item>
+	</item>
+</greeter>
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
new file mode 120000
index 00000000..87596c2c
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/kdm/welcome-time-shadowed.png
@@ -0,0 +1 @@
+../welcome-time-shadowed.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/main-runner.png b/os-plugins/plugins/desktop/themes/openslx/main-runner.png
new file mode 100644
index 00000000..5b3cf656
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/main-runner.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/openslx/openslx-logo-main.png
new file mode 100644
index 00000000..f98e6517
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/openslx-logo-main.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/openslx-logo.png b/os-plugins/plugins/desktop/themes/openslx/openslx-logo.png
new file mode 100644
index 00000000..8cfaaf94
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/openslx-logo.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/sessions.png b/os-plugins/plugins/desktop/themes/openslx/sessions.png
new file mode 100644
index 00000000..00d05f29
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/sessions.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/sessions_inactive.png b/os-plugins/plugins/desktop/themes/openslx/sessions_inactive.png
new file mode 100644
index 00000000..86bbe642
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/sessions_inactive.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/system.png b/os-plugins/plugins/desktop/themes/openslx/system.png
new file mode 100644
index 00000000..f7b9e71f
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/system.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/system_inactive.png b/os-plugins/plugins/desktop/themes/openslx/system_inactive.png
new file mode 100644
index 00000000..c3e1719b
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/system_inactive.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/openslx/welcome-time-shadowed.png
new file mode 100644
index 00000000..79e872c3
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/openslx/welcome-time-shadowed.png