From 2c931a20f303a9a488aef6eafb6a5d21b6b2faac Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Fri, 14 Sep 2007 16:33:10 +0000
Subject: Import new 2008 theme and port it to gdm

---
 dm/GdmGreeterTheme.desktop |   2 +-
 dm/KdmGreeterTheme.desktop |   2 +-
 dm/languages.png           | Bin 3056 -> 2858 bytes
 dm/mdk-gdm.xml             |  76 +++++++++++++++++++--------------
 dm/mdk-kde.xml             | 104 +++++++++++++++++++++------------------------
 dm/reboot.png              | Bin 3817 -> 2509 bytes
 dm/sessions.png            | Bin 4998 -> 3139 bytes
 dm/star.png                | Bin 9736 -> 0 bytes
 dm/system.png              | Bin 4232 -> 0 bytes
 9 files changed, 94 insertions(+), 90 deletions(-)
 delete mode 100644 dm/star.png
 delete mode 100644 dm/system.png

(limited to 'dm')

diff --git a/dm/GdmGreeterTheme.desktop b/dm/GdmGreeterTheme.desktop
index d61548d..1ed5770 100644
--- a/dm/GdmGreeterTheme.desktop
+++ b/dm/GdmGreeterTheme.desktop
@@ -7,5 +7,5 @@ Greeter=mdk-gdm.xml
 Name=Mandriva Linux
 Description=Mandriva Linux theme
 Author=Mandriva graphic team
-Copyright=(c) 2002-2005 Mandriva
+Copyright=(c) 2002-2007 Mandriva
 Screenshot=screenshot.png
diff --git a/dm/KdmGreeterTheme.desktop b/dm/KdmGreeterTheme.desktop
index da216af..bdbeb80 100644
--- a/dm/KdmGreeterTheme.desktop
+++ b/dm/KdmGreeterTheme.desktop
@@ -7,5 +7,5 @@ Greeter=mdk-kde.xml
 Name=Mandriva Linux
 Description=Mandriva Linux theme
 Author=Mandriva graphic team
-Copyright=(c) 2002-2005 Mandriva
+Copyright=(c) 2002-2007 Mandriva
 Screenshot=screenshot.png
diff --git a/dm/languages.png b/dm/languages.png
index a6d79f3..a315334 100644
Binary files a/dm/languages.png and b/dm/languages.png differ
diff --git a/dm/mdk-gdm.xml b/dm/mdk-gdm.xml
index 25627f0..117c167 100644
--- a/dm/mdk-gdm.xml
+++ b/dm/mdk-gdm.xml
@@ -6,35 +6,40 @@
     <pos x="0" y="0" width="100%" height="100%"/>
   </item>
 
+  <!-- START BAR -->
+  
   <item type="rect">
-    <pos x="0" y="90%" width="100%" height="10%"/>
+    <pos x="0" y="92%" width="100%" height="8%"/>
     <fixed>
       <item type="rect">
-        <normal color="#ffffff"/>
+        <normal color="#ffffff" alpha="0.2" />
         <pos x="0" y="4" width="100%" height="100%"/>
-        <box orientation="horizontal" spacing="10" xpadding="10">
+	  <box orientation="horizontal" >
+	
+	  <!-- LANGUAGE BUTTON -->
           <item type="rect" id="language_button" button="true">
-            <normal color="#ffffff"/>
+            <normal color="#ffffff" alpha="0" />
 	    <pos y="50%" anchor="w" width="box" height="box"/>
             <box orientation="horizontal" spacing="10" xpadding="10">
 	      <item type="pixmap">
 	        <normal file="languages.png" tint="#dddddd"/>
-	        <prelight file="languages.png"/>
+   		<prelight file="languages.png"/>
 		<active file="languages.png" tint="#b8bcdb"/>
-	        <pos y="50%" anchor="w"/>
+         	<pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#21449c" font="Sans 14"/>
+	        <normal color="#FFFFFF" font="Sans 14"/>
 		<prelight color="#666666" font="Sans 14"/>
 		<active color="#0d2d84" font="Sans 14"/>
 	        <pos y="50%" anchor="w"/>
 		<!-- Stock label for: _Language -->
 		<stock type="language"/>
