From b07f95b2e4cced381c0e5a2bb22207795a67f8f0 Mon Sep 17 00:00:00 2001
From: noisymime <noisymime@baaa0088-b137-0410-8772-f9fc1f435b5f>
Date: Sat, 28 Jun 2008 11:22:55 +0000
Subject: [PATCH] - Correction as SVN has gone nuts

---
 themes/Mich/main.xml                          | 110 ++++++++++++++++++
 themes/{Gloxygen => Mich}/shared/down.png     | Bin
 themes/{Gloxygen => Mich}/shared/up.png       | Bin
 themes/Pear/main.xml                          |   4 +-
 themes/{Mich => Pear/shared}/down.png         | Bin
 themes/{Mich => Pear/shared}/up.png           | Bin
 themes/{ => default}/Gloxygen/active_bar.png  | Bin
 themes/{ => default}/Gloxygen/background.png  | Bin
 themes/{ => default}/Gloxygen/dvd.xml         |   0
 themes/{ => default}/Gloxygen/dvd/dvd.png     | Bin
 themes/{ => default}/Gloxygen/dvd/dvd.svg     |   0
 themes/{ => default}/Gloxygen/main.xml        |   4 +-
 themes/{ => default}/Gloxygen/music.xml       |  19 +--
 .../Gloxygen/music/default_cover.png          | Bin
 themes/{ => default}/Gloxygen/music/music.png | Bin
 themes/{ => default}/Gloxygen/music/music.svg |   0
 .../Gloxygen/music/music_blue.svg             |   0
 .../Gloxygen/music/songlist_off.png           | Bin
 .../Gloxygen/music_play_screen.xml            |   0
 themes/{ => default}/Gloxygen/osd.xml         |   0
 themes/{ => default}/Gloxygen/osd/osd_bar.png | Bin
 .../{ => default}/Gloxygen/osd/osd_bar3.png   | Bin
 .../{ => default}/Gloxygen/osd/splash_box.png | Bin
 themes/{ => default}/Gloxygen/osd_bar.png     | Bin
 themes/{ => default}/Gloxygen/osd_bar3.png    | Bin
 .../Gloxygen/shared}/down.png                 | Bin
 .../{Pear => default/Gloxygen/shared}/up.png  | Bin
 themes/{ => default}/Gloxygen/slideshow.xml   |   0
 .../Gloxygen/slideshow/gallery.png            | Bin
 themes/{ => default}/Gloxygen/spinner.svg     |   0
 themes/{ => default}/Gloxygen/splash_box.png  | Bin
 themes/{ => default}/Gloxygen/tv.xml          |   0
 themes/{ => default}/Gloxygen/tv/tv.png       | Bin
 themes/{ => default}/Gloxygen/tv/tv.svg       |   0
 themes/{ => default}/Gloxygen/video.xml       |   0
 .../Gloxygen/video_player/cover_bg.png        | Bin
 .../Gloxygen/video_player/cover_bg_long.png   | Bin
 .../Gloxygen/video_player/folder-video.svg    |   0
 .../Gloxygen/video_player/vid_details_bg.png  | Bin
 .../video_player/vid_folders_select_box.png   | Bin
 .../Gloxygen/video_player/video_default.svg   |   0
 .../Gloxygen/video_player/videos.png          | Bin
 .../Gloxygen/video_player/videos.svg          |   0
 themes/default/main.xml                       |   4 +-
 themes/default/{ => shared}/down.png          | Bin
 themes/default/{ => shared}/up.png            | Bin
 themes/default/tests.xml                      |   4 +-
 47 files changed, 128 insertions(+), 17 deletions(-)
 rename themes/{Gloxygen => Mich}/shared/down.png (100%)
 rename themes/{Gloxygen => Mich}/shared/up.png (100%)
 rename themes/{Mich => Pear/shared}/down.png (100%)
 rename themes/{Mich => Pear/shared}/up.png (100%)
 rename themes/{ => default}/Gloxygen/active_bar.png (100%)
 rename themes/{ => default}/Gloxygen/background.png (100%)
 rename themes/{ => default}/Gloxygen/dvd.xml (100%)
 rename themes/{ => default}/Gloxygen/dvd/dvd.png (100%)
 rename themes/{ => default}/Gloxygen/dvd/dvd.svg (100%)
 rename themes/{ => default}/Gloxygen/main.xml (98%)
 rename themes/{ => default}/Gloxygen/music.xml (91%)
 rename themes/{ => default}/Gloxygen/music/default_cover.png (100%)
 rename themes/{ => default}/Gloxygen/music/music.png (100%)
 rename themes/{ => default}/Gloxygen/music/music.svg (100%)
 rename themes/{ => default}/Gloxygen/music/music_blue.svg (100%)
 rename themes/{ => default}/Gloxygen/music/songlist_off.png (100%)
 rename themes/{ => default}/Gloxygen/music_play_screen.xml (100%)
 rename themes/{ => default}/Gloxygen/osd.xml (100%)
 rename themes/{ => default}/Gloxygen/osd/osd_bar.png (100%)
 rename themes/{ => default}/Gloxygen/osd/osd_bar3.png (100%)
 rename themes/{ => default}/Gloxygen/osd/splash_box.png (100%)
 rename themes/{ => default}/Gloxygen/osd_bar.png (100%)
 rename themes/{ => default}/Gloxygen/osd_bar3.png (100%)
 rename themes/{Pear => default/Gloxygen/shared}/down.png (100%)
 rename themes/{Pear => default/Gloxygen/shared}/up.png (100%)
 rename themes/{ => default}/Gloxygen/slideshow.xml (100%)
 rename themes/{ => default}/Gloxygen/slideshow/gallery.png (100%)
 rename themes/{ => default}/Gloxygen/spinner.svg (100%)
 rename themes/{ => default}/Gloxygen/splash_box.png (100%)
 rename themes/{ => default}/Gloxygen/tv.xml (100%)
 rename themes/{ => default}/Gloxygen/tv/tv.png (100%)
 rename themes/{ => default}/Gloxygen/tv/tv.svg (100%)
 rename themes/{ => default}/Gloxygen/video.xml (100%)
 rename themes/{ => default}/Gloxygen/video_player/cover_bg.png (100%)
 rename themes/{ => default}/Gloxygen/video_player/cover_bg_long.png (100%)
 rename themes/{ => default}/Gloxygen/video_player/folder-video.svg (100%)
 rename themes/{ => default}/Gloxygen/video_player/vid_details_bg.png (100%)
 rename themes/{ => default}/Gloxygen/video_player/vid_folders_select_box.png (100%)
 rename themes/{ => default}/Gloxygen/video_player/video_default.svg (100%)
 rename themes/{ => default}/Gloxygen/video_player/videos.png (100%)
 rename themes/{ => default}/Gloxygen/video_player/videos.svg (100%)
 rename themes/default/{ => shared}/down.png (100%)
 rename themes/default/{ => shared}/up.png (100%)

