GNOME.org
 

[gnome-backgrounds] include a default wallpaper

commit ca908a177d5c88c3844403f7838eb12ecffa6be1
Author: Jakub Steiner <jimmac gmail com>
Date:   Wed Aug 6 17:31:32 2014 +0200

    include a default wallpaper

 backgrounds/Makefile.am                      |   25 +++++++++----
 backgrounds/adwaita-day.jpg                  |  Bin 0 -> 1982870 bytes
 backgrounds/{Locked.jpg => adwaita-lock.jpg} |  Bin 1082700 -> 1082700 bytes
 backgrounds/adwaita-morning.jpg              |  Bin 0 -> 1038873 bytes
 backgrounds/adwaita-night.jpg                |  Bin 0 -> 473584 bytes
 backgrounds/adwaita-timed.xml.in             |   51 ++++++++++++++++++++++++++
 backgrounds/adwaita.xml.in.in                |   12 ++++++
 backgrounds/gnome-backgrounds.xml.in.in      |   15 ++++++--
 8 files changed, 93 insertions(+), 10 deletions(-)
---
diff --git a/backgrounds/Makefile.am b/backgrounds/Makefile.am
index ffb1bdf..a4fe8db 100644
--- a/backgrounds/Makefile.am
+++ b/backgrounds/Makefile.am
@@ -1,6 +1,11 @@
 backgrounddir = $(datadir)/backgrounds/gnome
 
 background_DATA =\
+       adwaita-day.jpg \
+       adwaita-lock.jpg \
+       adwaita-morning.jpg \
+       adwaita-night.jpg \
+       adwaita-timed.xml \
        Blinds.jpg \
        Bokeh_Tails.jpg \
        Chmiri.jpg \
@@ -8,7 +13,6 @@ background_DATA =\
        Fabric.jpg \
        Flowerbed.jpg \
        FootFall.png \
-       Locked.jpg \
        Mirror.jpg \
        Road.jpg \
        Sandstone.jpg \
@@ -17,18 +21,25 @@ background_DATA =\
        Waves.jpg \
        Whispy_Tails.jpg
 
