2007-09-21 Dave Fincher <finchair@yahoo.com>^M

        Fixes bug #478805.
        * gui/greeter/themes/happygnome/happygnome-list.xml: Updated
          happygnome-list.xml so that all elements display on 800x600 and
          larger screen resolutions and elements dynamically adjust size and
          position based on the screen resolution.
        * gui/greeter/themes/happygnome-list: Removed the options.png files
          which  is not used in the happygnome-list theme
        * gui/greeter/themes/happygnome-list/Makefile.am:
          Removed session.png file entry which is not used in the
          happygnome-list theme.

2007-09-21  Dave Fincher  <finchair@yahoo.com>

        Fixes bug #478800.
        * gui/greeter/themes/happygnome/happygnome.xml: Updated happygnome.xml
          so that the bottom buttons and bar to display on 800x600 and larger
          screen resolutions.
        * gui/greeter/themes/happygnome: Removed the options.png files which
          is not used in the happygnome theme
        * gui/greeter/themes/circles/Makefile.am:
          Removed session.png file entry which is not used in the circles theme.

svn path=/trunk/; revision=5309

7 files changed, 179 insertions, 153 deletions

diff --git a/ChangeLog b/ChangeLog
index 84521d3b..ab66374f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2007-09-21  Dave Fincher  <finchair@yahoo.com>^M
+
+	Fixes bug #478805.
+	* gui/greeter/themes/happygnome/happygnome-list.xml: Updated
+	  happygnome-list.xml so that all elements display on 800x600 and
+	  larger screen resolutions and elements dynamically adjust size and
+	  position based on the screen resolution.
+	* gui/greeter/themes/happygnome-list: Removed the options.png files
+	  which  is not used in the happygnome-list theme
+	* gui/greeter/themes/happygnome-list/Makefile.am:
+	  Removed session.png file entry which is not used in the
+	  happygnome-list theme.
+
+2007-09-21  Dave Fincher  <finchair@yahoo.com>
+
+	Fixes bug #478800.
+	* gui/greeter/themes/happygnome/happygnome.xml: Updated happygnome.xml 
+	  so that the bottom buttons and bar to display on 800x600 and larger
+	  screen resolutions.
+	* gui/greeter/themes/happygnome: Removed the options.png files which 
+	  is not used in the happygnome theme
+	* gui/greeter/themes/circles/Makefile.am:
+	  Removed session.png file entry which is not used in the circles theme.
+
 2007-09-20  Brian Cameron  <brian.cameron@sun.com>
 
 	* configure.ac: Bump glib dependency to 2.12 since we now
diff --git a/gui/greeter/themes/happygnome-list/Makefile.am b/gui/greeter/themes/happygnome-list/Makefile.am
index 65177a60..42d61772 100644
--- a/gui/greeter/themes/happygnome-list/Makefile.am
+++ b/gui/greeter/themes/happygnome-list/Makefile.am
@@ -4,7 +4,6 @@ happygnome_DATA = \
 	happygnome-list.xml \
 	background.svg \
 	gnome-logo.svg  \
-	options.png \
 	screenshot.png
 
 happygnome_in_files = \
diff --git a/gui/greeter/themes/happygnome-list/happygnome-list.xml b/gui/greeter/themes/happygnome-list/happygnome-list.xml
index 7b9f2ea8..6442c692 100644
--- a/gui/greeter/themes/happygnome-list/happygnome-list.xml
+++ b/gui/greeter/themes/happygnome-list/happygnome-list.xml
@@ -1,128 +1,140 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE greeter SYSTEM "greeter.dtd">
 <greeter>
