Move UI directory

GlossMgr.py

@@ -7,6 +7,7 @@ import pango
 import copy
 
 class GlossMgr:
+    theme_dir = "themes"
 
     def __init__ (self, stage):
         self.stage = stage
@@ -29,30 +30,12 @@ class GlossMgr:
         #The background is a bit messy due to the depth issues :(
         background = self.themeMgr.get_texture("background", None, None)
         background.set_size(self.stage.get_width(), self.stage.get_height())
-        """
-        (width, height) = background.get_abs_size()
-        print background.get_abs_size()
-        #background.set_anchor_point_from_gravity(clutter.GRAVITY_NORTH_WEST)
-        background.set_anchor_point(int(background.get_width()/3.5), int(background.get_height()/3.5))    
-        #background.set_anchor_point_from_gravity(clutter.GRAVITY_CENTER)
-        background.set_depth(-self.stage.get_width())
-        print background.get_abs_size()
-        #
-        (width_new, height_new) = background.get_abs_size()
-        #width = self.stage.get_width()
-        #height = self.stage.get_height()
-        scale_x = float(width)/float(width_new)
-        scale_y = float(height)/float(height_new)
-        background.set_scale(scale_x, scale_y)
-        print background.get_abs_size()
-        #background.set_width(width)
-        #background.set_height(height)
-        """
+
         background.show()
         
         self.stage.add(background)
         
-        #Setip the selector bar
+        #Setup the selector bar
         self.selector_bar = MenuSelector(self)
         self.selector_bar.show_all()        
         self.stage.add(self.selector_bar)
@@ -300,6 +283,8 @@ class MenuSelector(clutter.Texture):
         return self.x_offset
         
 class message():
+    theme_dir = "themes"
+    
     font = "Lucida Grande "
     message_font_size = 30
     detail_font_size = 22
@@ -317,7 +302,7 @@ class message():
         
         self.main_group = clutter.Group()
         
-        pixbuf = gtk.gdk.pixbuf_new_from_file("ui/splash_box.png")
+        pixbuf = gtk.gdk.pixbuf_new_from_file(self.theme_dir + "/splash_box.png")
         self.box = clutter.Texture()
         self.box.set_pixbuf(pixbuf)
         self.box.set_opacity(int(255 * 0.75))

Spinner.py

@@ -6,8 +6,8 @@ class Spinner (clutter.Texture):
     def __init__(self):
         clutter.Texture.__init__ (self)
         
-        #self.texture = clutter.Texture()
-        pixbuf = gtk.gdk.pixbuf_new_from_file("ui/spinner.svg")
+        #Theme me please
+        pixbuf = gtk.gdk.pixbuf_new_from_file("themes/spinner.svg")
         self.set_pixbuf(pixbuf)
      
     def start(self):  

SplashScr.py

@@ -25,7 +25,8 @@ class SplashScr(clutter.Group):
         self.centre_group = clutter.Group()
         self.add(self.centre_group)
         
-        pixbuf = gtk.gdk.pixbuf_new_from_file("ui/splash_box.png")
+        #THIS NEEDS THEMING!!!
+        pixbuf = gtk.gdk.pixbuf_new_from_file("themes/splash_box.png")
         self.box = clutter.Texture()
         self.box.set_pixbuf(pixbuf)
         self.box.set_opacity(int(255 * 0.75))

gloss.py

@@ -49,7 +49,7 @@ class MainApp:
     
         self.args = args
     
-        self.stage = clutter.stage_get_default()
+        self.stage = clutter.Stage()
         self.stage.set_color(clutter.color_parse('Black'))
         self.stage.connect('button-press-event', self.on_button_press_event)
         #hide the cursor

themeMgr.py

@@ -5,6 +5,8 @@ import gtk
 from xml.dom import minidom
 
 class ThemeMgr:
+	theme_dir = "themes/"
+	
 	defaultTheme = "default"
 	currentTheme = "default"
 	currentTheme = "Pear"
@@ -16,14 +18,14 @@ class ThemeMgr:
 		self.docs = []
 		self.default_docs = []
 		
-		theme_dir = "ui/" + self.currentTheme
-		self.importDocs(theme_dir, self.docs)
+		current_theme_dir = self.theme_dir + self.currentTheme
+		self.importDocs(current_theme_dir, self.docs)
 		#If the current theme is the default theme, we just use the one list, else create a second one
 		if self.currentTheme == self.defaultTheme:
 			self.default_docs = self.docs
 		else:
-			theme_dir = "ui/" + self.defaultTheme
-			self.importDocs(theme_dir, self.default_docs)
+			current_theme_dir = self.theme_dir + self.defaultTheme
+			self.importDocs(current_theme_dir, self.default_docs)
 
 	def importDocs(self, dir, docs):
 		file_list = os.listdir(dir)
@@ -274,7 +276,7 @@ class ThemeMgr:
 		if src == "None":
 			return texture
 		
-		src = "ui/" + self.currentTheme + "/" + src
+		src = self.theme_dir + self.currentTheme + "/" + src
 		pixbuf = gtk.gdk.pixbuf_new_from_file(src)
 		texture.set_pixbuf(pixbuf)
 		

themes/Pear/video_osd.xml

@@ -11,4 +11,16 @@
 		</position>
 	</texture>
 
+	<texture id="tv_osd_box">
+		<image>video_osd/osd_bar3.png</image>
+		<dimensions type="relativeToStage">
+			<width>70%</width>
+			<height>5%</height>
+		</dimensions>
+		<position type="relativeToStage">
+			<x>95%</x>
+			<y>0</y>
+		</position>
+	</texture>
+
 </gloss-theme>