-	      </item>
+	     </item>
             </box>
-          </item>
+	</item>
+
           <item type="rect" id="session_button" button="true">
-            <normal color="#ffffff"/>
+            <normal color="#ffffff" alpha="0" />
 	    <pos y="50%" anchor="w" width="box" height="box"/>
             <box orientation="horizontal" spacing="10" xpadding="10">
 	      <item type="pixmap">
@@ -44,7 +49,7 @@
 		<pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#21449c" font="Sans 14"/>
+	        <normal color="#FFFFFF" font="Sans 14"/>
 		<prelight color="#666666" font="Sans 14"/>
 		<active color="#0d2d84" font="Sans 14"/>
 	        <pos y="50%" anchor="w"/>
@@ -54,18 +59,18 @@
             </box>
           </item>
           <item type="rect" id="system_button" button="true">
-            <normal color="#ffffff"/>
+            <normal color="#ffffff" alpha="0" />
 	    <show modes="console" type="system"/>
 	    <pos y="50%" anchor="w" width="box" height="box"/>
             <box orientation="horizontal" spacing="10" xpadding="10">
 	      <item type="pixmap">
-	        <normal file="system.png" tint="#dddddd"/>
-	        <prelight file="system.png"/>
-		<active file="system.png" tint="#b8bcdb"/>
+	        <normal file="reboot.png" tint="#dddddd"/>
+	        <prelight file="reboot.png"/>
+		<active file="reboot.png" tint="#b8bcdb"/>
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#21449c" font="Sans 14"/>
+	        <normal color="#FFFFFF" font="Sans 14"/>
 		<prelight color="#666666" font="Sans 14"/>
 		<active color="#0d2d84" font="Sans 14"/>
 	        <pos y="50%" anchor="w"/>
@@ -75,7 +80,7 @@
             </box>
           </item>
           <item type="rect" id="disconnect_button" button="true">
-            <normal color="#ffffff"/>
+            <normal color="#ffffff" alpha="0" />
 	    <show modes="flexi,remote"/>
 	    <pos y="50%" anchor="w" width="box" height="box"/>
             <box orientation="horizontal" spacing="10" xpadding="10">
@@ -86,7 +91,7 @@
 	        <pos y="50%" anchor="w"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#21449c" font="Sans 14"/>
+	        <normal color="#FFFFFF" font="Sans 14"/>
 		<prelight color="#666666" font="Sans 14"/>
 		<active color="#0d2d84" font="Sans 14"/>
 	        <pos y="50%" anchor="w"/>
@@ -95,7 +100,7 @@
 	        <show modes="remote"/>
 	      </item>
 	      <item type="label">
-	        <normal color="#21449c" font="Sans 14"/>
+	        <normal color="#FFFFFF" font="Sans 14"/>
 		<prelight color="#666666" font="Sans 14"/>
 		<active color="#0d2d84" font="Sans 14"/>
 	        <pos y="50%" anchor="w"/>
@@ -106,19 +111,23 @@
             </box>
           </item>
         </box>
-      </item>
+</item>
+
+<!-- START CLOCK -->
+ 	 <item type="label" id="clock">
+  	  <normal color="#FFFFFF" font="Sans 14"/>
+ 	   <pos x="99%" y="55%" anchor="e"/>
+  	  <text>%c</text>
+	  </item>
     </fixed>
   </item>
+<!-- END CLOCK -->
 
-  <item type="label" id="clock">
-    <normal color="#0d2d84" font="Sans 16"/>
-    <pos x="-10" y="95%" anchor="e"/>
-    <text>%c</text>
-  </item>
+  <!-- END BAR -->
 
   <item type="rect" id="caps-lock-warning">