-  <item type="svg" background="true">
-    <normal file="background.svg"/>
-    <pos x="0" y="0" width="100%" height="-75"/>
-  </item>
-  <item type="rect" background="true">
-    <normal color="#000000"/>
-    <pos x="0" y="-75" width="100%" height="75"/>
-    <fixed>
-      <item type="rect" background="true">
-        <normal color="#ffffff"/>
-        <pos x="0" y="4" width="100%" height="100%"/>
-        <box orientation="horizontal" spacing="10" xpadding="10" ypadding="10">
-          <item type="button" id="options_button">
-            <pos width="100" height="50" />
-            <stock type="options"/>
-          </item>
-          <item type="list" id="language" combo="true">
-            <pos  x="25" y="5" height="40" width="300"/>
-          </item>
-          <item type="list" id="session" combo="true">
-            <pos x="50" y="5" height="40" width="300"/>
-          </item>
-        </box>
-      </item>
-    </fixed>
-  </item>
-  <item type="svg" background="true">
-    <normal file="gnome-logo.svg"/>
-    <pos x="-12" y="-12" width="30" height="47" anchor="se" />
-  </item>
-  <item type="label" id="clock">
-    <normal color="#000000" font="Sans 12"/>
-    <pos x="-80" y="-37" anchor="e"/>
-    <text>%c</text>
-  </item>
+	<item type="svg" background="true">
+		<normal file="background.svg"/>
+		<pos x="0" y="0" width="100%" height="-75"/>
+	</item>
+	<item type="rect">
+	<normal color="#000000"/>
+		<pos x="0" y="-76" width="100%" height="76"/>
+		<fixed>
+			<item type="rect" background="true">
+				<normal color="#ffffff"/>
+				<pos x="0" y="5" width="100%" height="100%"/>
+				<box orientation="horizontal" spacing="10" xpadding="10" ypadding="0">
+					<item type="button" id="options_button">
+						<pos y="50%" anchor="w" width="100" height="40" />
+						<stock type="options"/>
+					</item>
+					<item type="list" id="session" combo="true">
+						<pos y="50%" anchor="w" height="40" width="200"/>
+					</item>
+					<item type="list" id="language" combo="true">
+						<pos y="50%" anchor="w" height="40" width="250"/>
+					</item>
+				</box>
+			</item>
+			<item type="label" id="clock">
+				<normal color="#000000" font="Sans 12"/>
+				<pos x="-52" y="55%" anchor="e"/>
+				<text>%c</text>
+			</item>
+			<item type="svg">
+				<normal file="gnome-logo.svg"/>
+				<pos x="-12" y="50%" width="30" height="47" anchor="e" />
+			</item>
+		</fixed>
+	</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" id="caps-lock-warning">
+		<normal color="#FFFFFF" alpha="0.5"/>
+		<pos anchor="sw" x="50%" y="80%" width="45%" height="box"/>
+		<box orientation="vertical" 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 %u will login in %t -->
-	<stock type="timed-label"/>
-      </item>
-    </box>
-  </item>
+	<item type="rect">
+		<show type="timed"/>
+		<normal color="#FFFFFF" alpha="0.5"/>
+		<pos anchor="w" x="50%" y="25%" width="45%" height="box"/>
+		<box orientation="vertical" 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 %u will login in %t -->
+				<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" 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="#000000" alpha="0.5" font="Sans 14"/>
+		<pos anchor="sw" x="5%" y="73%" width="40%" height="60%"/>
+		<fixed>
+			<item type="rect" id="userlist-rect">
+				<normal color="#ffffff" alpha=".80" font="Sans 14"/>
+				<pos anchor="c" x="50%" y="50%" width="-4" height="-4"/>
+				<fixed>
+					<item type="list" id="userlist">
+						<pos anchor="c" x="50%" y="50%" height="98%" width="98%"/>
+						<color iconcolor="#ACBFDD" labelcolor="#ACBFDD"/>
+					</item>
+				</fixed>
+			</item>
+		</fixed>
+	</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="button" id="ok_button">
-        <pos anchor="n" x="50%" height="32" width="50%"/>
-        <stock type="ok"/>
-      </item>
-      <item type="button" id="cancel_button">
-        <pos anchor="n" x="50%" height="32" width="50%"/>
-        <stock type="startagain"/>
-      </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>
+	<item type="rect">
+		<normal color="#000000" alpha=".50"/>
+		<pos anchor="sw" x="50%" y="73%" width="45%" height="40%"/>	
+		<fixed>
+			<item type="rect">
+				<normal color="#ffffff" alpha=".80"/>
+				<pos anchor="c" x="50%" y="50%" width="-4" height="-4"/>
+				<box orientation="vertical" xpadding="0" ypadding="10" spacing="5">
+					<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="n" x="50%"/>
+						<normal color="#000000" font="Sans 12"/>
+						<!-- Stock label for: Username: -->
+						<stock type="username-label"/>
+					</item>
+					<item type="rect">
+						<pos anchor="n" x="50%" width="80%" height="26"/>
+						<normal color="#000000" alpha=".50"/>					
+						<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="button" id="ok_button">
+						<pos anchor="n" x="50%" height="32" width="50%"/>
+						<stock type="ok"/>
+					</item>
+					<item type="button" id="cancel_button">
+						<pos anchor="n" x="50%" height="32" width="50%"/>
+						<stock type="startagain"/>
+					</item>
+					<item type="label" id="pam-message">
+						<pos anchor="n" x="50%" max-screen-percent-width="30%"/>
+						<normal color="#000000" font="Sans 12"/>
+						<text/>
+					</item>
+				   <item type="label" id="pam-error">
+						<pos anchor="n" x="50%"/>
+						<normal color="#000000" font="Sans 12"/>
+						<!-- Text for Incorrect username or password. Letters must be typed in the correct case.-->
+						<text/>
+					</item>
+				</box>
+			</item>
+		</fixed>
+	</item>
 </greeter>
 
 
