From 436dbce388e4f24d7c64079881b1bf021dfc75b5 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 27 Jun 2013 17:54:32 +0200
Subject: [kdm] Update theme

---
 .../themes/kdm/bwlehrpool/bwLehrpool-white.svg     |  36 +++++++++++++++++++++
 .../desktop/themes/kdm/bwlehrpool/openslx-logo.png | Bin 9113 -> 0 bytes
 .../share/desktop/themes/kdm/bwlehrpool/system.png | Bin 4257 -> 4311 bytes
 .../themes/kdm/bwlehrpool/system_inactive.png      | Bin 4091 -> 4235 bytes
 .../share/desktop/themes/kdm/bwlehrpool/theme.xml  |  36 ++++++++++++---------
 remote/rootfs/rootfs-stage32/rootfs-stage32.build  |  17 ++++++++++
 6 files changed, 74 insertions(+), 15 deletions(-)
 create mode 100644 remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/bwLehrpool-white.svg
 delete mode 100644 remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/openslx-logo.png

(limited to 'remote')

diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/bwLehrpool-white.svg b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/bwLehrpool-white.svg
new file mode 100644
index 00000000..f0d1a539
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/bwLehrpool-white.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="149.62437"
+   height="92.827499"
+   id="svg2985"
+   xml:space="preserve"><metadata
+     id="metadata2991"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs2989"><clipPath
+       id="clipPath3001"><path
+         d="M 0,8356.66 0,0 l 4518.7,0 0,8356.66 -4518.7,0 z"
+         id="path3003" /></clipPath></defs><g
+     transform="matrix(1.25,0,0,-1.25,-71.388125,593.675)"
+     id="g2993"><g
+       id="g3763"><path
+         d="m 107.979,438.637 -27.1091,0 0,11.032 21.5941,0 0,10.688 11.032,0 0,-16.204 c 0,-3.047 -2.469,-5.516 -5.517,-5.516"
+         id="path3065"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 122.466,400.678 -10.537,0 0,25.76 c 0.127,2.954 2.557,5.284 5.513,5.284 l 59.368,0 0,-11.033 -54.08,0 -0.264,-20.011"
+         id="path3067"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 104.061,409.795 -11.109,0 -0.109,10.894 -35.7325,0 0,11.033 41.434,0 c 1.4935,0 2.9235,-0.607 3.9645,-1.681 1.038,-1.074 1.597,-2.523 1.549,-4.018 l 0.003,-16.228"
+         id="path3069"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 146.076,438.57 -20.455,0 c -3.046,0 -5.517,2.471 -5.517,5.518 l 0,30.852 11.033,0 0,-25.336 14.939,0 0,-11.034"
+         id="path3071"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></svg>
\ No newline at end of file
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/openslx-logo.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/openslx-logo.png
deleted file mode 100644
index 8cfaaf94..00000000
Binary files a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/openslx-logo.png and /dev/null differ
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system.png
index f7b9e71f..4857b941 100644
Binary files a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system.png and b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system.png differ
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system_inactive.png
index c3e1719b..28f0251f 100644
Binary files a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system_inactive.png and b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system_inactive.png differ
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml
index 9012394a..8b05a8d5 100644
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml
@@ -69,15 +69,15 @@ KDM-OpenSLX-Theme
 						<box orientation="horizontal">
 
                             <!-- small logo -->
-							<item type="pixmap" background="true">
-								<normal file="openslx-logo.png"/>
-								<pos anchor="w" x="30" y="50%"/>
+							<item type="pixmap">
+								<normal file="bwLehrpool-white.svg" scalemode="fit"/>
+								<pos anchor="w" x="20" y="50%" width="80" height="100%"/>
 							</item>
 
                             <!-- login -->
 							<item type="rect">
 								<normal color="#000000" alpha="0.0"/>
-								<pos anchor="w" x="70" y="50%" width="box" height="box"/>
+								<pos anchor="w" x="40" y="50%" width="box" height="box"/>
 								<box orientation="horizontal" spacing="10">
 
 									<item type="rect">
@@ -99,7 +99,7 @@ KDM-OpenSLX-Theme
 										</box>
 									</item>
 
-                                    <item type="rect">
+									<item type="rect">
 										<normal color="#000000" alpha="0.0"/>
 										<pos anchor="nw" x="0" y="0" width="box" height="box"/>
 										<box homogeneous="true" spacing="10">
@@ -112,13 +112,13 @@ KDM-OpenSLX-Theme
 												<pos anchor="w" x="0" y="50%" height="20" width="200"/>
 											</item>
 										</box>
-                                    </item>
+									</item>
 
-                                    <item type="pixmap" button="true" id="login_button">
-                                        <pos anchor="sw" x="0" y="-0" height="20" width="20"/>
-                                        <normal file="enter_inactive.png"/>
-                                        <prelight file="enter.png"/>
-                                    </item>
+									<item type="pixmap" button="true" id="login_button">
+										<pos anchor="sw" x="0" y="-0" height="20" width="20"/>
+										<normal file="enter_inactive.png"/>
+										<prelight file="enter.png"/>
+									</item>
 
 								</box>
 							</item>
@@ -200,9 +200,15 @@ KDM-OpenSLX-Theme
 			</item>
                       
         </box>
-	</item>
-	<item type="pixmap" id="distro_logo" button="false">
-		<normal file="/etc/distro.png"/>
-		<pos anchor="se" x="99%" y="99%"/>
+		<!-- Icon/Logo of Uni -->
+		<item type="pixmap" id="branding_logo" button="false">
+			<normal file="/etc/branding.svg" scalemode="fit"/>
+			<pos anchor="sw" x="1%" y="99%" width="13%" height="13%"/>
+		</item>
+		<!-- Icon/Logo of Base Distro -->
+		<item type="pixmap" id="distro_logo" button="false">
+			<normal file="/etc/distro.png" scalemode="fit"/>
+			<pos anchor="se" x="99%" y="99%" width="13%" height="13%"/>
+		</item>
 	</item>
 </greeter>
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 4e16996b..3cfbbe5f 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -115,6 +115,23 @@ post_copy() {
 	else
 		pinfo "Not copying firmware from system, as '${TARGET_BUILD_DIR}/lib/firmware' already exists."
 	fi	
+
+	# Try to fetch distro logo
+	if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then
+		local DIST=$(lsb_release -a | grep ^Distributor)
+		DIST="${DIST#*:}"
+		pinfo "Distribution is $DIST"
+		if [ -n "$DIST" ]; then
+			wget -O "$TARGET_BUILD_DIR/etc/distro.png" "http://132.230.8.113/distro_logo.php?distro=$DIST"
+			if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then
+				rm -f "$TARGET_BUILD_DIR/etc/distro.png"
+				pwarning "Could not download distro-logo"
+			fi
+		else
+			pwarning "Could not determine distribution"
+		fi
+	fi
+
 	copy_kernel
 }
 
-- 
cgit v1.2.3-55-g7522