From c5cf9674b378a4189de407288ac483f8db991aa2 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Thu, 28 Feb 2008 13:54:47 +0000
Subject: Update gdm file and icons

---
 dm/disconnect.png | Bin 3232 -> 1229 bytes
 dm/languages.png  | Bin 2858 -> 1418 bytes
 dm/mdk-gdm.xml    | 307 ++++++++++++++++++++++++------------------------------
 dm/sessions.png   | Bin 3139 -> 1494 bytes
 dm/system.png     | Bin 2509 -> 1416 bytes
 5 files changed, 137 insertions(+), 170 deletions(-)

(limited to 'dm')

diff --git a/dm/disconnect.png b/dm/disconnect.png
index ecb9949..ed79853 100644
Binary files a/dm/disconnect.png and b/dm/disconnect.png differ
diff --git a/dm/languages.png b/dm/languages.png
index a315334..e5cf9bc 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 b6ed4ec..e11ced2 100644
--- a/dm/mdk-gdm.xml
+++ b/dm/mdk-gdm.xml
@@ -1,197 +1,164 @@
 <?xml version="1.0"?>
 <!DOCTYPE greeter SYSTEM "greeter.dtd">
 <greeter>
-  <item type="pixmap" background="true">
+  <item type="pixmap" id="background" background="true">
     <normal file="/usr/share/mdk/backgrounds/default.png"/>
     <pos x="0" y="0" width="100%" height="100%"/>
   </item>
-
-  <!-- START BAR -->
-  
+  <!-- MAIN BOX -->
   <item type="rect">
-    <pos x="0" y="92%" width="100%" height="8%"/>
-    <fixed>
+    <normal color="#FFFFFF" alpha="0.4"/>
+    <pos y="50%" x="50%" width="600" height="276" anchor="c"/>
+    <box orientation="vertical">
       <item type="rect">
-        <normal color="#ffffff" alpha="0.2" />
-        <pos x="0" y="4" width="100%" height="100%"/>
-	  <box orientation="horizontal" >
-	
-	  <!-- LANGUAGE BUTTON -->
-          <item type="rect" id="language_button" button="true">
-            <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"/>
-		<active file="languages.png" tint="#b8bcdb"/>
-         	<pos y="50%" anchor="w"/>
-	      </item>
-	      <item type="label">
-	        <normal color="#FFFFFF" font="Sans 14"/>
-		<prelight color="#BBBBBB" font="Sans 14"/>
-		<active color="#0d2d84" font="Sans 14"/>
-	        <pos y="50%" anchor="w"/>
-		<!-- Stock label for: _Language -->
-		<stock type="language"/>
-	     </item>
-            </box>
-	</item>
-
-          <item type="rect" id="session_button" button="true">
-            <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="sessions.png" tint="#dddddd"/>
-	        <prelight file="sessions.png"/>
-		<active file="sessions.png" tint="#b8bcdb"/>
-		<pos y="50%" anchor="w"/>
-	      </item>
-	      <item type="label">
-	        <normal color="#FFFFFF" font="Sans 14"/>
-		<prelight color="#BBBBBB" font="Sans 14"/>
-		<active color="#0d2d84" font="Sans 14"/>
-	        <pos y="50%" anchor="w"/>
-		<!-- Stock label for: _Session -->
-		<stock type="session"/>
-	      </item>
-            </box>
+        <pos width="100%" height="224"/>
+        <fixed>
+          <item type="rect">
+            <pos x="50%" height="50" width="100%" anchor="n"/>
+            <fixed>
+              <item type="label">
+                <pos x="50%" y="50%" anchor="c"/>
+                <normal color="#FFFFFF" font="Sans Bold 12"/>
+                <!-- Stock label for: Welcome to %h -->
+                <stock type="welcome-label"/>
+              </item>
+            </fixed>
           </item>