diff --git a/themes/Mich/main.xml b/themes/Mich/main.xml
index 59f4724..1fa1b91 100644
--- a/themes/Mich/main.xml
+++ b/themes/Mich/main.xml
@@ -61,4 +61,114 @@
 	<texture id="selector_bar">
 		<image>None</image>
 	</texture>
+	
+		<group id="option_dialog">
+		<dimensions type="relativeToStage">
+			<width>40%</width>
+			<height>40%</height>
+		</dimensions>
+		<position type="relativeToStage">
+			<x>center</x>
+			<y>center</y>
+		</position>
+
+		<label id="dialog_heading">
+			<font id="font">
+				<face>Tahoma</face>
+				<size id="default">30</size>
+				<size id="1024x768">38</size>
+				<size id="800x600">30</size>
+				<size id="1920x1080">25</size>
+			</font>
+		
+			<dimensions type="relativeToParent">
+				<width>90%</width>
+				<height>15%</height>
+			</dimensions>
+			<position type="relativeToParent">
+				<x>center</x>
+				<y>2%</y>
+			</position>
+			<colour id="colour">
+				<r>10</r>
+				<g>10</g>
+				<b>10</b>
+			</colour>
+		</label>
+	
+		<label_list id="option_dialog_list">		
+			<font id="main">
+				<face>Tahoma</face>
+				<size id="default">12</size>
+				<size id="1024x768">12</size>
+				<size id="800x600">10</size>
+				<size id="1920x1080">25</size>
+			</font>
+	
+			<dimensions type="relativeToParent">
+				<width>80%</width>
+				<height>80%</height>
+			</dimensions>
+			<position type="relativeToParent">
+				<x>10%</x>
+				<y>20%</y>
+			</position>
+	
+			<!-- This determines the height of each item based on a percentage of the font size. 
+				 Eg: 1.00 means that each item will be the same height as the font,
+				     1.50 means that the item will be 1.x times the height as the font etc
+			 -->
+			<item_height_percent>1.20</item_height_percent>
+			
+			<!-- These are the opacity and scale values for the 3 possible steps in the menu
+			     Make all the values the same if you do not want these effects -->
+			<opacity_step0>255</opacity_step0>
+			<opacity_step1>135</opacity_step1>
+			<opacity_step2>135</opacity_step2>
+			<scale_step0>1</scale_step0>
+			<scale_step1>1</scale_step1>
+			<scale_step2>1</scale_step2>
+			
+			<transition_fps>30</transition_fps>
+			<transition_frames>10</transition_frames>
+	
+			<texture id="inactive_background">
+				<image>music/songlist_off.png</image>
+				<dimensions type="relativeToParent">
+					<width>100%</width>
+					<height>100%</height>
+				</dimensions>
+				<position type="relativeToParent">
+					<x>-10</x>
+					<y>0</y>
+				</position>
+			</texture>
+			
+			<texture id="image_up">
+				<image>shared/up.png</image>
+				<dimensions type="relativeToStage">
+					<width>3%</width>
+					<height>3%</height>
+				</dimensions>
+				<position type="relativeToSelf">
+					<x>0</x>
+					<y>0</y>
+				</position>
+			</texture>
+			
+			<texture id="image_down">
+				<image>shared/down.png</image>
+				<dimensions type="relativeToStage">
+					<width>3%</width>
+					<height>3%</height>
+				</dimensions>
+				<position type="blah">
+					<x>0</x>
+					<y>0</y>
+				</position>
+			</texture>
+			<inactive_background>music/songlist_off.png</inactive_background>
+			
+		</label_list>
+	</group>
 </gloss-theme>
