diff --git a/Makefile b/Makefile index b775ceb..bfd99a2 100644 --- a/Makefile +++ b/Makefile @@ -215,14 +215,17 @@ install-local: install -d $(DESTDIR)/usr/share/wallpapers cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/futureprototype-theme/wallpaper FuturePrototype - ### Lockscreen - install -d $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images - $(INSTALL_DATA) futureprototype-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/lockscreen - $(INSTALL_DATA) futureprototype-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/lockscreen - $(INSTALL_DATA) $(wildcard futureprototype-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images/ + ### Lockscreen is using the same image as wallpaper + cd $(DESTDIR)/usr/share/desktop-base/futureprototype-theme && ln -s wallpaper lockscreen + + ### Alternate wallpaper with Debian swirl + install -d $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images + $(INSTALL_DATA) futureprototype-theme/wallpaper-withlogo/metadata.desktop $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo + $(INSTALL_DATA) futureprototype-theme/wallpaper-withlogo/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo + $(INSTALL_DATA) $(wildcard futureprototype-theme/wallpaper-withlogo/contents/images/*) $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images/ # Lock screen symlink for KDE install -d $(DESTDIR)/usr/share/wallpapers - cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/futureprototype-theme/lockscreen FuturePrototypeLockScreen + cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo FuturePrototypeWithLogo # Moonlight theme ### Plymouth theme diff --git a/futureprototype-theme/gnome-wp-list.xml b/futureprototype-theme/gnome-wp-list.xml index 5e5e99b..6e7f3d2 100644 --- a/futureprototype-theme/gnome-wp-list.xml +++ b/futureprototype-theme/gnome-wp-list.xml @@ -11,8 +11,8 @@ - futurePrototype Lock Screen - /usr/share/desktop-base/futureprototype-theme/lockscreen/gnome-background.xml + futurePrototype with Debian swirl + /usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/gnome-background.xml zoom #ffffff #000000 diff --git a/futureprototype-theme/lockscreen/contents/images/2560x1440.svg b/futureprototype-theme/lockscreen/contents/images/2560x1440.svg deleted file mode 100644 index 4099e23..0000000 --- a/futureprototype-theme/lockscreen/contents/images/2560x1440.svg +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/futureprototype-theme/lockscreen/contents/images/1280x1024.svg b/futureprototype-theme/wallpaper-withlogo/contents/images/1280x1024.svg similarity index 57% rename from futureprototype-theme/lockscreen/contents/images/1280x1024.svg rename to futureprototype-theme/wallpaper-withlogo/contents/images/1280x1024.svg index 0d17ebc..7b9a540 100644 --- a/futureprototype-theme/lockscreen/contents/images/1280x1024.svg +++ b/futureprototype-theme/wallpaper-withlogo/contents/images/1280x1024.svg @@ -2,6 +2,7 @@ @@ -53,7 +54,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.34293402" - inkscape:cx="-999.55202" + inkscape:cx="-241.38869" inkscape:cy="1003.3253" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -63,9 +64,9 @@ inkscape:showpageshadow="false" showborder="true" inkscape:window-width="1920" - inkscape:window-height="1008" - inkscape:window-x="0" - inkscape:window-y="36" + inkscape:window-height="1017" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -87,7 +88,7 @@ image/svg+xml - + @@ -177,5 +178,97 @@ id="layer3" inkscape:label="swirl" style="display:inline" - transform="translate(0,-300.56667)" /> + transform="translate(0,-300.56667)"> + + + + + + + + + + + + + + + + + + + diff --git a/futureprototype-theme/lockscreen/contents/images/1600x1200.svg b/futureprototype-theme/wallpaper-withlogo/contents/images/1600x1200.svg similarity index 57% rename from futureprototype-theme/lockscreen/contents/images/1600x1200.svg rename to futureprototype-theme/wallpaper-withlogo/contents/images/1600x1200.svg index 5dba296..768ad2c 100644 --- a/futureprototype-theme/lockscreen/contents/images/1600x1200.svg +++ b/futureprototype-theme/wallpaper-withlogo/contents/images/1600x1200.svg @@ -2,6 +2,7 @@ @@ -53,7 +54,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.42915156" - inkscape:cx="-27.575059" + inkscape:cx="578.27151" inkscape:cy="612.16319" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -63,9 +64,9 @@ inkscape:showpageshadow="false" showborder="true" inkscape:window-width="1920" - inkscape:window-height="1008" - inkscape:window-x="0" - inkscape:window-y="36" + inkscape:window-height="1017" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -87,7 +88,7 @@ image/svg+xml - + @@ -177,5 +178,97 @@ id="layer3" inkscape:label="swirl" style="display:inline" - transform="translate(0,-254)" /> + transform="translate(0,-254)"> + + + + + + + + + + + + + + + + + + + diff --git a/futureprototype-theme/lockscreen/contents/images/1920x1080.svg b/futureprototype-theme/wallpaper-withlogo/contents/images/1920x1080.svg similarity index 57% rename from futureprototype-theme/lockscreen/contents/images/1920x1080.svg rename to futureprototype-theme/wallpaper-withlogo/contents/images/1920x1080.svg index bbe8b0e..cc6f220 100644 --- a/futureprototype-theme/lockscreen/contents/images/1920x1080.svg +++ b/futureprototype-theme/wallpaper-withlogo/contents/images/1920x1080.svg @@ -2,6 +2,7 @@ @@ -53,7 +54,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.30345598" - inkscape:cx="-260.16367" + inkscape:cx="596.63276" inkscape:cy="188.50222" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -63,9 +64,9 @@ inkscape:showpageshadow="false" showborder="true" inkscape:window-width="1920" - inkscape:window-height="1008" - inkscape:window-x="0" - inkscape:window-y="36" + inkscape:window-height="1017" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -87,7 +88,7 @@ image/svg+xml - + @@ -177,5 +178,97 @@ id="layer3" inkscape:label="swirl" style="display:inline" - transform="translate(0,-285.75)" /> + transform="translate(0,-285.75)"> + + + + + + + + + + + + + + + + + + + diff --git a/futureprototype-theme/lockscreen/contents/images/1920x1200.svg b/futureprototype-theme/wallpaper-withlogo/contents/images/1920x1200.svg similarity index 57% rename from futureprototype-theme/lockscreen/contents/images/1920x1200.svg rename to futureprototype-theme/wallpaper-withlogo/contents/images/1920x1200.svg index 29565e0..c40ec05 100644 --- a/futureprototype-theme/lockscreen/contents/images/1920x1200.svg +++ b/futureprototype-theme/wallpaper-withlogo/contents/images/1920x1200.svg @@ -2,6 +2,7 @@ @@ -53,7 +54,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.54253234" - inkscape:cx="474.76797" + inkscape:cx="954.00207" inkscape:cy="593.33224" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -63,9 +64,9 @@ inkscape:showpageshadow="false" showborder="true" inkscape:window-width="1920" - inkscape:window-height="1008" - inkscape:window-x="0" - inkscape:window-y="36" + inkscape:window-height="1017" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -177,5 +178,97 @@ id="layer3" inkscape:label="swirl" style="display:inline" - transform="translate(0,-254)" /> + transform="translate(0,-254)"> + + + + + + + + + + + + + + + + + + + diff --git a/futureprototype-theme/lockscreen/contents/images/2560x1080.svg b/futureprototype-theme/wallpaper-withlogo/contents/images/2560x1080.svg similarity index 57% rename from futureprototype-theme/lockscreen/contents/images/2560x1080.svg rename to futureprototype-theme/wallpaper-withlogo/contents/images/2560x1080.svg index bb9d318..53a879a 100644 --- a/futureprototype-theme/lockscreen/contents/images/2560x1080.svg +++ b/futureprototype-theme/wallpaper-withlogo/contents/images/2560x1080.svg @@ -2,6 +2,7 @@ @@ -53,7 +54,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.21676817" - inkscape:cx="-121.57829" + inkscape:cx="1077.8598" inkscape:cy="876.45703" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -63,9 +64,9 @@ inkscape:showpageshadow="false" showborder="true" inkscape:window-width="1920" - inkscape:window-height="1008" - inkscape:window-x="0" - inkscape:window-y="36" + inkscape:window-height="1017" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -87,7 +88,7 @@ image/svg+xml - + @@ -178,5 +179,94 @@ id="layer3" inkscape:label="swirl" style="display:inline" - transform="translate(0,-285.75)" /> + transform="translate(0,-285.75)"> + + + + + + + + + + + + + + + + + + + diff --git a/futureprototype-theme/wallpaper-withlogo/contents/images/2560x1440.svg b/futureprototype-theme/wallpaper-withlogo/contents/images/2560x1440.svg new file mode 100644 index 0000000..cc1a194 --- /dev/null +++ b/futureprototype-theme/wallpaper-withlogo/contents/images/2560x1440.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/futureprototype-theme/lockscreen/contents/images/3840x2160.svg b/futureprototype-theme/wallpaper-withlogo/contents/images/3840x2160.svg similarity index 59% rename from futureprototype-theme/lockscreen/contents/images/3840x2160.svg rename to futureprototype-theme/wallpaper-withlogo/contents/images/3840x2160.svg index 6d8ee6f..b50f2ef 100644 --- a/futureprototype-theme/lockscreen/contents/images/3840x2160.svg +++ b/futureprototype-theme/wallpaper-withlogo/contents/images/3840x2160.svg @@ -2,6 +2,7 @@ + style="display:inline"> + + + + + + + + + + + + + + + + + + + diff --git a/futureprototype-theme/lockscreen/gnome-background.xml b/futureprototype-theme/wallpaper-withlogo/gnome-background.xml similarity index 50% rename from futureprototype-theme/lockscreen/gnome-background.xml rename to futureprototype-theme/wallpaper-withlogo/gnome-background.xml index 177b0ab..d81dbc5 100644 --- a/futureprototype-theme/lockscreen/gnome-background.xml +++ b/futureprototype-theme/wallpaper-withlogo/gnome-background.xml @@ -2,13 +2,13 @@ 8640000.0 - /usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images/1280x1024.svg - /usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images/1600x1200.svg - /usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images/1920x1080.svg - /usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images/1920x1200.svg - /usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images/2560x1080.svg - /usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images/2560x1440.svg - /usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images/3840x2160.svg + /usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images/1280x1024.svg + /usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images/1600x1200.svg + /usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images/1920x1080.svg + /usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images/1920x1200.svg + /usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images/2560x1080.svg + /usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images/2560x1440.svg + /usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images/3840x2160.svg diff --git a/futureprototype-theme/lockscreen/metadata.desktop b/futureprototype-theme/wallpaper-withlogo/metadata.desktop similarity index 61% rename from futureprototype-theme/lockscreen/metadata.desktop rename to futureprototype-theme/wallpaper-withlogo/metadata.desktop index 1508f06..65ff0a1 100644 --- a/futureprototype-theme/lockscreen/metadata.desktop +++ b/futureprototype-theme/wallpaper-withlogo/metadata.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Name=futurePrototype Lock Screen -X-KDE-PluginInfo-Name=futurePrototypeLockScreen +Name=futurePrototype with Debian swirl +X-KDE-PluginInfo-Name=futurePrototype X-KDE-PluginInfo-Author=Alex Makas X-KDE-PluginInfo-Email=radicalmonday@gmail.com X-KDE-PluginInfo-License=GPLv2+ diff --git a/futureprototype-theme/wallpaper/contents/images/1280x1024.svg b/futureprototype-theme/wallpaper/contents/images/1280x1024.svg index 7b9a540..0d17ebc 100644 --- a/futureprototype-theme/wallpaper/contents/images/1280x1024.svg +++ b/futureprototype-theme/wallpaper/contents/images/1280x1024.svg @@ -2,7 +2,6 @@ @@ -54,7 +53,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.34293402" - inkscape:cx="-241.38869" + inkscape:cx="-999.55202" inkscape:cy="1003.3253" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -64,9 +63,9 @@ inkscape:showpageshadow="false" showborder="true" inkscape:window-width="1920" - inkscape:window-height="1017" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:window-height="1008" + inkscape:window-x="0" + inkscape:window-y="36" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -88,7 +87,7 @@ image/svg+xml - + @@ -178,97 +177,5 @@ id="layer3" inkscape:label="swirl" style="display:inline" - transform="translate(0,-300.56667)"> - - - - - - - - - - - - - - - - - - - + transform="translate(0,-300.56667)" /> diff --git a/futureprototype-theme/wallpaper/contents/images/1600x1200.svg b/futureprototype-theme/wallpaper/contents/images/1600x1200.svg index 768ad2c..5dba296 100644 --- a/futureprototype-theme/wallpaper/contents/images/1600x1200.svg +++ b/futureprototype-theme/wallpaper/contents/images/1600x1200.svg @@ -2,7 +2,6 @@ @@ -54,7 +53,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.42915156" - inkscape:cx="578.27151" + inkscape:cx="-27.575059" inkscape:cy="612.16319" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -64,9 +63,9 @@ inkscape:showpageshadow="false" showborder="true" inkscape:window-width="1920" - inkscape:window-height="1017" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:window-height="1008" + inkscape:window-x="0" + inkscape:window-y="36" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -88,7 +87,7 @@ image/svg+xml - + @@ -178,97 +177,5 @@ id="layer3" inkscape:label="swirl" style="display:inline" - transform="translate(0,-254)"> - - - - - - - - - - - - - - - - - - - + transform="translate(0,-254)" /> diff --git a/futureprototype-theme/wallpaper/contents/images/1920x1080.svg b/futureprototype-theme/wallpaper/contents/images/1920x1080.svg index cc6f220..bbe8b0e 100644 --- a/futureprototype-theme/wallpaper/contents/images/1920x1080.svg +++ b/futureprototype-theme/wallpaper/contents/images/1920x1080.svg @@ -2,7 +2,6 @@ @@ -54,7 +53,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.30345598" - inkscape:cx="596.63276" + inkscape:cx="-260.16367" inkscape:cy="188.50222" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -64,9 +63,9 @@ inkscape:showpageshadow="false" showborder="true" inkscape:window-width="1920" - inkscape:window-height="1017" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:window-height="1008" + inkscape:window-x="0" + inkscape:window-y="36" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -88,7 +87,7 @@ image/svg+xml - + @@ -178,97 +177,5 @@ id="layer3" inkscape:label="swirl" style="display:inline" - transform="translate(0,-285.75)"> - - - - - - - - - - - - - - - - - - - + transform="translate(0,-285.75)" /> diff --git a/futureprototype-theme/wallpaper/contents/images/1920x1200.svg b/futureprototype-theme/wallpaper/contents/images/1920x1200.svg index c40ec05..29565e0 100644 --- a/futureprototype-theme/wallpaper/contents/images/1920x1200.svg +++ b/futureprototype-theme/wallpaper/contents/images/1920x1200.svg @@ -2,7 +2,6 @@ @@ -54,7 +53,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.54253234" - inkscape:cx="954.00207" + inkscape:cx="474.76797" inkscape:cy="593.33224" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -64,9 +63,9 @@ inkscape:showpageshadow="false" showborder="true" inkscape:window-width="1920" - inkscape:window-height="1017" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:window-height="1008" + inkscape:window-x="0" + inkscape:window-y="36" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -178,97 +177,5 @@ id="layer3" inkscape:label="swirl" style="display:inline" - transform="translate(0,-254)"> - - - - - - - - - - - - - - - - - - - + transform="translate(0,-254)" /> diff --git a/futureprototype-theme/wallpaper/contents/images/2560x1080.svg b/futureprototype-theme/wallpaper/contents/images/2560x1080.svg index 53a879a..bb9d318 100644 --- a/futureprototype-theme/wallpaper/contents/images/2560x1080.svg +++ b/futureprototype-theme/wallpaper/contents/images/2560x1080.svg @@ -2,7 +2,6 @@ @@ -54,7 +53,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.21676817" - inkscape:cx="1077.8598" + inkscape:cx="-121.57829" inkscape:cy="876.45703" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -64,9 +63,9 @@ inkscape:showpageshadow="false" showborder="true" inkscape:window-width="1920" - inkscape:window-height="1017" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:window-height="1008" + inkscape:window-x="0" + inkscape:window-y="36" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -88,7 +87,7 @@ image/svg+xml - + @@ -179,94 +178,5 @@ id="layer3" inkscape:label="swirl" style="display:inline" - transform="translate(0,-285.75)"> - - - - - - - - - - - - - - - - - - - + transform="translate(0,-285.75)" /> diff --git a/futureprototype-theme/wallpaper/contents/images/2560x1440.svg b/futureprototype-theme/wallpaper/contents/images/2560x1440.svg index cc1a194..4099e23 100644 --- a/futureprototype-theme/wallpaper/contents/images/2560x1440.svg +++ b/futureprototype-theme/wallpaper/contents/images/2560x1440.svg @@ -2,7 +2,6 @@ + viewbox-x="-6.61" /> @@ -102,22 +102,16 @@ id="layer2" inkscape:label="back" style="display:inline" - transform="translate(107.24624,-238.12595)" /> + transform="translate(107.24443,-238.125)" /> - + transform="translate(107.24443,36.375013)" + style="display:inline"> + id="g881" + transform="matrix(1.3333333,0,0,1.3333333,-84.666666,-51.374996)"> - - - - - - - - - - + transform="translate(0,-274.50001)" /> + id="g865"> + id="g852"> - - - - - - - - - - - - + id="g840"> + + + + + + + + + + + diff --git a/futureprototype-theme/wallpaper/contents/images/3840x2160.svg b/futureprototype-theme/wallpaper/contents/images/3840x2160.svg index b50f2ef..6d8ee6f 100644 --- a/futureprototype-theme/wallpaper/contents/images/3840x2160.svg +++ b/futureprototype-theme/wallpaper/contents/images/3840x2160.svg @@ -2,7 +2,6 @@ - - - - - - - - - - - - - - - - - - - + style="display:inline" />