-          <item type="rect" id="system_button" button="true">
-            <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"/>
-	        <pos y="50%" anchor="w"/>
-	      </item>
-	      <item type="label">
-	        <normal color="#FFFFFF" font="Sans 14"/>
-		<prelight color="#BBBBBB" font="Sans 14"/>
-		<active color="#0d2d84" font="Sans 14"/>
-	        <pos y="50%" anchor="w"/>
-		<!-- Stock label for: _Actions -->
-		<stock type="system"/>
-	      </item>
-            </box>
+          <item type="rect">
+            <pos anchor="n" x="50%" y="50" width="100%" height="156"/>
+            <!--            <normal color="#FF0000" alpha="0.5"/>-->
+            <fixed>
+              <item type="rect" id="userlist-background">
+                <!-- 16 pixel per user in list -->
+                <pos x="22" width="50%" height="100%"/>
+                <!--            <normal color="#ffffff" alpha="1.0"/>-->
+                <fixed>
+                  <item type="list" id="userlist">
+                    <pos height="100%" width="100%"/>
+                  </item>
+                </fixed>
+              </item>
+              <!-- the login box contents, positioned freely -->
+              <item type="rect">
+                <pos width="box" height="box" x="100%" y="50%" anchor="e"/>
+                <box orientation="vertical" spacing="8" xpadding="22">
+                  <!-- Stock label for: Username: -->
+                  <item type="label" id="pam-prompt">
+                    <pos anchor="nw" x="0"/>
+                    <normal color="#FFFFFF" font="Sans 12"/>
+                    <stock type="username-label"/>
+                  </item>
+                  <!-- user entry -->
+                  <item type="entry" id="user-pw-entry">
+                    <pos height="24" width="230"/>
+                  </item>
+                  <item type="rect">
+                    <pos width="100%" height="24"/>
+                    <fixed>
+                      <item type="button" id="ok_button">
+                        <pos height="box" x="100%" anchor="e" width="box" y="50%"/>
+                        <stock type="ok"/>
+                      </item>
+                    </fixed>
+                  </item>
+                </box>
+              </item>
+            </fixed>
           </item>
-          <item type="rect" id="disconnect_button" button="true">
-            <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">
-	      <item type="pixmap">
-	        <normal file="disconnect.png" tint="#dddddd"/>
-		<prelight file="disconnect.png"/>
-		<active file="disconnect.png" tint="#b8bcdb"/>
-	        <pos y="50%" anchor="w"/>
-	      </item>
-	      <item type="label">
-	        <normal color="#FFFFFF" font="Sans 14"/>
-		<prelight color="#BBBBBB" font="Sans 14"/>
-		<active color="#0d2d84" font="Sans 14"/>
-	        <pos y="50%" anchor="w"/>
-		<!-- Stock label for: D_isconnect -->
-		<stock type="disconnect"/>
-	        <show modes="remote"/>
-	      </item>
-	      <item type="label">
-	        <normal color="#FFFFFF" font="Sans 14"/>
-		<prelight color="#BBBBBB" font="Sans 14"/>
-		<active color="#0d2d84" font="Sans 14"/>
-	        <pos y="50%" anchor="w"/>
-		<!-- Stock label for: _Quit -->
-		<stock type="quit"/>
-	        <show modes="flexi"/>
-	      </item>
+        </fixed>
+      </item>
+      <item type="rect">
+        <pos width="100%" height="2"/>
+        <normal color="#FFFFFF" alpha="0.4"/>
+      </item>
+      <item type="rect">
+        <pos width="100%" height="50"/>
+        <fixed>
+          <item type="label" id="clock">
+            <normal color="#FFFFFF" font="Sans 12"/>
+            <pos x="22" y="50%" anchor="w"/>
+            <text>%c</text>
+          </item>
+          <item type="rect">
+            <pos x="100%" y="50%" height="30" width="box" anchor="e"/>
+            <box orientation="horizontal" spacing="20" xpadding="22">
+              <item type="rect" id="language_button" button="true">
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="languages.png" tint="#dddddd"/>
+                    <prelight file="languages.png"/>
+                    <active file="languages.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="session_button" button="true">
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="sessions.png" tint="#dddddd"/>
+                    <prelight file="sessions.png"/>
+                    <active file="sessions.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="disconnect_button" button="true">
+                <show modes="flexi,remote"/>
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="disconnect.png" tint="#dddddd"/>
+                    <prelight file="disconnect.png"/>
+                    <active file="disconnect.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="system_button" button="true">
+                <show type="system" modes="console"/>
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="system.png" tint="#dddddd"/>
+                    <prelight file="system.png"/>
+                    <active file="system.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
             </box>
           </item>
