diff --git a/GlossMgr.py b/GlossMgr.py index c158746..5039fbe 100644 --- a/GlossMgr.py +++ b/GlossMgr.py @@ -44,12 +44,11 @@ class GlossMgr: self.set_menu_transition("slide") #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()) - - background.show() + self.background = self.themeMgr.get_texture("background", None, None) + self.background.set_size(self.stage.get_width(), self.stage.get_height()) + self.background.show() - self.stage.add(background) + self.stage.add(self.background) self.currentPlugin = None diff --git a/modules/music_player/music_player.py b/modules/music_player/music_player.py index ecd85c9..23337c9 100644 --- a/modules/music_player/music_player.py +++ b/modules/music_player/music_player.py @@ -76,17 +76,11 @@ class Module: colour = clutter.color_parse('White') font_string = "Tahoma 30" + heading_label = self.glossMgr.themeMgr.get_label("music_heading") self.heading = musicHeading(colour, font_string) self.heading.set_width(self.stage.get_width()) - self.heading.set_position(0, 250) - """ - self.artist_label_1.set_position(200, 200) - self.artist_label_2.set_position(200, 200) - self.artist_label_3.set_position(200, 200) - self.artist_label_1.set_color(clutter.color_parse('White')) - self.artist_label_2.set_color(clutter.color_parse('White')) - self.artist_label_3.set_color(clutter.color_parse('White')) - """ + self.heading.set_position(0, heading_label.get_y()) + #Get the images dir setting our of the DB #But also creates the setting if it doesn't already exist @@ -308,7 +302,7 @@ class Module: self.opacity_behaviour = clutter.BehaviourOpacity(opacity_start=0, opacity_end=255, alpha=self.alpha) #Create a backdrop for the player. In this case we just use the same background as the menus - self.backdrop = glossMgr.get_themeMgr().get_texture("background", None, None) + self.backdrop = clutter.CloneTexture(glossMgr.background) #glossMgr.get_themeMgr().get_texture("background", None, None) self.backdrop.set_size(self.stage.get_width(), self.stage.get_height()) self.backdrop.set_opacity(0) self.backdrop.show() @@ -359,6 +353,7 @@ class Module: self.opacity_behaviour_outgoing.apply(self.loading_img) self.stage.add(self.artistImageRow) + self.artistImageRow.set_position(0, 40) self.artistImageRow.set_opacity(0) self.artistImageRow.select_first() self.artistImageRow.show() diff --git a/modules/myth_tv_player/myth_tv_player.py b/modules/myth_tv_player/myth_tv_player.py index da47561..2dbf4f5 100644 --- a/modules/myth_tv_player/myth_tv_player.py +++ b/modules/myth_tv_player/myth_tv_player.py @@ -152,13 +152,6 @@ class osd_channel(clutter.Group): 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() @@ -169,9 +162,11 @@ class osd_channel(clutter.Group): self.logo.set_position(20, pos_y ) self.add(self.logo) + text_colour = clutter.color_parse('Black') + self.name = clutter.Label() self.name.set_font_name(self.font + str(self.name_font_size)) - self.name.set_color(clutter.color_parse('White')) + self.name.set_color(text_colour) pos_x = self.logo.get_x() + int (self.logo.get_width() * 1.1) pos_x = pos_x self.name.set_position(pos_x, 0) @@ -180,7 +175,7 @@ class osd_channel(clutter.Group): self.prog_title = clutter.Label() self.prog_title.set_font_name(self.font + str(self.prog_title_font_size)) - self.prog_title.set_color(clutter.color_parse('White')) + self.prog_title.set_color(text_colour) self.prog_title.set_position(\ self.name.get_x(),\ self.name.get_y() + self.name.get_height()\ @@ -189,7 +184,7 @@ class osd_channel(clutter.Group): self.detail = clutter.Label() self.detail.set_font_name(self.font + str(self.detail_font_size)) - self.detail.set_color(clutter.color_parse('White')) + self.detail.set_color(text_colour) self.detail.set_position(\ self.prog_title.get_x(),\ self.prog_title.get_y() + self.prog_title.get_height()\ diff --git a/modules/video_player/video_player.py b/modules/video_player/video_player.py index ad1a3f2..2e99cd9 100644 --- a/modules/video_player/video_player.py +++ b/modules/video_player/video_player.py @@ -253,7 +253,7 @@ class Module(): return #Create a backdrop for the player. In this case we just use the same background as the menus - self.backdrop = glossMgr.get_themeMgr().get_texture("background", None, None) #clutter.CloneTexture(glossMgr.get_skinMgr().get_Background()) + self.backdrop = clutter.CloneTexture(glossMgr.background) #glossMgr.get_themeMgr().get_texture("background", None, None) #clutter.CloneTexture(glossMgr.get_skinMgr().get_Background()) self.backdrop.set_size(self.stage.get_width(), self.stage.get_height()) self.backdrop.set_opacity(0) self.backdrop.show() diff --git a/themes/Gloxygen/music.xml b/themes/Gloxygen/music.xml index 458c3c5..9cc7708 100644 --- a/themes/Gloxygen/music.xml +++ b/themes/Gloxygen/music.xml @@ -123,7 +123,7 @@ -