diff --git a/themes/Gloxygen/shared/down.png b/themes/Mich/shared/down.png
similarity index 100%
rename from themes/Gloxygen/shared/down.png
rename to themes/Mich/shared/down.png
diff --git a/themes/Gloxygen/shared/up.png b/themes/Mich/shared/up.png
similarity index 100%
rename from themes/Gloxygen/shared/up.png
rename to themes/Mich/shared/up.png
diff --git a/themes/Pear/main.xml b/themes/Pear/main.xml
index da17b79..053cdca 100644
--- a/themes/Pear/main.xml
+++ b/themes/Pear/main.xml
@@ -192,7 +192,7 @@
 			</texture>
 			
 			<texture id="image_up">
-				<image>up.png</image>
+				<image>shared/up.png</image>
 				<dimensions type="relativeToStage">
 					<width>3%</width>
 					<height>3%</height>
@@ -204,7 +204,7 @@
 			</texture>
 			
 			<texture id="image_down">
-				<image>down.png</image>
+				<image>shared/down.png</image>
 				<dimensions type="relativeToStage">
 					<width>3%</width>
 					<height>3%</height>
diff --git a/themes/Mich/down.png b/themes/Pear/shared/down.png
similarity index 100%
rename from themes/Mich/down.png
rename to themes/Pear/shared/down.png
diff --git a/themes/Mich/up.png b/themes/Pear/shared/up.png
similarity index 100%
rename from themes/Mich/up.png
rename to themes/Pear/shared/up.png
diff --git a/themes/Gloxygen/active_bar.png b/themes/default/Gloxygen/active_bar.png
similarity index 100%
rename from themes/Gloxygen/active_bar.png
rename to themes/default/Gloxygen/active_bar.png
diff --git a/themes/Gloxygen/background.png b/themes/default/Gloxygen/background.png
similarity index 100%
rename from themes/Gloxygen/background.png
rename to themes/default/Gloxygen/background.png
diff --git a/themes/Gloxygen/dvd.xml b/themes/default/Gloxygen/dvd.xml
similarity index 100%
rename from themes/Gloxygen/dvd.xml
rename to themes/default/Gloxygen/dvd.xml
diff --git a/themes/Gloxygen/dvd/dvd.png b/themes/default/Gloxygen/dvd/dvd.png
similarity index 100%
rename from themes/Gloxygen/dvd/dvd.png
rename to themes/default/Gloxygen/dvd/dvd.png
diff --git a/themes/Gloxygen/dvd/dvd.svg b/themes/default/Gloxygen/dvd/dvd.svg
similarity index 100%
rename from themes/Gloxygen/dvd/dvd.svg
rename to themes/default/Gloxygen/dvd/dvd.svg
diff --git a/themes/Gloxygen/main.xml b/themes/default/Gloxygen/main.xml
similarity index 98%
rename from themes/Gloxygen/main.xml
rename to themes/default/Gloxygen/main.xml
index 3f6099b..8ca730e 100644
--- a/themes/Gloxygen/main.xml
+++ b/themes/default/Gloxygen/main.xml
@@ -212,7 +212,7 @@
 			</texture>
 			
 			<texture id="image_up">
