diff options
author | Jakub Steiner <jimmac@gmail.com> | 2014-08-06 18:15:15 +0200 |
---|---|---|
committer | Jakub Steiner <jimmac@gmail.com> | 2014-08-06 18:15:15 +0200 |
commit | 484d6dd0816bbaa944fbd24c4f9675bb8760fece (patch) | |
tree | a7f473b31646abb2c9d214b03368f442c4d78e34 | |
parent | fa3e9399e09801fa7626f1bc2e64a30a403bbe9d (diff) |
background: move from here to gnome-backgrounds
- default bg now ships with gnome-backgrounds instead
where the lock screen was.
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | themes/Adwaita/Makefile.am | 2 | ||||
-rw-r--r-- | themes/Adwaita/backgrounds/Makefile.am | 27 | ||||
-rw-r--r-- | themes/Adwaita/backgrounds/adwaita-timed.xml.in | 51 | ||||
-rw-r--r-- | themes/Adwaita/backgrounds/adwaita.xml.in.in | 12 | ||||
-rw-r--r-- | themes/Adwaita/backgrounds/bright-day.jpg | bin | 1448256 -> 0 bytes | |||
-rw-r--r-- | themes/Adwaita/backgrounds/good-night.jpg | bin | 473584 -> 0 bytes | |||
-rw-r--r-- | themes/Adwaita/backgrounds/morning.jpg | bin | 1182508 -> 0 bytes |
8 files changed, 1 insertions, 92 deletions
diff --git a/configure.ac b/configure.ac index 02067088..c74b9ee2 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,6 @@ AC_CONFIG_FILES([ Makefile themes/Makefile themes/Adwaita/Makefile -themes/Adwaita/backgrounds/Makefile themes/Adwaita/gtk-2.0/Makefile themes/Adwaita/gtk-3.0/Makefile themes/Adwaita/metacity-1/Makefile diff --git a/themes/Adwaita/Makefile.am b/themes/Adwaita/Makefile.am index 3cb1d77e..a0eb9a9e 100644 --- a/themes/Adwaita/Makefile.am +++ b/themes/Adwaita/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = backgrounds metacity-1 gtk-3.0 +SUBDIRS = metacity-1 gtk-3.0 if GTK2_ENGINE SUBDIRS += gtk-2.0 diff --git a/themes/Adwaita/backgrounds/Makefile.am b/themes/Adwaita/backgrounds/Makefile.am deleted file mode 100644 index 50855605..00000000 --- a/themes/Adwaita/backgrounds/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ - -backgrounddir = $(datadir)/themes/Adwaita/backgrounds -background_DATA = \ - adwaita-timed.xml \ - bright-day.jpg \ - good-night.jpg \ - morning.jpg - - -metadata_in_files = adwaita.xml.in -metadatadir = $(datadir)/gnome-background-properties -metadata_DATA = $(metadata_in_files:.xml.in=.xml) - -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 - -@INTLTOOL_XML_RULE@ - -noinst_DATA = adwaita.xml.in -CLEANFILES = adwaita.xml adwaita.xml.in adwaita-timed.xml - -EXTRA_DIST = $(background_DATA) adwaita.xml.in.in adwaita-timed.xml.in diff --git a/themes/Adwaita/backgrounds/adwaita-timed.xml.in b/themes/Adwaita/backgrounds/adwaita-timed.xml.in deleted file mode 100644 index 54b6de3e..00000000 --- a/themes/Adwaita/backgrounds/adwaita-timed.xml.in +++ /dev/null @@ -1,51 +0,0 @@ -<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/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/morning.jpg</from> -<to>@datadir@/themes/Adwaita/backgrounds/bright-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/bright-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/bright-day.jpg</from> -<to>@datadir@/themes/Adwaita/backgrounds/good-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/good-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/good-night.jpg</from> -<to>@datadir@/themes/Adwaita/backgrounds/morning.jpg</to> -</transition> -</background> diff --git a/themes/Adwaita/backgrounds/adwaita.xml.in.in b/themes/Adwaita/backgrounds/adwaita.xml.in.in deleted file mode 100644 index 75793470..00000000 --- a/themes/Adwaita/backgrounds/adwaita.xml.in.in +++ /dev/null @@ -1,12 +0,0 @@ -<?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/themes/Adwaita/backgrounds/bright-day.jpg b/themes/Adwaita/backgrounds/bright-day.jpg Binary files differdeleted file mode 100644 index 910feaba..00000000 --- a/themes/Adwaita/backgrounds/bright-day.jpg +++ /dev/null diff --git a/themes/Adwaita/backgrounds/good-night.jpg b/themes/Adwaita/backgrounds/good-night.jpg Binary files differdeleted file mode 100644 index 0fd83401..00000000 --- a/themes/Adwaita/backgrounds/good-night.jpg +++ /dev/null diff --git a/themes/Adwaita/backgrounds/morning.jpg b/themes/Adwaita/backgrounds/morning.jpg Binary files differdeleted file mode 100644 index 33be99ef..00000000 --- a/themes/Adwaita/backgrounds/morning.jpg +++ /dev/null |