+
diff --git a/gui/greeter/themes/happygnome-list/options.png b/gui/greeter/themes/happygnome-list/options.png
deleted file mode 100644
index 431813fa..00000000
--- a/gui/greeter/themes/happygnome-list/options.png
+++ /dev/null
diff --git a/gui/greeter/themes/happygnome/Makefile.am b/gui/greeter/themes/happygnome/Makefile.am
index 19981eb7..59b1a2b0 100644
--- a/gui/greeter/themes/happygnome/Makefile.am
+++ b/gui/greeter/themes/happygnome/Makefile.am
@@ -4,7 +4,6 @@ happygnome_DATA = \
 	happygnome.xml \
 	background.svg \
 	gnome-logo.svg  \
-	options.png \
 	screenshot.png
 
 happygnome_in_files = \
diff --git a/gui/greeter/themes/happygnome/happygnome.xml b/gui/greeter/themes/happygnome/happygnome.xml
index 74914e0a..809ad798 100644
--- a/gui/greeter/themes/happygnome/happygnome.xml
+++ b/gui/greeter/themes/happygnome/happygnome.xml
@@ -5,39 +5,31 @@
     <normal file="background.svg"/>
     <pos x="0" y="0" width="100%" height="-75"/>
   </item>
-  <item type="rect" background="true">
-    <normal color="#000000"/>
-    <pos x="0" y="-75" width="100%" height="75"/>
-    <fixed>
-      <item type="rect" background="true">
-        <normal color="#ffffff"/>
-        <pos x="0" y="4" width="100%" height="100%"/>
-        <box orientation="horizontal" spacing="10" xpadding="10" ypadding="10">
-          <item type="button" id="options_button">
-            <pos width="100" height="50" />
-            <stock type="options"/>
-          </item>
-          <item type="list" id="language" combo="true">
-            <pos  x="25" y="5" height="40" width="300"/>
-          </item>
-          <item type="list" id="session" combo="true">
-            <pos x="50" y="5" height="40" width="300"/>
-          </item>
-        </box>
-      </item>
-    </fixed>
-  </item>
-  <item type="rect" id="userlist-rect">
-    <normal color="#FFFFFF" alpha="0.5" font="Sans 14"/>
-    <pos anchor="nw" x="0" y="0" 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="#000000"/>
+		<pos x="0" y="-76" width="100%" height="76"/>
+		<fixed>
+			<item type="rect" background="true"> 
+				<normal color="#ffffff"/>
+				<pos x="0" y="5" width="100%" height="100%"/>
+				<box orientation="horizontal" spacing="10" xpadding="10" ypadding="0">
+					<item type="button" id="options_button">
+						<pos y="50%" anchor="w" width="100" height="40" />
+						<stock type="options"/>
+					</item>
+					<item type="list" id="session" combo="true">
+						<pos y="50%" anchor="w" height="40" width="200"/>
+					</item>
+					<item type="list" id="language" combo="true">
+						<pos y="50%" anchor="w" height="40" width="250"/>
+					</item>
+				</box>
+			</item>
+		</fixed>
+	</item>
+
+
   <item type="svg" background="true">
     <normal file="gnome-logo.svg"/>
     <pos x="-12" y="-12" width="30" height="47" anchor="se" />
diff --git a/gui/greeter/themes/happygnome/options.png b/gui/greeter/themes/happygnome/options.png
deleted file mode 100644
index 431813fa..00000000
--- a/gui/greeter/themes/happygnome/options.png
+++ /dev/null