- Minor fixes after initial 0.1 testing

- Removal of licensed images from Gloxygen

SplashScr.py

@@ -13,9 +13,10 @@ class SplashScr(clutter.Group):
     message_font_size = 30
     detail_font_size = 22
     
-    def __init__(self, stage):
+    def __init__(self, glossMgr):
         clutter.Group.__init__ (self)
-        self.stage = stage
+        self.glossMgr = glossMgr
+        self.stage = self.glossMgr.stage
         
         self.backdrop = clutter.Rectangle()
         self.backdrop.set_color(clutter.color_parse('Black'))
@@ -44,7 +45,7 @@ class SplashScr(clutter.Group):
         """
         self.centre_group.add(self.box)        
        
-        self.spinner = Spinner()
+        self.spinner = Spinner(self.glossMgr)
         height = int(self.box.get_height() * 0.90)
         height = height + (height % 2) # Make sure that the dimension is even
         self.spinner.set_height(height)

gloss

@@ -1,6 +1,6 @@
 #!/bin/bash
 install_dir=/usr/share/gloss
-version="0.1"
+version="0.1 (r255)"
 
 print_help()
 {

gloss.py

@@ -72,19 +72,15 @@ class MainApp:
         else:
             self.stage.set_size(width, height)
         
-        #now that the size is set, we can show the stage    
+        #now that the size is set, we can fade in the stage
+        self.stage.set_opacity(0)
         self.stage.show()
+        timeline = clutter.Timeline(20,40)
+        alpha = clutter.Alpha(timeline, clutter.ramp_inc_func)
+        self.behaviour_opacity = clutter.BehaviourOpacity(opacity_start=0, opacity_end=255, alpha=alpha)
+        self.behaviour_opacity.apply(self.stage)
+        timeline.start()
         
-        #Display a loading / splash screen
-        self.splashScreen = SplashScr(self.stage)
-        self.splashScreen.display()
-        
-        #clutter.threads_enter()
-        gobject.timeout_add(500, self.loadGloss)
-        #clutter.threads_leave()
-        #clutter.threads_add_timeout(500, self.loadGloss())
-    
-    def loadGloss(self):
         theme = None
         debug = False
         #loop through the args
@@ -103,6 +99,18 @@ class MainApp:
         #Create the Gloss Manager
         self.glossMgr = GlossMgr(self.stage, self.dbMgr, theme=theme)
         self.glossMgr.debug = debug
+        
+        #Display a loading / splash screen
+        self.splashScreen = SplashScr(self.glossMgr)
+        self.splashScreen.display()
+        
+        #clutter.threads_enter()
+        gobject.timeout_add(500, self.loadGloss)
+        #clutter.threads_leave()
+        #clutter.threads_add_timeout(500, self.loadGloss())
+    
+    def loadGloss(self):
+
 
         #Update splash status msg
         self.splashScreen.set_msg("Creating menus")

themes/Mich/music_play_screen.xml

@@ -49,7 +49,7 @@
 		</texture>
 		
 		<texture id="image_up">
-			<image>up.png</image>
+			<image>shared/up.png</image>
 			<dimensions type="relativeToStage">
 				<width>3%</width>
 				<height>3%</height>
@@ -61,7 +61,7 @@
 		</texture>
 		
 		<texture id="image_down">
-			<image>down.png</image>
+			<image>shared/down.png</image>
 			<dimensions type="relativeToStage">
 				<width>3%</width>
 				<height>3%</height>

themes/Mich/video.xml

@@ -24,7 +24,7 @@
 	</texture>
 	
 	<video_cover_viewer id="main">
-		<video_default_src>video_player/video_default.png</video_default_src>
+		<video_default_src>video_player/videos.png</video_default_src>
 		<folder_img_src>video_player/mv_gallery_folder_sel.png</folder_img_src>
 		<dimensions type="relativeToStage">
 			<width>60%</width>

ui_elements/Spinner.py

@@ -3,11 +3,12 @@ import gtk
 
 class Spinner (clutter.Texture):
     
-    def __init__(self):
+    def __init__(self, glossMgr):
         clutter.Texture.__init__ (self)
         
         #Theme me please
-        pixbuf = gtk.gdk.pixbuf_new_from_file("themes/spinner.svg")
+        theme = glossMgr.themeMgr.currentTheme
+        pixbuf = gtk.gdk.pixbuf_new_from_file("themes/%s/spinner.svg" % theme)
         self.set_pixbuf(pixbuf)
      
     def start(self):