diff --git a/MenuMgr.py b/MenuMgr.py index 8aa470b..20ed625 100644 --- a/MenuMgr.py +++ b/MenuMgr.py @@ -159,10 +159,10 @@ class MenuSelector(clutter.Texture): self.set_pixbuf(pixbuf) self.set_width(self.width) - pixbuf = gtk.gdk.pixbuf_new_from_file("ui/spinner1.gif") - self.spinner = clutter.Texture() - self.spinner.set_pixbuf(pixbuf) - self.spinner.hide() + #pixbuf = gtk.gdk.pixbuf_new_from_file("ui/spinner1.gif") + #self.spinner = clutter.Texture() + #self.spinner.set_pixbuf(pixbuf) + #self.spinner.hide() def selectItem(self, selectee, timeline): diff --git a/MenuMgr.pyc b/MenuMgr.pyc index 7e98b08..a670e17 100644 Binary files a/MenuMgr.pyc and b/MenuMgr.pyc differ diff --git a/Spinner.py b/Spinner.py index e4a2de5..b7c93ff 100644 --- a/Spinner.py +++ b/Spinner.py @@ -14,9 +14,9 @@ class Spinner (clutter.Texture): self.timeline = clutter.Timeline(40,20) self.timeline.set_loop(True) alpha = clutter.Alpha(self.timeline, clutter.ramp_inc_func) - spin_behaviour = clutter.BehaviourRotate(alpha, clutter.Z_AXIS, clutter.ROTATE_CW, 0, 359) - spin_behaviour.set_center(self.get_width()/2,self.get_height()/2, 0) - spin_behaviour.apply(self) + self.spin_behaviour = clutter.BehaviourRotate(alpha, clutter.Z_AXIS, clutter.ROTATE_CW, 0, 359) + self.spin_behaviour.set_center(self.get_width()/2,self.get_height()/2, 0) + self.spin_behaviour.apply(self) self.timeline.start() def stop(self): diff --git a/Spinner.pyc b/Spinner.pyc index 5347d6f..5026fb6 100644 Binary files a/Spinner.pyc and b/Spinner.pyc differ diff --git a/SplashScr.py b/SplashScr.py new file mode 100644 index 0000000..64ce792 --- /dev/null +++ b/SplashScr.py @@ -0,0 +1,80 @@ +import pygtk +import gtk +import pygst +import gst +import gobject +import pango +import clutter +from Spinner import Spinner + +class SplashScr(): + font = "Lucida Grande " + message_font_size = 30 + detail_font_size = 22 + + def __init__(self, stage): + self.stage = stage + + self.backdrop = clutter.Rectangle() + self.backdrop.set_color(clutter.color_parse('Black')) + self.backdrop.set_width(self.stage.get_width()) + self.backdrop.set_height(self.stage.get_height()) + + + self.main_group = clutter.Group() + + 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.main_group.add(self.box) + + self.spinner = Spinner() + height = int(self.box.get_height() * 0.90) + height = height + (height % 2) # Make sure that the dimension is even + self.spinner.set_height(height) + self.spinner.set_width(height) + self.spinner.set_position(5, int(self.box.get_height() * 0.05 ) ) + self.main_group.add(self.spinner) + + self.message = clutter.Label() + self.message.set_font_name(self.font + str(self.message_font_size)) + self.message.set_color(clutter.color_parse('White')) + pos_x = self.spinner.get_x() + pos_x = pos_x + int (self.spinner.get_width() * 1.1) + self.message.set_position(pos_x, 0) + self.main_group.add(self.message) + + 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.main_group.add(self.detail) + + + def display(self): + self.stage.add(self.backdrop) + self.backdrop.show() + + self.stage.add(self.main_group) + self.main_group.show_all() + group_x = (self.stage.get_width()/2) - (self.box.get_width()/2) + group_y = (self.stage.get_height()/2) - (self.box.get_height()/2) + self.main_group.set_position(group_x, group_y) + self.main_group.show() + + self.spinner.start() + + def remove(self): + self.stage.remove(self.main_group) + self.stage.remove(self.backdrop) + + + def set_msg(self, msg): + self.message.set_text(msg) + + def set_details(self, detail): + self.detail.set_test(detail) + + + \ No newline at end of file diff --git a/gloss.py b/gloss.py index 2cac1bd..d32e4c8 100644 --- a/gloss.py +++ b/gloss.py @@ -3,6 +3,8 @@ import clutter #import gobject import pygtk import gtk +import thread +from SplashScr import SplashScr from Menu import Menu from MenuMgr import MenuMgr from Slideshow import Slideshow @@ -24,16 +26,22 @@ class MainApp: self.stage.set_property("fullscreen", True) self.stage.connect('button-press-event', self.on_button_press_event) self.stage.show_all() + #clutter.main() #hide the cursor self.stage.hide_cursor() + + #Display a loading / splash screen + self.splashScreen = SplashScr(self.stage) + self.splashScreen.display() + + def loadGloss(self, arg): - #color = clutter.Color(0xff, 0xcc, 0xcc, 0xdd) - color = clutter.Color(0, 0, 0, 0) self.menuMgr = MenuMgr(self.stage) - self.stage.connect('key-press-event', self.menuMgr.on_key_press_event) - + + #Update splash status msg + self.splashScreen.set_msg("Creating menus") menu1 = Menu(self.menuMgr) menu1.addItem("TV", "ui/dvd.png") menu1.addItem("Slideshow", "ui/gallery.png") @@ -43,12 +51,10 @@ class MainApp: menu1.addItem("nothing", "ui/dvd.png") menu1.addItem("nothing", "ui/dvd.png") menu1.addItem("nothing", "ui/dvd.png") - + #menu1.setListFont('Tahoma 42') menu1.setMenuPositionByName("center") self.menu1 = menu1 - self.menu1.display() - self.menu1.selectFirst(True) self.menu2 = Menu(self.menuMgr) self.menu2.addItem("Nothing", "ui/dvd.png") @@ -61,17 +67,28 @@ class MainApp: self.menu2.addItem("blah4", "ui/dvd.png") #self.menu2.setListFont('Tahoma 42') self.menu2.setMenuPositionByName("center") - - + + #Update splash status msg + self.splashScreen.set_msg("Connecting to MythTV server") #Create a master mySQL connection - self. dbMgr = mythDB() + self.dbMgr = mythDB() + #Update splash status msg + self.splashScreen.set_msg("Loading gallery") self.mySlideshow = Slideshow(self.menuMgr, self.dbMgr) + #Update splash status msg + self.splashScreen.set_msg("Loading videos") self.vidPlayer = VideoPlayer(self.stage, self.dbMgr) + #Update splash status msg + self.splashScreen.set_msg("Setting up TV player") self.tvPlayer = TVPlayer(self.stage, self.dbMgr) + #Update splash status msg + self.splashScreen.set_msg("Setting up DVD player") self.dvdPlayer = DvdPlayer(self.stage) + #Update splash status msg + self.splashScreen.set_msg("Setting up Music player") self.musicPlayer = MusicPlayer(self.stage) menu1.getItem(0).setAction(self.tvPlayer) @@ -83,6 +100,10 @@ class MainApp: self.menu2.getItem(1).setAction(self.menu1) + self.splashScreen.remove() + self.stage.connect('key-press-event', self.menuMgr.on_key_press_event) + self.menu1.display() + self.menu1.selectFirst(True) #print self.menuMgr.get_selector_bar().get_abs_position() #self.menuMgr.get_selector_bar().set_spinner(True) @@ -101,7 +122,12 @@ class MainApp: def main (args): app = MainApp() + #thread.start_new_thread(app.run, (None,)) + #thread.start_new_thread(app.loadGloss, (None,)) + app.loadGloss(None) app.run() + + return 0 if __name__ == '__main__': diff --git a/images/1.jpg b/images/1.jpg deleted file mode 100644 index 635176c..0000000 Binary files a/images/1.jpg and /dev/null differ diff --git a/images/tmp/2.jpg b/images/tmp/2.jpg deleted file mode 100644 index 0795a7e..0000000 Binary files a/images/tmp/2.jpg and /dev/null differ diff --git a/images/tmp/254910715_2e6ea2c4dc_b.jpg b/images/tmp/254910715_2e6ea2c4dc_b.jpg deleted file mode 100644 index 0022029..0000000 Binary files a/images/tmp/254910715_2e6ea2c4dc_b.jpg and /dev/null differ diff --git a/images/tmp/424458749_3c2bf3b383.jpg b/images/tmp/424458749_3c2bf3b383.jpg deleted file mode 100644 index 070290f..0000000 Binary files a/images/tmp/424458749_3c2bf3b383.jpg and /dev/null differ diff --git a/images/tmp/491260340_ef6650c3be.jpg b/images/tmp/491260340_ef6650c3be.jpg deleted file mode 100644 index 02621c3..0000000 Binary files a/images/tmp/491260340_ef6650c3be.jpg and /dev/null differ diff --git a/images/tmp/Thumbs.db b/images/tmp/Thumbs.db deleted file mode 100644 index 01a81e5..0000000 Binary files a/images/tmp/Thumbs.db and /dev/null differ diff --git a/media_pics/0088763.jpg b/media_pics/0088763.jpg deleted file mode 100644 index 1892043..0000000 Binary files a/media_pics/0088763.jpg and /dev/null differ diff --git a/media_pics/0096874.jpg b/media_pics/0096874.jpg deleted file mode 100644 index 724e579..0000000 Binary files a/media_pics/0096874.jpg and /dev/null differ diff --git a/media_pics/0099088.jpg b/media_pics/0099088.jpg deleted file mode 100644 index 0c8ded5..0000000 Binary files a/media_pics/0099088.jpg and /dev/null differ diff --git a/media_pics/0102926.jpg b/media_pics/0102926.jpg deleted file mode 100644 index f3321b0..0000000 Binary files a/media_pics/0102926.jpg and /dev/null differ diff --git a/media_pics/0120601.jpg b/media_pics/0120601.jpg deleted file mode 100644 index d6d526b..0000000 Binary files a/media_pics/0120601.jpg and /dev/null differ diff --git a/media_pics/0120663.jpg b/media_pics/0120663.jpg deleted file mode 100644 index cb7674c..0000000 Binary files a/media_pics/0120663.jpg and /dev/null differ diff --git a/media_pics/0120889.jpg b/media_pics/0120889.jpg deleted file mode 100644 index 8ddbc97..0000000 Binary files a/media_pics/0120889.jpg and /dev/null differ diff --git a/media_pics/0124819.jpg b/media_pics/0124819.jpg deleted file mode 100644 index 787c39f..0000000 Binary files a/media_pics/0124819.jpg and /dev/null differ diff --git a/media_pics/0133093.jpg b/media_pics/0133093.jpg deleted file mode 100644 index 97ecaf1..0000000 Binary files a/media_pics/0133093.jpg and /dev/null differ diff --git a/media_pics/0147800.jpg b/media_pics/0147800.jpg deleted file mode 100644 index 64cbb6f..0000000 Binary files a/media_pics/0147800.jpg and /dev/null differ diff --git a/media_pics/0151804.jpg b/media_pics/0151804.jpg deleted file mode 100644 index ceb0af0..0000000 Binary files a/media_pics/0151804.jpg and /dev/null differ diff --git a/media_pics/0167260.jpg b/media_pics/0167260.jpg deleted file mode 100644 index a613442..0000000 Binary files a/media_pics/0167260.jpg and /dev/null differ diff --git a/media_pics/0175880.jpg b/media_pics/0175880.jpg deleted file mode 100644 index d371cb5..0000000 Binary files a/media_pics/0175880.jpg and /dev/null differ diff --git a/media_pics/0221073.jpg b/media_pics/0221073.jpg deleted file mode 100644 index 5f3507a..0000000 Binary files a/media_pics/0221073.jpg and /dev/null differ diff --git a/media_pics/0234215.jpg b/media_pics/0234215.jpg deleted file mode 100644 index 38782a9..0000000 Binary files a/media_pics/0234215.jpg and /dev/null differ diff --git a/media_pics/0242653.jpg b/media_pics/0242653.jpg deleted file mode 100644 index cf9a548..0000000 Binary files a/media_pics/0242653.jpg and /dev/null differ diff --git a/media_pics/0295297.jpg b/media_pics/0295297.jpg deleted file mode 100644 index 47c8136..0000000 Binary files a/media_pics/0295297.jpg and /dev/null differ diff --git a/media_pics/0304415.jpg b/media_pics/0304415.jpg deleted file mode 100644 index c0dd0bb..0000000 Binary files a/media_pics/0304415.jpg and /dev/null differ diff --git a/media_pics/0305999.jpg b/media_pics/0305999.jpg deleted file mode 100644 index fe7b641..0000000 Binary files a/media_pics/0305999.jpg and /dev/null differ diff --git a/media_pics/0310793.jpg b/media_pics/0310793.jpg deleted file mode 100644 index 699d020..0000000 Binary files a/media_pics/0310793.jpg and /dev/null differ diff --git a/media_pics/0317198.jpg b/media_pics/0317198.jpg deleted file mode 100644 index dc33365..0000000 Binary files a/media_pics/0317198.jpg and /dev/null differ diff --git a/media_pics/0330373.jpg b/media_pics/0330373.jpg deleted file mode 100644 index f35ed3b..0000000 Binary files a/media_pics/0330373.jpg and /dev/null differ diff --git a/media_pics/0332280.jpg b/media_pics/0332280.jpg deleted file mode 100644 index 53dba5a..0000000 Binary files a/media_pics/0332280.jpg and /dev/null differ diff --git a/media_pics/0343737.jpg b/media_pics/0343737.jpg deleted file mode 100644 index c81f377..0000000 Binary files a/media_pics/0343737.jpg and /dev/null differ diff --git a/media_pics/0356150.jpg b/media_pics/0356150.jpg deleted file mode 100644 index b615d33..0000000 Binary files a/media_pics/0356150.jpg and /dev/null differ diff --git a/media_pics/0361596.jpg b/media_pics/0361596.jpg deleted file mode 100644 index 6186262..0000000 Binary files a/media_pics/0361596.jpg and /dev/null differ diff --git a/media_pics/0365748.jpg b/media_pics/0365748.jpg deleted file mode 100644 index ddeff7c..0000000 Binary files a/media_pics/0365748.jpg and /dev/null differ diff --git a/media_pics/0366548.jpg b/media_pics/0366548.jpg deleted file mode 100644 index b4d6f6c..0000000 Binary files a/media_pics/0366548.jpg and /dev/null differ diff --git a/media_pics/0366551.jpg b/media_pics/0366551.jpg deleted file mode 100644 index d5c5eed..0000000 Binary files a/media_pics/0366551.jpg and /dev/null differ diff --git a/media_pics/0367959.jpg b/media_pics/0367959.jpg deleted file mode 100644 index 0a94f4a..0000000 Binary files a/media_pics/0367959.jpg and /dev/null differ diff --git a/media_pics/0376541.jpg b/media_pics/0376541.jpg deleted file mode 100644 index b2b70f3..0000000 Binary files a/media_pics/0376541.jpg and /dev/null differ diff --git a/media_pics/0381061.jpg b/media_pics/0381061.jpg deleted file mode 100644 index 21d641d..0000000 Binary files a/media_pics/0381061.jpg and /dev/null differ diff --git a/media_pics/0383574.jpg b/media_pics/0383574.jpg deleted file mode 100644 index f209f5b..0000000 Binary files a/media_pics/0383574.jpg and /dev/null differ diff --git a/media_pics/0388795.jpg b/media_pics/0388795.jpg deleted file mode 100644 index 533708c..0000000 Binary files a/media_pics/0388795.jpg and /dev/null differ diff --git a/media_pics/0397535.jpg b/media_pics/0397535.jpg deleted file mode 100644 index 51971c4..0000000 Binary files a/media_pics/0397535.jpg and /dev/null differ diff --git a/media_pics/0401747.jpg b/media_pics/0401747.jpg deleted file mode 100644 index a3752c4..0000000 Binary files a/media_pics/0401747.jpg and /dev/null differ diff --git a/media_pics/0405296.jpg b/media_pics/0405296.jpg deleted file mode 100644 index 9d9ddad..0000000 Binary files a/media_pics/0405296.jpg and /dev/null differ diff --git a/media_pics/0410297.jpg b/media_pics/0410297.jpg deleted file mode 100644 index 37d8a7f..0000000 Binary files a/media_pics/0410297.jpg and /dev/null differ diff --git a/media_pics/0412080.jpg b/media_pics/0412080.jpg deleted file mode 100644 index bd56645..0000000 Binary files a/media_pics/0412080.jpg and /dev/null differ diff --git a/media_pics/0413573.jpg b/media_pics/0413573.jpg deleted file mode 100644 index 3556a34..0000000 Binary files a/media_pics/0413573.jpg and /dev/null differ diff --git a/media_pics/0416449.jpg b/media_pics/0416449.jpg deleted file mode 100644 index ec5ff06..0000000 Binary files a/media_pics/0416449.jpg and /dev/null differ diff --git a/media_pics/0424345.jpg b/media_pics/0424345.jpg deleted file mode 100644 index fe83926..0000000 Binary files a/media_pics/0424345.jpg and /dev/null differ diff --git a/media_pics/0434409.jpg b/media_pics/0434409.jpg deleted file mode 100644 index c094812..0000000 Binary files a/media_pics/0434409.jpg and /dev/null differ diff --git a/media_pics/0436697.jpg b/media_pics/0436697.jpg deleted file mode 100644 index 44ec74b..0000000 Binary files a/media_pics/0436697.jpg and /dev/null differ diff --git a/media_pics/0443453.jpg b/media_pics/0443453.jpg deleted file mode 100644 index 73fdadb..0000000 Binary files a/media_pics/0443453.jpg and /dev/null differ diff --git a/media_pics/0449059.jpg b/media_pics/0449059.jpg deleted file mode 100644 index 52679a3..0000000 Binary files a/media_pics/0449059.jpg and /dev/null differ diff --git a/media_pics/0453467.jpg b/media_pics/0453467.jpg deleted file mode 100644 index 1ae7603..0000000 Binary files a/media_pics/0453467.jpg and /dev/null differ diff --git a/media_pics/0457939.jpg b/media_pics/0457939.jpg deleted file mode 100644 index b12e8e2..0000000 Binary files a/media_pics/0457939.jpg and /dev/null differ diff --git a/media_pics/0462538.jpg b/media_pics/0462538.jpg deleted file mode 100644 index b6d9ca8..0000000 Binary files a/media_pics/0462538.jpg and /dev/null differ diff --git a/media_pics/0483726.jpg b/media_pics/0483726.jpg deleted file mode 100644 index 3eb984d..0000000 Binary files a/media_pics/0483726.jpg and /dev/null differ diff --git a/media_pics/0758766.jpg b/media_pics/0758766.jpg deleted file mode 100644 index 78ba7c9..0000000 Binary files a/media_pics/0758766.jpg and /dev/null differ diff --git a/media_pics/da_vinci_code.jpg b/media_pics/da_vinci_code.jpg deleted file mode 100644 index 1e7b731..0000000 Binary files a/media_pics/da_vinci_code.jpg and /dev/null differ