[debian-edu-commits] debian-edu/ 249/437: Refurbish kdm and wallpaper
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository debian-edu-artwork.
commit 82b8aa282771a968e4f8c8dcbea19b5a9e013ce9
Author: Andreas B. Mundt <andi.mundt at web.de>
Date: Thu Apr 8 19:20:15 2010 +0000
Refurbish kdm and wallpaper
---
art/kde/debian-edu-wallpaper.png | Bin 317814 -> 402779 bytes
art/kde/debian-edu-wallpaper.png.desktop | 6 +-
art/kdm-theme/GdmGreeterTheme.desktop | 14 +--
art/kdm-theme/KdmGreeterTheme.desktop | 14 +--
art/kdm-theme/Makefile.am | 21 ++--
art/kdm-theme/README | 14 +++
art/kdm-theme/caps.png | Bin 0 -> 4854 bytes
art/kdm-theme/debian-edu-wallpaper.png | Bin 0 -> 402779 bytes
art/kdm-theme/debian-edu.xml | 202 +++++++++++++------------------
art/kdm-theme/preview.info | 2 -
art/kdm-theme/pw-entry-li.png | Bin 0 -> 2488 bytes
art/kdm-theme/pw-entry.png | Bin 0 -> 1537 bytes
art/kdm-theme/screenshot.png | Bin 0 -> 177022 bytes
art/kdm-theme/session_button-li.png | Bin 0 -> 1697 bytes
art/kdm-theme/session_button.png | Bin 0 -> 1598 bytes
art/kdm-theme/slx-small.png | Bin 0 -> 9634 bytes
art/kdm-theme/system_button-li.png | Bin 0 -> 1957 bytes
art/kdm-theme/system_button.png | Bin 0 -> 1908 bytes
art/kdm-theme/user-entry-li.png | Bin 0 -> 2552 bytes
art/kdm-theme/user-entry.png | Bin 0 -> 1663 bytes
art/kdm-theme/win-login.png | Bin 0 -> 59164 bytes
debian/changelog | 3 +
22 files changed, 130 insertions(+), 146 deletions(-)
diff --git a/art/kde/debian-edu-wallpaper.png b/art/kde/debian-edu-wallpaper.png
index 2fe93ac..a2f0300 100644
Binary files a/art/kde/debian-edu-wallpaper.png and b/art/kde/debian-edu-wallpaper.png differ
diff --git a/art/kde/debian-edu-wallpaper.png.desktop b/art/kde/debian-edu-wallpaper.png.desktop
index 37d1380..7b707b2 100644
--- a/art/kde/debian-edu-wallpaper.png.desktop
+++ b/art/kde/debian-edu-wallpaper.png.desktop
@@ -1,6 +1,6 @@
[Wallpaper]
Encoding=UTF-8
-File=debian-edu-kde.jpg
-Name=Debian Edu
+File=debian-edu.png
+Name=Debian Edu 02
ImageType=pixmap
-Author=Qwertz
+Author=Andreas B. Mundt
diff --git a/art/kdm-theme/GdmGreeterTheme.desktop b/art/kdm-theme/GdmGreeterTheme.desktop
index d49c9e8..3d17f20 100644
--- a/art/kdm-theme/GdmGreeterTheme.desktop
+++ b/art/kdm-theme/GdmGreeterTheme.desktop
@@ -1,12 +1,12 @@
-# This is not really a .desktop file like the rest, but it's useful to treat
-# it as such.
+# This is not really a .desktop file like the rest, but it is useful to treat
+# it as such
# See http://projects.gnome.org/gdm/docs/2.18/thememanual.html
# for information about the GDM theme format.
[GdmGreeterTheme]
-Encoding=UTF-8
Greeter=debian-edu.xml
-Name=Debian Edu O1
-Description=A nice GDM theme for Debian Edu
-Author=Petter Reinholdtsen (pere at hungry.com)
-Screenshot=preview.png
+Name=Debian Edu 02
+Description=GDM theme for Debian Edu, based on oxygen-air (Xavier Araque)
+Author=Andreas B. Mundt
+Copyright=(c) 2010 Andreas B. Mundt, andi.mundt at web.de
+Screenshot=screenshot.png
diff --git a/art/kdm-theme/KdmGreeterTheme.desktop b/art/kdm-theme/KdmGreeterTheme.desktop
index ce9996e..371ca90 100644
--- a/art/kdm-theme/KdmGreeterTheme.desktop
+++ b/art/kdm-theme/KdmGreeterTheme.desktop
@@ -1,12 +1,12 @@
-# This is not really a .desktop file like the rest, but it's useful to treat
-# it as such.
+# This is not really a .desktop file like the rest, but it is useful to treat
+# it as such
# See http://docs.kde.org/stable/en/kdebase-workspace/kdm/kdm-themes.html
# for information about the KDM theme format.
[KdmGreeterTheme]
-Encoding=UTF-8
Greeter=debian-edu.xml
-Name=Debian Edu O1
-Description=A nice KDM theme for Debian Edu
-Author=Petter Reinholdtsen (pere at hungry.com)
-Screenshot=preview.png
+Name=Debian Edu 02
+Description=KDM theme for Debian Edu, based on oxygen-air (Xavier Araque)
+Author=Andreas B. Mundt
+Copyright=(c) 2010 Andreas B. Mundt, andi.mundt at web.de
+Screenshot=screenshot.png
diff --git a/art/kdm-theme/Makefile.am b/art/kdm-theme/Makefile.am
index c2579a7..cbcc7c7 100644
--- a/art/kdm-theme/Makefile.am
+++ b/art/kdm-theme/Makefile.am
@@ -1,14 +1,19 @@
KDMTHEME = debian-edu.xml \
GdmGreeterTheme.desktop \
KdmGreeterTheme.desktop \
- Dialog.png \
- enter_normal.png \
- enter_over.png \
- enter_pressed.png \
- preview.png \
- system_normal.png \
- system_over.png \
- system_pressed.png
+ caps.png \
+ win-login.png \
+ slx-small.png \
+ screenshot.png \
+ user-entry.png \
+ user-entry-li.png \
+ session_button.png \
+ session_button-li.png \
+ system_button.png \
+ system_button-li.png \
+ debian-edu-wallpaper.png \
+ pw-entry.png \
+ pw-entry-li.png
kdmthemedir = $(datadir)/apps/kdm/themes/debian-edu
kdmtheme_DATA = $(KDMTHEME)
diff --git a/art/kdm-theme/README b/art/kdm-theme/README
new file mode 100644
index 0000000..9c11009
--- /dev/null
+++ b/art/kdm-theme/README
@@ -0,0 +1,14 @@
+The first kdm theme was created by Petter Reinholdtsen based on the
+kdm theme in kubuntu and is licensed under the GNU General Public License.
+
+Based on that work, the oxygen-air theme (GPL 2008 Xavier Araque) and
+a new background image from the Debian moreblue-orbit theme, a
+refurbished theme was created by Andreas B. Mundt (GPL 2010).
+
+Resources:
+ http://docs.kde.org/stable/en/kdebase-workspace/kdm/kdm-themes.html
+ http://developer.skolelinux.no/~vb/logo/
+
+ For further improvements:
+ http://wiki.debian.org/DebianDesktopArtworkLenny
+ http://wiki.debian.org/DebianDesktopArtworkSqueeze
diff --git a/art/kdm-theme/caps.png b/art/kdm-theme/caps.png
new file mode 100644
index 0000000..1d75070
Binary files /dev/null and b/art/kdm-theme/caps.png differ
diff --git a/art/kdm-theme/debian-edu-wallpaper.png b/art/kdm-theme/debian-edu-wallpaper.png
new file mode 100644
index 0000000..a2f0300
Binary files /dev/null and b/art/kdm-theme/debian-edu-wallpaper.png differ
diff --git a/art/kdm-theme/debian-edu.xml b/art/kdm-theme/debian-edu.xml
index 0f9b873..34844a3 100644
--- a/art/kdm-theme/debian-edu.xml
+++ b/art/kdm-theme/debian-edu.xml
@@ -1,129 +1,93 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE greeter SYSTEM "greeter.dtd">
-<greeter>
- <item type="pixmap" >
- <normal file="/usr/share/wallpapers/debian-edu-wallpaper.png" />
- <!-- <normal file="debian-edu-wallpaper.png" /> -->
- <!-- <pos width="100%" x="0" y="0" height="100%" /> -->
- <pos width="100%" x="0" y="0" height="100%" />
+<greeter id="theme">
+ <style font="Sans 12" window-text-color="#bfd9ff"
+ base-color="#bfd9ff" alternate-base-color="#666666"
+ text-color="#0b678c" disabled-text-color="#111111"/>
+ <item type="pixmap" id="background" background="true">
+ <normal file="debian-edu-wallpaper.png" scalemode="scale"/>
+ <pos width="100%" height="100%"/>
</item>
- <!--
- <item type="rect" >
- <normal alpha="0.0" color="#ff0000" />
- <pos width="100%" x="5" y="-130" height="120" />
- </item>
- -->
- <item type="pixmap" >
- <normal file="Dialog.png" />
- <pos width="462" x="50%" y="50%" anchor="c" height="324" />
- <item type="label" id="clock" >
- <normal color="#555555" font="DejaVu Sans 11" />
- <pos x="50%" y="150" anchor="c" />
- <!-- <pos x="50%" y="185" anchor="c" /> -->
- <text>%c %h</text>
- </item>
- <!-- system button image -->
- <item button="true" type="rect" id="system_button" >
- <normal alpha="0.0" color="#00ff00" />
- <pos width="box" x="65" y="295" noty="55%" anchor="c" height="box" />
- <box xpadding="0" spacing="0" orientation="horizontal" >
- <item type="pixmap">
- <pos x="50%" y="50%" anchor="c" />
- <normal file="system_normal.png" />
- <prelight file="system_over.png" />
- <active file="system_pressed.png" />
- </item>
- </box>
- </item>
- <!-- system button text -->
- <item button="true" type="rect" id="system_button" >
- <normal alpha="0.0" color="#ff0000" />
- <!-- <pos width="box" x="6" y="55%" anchor="c" height="box" /> -->
- <pos width="box" x="65" y="295" noty="55%" anchor="c" height="box" />
- <box xpadding="0" spacing="0" orientation="horizontal" >
- <item type="label">
- <normal color="#222222" font="Sans 12"/>
- <prelight color="#222222" font="Sans 12"/>
- <active color="#222222" font="Sans 12"/>
- <!-- <pos y="50%" anchor="w"/> -->
- <stock type="system"/>
- </item>
- </box>
- </item>
- <!-- login button -->
- <item button="true" type="rect" id="login_button" >
- <normal alpha="0.0" color="#00ff00" />
- <pos width="box" x="423" y="295" noty="55%" anchor="c" height="box" />
- <box xpadding="0" spacing="0" orientation="horizontal" >
- <item type="pixmap">
- <pos x="50%" y="50%" anchor="c" />
- <normal file="enter_normal.png" />
- <prelight file="enter_over.png" />
- <active file="enter_pressed.png" />
- </item>
- </box>
- </item>
- <box xpadding="30" spacing="10" ypadding="30" orientation="vertical" min-width="340" >
- <item type="rect" id="talker" >
- <!-- <pos width="box" x="50%" y="185" anchor="n" height="box" /> -->
- <pos width="box" x="50%" y="150" noty="180" anchor="n" height="box" />
- <!-- box orientation="vertical" xpadding="0" ypadding="0" spacing="10" -->
- <box xpadding="0" spacing="0" ypadding="0" orientation="horizontal" >
- <item type="rect" >
- <normal alpha="0.0" color="#222222" />
- <pos width="box" y="55%" anchor="w" height="box" />
- <box xpadding="10" spacing="10" ypadding="0" orientation="vertical" >
- <item type="label" >
- <pos x="100%" anchor="ne" />
- <normal color="#222222" font="DejaVu Sans Condensed 12" />
- <!-- Stock label for: Username: -->
- <stock type="username-label" />
- </item>
- <item type="label" >
- <pos x="100%" anchor="ne" />
- <normal color="#222222" font="DejaVu Sans Condensed 12" />
- <!-- Stock label for: Password: -->
- <stock type="password-label" />
- </item>
- </box>
- </item>
- <item type="rect" >
- <normal alpha="0.0" color="#cccccc" />
- <pos width="box" y="55%" anchor="w" height="box" />
- <box xpadding="0" spacing="10" ypadding="0" orientation="vertical" >
- <item type="entry" id="user-entry" >
- <pos width="130" x="50%" anchor="n" height="21" />
- </item>
- <item type="entry" id="pw-entry" >
- <pos width="130" x="50%" anchor="n" height="21" />
- </item>
- </box>
- </item>
- </box>
+ <item type="pixmap" id="system-session">
+ <normal file="win-login.png"/>
+ <pos anchor="c" x="50%" y="45%" width="615" height="401"/>
+ <box orientation="vertical" spacing="10" homogeneous="true">
+ <item type="pixmap">
+ <normal file="slx-small.png"/>
+ <pos anchor="c" x="50%" y="80%"/>
</item>
- </box>
- <fixed>
- <item type="label" id="pam-error" >
- <pos x="50%" y="260" anchor="n" />
- <normal color="#CD0000" font="Sans 12" />
- <text/>
+ <item type="label" id="welcome">
+ <pos anchor="c" x="50%" y="46%"/>
+ <normal alpha="0.5" font="Sans Bold 18" color="#FFFFFF"/>
+ <stock type="welcome-label"/>
</item>
- </fixed>
- <fixed>
- <item type="label" id="caps-lock-warning" >
- <normal color="#CD0000" font="Sans 12" />
- <pos x="50%" y="240" noty="69%" anchor="n" />
- <stock type="caps-lock-warning" />
+ <item type="rect" id="user-field">
+ <pos anchor="c" x="50%" y="43%" width="400" height="144"/>
+ <box orientation="vertical" spacing="0" homogeneous="true">
+ <item type="pixmap" butoon="true">
+ <normal file="user-entry.png"/>
+ <prelight file="user-entry-li.png"/>
+ <active file="user-entry-li.png"/>
+ <pos anchor="c" x="50%" y="100%"/>
+ </item>
+ <item type="entry" id="user-entry">
+ <pos anchor="c" x="52%" y="0%" width="110" height="22"/>
+ </item>
+ <item type="pixmap">
+ <normal file="pw-entry.png"/>
+ <prelight file="pw-entry-li.png"/>
+ <pos anchor="c" x="50%" y="100%"/>
+ </item>
+ <item type="entry" id="pw-entry">
+ <pos anchor="c" x="52%" y="0%" width="110" height="22"/>
+ </item>
+ </box>
</item>
- </fixed>
- <!--
+ <item type="rect" id="system-session">
+ <pos anchor="c" x="50%" y="70%" width="615" height="44"/>
+ <fixed>
+ <item type="label">
+ <pos anchor="se" x="96%" y="70%"/>
+ <normal alpha="0.5" font="Sans 8" color="#ffffff"/>
+ <text>%c</text>
+ </item>
+ <item type="pixmap" id="session_button" button="true">
+ <normal file="session_button.png"/>
+ <prelight file="session_button-li.png"/>
+ <active file="session_button-li.png"/>
+ <pos anchor="w" x="15" y="50%"/>
+ </item>
+ <item type="pixmap" id="system_button" button="true">
+ <normal file="system_button.png"/>
+ <prelight file="system_button-li.png"/>
+ <active file="system_button-li.png"/>
+ <pos anchor="w" x="47" y="50%"/>
+ </item>
+ </fixed>
+ </item>
+ </box>
+ </item>
+ <item type="pixmap" id="caps-lock-warning">
+ <normal file="caps.png"/>
+ <pos anchor="c" x="50%" y="45%"/>
<fixed>
- <item type="label" id="GNU/Linux" >
- <normal color="#222222" font="DejaVu Sans Condensed 9" />
- <pos x="50%" y="90%" anchor="n" />
- <stock type="Powered By GNU/Linux" />
+ <item type="label" id="message">
+ <normal color="#0b678c" font="Sans Bold 10"/>
+ <pos anchor="c" x="50%" y="85%"/>
+ <stock type="caps-lock-warning"/>
</item>
</fixed>
- -->
+ </item>
+ <item type="rect" id="pam-error-paceholder">
+ <pos anchor="c" x="50%" y="98%" widht="615" height="200"/>
+ <item type="label" id="dummy1">
+ <normal alpha="0" color="#0b678c" font="Sans Bold 10"/>
+ <!-- </text> -->
+ </item>
+ <item type="label" id="pam-error">
+ <pos anchor="c" x="50%" y="50%" expand="true"/>
+ <normal alpha="0" color="#0b678c" font="Sans Bold 10"/>
+ <!-- </text> -->
+ </item>
</item>
</greeter>
diff --git a/art/kdm-theme/preview.info b/art/kdm-theme/preview.info
deleted file mode 100644
index 43fcd89..0000000
--- a/art/kdm-theme/preview.info
+++ /dev/null
@@ -1,2 +0,0 @@
-The kdm theme was created by Petter Reinholdtsen based on the kdm theme in
-kubuntu and is licensed under the GNU General Public License.
diff --git a/art/kdm-theme/pw-entry-li.png b/art/kdm-theme/pw-entry-li.png
new file mode 100644
index 0000000..75174cc
Binary files /dev/null and b/art/kdm-theme/pw-entry-li.png differ
diff --git a/art/kdm-theme/pw-entry.png b/art/kdm-theme/pw-entry.png
new file mode 100644
index 0000000..3f235d8
Binary files /dev/null and b/art/kdm-theme/pw-entry.png differ
diff --git a/art/kdm-theme/screenshot.png b/art/kdm-theme/screenshot.png
new file mode 100644
index 0000000..22b5291
Binary files /dev/null and b/art/kdm-theme/screenshot.png differ
diff --git a/art/kdm-theme/session_button-li.png b/art/kdm-theme/session_button-li.png
new file mode 100644
index 0000000..d018eb6
Binary files /dev/null and b/art/kdm-theme/session_button-li.png differ
diff --git a/art/kdm-theme/session_button.png b/art/kdm-theme/session_button.png
new file mode 100644
index 0000000..aea03c1
Binary files /dev/null and b/art/kdm-theme/session_button.png differ
diff --git a/art/kdm-theme/slx-small.png b/art/kdm-theme/slx-small.png
new file mode 100644
index 0000000..491a5a7
Binary files /dev/null and b/art/kdm-theme/slx-small.png differ
diff --git a/art/kdm-theme/system_button-li.png b/art/kdm-theme/system_button-li.png
new file mode 100644
index 0000000..595fce4
Binary files /dev/null and b/art/kdm-theme/system_button-li.png differ
diff --git a/art/kdm-theme/system_button.png b/art/kdm-theme/system_button.png
new file mode 100644
index 0000000..19c6a9d
Binary files /dev/null and b/art/kdm-theme/system_button.png differ
diff --git a/art/kdm-theme/user-entry-li.png b/art/kdm-theme/user-entry-li.png
new file mode 100644
index 0000000..b5f093f
Binary files /dev/null and b/art/kdm-theme/user-entry-li.png differ
diff --git a/art/kdm-theme/user-entry.png b/art/kdm-theme/user-entry.png
new file mode 100644
index 0000000..d80d5aa
Binary files /dev/null and b/art/kdm-theme/user-entry.png differ
diff --git a/art/kdm-theme/win-login.png b/art/kdm-theme/win-login.png
new file mode 100644
index 0000000..f774833
Binary files /dev/null and b/art/kdm-theme/win-login.png differ
diff --git a/debian/changelog b/debian/changelog
index 311b3d9..43810c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ debian-edu-artwork (0.0.30-5) UNRELEASED; urgency=low
conflict with desktop-base as we include
/usr/share/desktop-base/grub_background.sh which is also there.
+ [ Andreas B. Mundt ]
+ * Update kdm theme (Closes: #572769) including the wallpaper.
+
-- Petter Reinholdtsen <pere at debian.org> Sun, 07 Mar 2010 19:43:19 +0100
debian-edu-artwork (0.0.30-4) unstable; urgency=low
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git
More information about the debian-edu-commits
mailing list