[Mageia-sysadm] [484] More fixes for theme

[root at mageia.org]

Revision: 484
Author:   dmorgan
Date:     2011-02-07 23:31:52 +0100 (Mon, 07 Feb 2011)
Log Message:
-----------
More fixes for theme

Modified Paths:
--------------
    theme/mageia-theme/trunk/Makefile

Added Paths:
-----------
    theme/mageia-theme/trunk/Mageia-Default/background/Mageia-Default.xml

Removed Paths:
-------------
    theme/mageia-theme/trunk/Mageia-Default/background/Mageia-default.xml

Copied: theme/mageia-theme/trunk/Mageia-Default/background/Mageia-Default.xml (from rev 483, theme/mageia-theme/trunk/Mageia-Default/background/Mageia-default.xml)
===================================================================
--- theme/mageia-theme/trunk/Mageia-Default/background/Mageia-Default.xml	                        (rev 0)
+++ theme/mageia-theme/trunk/Mageia-Default/background/Mageia-Default.xml	2011-02-07 22:31:52 UTC (rev 484)
@@ -0,0 +1,147 @@
+<background>
+  <starttime>
+    <year>2011</year>
+    <month>01</month>
+    <day>01</day>
+    <hour>07</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>
+	<!--	/usr/share/mdk/backgrounds/Mageia-default-0700.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0700.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0700.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0700.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0700.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0700.jpg</size>
+</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>
+	<!--	/usr/share/mdk/backgrounds/Mageia-default-0700.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0700.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0700.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0700.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0700.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0700.jpg</size>
+</from>
+<to>
+	<!-- /usr/share/mdk/backgrounds/Mageia-default-1300.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1300.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1300.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1300.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1300.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1300.jpg</size>
+</to>
+</transition>
+
+<!-- It's 1 PM, we're showing the day image in full force now, for 2 hours ending at 3 PM. -->
+<static>
+<duration>7200.0</duration>
+<file>
+	<!-- /usr/share/mdk/backgrounds/Mageia-default-1300.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1300.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1300.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1300.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1300.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1300.jpg</size>
+</file>
+</static>
+
+<!-- It's 3 PM, and we're starting to transition to sunset. Transition completes at 6 PM. -->
+<transition type="overlay">
+<duration>10800.0</duration>
+<from>
+	<!-- /usr/share/mdk/backgrounds/Mageia-default-1300.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1300.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1300.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1300.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1300.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1300.jpg</size>
+</from>
+<to>
+	<!-- /usr/share/mdk/backgrounds/Mageia-default-1800.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1800.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1800.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1800.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1800.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1800.jpg</size>
+</to>
+</transition>
+
+<!-- It's 6 PM, and it's sunset, for an hour. Ends at 7. -->
+<static>
+<duration>3600.0</duration>
+<file>
+	<!-- /usr/share/mdk/backgrounds/Mageia-default-1800.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1800.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1800.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1800.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1800.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1800.jpg</size>
+</file>
+</static>
+
+<!-- It's 7 PM and it's going to start to get darker. This will transition for 5 hours up until midnight. -->
+<transition type="overlay">
+<duration>18000.0</duration>
+<from>
+	<!-- /usr/share/mdk/backgrounds/Mageia-default-1800.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1800.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1800.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1800.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1800.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1800.jpg</size>
+</from>
+<to>
+	<!-- /usr/share/mdk/backgrounds/Mageia-default-0000.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0000.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0000.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0000.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0000.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0000.jpg</size>
+</to>
+</transition>
+
+<!-- It's midnight. It'll stay dark for 5 hours up until 5 AM. -->
+<static>
+<duration>18000.0</duration>
+<file>
+	<!-- /usr/share/mdk/backgrounds/Mageia-default-0000.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0000.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0000.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0000.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0000.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0000.jpg</size>
+</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>
+	<!-- /usr/share/mdk/backgrounds/Mageia-default-0000.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0000.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0000.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0000.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0000.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0000.jpg</size>
+</from>
+<to>
+	<!-- /usr/share/mdk/backgrounds/Mageia-default-0700.jpg -->
+	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0000.jpg</size>
+	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0000.jpg</size>
+	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0000.jpg</size>
+	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0000.jpg</size>
+	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0000.jpg</size>
+</to>
+</transition>
+</background>

