Complete theme directory move

GlossMgr.py

@@ -7,7 +7,7 @@ import pango
 import copy
 
 class GlossMgr:
-    theme_dir = "themes"
+    theme_dir = "themes/"
 
     def __init__ (self, stage):
         self.stage = stage
@@ -267,7 +267,7 @@ class MenuSelector(clutter.Texture):
             self.behaviour = clutter.BehaviourOpacity(opacity_start=0, opacity_end=255, alpha=self.alpha)
             self.spinner.start()
         else:
-            self.behaviour = clutter.BehaviourOpacity(opacity_start=255, opacity_end=0, alpha=self.alpha)
+            self.behaviour = clutter.Behaviourtv_osd_boxOpacity(opacity_start=255, opacity_end=0, alpha=self.alpha)
             self.timeline.connect('completed', self.spinner_end_event)
             #self.menuMgr.get_stage().remove(self.spinner)
             #self.spinner = None

modules/myth_tv_player/myth_tv_player.py

@@ -22,7 +22,7 @@ class Module:
         self.dbMgr = dbMgr
         self.setup_ui()
         
-        self.osd = osd_channel(self.stage)
+        self.osd = osd_channel(self.glossMgr)
         self.videoController = VideoController(glossMgr)
         self.dbController = tv_db_controller(dbMgr)
         #self.dbController.get_current_show(1033)
@@ -147,15 +147,19 @@ class osd_channel(clutter.Group):
     timeline = clutter.Timeline()
     fps = 20
     
-    def __init__(self, stage):
+    def __init__(self, glossMgr):
         clutter.Group.__init__(self)
-        self.stage = stage
+        self.glossMgr = glossMgr
+        self.stage = glossMgr.stage
         
+        self.box = self.glossMgr.themeMgr.get_texture("tv_osd_box", self.stage, None)
+        """
         pixbuf = gtk.gdk.pixbuf_new_from_file("ui/splash_box.png")
         self.box = clutter.Texture()
         self.box.set_pixbuf(pixbuf)
         self.box.set_opacity(int(255 * 0.75))
         self.box.set_height(int(self.stage.get_height()* 0.15))
+        """
         self.add(self.box)
        
         self.logo = clutter.Texture()

modules/video_player/elements/CoverItem.py

@@ -18,7 +18,7 @@ class cover_item(clutter.Group):
         #Set whether or not this is a folder or a video cover
         if not folder_name is None:
             element = glossMgr.themeMgr.search_docs("video_cover_viewer", "main").childNodes
-            imagePath = "ui/" + glossMgr.themeMgr.currentTheme + "/" + glossMgr.themeMgr.find_child_value(element, "folder_img_src")
+            imagePath = glossMgr.theme_dir + glossMgr.themeMgr.currentTheme + "/" + glossMgr.themeMgr.find_child_value(element, "folder_img_src")
             pixbuf = gtk.gdk.pixbuf_new_from_file(imagePath)
             self.isFolder = True
         else:
@@ -27,7 +27,7 @@ class cover_item(clutter.Group):
             # In the future this will change so that the video is still included with a blank image
             if not os.path.exists(imagePath):
                 element = glossMgr.themeMgr.search_docs("video_cover_viewer", "main").childNodes
-                imagePath = "ui/" + glossMgr.themeMgr.currentTheme + "/" + glossMgr.themeMgr.find_child_value(element, "video_default_src")
+                imagePath = glossMgr.theme_dir + glossMgr.themeMgr.currentTheme + "/" + glossMgr.themeMgr.find_child_value(element, "video_default_src")
                 
             pixbuf = gtk.gdk.pixbuf_new_from_file(imagePath)
             self.isFolder = False

themes/Mich/osd.xml

@@ -1,6 +1,6 @@
 <gloss-theme>
 	<texture id="video_osd_bar">
-		<image>video_osd/osd_bar3.png</image>
+		<image>osd/osd_bar3.png</image>
 		<dimensions type="relativeToStage">
 			<width>70%</width>
 			<height>5%</height>
@@ -11,4 +11,13 @@
 		</position>
 	</texture>
 
+	<texture id="tv_osd_box">
+		<image>osd/splash_box.png</image>
+		<dimensions type="relativeToStage">
+			<width>50%</width>
+			<height>30%</height>
+		</dimensions>
+		<opacity>188</opacity>
+	</texture>
+
 </gloss-theme>

themes/Pear/osd.xml

@@ -1,6 +1,6 @@
 <gloss-theme>
 	<texture id="video_osd_bar">
-		<image>video_osd/osd_bar3.png</image>
+		<image>osd/osd_bar3.png</image>
 		<dimensions type="relativeToStage">
 			<width>70%</width>
 			<height>5%</height>
@@ -12,15 +12,12 @@
 	</texture>
 
 	<texture id="tv_osd_box">
-		<image>video_osd/osd_bar3.png</image>
+		<image>osd/splash_box.png</image>
 		<dimensions type="relativeToStage">
-			<width>70%</width>
-			<height>5%</height>
+			<width>50%</width>
+			<height>30%</height>
 		</dimensions>
-		<position type="relativeToStage">
-			<x>95%</x>
-			<y>0</y>
-		</position>
+		<opacity>188</opacity>
 	</texture>
 
 </gloss-theme>

themes/default/osd.xml

@@ -1,6 +1,6 @@
 <gloss-theme>
 	<texture id="video_osd_bar">
-		<image>video_osd/osd_bar3.png</image>
+		<image>osd/osd_bar3.png</image>
 		<dimensions type="relativeToStage">
 			<width>70%</width>
 			<height>5%</height>
@@ -11,4 +11,13 @@
 		</position>
 	</texture>
 
+	<texture id="tv_osd_box">
+		<image>osd/splash_box.png</image>
+		<dimensions type="relativeToStage">
+			<width>50%</width>
+			<height>30%</height>
+		</dimensions>
+		<opacity>188</opacity>
+	</texture>
+
 </gloss-theme>