-    <normal color="#ffffff" alpha="0"/>
-    <pos anchor="c" x="50%" y="50%" width="box" height="box"/>
+    <normal color="#ffffff" alpha="0.0"/>
+    <pos anchor="c" x="50%" y="60%" width="box" height="box"/>
     <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
       <item type="label">
         <normal color="#FFFFFF" font="Sans 14"/>
@@ -135,7 +144,7 @@
     <pos anchor="c" x="50%" y="70%" width="box" height="box"/>
     <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
       <item type="label" id="timed-label">
-        <normal color="#FFFFFF" font="Sans 14"/>
+        <normal color="#000000" font="Sans 14"/>
         <pos x="50%" anchor="n"/>
 	<!-- Stock label for: User %s will login in %d seconds -->
 	<stock type="timed-label"/>
@@ -143,16 +152,19 @@
     </box>
   </item>
 
+  <!-- HERE START THE CENTER LOGIN LAYOUT -->
+
   <item type="rect">
     <normal color="#ffffff" alpha="0"/>
     <pos anchor="c" x="50%" y="40%" width="box" height="box"/>
     <box orientation="vertical" min-width="350" xpadding="30" ypadding="30" spacing="10">
-      <item type="label">
+  <!-- WELCOME LABEL -->
+		<!--
+			<item type="label">
         <pos anchor="n" x="50%"/>
         <normal color="#FFFFFF" font="Sans 18"/>
-	<!-- Stock label for: Welcome to %h -->
 	<stock type="welcome-label"/>
-      </item>
+</item> -->
       <item type="label" id="pam-prompt">
         <pos anchor="nw" x="10%" />
         <normal color="#FFFFFF" font="Sans 14"/>
@@ -177,7 +189,7 @@
     <fixed>
       <item type="label" id="pam-error">
         <pos anchor="n" x="50%" y="110%"/>
-        <normal color="#ffffff" font="Sans 16"/>
+        <normal color="#ffffff" font="Sans 14"/>
         <text></text>
       </item>
     </fixed>
diff --git a/dm/mdk-kde.xml b/dm/mdk-kde.xml
index 0760f84..9923832 100644
--- a/dm/mdk-kde.xml
+++ b/dm/mdk-kde.xml
@@ -9,10 +9,10 @@
   <!-- START BAR -->
   
   <item type="rect">
-    <pos x="0" y="90%" width="100%" height="10%"/>
+    <pos x="0" y="92%" width="100%" height="8%"/>
     <fixed>
       <item type="rect">
-        <normal color="#ffffff" alpha="0.1" />
+        <normal color="#ffffff" alpha="0.2" />
         <pos x="0" y="4" width="100%" height="100%"/>
 		<box orientation="horizontal" >
 	
@@ -116,7 +116,7 @@
 <!-- START CLOCK -->
  	 <item type="label" id="clock">
   	  <normal color="#FFFFFF" font="Sans 11"/>
- 	   <pos x="95%" y="55%" anchor="e"/>
+ 	   <pos x="99%" y="55%" anchor="e"/>
   	  <text>%c</text>
 	  </item>
     </fixed>
@@ -155,9 +155,9 @@
   <!-- HERE START THE CENTER LOGIN LAYOUT -->
 
   <item type="rect">
-    <normal color="#ffffff" alpha="0.2"/>
-    <pos anchor="c" x="50%" y="40%" width="box" height="150"/>
-    <box orientation="vertical" min-width="350" xpadding="5" ypadding="5" spacing="2">
+    <normal color="#ffffff" alpha="0"/>
+    <pos anchor="c" x="50%" y="40%" width="box" height="box"/>
+    <box orientation="vertical" min-width="150" xpadding="5" ypadding="5" spacing="2">
   <!-- WELCOME LABEL -->
 		<!--
 			<item type="label">
@@ -173,54 +173,46 @@
 		<normal color="#FFFFFF" alpha="0" font="Sans 12"/>
 		<pos anchor="n" x="50%" width="box" height="box"/>
 
