- Fix to prevent crashing when starting slideshow

SplashScr.py

@@ -119,6 +119,8 @@ class SplashScr(clutter.Group):
         self.behaviour_opacity.apply(self)
         timeline_opacity.start()       
         
+        return timeline_opacity
+        
     def set_msg(self, msg):
         self.message.set_text(msg)
         

gloss

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

gloss.py

@@ -124,8 +124,7 @@ class MainApp:
         MainMenu = self.glossMgr.create_menu()
         self.glossMgr.addMenu(MainMenu)
         #Update splash status msg
-        self.splashScreen.set_msg("Connecting to MythTV server")        
-        
+        self.splashScreen.set_msg("Connecting to MythTV server")
 
         #Load all modules
         for mods in modules:
@@ -136,12 +135,17 @@ class MainApp:
             if self.glossMgr.debug: print "Loading module: %s" % title
             
             self.splashScreen.set_msg("Loading "+title)
+            #while gtk.events_pending():
+            #    gtk.main_iteration(0)
             temp_menu_item = MainMenu.addItem(title)
             temp_menu_item.add_image_from_texture(tempMod.menu_image)
             temp_menu_item.setAction(tempMod.action())
          
-        self.splashScreen.remove_elegant()
+        timeline_remove = self.splashScreen.remove_elegant()
+        timeline_remove.connect("completed", self.finish_load, MainMenu)
         self.stage.connect('key-press-event', self.glossMgr.on_key_press_event)
+        
+    def finish_load(self, data, MainMenu):
         MainMenu.display()
 
         MainMenu.selectFirst(True)

modules/slideshow/slideshow.py

@@ -176,7 +176,7 @@ class Module:
         self.backdrop_behaviour = clutter.BehaviourOpacity(opacity_start=0, opacity_end=255, alpha=alpha)
         self.menu_behaviour = clutter.BehaviourOpacity(opacity_start=255, opacity_end=0, alpha=alpha)
         self.backdrop_behaviour.apply(self.backdrop)
-        self.menu_behaviour.apply(self.menu.getItemGroup())
+        #self.menu_behaviour.apply(self.menu.getItemGroup())
         timeline_backdrop.start()
         
         
@@ -398,7 +398,7 @@ class Module:
         self.stop_behaviour.apply(self.currentTexture)
         self.stop_behaviour.apply(self.backdrop)
         self.stop_behaviour.apply(self.overlay)
-        self.menu_behaviour.apply(self.menu.getItemGroup())
+        #self.menu_behaviour.apply(self.menu.getItemGroup())
         timeline_stop.connect('completed', self.destroySlideshow)
         timeline_stop.start()
         

themes/Pear/music_play_screen.xml

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