-metadata_in_files = gnome-backgrounds.xml.in
+metadata_in_files = gnome-backgrounds.xml.in adwaita.xml.in
 metadatadir = $(datadir)/gnome-background-properties
 metadata_DATA = $(metadata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
-noinst_DATA = gnome-backgrounds.xml.in
-CLEANFILES = gnome-backgrounds.xml gnome-backgrounds.xml.in
+noinst_DATA = gnome-backgrounds.xml.in adwaita.xml.in
+CLEANFILES = gnome-backgrounds.xml gnome-backgrounds.xml.in adwaita.xml adwaita.xml.in adwaita-timed.xml
 
-EXTRA_DIST = $(background_DATA) gnome-backgrounds.xml.in.in
+EXTRA_DIST = $(background_DATA) gnome-backgrounds.xml.in.in adwaita.xml.in.in adwaita-timed.xml.in
 
-edit = sed \
-       -e 's|@BACKGROUNDDIR[ ]|$(backgrounddir)|g'
+edit = sed -e 's|@BACKGROUNDDIR[ ]|$(backgrounddir)|g'
+
+adwaita.xml.in: adwaita.xml.in.in Makefile
+       $(AM_V_GEN) sed -e 's^\ datadir\@^$(datadir)^g' < $(srcdir)/adwaita.xml.in.in > adwaita.xml.in.tmp \
+       && mv adwaita.xml.in.tmp adwaita.xml.in
+
+adwaita-timed.xml: adwaita-timed.xml.in Makefile
+       $(AM_V_GEN) sed -e 's^\ datadir\@^$(datadir)^g' < $(srcdir)/adwaita-timed.xml.in > 
adwaita-timed.xml.tmp \
+       && mv adwaita-timed.xml.tmp adwaita-timed.xml
 
 gnome-backgrounds.xml.in: gnome-backgrounds.xml.in.in Makefile
        $(edit) $< >$@
diff --git a/backgrounds/adwaita-day.jpg b/backgrounds/adwaita-day.jpg
new file mode 100644
index 0000000..119ed5f
Binary files /dev/null and b/backgrounds/adwaita-day.jpg differ
diff --git a/backgrounds/adwaita-morning.jpg b/backgrounds/adwaita-morning.jpg
new file mode 100644
index 0000000..96eeb33
Binary files /dev/null and b/backgrounds/adwaita-morning.jpg differ
diff --git a/backgrounds/adwaita-night.jpg b/backgrounds/adwaita-night.jpg
new file mode 100644
index 0000000..0fd8340
Binary files /dev/null and b/backgrounds/adwaita-night.jpg differ
diff --git a/backgrounds/adwaita-timed.xml.in b/backgrounds/adwaita-timed.xml.in
new file mode 100644
index 0000000..c2ae451
--- /dev/null
+++ b/backgrounds/adwaita-timed.xml.in
@@ -0,0 +1,51 @@
+<background>
+  <starttime>
+    <year>2011</year>
+    <month>11</month>
+    <day>24</day>
+    <hour>7</hour>
+    <minute>00</minute>
+    <second>00</second>
+  </starttime>
+
+<!-- This animation will start at 7 AM. -->
+
+<!-- We start with sunrise at 7 AM. It will remain up for 1 hour. -->
+<static>
+<duration>3600.0</duration>
+<file>@datadir@/themes/Adwaita/backgrounds/adwaita-morning.jpg</file>
+</static>
+
+<!-- Sunrise starts to transition to day at 8 AM. The transition lasts for 5 hours, ending at 1 PM. -->
+<transition type="overlay">
+<duration>18000.0</duration>
+<from>@datadir@/themes/Adwaita/backgrounds/adwaita-morning.jpg</from>
+<to>@datadir@/themes/Adwaita/backgrounds/adwaita-day.jpg</to>
+</transition>
+
+<!-- It's 1 PM, we're showing the day image in full force now, for 5 hours ending at 6 PM. -->
+<static>
+<duration>18000.0</duration>
+<file>@datadir@/themes/Adwaita/backgrounds/adwaita-day.jpg</file>
+</static>
+
+<!-- It's 7 PM and it's going to start to get darker. This will transition for 6 hours up until midnight. -->
+<transition type="overlay">
+<duration>21600.0</duration>
+<from>@datadir@/themes/Adwaita/backgrounds/adwaita-day.jpg</from>
+<to>@datadir@/themes/Adwaita/backgrounds/adwaita-night.jpg</to>
+</transition>
+
+<!-- It's midnight. It'll stay dark for 5 hours up until 5 AM. -->
+<static>
+<duration>18000.0</duration>
+<file>@datadir@/themes/Adwaita/backgrounds/adwaita-night.jpg</file>
+</static>
+
+<!-- It's 5 AM. We'll start transitioning to sunrise for 2 hours up until 7 AM. -->
+<transition type="overlay">
+<duration>7200.0</duration>
+<from>@datadir@/themes/Adwaita/backgrounds/adwaita-night.jpg</from>
+<to>@datadir@/themes/Adwaita/backgrounds/adwaita-morning.jpg</to>
+</transition>
+</background>
diff --git a/backgrounds/adwaita.xml.in.in b/backgrounds/adwaita.xml.in.in
new file mode 100644
index 0000000..7579347
--- /dev/null
+++ b/backgrounds/adwaita.xml.in.in
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <_name>Default Background</_name>
+    <filename>@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml</filename>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#3465a4</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+</wallpapers>
diff --git a/backgrounds/gnome-backgrounds.xml.in.in b/backgrounds/gnome-backgrounds.xml.in.in
index 941d460..118ad8d 100644
--- a/backgrounds/gnome-backgrounds.xml.in.in
+++ b/backgrounds/gnome-backgrounds.xml.in.in
@@ -64,11 +64,20 @@
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
        </wallpaper>
-               <wallpaper deleted="false">
-               <!-- TRANSLATORS: This is the name of this background picture: 
http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Locked.jpg - 
+       <wallpaper deleted="false">
+               <!-- TRANSLATORS: This is the name of this background picture: 
http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/adwaita-morning.jpg - 
+               You might want to translate it into the equivalent words of your language  -->
+               <_name>Adwaita</_name>
+               <filename>@BACKGROUNDDIR@/adwaita-timed.xml</filename>
+               <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+       </wallpaper>
+       <wallpaper deleted="false">
+               <!-- TRANSLATORS: This is the name of this background picture: 
http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/adwaita-night.jpg - 
                You might want to translate it into the equivalent words of your language  -->
                <_name>Lock Screen</_name>
-               <filename>@BACKGROUNDDIR@/Locked.jpg</filename>
+               <filename>@BACKGROUNDDIR@/adwaita-lock.jpg</filename>
                <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]