[debian-edu-commits] debian-edu/ 386/437: * Create and configure Debian Edu theme, based on the joy theme for kdm: - Reorganize Debian Edu kdm theme to match the new structure; copy joy theme icons for the greeter, move wallpaper images to the new default desktop-base directory /usr/share/images/desktop-base. - Provide scaled images based on debian-edu-wallpaper01_1920x1080.svg by Christop Muetze and on png files by Holger Levsen in Debian Edu theme directory located in desktop-base. (kdm-theme/background.svg has to be repaced with a real svg file.) - Add metadata.desktop for Debian Edu theme directory. - Add screenshot image for Debian Edu theme directory; this image has yet to be updated. - Add 20-desktop-base-edu.js to /usr/share/kde4/apps/plasma-desktop/init/ to set scaled Debian Edu theme images as the default background. * Add myself to AUTHORS.
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:55 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 ababd256a6203476924cfa7dce6a9e73e03e9c4c
Author: Wolfgang Schweer <w.schweer at gmx.de>
Date: Tue Jun 25 17:18:40 2013 +0000
* Create and configure Debian Edu theme, based on the joy theme for kdm:
- Reorganize Debian Edu kdm theme to match the new structure; copy joy
theme icons for the greeter, move wallpaper images to the new
default desktop-base directory /usr/share/images/desktop-base.
- Provide scaled images based on debian-edu-wallpaper01_1920x1080.svg
by Christop Muetze and on png files by Holger Levsen in Debian Edu
theme directory located in desktop-base. (kdm-theme/background.svg has
to be repaced with a real svg file.)
- Add metadata.desktop for Debian Edu theme directory.
- Add screenshot image for Debian Edu theme directory; this image has
yet to be updated.
- Add 20-desktop-base-edu.js to /usr/share/kde4/apps/plasma-desktop/init/
to set scaled Debian Edu theme images as the default background.
* Add myself to AUTHORS.
---
AUTHORS | 1 +
art/Makefile.am | 2 +-
art/kde/Makefile.am | 30 ++-
art/kdm-theme/Dialog.png | Bin 4972 -> 0 bytes
art/kdm-theme/GdmGreeterTheme.desktop | 12 --
art/kdm-theme/KdmGreeterTheme.desktop | 8 +-
art/kdm-theme/Makefile.am | 22 +--
art/kdm-theme/README | 8 +-
art/kdm-theme/background.svg | 9 +
art/kdm-theme/caps.png | Bin 4854 -> 0 bytes
art/kdm-theme/debian-edu.xml | 317 ++++++++++++++------------------
art/kdm-theme/enter_normal.png | Bin 630 -> 0 bytes
art/kdm-theme/enter_over.png | Bin 793 -> 0 bytes
art/kdm-theme/enter_pressed.png | Bin 793 -> 0 bytes
art/kdm-theme/icon-language.png | Bin 909 -> 0 bytes
art/kdm-theme/icon-reboot.png | Bin 670 -> 0 bytes
art/kdm-theme/icon-session.png | Bin 1236 -> 0 bytes
art/kdm-theme/icon-shutdown.png | Bin 727 -> 0 bytes
art/kdm-theme/joy.xml | 0
art/kdm-theme/kdm-default | 6 +-
art/kdm-theme/lineedit_active.png | Bin 0 -> 1707 bytes
art/kdm-theme/lineedit_normal.png | Bin 0 -> 686 bytes
art/kdm-theme/lock.png | Bin 0 -> 766 bytes
art/kdm-theme/preview.png | 1 -
art/kdm-theme/pw-entry-li.png | Bin 2488 -> 0 bytes
art/kdm-theme/pw-entry.png | Bin 1537 -> 0 bytes
art/kdm-theme/screenshot.png | Bin 211065 -> 75702 bytes
art/kdm-theme/session_button-li.png | Bin 1697 -> 0 bytes
art/kdm-theme/session_button.png | Bin 1598 -> 0 bytes
art/kdm-theme/swirl.png | Bin 2692 -> 0 bytes
art/kdm-theme/system_button-li.png | Bin 1957 -> 0 bytes
art/kdm-theme/system_button.png | Bin 1908 -> 0 bytes
art/kdm-theme/system_normal.png | Bin 332 -> 1076 bytes
art/kdm-theme/system_over.png | Bin 403 -> 0 bytes
art/kdm-theme/system_pressed.png | Bin 403 -> 0 bytes
art/kdm-theme/user-entry-li.png | Bin 2552 -> 0 bytes
art/kdm-theme/user-entry.png | Bin 1663 -> 0 bytes
art/kdm-theme/user_icon.png | Bin 0 -> 885 bytes
art/kdm-theme/win-login.png | Bin 59164 -> 0 bytes
art/ksplash-bg_1024x768/Makefile.am | 9 +
art/ksplash-bg_1024x768/background.png | Bin 0 -> 290817 bytes
art/ksplash-bg_1280x1024/Makefile.am | 9 +
art/ksplash-bg_1280x1024/background.png | Bin 0 -> 397394 bytes
art/ksplash-bg_1280x800/Makefile.am | 9 +
art/ksplash-bg_1280x800/background.png | Bin 0 -> 300125 bytes
art/ksplash-bg_1366x768/Makefile.am | 9 +
art/ksplash-bg_1366x768/background.png | Bin 0 -> 369812 bytes
art/ksplash-bg_1920x1080/Makefile.am | 9 +
art/ksplash-bg_1920x1080/background.png | Bin 0 -> 214992 bytes
art/ksplash-bg_1920x1200/Makefile.am | 9 +
art/ksplash-bg_1920x1200/background.png | Bin 0 -> 232740 bytes
art/ksplash-theme/README | 10 +-
art/ksplash-theme/Theme.rc | 6 +-
art/ksplash-theme/background.png | Bin 43 -> 212772 bytes
art/ksplash-theme/rectangle.png | Bin 27979 -> 14942 bytes
debian/changelog | 19 ++
debian/copyright | 2 +-
debian/debian-edu-artwork.links | 2 +-
debian/update-artwork | 15 +-
59 files changed, 281 insertions(+), 243 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index dbdc6da..465e579 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,3 +7,4 @@ Ralf Gesellensetter <rgx at gmx.de>
Andreas B. Mundt <andi.mundt at web.de>
Christoph Muetze <gizmo at pixelz.de>
Holger Levsen <holger at layer-acht.org>
+Wolfgang Schweer <wschweer at arcor.de>
diff --git a/art/Makefile.am b/art/Makefile.am
index 8f578ac..114d0eb 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1 +1 @@
-SUBDIRS = g-i kde kdm-theme gdm-theme ksplash-theme ldm splash media-cover
+SUBDIRS = g-i kde kdm-theme gdm-theme ksplash-theme ldm splash media-cover ksplash-bg_1024x768 ksplash-bg_1280x1024 ksplash-bg_1280x800 ksplash-bg_1366x768 ksplash-bg_1920x1080 ksplash-bg_1920x1200
diff --git a/art/kde/Makefile.am b/art/kde/Makefile.am
index c66b513..6a9349f 100644
--- a/art/kde/Makefile.am
+++ b/art/kde/Makefile.am
@@ -11,14 +11,38 @@ KDEIMG = debian-edu-wallpaper01_1600x1200.png \
debian-edu-wallpaper02_1920x1080.svg \
debian-edu-wallpaper02_1920x1200.svg
-kdeimgdir = $(datadir)/wallpapers/
-kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
+EDUIMG = 1024x768.png \
+ 1280x1024.png \
+ 1280x800.png \
+ 1366x768.png \
+ 1600x1200.png \
+ 1920x1080.png \
+ 1920x1200.png \
+ 800x600.png
+
+kdeimgdir = $(datadir)/images/desktop-base
+kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop debian-edu.xml
+
+kdeplasmadir = $(datadir)/kde4/apps/plasma-desktop/init/
+kdeplasma_DATA = 20-desktop-base-edu.js
+
+edudir = $(datadir)/wallpapers/Debian-Edu/
+edu_DATA = metadata.desktop
+
+educontentsdir = $(datadir)/wallpapers/Debian-Edu/contents/
+educontents_DATA = screenshot.png
+
+eduimgdir = $(datadir)/wallpapers/Debian-Edu/contents/images/
+eduimg_DATA = $(EDUIMG)
Xsessiondir = /etc/X11/Xsession.d/
Xsession_DATA = 25debian-edu-artwork
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
+ $(mkinstalldirs) $(DESTDIR)$(edudir)
+ $(mkinstalldirs) $(DESTDIR)$(educontentsdir)
+ $(mkinstalldirs) $(DESTDIR)$(eduimgdir)
$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
-EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA)
+EXTRA_DIST = $(kdeimg_DATA) $(edu_DATA) $(educontents_DATA) $(eduimg_DATA) $(Xsession_DATA)
diff --git a/art/kdm-theme/Dialog.png b/art/kdm-theme/Dialog.png
deleted file mode 100755
index 5f333a7..0000000
Binary files a/art/kdm-theme/Dialog.png and /dev/null differ
diff --git a/art/kdm-theme/GdmGreeterTheme.desktop b/art/kdm-theme/GdmGreeterTheme.desktop
deleted file mode 100644
index 3d17f20..0000000
--- a/art/kdm-theme/GdmGreeterTheme.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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]
-Greeter=debian-edu.xml
-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 371ca90..12a8ec6 100644
--- a/art/kdm-theme/KdmGreeterTheme.desktop
+++ b/art/kdm-theme/KdmGreeterTheme.desktop
@@ -5,8 +5,8 @@
[KdmGreeterTheme]
Greeter=debian-edu.xml
-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
+Name=Debian Edu
+Description=KDM theme for Debian Edu, based on Debian Wheezyjoy theme.
+Author=Wolfgang Schweer
+Copyright=(c) 2013, Wolfgang Schweer, wschweer at arcor.de
Screenshot=screenshot.png
diff --git a/art/kdm-theme/Makefile.am b/art/kdm-theme/Makefile.am
index 917edfc..852dc37 100644
--- a/art/kdm-theme/Makefile.am
+++ b/art/kdm-theme/Makefile.am
@@ -1,24 +1,20 @@
KDMTHEME = debian-edu.xml \
+ background.svg \
KdmGreeterTheme.desktop \
- caps.png \
- icon-language.png \
- icon-reboot.png \
- icon-session.png \
- icon-shutdown.png \
+ lineedit_active.png \
+ lineedit_normal.png \
+ lock.png \
+ rectangle.png \
screenshot.png \
- swirl.png \
- user-entry.png \
- user-entry-li.png \
- pw-entry.png \
- pw-entry-li.png \
- win-login.png
+ session_normal.png \
+ system_normal.png \
+ user_icon.png
kdmthemedir = $(datadir)/kde4/apps/kdm/themes/debian-edu
kdmtheme_DATA = $(KDMTHEME)
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(kdmthemedir)
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/default/kdm.d
$(INSTALL_DATA) kdm-default $(DESTDIR)$(sysconfdir)/default/kdm.d/20_debian-edu
-EXTRA_DIST = $(kdmtheme_DATA) gpl.txt
+EXTRA_DIST = $(kdmtheme_DATA)
diff --git a/art/kdm-theme/README b/art/kdm-theme/README
index 2579b4f..6622b25 100644
--- a/art/kdm-theme/README
+++ b/art/kdm-theme/README
@@ -4,11 +4,11 @@ kdm theme in kubuntu and is licensed under the GNU General Public License.
Based on the existent kdm and gdm themes, in combination with 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).
+by Andreas B. Mundt (GPL 2010).
-The xml-files defining the gdm and kdm theme are mostly identical now,
-except for the user entries: gdm uses a combined "user-pw-entry", where
-kdm has a "user-entry" and a "pw-entry".
+Wheezy version (based on joy theme) by Wolfgang Schweer (GPLv2+, 2013).
+background.svg must be replaced by a proper svg file. This one is a copy
+of debian-edu-wallpaper02_1920x1080.svg by Holger Levsen.
Resources:
http://docs.kde.org/stable/en/kdebase-workspace/kdm/kdm-themes.html
diff --git a/art/kdm-theme/background.svg b/art/kdm-theme/background.svg
new file mode 100644
index 0000000..fb32718
--- /dev/null
+++ b/art/kdm-theme/background.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1280pt" height="960pt" viewBox="0 0 1280 960" version="1.2">
+<defs>
+<image id="image8" width="1280" height="960" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABQAAAAPACAIAAADlvkMuAAAABmJLR0QA/wD/AP+gvaeTAAAgAElEQVR4nOy9QZbkOg+cy7TLxxt5E6/A+9+IN+CBN2D//QbVlZ0pAUQACJCQKjG4p28mEIAoVZU+gaQeX//tv4+oPcKRe9IsqvdjN7PPdSPZZ1Q+htuf3QX0ss9wfCxqpGun/hL8XOQ77U/T4W9a1gZTRqLHAPWootL+/PnPf/7v1//3P/6n7vKY3+Xat8APwIXgobk8ECfMHur/pAWBQXJrWqeup/4py/f/r0MtIVMo+0XhEC174Rn52B3szwD/ol73z66vcn1AFo2AdHtckvqUiJzlXZ8mzpU9xScEgcIoP2q2CPBTbX09+x4oIBFeFjsNCp33WOQsShf7M/la+ [...]
+</defs>
+<g id="surface1">
+<use xlink:href="#image8"/>
+</g>
+</svg>
diff --git a/art/kdm-theme/caps.png b/art/kdm-theme/caps.png
deleted file mode 100644
index 1d75070..0000000
Binary files a/art/kdm-theme/caps.png and /dev/null differ
diff --git a/art/kdm-theme/debian-edu.xml b/art/kdm-theme/debian-edu.xml
index cff3890..251d62b 100644
--- a/art/kdm-theme/debian-edu.xml
+++ b/art/kdm-theme/debian-edu.xml
@@ -1,185 +1,138 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE greeter SYSTEM "greeter.dtd">
-<greeter>
- <!-- background (use default wallpaper) -->
- <item type="pixmap" id="background" background="true">
- <normal file="/usr/share/wallpapers/debian-edu-wallpaper02_1600x1200.png" />
- <pos width="100%" x="0" y="0" height="100%" />
- </item>
- <!-- hostname and clock -->
- <item type="label" id="clock">
- <normal alpha="0.5" color="#334560" font="Sans Bold 11"/>
- <pos x="95%" y="97.5%" anchor="e"/>
- <text>%h - %c</text>
- </item>
- <!-- the bounding box in the center -->
- <item type="pixmap">
- <normal file="win-login.png"/>
- <pos x="50%" y="50%" width="615" height="401" anchor="c"/>
- </item>
- <!-- buttons -->
- <item type="rect">
- <normal/>
- <pos x="0" y="-50" width="100%" height="50"/>
- <fixed>
- <item type="rect">
- <normal />
- <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 />
- <pos y="50%" anchor="w" width="box" height="box"/>
- <box orientation="horizontal" spacing="10" xpadding="10">
- <item type="pixmap">
- <normal file="icon-language.png" tint="#dddddd"/>
- <prelight file="icon-language.png"/>
- <active file="icon-language.png" tint="#bbbbbb" />
- <pos y="50%" anchor="w"/>
- </item>
- <item type="label">
- <normal alpha="0.5" color="#334560" font="Sans Bold 12"/>
- <prelight color="#BBBBBB" font="Sans Bold 12"/>
- <active color="#bbbbbb" font="Sans Bold 12"/>
- <pos y="50%" anchor="w"/>
- <stock type="language" />
- </item>
- </box>
- </item>
- <item type="rect" id="session_button" button="true">
- <normal />
- <pos y="50%" anchor="w" width="box" height="box"/>
- <box orientation="horizontal" spacing="10" xpadding="10">
- <item type="pixmap">
- <normal file="icon-session.png" tint="#dddddd"/>
- <prelight file="icon-session.png"/>
- <active file="icon-session.png" tint="#bbbbbb"/>
- <pos y="50%" anchor="w"/>
- </item>
- <item type="label">
- <normal alpha="0.5" color="#334560" font="Sans Bold 12"/>
- <prelight color="#BBBBBB" font="Sans Bold 12"/>
- <active color="#bbbbbb" font="Sans Bold 12"/>
- <pos y="50%" anchor="w"/>
- <stock type="session" />
- </item>
- </box>
- </item>
- <item type="rect" id="system_button" button="true">
- <normal />
- <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="icon-reboot.png" tint="#dddddd"/>
- <prelight file="icon-reboot.png"/>
- <active file="icon-reboot.png" tint="#bbbbbb"/>
- <pos y="50%" anchor="w"/>
- </item>
- <item type="label">
- <normal alpha="0.5" color="#334560" font="Sans Bold 12"/>
- <prelight color="#BBBBBB" font="Sans Bold 12"/>
- <active color="#bbbbbb" font="Sans Bold 12"/>
- <pos y="50%" anchor="w"/>
- <stock type="system"/>
- </item>
- </box>
- </item>
- <item type="rect" id="disconnect_button" button="true">
- <normal />
- <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="icon-shutdown.png" tint="#dddddd"/>
- <prelight file="icon-shutdown.png"/>
- <active file="icon-shutdown.png" tint="#bbbbbb"/>
- <pos y="50%" anchor="w"/>
- </item>
- <item type="label">
- <normal alpha="0.5" color="#334560" font="Sans Bold 12"/>
- <prelight color="#666666" font="Sans Bold 12"/>
- <active color="#bbbbbb" font="Sans Bold 12"/>
- <pos y="50%" anchor="w"/>
- <stock type="disconnect"/>
- <show modes="remote"/>
- </item>
- <item type="label">
- <normal alpha="0.5" color="#334560" font="Sans Bold 12"/>
- <prelight color="#BBBBBB" font="Sans Bold 12"/>
- <active color="#bbbbbb" font="Sans Bold 12"/>
- <pos y="50%" anchor="w"/>
- <stock type="quit"/>
- <show modes="flexi"/>
- </item>
- </box>
- </item>
- </box>
- </item>
- </fixed>
- </item>
- <!-- container for labels etc. -->
- <item type="rect">
- <pos x="50%" y="50%" width="474" height="334" anchor="c"/>
- <box orientation="vertical">
- <!-- Debian swirl -->
- <item type="pixmap">
- <normal file="swirl.png"/>
- <pos anchor="c" x="50%" y="40%" />
- </item>
- <!-- welcome -->
- <item type="label" id="welcome-label">
- <pos x="50%" y="50%" anchor="c" />
- <normal alpha="0.5" font="Sans Bold 18" color="#334560"/>
- <stock type="welcome-label"/>
- </item>
- <item type="rect" id="user-field">
- <pos anchor="c" x="50%" y="135%" width="400" height="80"/>
- <style font="Sans 11" window-text-color="#bfd9ff"
- base-color="#bfd9ff" alternate-base-color="#666666"
- text-color="#0b678c" disabled-text-color="#111111"/>
- <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="54%" y="0%" width="135" 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="54%" y="0%" width="135" height="22"/>
- </item>
- </box>
- </item>
- </box>
- </item>
- <!-- caps-lock-warning -->
- <item type="pixmap" id="caps-lock-warning">
- <normal file="caps.png"/>
- <pos anchor="c" x="50%" y="50%"/>
- <fixed>
- <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>
- <!-- pam-error (login failure etc.) -->
- <item type="rect" id="pam-error">
- <pos x="0" y="90%" width="100%" height="box" anchor="sw"/>
- <box orientation="vertical" min-width="250" xpadding="10" ypadding="5" spacing="0">
- <item type="label" id="pam-error">
- <normal alpha="0.5" color="#334560" font="Sans 12"/>
- <pos x="50%" y="50%" anchor="c"/>
- <text></text>
- </item>
- </box>
- </item>
+
+<greeter id="theme">
+ <style font="Sans 12" window-text-color="#bfd9ff"
+ base-color="#bfd9ff" alternate-base-color="#666666"
+ text-color="#555555" disabled-text-color="#999999"
+ base-alpha="0"
+ disabled-base-color="#ff0000"
+ disabled-base-alpha="0.25"
+ disabled-highlight-alpha="0"
+ frame="false" />
+
+ <item type="pixmap" id="background" background="true">
+ <normal file="background.svg" scalemode="scale"/>
+ <pos x="0" y="0" width="100%" height="100%"/>
+ </item>
+<!--
+ <item type="pixmap" id="system-session">
+ <normal file="rectangle.png"/>
+ <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+ </item>
+
+ <item type="pixmap" id="branding-logo" background="true">
+ <normal file="branding.png" alpha=".4" />
+ <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+ </item>
+-->
+ <item type="pixmap" id="system-session">
+ <normal file="rectangle.png"/>
+ <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+
+ <fixed>
+ <item type="label" id="welcome">
+ <pos anchor="nw" x="20" y="20"/>
+ <normal alpha="1.0" font="Sans Bold 14" color="#444444"/>
+ <text>%h </text>
+ </item>
+ </fixed>
+ </item>
+
+
+ <item type="rect">
+ <pos anchor="c" x="50%" y="50%" width="200" height="100"/>
+ <box orientation="vertical" spacing="10" homogeneous="true">
+
+ <item type="rect" id="user-field">
+ <pos anchor="c" x="50%" y="50%" width="200" height="box"/>
+ <fixed>
+ <item type="pixmap">
+ <pos anchor="w" x="0" y="50%"/>
+ <normal file="user_icon.png"/>
+ </item>
+
+ <item type="pixmap">
+ <pos anchor="w" x="42" y="50%"/>
+ <normal file="lineedit_normal.png"/>
+ <prelight file="lineedit_active.png"/>
+ <active file="lineedit_active.png"/>
+ </item>
+
+ <item type="entry" id="user-entry">
+ <pos anchor="w" x="49" y="50%" width="140" height="20"/>
+ </item>
+ </fixed>
+ </item>
+
+ <item type="rect" id="user-field2">
+ <pos anchor="c" x="50%" y="50%" width="200" height="box"/>
+ <fixed>
+ <item type="pixmap" button="true">
+ <pos anchor="w" x="0%" y="50%"/>
+ <normal file="lock.png"/>
+ </item>
+
+ <item type="pixmap">
+ <pos anchor="w" x="42" y="50%"/>
+ <normal file="lineedit_normal.png"/>
+ <prelight file="lineedit_active.png"/>
+ <active file="lineedit_active.png"/>
+ </item>
+
+ <item type="entry" id="pw-entry">
+ <pos anchor="w" x="49" y="50%" width="140" height="20"/>
+ </item>
+ </fixed>
+ </item>
+ </box>
+ </item>
+
+ <item type="rect" id="system-session">
+ <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+ <fixed>
+ <item type="label">
+ <pos anchor="se" x="-15" y="-20"/>
+ <normal font="Sans Bold 10" color="#444444"/>
+ <text>%c</text>
+ </item>
+
+ <item type="pixmap" id="session_button" button="true">
+ <normal alpha="1.0" file="session_normal.png"/>
+ <prelight file="session_normal.png"/>
+ <active file="session_normal.png"/>
+ <pos anchor="sw" x="22" y="-20"/>
+ </item>
+
+ <item type="pixmap" id="system_button" button="true">
+ <normal alpha="1.0" file="system_normal.png"/>
+ <prelight file="system_normal.png"/>
+ <active file="system_normal.png"/>
+ <pos anchor="sw" x="50" y="-20"/>
+ </item>
+ </fixed>
+ </item>
+
+ <item type="rect" id="caps-lock-warning">
+ <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+ <fixed>
+ <item type="label" id="mesage">
+ <normal color="#444444" font="Sans Bold 10"/>
+ <pos anchor="s" x="50%" y="80%"/>
+ <stock type="caps-lock-warning"/>
+ </item>
+ </fixed>
+ </item>
+
+ <item type="rect" id="pam-error-paceholder">
+ <pos anchor="c" x="50%" y="42%" widht="615" height="200"/>
+ <fixed>
+ <item type="label" id="pam-error">
+ <pos anchor="c" x="50%" y="50%" expand="true"/>
+ <normal alpha="1.0" color="#aa4444" font="Sans Bold 10"/>
+ <text/>
+ </item>
+ </fixed>
+ </item>
+
</greeter>
diff --git a/art/kdm-theme/enter_normal.png b/art/kdm-theme/enter_normal.png
deleted file mode 100644
index 73dcb8f..0000000
Binary files a/art/kdm-theme/enter_normal.png and /dev/null differ
diff --git a/art/kdm-theme/enter_over.png b/art/kdm-theme/enter_over.png
deleted file mode 100644
index a78fae6..0000000
Binary files a/art/kdm-theme/enter_over.png and /dev/null differ
diff --git a/art/kdm-theme/enter_pressed.png b/art/kdm-theme/enter_pressed.png
deleted file mode 100644
index a78fae6..0000000
Binary files a/art/kdm-theme/enter_pressed.png and /dev/null differ
diff --git a/art/kdm-theme/icon-language.png b/art/kdm-theme/icon-language.png
deleted file mode 100644
index 03fe222..0000000
Binary files a/art/kdm-theme/icon-language.png and /dev/null differ
diff --git a/art/kdm-theme/icon-reboot.png b/art/kdm-theme/icon-reboot.png
deleted file mode 100644
index 6373e01..0000000
Binary files a/art/kdm-theme/icon-reboot.png and /dev/null differ
diff --git a/art/kdm-theme/icon-session.png b/art/kdm-theme/icon-session.png
deleted file mode 100644
index ac7843c..0000000
Binary files a/art/kdm-theme/icon-session.png and /dev/null differ
diff --git a/art/kdm-theme/icon-shutdown.png b/art/kdm-theme/icon-shutdown.png
deleted file mode 100644
index 0b78ec1..0000000
Binary files a/art/kdm-theme/icon-shutdown.png and /dev/null differ
diff --git a/art/kdm-theme/joy.xml b/art/kdm-theme/joy.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/art/kdm-theme/kdm-default b/art/kdm-theme/kdm-default
index 45407b9..52975de 100644
--- a/art/kdm-theme/kdm-default
+++ b/art/kdm-theme/kdm-default
@@ -1,4 +1,2 @@
-USETHEME=true
-THEME=/usr/share/kde4/apps/kdm/themes/debian-edu
-USEBACKGROUND=true
-WALLPAPER=/usr/share/wallpapers/debian-edu-wallpaper01_1600x1200.png
+USETHEME="true"
+THEME="/usr/share/kde4/apps/kdm/themes/debian-edu"
diff --git a/art/kdm-theme/lineedit_active.png b/art/kdm-theme/lineedit_active.png
new file mode 100644
index 0000000..0192ee6
Binary files /dev/null and b/art/kdm-theme/lineedit_active.png differ
diff --git a/art/kdm-theme/lineedit_normal.png b/art/kdm-theme/lineedit_normal.png
new file mode 100644
index 0000000..a5138e9
Binary files /dev/null and b/art/kdm-theme/lineedit_normal.png differ
diff --git a/art/kdm-theme/lock.png b/art/kdm-theme/lock.png
new file mode 100644
index 0000000..21864d0
Binary files /dev/null and b/art/kdm-theme/lock.png differ
diff --git a/art/kdm-theme/preview.png b/art/kdm-theme/preview.png
deleted file mode 120000
index 95bdd64..0000000
--- a/art/kdm-theme/preview.png
+++ /dev/null
@@ -1 +0,0 @@
-screenshot.png
\ No newline at end of file
diff --git a/art/kdm-theme/pw-entry-li.png b/art/kdm-theme/pw-entry-li.png
deleted file mode 100644
index 75174cc..0000000
Binary files a/art/kdm-theme/pw-entry-li.png and /dev/null differ
diff --git a/art/kdm-theme/pw-entry.png b/art/kdm-theme/pw-entry.png
deleted file mode 100644
index 3f235d8..0000000
Binary files a/art/kdm-theme/pw-entry.png and /dev/null differ
diff --git a/art/kdm-theme/screenshot.png b/art/kdm-theme/screenshot.png
index 996c749..89f36ef 100644
Binary files a/art/kdm-theme/screenshot.png 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
deleted file mode 100644
index d018eb6..0000000
Binary files a/art/kdm-theme/session_button-li.png and /dev/null differ
diff --git a/art/kdm-theme/session_button.png b/art/kdm-theme/session_button.png
deleted file mode 100644
index aea03c1..0000000
Binary files a/art/kdm-theme/session_button.png and /dev/null differ
diff --git a/art/kdm-theme/swirl.png b/art/kdm-theme/swirl.png
deleted file mode 100644
index b65a143..0000000
Binary files a/art/kdm-theme/swirl.png and /dev/null differ
diff --git a/art/kdm-theme/system_button-li.png b/art/kdm-theme/system_button-li.png
deleted file mode 100644
index 595fce4..0000000
Binary files a/art/kdm-theme/system_button-li.png and /dev/null differ
diff --git a/art/kdm-theme/system_button.png b/art/kdm-theme/system_button.png
deleted file mode 100644
index 19c6a9d..0000000
Binary files a/art/kdm-theme/system_button.png and /dev/null differ
diff --git a/art/kdm-theme/system_normal.png b/art/kdm-theme/system_normal.png
index 1051e51..5769fdb 100644
Binary files a/art/kdm-theme/system_normal.png and b/art/kdm-theme/system_normal.png differ
diff --git a/art/kdm-theme/system_over.png b/art/kdm-theme/system_over.png
deleted file mode 100644
index db69849..0000000
Binary files a/art/kdm-theme/system_over.png and /dev/null differ
diff --git a/art/kdm-theme/system_pressed.png b/art/kdm-theme/system_pressed.png
deleted file mode 100644
index db69849..0000000
Binary files a/art/kdm-theme/system_pressed.png and /dev/null differ
diff --git a/art/kdm-theme/user-entry-li.png b/art/kdm-theme/user-entry-li.png
deleted file mode 100644
index b5f093f..0000000
Binary files a/art/kdm-theme/user-entry-li.png and /dev/null differ
diff --git a/art/kdm-theme/user-entry.png b/art/kdm-theme/user-entry.png
deleted file mode 100644
index d80d5aa..0000000
Binary files a/art/kdm-theme/user-entry.png and /dev/null differ
diff --git a/art/kdm-theme/user_icon.png b/art/kdm-theme/user_icon.png
new file mode 100644
index 0000000..84e9139
Binary files /dev/null and b/art/kdm-theme/user_icon.png differ
diff --git a/art/kdm-theme/win-login.png b/art/kdm-theme/win-login.png
deleted file mode 100644
index f774833..0000000
Binary files a/art/kdm-theme/win-login.png and /dev/null differ
diff --git a/art/ksplash-bg_1024x768/Makefile.am b/art/ksplash-bg_1024x768/Makefile.am
new file mode 100644
index 0000000..2772600
--- /dev/null
+++ b/art/ksplash-bg_1024x768/Makefile.am
@@ -0,0 +1,9 @@
+KSPLASHTHEME = background.png
+
+ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu/1024x768
+ksplashtheme_DATA = $(KSPLASHTHEME)
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
+
+EXTRA_DIST = $(ksplashtheme_DATA)
diff --git a/art/ksplash-bg_1024x768/background.png b/art/ksplash-bg_1024x768/background.png
new file mode 100644
index 0000000..29045ec
Binary files /dev/null and b/art/ksplash-bg_1024x768/background.png differ
diff --git a/art/ksplash-bg_1280x1024/Makefile.am b/art/ksplash-bg_1280x1024/Makefile.am
new file mode 100644
index 0000000..10f4c98
--- /dev/null
+++ b/art/ksplash-bg_1280x1024/Makefile.am
@@ -0,0 +1,9 @@
+KSPLASHTHEME = background.png
+
+ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu/1280x1024
+ksplashtheme_DATA = $(KSPLASHTHEME)
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
+
+EXTRA_DIST = $(ksplashtheme_DATA)
diff --git a/art/ksplash-bg_1280x1024/background.png b/art/ksplash-bg_1280x1024/background.png
new file mode 100644
index 0000000..f799f14
Binary files /dev/null and b/art/ksplash-bg_1280x1024/background.png differ
diff --git a/art/ksplash-bg_1280x800/Makefile.am b/art/ksplash-bg_1280x800/Makefile.am
new file mode 100644
index 0000000..a1e9843
--- /dev/null
+++ b/art/ksplash-bg_1280x800/Makefile.am
@@ -0,0 +1,9 @@
+KSPLASHTHEME = background.png
+
+ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu/1280x800
+ksplashtheme_DATA = $(KSPLASHTHEME)
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
+
+EXTRA_DIST = $(ksplashtheme_DATA)
diff --git a/art/ksplash-bg_1280x800/background.png b/art/ksplash-bg_1280x800/background.png
new file mode 100644
index 0000000..c2929a0
Binary files /dev/null and b/art/ksplash-bg_1280x800/background.png differ
diff --git a/art/ksplash-bg_1366x768/Makefile.am b/art/ksplash-bg_1366x768/Makefile.am
new file mode 100644
index 0000000..8dd5960
--- /dev/null
+++ b/art/ksplash-bg_1366x768/Makefile.am
@@ -0,0 +1,9 @@
+KSPLASHTHEME = background.png
+
+ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu/1366x768
+ksplashtheme_DATA = $(KSPLASHTHEME)
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
+
+EXTRA_DIST = $(ksplashtheme_DATA)
diff --git a/art/ksplash-bg_1366x768/background.png b/art/ksplash-bg_1366x768/background.png
new file mode 100644
index 0000000..1c64b6d
Binary files /dev/null and b/art/ksplash-bg_1366x768/background.png differ
diff --git a/art/ksplash-bg_1920x1080/Makefile.am b/art/ksplash-bg_1920x1080/Makefile.am
new file mode 100644
index 0000000..748e1bf
--- /dev/null
+++ b/art/ksplash-bg_1920x1080/Makefile.am
@@ -0,0 +1,9 @@
+KSPLASHTHEME = background.png
+
+ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu/1920x1080
+ksplashtheme_DATA = $(KSPLASHTHEME)
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
+
+EXTRA_DIST = $(ksplashtheme_DATA)
diff --git a/art/ksplash-bg_1920x1080/background.png b/art/ksplash-bg_1920x1080/background.png
new file mode 100644
index 0000000..4dcb0cb
Binary files /dev/null and b/art/ksplash-bg_1920x1080/background.png differ
diff --git a/art/ksplash-bg_1920x1200/Makefile.am b/art/ksplash-bg_1920x1200/Makefile.am
new file mode 100644
index 0000000..f87aa99
--- /dev/null
+++ b/art/ksplash-bg_1920x1200/Makefile.am
@@ -0,0 +1,9 @@
+KSPLASHTHEME = background.png
+
+ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu/1920x1200
+ksplashtheme_DATA = $(KSPLASHTHEME)
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
+
+EXTRA_DIST = $(ksplashtheme_DATA)
diff --git a/art/ksplash-bg_1920x1200/background.png b/art/ksplash-bg_1920x1200/background.png
new file mode 100644
index 0000000..cb917fc
Binary files /dev/null and b/art/ksplash-bg_1920x1200/background.png differ
diff --git a/art/ksplash-theme/README b/art/ksplash-theme/README
index 8b90d9d..66c2728 100644
--- a/art/ksplash-theme/README
+++ b/art/ksplash-theme/README
@@ -1,7 +1,5 @@
-This ksplash theme was created by Andreas B. Mundt <andi.mundt at web.de>
-based on the default KDE theme created by: Nuno Pinheiro
-<nuno at oxygen-icons.org>, Riccardo Iaconelli <riccardo at kde.org> and
-Marco Martin <notmart at gmail.com>.
+This ksplash theme was created by Wolfgang Schweer <wschweer at arcor.de>
+based on the default KDE joy theme.
-Basically, only the background image was exchanged by the Debian-Edu
-one.
+Basically, only the background images were exchanged by the Debian Edu
+ones.
diff --git a/art/ksplash-theme/Theme.rc b/art/ksplash-theme/Theme.rc
index 90ea887..584a223 100644
--- a/art/ksplash-theme/Theme.rc
+++ b/art/ksplash-theme/Theme.rc
@@ -1,8 +1,8 @@
[KSplash Theme: Debian-Edu]
-Name = KDE Debian-Edu Splash Screen
-Description = KDE Debian-Edu Splash Screen from Customized Air Splash Screen
+Name = KDE Debian Edu Splash Screen
+Description = KDE Debian Edu Splash Screen based upon the joy theme
Version = 1.0
-Author = Andreas B. Mundt <andi.mundt at web.de>, built on the work of: Nuno Pinheiro <nuno at oxygen-icons.org>, Riccardo Iaconelli <riccardo at kde.org> and Marco Martin <notmart at gmail.com>
+Author = Wolfgang Schweer <wschweer at arcor.de>, based upon the work of the joy theme authors.
Homepage = http://www.kde.org
# Theme behaviour settings.
diff --git a/art/ksplash-theme/background.png b/art/ksplash-theme/background.png
deleted file mode 120000
index a794f7c..0000000
--- a/art/ksplash-theme/background.png
+++ /dev/null
@@ -1 +0,0 @@
-../kde/debian-edu-wallpaper02_1600x1200.png
\ No newline at end of file
diff --git a/art/ksplash-theme/background.png b/art/ksplash-theme/background.png
new file mode 100644
index 0000000..f2d0109
Binary files /dev/null and b/art/ksplash-theme/background.png differ
diff --git a/art/ksplash-theme/rectangle.png b/art/ksplash-theme/rectangle.png
index 902940d..b9a13b1 100644
Binary files a/art/ksplash-theme/rectangle.png and b/art/ksplash-theme/rectangle.png differ
diff --git a/debian/changelog b/debian/changelog
index 9d700d7..d004dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+debian-edu-artwork (0.0.38-1.1) UNRELEASED; urgency=low
+
+ * Create and configure Debian Edu theme, based on the joy theme for kdm:
+ - Reorganize Debian Edu kdm theme to match the new structure; copy joy
+ theme icons for the greeter, move wallpaper images to the new
+ default desktop-base directory /usr/share/images/desktop-base.
+ - Provide scaled images based on debian-edu-wallpaper01_1920x1080.svg
+ by Christop Muetze and on png files by Holger Levsen in Debian Edu
+ theme directory located in desktop-base. (kdm-theme/background.svg has
+ to be repaced with a real svg file.)
+ - Add metadata.desktop for Debian Edu theme directory.
+ - Add screenshot image for Debian Edu theme directory; this image has
+ yet to be updated.
+ - Add 20-desktop-base-edu.js to /usr/share/kde4/apps/plasma-desktop/init/
+ to set scaled Debian Edu theme images as the default background.
+ * Add myself to AUTHORS.
+
+ -- Wolfgang Schweer <wschweer at arcor.de> Tue, 18 Jun 2013 14:47:31 +0200
+
debian-edu-artwork (0.0.38-1) unstable; urgency=low
* Bump upstream version, appearantly the Debian Edu archive has problems
diff --git a/debian/copyright b/debian/copyright
index 434a447..8ebc16b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
This package was debianized by Petter Reinholdtsen <pere at debian.org> on
Mon, 01 Aug 2005 08:43:22 +0200.
-Upstream Author: Christoph Muetze, Holger Levsen and others
+Upstream Author: Christoph Muetze, Holger Levsen, Wolfgang Schweer and others
Copyright: 2011-2013 Christoph Muetze and others
diff --git a/debian/debian-edu-artwork.links b/debian/debian-edu-artwork.links
index 89cc5d2..0f15828 100644
--- a/debian/debian-edu-artwork.links
+++ b/debian/debian-edu-artwork.links
@@ -4,4 +4,4 @@
/usr/share/ldm/themes/ltsp/reboot.png /usr/share/ldm/themes/debian-edu/reboot.png
/usr/share/ldm/themes/ltsp/session.png /usr/share/ldm/themes/debian-edu/session.png
/usr/share/ldm/themes/ltsp/shutdown.png /usr/share/ldm/themes/debian-edu/shutdown.png
-/usr/share/wallpapers/debian-edu-wallpaper02_1600x1200.svg /usr/share/images/desktop-base/login-background.svg
+/usr/share/images/desktop-base/debian-edu-wallpaper02_1600x1200.svg /usr/share/images/desktop-base/login-background.svg
diff --git a/debian/update-artwork b/debian/update-artwork
index 7102e52..8bfb605 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -39,11 +39,11 @@ change_desktop_background() {
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
- /usr/share/wallpapers/debian-edu-wallpaper01_1600x1200.png 75
+ /usr/share/images/desktop-base/debian-edu-wallpaper01_1920x1080.svg 75
- for WALLPAPER in debian-edu-wallpaper01_1600x1200.svg \
+ for WALLPAPER in debian-edu-wallpaper01_1600x1200.png \
+ debian-edu-wallpaper01_1600x1200.svg \
debian-edu-wallpaper01_1920x1080.png \
- debian-edu-wallpaper01_1920x1080.svg \
debian-edu-wallpaper01_1920x1200.png \
debian-edu-wallpaper01_1920x1200.svg \
debian-edu-wallpaper02_1920x1080.png \
@@ -55,7 +55,7 @@ change_desktop_background() {
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
- /usr/share/wallpapers/$WALLPAPER 50
+ /usr/share/images/desktop-base/$WALLPAPER 50
done
}
@@ -63,7 +63,6 @@ restore_desktop_background() {
for WALLPAPER in debian-edu-wallpaper01_1600x1200.png \
debian-edu-wallpaper01_1600x1200.svg \
debian-edu-wallpaper01_1920x1080.png \
- debian-edu-wallpaper01_1920x1080.svg \
debian-edu-wallpaper01_1920x1200.png \
debian-edu-wallpaper01_1920x1200.svg \
debian-edu-wallpaper02_1920x1080.png \
@@ -73,7 +72,7 @@ restore_desktop_background() {
debian-edu-wallpaper02_1600x1200.png \
debian-edu-wallpaper02_1600x1200.svg ; do
update-alternatives --remove desktop-background \
- /usr/share/wallpapers/$WALLPAPER
+ /usr/share/images/desktop-base/$WALLPAPER
done
}
@@ -82,12 +81,12 @@ change_ksplash() {
update-alternatives --install \
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
- /usr/share/kde4/apps/ksplash/Themes/Debian-Edu/1600x1200/background.png 55
+ /usr/share/kde4/apps/kdm/themes/debian-edu/background.svg 55
}
restore_ksplash() {
update-alternatives --remove desktop-splash \
- /usr/share/kde4/apps/ksplash/Themes/Debian-Edu/1600x1200/background.png
+ /usr/share/kde4/apps/kdm/themes/debian-edu/background.svg
}
case "$1" in
--
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