merge the altusmetrum-themes package

diff --git a/debian/altos.install b/debian/altos.install
index 8d8a1987867c8c87175af3d18a86ed8600265e00..8be48ca35db1d94d3e9a1759a1bc812dfb25034b 100644 (file)
--- a/debian/altos.install
+++ b/debian/altos.install
@@ -1,4 +1,12 @@
 debian/altos.desktop   usr/share/applications
 debian/altos.list      etc/apt/sources.list.d
 debian/altos.desktop   usr/share/applications
 debian/altos.list      etc/apt/sources.list.d

+debian/altusmetrum.xpm usr/share/pixmaps

 src/*.ihx              usr/share/altos
 src/*.map              usr/share/altos
 src/*.ihx              usr/share/altos
 src/*.map              usr/share/altos

+themes/background.png          usr/share/slim/themes/altusmetrum
+themes/slim/panel.png          usr/share/slim/themes/altusmetrum
+themes/slim/slim.theme         usr/share/slim/themes/altusmetrum
+themes/background.png          usr/share/gdm/themes/altusmetrum
+themes/gdm/altusmetrum.xml     /usr/share/gdm/themes/altusmetrum
+themes/gdm/GdmGreeterTheme.desktop     /usr/share/gdm/themes/altusmetrum
+themes/gdm/screenshot.png      /usr/share/gdm/themes/altusmetrum

diff --git a/debian/control b/debian/control
index ff6c12e7cdee4c15d1e6fdca3bc45adef12a0b65..fb620e3d3e80681b9c60c09c453f8a7f1d46ddd2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,9 @@ Homepage: http://altusmetrum.org/AltOS
 Package: altos
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, nickle, plplot9-driver-cairo
 Package: altos
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, nickle, plplot9-driver-cairo

-Suggests: slim-altusmetrum
+Suggests: slim | gdm
+Replaces: altusmetrum-themes, slim-altusmetrum
+Conflicts: altusmetrum-themes, slim-altusmetrum

 Description: Altus Metrum firmware and utilities
  Firmware and utilities needed to support the TeleMetrum dual-deploy
  recording altimeter for high power model rocketry.  
 Description: Altus Metrum firmware and utilities
  Firmware and utilities needed to support the TeleMetrum dual-deploy
  recording altimeter for high power model rocketry.  

diff --git a/debian/dirs b/debian/dirs
index 29840efb768f0fdf400297060756f9e82889e109..db75fea71022dc3c3057fab5c4be8ae42afdb292 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -2,4 +2,6 @@ etc/apt/sources.list.d
 usr/bin
 usr/share/altos
 usr/share/applications
 usr/bin
 usr/share/altos
 usr/share/applications

+usr/share/gdm/themes/altusmetrum

 usr/share/pixmaps
 usr/share/pixmaps

+usr/share/slim/themes/altusmetrum

diff --git a/debian/rules b/debian/rules
index a7468b9f5c99814da86002ffd31fd184eb7df2e6..53a8a34023caf9d8707c38c8179c104638b68c3c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,14 +43,9 @@ install: build
        dh_installdirs
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/altos install
        dh_installdirs
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/altos install

-       install -o root -g root -m 0644 debian/altusmetrum.xpm \
-               $(CURDIR)/debian/altos/usr/share/pixmaps/altusmetrum.xpm

 
 

-# Build architecture-independent files here.

 binary-indep: install
 binary-indep: install

-# We have nothing to do by default.

 
 

-# Build architecture-dependent files here.

 binary-arch: install
        dh_testdir
        dh_testroot
 binary-arch: install
        dh_testdir
        dh_testroot

diff --git a/themes/background.png b/themes/background.png
new file mode 100644 (file)
index 0000000..a3c78f3
Binary files /dev/null and b/themes/background.png differ

diff --git a/themes/background.xcf b/themes/background.xcf
new file mode 100644 (file)
index 0000000..92c1709
Binary files /dev/null and b/themes/background.xcf differ

diff --git a/themes/gdm/GdmGreeterTheme.desktop b/themes/gdm/GdmGreeterTheme.desktop
new file mode 100644 (file)
index 0000000..b0fa34b
--- /dev/null
+++ b/themes/gdm/GdmGreeterTheme.desktop
@@ -0,0 +1,7 @@
+[GdmGreeterTheme]
+Greeter=altusmetrum.xml
+Name=AltusMetrum
+Description=altusmetrum.org
+Author=Bdale Garbee
+Copyright=Bdale Garbee
+Screenshot=screenshot.png

diff --git a/themes/gdm/altusmetrum.xml b/themes/gdm/altusmetrum.xml
new file mode 100644 (file)
index 0000000..e2755e8
--- /dev/null
+++ b/themes/gdm/altusmetrum.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+
+<item type="pixmap">
+       <normal file="background.png"/>
+       <pos x="0" y="0" width="100%" height="100%"/>
+</item>
+
+<item type="rect">
+       <normal color="#ffffff" alpha="0.1"/>
+       <pos anchor="center" x="50%" y="94%" width="100%" height="6%"/>
+       <fixed>
+               <item type="rect">
+                       <normal color="#000000" alpha="0.3"/>
+                       <pos anchor="w" x="84%" y="50%" height="24" width="15%"/>
+                       <fixed>
+                               <item type="entry" id="user-pw-entry">
+                                       <pos anchor="nw" x="1" y="1" height="-2" width="-2"/>
+                                       <normal color="#000000" font="Bitstream Vera Sans 10"/>
+                               </item>
+                       </fixed>
+               </item>
+       </fixed>
+</item>
+
+<item type="label" id="system_button" button="true">
+       <pos anchor="w" x="1%" y="94%"/>
+       <normal font="Bitstream Vera Sans Bold 10" color="#ffffff" alpha="0.8"/>
+       <active font="Bitstream Vera Sans Bold 10" color="#ffffff" alpha="0.8"/>
+       <prelight font="Bitstream Vera Sans Bold 10" color="#ffffff"/>
+       <text>%n | %c</text>
+</item>
+
+<item type="label" id="pam-prompt">
+       <pos anchor="e" x="83%" y="94%"/>
+       <normal font="Bitstream Vera Sans Bold 10" color="#ffffff" alpha="0.8"/>
+       <stock type="username-label"/>
+</item>
+
+<item type="label" id="timed-label">
+       <pos anchor="center" x="50%" y="30%"/>
+       <show type="timed"/>
+       <normal font="Bitstream Vera Sans Bold 10" color="#ffffff"/>
+       <stock type="timed-label"/>
+</item>
+
+<item type="label" id="pam-error">
+       <pos anchor="center" x="50%" y="50%"/>
+       <normal font="Bitstream Vera Sans Bold 10" color="#ffffff"/>
+       <text></text>
+</item>
+
+<item type="label" id="caps-lock-warning">
+       <pos anchor="center" x="50%" y="70%"/>
+       <normal font="Bitstream Vera Sans Bold 10" color="#ffffff"/>
+       <stock type="caps-lock-warning"/>
+</item>
+
+</greeter>

diff --git a/themes/gdm/screenshot.png b/themes/gdm/screenshot.png
new file mode 100644 (file)
index 0000000..5c49ec1
Binary files /dev/null and b/themes/gdm/screenshot.png differ

diff --git a/themes/slim/panel.png b/themes/slim/panel.png
new file mode 100644 (file)
index 0000000..f61bafe
Binary files /dev/null and b/themes/slim/panel.png differ

diff --git a/themes/slim/slim.theme b/themes/slim/slim.theme
new file mode 100644 (file)
index 0000000..1eeef96
--- /dev/null
+++ b/themes/slim/slim.theme
@@ -0,0 +1,37 @@
+# altusmetrum theme for SLiM
+# by Bdale Garbee <bdale@gag.com>
+
+# Messages (ie: shutdown)
+msg_color               #000000
+msg_font                Verdana:size=18:bold:dpi=75
+msg_x                   50%
+msg_y                   40%
+msg_shadow_color #FFFFFF
+msg_shadow_xoffset 1
+msg_shadow_yoffset 1
+
+# valid values: stretch, tile
+background_style        stretch
+background_color        #eedddd
+
+# Input controls
+input_panel_x           50%
+input_panel_y           70%
+input_name_x            59
+input_name_y            161
+input_font             Verdana:size=12:dpi=75
+input_fgcolor           #000000
+
+# Username / password request
+username_font                  Verdana:size=14:bold:dpi=75
+username_color         #000000
+username_x              50%
+username_y              122
+password_x              50%
+password_y              122
+username_shadow_color   #FFFFFF
+username_shadow_xoffset 1
+username_shadow_yoffset 1
+
+username_msg            Username:
+password_msg            Password: