From 38562aa5646a5ef8042bb0696c3e7d56f718e308 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 13 Oct 2009 19:49:35 +0000
Subject: background after login is now changed to background of login manager

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3170 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/bin/servconfig                |  1 +
 os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm    |  4 ++++
 .../plugins/desktop/themes/gdm/openslx/theme.xml     | 20 ++++++++++----------
 .../themes/kdm/openslx/GdmGreeterTheme.desktop       |  8 --------
 .../plugins/desktop/themes/kdm/openslx/theme.xml     | 20 ++++++++++----------
 5 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100755 os-plugins/plugins/desktop/themes/kdm/openslx/GdmGreeterTheme.desktop

diff --git a/initramfs/stage3-stuff/bin/servconfig b/initramfs/stage3-stuff/bin/servconfig
index 67450253..dad8f409 100755
--- a/initramfs/stage3-stuff/bin/servconfig
+++ b/initramfs/stage3-stuff/bin/servconfig
@@ -191,6 +191,7 @@ auto.master." >/mnt/etc/auto.misc
         >> /mnt/etc/auto.master
       echo -e "# /etc/auto.${amdirn} created by $0:\n" \
         > /mnt/etc/auto.${amdirn}
+      # add '/' to path because uri_token removes any leading '/' (s. function)
       echo -e "*\t-rsize=32768,wsize=32768,rw\t${amserv}:/${ampath}/&" \
         >> /mnt/etc/auto.${amdirn}
       # no tempfs needed if automounter operates on /home
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index ef82f301..e6d9a819 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -141,6 +141,8 @@ sub setupGDMScript
           thdir=/opt/openslx/plugin-repo/desktop/themes/gdm
           theme=\$desktop_theme
           if [ -e /mnt\$thdir/\$theme/*.xml ]; then
+            sed -i "s,\\[greeter\\],[greeter]\\nGraphicalThemedColor=," \\
+              /mnt$configFile
             sed -i "s,\\[greeter\\],[greeter]\\nGraphicalThemeDir=\$thdir," \\
               /mnt$configFile
             sed -i "s,\\[greeter\\],[greeter]\\nGraphicalTheme=\$theme," \\
@@ -307,6 +309,8 @@ sub setupKDMScript
           theme=\$desktop_theme
           thdir=/opt/openslx/plugin-repo/desktop/themes/kdm/\$theme
           if [ -e /mnt\$thdir/*.xml ]; then
+            sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nUseBackground=false," \\
+              /mnt$configFile
             sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nTheme=\$thdir," \\
               /mnt$configFile
             sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nUseTheme=true," \\
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml b/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
index 50532e6c..a23ce7c8 100755
--- a/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
@@ -3,32 +3,32 @@
 <!--
 GDM-OpenSLX-Theme
 -->
-<greeter id="greeter">
+<greeter id="theme">
 
         <!-- background -->
-	<item type="pixmap" id="backgound">
+	<item type="pixmap" id="background" background="true">
 		<normal file="color.png"/>
 		<pos x="0" y="0" width="100%" height="100%"/>
 	</item>
 
         <!-- top / welcome, clock and big logo -->
-	<item type="rect" id="top">
+	<item type="rect" id="top" background="true">
 		<normal color="#000000" alpha="0.0"/>
 		<pos anchor="n" x="50%" y="0" width="100%" height="40%"/>
 		<box orientation="vertical" homogeneous="true">
 
-        		<item type="pixmap">
+        		<item type="pixmap" background="true">
         			<normal file="welcome-time-shadowed.png"/>
         			<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
 	        		<box orientation="horizontal" homogeneous="true">
                 			<!-- Welcome on ... -->
-	        			<item type="label">
+	        			<item type="label" background="true">
 	        				<pos anchor="w" x="10%" y="30%"/>
 	        				<normal color="#f0f0f0" font="Sans 11"/>
 	        				<stock type="welcome-label"/>
 	        			</item>
 	        			<!-- clock -->
-	        			<item type="label" id="clock">
+	        			<item type="label" id="clock" background="true">
 	        				<pos anchor="e" x="90%" y="30%"/>
 	        				<normal color="#f0f0f0" font="Sans 11"/>
 	        				<text>%c</text>
@@ -51,24 +51,24 @@ GDM-OpenSLX-Theme
 	</item>
 
         <!-- main part / login, session, menu, ... -->
-	<item type="pixmap" id="main-runner">
+	<item type="pixmap" id="main-runner" background="true">
 		<normal file="main-runner.png"/>
 		<pos anchor="c" x="50%" y="50%" width="100%" height="160"/>
 		<box orientation="horizontal" homogeneous="true">
 
-			<item type="rect">
+			<item type="rect" background="true">
 				<normal color="#000000" alpha="0.0"/>
 				<pos anchor="w" x="0%" y="50%" width="100%" height="100%"/>
 				<box orientation="horizontal" homogeneous="true">
 
                                         <!-- left part / login -->
-					<item type="rect">
+					<item type="rect" background="true">
 						<normal color="#000000" alpha="0.0"/>
 						<pos anchor="w" x="0" y="50%" width="100%" height="100%"/>
 						<box orientation="horizontal">
 
                                                         <!-- small logo -->
-							<item type="pixmap">
+							<item type="pixmap" background="true">
 								<normal file="openslx-logo.png"/>
 								<pos anchor="w" x="30" y="50%"/>
 							</item>
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/GdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/kdm/openslx/GdmGreeterTheme.desktop
deleted file mode 100755
index da63ec08..00000000
--- a/os-plugins/plugins/desktop/themes/kdm/openslx/GdmGreeterTheme.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[GdmGreeterTheme]
-Encoding=UTF-8
-Greeter=theme.xml
-Name=OpenSLX KDM theme
-Description=KDM Port of Daemonic KDM theme for FreeBSD
-Author=MJanc / KDM by aceph <aceph@ventcore.net>
-Copyright=Creative Commons
-Screenshot=screenshot.png
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml b/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
index 55e20a06..4af39bdf 100644
--- a/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
@@ -3,33 +3,33 @@
 <!--
 KDM-OpenSLX-Theme
 -->
-<greeter id="greeter">
+<greeter id="theme">
         <style font="Sans 11" window-text-color="#f0f0f0" base-color="#f0f0f0" text-color="#000000"/>
 
         <!-- background -->
-	<item type="pixmap" id="backgound">
+	<item type="pixmap" id="background" background="true">
 		<normal file="color.png"/>
 		<pos x="0" y="0" width="100%" height="100%"/>
 	</item>
 
         <!-- top / welcome, clock and big logo -->
-	<item type="rect" id="top">
+	<item type="rect" id="top" background="true">
 		<normal color="#000000" alpha="0.0"/>
 		<pos anchor="n" x="50%" y="0" width="100%" height="40%"/>
 		<box orientation="vertical" homogeneous="true">
 
-        		<item type="pixmap">
+        		<item type="pixmap" background="true">
         			<normal file="welcome-time-shadowed.png"/>
         			<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
 	        		<box orientation="horizontal" homogeneous="true">
                 			<!-- Welcome on ... -->
-	        			<item type="label">
+	        			<item type="label" background="true">
 	        				<pos anchor="w" x="10%" y="30%"/>
 	        				<normal color="#f0f0f0" font="Sans 11"/>
 	        				<stock type="welcome-label"/>
 	        			</item>
 	        			<!-- clock -->
-	        			<item type="label" id="clock">
+	        			<item type="label" id="clock" background="true">
 	        				<pos anchor="e" x="90%" y="30%"/>
 	        				<normal color="#f0f0f0" font="Sans 11"/>
 	        				<text>%c</text>
@@ -52,24 +52,24 @@ KDM-OpenSLX-Theme
 	</item>
 
         <!-- main part / login, session, menu, ... -->
-	<item type="pixmap" id="main-runner">
+	<item type="pixmap" id="main-runner" background="true">
 		<normal file="main-runner.png"/>
 		<pos anchor="c" x="50%" y="50%" width="100%" height="160"/>
 		<box orientation="horizontal" homogeneous="true">
 
-			<item type="rect">
+			<item type="rect" background="true">
 				<normal color="#000000" alpha="0.0"/>
 				<pos anchor="w" x="0%" y="50%" width="100%" height="100%"/>
 				<box orientation="horizontal" homogeneous="true">
 
                                         <!-- left part / login -->
-					<item type="rect">
+					<item type="rect" background="true">
 						<normal color="#000000" alpha="0.0"/>
 						<pos anchor="w" x="0" y="50%" width="100%" height="100%"/>
 						<box orientation="horizontal">
 
                                                         <!-- small logo -->
-							<item type="pixmap">
+							<item type="pixmap" background="true">
 								<normal file="openslx-logo.png"/>
 								<pos anchor="w" x="30" y="50%"/>
 							</item>
-- 
cgit v1.2.3-55-g7522