hopefully the final version

git-svn-id: svn+ssh://scm.narf.ssji.net/svn/archlinux-packages@69 df209809-8e4a-0410-9a64-c169741eb0fc

5 files changed, 12 insertions, 169 deletions

diff --git a/GdmGreeterTheme-list.desktop b/GdmGreeterTheme-list.desktop
index f8290f327c35..6ea89a88967c 100644
--- a/GdmGreeterTheme-list.desktop
+++ b/GdmGreeterTheme-list.desktop
@@ -3,9 +3,9 @@
 
 [GdmGreeterTheme]
 Encoding=UTF-8
-Greeter=arch.xml
-Name=Archlinux
-Description=Arch Linux GDM Theme with face browser
-Author=Lukas Kropatschek <lukas.krop@gmail.com
+Greeter=arch-list.xml
+Name=Archlinux with Browser
+Description=Arch Linux GDM Theme with a Face Browser
+Author=Lukas Kropatschek <lukas.krop@gmail.com>
 Copyright=(c) 2006 Lukas Kropatschek
 Screenshot=screenshot-list.png
diff --git a/PKGBUILD b/PKGBUILD
index d2171ca6817d..3f9a094f3fec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,12 +22,13 @@ build() {
 	mkdir -p $startdir/pkg/opt/gnome/share/gdm/themes/arch-list
 	for FILE in $startdir/pkg/opt/gnome/share/gdm/themes/arch/* ; do 
 		BASENAME=${FILE/*\/}
-		ln -s /opt/gnome/share/gdm/themes/arch/${BASENAME} $startdir/pkg/opt/gnome/share/gdm/themes/arch-list/${BASENAME}
+		#ln -s /opt/gnome/share/gdm/themes/arch/${BASENAME} $startdir/pkg/opt/gnome/share/gdm/themes/arch-list/${BASENAME}
+		cp $startdir/pkg/opt/gnome/share/gdm/themes/arch/${BASENAME} $startdir/pkg/opt/gnome/share/gdm/themes/arch-list/${BASENAME}
 	done
 	rm $startdir/pkg/opt/gnome/share/gdm/themes/arch-list/arch.xml
 	rm $startdir/pkg/opt/gnome/share/gdm/themes/arch-list/screenshot.jpg
 	rm $startdir/pkg/opt/gnome/share/gdm/themes/arch-list/GdmGreeterTheme.desktop
-	cp $startdir/arch-list.xml $startdir/pkg/opt/gnome/share/gdm/themes/arch-list/
+	patch $startdir/arch.xml $startdir/list.patch -o $startdir/pkg/opt/gnome/share/gdm/themes/arch-list/arch-list.xml
 	cp $startdir/screenshot-list.jpg $startdir/pkg/opt/gnome/share/gdm/themes/arch-list/
 	cp $startdir/GdmGreeterTheme-list.desktop $startdir/pkg/opt/gnome/share/gdm/themes/arch-list/GdmGreeterTheme.desktop
 }
diff --git a/arch-list.xml b/arch-list.xml
deleted file mode 100644
index db4c8b32fd29..000000000000
--- a/arch-list.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE greeter SYSTEM "greeter.dtd">
-<greeter>
-  <item type="svg">
-    <normal file="background.png"/>
-    <pos x="0" y="0" width="100%" height="100%"/>
-  </item>
-  <item type="rect">
-    <normal color="#000000"/>
-    <pos x="0" y="-75" width="100%" height="75"/>
-    <fixed>
-      <item type="rect">
-        <normal color="#ffffff"/>
-        <pos x="0" y="4" width="100%" height="100%"/>
-        <box orientation="horizontal" spacing="10" xpadding="10">
-          <item type="rect" id="options_button" button="true">
-            <normal color="#ffffff"/>
-	    <pos y="50%" anchor="w" width="box" height="box"/>
-            <box orientation="horizontal" spacing="10" xpadding="10">
-	      <item type="pixmap">
-	        <normal file="options.png" tint="#dddddd"/>
-	        <prelight file="options.png"/>
-	        <active file="options.png" tint="#ff0000"/>
-	        <pos y="50%" anchor="w"/>
-	      </item>
-	      <item type="label">
-	        <normal color="#000000" font="Sans 12"/>
-		<prelight color="#666666" font="Sans 12"/>
-		<active color="#ff0000" font="Sans 12"/>
-	        <pos y="50%" anchor="w"/>
-		<!-- Stock label for: _Options -->
-		<stock type="options"/>
-	      </item>
-            </box>
-          </item>
-        </box>
-      </item>
-    </fixed>
-  </item>
-  <item type="pixmap">
-    <normal file="nvidia-arch.png"/>
-    <pos x="100%" y="100%" anchor="se"/>
-  </item>
-  <item type="label" id="clock">
-    <normal color="#000000" font="Sans 12"/>
-    <pos x="-20" y="-37" anchor="e"/>
-    <text>%c</text>
-  </item>
-
-  <item type="rect" id="caps-lock-warning">
-    <normal color="#FFFFFF" alpha="0.5"/>
-    <pos anchor="c" x="75%" y="75%" width="box" height="box"/>
-    <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
-      <item type="label">
-        <normal color="#000000" font="Sans 12"/>
-        <pos x="50%" anchor="n"/>
-	<!-- Stock label for: You've got capslock on! -->
-	<stock type="caps-lock-warning"/>
-      </item>
-    </box>
-  </item>
-
-  <item type="rect">
-    <show type="timed"/>
-    <normal color="#FFFFFF" alpha="0.5"/>
-    <pos anchor="c" x="75%" y="25%" 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 12"/>
-        <pos x="50%" anchor="n"/>
-	<!-- Stock label for: User %s will login in %d seconds -->
-	<stock type="timed-label"/>
-      </item>
-    </box>
-  </item>
-
-  <item type="rect" id="userlist-rect">
-    <normal color="#FFFFFF" alpha="0.5" font="Sans 14"/>
-    <pos anchor="c" x="25%" y="50%" width="box" height="box"/>
-    <box orientation="vertical" min-width="440" max-width="440" min-height="100" xpadding="4" ypadding="4" spacing="0">
-      <item type="list" id="userlist">
-        <pos anchor="nw" x="0" y="0" height="550" width="440"/>
-        <color iconcolor="#ACBFDD" labelcolor="#ACBFDD"/>
-      </item>
-    </box>
-  </item>
-
-  <item type="rect">
-    <normal color="#FFFFFF" alpha="0.5"/>
-    <pos anchor="c" x="75%" y="50%" width="box" height="box"/>
-    <box orientation="vertical" min-width="340" xpadding="30" ypadding="30" spacing="10">
-      <item type="label">
-        <pos anchor="n" x="50%"/>
-        <normal color="#000000" font="Sans 18"/>
-	<!-- Stock label for: Welcome to %h -->
-	<stock type="welcome-label"/>
-      </item>
-      <item type="label" id="pam-prompt">
-        <pos anchor="nw" x="10%"/>
-        <normal color="#000000" font="Sans 12"/>
-	<!-- Stock label for: Username: -->
-	<stock type="username-label"/>
-      </item>
-      <item type="rect">
-	<normal color="#000000"/>
-        <pos anchor="n" x="50%" height="24" width="80%"/>
-	<fixed>
-	  <item type="entry" id="user-pw-entry">
-            <normal color="#000000" font="Sans 12"/>
-            <pos anchor="nw" x="1" y="1" height="-2" width="-2"/>
-	  </item>
-	</fixed>
-      </item>
-      <item type="rect" id="ok_button" button="true">
-        <normal color="#ffffff"/>
-        <pos anchor="n" x="50%" width="50%" height="20"/>
-        <box orientation="vertical" spacing="10" xpadding="10">
-          <item type="label">
-            <normal color="#000000" font="Sans 12"/>
-            <prelight color="#666666" font="Sans 12"/>
-            <active color="#ff0000" font="Sans 12"/>
-            <pos anchor="n" x="50%" height="24" width="50%"/>
-            <!-- Stock label for: _OK -->
-            <stock type="ok"/>
-          </item>
-        </box>
-      </item>
-      <item type="rect" id="cancel_button" button="true">
-        <normal color="#ffffff"/>
-        <pos anchor="n" x="50%" width="50%" height="20"/>
-        <box orientation="vertical" spacing="10" xpadding="10">
-          <item type="label">
-            <normal color="#000000" font="Sans 12"/>
-            <prelight color="#666666" font="Sans 12"/>
-            <active color="#ff0000" font="Sans 12"/>
-            <pos anchor="n" x="50%" height="24" width="50%"/>
-            <!-- Stock label for: _Cancel -->
-            <stock type="cancel"/>
-          </item>
-        </box>
-      </item>
-      <item type="label" id="pam-message">
-        <pos anchor="n" x="50%"/>
-        <normal color="#000000" font="Sans 12"/>
-	<text></text>
-      </item>
-    </box>
-    <fixed>
-      <item type="label" id="pam-error">
-        <pos anchor="n" x="50%" y="110%"/>
-        <normal color="#000000" font="Sans 12"/>
-        <text></text>
-      </item>
-    </fixed>
-  </item>
-</greeter>
-
-
diff --git a/list.patch b/list.patch
index 950ef1be5b23..afa81839641b 100644
--- a/list.patch
+++ b/list.patch
@@ -1,6 +1,6 @@
---- arch.xml	2007-02-02 19:23:52.000000000 +0100
-+++ arch-list.xml	2007-02-02 19:23:52.000000000 +0100
-@@ -33,7 +33,7 @@
+--- arch.xml	2007-04-17 14:29:44.000000000 +0200
++++ arch-list.xml	2007-04-17 14:45:30.000000000 +0200
+@@ -49,7 +49,7 @@
  
    <item type="rect" id="caps-lock-warning">
      <normal color="#FFFFFF" alpha="0.5"/>
@@ -9,7 +9,7 @@
      <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
        <item type="label">
          <normal color="#000000" font="Sans 12"/>
-@@ -47,7 +47,7 @@
+@@ -63,7 +63,7 @@
    <item type="rect">
      <show type="timed"/>
      <normal color="#FFFFFF" alpha="0.5"/>
@@ -18,7 +18,7 @@
      <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
        <item type="label" id="timed-label">
          <normal color="#000000" font="Sans 12"/>
-@@ -58,13 +58,24 @@
+@@ -74,13 +74,24 @@
      </box>
    </item>
  
diff --git a/screenshot-list.jpg b/screenshot-list.jpg
index 1305e05f0704..7fc5e932d2d4 100644
--- a/screenshot-list.jpg
+++ b/screenshot-list.jpg