-				<image>up.png</image>
+				<image>shared/up.png</image>
 				<dimensions type="relativeToStage">
 					<width>3%</width>
 					<height>3%</height>
@@ -224,7 +224,7 @@
 			</texture>
 			
 			<texture id="image_down">
-				<image>down.png</image>
+				<image>shared/down.png</image>
 				<dimensions type="relativeToStage">
 					<width>3%</width>
 					<height>3%</height>
diff --git a/themes/Gloxygen/music.xml b/themes/default/Gloxygen/music.xml
similarity index 91%
rename from themes/Gloxygen/music.xml
rename to themes/default/Gloxygen/music.xml
index 591b46e..458c3c5 100644
--- a/themes/Gloxygen/music.xml
+++ b/themes/default/Gloxygen/music.xml
@@ -14,10 +14,10 @@
 	<label_list id="music_albums">		
 		<font id="main">
 			<face>Tahoma</face>
-			<size id="default">30</size>
-			<size id="1024x768">38</size>
-			<size id="800x600">30</size>
-			<size id="1920x1080">25</size>
+			<size id="default">20</size>
+			<size id="1024x768">22</size>
+			<size id="800x600">18</size>
+			<size id="1920x1080">28</size>
 		</font>
 
 		<dimensions type="relativeToStage">
@@ -31,13 +31,14 @@
 		
 		<texture id="selector_bar">
 			<image>active_bar.png</image>
+			<height_percent>1.20</height_percent>
 			<dimensions type="relativeToSelf">
 				<width>100%</width>
 				<height>relative</height>
 			</dimensions>
 			<position type="relativeToParent">
 				<x>-20</x>
-				<y>-10%</y>
+				<y>0</y>
 			</position>
 		</texture>
 
@@ -65,10 +66,10 @@
 	<label_list id="music_songs">		
 		<font id="main">
 			<face>Tahoma</face>
-			<size id="default">30</size>
-			<size id="1024x768">38</size>
-			<size id="800x600">30</size>
-			<size id="1920x1080">25</size>
+			<size id="default">20</size>
+			<size id="1024x768">22</size>
+			<size id="800x600">18</size>
+			<size id="1920x1080">28</size>
 		</font>
 
 		<dimensions type="relativeToStage">
