[debian-edu-commits] debian-edu/ 04/09: art-lines: Adjust to match new structur (same as art-softwaves).
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Fri Oct 28 15:48:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch schweer/softwaves
in repository debian-edu-artwork.
commit 2178452ca81023da6e3df47bc2148015173fe891
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Fri Oct 28 14:03:26 2016 +0200
art-lines: Adjust to match new structur (same as art-softwaves).
- remove all kdm and ksplash related directories and files.
- rename subdir kde -> deaktop-base for a better naming match.
- remove no longer used directory splash (grub files in desktop-base now).
- add plymouth support.
- rely more on SVG files in playground to ease adding new themes.
---
art-lines/Makefile.am | 12 +-
art-lines/desktop-base/20-desktop-base-edu.js | 13 +
art-lines/desktop-base/Makefile.am | 91 ++
art-lines/desktop-base/debian-edu-lines-grub.svg | 1 +
.../debian-edu-lines-grub_1920x1080.svg | 1 +
art-lines/desktop-base/debian-edu-lines-login.svg | 1 +
.../debian-edu-lines-wallpaper.svg.desktop | 0
.../debian-edu-lines-wallpaper_1024x768.svg | 1 +
.../debian-edu-lines-wallpaper_1280x1024.svg | 0
.../debian-edu-lines-wallpaper_1600x1200.svg | 0
.../debian-edu-lines-wallpaper_1920x1080.svg | 0
.../debian-edu-lines-wallpaper_1920x1200.svg | 0
.../debian-edu-lines-wallpaper_2560x1080.svg | 0
.../{kde => desktop-base}/debian-edu-lines.xml | 2 +-
art-lines/{kde => desktop-base}/metadata.desktop | 0
art-lines/g-i/Makefile.am | 7 +-
art-lines/g-i/debian-edu-lines-installer-logo.info | 6 +-
art-lines/gnome-shell/Makefile.am | 3 +-
art-lines/kde/20-desktop-base-edu.js | 13 -
art-lines/kde/Makefile.am | 68 --
art-lines/kde/debian-edu-lines-login+grub.svg | 1 -
art-lines/kdm-theme/KdmGreeterTheme.desktop | 12 -
art-lines/kdm-theme/Makefile.am | 19 -
art-lines/kdm-theme/README | 21 -
art-lines/kdm-theme/background.svg | 1 -
art-lines/kdm-theme/debian-edu-lines.xml | 138 ---
art-lines/kdm-theme/gpl.txt | 340 ------
art-lines/kdm-theme/lineedit_active.png | Bin 1707 -> 0 bytes
art-lines/kdm-theme/lineedit_normal.png | Bin 686 -> 0 bytes
art-lines/kdm-theme/lock.png | Bin 766 -> 0 bytes
art-lines/kdm-theme/rectangle.png | Bin 14942 -> 0 bytes
art-lines/kdm-theme/screenshot.png | Bin 70336 -> 0 bytes
art-lines/kdm-theme/session_normal.png | Bin 1230 -> 0 bytes
art-lines/kdm-theme/system_normal.png | Bin 1076 -> 0 bytes
art-lines/kdm-theme/user_icon.png | Bin 885 -> 0 bytes
art-lines/ksplash-bg_1280x1024/Makefile.am | 18 -
art-lines/ksplash-bg_1280x1024/background.svg | 1 -
art-lines/ksplash-bg_1920x1080/Makefile.am | 17 -
art-lines/ksplash-bg_1920x1080/background.svg | 1 -
art-lines/ksplash-bg_1920x1200/Makefile.am | 17 -
art-lines/ksplash-bg_1920x1200/background.svg | 1 -
art-lines/ksplash-bg_2560x1080/Makefile.am | 17 -
art-lines/ksplash-bg_2560x1080/background.svg | 1 -
art-lines/ksplash-theme/Makefile.am | 34 -
art-lines/ksplash-theme/Preview.png | Bin 62513 -> 0 bytes
art-lines/ksplash-theme/README | 5 -
art-lines/ksplash-theme/Theme.rc | 8 -
art-lines/ksplash-theme/background.svg | 1 -
art-lines/ksplash-theme/description.txt | 43 -
art-lines/ksplash-theme/icon1.png | Bin 4748 -> 0 bytes
art-lines/ksplash-theme/icon1_anim.png | Bin 172105 -> 0 bytes
art-lines/ksplash-theme/icon2.png | Bin 8531 -> 0 bytes
art-lines/ksplash-theme/icon2_anim.png | Bin 246882 -> 0 bytes
art-lines/ksplash-theme/icon3.png | Bin 9428 -> 0 bytes
art-lines/ksplash-theme/icon3_anim.png | Bin 279063 -> 0 bytes
art-lines/ksplash-theme/icon4.png | Bin 5468 -> 0 bytes
art-lines/ksplash-theme/icon4_anim.png | Bin 232671 -> 0 bytes
art-lines/ksplash-theme/icon5.png | Bin 20953 -> 0 bytes
art-lines/ksplash-theme/icon5_anim.png | Bin 589217 -> 0 bytes
art-lines/ksplash-theme/ksplashrc | 3 -
art-lines/ksplash-theme/rectangle.png | Bin 14942 -> 0 bytes
art-lines/ldm/Makefile.am | 9 +-
art-lines/ldm/bg.png | Bin 31 -> 131312 bytes
art-lines/ldm/bg.svg | 1 +
art-lines/plymouth/Makefile.am | 28 +
art-lines/plymouth/debian-edu-lines-logo.svg | 1 +
art-lines/plymouth/debian-edu-lines-plymouth.svg | 1 +
art-lines/plymouth/debian-edu-lines.plymouth | 8 +
art-lines/plymouth/debian-edu-lines.script | 1111 ++++++++++++++++++++
art-lines/plymouth/electron.png | Bin 0 -> 4867 bytes
art-lines/plymouth/password_dot.png | Bin 0 -> 324 bytes
art-lines/plymouth/password_dot16.png | Bin 0 -> 285 bytes
art-lines/plymouth/password_field.png | Bin 0 -> 1214 bytes
art-lines/plymouth/password_field16.png | Bin 0 -> 230 bytes
art-lines/splash/Makefile.am | 24 -
art-lines/splash/README | 39 -
art-lines/splash/background-grub2.png | 1 -
art-lines/splash/debian-edu-lines-splash.svg | 1 -
78 files changed, 1280 insertions(+), 862 deletions(-)
diff --git a/art-lines/Makefile.am b/art-lines/Makefile.am
index 4709c6a..3baaeb1 100644
--- a/art-lines/Makefile.am
+++ b/art-lines/Makefile.am
@@ -1,11 +1,5 @@
-SUBDIRS = g-i \
+SUBDIRS = desktop-base \
+ g-i \
gnome-shell \
- kde \
- kdm-theme \
- ksplash-theme \
- ksplash-bg_1280x1024 \
- ksplash-bg_1920x1080 \
- ksplash-bg_1920x1200 \
- ksplash-bg_2560x1080 \
ldm \
- splash
+ plymouth
diff --git a/art-lines/desktop-base/20-desktop-base-edu.js b/art-lines/desktop-base/20-desktop-base-edu.js
new file mode 100644
index 0000000..e84e917
--- /dev/null
+++ b/art-lines/desktop-base/20-desktop-base-edu.js
@@ -0,0 +1,13 @@
+// Placed in /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
+//
+// This script is run once for each user and it sets the default wallpaper
+// for all activities
+
+d = desktops()
+
+for (i in d) {
+ d[i].wallpaperPlugin = 'org.kde.image'
+ d[i].currentConfigGroup = Array('Wallpaper', 'org.kde.image', 'General')
+ d[i].writeConfig('Image', 'Debian-Edu-Lines')
+ d[i].writeConfig('FillMode', '2') //enables croping
+}
diff --git a/art-lines/desktop-base/Makefile.am b/art-lines/desktop-base/Makefile.am
new file mode 100644
index 0000000..1b05fdd
--- /dev/null
+++ b/art-lines/desktop-base/Makefile.am
@@ -0,0 +1,91 @@
+THEME = lines
+THEMECONTENT = Lines
+DESKTOPBASEIMG = \
+ debian-edu-$(THEME)-wallpaper_1024x768.svg \
+ debian-edu-$(THEME)-wallpaper_1280x1024.svg \
+ debian-edu-$(THEME)-wallpaper_1600x1200.svg \
+ debian-edu-$(THEME)-wallpaper_1920x1080.svg \
+ debian-edu-$(THEME)-wallpaper_1920x1200.svg \
+ debian-edu-$(THEME)-wallpaper_2560x1080.svg \
+ debian-edu-$(THEME)-login.svg \
+ debian-edu-$(THEME)-grub.png \
+ debian-edu-$(THEME)-grub_1920x1080.png
+
+EDUIMG = \
+ 1024x768.png \
+ 1280x1024.png \
+ 1600x1200.png \
+ 1920x1080.png \
+ 1920x1200.png \
+ 2560x1080.png
+
+desktopbaseimgdir = $(datadir)/images/desktop-base
+desktopbaseimg_DATA = $(DESKTOPBASEIMG) debian-edu-$(THEME).xml
+
+kdeplasmadir = $(datadir)/debian-edu-artwork-$(THEME)/kde4/apps/plasma-desktop/init/
+kdeplasma_DATA = 20-desktop-base-edu.js
+
+edudir = $(datadir)/wallpapers/Debian-Edu-$(THEMECONTENT)/
+edu_DATA = metadata.desktop
+
+educontentsdir = $(datadir)/wallpapers/Debian-Edu-$(THEMECONTENT)/contents/
+educontents_DATA = screenshot.png
+
+eduimgdir = $(datadir)/wallpapers/Debian-Edu-$(THEMECONTENT)/contents/images/
+eduimg_DATA = $(EDUIMG)
+
+# Build rules for PNG files using the SVG files in playground/stretch as source.
+1024x768.png: debian-edu-$(THEME)-wallpaper_1024x768.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+1280x1024.png: debian-edu-$(THEME)-wallpaper_1280x1024.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+1600x1200.png: debian-edu-$(THEME)-wallpaper_1600x1200.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+1920x1080.png: debian-edu-$(THEME)-wallpaper_1920x1080.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+1920x1200.png: debian-edu-$(THEME)-wallpaper_1920x1200.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+2560x1080.png: debian-edu-$(THEME)-wallpaper_2560x1080.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+
+debian-edu-$(THEME)-grub.png: debian-edu-$(THEME)-grub.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+
+debian-edu-$(THEME)-grub_1920x1080.png: debian-edu-$(THEME)-grub_1920x1080.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+
+screenshot.png: debian-edu-$(THEME)-wallpaper_1920x1200.svg
+ inkscape -z -e $@ $^
+ convert $@ -resize 400x +set date:create +set date:modify $@
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(desktopbaseimgdir)
+ $(mkinstalldirs) $(DESTDIR)$(edudir)
+ $(mkinstalldirs) $(DESTDIR)$(educontentsdir)
+ $(mkinstalldirs) $(DESTDIR)$(eduimgdir)
+ $(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
+
+EXTRA_DIST = $(desktopbaseimg_DATA) $(edu_DATA) $(educontents_DATA) $(eduimg_DATA) $(kdeplasma_DATA)
+
+CLEANFILES = 1024x768.png 1280x1024.png 1600x1200.png 1920x1080.png 1920x1200.png 2560x1080.png \
+ debian-edu-$(THEME)-grub.png debian-edu-$(THEME)-grub_1920x1080.png screenshot.png
+
+
diff --git a/art-lines/desktop-base/debian-edu-lines-grub.svg b/art-lines/desktop-base/debian-edu-lines-grub.svg
new file mode 120000
index 0000000..94b75b3
--- /dev/null
+++ b/art-lines/desktop-base/debian-edu-lines-grub.svg
@@ -0,0 +1 @@
+../../playground/jessie/debian-edu-lines-grub.svg
\ No newline at end of file
diff --git a/art-lines/desktop-base/debian-edu-lines-grub_1920x1080.svg b/art-lines/desktop-base/debian-edu-lines-grub_1920x1080.svg
new file mode 120000
index 0000000..729d9ad
--- /dev/null
+++ b/art-lines/desktop-base/debian-edu-lines-grub_1920x1080.svg
@@ -0,0 +1 @@
+../../playground/jessie/debian-edu-lines-grub_1920x1080.svg
\ No newline at end of file
diff --git a/art-lines/desktop-base/debian-edu-lines-login.svg b/art-lines/desktop-base/debian-edu-lines-login.svg
new file mode 120000
index 0000000..08850cf
--- /dev/null
+++ b/art-lines/desktop-base/debian-edu-lines-login.svg
@@ -0,0 +1 @@
+../../playground/jessie/debian-edu-lines-login.svg
\ No newline at end of file
diff --git a/art-lines/kde/debian-edu-lines-wallpaper.svg.desktop b/art-lines/desktop-base/debian-edu-lines-wallpaper.svg.desktop
similarity index 100%
rename from art-lines/kde/debian-edu-lines-wallpaper.svg.desktop
rename to art-lines/desktop-base/debian-edu-lines-wallpaper.svg.desktop
diff --git a/art-lines/desktop-base/debian-edu-lines-wallpaper_1024x768.svg b/art-lines/desktop-base/debian-edu-lines-wallpaper_1024x768.svg
new file mode 120000
index 0000000..bfca8fb
--- /dev/null
+++ b/art-lines/desktop-base/debian-edu-lines-wallpaper_1024x768.svg
@@ -0,0 +1 @@
+../../playground/jessie/debian-edu-lines-wallpaper_1024x768.svg
\ No newline at end of file
diff --git a/art-lines/kde/debian-edu-lines-wallpaper_1280x1024.svg b/art-lines/desktop-base/debian-edu-lines-wallpaper_1280x1024.svg
similarity index 100%
rename from art-lines/kde/debian-edu-lines-wallpaper_1280x1024.svg
rename to art-lines/desktop-base/debian-edu-lines-wallpaper_1280x1024.svg
diff --git a/art-lines/kde/debian-edu-lines-wallpaper_1600x1200.svg b/art-lines/desktop-base/debian-edu-lines-wallpaper_1600x1200.svg
similarity index 100%
rename from art-lines/kde/debian-edu-lines-wallpaper_1600x1200.svg
rename to art-lines/desktop-base/debian-edu-lines-wallpaper_1600x1200.svg
diff --git a/art-lines/kde/debian-edu-lines-wallpaper_1920x1080.svg b/art-lines/desktop-base/debian-edu-lines-wallpaper_1920x1080.svg
similarity index 100%
rename from art-lines/kde/debian-edu-lines-wallpaper_1920x1080.svg
rename to art-lines/desktop-base/debian-edu-lines-wallpaper_1920x1080.svg
diff --git a/art-lines/kde/debian-edu-lines-wallpaper_1920x1200.svg b/art-lines/desktop-base/debian-edu-lines-wallpaper_1920x1200.svg
similarity index 100%
rename from art-lines/kde/debian-edu-lines-wallpaper_1920x1200.svg
rename to art-lines/desktop-base/debian-edu-lines-wallpaper_1920x1200.svg
diff --git a/art-lines/kde/debian-edu-lines-wallpaper_2560x1080.svg b/art-lines/desktop-base/debian-edu-lines-wallpaper_2560x1080.svg
similarity index 100%
rename from art-lines/kde/debian-edu-lines-wallpaper_2560x1080.svg
rename to art-lines/desktop-base/debian-edu-lines-wallpaper_2560x1080.svg
diff --git a/art-lines/kde/debian-edu-lines.xml b/art-lines/desktop-base/debian-edu-lines.xml
similarity index 92%
rename from art-lines/kde/debian-edu-lines.xml
rename to art-lines/desktop-base/debian-edu-lines.xml
index ebd7d78..5bbbd11 100644
--- a/art-lines/kde/debian-edu-lines.xml
+++ b/art-lines/desktop-base/debian-edu-lines.xml
@@ -6,7 +6,7 @@
<size width="1600" height="1200">/usr/share/images/desktop-base/debian-edu-lines-wallpaper_1600x1200.svg</size>
<size width="1920" height="1080">/usr/share/images/desktop-base/debian-edu-lines-wallpaper_1920x1080.svg</size>
<size width="1920" height="1200">/usr/share/images/desktop-base/debian-edu-lines-wallpaper_1920x1200.svg</size>
- <size width="2560" height="1080">/usr/share/images/desktop-base/debian-edu-lines-wallpaper_1920x1200.svg</size>
+ <size width="2560" height="1080">/usr/share/images/desktop-base/debian-edu-lines-wallpaper_2560x1080.svg</size>
</file>
</static>
</background>
diff --git a/art-lines/kde/metadata.desktop b/art-lines/desktop-base/metadata.desktop
similarity index 100%
rename from art-lines/kde/metadata.desktop
rename to art-lines/desktop-base/metadata.desktop
diff --git a/art-lines/g-i/Makefile.am b/art-lines/g-i/Makefile.am
index 87ae596..cb2b0cf 100644
--- a/art-lines/g-i/Makefile.am
+++ b/art-lines/g-i/Makefile.am
@@ -1,16 +1,17 @@
+THEME = lines
logodir = $(datadir)/pixmaps
-logo_DATA = debian-edu-lines-installer-logo.png
+logo_DATA = debian-edu-$(THEME)-installer-logo.png
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(logodir)
# Build rule for the PNG using the SVG as the source
-debian-edu-lines-installer-logo.png: debian-edu-lines-installer-logo.svg
+debian-edu-$(THEME)-installer-logo.png: debian-edu-$(THEME)-installer-logo.svg
inkscape -z -e $@ $^
optipng -o4 -i0 -fix $@
advpng -z4 $@
EXTRA_DIST = README $(logo_DATA)
-CLEANFILES = debian-edu-lines-installer-logo.png
+CLEANFILES = debian-edu-$(THEME)-installer-logo.png
diff --git a/art-lines/g-i/debian-edu-lines-installer-logo.info b/art-lines/g-i/debian-edu-lines-installer-logo.info
index ea5f218..4fdd709 100644
--- a/art-lines/g-i/debian-edu-lines-installer-logo.info
+++ b/art-lines/g-i/debian-edu-lines-installer-logo.info
@@ -1,4 +1,6 @@
-The debian-edu-lines-installer-logo.png was created by
+The debian-edu-lines-installer-logo.svg was created by
Wolfgang Schweer <wschweer at arcor.de> based upon the Jessie 'lines' theme
-by Juliette Taka Belin.
+by Juliette Taka Belin <juliette.belin at free.fr> and the Debian Edu
+logo by Christoph Muetze <gizmo at pixelz.de>.
+
It has been released under version 2 of the GPL or any later version.
diff --git a/art-lines/gnome-shell/Makefile.am b/art-lines/gnome-shell/Makefile.am
index 8b6bee4..97ee055 100644
--- a/art-lines/gnome-shell/Makefile.am
+++ b/art-lines/gnome-shell/Makefile.am
@@ -1,5 +1,6 @@
+THEME = lines
gnomedir = $(datadir)/gnome-shell/theme
-gnome_DATA = debian-edu-lines-gdm.svg debian-edu-lines-gnome-shell.css
+gnome_DATA = debian-edu-$(THEME)-gdm.svg debian-edu-$(THEME)-gnome-shell.css
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(gnomedir)
diff --git a/art-lines/kde/20-desktop-base-edu.js b/art-lines/kde/20-desktop-base-edu.js
deleted file mode 100644
index 8489093..0000000
--- a/art-lines/kde/20-desktop-base-edu.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Placed in /usr/share/kde4/apps/plasma-desktop/init/
-// This script is run for new users, which do not have a .kde directory
-// and it set's the default wallpaper for all activities
-
-a = activities()
-
-for (i in a) {
- a[i].wallpaperPlugin = 'image'
- a[i].wallpaperMode = 'SingleImage'
- a[i].currentConfigGroup = Array('Wallpaper', 'image')
- a[i].writeConfig('wallpaper', 'Debian-Edu-Lines')
- a[i].writeConfig('wallpaperposition', '2')
-}
diff --git a/art-lines/kde/Makefile.am b/art-lines/kde/Makefile.am
deleted file mode 100644
index f0eae59..0000000
--- a/art-lines/kde/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-KDEIMG = debian-edu-lines-wallpaper_1280x1024.svg \
- debian-edu-lines-wallpaper_1600x1200.svg \
- debian-edu-lines-wallpaper_1920x1080.svg \
- debian-edu-lines-wallpaper_1920x1200.svg \
- debian-edu-lines-wallpaper_2560x1080.svg \
- debian-edu-lines-login+grub.svg
-
-EDUIMG = \
- 1280x1024.png \
- 1600x1200.png \
- 1920x1080.png \
- 1920x1200.png \
- 2560x1080.png
-
-kdeimgdir = $(datadir)/images/desktop-base
-kdeimg_DATA = $(KDEIMG) debian-edu-lines.xml
-
-kdeplasmadir = $(datadir)/debian-edu-artwork-lines/kde4/apps/plasma-desktop/init/
-kdeplasma_DATA = 20-desktop-base-edu.js
-
-edudir = $(datadir)/wallpapers/Debian-Edu-Lines/
-edu_DATA = metadata.desktop
-
-educontentsdir = $(datadir)/wallpapers/Debian-Edu-Lines/contents/
-educontents_DATA = screenshot.png
-
-eduimgdir = $(datadir)/wallpapers/Debian-Edu-Lines/contents/images/
-eduimg_DATA = $(EDUIMG)
-
-# Build rules for PNG files using the SVG files in playground/jessie as source.
-1280x1024.png: debian-edu-lines-wallpaper_1280x1024.svg
- inkscape -z -e $@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-1600x1200.png: debian-edu-lines-wallpaper_1600x1200.svg
- inkscape -z -e $@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-1920x1080.png: debian-edu-lines-wallpaper_1920x1080.svg
- inkscape -z -e $@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-1920x1200.png: debian-edu-lines-wallpaper_1920x1200.svg
- inkscape -z -e $@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-2560x1080.png: debian-edu-lines-wallpaper_2560x1080.svg
- inkscape -z -e $@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-screenshot.png: debian-edu-lines-wallpaper_1920x1200.svg
- inkscape -z -e $@ $^
- convert $@ -resize 400x +set date:create +set date:modify $@
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
- $(mkinstalldirs) $(DESTDIR)$(edudir)
- $(mkinstalldirs) $(DESTDIR)$(educontentsdir)
- $(mkinstalldirs) $(DESTDIR)$(eduimgdir)
- $(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
-
-EXTRA_DIST = $(kdeimg_DATA) $(edu_DATA) $(educontents_DATA) $(eduimg_DATA) $(kdeplasma_DATA)
-
-CLEANFILES = 1280x1024.png 1600x1200.png 1920x1080.png 1920x1200.png 2560x1080.png screenshot.png
diff --git a/art-lines/kde/debian-edu-lines-login+grub.svg b/art-lines/kde/debian-edu-lines-login+grub.svg
deleted file mode 120000
index dc9ec1c..0000000
--- a/art-lines/kde/debian-edu-lines-login+grub.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../playground/jessie/debian-edu-lines-login_1600x1200+grub.svg
\ No newline at end of file
diff --git a/art-lines/kdm-theme/KdmGreeterTheme.desktop b/art-lines/kdm-theme/KdmGreeterTheme.desktop
deleted file mode 100644
index 924b1ea..0000000
--- a/art-lines/kdm-theme/KdmGreeterTheme.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://docs.kde.org/stable/en/kdebase-workspace/kdm/kdm-themes.html
-# for information about the KDM theme format.
-
-[KdmGreeterTheme]
-Greeter=debian-edu-lines.xml
-Name=Debian Edu Lines
-Description=KDM theme for Debian Edu (Lines), based on Debian Jessie lines theme.
-Author=Wolfgang Schweer
-Copyright=(c) 2014, Wolfgang Schweer, wschweer at arcor.de
-Screenshot=screenshot.png
diff --git a/art-lines/kdm-theme/Makefile.am b/art-lines/kdm-theme/Makefile.am
deleted file mode 100644
index db05e67..0000000
--- a/art-lines/kdm-theme/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-KDMTHEME = debian-edu-lines.xml \
- background.svg \
- KdmGreeterTheme.desktop \
- lineedit_active.png \
- lineedit_normal.png \
- lock.png \
- rectangle.png \
- screenshot.png \
- session_normal.png \
- system_normal.png \
- user_icon.png
-
-kdmthemedir = $(datadir)/kde4/apps/kdm/themes/debian-edu-lines
-kdmtheme_DATA = $(KDMTHEME)
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(kdmthemedir)
-
-EXTRA_DIST = $(kdmtheme_DATA)
diff --git a/art-lines/kdm-theme/README b/art-lines/kdm-theme/README
deleted file mode 100644
index c633026..0000000
--- a/art-lines/kdm-theme/README
+++ /dev/null
@@ -1,21 +0,0 @@
-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 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).
-
-Wheezy version (based on joy theme) by Wolfgang Schweer (GPLv2+, 2013).
-background.svg is a copy of debian-edu-wallpaper02_1600x1200.svg by
-Christoph Muetze.
-
-Jessie version (based on lines theme) by Wolfgang Schweer (GPLv2+, 2014).
-
-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-lines/kdm-theme/background.svg b/art-lines/kdm-theme/background.svg
deleted file mode 120000
index dc9ec1c..0000000
--- a/art-lines/kdm-theme/background.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../playground/jessie/debian-edu-lines-login_1600x1200+grub.svg
\ No newline at end of file
diff --git a/art-lines/kdm-theme/debian-edu-lines.xml b/art-lines/kdm-theme/debian-edu-lines.xml
deleted file mode 100644
index 251d62b..0000000
--- a/art-lines/kdm-theme/debian-edu-lines.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE greeter SYSTEM "greeter.dtd">
-
-<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-lines/kdm-theme/gpl.txt b/art-lines/kdm-theme/gpl.txt
deleted file mode 100644
index b6f92f3..0000000
--- a/art-lines/kdm-theme/gpl.txt
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/art-lines/kdm-theme/lineedit_active.png b/art-lines/kdm-theme/lineedit_active.png
deleted file mode 100644
index 0192ee6..0000000
Binary files a/art-lines/kdm-theme/lineedit_active.png and /dev/null differ
diff --git a/art-lines/kdm-theme/lineedit_normal.png b/art-lines/kdm-theme/lineedit_normal.png
deleted file mode 100644
index a5138e9..0000000
Binary files a/art-lines/kdm-theme/lineedit_normal.png and /dev/null differ
diff --git a/art-lines/kdm-theme/lock.png b/art-lines/kdm-theme/lock.png
deleted file mode 100644
index 21864d0..0000000
Binary files a/art-lines/kdm-theme/lock.png and /dev/null differ
diff --git a/art-lines/kdm-theme/rectangle.png b/art-lines/kdm-theme/rectangle.png
deleted file mode 100644
index b9a13b1..0000000
Binary files a/art-lines/kdm-theme/rectangle.png and /dev/null differ
diff --git a/art-lines/kdm-theme/screenshot.png b/art-lines/kdm-theme/screenshot.png
deleted file mode 100644
index 303c6cb..0000000
Binary files a/art-lines/kdm-theme/screenshot.png and /dev/null differ
diff --git a/art-lines/kdm-theme/session_normal.png b/art-lines/kdm-theme/session_normal.png
deleted file mode 100644
index a970bf1..0000000
Binary files a/art-lines/kdm-theme/session_normal.png and /dev/null differ
diff --git a/art-lines/kdm-theme/system_normal.png b/art-lines/kdm-theme/system_normal.png
deleted file mode 100644
index 5769fdb..0000000
Binary files a/art-lines/kdm-theme/system_normal.png and /dev/null differ
diff --git a/art-lines/kdm-theme/user_icon.png b/art-lines/kdm-theme/user_icon.png
deleted file mode 100644
index 84e9139..0000000
Binary files a/art-lines/kdm-theme/user_icon.png and /dev/null differ
diff --git a/art-lines/ksplash-bg_1280x1024/Makefile.am b/art-lines/ksplash-bg_1280x1024/Makefile.am
deleted file mode 100644
index 47c5cf9..0000000
--- a/art-lines/ksplash-bg_1280x1024/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-KSPLASHTHEME = background.png
-
-ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu-Lines/1280x1024
-ksplashtheme_DATA = $(KSPLASHTHEME)
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
-
-# Build rule for the PNG using the SVG as the source
-background.png: background.svg
- inkscape -z -e $@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-EXTRA_DIST = $(ksplashtheme_DATA)
-
-CLEANFILES = background.png
-
diff --git a/art-lines/ksplash-bg_1280x1024/background.svg b/art-lines/ksplash-bg_1280x1024/background.svg
deleted file mode 120000
index e6dab72..0000000
--- a/art-lines/ksplash-bg_1280x1024/background.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../playground/jessie/debian-edu-lines-login_1280x1024.svg
\ No newline at end of file
diff --git a/art-lines/ksplash-bg_1920x1080/Makefile.am b/art-lines/ksplash-bg_1920x1080/Makefile.am
deleted file mode 100644
index c30db6e..0000000
--- a/art-lines/ksplash-bg_1920x1080/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-KSPLASHTHEME = background.png
-
-ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu-Lines/1920x1080
-ksplashtheme_DATA = $(KSPLASHTHEME)
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
-
-# Build rule for the PNG using the SVG as the source
-background.png: background.svg
- inkscape -z -e $@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-EXTRA_DIST = $(ksplashtheme_DATA)
-
-CLEANFILES = background.png
diff --git a/art-lines/ksplash-bg_1920x1080/background.svg b/art-lines/ksplash-bg_1920x1080/background.svg
deleted file mode 120000
index a8ae278..0000000
--- a/art-lines/ksplash-bg_1920x1080/background.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../playground/jessie/debian-edu-lines-login_1920x1080.svg
\ No newline at end of file
diff --git a/art-lines/ksplash-bg_1920x1200/Makefile.am b/art-lines/ksplash-bg_1920x1200/Makefile.am
deleted file mode 100644
index dd6cac4..0000000
--- a/art-lines/ksplash-bg_1920x1200/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-KSPLASHTHEME = background.png
-
-ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu-Lines/1920x1200
-ksplashtheme_DATA = $(KSPLASHTHEME)
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
-
-# Build rule for the PNG using the SVG as the source
-background.png: background.svg
- inkscape -z -e $@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-EXTRA_DIST = $(ksplashtheme_DATA)
-
-CLEANFILES = background.png
diff --git a/art-lines/ksplash-bg_1920x1200/background.svg b/art-lines/ksplash-bg_1920x1200/background.svg
deleted file mode 120000
index 1fdd2be..0000000
--- a/art-lines/ksplash-bg_1920x1200/background.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../playground/jessie/debian-edu-lines-login_1920x1200.svg
\ No newline at end of file
diff --git a/art-lines/ksplash-bg_2560x1080/Makefile.am b/art-lines/ksplash-bg_2560x1080/Makefile.am
deleted file mode 100644
index 055d28e..0000000
--- a/art-lines/ksplash-bg_2560x1080/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-KSPLASHTHEME = background.png
-
-ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu-Lines/2560x1080
-ksplashtheme_DATA = $(KSPLASHTHEME)
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
-
-# Build rule for the PNG using the SVG as the source
-background.png: background.svg
- inkscape -z -e $@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-EXTRA_DIST = $(ksplashtheme_DATA)
-
-CLEANFILES = background.png
diff --git a/art-lines/ksplash-bg_2560x1080/background.svg b/art-lines/ksplash-bg_2560x1080/background.svg
deleted file mode 120000
index 41e5a39..0000000
--- a/art-lines/ksplash-bg_2560x1080/background.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../playground/jessie/debian-edu-lines-login_2560x1080.svg
\ No newline at end of file
diff --git a/art-lines/ksplash-theme/Makefile.am b/art-lines/ksplash-theme/Makefile.am
deleted file mode 100644
index e9ac14c..0000000
--- a/art-lines/ksplash-theme/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-KSPLASHTHEME = description.txt \
- background.png \
- rectangle.png \
- icon1_anim.png \
- icon2_anim.png \
- icon3_anim.png \
- icon4_anim.png \
- icon5_anim.png \
- icon1.png \
- icon2.png \
- icon3.png \
- icon4.png \
- icon5.png
-
-ksplashthemedir = $(datadir)/kde4/apps/ksplash/Themes/Debian-Edu-Lines/1600x1200
-ksplashtheme_DATA = $(KSPLASHTHEME)
-
-kdedefaultdir = /usr/share/debian-edu-artwork-lines/kde-profile/share/config
-kdedefault_DATA = ksplashrc
-
-# Build rule for the PNG using the SVG as the source
-background.png: background.svg
- inkscape -z -e $@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(ksplashthemedir)
- $(INSTALL_DATA) Preview.png Theme.rc $(DESTDIR)$(ksplashthemedir)/..
- $(mkinstalldirs) $(DESTDIR)$(kdedefaultdir)
-
-EXTRA_DIST = $(ksplashtheme_DATA) $(kdedefault_DATA)
-
-CLEANFILES = background.png
diff --git a/art-lines/ksplash-theme/Preview.png b/art-lines/ksplash-theme/Preview.png
deleted file mode 100644
index dc33754..0000000
Binary files a/art-lines/ksplash-theme/Preview.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/README b/art-lines/ksplash-theme/README
deleted file mode 100644
index 910f432..0000000
--- a/art-lines/ksplash-theme/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This ksplash theme was created by Wolfgang Schweer <wschweer at arcor.de>
-based on the default KDE lines theme.
-
-Basically, only the background images were exchanged by the Debian Edu ones.
-
diff --git a/art-lines/ksplash-theme/Theme.rc b/art-lines/ksplash-theme/Theme.rc
deleted file mode 100644
index 56986c6..0000000
--- a/art-lines/ksplash-theme/Theme.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-[KSplash Theme: Debian-Edu-Lines]
-Name = KDE Debian Edu (Lines) Splash Screen
-Description = KDE Debian Edu Splash Screen based upon the lines theme
-Version = 1.0
-Author = Wolfgang Schweer <wschweer at arcor.de>, based upon the work of the line theme author.
-
-# Theme behaviour settings.
-Engine = KSplashX
diff --git a/art-lines/ksplash-theme/background.svg b/art-lines/ksplash-theme/background.svg
deleted file mode 120000
index dc9ec1c..0000000
--- a/art-lines/ksplash-theme/background.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../playground/jessie/debian-edu-lines-login_1600x1200+grub.svg
\ No newline at end of file
diff --git a/art-lines/ksplash-theme/description.txt b/art-lines/ksplash-theme/description.txt
deleted file mode 100644
index b194616..0000000
--- a/art-lines/ksplash-theme/description.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-SCALE ON
-BACKGROUND_IMAGE 0 0 background.png
-SCALE OFF
-
-# the rectangle image is 390x234, make it centered,
-# all icons need the same adjustment too
-IMAGE_REL CC 0 0 CC rectangle.png
-
-# these have their relative positions to the rectangle adjusted by -195,-117
-# (i.e. half of the rectangle size)
-# 3,32
-ANIM_REL 1 CC -192 -50 LT 30 icon1_anim.png 85 1
-WAIT_STATE kded
-
-# 69,32
-ANIM_REL 2 CC -126 -50 LT 30 icon2_anim.png 85 1
-WAIT_STATE kcminit
-
-# 135,32
-ANIM_REL 3 CC -60 -50 LT 29 icon3_anim.png 85 1
-WAIT_STATE ksmserver
-
-# 201,32
-ANIM_REL 4 CC 6 -50 LT 30 icon4_anim.png 85 1
-WAIT_STATE wm
-
-# 263,15
-ANIM_REL 5 CC 68 -88 LT 30 icon5_anim.png 85 1
-WAIT_STATE desktop
-
-WAIT_STATE ready
-
-# show the icons fully right before the splash goes away
-STOP_ANIM 1
-IMAGE_REL CC -192 -50 LT icon1.png
-STOP_ANIM 2
-IMAGE_REL CC -126 -50 LT icon2.png
-STOP_ANIM 3
-IMAGE_REL CC -60 -50 LT icon3.png
-STOP_ANIM 4
-IMAGE_REL CC 6 -50 LT icon4.png
-STOP_ANIM 5
-IMAGE_REL CC 68 -88 LT icon5.png
diff --git a/art-lines/ksplash-theme/icon1.png b/art-lines/ksplash-theme/icon1.png
deleted file mode 100644
index 93daa84..0000000
Binary files a/art-lines/ksplash-theme/icon1.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/icon1_anim.png b/art-lines/ksplash-theme/icon1_anim.png
deleted file mode 100644
index 3b065f5..0000000
Binary files a/art-lines/ksplash-theme/icon1_anim.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/icon2.png b/art-lines/ksplash-theme/icon2.png
deleted file mode 100644
index 2078ad1..0000000
Binary files a/art-lines/ksplash-theme/icon2.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/icon2_anim.png b/art-lines/ksplash-theme/icon2_anim.png
deleted file mode 100644
index 36f1afc..0000000
Binary files a/art-lines/ksplash-theme/icon2_anim.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/icon3.png b/art-lines/ksplash-theme/icon3.png
deleted file mode 100644
index 48b2ffe..0000000
Binary files a/art-lines/ksplash-theme/icon3.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/icon3_anim.png b/art-lines/ksplash-theme/icon3_anim.png
deleted file mode 100644
index 8b36220..0000000
Binary files a/art-lines/ksplash-theme/icon3_anim.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/icon4.png b/art-lines/ksplash-theme/icon4.png
deleted file mode 100644
index 15699e2..0000000
Binary files a/art-lines/ksplash-theme/icon4.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/icon4_anim.png b/art-lines/ksplash-theme/icon4_anim.png
deleted file mode 100644
index 9309db5..0000000
Binary files a/art-lines/ksplash-theme/icon4_anim.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/icon5.png b/art-lines/ksplash-theme/icon5.png
deleted file mode 100644
index 4540cb3..0000000
Binary files a/art-lines/ksplash-theme/icon5.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/icon5_anim.png b/art-lines/ksplash-theme/icon5_anim.png
deleted file mode 100644
index de690c1..0000000
Binary files a/art-lines/ksplash-theme/icon5_anim.png and /dev/null differ
diff --git a/art-lines/ksplash-theme/ksplashrc b/art-lines/ksplash-theme/ksplashrc
deleted file mode 100644
index 239fbd7..0000000
--- a/art-lines/ksplash-theme/ksplashrc
+++ /dev/null
@@ -1,3 +0,0 @@
-[KSplash]
-Engine=KSplashX
-Theme=Debian-Edu-Lines
diff --git a/art-lines/ksplash-theme/rectangle.png b/art-lines/ksplash-theme/rectangle.png
deleted file mode 100644
index b9a13b1..0000000
Binary files a/art-lines/ksplash-theme/rectangle.png and /dev/null differ
diff --git a/art-lines/ldm/Makefile.am b/art-lines/ldm/Makefile.am
index fcf650b..3b0a635 100644
--- a/art-lines/ldm/Makefile.am
+++ b/art-lines/ldm/Makefile.am
@@ -1,6 +1,13 @@
-ldmdir = $(datadir)/ldm/themes/debian-edu-lines
+THEME = lines
+ldmdir = $(datadir)/ldm/themes/debian-edu-$(THEME)
ldm_DATA = logo.png greeter-gtkrc bg.png preview.png
+# Build rule for the PNG using the SVG as the source
+bg.png: bg.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(ldmdir)
diff --git a/art-lines/ldm/bg.png b/art-lines/ldm/bg.png
deleted file mode 120000
index 64111fe..0000000
--- a/art-lines/ldm/bg.png
+++ /dev/null
@@ -1 +0,0 @@
-../ksplash-theme/background.png
\ No newline at end of file
diff --git a/art-lines/ldm/bg.png b/art-lines/ldm/bg.png
new file mode 100644
index 0000000..93fff75
Binary files /dev/null and b/art-lines/ldm/bg.png differ
diff --git a/art-lines/ldm/bg.svg b/art-lines/ldm/bg.svg
new file mode 120000
index 0000000..94b75b3
--- /dev/null
+++ b/art-lines/ldm/bg.svg
@@ -0,0 +1 @@
+../../playground/jessie/debian-edu-lines-grub.svg
\ No newline at end of file
diff --git a/art-lines/plymouth/Makefile.am b/art-lines/plymouth/Makefile.am
new file mode 100644
index 0000000..dfa2b71
--- /dev/null
+++ b/art-lines/plymouth/Makefile.am
@@ -0,0 +1,28 @@
+THEME = lines
+plymouthdir = $(datadir)/plymouth/themes/debian-edu-$(THEME)
+plymouth_DATA = \
+ background.png \
+ debian-edu-logo.png \
+ password_dot16.png \
+ password_dot.png \
+ password_field16.png \
+ password_field.png \
+ debian-edu-$(THEME).plymouth \
+ debian-edu-$(THEME).script
+
+background.png: debian-edu-$(THEME)-plymouth.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+
+debian-edu-logo.png: debian-edu-$(THEME)-logo.svg
+ inkscape -z -e $@ $^
+ optipng -o4 -i0 -fix $@
+ advpng -z4 $@
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(plymouthdir)
+
+EXTRA_DIST = $(plymouth_DATA)
+
+CLEANFILES = background.png debian-edu-logo.png
diff --git a/art-lines/plymouth/debian-edu-lines-logo.svg b/art-lines/plymouth/debian-edu-lines-logo.svg
new file mode 120000
index 0000000..2f87252
--- /dev/null
+++ b/art-lines/plymouth/debian-edu-lines-logo.svg
@@ -0,0 +1 @@
+../../playground/jessie/debian-edu-lines-logo.svg
\ No newline at end of file
diff --git a/art-lines/plymouth/debian-edu-lines-plymouth.svg b/art-lines/plymouth/debian-edu-lines-plymouth.svg
new file mode 120000
index 0000000..da4b614
--- /dev/null
+++ b/art-lines/plymouth/debian-edu-lines-plymouth.svg
@@ -0,0 +1 @@
+../../playground/jessie/debian-edu-lines-plymouth.svg
\ No newline at end of file
diff --git a/art-lines/plymouth/debian-edu-lines.plymouth b/art-lines/plymouth/debian-edu-lines.plymouth
new file mode 100644
index 0000000..16707b3
--- /dev/null
+++ b/art-lines/plymouth/debian-edu-lines.plymouth
@@ -0,0 +1,8 @@
+[Plymouth Theme]
+Name=Default theme for Debian Edu 8.0 Jessie
+Description=A theme that features a white debian logo and the Debian Edu logo on a blue-green background surrounded by thin curves
+ModuleName=script
+
+[script]
+ImageDir=/usr/share/plymouth/themes/debian-edu-lines
+ScriptFile=/usr/share/plymouth/themes/debian-edu-lines/debian-edu-lines.script
diff --git a/art-lines/plymouth/debian-edu-lines.script b/art-lines/plymouth/debian-edu-lines.script
new file mode 100644
index 0000000..8f69093
--- /dev/null
+++ b/art-lines/plymouth/debian-edu-lines.script
@@ -0,0 +1,1111 @@
+# ubuntu-logo.script - boot splash plugin
+#
+# Copyright (C) 2009 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+# Written by: Alberto Milone <alberto.milone at canonical.com>
+#
+# Based on the example provided with the "script plugin" written by:
+# Charlie Brej <cbrej at cs.man.ac.uk>
+#
+# Lines theme scripting by Juliette Taka BELIN and Aurélien COUDERC
+
+
+#------------------------------- Constants -----------------------------------------
+ELECTRONS_DISPLAYED = 3;
+SECS_BETWEEN_ANIMS = 2.5;
+
+#------------------------------- Globals -------------------------------------------
+anim_iter = 0;
+anim_status = "stopped";
+
+bg_image = Image("background.png");
+
+#------------------------------- Background ----------------------------------------
+# Compute screen/image ratio and scale the background accordingly
+window_max_width = Window.GetX() * 2 + Window.GetWidth();
+window_max_height = Window.GetY() * 2 + Window.GetHeight();
+screen_ratio = window_max_width / window_max_height;
+bg_image_ratio = bg_image.GetWidth() / bg_image.GetHeight();
+if (screen_ratio > bg_image_ratio)
+ bg_scale_factor = window_max_width / bg_image.GetWidth();
+else
+ bg_scale_factor = window_max_height / bg_image.GetHeight();
+scaled_bg_image = bg_image.Scale(bg_image.GetWidth() * bg_scale_factor,
+ bg_image.GetHeight() * bg_scale_factor);
+
+# Display background
+bg_sprite = Sprite(scaled_bg_image);
+bg_sprite.SetPosition(Window.GetX() + Window.GetWidth() / 2 - scaled_bg_image.GetWidth() / 2,
+ Window.GetY() + Window.GetHeight() / 2 - scaled_bg_image.GetHeight() / 2,
+ -10000);
+
+#------------------------------- Logo ----------------------------------------------
+logo_image = Image("logo.png");
+logo_height = Math.Min(Window.GetWidth(), Window.GetHeight()) * 0.7;
+logo_scale_factor = logo_height / logo_image.GetHeight();
+logo_image = logo_image.Scale(logo_image.GetWidth() * logo_scale_factor,
+ logo_image.GetHeight() * logo_scale_factor);
+logo_sprite = Sprite(logo_image);
+logo_to_top_edge = Window.GetHeight() * 0;
+logo_right_shift = logo_image.GetWidth() * 0.092;
+logo_sprite.SetPosition(Window.GetX() + Window.GetWidth() / 2 - logo_image.GetWidth() / 2 + logo_right_shift,
+ Window.GetY() + logo_to_top_edge,
+ -100);
+
+#------------------------------- Debian8 ----------------------------------------------
+debian8_image = Image("debian-edu-logo.png");
+debian8_width = logo_image.GetWidth();
+debian8_scale_factor = debian8_width / debian8_image.GetWidth() * 0.24;
+if (debian8_scale_factor < 1) {
+ debian8_image = debian8_image.Scale(debian8_image.GetWidth() * debian8_scale_factor,
+ debian8_image.GetHeight() * debian8_scale_factor);
+}
+debian8_sprite = Sprite(debian8_image);
+debian8_to_bottom_edge = Window.GetHeight() * 0.10;
+debian8_sprite.SetPosition(Window.GetX() + Window.GetWidth() / 2 - debian8_image.GetWidth() / 2,
+ Window.GetY() + Window.GetHeight() - debian8_to_bottom_edge - debian8_image.GetHeight(),
+ -90);
+#------------------------------- Electrons --------------------------------------------
+
+electron_image = Image("electron.png");
+electron_image = electron_image.Scale(
+ electron_image.GetWidth() * 0.06 * logo_scale_factor,
+ electron_image.GetHeight() * 0.06 * logo_scale_factor);
+
+
+#main center coords
+ellipses[0].x = logo_sprite.GetX() + logo_image.GetWidth() * 0.4245;
+ellipses[0].y = logo_sprite.GetY() + logo_image.GetHeight() * 0.611;
+#main small / large axis
+ellipses[0].height = logo_image.GetHeight() * 0.3303;
+ellipses[0].width = logo_image.GetWidth() * 0.295;
+#main animation parameters
+ellipses[0].anim.start_iter = 0;
+ellipses[0].anim.stop_iter = 150;
+ellipses[0].anim.start_angle = Math.Pi;
+ellipses[0].anim.arc = 2*Math.Pi;
+ellipses[0].anim.rotat_dir = -1;
+
+#left center coords
+ellipses[1].x = logo_sprite.GetX() + logo_image.GetWidth() * 0.3825;
+ellipses[1].y = logo_sprite.GetY() + logo_image.GetHeight() * 0.411;
+#left small / large axis
+ellipses[1].height = logo_image.GetHeight() * 0.1645;
+ellipses[1].width = logo_image.GetWidth() * 0.2248;
+#left animation parameters
+ellipses[1].anim.start_iter = 50;
+ellipses[1].anim.stop_iter = 130;
+ellipses[1].anim.start_angle = 0;
+ellipses[1].anim.arc = 2*Math.Pi;
+ellipses[1].anim.rotat_dir = 1;
+
+#right center coords
+ellipses[2].x = logo_sprite.GetX() + logo_image.GetWidth() * 0.7065;
+ellipses[2].y = logo_sprite.GetY() + logo_image.GetHeight() * 0.460;
+#right small / large axis
+ellipses[2].height = logo_image.GetHeight() * 0.2343;
+ellipses[2].width = logo_image.GetWidth() * 0.2945;
+#right animation parameters
+ellipses[2].anim.start_iter = 20;
+ellipses[2].anim.stop_iter = 100;
+ellipses[2].anim.start_angle = 0;
+ellipses[2].anim.arc = 2*Math.Pi;
+ellipses[2].anim.rotat_dir = 1;
+
+# Define 5 sprites for each electron to create gradient along the ellipses
+for (i = 0; i < ELECTRONS_DISPLAYED; i++) {
+ anim = ellipses[i].anim;
+ anim.angle_incr = anim.arc / (anim.stop_iter - anim.start_iter) * anim.rotat_dir;
+ for (j = 0; j < 5; j++) {
+ electron_sprite[i][j] = Sprite(electron_image);
+ electron_sprite[i][j].base_opacity = 1-(0.2*j);
+ electron_sprite[i][j].angle_diff = -(anim.rotat_dir*j*0.01);
+ }
+}
+
+
+# Set the text colour in (rgb / 256)
+text_colour.red = 1.0;
+text_colour.green = 1.0;
+text_colour.blue = 1.0;
+
+# Tinted text #988592
+tinted_text_colour.red = 1.0;
+tinted_text_colour.green = 1.0;
+tinted_text_colour.blue = 1.0;
+
+# Action Text - #ffffff - RGB 255 255 255
+action_text_colour.red = 1.0;
+action_text_colour.green = 1.0;
+action_text_colour.blue = 1.0;
+
+# Orange - #ff4012 - RGB 255 64 18
+debugsprite = Sprite();
+debugsprite_bottom = Sprite();
+debugsprite_medium = Sprite();
+
+# are we currently prompting for a password?
+prompt_active = 0;
+
+# General purpose function to create text
+fun WriteText (text, colour) {
+ image = Image.Text (text, colour.red, colour.green, colour.blue);
+ return image;
+}
+
+fun ImageToText (text) {
+ image = WriteText (text, text_colour);
+ return image;
+}
+
+fun ImageToTintedText (text) {
+ image = WriteText (text, tinted_text_colour);
+ return image;
+}
+
+fun ImageToActionText (text) {
+ image = WriteText (text, action_text_colour);
+ return image;
+}
+
+fun Debug(text) {
+ debugsprite.SetImage(ImageToText (text));
+}
+
+fun DebugBottom(text) {
+ debugsprite_bottom.SetImage(ImageToText (text));
+ debugsprite_bottom.SetPosition(0, (Window.GetHeight (0) - 20), 1);
+}
+
+fun DebugMedium(text) {
+ debugsprite_medium.SetImage(ImageToText (text));
+ debugsprite_medium.SetPosition(0, (Window.GetHeight (0) - 100), 1);
+}
+
+fun TextYOffset() {
+ local.y;
+ local.text_height;
+ local.min_height;
+
+ # Put the 1st line below the logo + some spacing
+ y = logo_sprite.GetY() + logo_image.GetHeight();
+ #Debug("y = " + y);
+
+ text_height = first_line_height * 7.5;
+
+ min_height = Window.GetHeight();
+ if (y + text_height > min_height)
+ y = min_height - text_height;
+
+ return y;
+}
+
+#------------------------------String functions-------------------------------
+
+# This is the equivalent for strstr()
+fun StringString(string, substring) {
+ start = 0;
+ while (String(string).CharAt (start)) {
+ walk = 0;
+ while (String(substring).CharAt (walk) == String(string).CharAt (start + walk) ) {
+ walk++;
+ if (!String(substring).CharAt (walk)) return start;
+ }
+ start++;
+ }
+
+ return NULL;
+}
+
+fun StringLength (string) {
+ index = 0;
+ while (String(string).CharAt(index)) index++;
+ return index;
+}
+
+fun StringCopy (source, beginning, end) {
+ local.destination = "";
+ for (index = beginning; ( ( (end == NULL) || (index <= end) ) && (String(source).CharAt(index)) ); index++) {
+ local.destination += String(source).CharAt(index);
+ }
+
+ return local.destination;
+}
+
+fun StringReplace (source, pattern, replacement) {
+ local.found = StringString(source, pattern);
+ if (local.found == NULL)
+ return source;
+
+ local.new_string = StringCopy (source, 0, local.found - 1) +
+ replacement +
+ StringCopy (source, local.found + StringLength(pattern), NULL);
+
+ return local.new_string;
+}
+
+# it makes sense to use it only for
+# numbers up to 100
+fun StringToInteger (str) {
+ int = -1;
+ for (i=0; i<=100; i++) {
+ if (i+"" == str) {
+ int = i;
+ break;
+ }
+ }
+ return int;
+}
+
+#-----------------------------------------------------------------------------
+# Top background colour
+# #489291 --> 0.282, 0.572, 0.569
+# New background colour
+# #0a3649 --> 0.039, 0.212, 0.286
+#
+Window.SetBackgroundTopColor (0.282, 0.572, 0.569); # Nice colour on top of the screen fading to
+Window.SetBackgroundBottomColor (0.039, 0.212, 0.286); # an equally nice colour on the bottom
+
+bits_per_pixel = Window.GetBitsPerPixel ();
+# TODO need to handle 16 colors ?
+#if (bits_per_pixel == 4) {
+# logo_filename = "debian_logo16.png";
+# progress_dot_off_filename = "progress_dot_off16.png";
+# progress_dot_on_filename = "progress_dot_on16.png";
+# password_dot_filename = "password_dot.png";
+# password_field_filename = "password_field16.png";
+#} else {
+# logo_filename = "debian_logo.png";
+# progress_dot_off_filename = "progress_dot_off.png";
+# progress_dot_on_filename = "progress_dot_on.png";
+ password_dot_filename = "password_dot.png";
+ password_field_filename = "password_field.png";
+#}
+
+message_notification[0].image = ImageToTintedText ("");
+message_notification[1].image = ImageToTintedText ("");
+fsck_notification.image = ImageToActionText ("");
+
+status = "normal";
+
+# use a fixed string with ascending and descending stems to calibrate the
+# bounding box for the first message, so the messages below don't move up
+# and down according to *their* height.
+first_line_height = ImageToTintedText ("AfpqtM").GetHeight();
+
+# if the user has a 640x480 or 800x600 display, we can't quite fit everything
+# (including passphrase prompts) with the target spacing, so scoot the text up
+# a bit if needed.
+top_of_the_text = TextYOffset();
+
+#-----------------------------------------Logo functions------------------------------
+
+# Call this when updating the screen
+fun draw_logo () {
+# logo.sprite.SetX (logo.x);
+# logo.sprite.SetY (logo.y);
+# logo.sprite.SetZ (logo.z);
+# logo.sprite.SetOpacity (1);
+# logo_sprite.SetOpacity (1);
+}
+
+
+#-----------------------------------------Progress Indicator--------------------------
+# Implement in boot progress callback
+fun animate_progress_indicator (time, progress) {
+ # Start electrons animation at launch and every 3 seconds
+ if (global.progress_time == NULL || (time - global.progress_time) >= SECS_BETWEEN_ANIMS) {
+ global.progress_time = time;
+ global.anim_status = "start";
+ }
+
+ # Debug ("global progress time =" + global.progress_time + " global anim status = " + global.anim_status + " progress = " + progress + ", time = " + time);
+
+}
+
+
+#-----------------------------------------Label utility functions---------------------
+
+# label should be either a string or NULL
+# Images for n lines will be created and returned as items of the
+# message_label array
+#
+fun get_message_label (label, is_fake, is_action_line) {
+ # Debug("Get Label position");
+ local.message_label;
+
+ if (is_fake)
+ # Create a fake label so as to get the y coordinate of
+ # a standard-length label.
+ local.message_image = ImageToTintedText ("This is a fake message");
+ else
+ local.message_image = (is_action_line) && ImageToActionText (label) || ImageToTintedText (label);
+
+ message_label.width = message_image.GetWidth ();
+ message_label.height = message_image.GetHeight ();
+
+ # Center the line horizontally
+ message_label.x = Window.GetX () + Window.GetWidth () / 2 - message_label.width / 2;
+
+ message_label.y = top_of_the_text;
+
+ # Put the 2nd line below the fsck line
+ if (is_action_line) {
+ local.fsck_label.y = message_label.y + (first_line_height + first_line_height / 2);
+ message_label.y = local.fsck_label.y + (first_line_height * 2);
+ }
+
+ # Debug("action label x = " + message_label.x + " y = " + message_label.y );
+
+# message_debug = "msg_x = " + message_label.x + " msg_y = " + message_label.y +
+# "msg_width = " + message_label.width + " msg_height = " +
+# message_label.height + " message = " + label;
+# Debug(message_debug);
+
+ return message_label;
+
+}
+
+# Create an fsck label and/or get its position
+fun get_fsck_label (label, is_fake) {
+ # Debug("Get Label position");
+ local.fsck_label = global.progress_label;
+
+ if (is_fake)
+ fsck_label.image = ImageToTintedText ("This is a fake message");
+ else
+ fsck_label.image = ImageToTintedText (label);
+
+ fsck_label.width = fsck_label.image.GetWidth ();
+ fsck_label.height = fsck_label.image.GetHeight ();
+
+ # Centre the label horizontally
+ fsck_label.x = Window.GetX () + Window.GetWidth () / 2 - fsck_label.width / 2;
+
+ local.first_label = get_message_label (label, 1, 0);
+
+ # Place the label below the 1st message line
+ fsck_label.y = local.first_label.y + local.first_label.height + (local.first_label.height / 2);
+
+# message_debug = "msg_x = " + fsck_label.x + " msg_y = " + fsck_label.y +
+# "msg_width = " + fsck_label.width + " msg_height = " +
+# fsck_label.height + " message = " + label;
+# Debug(message_debug);
+
+ return fsck_label;
+}
+
+#-----------------------------------------Message stuff --------------------------------
+#
+
+# Set up a message label
+#
+# NOTE: this is called when doing something like 'plymouth message "hello world"'
+#
+fun setup_message (message_text, x, y, z, index) {
+ # Debug("Message setup");
+ global.message_notification[index].image = (index) && ImageToActionText (message_text) || ImageToTintedText (message_text);
+
+ # Set up the text message, if any
+ message_notification[index].x = x;
+ message_notification[index].y = y;
+ message_notification[index].z = z;
+
+ message_notification[index].sprite = Sprite ();
+ message_notification[index].sprite.SetImage (message_notification[index].image);
+ message_notification[index].sprite.SetX (message_notification[index].x);
+ message_notification[index].sprite.SetY (message_notification[index].y);
+ message_notification[index].sprite.SetZ (message_notification[index].z);
+
+}
+
+fun show_message (index) {
+ if (global.message_notification[index].sprite) global.message_notification[index].sprite.SetOpacity(1);
+}
+
+fun hide_message (index) {
+ if (global.message_notification[index].sprite) global.message_notification[index].sprite.SetOpacity(0);
+}
+
+
+
+
+# the callback function is called when new message should be displayed.
+# First arg is message to display.
+fun message_callback (message)
+{
+ # Debug("Message callback");
+ is_fake = 0;
+ if (!message || (message == "")) is_fake = 1;
+
+ local.substring = "keys:";
+
+ # Look for the "keys:" prefix
+ local.keys = StringString(message, local.substring);
+
+ local.is_action_line = (keys != NULL);
+ #Debug("keys " + local.keys + " substring length = " + StringLength(local.substring));
+
+ # Get the message without the "keys:" prefix
+ if (keys != NULL)
+ message = StringCopy (message, keys + StringLength(local.substring), NULL);
+
+ local.label.is_fake = is_fake;
+ label = get_message_label(message, is_fake, is_action_line);
+ label.z = 10000;
+
+ setup_message (message, label.x, label.y, label.z, is_action_line);
+ if (prompt_active && local.is_action_line)
+ hide_message (is_action_line);
+ else
+ show_message (is_action_line);
+
+}
+
+
+#-----------------------------------------Display Password stuff -----------------------
+#
+
+fun password_dialogue_setup (message_label) {
+ # Debug("Password dialog setup");
+
+ local.entry;
+ local.bullet_image;
+
+ bullet_image = Image (password_dot_filename);
+ entry.image = Image (password_field_filename);
+
+ # Hide the normal labels
+ prompt_active = 1;
+ if (message_notification[1].sprite) hide_message (1);
+
+ # Set the prompt label
+ label = get_message_label(message_label, 0, 1);
+ label.z = 10000;
+
+ setup_message (message_label, label.x, label.y, label.z, 2);
+ show_message (2);
+
+ # Set up the text entry which contains the bullets
+ entry.sprite = Sprite ();
+ entry.sprite.SetImage (entry.image);
+
+ # Centre the box horizontally
+ entry.x = Window.GetX () + Window.GetWidth () / 2 - entry.image.GetWidth () / 2;
+
+ # Put the entry below the second label.
+ entry.y = message_notification[2].y + label.height;
+
+ # Debug ("entry x = " + entry.x + ", y = " + entry.y);
+ entry.z = 10000;
+ entry.sprite.SetX (entry.x);
+ entry.sprite.SetY (entry.y);
+ entry.sprite.SetZ (entry.z);
+
+ global.password_dialogue = local;
+}
+
+fun password_dialogue_opacity (opacity) {
+ # Debug("Password dialog opacity");
+ global.password_dialogue.opacity = opacity;
+ local = global.password_dialogue;
+
+ # You can make the box translucent with a float
+ # entry.sprite.SetOpacity (0.3);
+ entry.sprite.SetOpacity (opacity);
+ label.sprite.SetOpacity (opacity);
+
+ if (bullets) {
+ for (index = 0; bullets[index]; index++) {
+ bullets[index].sprite.SetOpacity (opacity);
+ }
+ }
+}
+
+
+# The callback function is called when the display should display a password dialogue.
+# First arg is prompt string, the second is the number of bullets.
+fun display_password_callback (prompt, bullets) {
+ # Debug("Password dialog setup");
+
+ global.status = "password";
+ if (!global.password_dialogue) password_dialogue_setup(prompt);
+ password_dialogue_opacity (1);
+ bullet_width = password_dialogue.bullet_image.GetWidth();
+ bullet_y = password_dialogue.entry.y +
+ password_dialogue.entry.image.GetHeight () / 2 -
+ password_dialogue.bullet_image.GetHeight () / 2;
+ margin = bullet_width;
+ spaces = Math.Int( (password_dialogue.entry.image.GetWidth () - (margin * 2)) / (bullet_width / 2 ) );
+ # Debug ("spaces = " + spaces + ", bullets = " + bullets);
+ bullets_area.width = margin + spaces * (bullet_width / 2);
+ bullets_area.x = Window.GetX () + Window.GetWidth () / 2 - bullets_area.width / 2;
+ # DebugBottom ("pwd_entry x = " + password_dialogue.entry.x + ", bullets_area.x = " + bullets_area.x + ", bullets_area.width = " + bullets_area.width);
+ if (bullets > spaces)
+ bullets = spaces;
+ for (index = 0; password_dialogue.bullets[index] || index < bullets; index++){
+ if (!password_dialogue.bullets[index]) {
+ password_dialogue.bullets[index].sprite = Sprite ();
+ password_dialogue.bullets[index].sprite.SetImage (password_dialogue.bullet_image);
+ password_dialogue.bullets[index].x = bullets_area.x + # password_dialogue.entry.x + margin +
+ index * bullet_width / 2;
+ password_dialogue.bullets[index].sprite.SetX (password_dialogue.bullets[index].x);
+ password_dialogue.bullets[index].y = bullet_y;
+ password_dialogue.bullets[index].sprite.SetY (password_dialogue.bullets[index].y);
+ password_dialogue.bullets[index].z = password_dialogue.entry.z + 1;
+ password_dialogue.bullets[index].sprite.SetZ (password_dialogue.bullets[index].z);
+ }
+
+ password_dialogue.bullets[index].sprite.SetOpacity (0);
+
+ if (index < bullets) {
+ password_dialogue.bullets[index].sprite.SetOpacity (1);
+ }
+ }
+}
+
+Plymouth.SetDisplayPasswordFunction (display_password_callback);
+
+Plymouth.SetMessageFunction (message_callback);
+
+Plymouth.SetBootProgressFunction (animate_progress_indicator);
+
+# Plymouth.SetBootProgressFunction: the callback function is called with two numbers, the progress (between 0 and 1) and the time spent booting so far
+# Plymouth.SetRootMountedFunction: the callback function is called when a new root is mounted
+# Plymouth.SetKeyboardInputFunction: the callback function is called with a string containing a new character entered on the keyboard
+
+#----------------------------------------- FSCK Counter --------------------------------
+
+# Initialise the counter
+fun init_fsck_count () {
+ # The number of fsck checks in this cycle
+ global.counter.total = 0;
+ # The number of fsck checks already performed + the current one
+ global.counter.current = 1;
+ # The previous fsck
+ global.counter.last = 0;
+}
+
+# Increase the total counter
+fun increase_fsck_count () {
+ global.counter.total++;
+}
+
+fun increase_current_fsck_count () {
+ global.counter.last = global.counter.current++;
+}
+
+# Clear the counter
+fun clear_fsck_count () {
+ global.counter = NULL;
+ init_fsck_count ();
+}
+
+#----------------------------------------- Progress Label ------------------------------
+
+
+# Change the opacity level of a progress label
+#
+# opacity = 1 -> show
+# opacity = 0 -> hide
+# opacity = 0.3 (or any other float) -> translucent
+#
+fun set_progress_label_opacity (opacity) {
+ # the label
+ progress_label.sprite.SetOpacity (opacity);
+
+ # Make the slot available again when hiding the bar
+ # So that another bar can take its place
+ if (opacity == 0) {
+ progress_label.is_available = 1;
+ progress_label.device = "";
+ }
+}
+
+# Set up a new Progress Bar
+#
+# TODO: Make it possible to reuse (rather than recreate) a bar
+# if .is_available = 1. Ideally this would just reset the
+# label, the associated
+# device and the image size of the sprite.
+
+fun init_progress_label (device, status_string) {
+ # Make the slot unavailable
+ global.progress_label.is_available = 0;
+ progress_label.progress = 0;
+ progress_label.device = device;
+ progress_label.status_string = status_string;
+}
+
+# See if the progress label is keeping track of the fsck
+# of "device"
+#
+fun device_has_progress_label (device) {
+ #DebugBottom ("label device = " + progress_label.device + " checking device " + device);
+ return (progress_label.device == device);
+}
+
+# Update the Progress bar which corresponds to index
+#
+fun update_progress_label (progress) {
+ # If progress is NULL then we just refresh the label.
+ # This happens when only counter.total has changed.
+ if (progress != NULL) {
+ progress_label.progress = progress;
+
+ #Debug("device " + progress_label.device + " progress " + progress);
+
+ # If progress >= 100% hide the label and make it available again
+ if (progress >= 100) {
+ set_progress_label_opacity (0);
+
+ # See if we any other fsck check is complete
+ # and, if so, hide the progress bars and the labels
+ on_fsck_completed ();
+
+ return 0;
+ }
+ }
+ # Update progress label here
+ #
+ # FIXME: the queue logic from this theme should really be moved into mountall
+ # instead of using string replacement to deal with localised strings.
+ label = StringReplace (progress_label.status_string[0], "%1$d", global.counter.current);
+ label = StringReplace (label, "%2$d", global.counter.total);
+ label = StringReplace (label, "%3$d", progress_label.progress);
+ label = StringReplace (label, "%%", "%");
+
+ progress_label = get_fsck_label (label, 0);
+ #progress_label.progress = progress;
+
+ progress_label.sprite = Sprite (progress_label.image);
+
+ # Set up the bar
+ progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1);
+
+ set_progress_label_opacity (1);
+
+}
+
+# Refresh the label so as to update counters
+fun refresh_progress_label () {
+ update_progress_label (NULL);
+}
+
+#----------------------------------------- FSCK Queue ----------------------------------
+
+# Initialise the fsck queue
+fun init_queue () {
+ global.fsck_queue[0].device;
+ global.fsck_queue[0].progress;
+ global.fsck_queue.counter = 0;
+ global.fsck_queue.biggest_item = 0;
+}
+
+fun clear_queue () {
+ global.fsck_queue = NULL;
+ init_queue ();
+}
+
+# Return either the device index in the queue or -1
+fun queue_look_up_by_device (device) {
+ for (i=0; i <= fsck_queue.biggest_item; i++) {
+ if ((fsck_queue[i]) && (fsck_queue[i].device == device))
+ return i;
+ }
+ return -1;
+}
+
+# Keep track of an fsck process in the queue
+fun add_fsck_to_queue (device, progress) {
+ # Look for an empty slot in the queue
+ for (i=0; global.fsck_queue[i].device; i++) {
+ continue;
+ }
+ local.index = i;
+
+ # Set device and progress
+ global.fsck_queue[local.index].device = device;
+ global.fsck_queue[local.index].progress = progress;
+
+ # Increase the queue counter
+ global.fsck_queue.counter++;
+
+ # Update the max index of the array for iterations
+ if (local.index > global.fsck_queue.biggest_item)
+ global.fsck_queue.biggest_item = local.index;
+
+ #DebugMedium ("Adding " + device + " at " + local.index);
+}
+
+fun is_queue_empty () {
+ return (fsck_queue.counter == 0);
+}
+
+fun is_progress_label_available () {
+ return (progress_label.is_available == 1);
+}
+
+
+# This should cover the case in which the fsck checks in
+# the queue are completed before the ones showed in the
+# progress label
+fun on_queued_fsck_completed () {
+ if (!is_queue_empty ())
+ return;
+
+ # Hide the extra label, if any
+ #if (progress_bar.extra_label.sprite)
+ # progress_bar.extra_label.sprite.SetOpacity(0);
+}
+
+fun remove_fsck_from_queue (index) {
+ # Free memory which was previously allocated for
+ # device and progress
+ global.fsck_queue[index].device = NULL;
+ global.fsck_queue[index].progress = NULL;
+
+ # Decrease the queue counter
+ global.fsck_queue.counter--;
+
+ # See if there are other processes in the queue
+ # if not, clear the extra_label
+ on_queued_fsck_completed ();
+}
+
+fun on_fsck_completed () {
+ # We have moved on to tracking the next fsck
+ increase_current_fsck_count ();
+
+ if (!is_progress_label_available ())
+ return;
+
+ if (!is_queue_empty ())
+ return;
+
+ # Hide the progress label
+ if (progress_label.sprite)
+ progress_label.sprite.SetOpacity (0);
+
+ # Clear the queue
+ clear_queue ();
+
+ # Clear the fsck counter
+ clear_fsck_count ();
+}
+
+# Update an fsck process that we keep track of in the queue
+fun update_progress_in_queue (index, device, progress) {
+ # If the fsck is complete, remove it from the queue
+ if (progress >= 100) {
+ remove_fsck_from_queue (index);
+ on_queued_fsck_completed ();
+ return;
+ }
+
+ global.fsck_queue[index].device = device;
+ global.fsck_queue[index].progress = progress;
+
+}
+
+# TODO: Move it to some function
+# Create an empty queue
+#init_queue ();
+
+
+#----------------------------------------- FSCK Functions ------------------------------
+
+
+# Either add a new bar for fsck checks or update an existing bar
+#
+# NOTE: no more than "progress_bar.max_number" bars are allowed
+#
+fun fsck_check (device, progress, status_string) {
+
+ # The 1st time this will take place
+ if (!global.progress_label) {
+ # Increase the fsck counter
+ increase_fsck_count ();
+
+ # Set up a new label for the check
+ init_progress_label (device, status_string);
+ update_progress_label (progress);
+
+ return;
+ }
+
+
+ if (device_has_progress_label (device)) {
+ # Update the progress of the existing label
+ update_progress_label (progress);
+ }
+ else {
+ # See if there's already a slot in the queue for the device
+ local.queue_device_index = queue_look_up_by_device(device);
+
+ # See if the progress_label is available
+ if (progress_label.is_available) {
+
+# local.my_string = "available index " + local.available_index + " progress_bar counter is " + progress_bar.counter;
+# Debug(local.my_string);
+
+
+ # If the fsck check for the device was in the queue, then
+ # remove it from the queue
+ if (local.queue_device_index >= 0) {
+ remove_fsck_from_queue (index);
+ }
+ else {
+ # Increase the fsck counter
+ increase_fsck_count ();
+ }
+
+# local.my_string += local.message;
+ #Debug("setting new label for device " + device + " progress " + progress);
+
+ # Set up a new label for the check
+ init_progress_label (device, status_string);
+ update_progress_label (progress);
+
+ }
+ # If the progress_label is not available
+ else {
+
+ # If the fsck check for the device is already in the queue
+ # just update its progress in the queue
+ if (local.queue_device_index >= 0) {
+ #DebugMedium("Updating queue at " + local.queue_device_index + " for device " + device);
+ update_progress_in_queue (local.queue_device_index, device, progress);
+ }
+ # Otherwise add the check to the queue
+ else {
+ #DebugMedium("Adding device " + device + " to queue at " + local.queue_device_index);
+ add_fsck_to_queue (device, progress);
+
+ # Increase the fsck counter
+ increase_fsck_count ();
+
+ refresh_progress_label ();
+ }
+
+ }
+ }
+
+# if (!is_queue_empty ()) {
+# DebugBottom("Extra label for "+ device);
+ #}
+# else {
+# DebugBottom("No extra label for " + device + ". 1st Device in the queue "+ fsck_queue[0].device + " counter = " + global.fsck_queue.counter);
+# }
+}
+
+
+#-----------------------------------------Update Status stuff --------------------------
+#
+# The update_status_callback is what we can use to pass plymouth whatever we want so
+# as to make use of features which are available only in this program (as opposed to
+# being available for any theme for the script plugin).
+#
+# Example:
+#
+# Thanks to the current implementation, some scripts can call "plymouth --update=fsck:sda1:40"
+# and this program will know that 1) we're performing and fsck check, 2) we're checking sda1,
+# 3) the program should set the label progress to 40%
+#
+# Other features can be easily added by parsing the string that we pass plymouth with "--update"
+#
+fun update_status_callback (status) {
+# Debug(status);
+ if (!status) return;
+
+ string_it = 0;
+ update_strings[string_it] = "";
+
+ for (i=0; (String(status).CharAt(i) != ""); i++) {
+ local.temp_char = String(status).CharAt(i);
+ if (temp_char != ":")
+ update_strings[string_it] += temp_char;
+ else
+ update_strings[++string_it] = "";
+ }
+
+# my_string = update_strings[0] + " " + update_strings[1] + " " + update_strings[2];
+# Debug(my_string);
+ # Let's assume that we're dealing with these strings fsck:sda1:40
+ if ((string_it >= 2) && (update_strings[0] == "fsck")) {
+
+ device = update_strings[1];
+ progress = update_strings[2];
+ status_string[0] = update_strings[3]; # "Checking disk %1$d of %2$d (%3$d %% complete)"
+ if (!status_string[0])
+ status_string[0] = "Checking disk %1$d of %2$d (%3$d %% complete)";
+
+ if ((device != "") && (progress != "")) {
+ progress = StringToInteger (progress);
+
+ # Make sure that the fsck_queue is initialised
+ if (!global.fsck_queue)
+ init_queue ();
+
+ # Make sure that the fsck counter is initialised
+ if (!global.counter)
+ init_fsck_count ();
+
+# if (!global.progress_bar.extra_label.sprite)
+# create_extra_fsck_label ();
+
+ # Keep track of the fsck check
+ fsck_check (device, progress, status_string);
+ }
+
+ }
+
+}
+Plymouth.SetUpdateStatusFunction (update_status_callback);
+
+#-----------------------------------------Display Question stuff -----------------------
+#
+# TODO: Implement this if needed
+#
+# The callback function is called when the display should display a question dialogue.
+# First arg is prompt string, the second is the entry contents.
+#fun display_question_callback (prompt_string, entry_contents)
+#{
+# time++;
+#}
+#
+#Plymouth.SetDisplayQuestionFunction (display_question_callback);
+
+
+#-----------------------------------------Refresh stuff --------------------------------
+#
+# Calling Plymouth.SetRefreshFunction with a function will set that function to be
+# called up to 50 times every second, e.g.
+#
+# NOTE: if a refresh function is not set, Plymouth doesn't seem to be able to update
+# the screen correctly
+#
+fun refresh_callback ()
+{
+ if (global.anim_status == "start") {
+ anim_iter = 0;
+ for (i = 0; i < ELECTRONS_DISPLAYED; i++) {
+ ellipses[i].anim.angle = ellipses[i].anim.start_angle;
+ }
+ global.anim_status = "running";
+ }
+
+ if (global.anim_status == "running") {
+ anim_done = 1;
+ for (i = 0; i < ELECTRONS_DISPLAYED; i++) {
+ if (anim_iter >= ellipses[i].anim.start_iter && anim_iter < ellipses[i].anim.stop_iter) {
+ draw_electron(i);
+
+ ellipses[i].anim.angle += ellipses[i].anim.angle_incr;
+ # check if at least one of the animations needs more loops
+ if (ellipses[i].anim.stop_iter > anim_iter) {
+ anim_done = 0;
+ }
+ }
+ }
+ if (anim_done) {
+ global.anim_status = "stopped";
+ }
+ anim_iter++;
+ # DebugBottom ("anim iter = " + anim_iter);
+ }
+}
+Plymouth.SetRefreshFunction (refresh_callback);
+
+# Acceleration function to have the electrons move faster in there most visible section, in
+# the middle of the ellipses.
+#
+# The function computes the result based on the .anim.angle member value in the given ellipse
+#
+# The angle is adapted so that accel([start_angle,start_angle+arc])->[start_angle,start_angle+arc]
+# is traveled in a sin([0,Pi/2])->[0,1] manner instead of linear increments
+#
+fun compute_angle_with_accel(ellipse) {
+ # first map the [start_angle,start_angle+arc] to [0,Pi/2]
+ angle_in_0_pi_2 = Math.Pi / 2 / ellipse.anim.arc * (ellipse.anim.angle - ellipse.anim.start_angle);
+ # then compute sin and scale output to [start_angle,start_angle+arc]
+ accel_angle = ellipse.anim.arc * Math.Sin(angle_in_0_pi_2) + ellipse.anim.start_angle;
+ return accel_angle;
+}
+
+# Computes the opacity factor so that the electrons visibility somehow matches that of the ellipses:
+# Most visible in a middle part, and invisible at the oposite.
+fun compute_opacity(ellipse) {
+ # map the [start_angle,start_angle+arc] to [0,Pi]
+ transformed_angle = Math.Pi / ellipse.anim.arc * (ellipse.anim.angle - ellipse.anim.start_angle);
+ # and compute Math.Sin^2
+ opacity_factor = Math.Sin(Math.Max(transformed_angle,-transformed_angle));
+ opacity_factor *= opacity_factor;
+ return opacity_factor;
+}
+
+# Draw the 5 electron sprites to create a gradient effect
+#
+# The position is computed based on the .angle field, adapted with the acceleration function above.
+#
+fun draw_electron(index) {
+ base_electron_x = ellipses[index].x - electron_image.GetWidth() / 2;
+ base_electron_y = ellipses[index].y - electron_image.GetHeight() / 2;
+ accel_angle = compute_angle_with_accel(ellipses[index]);
+ opacity_factor = compute_opacity(ellipses[index]);
+ for (j = 0; j < 5; j++) {
+ electron_x = base_electron_x + ellipses[index].width * Math.Cos(accel_angle + electron_sprite[index][j].angle_diff);
+ electron_y = base_electron_y + ellipses[index].height * Math.Sin(accel_angle + electron_sprite[index][j].angle_diff);
+ electron_sprite[index][j].SetOpacity(opacity_factor * electron_sprite[index][j].base_opacity);
+ electron_sprite[index][j].SetPosition(electron_x , electron_y, -10);
+ }
+}
+
+
+#-----------------------------------------Display Normal stuff -----------------------
+#
+# The callback function is called when the display should return to normal
+fun display_normal_callback ()
+{
+ global.status = "normal";
+ if (global.password_dialogue) {
+ password_dialogue_opacity (0);
+ global.password_dialogue = NULL;
+ if (message_notification[2].sprite) hide_message(2);
+ prompt_active = 0;
+ }
+
+ if (message_notification[1].sprite) show_message (1);
+
+
+}
+
+Plymouth.SetDisplayNormalFunction (display_normal_callback);
+
+
+#----------------------------------------- Quit --------------------------------
+
+# TODO: Maybe we should also hide any other dialog
+# Show the logo and make the progress indicator look full when on exit
+fun quit_callback ()
+{
+ logo.sprite.SetOpacity (1);
+ switch_on_bullets ();
+}
+
+Plymouth.SetQuitFunction(quit_callback);
diff --git a/art-lines/plymouth/electron.png b/art-lines/plymouth/electron.png
new file mode 100644
index 0000000..ab1ef02
Binary files /dev/null and b/art-lines/plymouth/electron.png differ
diff --git a/art-lines/plymouth/password_dot.png b/art-lines/plymouth/password_dot.png
new file mode 100644
index 0000000..7dd7413
Binary files /dev/null and b/art-lines/plymouth/password_dot.png differ
diff --git a/art-lines/plymouth/password_dot16.png b/art-lines/plymouth/password_dot16.png
new file mode 100644
index 0000000..991a586
Binary files /dev/null and b/art-lines/plymouth/password_dot16.png differ
diff --git a/art-lines/plymouth/password_field.png b/art-lines/plymouth/password_field.png
new file mode 100644
index 0000000..4c0b93e
Binary files /dev/null and b/art-lines/plymouth/password_field.png differ
diff --git a/art-lines/plymouth/password_field16.png b/art-lines/plymouth/password_field16.png
new file mode 100644
index 0000000..962c557
Binary files /dev/null and b/art-lines/plymouth/password_field16.png differ
diff --git a/art-lines/splash/Makefile.am b/art-lines/splash/Makefile.am
deleted file mode 100644
index 75a4704..0000000
--- a/art-lines/splash/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-SPLASH = debian-edu-lines-splash.png \
- debian-edu-lines-splash-live.png
-
-splashdir = $(datadir)/pixmaps/splash
-splash_DATA = $(SPLASH) debian-edu-lines-splash-grub.png
-
-grub2splashdir= /usr/share/desktop-base/
-
-# Build rule for the PNG using the SVG as the source
-debian-edu-lines-splash.png: debian-edu-lines-splash.svg
- inkscape -z -e $@ $^
- convert $@ -scale 640x +set date:create +set date:modify $@
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-debian-edu-lines-splash-grub.png: debian-edu-lines-splash.png
- cp $^ $@
-
-debian-edu-lines-splash-live.png: debian-edu-lines-splash.png
- cp $^ $@
-
-EXTRA_DIST = $(splash_DATA) debian-edu-lines-splash.svg
-
-CLEANFILES = debian-edu-lines-splash-grub.png debian-edu-lines-splash.png debian-edu-lines-splash-live.png
diff --git a/art-lines/splash/README b/art-lines/splash/README
deleted file mode 100644
index 9135b0e..0000000
--- a/art-lines/splash/README
+++ /dev/null
@@ -1,39 +0,0 @@
-syslinux splash image
-=====================
-
-This image is used when generating the CD images, and is displayed on
-the first promt after booting the CD.
-
-Clues on how to make such image is available from the
-ISOLINUX/SYSLINUX splash image mini-HOWTO,
-<URL:http://www.sweb.cz/Frantisek.Rysanek/splash/isolinux-splash-HOWTO.html>.
-
-Some important excepts:
-
-The image need to be 640 pixels wide (the basic VGA screen width) with
-4bpp color depth (16 colors). The vertical dimension should be
-definitely less then 480 pixels and please be aware that you need some
-space below your image on the splash screen for your welcome text - at
-least one line for the boot prompt. To sum up, 200 - 300 pixels might
-be an appropriate height. (Note, this is no longer true for Squeeze,
-where the image should be 640x480)
-
-The PNG image should use indexed colors with less than 14 , and color
-indicies 0 and 7, in particular, should be chosen with care: 0 is the
-background color, and 7 is the color used for the text printed by
-syslinux itself.
-
-The PNG passed to debian-cd is processed like this:
-
- pngtopnm < splash.png | ppmquant 16 | \
- ppmtolss16 "#ffffff=7" "#000000=0" > splash.rle
-
-The debian-edu-splash-squeeze.png image was created by loading the
-background-grub2.png image into gimp and selecting
-Image->Mode->Indexed... and reducing the number of colors to 16 with
-dithering.
-
-grub splash image
-=================
-
-This image is used when the system boots, to have a backdrop behind the grub menu.
diff --git a/art-lines/splash/background-grub2.png b/art-lines/splash/background-grub2.png
deleted file mode 120000
index 150df12..0000000
--- a/art-lines/splash/background-grub2.png
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu-lines-splash.png
\ No newline at end of file
diff --git a/art-lines/splash/debian-edu-lines-splash.svg b/art-lines/splash/debian-edu-lines-splash.svg
deleted file mode 120000
index dc9ec1c..0000000
--- a/art-lines/splash/debian-edu-lines-splash.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../playground/jessie/debian-edu-lines-login_1600x1200+grub.svg
\ No newline at end of file
--
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