-
-
-		<box orientation="horizontal" xpadding="0" ypadding="0" spacing="5">
-				<!-- USER LIST -->
-			<item type="rect" id="userlist-background">
-					<pos anchor="w" y="50%" width="150" height="140" />
-				<normal color="#FFFFFF" alpha="0.7"/>
-					<item type="rect" id="userlist">
-						<pos  width="100%" height="100%"/>
-						<show type="userlist"/>
-						<normal color="#ffffff" alpha="0"/>
-					</item>
-		</item> 
-
-			<item type="rect">
-				<normal color="#FF8080" alpha="0.0"/>
-				<pos anchor="w" y="50%" width="box" height="box"/>
-				<box orientation="vertical" xpadding="10" ypadding="0" spacing="0">
-					<item type="label">
-						<pos anchor="ne" x="100%"/>
-						<normal color="#FFFFFF" font="Sans 13"/>
-						<!-- Stock label for: Username: -->
-						<stock type="username-label"/>
-					</item>
-					<item type="entry" id="user-entry">
-						<pos anchor="ne" x="100%" height="20" width="150"/>
-					</item>
-					<item type="label">
-						<pos anchor="ne" x="100%"/>
-						<normal color="#FFFFFF" font="Sans 13"/>
-						<!-- Stock label for: Password: -->
-						<stock type="password-label"/>
-					</item>
-					<item type="entry" id="pw-entry">
-						<pos anchor="ne" x="100%" height="20" width="150"/>
-	  				</item>
-				</box>
-			</item>
-		</box>
-
-	</item>
-</box>
-    <fixed>
-      <item type="label" id="pam-error">
-        <pos anchor="n" x="50%" y="110%"/>
-        <normal color="#ffffff" font="Sans 11"/>
-        <text></text>
-      </item>
-    </fixed>
-  </item>
+        <box orientation="horizontal" xpadding="0" ypadding="0" spacing="0">
+            <item type="rect">
+                <normal color="#FF8080" alpha="0.0"/>
+                <pos anchor="w" y="50%" width="box" height="box"/>
+                <box orientation="vertical" xpadding="0" ypadding="0" spacing="14">
+                    <item type="label">
+                        <pos anchor="ne" x="100%"/>
+                       <normal color="#FFFFFF" font="Sans 14"/>
+                        <!-- Stock label for: Username: -->
+                       <stock type="username-label"/>
+                    </item>
+                    <item type="label">
+                        <pos anchor="ne" x="100%"/>
+                        <normal color="#FFFFFF" font="Sans 14"/>
+                        <!-- Stock label for: Password: -->
+                        <stock type="password-label"/>
+                    </item>
+                </box>
+            </item>
+            <item type="rect">
+                <normal color="#FF80FF" alpha="0.0"/>
+                <pos anchor="w" y="50%" width="box" height="box"/>
+                <box orientation="vertical" xpadding="15" ypadding="0" spacing="10">
+                    <item type="entry" id="user-entry">
+                        <pos anchor="n" x="50%" height="24" width="150"/>
+                    </item>
+                    <item type="entry" id="pw-entry">
+                        <pos anchor="n" x="50%" height="24" width="150"/>
+                    </item>
+                </box>
+                    </item>
+                </box>
+            </item>
+        </box>
+        <fixed>
+            <item type="label" id="pam-error">
+                <pos anchor="n" x="50%" y="110%"/>
+                <normal color="#ffffff" font="Sans 11"/>
+                <text></text>
+            </item>
+        </fixed>
+    </item>
 </greeter>
diff --git a/dm/reboot.png b/dm/reboot.png
index 705cd03..214697a 100644
Binary files a/dm/reboot.png and b/dm/reboot.png differ
diff --git a/dm/sessions.png b/dm/sessions.png
index 0058814..6789346 100644
Binary files a/dm/sessions.png and b/dm/sessions.png differ
diff --git a/dm/star.png b/dm/star.png
deleted file mode 100644
index a015ab8..0000000
Binary files a/dm/star.png and /dev/null differ
diff --git a/dm/system.png b/dm/system.png
deleted file mode 100644
index 7423ea3..0000000
Binary files a/dm/system.png and /dev/null differ
-- 
cgit v1.2.1