diff --git a/themes/Gloxygen/music/default_cover.png b/themes/default/Gloxygen/music/default_cover.png
similarity index 100%
rename from themes/Gloxygen/music/default_cover.png
rename to themes/default/Gloxygen/music/default_cover.png
diff --git a/themes/Gloxygen/music/music.png b/themes/default/Gloxygen/music/music.png
similarity index 100%
rename from themes/Gloxygen/music/music.png
rename to themes/default/Gloxygen/music/music.png
diff --git a/themes/Gloxygen/music/music.svg b/themes/default/Gloxygen/music/music.svg
similarity index 100%
rename from themes/Gloxygen/music/music.svg
rename to themes/default/Gloxygen/music/music.svg
diff --git a/themes/Gloxygen/music/music_blue.svg b/themes/default/Gloxygen/music/music_blue.svg
similarity index 100%
rename from themes/Gloxygen/music/music_blue.svg
rename to themes/default/Gloxygen/music/music_blue.svg
diff --git a/themes/Gloxygen/music/songlist_off.png b/themes/default/Gloxygen/music/songlist_off.png
similarity index 100%
rename from themes/Gloxygen/music/songlist_off.png
rename to themes/default/Gloxygen/music/songlist_off.png
diff --git a/themes/Gloxygen/music_play_screen.xml b/themes/default/Gloxygen/music_play_screen.xml
similarity index 100%
rename from themes/Gloxygen/music_play_screen.xml
rename to themes/default/Gloxygen/music_play_screen.xml
diff --git a/themes/Gloxygen/osd.xml b/themes/default/Gloxygen/osd.xml
similarity index 100%
rename from themes/Gloxygen/osd.xml
rename to themes/default/Gloxygen/osd.xml
diff --git a/themes/Gloxygen/osd/osd_bar.png b/themes/default/Gloxygen/osd/osd_bar.png
similarity index 100%
rename from themes/Gloxygen/osd/osd_bar.png
rename to themes/default/Gloxygen/osd/osd_bar.png
diff --git a/themes/Gloxygen/osd/osd_bar3.png b/themes/default/Gloxygen/osd/osd_bar3.png
similarity index 100%
rename from themes/Gloxygen/osd/osd_bar3.png
rename to themes/default/Gloxygen/osd/osd_bar3.png
diff --git a/themes/Gloxygen/osd/splash_box.png b/themes/default/Gloxygen/osd/splash_box.png
similarity index 100%
rename from themes/Gloxygen/osd/splash_box.png
rename to themes/default/Gloxygen/osd/splash_box.png
diff --git a/themes/Gloxygen/osd_bar.png b/themes/default/Gloxygen/osd_bar.png
similarity index 100%
rename from themes/Gloxygen/osd_bar.png
rename to themes/default/Gloxygen/osd_bar.png
diff --git a/themes/Gloxygen/osd_bar3.png b/themes/default/Gloxygen/osd_bar3.png
similarity index 100%
rename from themes/Gloxygen/osd_bar3.png
rename to themes/default/Gloxygen/osd_bar3.png
diff --git a/themes/Pear/down.png b/themes/default/Gloxygen/shared/down.png
similarity index 100%
rename from themes/Pear/down.png
rename to themes/default/Gloxygen/shared/down.png
diff --git a/themes/Pear/up.png b/themes/default/Gloxygen/shared/up.png
similarity index 100%
rename from themes/Pear/up.png
rename to themes/default/Gloxygen/shared/up.png
diff --git a/themes/Gloxygen/slideshow.xml b/themes/default/Gloxygen/slideshow.xml
similarity index 100%
rename from themes/Gloxygen/slideshow.xml
rename to themes/default/Gloxygen/slideshow.xml
diff --git a/themes/Gloxygen/slideshow/gallery.png b/themes/default/Gloxygen/slideshow/gallery.png
similarity index 100%
rename from themes/Gloxygen/slideshow/gallery.png
rename to themes/default/Gloxygen/slideshow/gallery.png
diff --git a/themes/Gloxygen/spinner.svg b/themes/default/Gloxygen/spinner.svg
similarity index 100%
rename from themes/Gloxygen/spinner.svg
rename to themes/default/Gloxygen/spinner.svg
diff --git a/themes/Gloxygen/splash_box.png b/themes/default/Gloxygen/splash_box.png
similarity index 100%
rename from themes/Gloxygen/splash_box.png
rename to themes/default/Gloxygen/splash_box.png
diff --git a/themes/Gloxygen/tv.xml b/themes/default/Gloxygen/tv.xml
similarity index 100%
rename from themes/Gloxygen/tv.xml
rename to themes/default/Gloxygen/tv.xml
diff --git a/themes/Gloxygen/tv/tv.png b/themes/default/Gloxygen/tv/tv.png
similarity index 100%
rename from themes/Gloxygen/tv/tv.png
rename to themes/default/Gloxygen/tv/tv.png
diff --git a/themes/Gloxygen/tv/tv.svg b/themes/default/Gloxygen/tv/tv.svg
similarity index 100%
rename from themes/Gloxygen/tv/tv.svg
rename to themes/default/Gloxygen/tv/tv.svg
diff --git a/themes/Gloxygen/video.xml b/themes/default/Gloxygen/video.xml
similarity index 100%
rename from themes/Gloxygen/video.xml
rename to themes/default/Gloxygen/video.xml
diff --git a/themes/Gloxygen/video_player/cover_bg.png b/themes/default/Gloxygen/video_player/cover_bg.png
similarity index 100%
rename from themes/Gloxygen/video_player/cover_bg.png
rename to themes/default/Gloxygen/video_player/cover_bg.png
diff --git a/themes/Gloxygen/video_player/cover_bg_long.png b/themes/default/Gloxygen/video_player/cover_bg_long.png
similarity index 100%
rename from themes/Gloxygen/video_player/cover_bg_long.png
rename to themes/default/Gloxygen/video_player/cover_bg_long.png
diff --git a/themes/Gloxygen/video_player/folder-video.svg b/themes/default/Gloxygen/video_player/folder-video.svg
similarity index 100%
rename from themes/Gloxygen/video_player/folder-video.svg
rename to themes/default/Gloxygen/video_player/folder-video.svg
diff --git a/themes/Gloxygen/video_player/vid_details_bg.png b/themes/default/Gloxygen/video_player/vid_details_bg.png
similarity index 100%
rename from themes/Gloxygen/video_player/vid_details_bg.png
rename to themes/default/Gloxygen/video_player/vid_details_bg.png
diff --git a/themes/Gloxygen/video_player/vid_folders_select_box.png b/themes/default/Gloxygen/video_player/vid_folders_select_box.png
similarity index 100%
rename from themes/Gloxygen/video_player/vid_folders_select_box.png
rename to themes/default/Gloxygen/video_player/vid_folders_select_box.png
diff --git a/themes/Gloxygen/video_player/video_default.svg b/themes/default/Gloxygen/video_player/video_default.svg
similarity index 100%
rename from themes/Gloxygen/video_player/video_default.svg
rename to themes/default/Gloxygen/video_player/video_default.svg
diff --git a/themes/Gloxygen/video_player/videos.png b/themes/default/Gloxygen/video_player/videos.png
similarity index 100%
rename from themes/Gloxygen/video_player/videos.png
rename to themes/default/Gloxygen/video_player/videos.png
diff --git a/themes/Gloxygen/video_player/videos.svg b/themes/default/Gloxygen/video_player/videos.svg
similarity index 100%
rename from themes/Gloxygen/video_player/videos.svg
rename to themes/default/Gloxygen/video_player/videos.svg
diff --git a/themes/default/main.xml b/themes/default/main.xml
index 7b15fc7..9fc782e 100644
--- a/themes/default/main.xml
+++ b/themes/default/main.xml
@@ -192,7 +192,7 @@
 			</texture>
 			
 			<texture id="image_up">
