From 5f7e8a8864b6c3c7b573f9413d8939f449329dde Mon Sep 17 00:00:00 2001
From: Alexander Mikhaylenko <exalm7659@gmail.com>
Date: Sun, 12 Dec 2021 23:54:26 +0500
Subject: Group light/dark wallpapers together

Get rid of the animated adwaita wallpaper, split it into light and dark
versions. Turn every separate dark version into <filename-dark>.
---
 backgrounds/adwaita-timed.xml.in     | 33 ---------------
 backgrounds/adwaita.xml.in           |  3 +-
 backgrounds/gnome-backgrounds.xml.in | 82 ++++++------------------------------
 backgrounds/meson.build              |  8 +---
 4 files changed, 17 insertions(+), 109 deletions(-)
 delete mode 100644 backgrounds/adwaita-timed.xml.in

diff --git a/backgrounds/adwaita-timed.xml.in b/backgrounds/adwaita-timed.xml.in
deleted file mode 100644
index 6b94586..0000000
--- a/backgrounds/adwaita-timed.xml.in
+++ /dev/null
@@ -1,33 +0,0 @@
-<background>
-  <starttime>
-    <year>2011</year>
-    <month>11</month>
-    <day>24</day>
-    <hour>7</hour>
-    <minute>00</minute>
-    <second>00</second>
-  </starttime>
-
-<!-- We start at 7 AM. It will remain up for 12 hours. -->
-<static>
-<duration>43200.0</duration>
-<file>@datadir@/backgrounds/gnome/adwaita-l.jpg</file>
-</static>
-
-<!-- It's 7 PM. It will remain for 12 hours -->
-<static>
-<duration>43200.0</duration>
-<file>@datadir@/backgrounds/gnome/adwaita-d.jpg</file>
-</static>
-
-
-<!--
-FIXME: eventually we'll transition. let's start simple
-<transition type="overlay">
-<duration>21600.0</duration>
-<from>@datadir@/backgrounds/gnome/adwaita-day.jpg</from>
-<to>@datadir@/backgrounds/gnome/adwaita-night.jpg</to>
-</transition>
--->
-
-</background>
diff --git a/backgrounds/adwaita.xml.in b/backgrounds/adwaita.xml.in
index 78f670f..4de08ac 100644
--- a/backgrounds/adwaita.xml.in
+++ b/backgrounds/adwaita.xml.in
@@ -3,7 +3,8 @@
 <wallpapers>
   <wallpaper deleted="false">
     <name>Default Background</name>
-    <filename>@datadir@/backgrounds/gnome/adwaita-timed.xml</filename>
+    <filename>@BACKGROUNDDIR@/adwaita-l.jpg</filename>
+    <filename-dark>@BACKGROUNDDIR@/adwaita-d.jpg</filename-dark>
     <options>zoom</options>
     <shade_type>solid</shade_type>
     <pcolor>#3465a4</pcolor>
diff --git a/backgrounds/gnome-backgrounds.xml.in b/backgrounds/gnome-backgrounds.xml.in
index f08f1b3..1f7a601 100644
--- a/backgrounds/gnome-backgrounds.xml.in
+++ b/backgrounds/gnome-backgrounds.xml.in
@@ -4,88 +4,52 @@
 	<wallpaper deleted="false">
 		<name>2</name>
 		<filename>@BACKGROUNDDIR@/blobs-l.svg</filename>
-		<options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-	</wallpaper>
-	<wallpaper deleted="false">
-		<name>2</name>
-		<filename>@BACKGROUNDDIR@/blobs-d.svg</filename>
+		<filename-dark>@BACKGROUNDDIR@/blobs-d.svg</filename-dark>
 		<options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
 	</wallpaper>
 
-	<wallpaper deleted="false">
-		<name>3</name>
-		<filename>@BACKGROUNDDIR@/brush-strokes-d.jpg</filename>
-		<options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-	</wallpaper>
 	<wallpaper deleted="false">
 		<name>3</name>
 		<filename>@BACKGROUNDDIR@/brush-strokes-l.jpg</filename>
+		<filename-dark>@BACKGROUNDDIR@/brush-strokes-d.jpg</filename-dark>
 		<options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
 	</wallpaper>
 
