diff --git a/Makefile b/Makefile index 7a4c258..dd9d749 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -GRUB_THEMES=softwaves-theme/grub +GRUB_THEMES=lines-theme/grub softwaves-theme/grub DEFAULT_BACKGROUND=desktop-background BACKGROUNDS=$(wildcard backgrounds/*.png backgrounds/*.jpg backgrounds/*.svg backgrounds/*.tga backgrounds/*.xml) @@ -63,13 +63,6 @@ install-local: $(INSTALL) kde-wallpaper/joy_inksplat/contents/screenshot.png $(DESTDIR)/usr/share/wallpapers/joy_inksplat/contents/ mkdir -p $(DESTDIR)/usr/share/wallpapers/joy_inksplat/contents/images $(INSTALL) $(wildcard kde-wallpaper/joy_inksplat/contents/images/*) $(DESTDIR)/usr/share/wallpapers/joy_inksplat/contents/images/ - ## Lines - mkdir -p $(DESTDIR)/usr/share/wallpapers/Lines - $(INSTALL) kde-wallpaper/Lines/metadata.desktop $(DESTDIR)/usr/share/wallpapers/Lines/ - mkdir -p $(DESTDIR)/usr/share/wallpapers/Lines/contents - $(INSTALL) kde-wallpaper/Lines/contents/screenshot.png $(DESTDIR)/usr/share/wallpapers/Lines/contents/ - mkdir -p $(DESTDIR)/usr/share/wallpapers/Lines/contents/images - $(INSTALL) $(wildcard kde-wallpaper/Lines/contents/images/*) $(DESTDIR)/usr/share/wallpapers/Lines/contents/images/ ## SDDM meta theme (configured with alternatives) @@ -77,13 +70,6 @@ install-local: $(INSTALL) $(wildcard sddm-debian/*) $(DESTDIR)/usr/share/sddm/themes/debian-theme - ## Lines - install -d $(DESTDIR)/usr/share/desktop-base/lines-theme - # login background - $(INSTALL) lines-theme/login-background.svg $(DESTDIR)/usr/share/desktop-base/lines-theme/ - $(INSTALL) lines-theme/login-background-with-logo.svg $(DESTDIR)/usr/share/desktop-base/lines-theme/ - $(INSTALL) lines-theme/sddm-preview.jpg $(DESTDIR)/usr/share/desktop-base/lines-theme/ - ## Joy install -d $(DESTDIR)/usr/share/desktop-base/joy-theme # login background @@ -99,8 +85,6 @@ install-local: $(INSTALL) gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/debian.xml # grub - $(INSTALL) grub/lines-grub.png $(DESTDIR)/usr/share/images/desktop-base/ - $(INSTALL) grub/lines-grub-1920x1080.png $(DESTDIR)/usr/share/images/desktop-base/ $(INSTALL) grub/joy-grub.png $(DESTDIR)/usr/share/images/desktop-base/ $(INSTALL) grub/spacefun-grub.png $(DESTDIR)/usr/share/images/desktop-base/ $(INSTALL) grub/spacefun-grub-widescreen.png $(DESTDIR)/usr/share/images/desktop-base/ @@ -116,19 +100,40 @@ install-local: install -d $(DESTDIR)/usr/share/plymouth/themes/lines $(INSTALL) $(wildcard plymouth/lines/*) $(DESTDIR)/usr/share/plymouth/themes/lines - - # Soft waves theme (Stretch default) + # Lines theme (Jessie’s default) ### Login background - install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme - $(INSTALL) softwaves-theme/sddm-preview.jpg $(DESTDIR)/usr/share/desktop-base/softwaves-theme/ - install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/backgrounds - $(INSTALL) softwaves-theme/backgrounds/login.svg $(DESTDIR)/usr/share/desktop-base/softwaves-theme/backgrounds + install -d $(DESTDIR)/usr/share/desktop-base/lines-theme/login + $(INSTALL) $(wildcard lines-theme/login/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/login + ### Wallpapers + install -d $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper/contents/images + $(INSTALL) lines-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper + $(INSTALL) lines-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper + $(INSTALL) $(wildcard lines-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper/contents/images/ + $(INSTALL) lines-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-lines.xml + # Wallpaper symlink for KDE + install -d $(DESTDIR)/usr/share/wallpapers + cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/lines-theme/wallpaper Lines + + ### Lockscreen + install -d $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen/contents/images + $(INSTALL) lines-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen + $(INSTALL) lines-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen + $(INSTALL) $(wildcard lines-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen/contents/images/ + # Lock screen symlink for KDE + install -d $(DESTDIR)/usr/share/wallpapers + cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/lines-theme/lockscreen LinesLockScreen + + + # Soft waves theme (Stretch’s default) + ### Login background + install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/login + $(INSTALL) $(wildcard softwaves-theme/login/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/login ### Wallpapers install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper/contents/images $(INSTALL) softwaves-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper $(INSTALL) softwaves-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper $(INSTALL) $(wildcard softwaves-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper/contents/images/ - $(INSTALL) softwaves-theme/gnome-wp-list-softwaves.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-softwaves.xml + $(INSTALL) softwaves-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-softwaves.xml # Wallpaper symlink for KDE install -d $(DESTDIR)/usr/share/wallpapers cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/softwaves-theme/wallpaper SoftWaves @@ -138,7 +143,6 @@ install-local: $(INSTALL) softwaves-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen $(INSTALL) softwaves-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen $(INSTALL) $(wildcard softwaves-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen/contents/images/ - $(INSTALL) softwaves-theme/gnome-wp-list-softwaves.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-softwaves.xml # Lock screen symlink for KDE install -d $(DESTDIR)/usr/share/wallpapers cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/softwaves-theme/lockscreen SoftWavesLockScreen diff --git a/backgrounds/lines-lockscreen.xml b/backgrounds/lines-lockscreen.xml deleted file mode 100644 index 2848da2..0000000 --- a/backgrounds/lines-lockscreen.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - 8640000.0 - - /usr/share/images/desktop-base/lines-lockscreen_1280x1024.svg - /usr/share/images/desktop-base/lines-lockscreen_1600x1200.svg - /usr/share/images/desktop-base/lines-lockscreen_1920x1080.svg - /usr/share/images/desktop-base/lines-lockscreen_1920x1200.svg - /usr/share/images/desktop-base/lines-lockscreen_2560x1080.svg - - - diff --git a/backgrounds/lines-lockscreen_1920x1200.svg b/backgrounds/lines-lockscreen_1920x1200.svg deleted file mode 100644 index d3bc544..0000000 --- a/backgrounds/lines-lockscreen_1920x1200.svg +++ /dev/null @@ -1,3 +0,0 @@ - -image/svg+xml8 - \ No newline at end of file diff --git a/backgrounds/lines.xml b/backgrounds/lines.xml deleted file mode 100644 index 4b834eb..0000000 --- a/backgrounds/lines.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - 8640000.0 - - /usr/share/images/desktop-base/lines-wallpaper_1280x1024.svg - /usr/share/images/desktop-base/lines-wallpaper_1600x1200.svg - /usr/share/images/desktop-base/lines-wallpaper_1920x1080.svg - /usr/share/images/desktop-base/lines-wallpaper_1920x1200.svg - /usr/share/images/desktop-base/lines-wallpaper_2560x1080.svg - - - diff --git a/debian/postinst b/debian/postinst index e24942c..2ccf3c9 100644 --- a/debian/postinst +++ b/debian/postinst @@ -10,6 +10,7 @@ if [[ "$1" = "configure" || "$1" = "abort-upgrade" || "$1" = "abort-remove" ]]; /usr/share/desktop-base/$theme-theme $priority done << EOF softwaves 50 +lines 40 EOF # Use active theme as highest priority for background @@ -25,8 +26,16 @@ EOF /usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename $priority done << EOF softwaves 1280x720.svg 65 +softwaves 1280x800.svg 65 softwaves 1920x1080.svg 65 +softwaves 1920x1200.svg 65 softwaves 2560x1440.svg 65 +softwaves 2560x1600.svg 65 +lines 1280x1024.svg 60 +lines 1600x1200.svg 60 +lines 1920x1080.svg 60 +lines 1920x1200.svg 60 +lines 2560x1080.svg 60 EOF # Old alternatives for the background while read background priority; do @@ -35,11 +44,6 @@ EOF desktop-background \ /usr/share/images/desktop-base/$background $priority done << EOF -lines-wallpaper_1280x1024.svg 60 -lines-wallpaper_1600x1200.svg 60 -lines-wallpaper_1920x1080.svg 60 -lines-wallpaper_1920x1200.svg 60 -lines-wallpaper_2560x1080.svg 60 joy-wallpaper_1600x1200.svg 50 joy-wallpaper_1280x1024.svg 50 joy-wallpaper_1920x1080.svg 50 @@ -66,6 +70,7 @@ EOF /usr/share/desktop-base/$theme-theme/wallpaper/gnome-background.xml $priority done << EOF softwaves 40 +lines 30 EOF # Old alternatives while read desktopbackground priority; do @@ -74,7 +79,6 @@ EOF desktop-background.xml \ /usr/share/images/desktop-base/$desktopbackground $priority done << EOF -lines.xml 20 joy.xml 20 EOF @@ -93,41 +97,31 @@ EOF /usr/share/desktop-base/$theme-theme/lockscreen/gnome-background.xml $priority done << EOF softwaves 40 +lines 30 EOF # Login theme # Highest priority for active theme update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ desktop-login-background \ - /usr/share/desktop-base/active-theme/backgrounds/login.svg 50 \ + /usr/share/desktop-base/active-theme/login/background.svg 50 \ --slave /usr/share/sddm/themes/debian-theme/sddm-preview.jpg \ desktop-sddm-preview \ - /usr/share/desktop-base/active-theme/sddm-preview.jpg + /usr/share/desktop-base/active-theme/login/sddm-preview.jpg # Alternatives for theme packages - while read theme priority; do + while read theme background sddm_preview priority; do update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ desktop-login-background \ - /usr/share/desktop-base/$theme-theme/backgrounds/login.svg $priority \ + /usr/share/desktop-base/$theme-theme/login/$background $priority \ --slave /usr/share/sddm/themes/debian-theme/sddm-preview.jpg \ desktop-sddm-preview \ - /usr/share/desktop-base/$theme-theme/sddm-preview.jpg + /usr/share/desktop-base/$theme-theme/login/$sddm_preview done << EOF -softwaves 40 +softwaves background.svg sddm-preview.jpg 40 +lines background.svg sddm-preview.jpg 30 +lines background-nologo.svg sddm-preview-nologo.jpg 30 EOF # Old alternatives - ## Lines - update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ - desktop-login-background \ - /usr/share/desktop-base/lines-theme/login-background.svg 20 \ - --slave /usr/share/sddm/themes/debian-theme/sddm-preview.jpg \ - desktop-sddm-preview \ - /usr/share/desktop-base/lines-theme/sddm-preview.jpg - update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ - desktop-login-background \ - /usr/share/desktop-base/lines-theme/login-background-with-logo.svg 20 \ - --slave /usr/share/sddm/themes/debian-theme/sddm-preview.jpg \ - desktop-sddm-preview \ - /usr/share/desktop-base/lines-theme/sddm-preview.jpg ## Joy update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ desktop-login-background \ @@ -163,6 +157,8 @@ EOF done << EOF softwaves 4x3 15 softwaves 16x9 15 +lines 4x3 14 +lines 16x9 14 EOF # Old alternatives @@ -172,8 +168,6 @@ EOF desktop-grub \ /usr/share/images/desktop-base/$background $priority done << EOF -lines-grub.png 10 -lines-grub-1920x1080.png 10 joy-grub.png 10 spacefun-grub.png 10 spacefun-grub-widescreen.png 10 diff --git a/debian/preinst b/debian/preinst index 419eee3..6701169 100644 --- a/debian/preinst +++ b/debian/preinst @@ -16,7 +16,38 @@ if [ "${1}" = "upgrade" ]; then fi if dpkg --compare-versions ${2} lt "9.0.0~exp"; then + # Remove desktop splash alternative that we don’t ship anymore update-alternatives --remove-all desktop-splash + + # Remove alternatives for Lines we now ship elsewhere as a theme pack + ## Wallpaper + for background in \ + lines-wallpaper_1280x1024.svg \ + lines-wallpaper_1600x1200.svg \ + lines-wallpaper_1920x1080.svg \ + lines-wallpaper_1920x1200.svg \ + lines-wallpaper_2560x1080.svg \ + ; do + update-alternatives --remove desktop-background /usr/share/images/desktop-base/$background + done + update-alternatives --remove \ + desktop-background.xml \ + /usr/share/images/desktop-base/lines.xml + ## Login background + update-alternatives --remove desktop-login-background \ + /usr/share/desktop-base/lines-theme/login-background.svg + update-alternatives --remove desktop-login-background \ + /usr/share/desktop-base/lines-theme/login-background-with-logo.svg + + ## Grub background + while read background; do + update-alternatives --remove \ + desktop-grub \ + /usr/share/images/desktop-base/$background + done << EOF +lines-grub.png +lines-grub-1920x1080.png +EOF fi fi diff --git a/debian/prerm b/debian/prerm index 64b7f9e..92da828 100644 --- a/debian/prerm +++ b/debian/prerm @@ -11,16 +11,19 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then /usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename $priority done << EOF softwaves 1280x720.svg +softwaves 1280x800.svg softwaves 1920x1080.svg +softwaves 1920x1200.svg softwaves 2560x1440.svg +softwaves 2560x1600.svg +lines 1280x1024.svg +lines 1600x1200.svg +lines 1920x1080.svg +lines 1920x1200.svg +lines 2560x1080.svg EOF # Remove old background alternatives for background in \ - lines-wallpaper_1280x1024.svg \ - lines-wallpaper_1600x1200.svg \ - lines-wallpaper_1920x1080.svg \ - lines-wallpaper_1920x1200.svg \ - lines-wallpaper_2560x1080.svg \ joy-wallpaper_1600x1200.svg \ joy-wallpaper_1600x1200.svg \ joy-wallpaper_1280x1024.svg \ @@ -45,10 +48,10 @@ EOF /usr/share/desktop-base/$theme-theme/wallpaper/gnome-background.xml $priority done << EOF softwaves +lines EOF # For old alternatives for desktopbackground in \ - lines.xml \ joy.xml \ ; do update-alternatives --remove desktop-background.xml /usr/share/images/desktop-base/$desktopbackground @@ -66,6 +69,7 @@ EOF /usr/share/desktop-base/$theme-theme/lockscreen/gnome-background.xml $priority done << EOF softwaves +lines EOF # *Last* remove *highest priority* alternative for active theme update-alternatives --remove \ @@ -75,40 +79,32 @@ EOF # Remove login theme alternatives # For theme packages # Alternative for theme packages - while read theme; do + while read theme background sddm_preview; do update-alternatives --remove \ desktop-sddm-preview \ - /usr/share/desktop-base/$theme-theme/sddm-preview.jpg + /usr/share/desktop-base/$theme-theme/login/$sddm_preview update-alternatives --remove \ desktop-login-background \ - /usr/share/desktop-base/$theme-theme/backgrounds/login.svg + /usr/share/desktop-base/$theme-theme/login/$background done << EOF -softwaves +softwaves background.svg sddm-preview.jpg +lines background.svg sddm-preview.jpg +lines background-nologo.svg sddm-preview-nologo.jpg EOF # For old alternatives - ## Lines - ### secondary alternatives - update-alternatives --remove desktop-sddm-preview \ - /usr/share/desktop-base/lines-theme/sddm-preview.jpg - ### main alternatives - update-alternatives --remove desktop-login-background \ - /usr/share/desktop-base/lines-theme/login-background.svg - update-alternatives --remove desktop-login-background \ - /usr/share/desktop-base/lines-theme/login-background-with-logo.svg ## Joy ### secondary alternatives update-alternatives --remove desktop-sddm-preview \ /usr/share/desktop-base/joy-theme/sddm-preview.jpg - ### main alternatives update-alternatives --remove desktop-login-background \ /usr/share/desktop-base/joy-theme/login-background.svg # *Last* remove *highest priority* alternative for active theme update-alternatives --remove \ desktop-sddm-preview \ - /usr/share/desktop-base/active-theme/sddm-preview.jpg + /usr/share/desktop-base/active-theme/login/sddm-preview.jpg update-alternatives --remove \ desktop-login-background \ - /usr/share/desktop-base/active-theme/backgrounds/login.svg + /usr/share/desktop-base/active-theme/login/background.svg # Remove grub background alternatives # For theme packages @@ -119,6 +115,8 @@ EOF done << EOF softwaves 4x3 softwaves 16x9 +lines 4x3 +lines 16x9 EOF # For old alternatives while read background; do @@ -126,8 +124,6 @@ EOF desktop-grub \ /usr/share/images/desktop-base/$background done << EOF -lines-grub.png -lines-grub-1920x1080.png joy-grub.png spacefun-grub.png spacefun-grub-widescreen.png @@ -154,7 +150,12 @@ EOF desktop-theme \ /usr/share/desktop-base/$theme-theme done << EOF -softwaves +lines EOF + ## *Lastly* remove *highest priority* alternative + update-alternatives --remove \ + desktop-theme \ + /usr/share/desktop-base/softwaves-theme + fi diff --git a/gnome-backgrounds.xml b/gnome-backgrounds.xml index 9417852..1e7d983 100644 --- a/gnome-backgrounds.xml +++ b/gnome-backgrounds.xml @@ -3,19 +3,6 @@ - Lines - /usr/share/images/desktop-base/lines.xml - zoom - #ffffff - #000000 - - - Lines lock screen - /usr/share/images/desktop-base/lines-lockscreen.xml - zoom - #ffffff - #000000 - Joy /usr/share/images/desktop-base/joy.xml diff --git a/kde-wallpaper/Lines/contents/images/1024x768.png b/kde-wallpaper/Lines/contents/images/1024x768.png deleted file mode 100644 index b38d875..0000000 Binary files a/kde-wallpaper/Lines/contents/images/1024x768.png and /dev/null differ diff --git a/kde-wallpaper/Lines/contents/images/1280x1024.png b/kde-wallpaper/Lines/contents/images/1280x1024.png deleted file mode 100644 index dc641e6..0000000 Binary files a/kde-wallpaper/Lines/contents/images/1280x1024.png and /dev/null differ diff --git a/kde-wallpaper/Lines/contents/images/1600x1200.png b/kde-wallpaper/Lines/contents/images/1600x1200.png deleted file mode 100644 index 8744133..0000000 Binary files a/kde-wallpaper/Lines/contents/images/1600x1200.png and /dev/null differ diff --git a/kde-wallpaper/Lines/contents/images/1920x1080.png b/kde-wallpaper/Lines/contents/images/1920x1080.png deleted file mode 100644 index 2db13f3..0000000 Binary files a/kde-wallpaper/Lines/contents/images/1920x1080.png and /dev/null differ diff --git a/kde-wallpaper/Lines/contents/images/1920x1200.png b/kde-wallpaper/Lines/contents/images/1920x1200.png deleted file mode 100644 index 6ec3fc6..0000000 Binary files a/kde-wallpaper/Lines/contents/images/1920x1200.png and /dev/null differ diff --git a/kde-wallpaper/Lines/contents/images/2560x1080.png b/kde-wallpaper/Lines/contents/images/2560x1080.png deleted file mode 100644 index 6db10d7..0000000 Binary files a/kde-wallpaper/Lines/contents/images/2560x1080.png and /dev/null differ diff --git a/kde-wallpaper/Lines/contents/screenshot.png b/kde-wallpaper/Lines/contents/screenshot.png deleted file mode 100644 index e9602ef..0000000 Binary files a/kde-wallpaper/Lines/contents/screenshot.png and /dev/null differ diff --git a/kde-wallpaper/Lines/metadata.desktop b/kde-wallpaper/Lines/metadata.desktop deleted file mode 100644 index d5f3362..0000000 --- a/kde-wallpaper/Lines/metadata.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Lines - -X-KDE-PluginInfo-Name=Lines -X-KDE-PluginInfo-Author=Juliette Taka Belin -X-KDE-PluginInfo-Email=juliette.belin@free.fr -X-KDE-PluginInfo-License=GPL-2 diff --git a/lines-theme/gnome-wp-list.xml b/lines-theme/gnome-wp-list.xml new file mode 100644 index 0000000..28ba8ea --- /dev/null +++ b/lines-theme/gnome-wp-list.xml @@ -0,0 +1,20 @@ + + + + + + Lines + /usr/share/desktop-base/lines-theme/wallpaper/gnome-background.xml + zoom + #ffffff + #000000 + + + + Lines Lock Screen + /usr/share/desktop-base/lines-theme/lockscreen/gnome-background.xml + zoom + #ffffff + #000000 + + diff --git a/lines-theme/grub/Makefile b/lines-theme/grub/Makefile new file mode 100644 index 0000000..79be3aa --- /dev/null +++ b/lines-theme/grub/Makefile @@ -0,0 +1,22 @@ +dir = usr/share/desktop-base/lines-theme/grub + +files = \ + grub-4x3.png \ + grub-16x9.png + +build: $(files) + +clean: + rm -f grub-4x3.png grub-16x9.png + +install: + install -d $(DESTDIR)/$(dir) + $(INSTALL) $(wildcard *.png) $(DESTDIR)/$(dir) + +grub-4x3.png: grub-4x3.svg + rsvg-convert $< > $@ + +grub-16x9.png: grub-16x9.svg + rsvg-convert $< > $@ + +include ../../Makefile.inc diff --git a/source/lines/grub-widescreen.svg b/lines-theme/grub/grub-16x9.svg similarity index 71% rename from source/lines/grub-widescreen.svg rename to lines-theme/grub/grub-16x9.svg index 4054504..6741a98 100644 --- a/source/lines/grub-widescreen.svg +++ b/lines-theme/grub/grub-16x9.svg @@ -16,14 +16,14 @@ viewBox="0 0 640 480" enable-background="new 0 0 640 480" xml:space="preserve" - inkscape:version="0.48.5 r10040" - sodipodi:docname="grub.svg" + inkscape:version="0.91 r13725" + sodipodi:docname="grub-16x9.svg" inkscape:export-filename="/tmp/grub.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90">image/svg+xml8 - \ No newline at end of file + inkscape:connector-curvature="0" /> \ No newline at end of file diff --git a/source/lines/grub.svg b/lines-theme/grub/grub-4x3.svg similarity index 71% rename from source/lines/grub.svg rename to lines-theme/grub/grub-4x3.svg index 897e80f..941b833 100644 --- a/source/lines/grub.svg +++ b/lines-theme/grub/grub-4x3.svg @@ -16,14 +16,14 @@ viewBox="0 0 640 480" enable-background="new 0 0 640 480" xml:space="preserve" - inkscape:version="0.48.5 r10040" - sodipodi:docname="grub.svg" + inkscape:version="0.91 r13725" + sodipodi:docname="grub-4x3.svg" inkscape:export-filename="/tmp/grub.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90">image/svg+xml8 - \ No newline at end of file + id="path3085" /> \ No newline at end of file diff --git a/backgrounds/lines-lockscreen_1280x1024.svg b/lines-theme/lockscreen/contents/images/1280x1024.svg similarity index 92% rename from backgrounds/lines-lockscreen_1280x1024.svg rename to lines-theme/lockscreen/contents/images/1280x1024.svg index 9ef27a1..cdca6b9 100644 --- a/backgrounds/lines-lockscreen_1280x1024.svg +++ b/lines-theme/lockscreen/contents/images/1280x1024.svg @@ -12,8 +12,8 @@ inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/coucouf/hack/desktop-base/LinesColor/contents/images/1920x1200.png" - sodipodi:docname="lines-lockscreen_1280x1024.svg" - inkscape:version="0.48.5 r10040" + sodipodi:docname="1280x1024.svg" + inkscape:version="0.91 r13725" x="0px" y="0px" width="1280" @@ -23,7 +23,7 @@ xml:space="preserve">image/svg+xml8 -image/svg+xml8 -image/svg+xml8 - +image/svg+xml \ No newline at end of file diff --git a/backgrounds/lines-lockscreen_2560x1080.svg b/lines-theme/lockscreen/contents/images/2560x1080.svg similarity index 93% rename from backgrounds/lines-lockscreen_2560x1080.svg rename to lines-theme/lockscreen/contents/images/2560x1080.svg index b7411b2..c2f10c7 100644 --- a/backgrounds/lines-lockscreen_2560x1080.svg +++ b/lines-theme/lockscreen/contents/images/2560x1080.svg @@ -12,8 +12,8 @@ inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/coucouf/hack/desktop-base/LinesColor/contents/images/1920x1200.png" - sodipodi:docname="lines-lockscreen_2560x1080.svg" - inkscape:version="0.48.5 r10040" + sodipodi:docname="2560x1080.svg" + inkscape:version="0.91 r13725" x="0px" y="0px" width="2560" @@ -23,7 +23,7 @@ xml:space="preserve">image/svg+xml8 - + + 8640000.0 + + /usr/share/desktop-base/lines-theme/lockscreen/contents/images/1280x1024.svg + /usr/share/desktop-base/lines-theme/lockscreen/contents/images/1600x1200.svg + /usr/share/desktop-base/lines-theme/lockscreen/contents/images/1920x1080.svg + /usr/share/desktop-base/lines-theme/lockscreen/contents/images/1920x1200.svg + /usr/share/desktop-base/lines-theme/lockscreen/contents/images/2560x1080.svg + + + diff --git a/lines-theme/lockscreen/metadata.desktop b/lines-theme/lockscreen/metadata.desktop new file mode 100644 index 0000000..7d0410c --- /dev/null +++ b/lines-theme/lockscreen/metadata.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Lines Lock Screen +Name[fr]=Écran de verrouillage pour Lignes +X-KDE-PluginInfo-Name=LinesLockScreen +X-KDE-PluginInfo-Author=Juliette Taka Belin +X-KDE-PluginInfo-Email=juliettetaka.belin@gmail.com +X-KDE-PluginInfo-License=GPLv2+ diff --git a/lines-theme/login-background-with-logo.svg b/lines-theme/login-background-with-logo.svg deleted file mode 100644 index bd12218..0000000 --- a/lines-theme/login-background-with-logo.svg +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 8 - - diff --git a/lines-theme/login-background.svg b/lines-theme/login/background-nologo.svg similarity index 100% rename from lines-theme/login-background.svg rename to lines-theme/login/background-nologo.svg diff --git a/lines-theme/login/background.svg b/lines-theme/login/background.svg new file mode 100644 index 0000000..791caa6 --- /dev/null +++ b/lines-theme/login/background.svg @@ -0,0 +1,447 @@ + +image/svg+xml \ No newline at end of file diff --git a/lines-theme/login/sddm-preview-nologo.jpg b/lines-theme/login/sddm-preview-nologo.jpg new file mode 100644 index 0000000..adfb74b Binary files /dev/null and b/lines-theme/login/sddm-preview-nologo.jpg differ diff --git a/lines-theme/login/sddm-preview.jpg b/lines-theme/login/sddm-preview.jpg new file mode 100644 index 0000000..f8b44ab Binary files /dev/null and b/lines-theme/login/sddm-preview.jpg differ diff --git a/lines-theme/sddm-preview.jpg b/lines-theme/sddm-preview.jpg deleted file mode 100644 index 254dc8e..0000000 Binary files a/lines-theme/sddm-preview.jpg and /dev/null differ diff --git a/backgrounds/lines-wallpaper_1280x1024.svg b/lines-theme/wallpaper/contents/images/1280x1024.svg similarity index 100% rename from backgrounds/lines-wallpaper_1280x1024.svg rename to lines-theme/wallpaper/contents/images/1280x1024.svg diff --git a/backgrounds/lines-wallpaper_1600x1200.svg b/lines-theme/wallpaper/contents/images/1600x1200.svg similarity index 100% rename from backgrounds/lines-wallpaper_1600x1200.svg rename to lines-theme/wallpaper/contents/images/1600x1200.svg diff --git a/backgrounds/lines-wallpaper_1920x1080.svg b/lines-theme/wallpaper/contents/images/1920x1080.svg similarity index 100% rename from backgrounds/lines-wallpaper_1920x1080.svg rename to lines-theme/wallpaper/contents/images/1920x1080.svg diff --git a/backgrounds/lines-wallpaper_1920x1200.svg b/lines-theme/wallpaper/contents/images/1920x1200.svg similarity index 100% rename from backgrounds/lines-wallpaper_1920x1200.svg rename to lines-theme/wallpaper/contents/images/1920x1200.svg diff --git a/backgrounds/lines-wallpaper_2560x1080.svg b/lines-theme/wallpaper/contents/images/2560x1080.svg similarity index 100% rename from backgrounds/lines-wallpaper_2560x1080.svg rename to lines-theme/wallpaper/contents/images/2560x1080.svg diff --git a/lines-theme/wallpaper/gnome-background.xml b/lines-theme/wallpaper/gnome-background.xml new file mode 100644 index 0000000..bc77637 --- /dev/null +++ b/lines-theme/wallpaper/gnome-background.xml @@ -0,0 +1,12 @@ + + + 8640000.0 + + /usr/share/desktop-base/lines-theme/wallpaper/contents/images/1280x1024.svg + /usr/share/desktop-base/lines-theme/wallpaper/contents/images/1600x1200.svg + /usr/share/desktop-base/lines-theme/wallpaper/contents/images/1920x1080.svg + /usr/share/desktop-base/lines-theme/wallpaper/contents/images/1920x1200.svg + /usr/share/desktop-base/lines-theme/wallpaper/contents/images/2560x1080.svg + + + diff --git a/lines-theme/wallpaper/metadata.desktop b/lines-theme/wallpaper/metadata.desktop new file mode 100644 index 0000000..84104c5 --- /dev/null +++ b/lines-theme/wallpaper/metadata.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Lines +Name[fr]=Lignes +X-KDE-PluginInfo-Name=Lines +X-KDE-PluginInfo-Author=Juliette Taka Belin +X-KDE-PluginInfo-Email=juliettetaka.belin@gmail.com +X-KDE-PluginInfo-License=GPLv2+ diff --git a/softwaves-theme/gnome-wp-list-softwaves.xml b/softwaves-theme/gnome-wp-list.xml similarity index 100% rename from softwaves-theme/gnome-wp-list-softwaves.xml rename to softwaves-theme/gnome-wp-list.xml diff --git a/softwaves-theme/backgrounds/login.svg b/softwaves-theme/login/background.svg similarity index 100% rename from softwaves-theme/backgrounds/login.svg rename to softwaves-theme/login/background.svg diff --git a/softwaves-theme/sddm-preview.jpg b/softwaves-theme/login/sddm-preview.jpg similarity index 100% rename from softwaves-theme/sddm-preview.jpg rename to softwaves-theme/login/sddm-preview.jpg