Add the happygnome theme, so finally the theme browser makes sense since

Thu Jun 06 11:47:26 2002  George Lebl <jirka@5z.com>

	* configure.in, po/POTFILES.in, gui/greeter/themes/Makefile.am,
	  gui/greeter/themes/happygnome/*:  Add the happygnome theme,
	  so finally the theme browser makes sense since you can now
	  switch between two themes :)  If we're in freeze we can at least
	  add themes ...

14 files changed, 263 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b83bc21..753207e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun 06 11:47:26 2002  George Lebl <jirka@5z.com>
+
+	* configure.in, po/POTFILES.in, gui/greeter/themes/Makefile.am,
+	  gui/greeter/themes/happygnome/*:  Add the happygnome theme,
+	  so finally the theme browser makes sense since you can now
+	  switch between two themes :)  If we're in freeze we can at least
+	  add themes ...
+
 Tue Jun 04 21:45:19 2002  George Lebl <jirka@5z.com>
 
 	* Release 2.3.90.6
diff --git a/configure.in b/configure.in
index d6083db5..9fcdd29f 100644
--- a/configure.in
+++ b/configure.in
@@ -429,6 +429,7 @@ gui/Makefile
 gui/greeter/Makefile
 gui/greeter/themes/Makefile
 gui/greeter/themes/circles/Makefile
+gui/greeter/themes/happygnome/Makefile
 utils/Makefile
 pixmaps/Makefile
 config/Makefile
diff --git a/gui/greeter/themes/Makefile.am b/gui/greeter/themes/Makefile.am
index bcfa8153..c98291aa 100644
--- a/gui/greeter/themes/Makefile.am
+++ b/gui/greeter/themes/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = circles
+SUBDIRS = circles happygnome
 
diff --git a/gui/greeter/themes/happygnome/.cvsignore b/gui/greeter/themes/happygnome/.cvsignore
new file mode 100644
index 00000000..fb2d42c4
--- /dev/null
+++ b/gui/greeter/themes/happygnome/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+happygnome.xml
+GdmGreeterTheme.desktop
diff --git a/gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in b/gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in
new file mode 100644
index 00000000..0ece463e
--- /dev/null
+++ b/gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in
@@ -0,0 +1,10 @@
+# This is not really a .desktop file like the rest, but it's useful to treat
+# it as such
+
+[GdmGreeterTheme]
+Greeter=happygnome.xml
+_Name=Happy GNOME
+_Description=GNOME Art variation of Circles
+_Author=GNOME Artists
+_Copyright=(c) 2002 GNOME
+Screenshot=screenshot.png
diff --git a/gui/greeter/themes/happygnome/Makefile.am b/gui/greeter/themes/happygnome/Makefile.am
new file mode 100644
index 00000000..4014ca96
--- /dev/null
+++ b/gui/greeter/themes/happygnome/Makefile.am
@@ -0,0 +1,17 @@
+circlesdir = $(datadir)/gdm/themes/circles
+circles_DATA = \
+	GdmGreeterTheme.desktop \
+	happygnome.xml \
+	background.svg \
+	gnome-logo.png  \
+	options.png \
+	screenshot.png
+
+circles_in_files = \
+	GdmGreeterTheme.desktop.in \
+	circles.xml.in
+
+@INTLTOOL_XML_RULE@
+@INTLTOOL_DESKTOP_RULE@
+
+EXTRA_DIST = $(circles_DATA) $(circles_in_files)
diff --git a/gui/greeter/themes/happygnome/background.svg b/gui/greeter/themes/happygnome/background.svg
new file mode 100644
index 00000000..11abc4f4
--- /dev/null
+++ b/gui/greeter/themes/happygnome/background.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->

+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [

+	<!ENTITY st0 "fill:url(#aigrd1);stroke:none;">

+	<!ENTITY st1 "fill:url(#aigrd3);stroke:none;">

+	<!ENTITY st2 "fill:url(#aigrd2);stroke:none;">

+	<!ENTITY st3 "fill-rule:nonzero;clip-rule:nonzero;fill:#2A569D;stroke:#000000;stroke-miterlimit:4;">

+	<!ENTITY st4 "stroke:none;">

+]>

+<svg  width="508.104pt" height="383.717pt" viewBox="0 0 508.104 383.717" xml:space="preserve">

+	<g id="Layer_x0020_1" style="&st3;">

+		<g id="middle">

+			<linearGradient id="aigrd1" gradientUnits="userSpaceOnUse" x1="237.2617" y1="24.7095" x2="237.2617" y2="371.207">

+				<stop  offset="0" style="stop-color:#4E77B9"/>

+				<stop  offset="1" style="stop-color:#6E8CBE"/>

+			</linearGradient>

+			<path style="&st0;" d="M59.227,357.212c27.481,9.066,56.985,13.994,87.696,13.994c148.221,0,268.375-114.698,268.375-256.189c0-31.789-6.073-62.221-17.16-90.308C249.869,104.206,131.168,219.909,59.227,357.212z"/>

+		</g>

+		<linearGradient id="aigrd2" gradientUnits="userSpaceOnUse" x1="277.0767" y1="0" x2="277.0766" y2="383.7178">

+			<stop  offset="0" style="stop-color:#335EA2"/>

+			<stop  offset="1" style="stop-color:#6D8BBD"/>

+		</linearGradient>

+		<path id="lower_x0020_right" style="&st2;" d="M447.704,0c-16.859,7.792-33.389,16.037-49.566,24.709c11.087,28.087,17.16,58.52,17.16,90.308c0,141.491-120.154,256.189-268.375,256.189c-30.71,0-60.214-4.928-87.696-13.994

+			c-4.584,8.749-8.979,17.585-13.178,26.505h462.056V0h-60.4z"/>

+		<g id="upper_x0020_left">

+			<linearGradient id="aigrd3" gradientUnits="userSpaceOnUse" x1="199.0684" y1="0" x2="199.0683" y2="357.2129">

+				<stop  offset="0" style="stop-color:#436FB6"/>

+				<stop  offset="1" style="stop-color:#305CA3"/>

+			</linearGradient>

+			<path style="&st1;" d="M398.137,24.709C394.798,16.252,391.011,8.005,386.791,0H0v329.44c18.309,11.454,38.174,20.827,59.227,27.772c71.942-137.304,190.642-253.007,338.911-332.503z"/>

+		</g>

+		<g id="bottom_x0020_small">

+			<path style="&st4;" d="M0,329.44v54.277h46.048c4.2-8.92,8.594-17.756,13.178-26.505C38.174,350.267,18.309,340.894,0,329.44z"/>

+		</g>

+		<g id="top_x0020_small">

+			<path style="&st4;" d="M447.704,0h-60.913c4.221,8.005,8.008,16.252,11.347,24.709C414.315,16.037,430.844,7.792,447.704,0z"/>

+		</g>

+	</g>

+</svg>

diff --git a/gui/greeter/themes/happygnome/gnome-logo.png b/gui/greeter/themes/happygnome/gnome-logo.png
new file mode 100644
index 00000000..e62fc0ee
--- /dev/null
+++ b/gui/greeter/themes/happygnome/gnome-logo.png
diff --git a/gui/greeter/themes/happygnome/happygnome.xml.in b/gui/greeter/themes/happygnome/happygnome.xml.in
new file mode 100644
index 00000000..81c2579e
--- /dev/null
+++ b/gui/greeter/themes/happygnome/happygnome.xml.in
@@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+  <item type="svg">
+    <normal file="background.svg"/>
+    <pos x="0" y="0" width="100%" height="-75"/>
+  </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="language_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 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#ff0000" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+	        <_text>Option</_text>
+	      </item>
+            </box>
+          </item>
+          <item type="rect" id="session_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="session.png" tint="#dddddd"/>
+	        <prelight file="session.png"/>
+	        <active file="session.png" tint="#ff0000"/>
+	        <pos y="50%" anchor="w"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#000000" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#ff0000" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+	        <_text>Session</_text>
+	      </item>
+            </box>
+          </item>
+          <item type="rect" id="system_button" button="true">
+            <normal color="#ffffff"/>
+	    <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="#ff0000"/>
+	        <pos y="50%" anchor="w"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#000000" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#ff0000" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+	        <_text>System</_text>
+	      </item>
+            </box>
+          </item>
+          <item type="rect" id="disconnect_button" button="true">
+            <normal color="#ffffff"/>
+	    <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="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 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#ff0000" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+	        <_text>Disconnect</_text>
+	        <show modes="remote"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#000000" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#ff0000" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+	        <_text>Quit</_text>
+	        <show modes="flexi"/>
+	      </item>
+            </box>
+          </item>
+        </box>
+      </item>
+    </fixed>
+  </item>
+  <item type="pixmap">
+    <normal file="gnome-logo.png"/>
+    <pos x="100%" y="100%" anchor="se"/>
+  </item>
+  <item type="label" id="clock">
+    <normal color="#000000" font="Sans 16"/>
+    <pos x="-150" 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="50%" 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 14"/>
+        <pos x="50%" anchor="n"/>
+        <_text>You've got capslock on!</_text>
+      </item>
+    </box>
+  </item>
+
+  <item type="rect" id="timed-rect">
+    <show type="timed"/>
+    <normal color="#FFFFFF" alpha="0.5"/>
+    <pos anchor="c" x="50%" 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 14"/>
+        <pos x="50%" anchor="n"/>
+        <_text>User %s will login in %d seconds</_text>
+      </item>
+    </box>
+  </item>
+
+  <item type="rect">
+    <normal color="#FFFFFF" alpha="0.5"/>
+    <pos anchor="c" x="50%" y="50%" width="box" height="box"/>
+    <box orientation="vertical" min-width="300" xpadding="30" ypadding="30" spacing="10">
+      <item type="label">
+        <pos anchor="n" x="50%"/>
+        <normal color="#000000" font="Sans 18"/>
+	<_text>Welcome to %h</_text>
+      </item>
+      <item type="label" id="pam-prompt">
+        <pos anchor="nw" x="10%"/>
+        <normal color="#000000" font="Sans 16"/>
+	<_text>Username:</_text>
+      </item>
+      <item type="rect">
+	<normal color="#000000"/>
+        <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="#000000" font="Sans 16"/>
+	<text></text>
+      </item>
+    </box>
+    <fixed>
+      <item type="label" id="pam-error">
+        <pos anchor="n" x="50%" y="110%"/>
+        <normal color="#000000" font="Sans 16"/>
+        <text></text>
+      </item>
+    </fixed>
+  </item>
+</greeter>
+
+
diff --git a/gui/greeter/themes/happygnome/options.png b/gui/greeter/themes/happygnome/options.png
new file mode 100644
index 00000000..ef385746
--- /dev/null
+++ b/gui/greeter/themes/happygnome/options.png
diff --git a/gui/greeter/themes/happygnome/screenshot.png b/gui/greeter/themes/happygnome/screenshot.png
new file mode 100644
index 00000000..ab4f503c
--- /dev/null
+++ b/gui/greeter/themes/happygnome/screenshot.png
diff --git a/gui/greeter/themes/happygnome/session.png b/gui/greeter/themes/happygnome/session.png
new file mode 100644
index 00000000..431813fa
--- /dev/null
+++ b/gui/greeter/themes/happygnome/session.png
diff --git a/gui/greeter/themes/happygnome/system.png b/gui/greeter/themes/happygnome/system.png
new file mode 100644
index 00000000..7a233d4d
--- /dev/null
+++ b/gui/greeter/themes/happygnome/system.png
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 581ef8f2..0d9fd63d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -37,5 +37,7 @@ gui/greeter/greeter_session.c
 gui/greeter/greeter_system.c
 gui/greeter/themes/circles/GdmGreeterTheme.desktop.in
 gui/greeter/themes/circles/circles.xml.in
+gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in
+gui/greeter/themes/happygnome/happygnome.xml.in
 utils/gdmaskpass.c
 vicious-extensions/glade-helper.c