From 7431e6aacc7a07e6850c6dbbd956a292c8ee37cb Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Wed, 17 Sep 2008 11:28:43 +0000
Subject: removed old theme stuff from stage 3 script changed greeter string,
 since GreetString from kdmrc does not work with themes (bug 98154,
 bugs.kde.org)

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2233 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/desktop/XX_desktop.sh                | 12 ------------
 os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml |  2 +-
 os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml |  9 +++++----
 3 files changed, 6 insertions(+), 17 deletions(-)

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/desktop/XX_desktop.sh b/os-plugins/plugins/desktop/XX_desktop.sh
index ff619bdc..a8cc71fc 100644
--- a/os-plugins/plugins/desktop/XX_desktop.sh
+++ b/os-plugins/plugins/desktop/XX_desktop.sh
@@ -19,9 +19,6 @@ if [ -e /initramfs/plugin-conf/desktop.conf ]; then
   if [ $desktop_active -ne 0 ]; then
     [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'desktop' os-plugin ...";
   
-    testmkd /mnt/var/lib/openslx/themes
-    testmkd /mnt/var/lib/openslx/config
-
     # 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
@@ -30,15 +27,6 @@ if [ -e /initramfs/plugin-conf/desktop.conf ]; then
 your system." fatal
     fi
 
-    # TODO: move the following stuff into the gdm-specific desktop.sh
-    #       (and perhaps handle through a template?)
-    if [ "${desktop_manager}" = "XXXkdm" ]; then
-      cp -a /usr/share/themes/kdm /mnt/var/lib/openslx/themes
-      sed "s,Theme=.*,Theme=/var/lib/openslx/themes/kdm," \
-        -i /mnt/etc/kde3/kdm/kdmrc
-      sed "s,UseTheme=.*,UseTheme=true," -i /mnt/etc/kde3/kdm/kdmrc
-    fi
-
     [ $DEBUGLEVEL -gt 0 ] && echo "done with 'desktop' os-plugin ...";
 
   fi
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml b/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
index 2a1708c3..a14ae609 100755
--- a/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
@@ -16,7 +16,7 @@
 						<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
 						<box orientation="horizontal" homogeneous="true">
 						
-							<!-- Wellcome on ... -->
+							<!-- Welcome on ... -->
 							<item type="label">
 								<pos anchor="w" x="10%" y="30%"/>
 								<normal color="#f0f0f0" font="Sans 11"/>
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml b/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
index 437f988f..ac5f3d00 100644
--- a/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
@@ -13,11 +13,12 @@
 				<normal file="welcome-time-shadowed.png"/>
 				<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
 				
-				<!-- Wellcome on ... -->
+				<!-- Welcome on ... -->
 				<item type="label">
 					<pos anchor="w" x="5%" y="33%"/>
 					<normal color="#f0f0f0" font="Sans 12"/>
-					<stock type="welcome-label"/>
+					<!-- <stock type="welcome-label"/> -->
+					<text>OpenSLX Workstation (%h)</text>
 				</item>
 				
 				<!-- clock -->
@@ -55,7 +56,7 @@
 				
 				<item type="rect">
 					<normal color="#000000" alpha="0.0"/>
-                                        <pos anchor="e" x="-140" y="50%" width="100%" height="100%"/>
+					<pos anchor="e" x="-140" y="50%" width="100%" height="100%"/>
 					
 					<!-- username-label -->
 					<item type="label">
@@ -75,7 +76,7 @@
 				
 				<item type="rect">
 					<normal color="#000000" alpha="0.0"/>
-                                        <pos anchor="e" x="100%" y="50%" width="140" height="100%"/>
+					<pos anchor="e" x="100%" y="50%" width="140" height="100%"/>
 					
 					<!-- username-entry -->
 					<item type="entry" id="user-entry">
-- 
cgit v1.2.3-55-g7522