-				<image>up.png</image>
+				<image>shared/up.png</image>
 				<dimensions type="relativeToStage">
 					<width>3%</width>
 					<height>3%</height>
@@ -204,7 +204,7 @@
 			</texture>
 			
 			<texture id="image_down">
-				<image>down.png</image>
+				<image>shared/down.png</image>
 				<dimensions type="relativeToStage">
 					<width>3%</width>
 					<height>3%</height>
diff --git a/themes/default/down.png b/themes/default/shared/down.png
similarity index 100%
rename from themes/default/down.png
rename to themes/default/shared/down.png
diff --git a/themes/default/up.png b/themes/default/shared/up.png
similarity index 100%
rename from themes/default/up.png
rename to themes/default/shared/up.png
diff --git a/themes/default/tests.xml b/themes/default/tests.xml
index f986884..d50991b 100644
--- a/themes/default/tests.xml
+++ b/themes/default/tests.xml
@@ -47,7 +47,7 @@
         </texture>
         
         <texture id="image_up">
-            <image>up.png</image>
+            <image>shared/up.png</image>
             <dimensions type="relativeToStage">
                 <width>3%</width>
                 <height>3%</height>
@@ -59,7 +59,7 @@
         </texture>
         
         <texture id="image_down">
-            <image>down.png</image>
+            <image>shared/down.png</image>
             <dimensions type="relativeToStage">
                 <width>3%</width>
                 <height>3%</height>