-        </box>
-</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 -->
-
-  <!-- END BAR -->
-
-  <item type="rect" id="caps-lock-warning">
-    <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"/>
-        <pos x="50%" anchor="n"/>
-	<!-- Stock label for: You've got capslock on! -->
-	<stock type="caps-lock-warning"/>
+        </fixed>
       </item>
     </box>
   </item>
-
-  <item type="rect">
+  <!-- timer -->
+  <item type="rect" id="timed-rect">
     <show type="timed"/>
-    <normal color="#ffffff" alpha="0"/>
-    <pos anchor="c" x="50%" y="70%" width="box" height="box"/>
+    <normal color="#FFFFFF" alpha="0"/>
+    <pos anchor="n" x="50%" y="68%" width="box" height="box"/>
     <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
       <item type="label" id="timed-label">
-        <normal color="#000000" font="Sans 14"/>
+        <normal color="#ffffff" font="Sans 12"/>
         <pos x="50%" anchor="n"/>
-	<!-- Stock label for: User %s will login in %d seconds -->
-	<stock type="timed-label"/>
+        <!-- Stock label for: User %s will login in %d seconds -->
+        <stock type="timed-label"/>
       </item>
     </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">
-  <!-- WELCOME LABEL -->
-		<!--
-			<item type="label">
-        <pos anchor="n" x="50%"/>
-        <normal color="#FFFFFF" font="Sans 18"/>
-	<stock type="welcome-label"/>
-</item> -->
-      <item type="label" id="pam-prompt">
-        <pos anchor="nw" x="10%" />
+  <item type="label" id="pam-error">
+    <pos x="50%" y="75%" anchor="c"/>
+    <normal font="Sans Bold 14" color="#ffffff"/>
+    <text/>
+  </item>
+  <item type="rect" id="caps-lock-warning">
+    <normal color="#FFFFFF" alpha="0"/>
+    <pos anchor="n" x="50%" y="80%" 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"/>
-	<!-- Stock label for: Username: -->
-	<stock type="username-label"/>
-      </item>
-      <item type="rect">
-	<normal color="#FFFFFF"/>
-        <pos anchor="n" x="50%" height="24" width="80%"/>
-	<fixed>
-	  <item type="entry" id="user-pw-entry">
-            <pos anchor="nw" x="1" y="1" height="-2" width="-2"/>
-	  </item>
-	</fixed>
-      </item>
-      <item type="label" id="pam-message">
-        <pos anchor="n" x="50%"/>
-        <normal color="#FFFFFF" font="Sans 12"/>
-	<text></text>
+        <pos x="50%" anchor="n"/>
+        <!-- Stock label for: You've got capslock on! -->
+        <stock type="caps-lock-warning"/>
       </item>
     </box>
-    <fixed>
-      <item type="label" id="pam-error">
-        <pos anchor="n" x="50%" y="110%"/>
-        <normal color="#ffffff" font="Sans 14"/>
-        <text></text>
-      </item>
-    </fixed>
   </item>
 </greeter>
diff --git a/dm/sessions.png b/dm/sessions.png
index 6789346..07c1494 100644
Binary files a/dm/sessions.png and b/dm/sessions.png differ
diff --git a/dm/system.png b/dm/system.png
index 214697a..4dd1a11 100644
Binary files a/dm/system.png and b/dm/system.png differ
-- 
cgit v1.2.1