Commits

Ulrich Hansen committed 23457a0

A lot of changes: Cleanup, use smaller pictures, use more symlinks, don't have
the same pictures twice in the deb. Cleanup the alternatives. (Full changes
per email).

Comments (0)

Files changed (39)

 	mkdir -p $(DESTDIR)/usr/share/plymouth/themes/$(THEME)/
 	mkdir -p $(DESTDIR)/usr/share/gdm/dconf/
 	mkdir -p $(DESTDIR)/etc/default/kdm.d/
-	mkdir -p $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/$(THEME)/1600x1200/
+	mkdir -p $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/$(THEME)/1920x1080/
 	mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/$(THEME)/
 	mkdir -p $(DESTDIR)/usr/share/kde4/apps/plasma-desktop/init/
 	mkdir -p $(DESTDIR)/usr/share/wallpapers/$(THEME)/contents/images/
 
 
 install-backgrounds: mkdirs
-	$(INSTALL) $(wildcard backgrounds/*) $(DESTDIR)/usr/share/desktop-theme-$(THEME)/backgrounds/
-	$(INSTALL) backgrounds/growing-gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/growing.xml
-	$(INSTALL) backgrounds/growing-autostart.desktop $(DESTDIR)/etc/xdg/autostart/
+	$(INSTALL) backgrounds/$(THEME)-wallpaper.png $(DESTDIR)/usr/share/desktop-theme-$(THEME)/backgrounds/
+	$(INSTALL) backgrounds/$(THEME)-login.png $(DESTDIR)/usr/share/desktop-theme-$(THEME)/backgrounds/
+	$(INSTALL) backgrounds/$(THEME)-gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/$(THEME).xml
+	$(INSTALL) backgrounds/$(THEME)-autostart.desktop $(DESTDIR)/etc/xdg/autostart/
 
 install-plymouth: mkdirs
 	$(INSTALL) $(wildcard plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/$(THEME)/
+	$(INSTALL) backgrounds/$(THEME)-login.png $(DESTDIR)/usr/share/plymouth/themes/$(THEME)/background.png
+
 
 install-grub: mkdirs
 	$(INSTALL) $(wildcard grub/*.* ) $(DESTDIR)/usr/share/desktop-theme-$(THEME)/grub
 	$(INSTALL) $(wildcard grub/theme/*.*) $(DESTDIR)/usr/share/desktop-theme-$(THEME)/grub/theme
 	$(INSTALL) $(wildcard grub/theme/icons/*.*) $(DESTDIR)/usr/share/desktop-theme-$(THEME)/grub/theme/icons
 
+
 install-gdm3: mkdirs
 	$(INSTALL) gdm3/15-desktop-theme-settings $(DESTDIR)/usr/share/gdm/dconf/
 
 install-ksplash: mkdirs
 	$(INSTALL) $(wildcard ksplash/theme/*.*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/$(THEME)/
-	$(INSTALL) $(wildcard ksplash/theme/1600x1200/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/$(THEME)/1600x1200
+	$(INSTALL) $(wildcard ksplash/theme/1920x1080/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/$(THEME)/1920x1080/
 	$(INSTALL) ksplash/$(THEME)-ksplash.conf $(DESTDIR)/usr/share/desktop-theme-$(THEME)/ksplash/
 
 install-kdm: mkdirs
 	$(INSTALL) kdm-theme/15_desktop-theme $(DESTDIR)/etc/default/kdm.d/
-	$(INSTALL) $(wildcard kdm-theme/theme/*.*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/$(THEME)
+	$(INSTALL) $(wildcard kdm-theme/theme/*.*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/$(THEME)/
 
 install-kde: mkdirs
 	$(INSTALL) kde-wallpaper/theme/metadata.desktop $(DESTDIR)/usr/share/wallpapers/$(THEME)/
 	$(INSTALL) kde-wallpaper/theme/contents/screenshot.png $(DESTDIR)/usr/share/wallpapers/$(THEME)/contents/
-	$(INSTALL) $(wildcard kde-wallpaper/theme/contents/images/*) $(DESTDIR)/usr/share/wallpapers/$(THEME)/contents/images/
+#	$(INSTALL) $(wildcard kde-wallpaper/theme/contents/images/*) $(DESTDIR)/usr/share/wallpapers/$(THEME)/contents/images/
 	$(INSTALL) kde-wallpaper/15-desktop-theme.js $(DESTDIR)/usr/share/kde4/apps/plasma-desktop/init/
 
 

backgrounds/growing-background.xml

-<background>
-  <static>
-    <duration>8640000.0</duration>
-    <file>
-      <size width="2560" height="1440">/usr/share/desktop-theme-growing/backgrounds/growing-wallpaper.png</size>
-    </file>
-  </static>
-</background>

backgrounds/growing-gnome-backgrounds.xml

   <wallpaper>
     <!-- don't include words such as "wallpaper" (avoids translations) -->
     <name>growing</name>
-    <filename>/usr/share/desktop-theme-growing/backgrounds/growing-wallpaper.png</filename>
+    <filename>/usr/share/images/desktop-base/desktop-background</filename>
     <options>zoom</options>
     <shade_type>horizontal-gradient</shade_type>
     <pcolor>#0099cc</pcolor>

backgrounds/growing-login.png

Old
Old image
New
New image

backgrounds/growing-wallpaper.png

Old
Old image
New
New image
         /usr/share/desktop-theme-growing/backgrounds/growing-wallpaper.png 90
 
     update-alternatives --install \
-        /usr/share/images/desktop-base/desktop-background.xml \
-        desktop-background.xml \
-        /usr/share/desktop-theme-growing/backgrounds/growing-background.xml 90
-
-    update-alternatives --install \
         /usr/share/images/desktop-base/desktop-grub.png \
         desktop-grub \
         /usr/share/desktop-theme-growing/grub/growing-grub.png 90
 	desktop-grub-theme \
 	/usr/share/desktop-theme-growing/grub/theme/theme.txt 90
 
+    update-alternatives --install \
+	/usr/share/images/desktop-base/desktop-login \
+	desktop-login \
+	/usr/share/desktop-theme-growing/backgrounds/growing-login.png 90
+
 }
 
-set_alternatives() {
-    update-alternatives --set \
-        desktop-background \
-        /usr/share/images/desktop-base/desktop-background
+set_alternatives_auto() {
+    update-alternatives --auto desktop-background
+    update-alternatives --auto desktop-grub
+    update-alternatives --auto desktop-ksplash
+    update-alternatives --auto desktop-grub-theme
+    update-alternatives --auto desktop-login
+}
 
-    update-alternatives --set \
-        desktop-background.xml \
-        /usr/share/images/desktop-base/desktop-background.xml
-
-    update-alternatives --set \
-        desktop-grub \
-        /usr/share/images/desktop-base/desktop-grub.png
-
-    update-alternatives --set \
-        desktop-ksplash \
-	/usr/share/images/desktop-base/desktop-ksplash
-
-}
 
 update_plymouth_config() {
     if which plymouth-set-default-theme ; then
 case "$1" in
     configure|abort-upgrade)
         install_alternatives
+	set_alternatives_auto
         update_grub_config
         update_gdm3_config
         update_plymouth_config
 title-text: ""
 message-color: "#ffffff"
 message-bg-color: "#000"
-desktop-image: "/usr/share/desktop-theme-growing/backgrounds/growing-login.png"
+desktop-image: "background.png"
 desktop-color: "#495585 "
 terminal-box: "terminal_box_*.png"
 terminal-font: "DejaVu Sans Mono Regular 14"

kde-wallpaper/theme/contents/images/2560x1440.png

Removed
Old image

kde-wallpaper/theme/contents/screenshot.png

Old
Old image
New
New image

kdm-theme/15_desktop-theme

 USETHEME="true"
 THEME="/usr/share/kde4/apps/kdm/themes/growing"
-WALLPAPER="/usr/share/desktop-theme-growing/backgrounds/growing-login.png"
+WALLPAPER="/usr/share/images/desktop-base/desktop-login"

kdm-theme/theme/growing.xml

 
 <!-- main pic, login pic -->
 <item type="pixmap">
-	<normal file="/usr/share/desktop-theme-growing/backgrounds/growing-login.png" scalemode="crop"/>
+	<normal file="/usr/share/images/desktop-base/desktop-login" scalemode="scale"/>
 	<pos x="0" y="0" width="100%" height="100%"/>
 
 	<fixed>

kdm-theme/theme/screenshot.png

Old
Old image
New
New image

ksplash/theme/1600x1200/background.png

Removed
Old image

ksplash/theme/1600x1200/description.txt

-SCALE ON
-BACKGROUND_IMAGE 0 0 background.png
-SCALE OFF
-
-# the 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 150 LT 30 icon1_anim.png 85 1
-WAIT_STATE kded
-
-# 69,32
-ANIM_REL 2 CC -126 150 LT 30 icon2_anim.png 85 1
-WAIT_STATE kcminit
-
-# 135,32
-ANIM_REL 3 CC -60 150 LT 29 icon3_anim.png 85 1
-WAIT_STATE ksmserver
-
-# 201,32
-ANIM_REL 4 CC 6 150  LT 30 icon4_anim.png 85 1
-WAIT_STATE wm
-
-# 263,15
-ANIM_REL 5 CC 68 122 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 150 LT icon1.png
-STOP_ANIM 2
-IMAGE_REL CC -126 150 LT icon2.png
-STOP_ANIM 3
-IMAGE_REL CC -60 150 LT icon3.png
-STOP_ANIM 4
-IMAGE_REL CC 6 150 LT icon4.png
-STOP_ANIM 5
-IMAGE_REL CC 68 122 LT icon5.png

ksplash/theme/1600x1200/icon1.png

Removed
Old image

ksplash/theme/1600x1200/icon1_anim.png

Removed
Old image

ksplash/theme/1600x1200/icon2.png

Removed
Old image

ksplash/theme/1600x1200/icon2_anim.png

Removed
Old image

ksplash/theme/1600x1200/icon3.png

Removed
Old image

ksplash/theme/1600x1200/icon3_anim.png

Removed
Old image

ksplash/theme/1600x1200/icon4.png

Removed
Old image

ksplash/theme/1600x1200/icon4_anim.png

Removed
Old image

ksplash/theme/1600x1200/icon5.png

Removed
Old image

ksplash/theme/1600x1200/icon5_anim.png

Removed
Old image

ksplash/theme/1600x1200/rectangle.png

Removed
Old image

ksplash/theme/1920x1080/description.txt

+SCALE ON
+BACKGROUND_IMAGE 0 0 background.png
+SCALE OFF
+
+# the 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 150 LT 30 icon1_anim.png 85 1
+WAIT_STATE kded
+
+# 69,32
+ANIM_REL 2 CC -126 150 LT 30 icon2_anim.png 85 1
+WAIT_STATE kcminit
+
+# 135,32
+ANIM_REL 3 CC -60 150 LT 29 icon3_anim.png 85 1
+WAIT_STATE ksmserver
+
+# 201,32
+ANIM_REL 4 CC 6 150  LT 30 icon4_anim.png 85 1
+WAIT_STATE wm
+
+# 263,15
+ANIM_REL 5 CC 68 122 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 150 LT icon1.png
+STOP_ANIM 2
+IMAGE_REL CC -126 150 LT icon2.png
+STOP_ANIM 3
+IMAGE_REL CC -60 150 LT icon3.png
+STOP_ANIM 4
+IMAGE_REL CC 6 150 LT icon4.png
+STOP_ANIM 5
+IMAGE_REL CC 68 122 LT icon5.png

ksplash/theme/1920x1080/icon1.png

Added
New image

ksplash/theme/1920x1080/icon1_anim.png

Added
New image

ksplash/theme/1920x1080/icon2.png

Added
New image

ksplash/theme/1920x1080/icon2_anim.png

Added
New image

ksplash/theme/1920x1080/icon3.png

Added
New image

ksplash/theme/1920x1080/icon3_anim.png

Added
New image

ksplash/theme/1920x1080/icon4.png

Added
New image

ksplash/theme/1920x1080/icon4_anim.png

Added
New image

ksplash/theme/1920x1080/icon5.png

Added
New image

ksplash/theme/1920x1080/icon5_anim.png

Added
New image

ksplash/theme/1920x1080/rectangle.png

Added
New image

plymouth/background.png

Removed
Old image