-	<wallpaper deleted="false">
-		<name>4</name>
-		<filename>@BACKGROUNDDIR@/disco-d.jpg</filename>
-		<options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-	</wallpaper>
 	<wallpaper deleted="false">
 		<name>4</name>
 		<filename>@BACKGROUNDDIR@/disco-l.jpg</filename>
+		<filename-dark>@BACKGROUNDDIR@/disco-d.jpg</filename-dark>
 		<options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
 	</wallpaper>
 
-	<wallpaper deleted="false">
-		<name>5</name>
-		<filename>@BACKGROUNDDIR@/truchet-d.jpg</filename>
-		<options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-	</wallpaper>
 	<wallpaper deleted="false">
 		<name>5</name>
 		<filename>@BACKGROUNDDIR@/truchet-l.jpg</filename>
+		<filename-dark>@BACKGROUNDDIR@/truchet-d.jpg</filename-dark>
 		<options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
 	</wallpaper>
-	
-	<wallpaper deleted="false">
-		<name>6</name>
-		<filename>@BACKGROUNDDIR@/pixels-d.png</filename>
-		<options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-	</wallpaper>
+
 	<wallpaper deleted="false">
 		<name>6</name>
 		<filename>@BACKGROUNDDIR@/pixels-l.png</filename>
+		<filename-dark>@BACKGROUNDDIR@/pixels-d.png</filename-dark>
 		<options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
 	</wallpaper>
-	
-	<wallpaper deleted="false">
-		<name>7</name>
-		<filename>@BACKGROUNDDIR@/symbolics-d.png</filename>
-		<options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-	</wallpaper>
+
 	<wallpaper deleted="false">
 		<name>7</name>
 		<filename>@BACKGROUNDDIR@/symbolics-l.png</filename>
+		<filename-dark>@BACKGROUNDDIR@/symbolics-d.png</filename-dark>
 		<options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
@@ -98,47 +62,29 @@
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
 	</wallpaper>
-	
-	<wallpaper deleted="false">
-		<name>9</name>
-		<filename>@BACKGROUNDDIR@/wood-d.jpg</filename>
-		<options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-	</wallpaper>
+
 	<wallpaper deleted="false">
 		<name>9</name>
 		<filename>@BACKGROUNDDIR@/wood-l.jpg</filename>
+		<filename-dark>@BACKGROUNDDIR@/wood-d.jpg</filename-dark>
 		<options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
 	</wallpaper>
-	
-		<wallpaper deleted="false">
-		<name>10</name>
-		<filename>@BACKGROUNDDIR@/libadwaita-d.jpg</filename>
-		<options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-	</wallpaper>
+
 	<wallpaper deleted="false">
 		<name>10</name>
 		<filename>@BACKGROUNDDIR@/libadwaita-l.jpg</filename>
+		<filename-dark>@BACKGROUNDDIR@/libadwaita-d.jpg</filename-dark>
 		<options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
 	</wallpaper>
-	
-			<wallpaper deleted="false">
-		<name>11</name>
-		<filename>@BACKGROUNDDIR@/drool-d.svg</filename>
-		<options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-	</wallpaper>
+
 	<wallpaper deleted="false">
 		<name>11</name>
 		<filename>@BACKGROUNDDIR@/drool-l.svg</filename>
+		<filename-dark>@BACKGROUNDDIR@/drool-d.svg</filename-dark>
 		<options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
diff --git a/backgrounds/meson.build b/backgrounds/meson.build
index f7f6464..f8e1136 100644
--- a/backgrounds/meson.build
+++ b/backgrounds/meson.build
@@ -2,12 +2,6 @@ dataconf = configuration_data()
 dataconf.set('BACKGROUNDDIR', backgrounddir)
 dataconf.set('datadir', datadir)
 
-adwaita_timed = configure_file(
-  input: 'adwaita-timed.xml.in',
-  output: 'adwaita-timed.xml',
-  configuration: dataconf
-)
-
 backgrounds = [
   'adwaita-d.jpg',
   'adwaita-l.jpg',
@@ -32,7 +26,7 @@ backgrounds = [
   'wood-l.jpg'
 ]
 
-install_data([adwaita_timed] + backgrounds, install_dir: backgrounddir)
+install_data(backgrounds, install_dir: backgrounddir)
 
 foreach metadata : ['gnome-backgrounds.xml', 'adwaita.xml']
   configure_file(
-- 
cgit v1.2.1