[debian-edu-commits] debian-edu/ 296/437: * Minor kdm/gdm-theme design modifications. * Use Debian default path for kdm-theme.
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:44 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 8f26be75f53759a89545ca709e7135bc31d47ef5
Author: Andreas B. Mundt <andi.mundt at web.de>
Date: Mon Jun 20 15:44:03 2011 +0000
* Minor kdm/gdm-theme design modifications.
* Use Debian default path for kdm-theme.
---
art/gdm-theme/Makefile.am | 2 +-
art/gdm-theme/Makefile.in | 2 +-
art/gdm-theme/debian-edu.xml | 24 ++++++++++++------------
art/gdm-theme/slx-small.png | Bin 9634 -> 0 bytes
art/gdm-theme/swirl.png | Bin 0 -> 2692 bytes
art/kdm-theme/Makefile.am | 2 +-
art/kdm-theme/Makefile.in | 2 +-
art/kdm-theme/debian-edu.xml | 1 -
art/kdm-theme/kdm-default | 2 +-
debian/changelog | 3 ++-
10 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/art/gdm-theme/Makefile.am b/art/gdm-theme/Makefile.am
index 6c3cfaa..7c614bd 100644
--- a/art/gdm-theme/Makefile.am
+++ b/art/gdm-theme/Makefile.am
@@ -6,7 +6,7 @@ GDMTHEME = debian-edu.xml \
icon-session.png \
icon-shutdown.png \
screenshot.png \
- slx-small.png \
+ swirl.png \
userentry.png \
win-login.png
diff --git a/art/gdm-theme/Makefile.in b/art/gdm-theme/Makefile.in
index 611328d..0559ef2 100644
--- a/art/gdm-theme/Makefile.in
+++ b/art/gdm-theme/Makefile.in
@@ -162,7 +162,7 @@ GDMTHEME = debian-edu.xml \
icon-session.png \
icon-shutdown.png \
screenshot.png \
- slx-small.png \
+ swirl.png \
userentry.png \
win-login.png
diff --git a/art/gdm-theme/debian-edu.xml b/art/gdm-theme/debian-edu.xml
index 7354bbd..c666d38 100644
--- a/art/gdm-theme/debian-edu.xml
+++ b/art/gdm-theme/debian-edu.xml
@@ -121,36 +121,36 @@
<item type="rect">
<pos x="50%" y="50%" width="474" height="334" anchor="c"/>
<box orientation="vertical">
- <!-- skolelinux label
- <item type="pixmap">
- <normal file="slx-small.png"/>
- <pos anchor="c" x="50%" y="60%"/>
- </item> -->
+ <!-- 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="95" anchor="c" height="80"/>
- <normal font="Sans Bold 18" color="#000000"/>
- <stock type="welcome-label"/>
+ <pos x="50%" y="50%" anchor="c" />
+ <normal alpha="0.5" font="Sans Bold 18" color="#334560"/>
+ <stock type="welcome-label"/>
</item>
<!-- username label -->
<item type="label" id="pam-prompt">
- <pos x="50%" y="80" anchor="c"/>
+ <pos x="50%" y="70" anchor="c"/>
<normal font="Sans Bold 12" color="#000000"/>
<stock type="username-label"/>
</item>
<item type="label" id="pam-message">
- <pos anchor="c" x="50%" y="90"/>
+ <pos anchor="c" x="50%" y="80"/>
<normal color="#000000" font="Sans 11"/>
<text></text>
</item>
<!-- user-pw-entry background pixmap -->
<item type="pixmap">
- <pos x="140" y="105" width="200" height="40"/>
+ <pos x="140" y="75" width="200" height="40"/>
<normal file="userentry.png"/>
</item>
<!-- user-pw-entry -->
<item type="entry" id="user-pw-entry">
- <pos x="150" y="75" width="180" height="20"/>
+ <pos x="150" y="45" width="180" height="20"/>
<normal font="Sans 12" color="#444444"/>
</item>
</box>
diff --git a/art/gdm-theme/slx-small.png b/art/gdm-theme/slx-small.png
deleted file mode 100644
index 491a5a7..0000000
Binary files a/art/gdm-theme/slx-small.png and /dev/null differ
diff --git a/art/gdm-theme/swirl.png b/art/gdm-theme/swirl.png
new file mode 100644
index 0000000..b65a143
Binary files /dev/null and b/art/gdm-theme/swirl.png differ
diff --git a/art/kdm-theme/Makefile.am b/art/kdm-theme/Makefile.am
index 11a6214..917edfc 100644
--- a/art/kdm-theme/Makefile.am
+++ b/art/kdm-theme/Makefile.am
@@ -13,7 +13,7 @@ KDMTHEME = debian-edu.xml \
pw-entry-li.png \
win-login.png
-kdmthemedir = $(datadir)/apps/kdm/themes/debian-edu
+kdmthemedir = $(datadir)/kde4/apps/kdm/themes/debian-edu
kdmtheme_DATA = $(KDMTHEME)
install-data-local:
diff --git a/art/kdm-theme/Makefile.in b/art/kdm-theme/Makefile.in
index c3dec69..6bd5e7b 100644
--- a/art/kdm-theme/Makefile.in
+++ b/art/kdm-theme/Makefile.in
@@ -169,7 +169,7 @@ KDMTHEME = debian-edu.xml \
pw-entry-li.png \
win-login.png
-kdmthemedir = $(datadir)/apps/kdm/themes/debian-edu
+kdmthemedir = $(datadir)/kde4/apps/kdm/themes/debian-edu
kdmtheme_DATA = $(KDMTHEME)
EXTRA_DIST = $(kdmtheme_DATA) gpl.txt
all: all-am
diff --git a/art/kdm-theme/debian-edu.xml b/art/kdm-theme/debian-edu.xml
index 192960d..172c152 100644
--- a/art/kdm-theme/debian-edu.xml
+++ b/art/kdm-theme/debian-edu.xml
@@ -121,7 +121,6 @@
<item type="rect">
<pos x="50%" y="50%" width="474" height="334" anchor="c"/>
<box orientation="vertical">
- <!-- container for labels etc. -->
<!-- Debian swirl -->
<item type="pixmap">
<normal file="swirl.png"/>
diff --git a/art/kdm-theme/kdm-default b/art/kdm-theme/kdm-default
index 16b7cc5..2a53d13 100644
--- a/art/kdm-theme/kdm-default
+++ b/art/kdm-theme/kdm-default
@@ -1,4 +1,4 @@
USETHEME=true
-THEME=/usr/share/apps/kdm/themes/debian-edu
+THEME=/usr/share/kde4/apps/kdm/themes/debian-edu
USEBACKGROUND=true
WALLPAPER=/usr/share/wallpapers/debian-edu-wallpaper.png
diff --git a/debian/changelog b/debian/changelog
index 9611944..56755b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ debian-edu-artwork (0.0.33~svn73753) UNRELEASED; urgency=low
(*.orig.tar.gz).
* Use new artwork for PXE boot screen. Remove outdated paragraph from
art/splash/README.
- * Minor kdm-theme design modification.
+ * Minor kdm/gdm-theme design modifications.
+ * Use Debian default path for kdm-theme.
-- Andreas B. Mundt <andi.mundt at web.de> Sun, 19 Jun 2011 13:00:25 +0200
--
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