Deleted: theme/mageia-theme/trunk/Mageia-Default/background/Mageia-default.xml
===================================================================
--- theme/mageia-theme/trunk/Mageia-Default/background/Mageia-default.xml	2011-02-07 21:37:54 UTC (rev 483)
+++ theme/mageia-theme/trunk/Mageia-Default/background/Mageia-default.xml	2011-02-07 22:31:52 UTC (rev 484)
@@ -1,147 +0,0 @@
-<background>
-  <starttime>
-    <year>2011</year>
-    <month>01</month>
-    <day>01</day>
-    <hour>07</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>
-	<!--	/usr/share/mdk/backgrounds/Mageia-default-0700.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0700.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0700.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0700.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0700.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0700.jpg</size>
-</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>
-	<!--	/usr/share/mdk/backgrounds/Mageia-default-0700.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0700.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0700.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0700.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0700.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0700.jpg</size>
-</from>
-<to>
-	<!-- /usr/share/mdk/backgrounds/Mageia-default-1300.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1300.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1300.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1300.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1300.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1300.jpg</size>
-</to>
-</transition>
-
-<!-- It's 1 PM, we're showing the day image in full force now, for 2 hours ending at 3 PM. -->
-<static>
-<duration>7200.0</duration>
-<file>
-	<!-- /usr/share/mdk/backgrounds/Mageia-default-1300.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1300.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1300.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1300.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1300.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1300.jpg</size>
-</file>
-</static>
-
-<!-- It's 3 PM, and we're starting to transition to sunset. Transition completes at 6 PM. -->
-<transition type="overlay">
-<duration>10800.0</duration>
-<from>
-	<!-- /usr/share/mdk/backgrounds/Mageia-default-1300.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1300.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1300.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1300.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1300.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1300.jpg</size>
-</from>
-<to>
-	<!-- /usr/share/mdk/backgrounds/Mageia-default-1800.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1800.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1800.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1800.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1800.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1800.jpg</size>
-</to>
-</transition>
-
-<!-- It's 6 PM, and it's sunset, for an hour. Ends at 7. -->
-<static>
-<duration>3600.0</duration>
-<file>
-	<!-- /usr/share/mdk/backgrounds/Mageia-default-1800.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1800.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1800.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1800.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1800.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1800.jpg</size>
-</file>
-</static>
-
-<!-- It's 7 PM and it's going to start to get darker. This will transition for 5 hours up until midnight. -->
-<transition type="overlay">
-<duration>18000.0</duration>
-<from>
-	<!-- /usr/share/mdk/backgrounds/Mageia-default-1800.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-1800.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-1800.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-1800.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-1800.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-1800.jpg</size>
-</from>
-<to>
-	<!-- /usr/share/mdk/backgrounds/Mageia-default-0000.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0000.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0000.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0000.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0000.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0000.jpg</size>
-</to>
-</transition>
-
-<!-- It's midnight. It'll stay dark for 5 hours up until 5 AM. -->
-<static>
-<duration>18000.0</duration>
-<file>
-	<!-- /usr/share/mdk/backgrounds/Mageia-default-0000.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0000.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0000.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0000.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0000.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0000.jpg</size>
-</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>
-	<!-- /usr/share/mdk/backgrounds/Mageia-default-0000.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0000.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0000.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0000.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0000.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0000.jpg</size>
-</from>
-<to>
-	<!-- /usr/share/mdk/backgrounds/Mageia-default-0700.jpg -->
-	<size width="1280" height="1024">/usr/share/mdk/backgrounds/Mageia-default-1280x1024-0000.jpg</size>
-	<size width="1920" height="1080">/usr/share/mdk/backgrounds/Mageia-default-1920x1080-0000.jpg</size>
-	<size width="1920" height="1200">/usr/share/mdk/backgrounds/Mageia-default-1920x1200-0000.jpg</size>
-	<size width="1920" height="1440">/usr/share/mdk/backgrounds/Mageia-default-1920x1440-0000.jpg</size>
-	<size width="800" height="480">/usr/share/mdk/backgrounds/Mageia-default-800x480-0000.jpg</size>
-</to>
-</transition>
-</background>

Modified: theme/mageia-theme/trunk/Makefile
===================================================================
--- theme/mageia-theme/trunk/Makefile	2011-02-07 21:37:54 UTC (rev 483)
+++ theme/mageia-theme/trunk/Makefile	2011-02-07 22:31:52 UTC (rev 484)
@@ -2,7 +2,7 @@
 PACKAGE=mageia-theme
 VERSION=1.4.8
 
-THEMES=Mageia-default
+THEMES=Mageia-Default
 
 FILES=$(THEMES) Makefile common gimp extra-backgrounds
 sharedir=/usr/share
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110207/748eb4c1/attachment-0001.html>