X-Git-Url: http://git.maemo.org/git/?p=jamaendo;a=blobdiff_plain;f=jamaui%2Fui.py;h=329963b232a646f1427755feb27b7c9f5f974935;hp=2ba459723959b8cec9334017933307ed7e1d971f;hb=19020e8dae378875c8bfcd7e573ca5e91b1dfa10;hpb=d2b935f99c20e44a06663f0bf2c696b2ff911582;ds=sidebyside diff --git a/jamaui/ui.py b/jamaui/ui.py index 2ba4597..329963b 100644 --- a/jamaui/ui.py +++ b/jamaui/ui.py @@ -56,6 +56,7 @@ DBusGMainLoop(set_as_default=True) import jamaendo +from postoffice import postoffice from playerwindow import open_playerwindow from search import SearchWindow from featured import FeaturedWindow @@ -79,11 +80,13 @@ class Jamaui(object): self.window = None def create_window(self): + log.debug("Creating main window...") self.app = hildon.Program() self.window = hildon.StackableWindow() self.app.add_window(self.window) self.window.set_title("jamaendo") + self.window.connect("destroy", self.destroy) self.CONFDIR = os.path.expanduser('~/MyDocs/.jamaendo') @@ -91,6 +94,9 @@ class Jamaui(object): settings.set_filename(os.path.join(self.CONFDIR, 'ui_settings')) settings.load() + postoffice.connect('request-album-cover', self, self.on_request_cover) + log.debug("Created main window.") + def save_settings(self): settings.save() @@ -167,6 +173,12 @@ class Jamaui(object): btn.connect('clicked', callback) self.bbox.add(btn) + def on_request_cover(self, albumid, size): + jamaendo.get_album_cover_async(self.got_album_cover, int(albumid), size) + + def got_album_cover(self, albumid, size, cover): + postoffice.notify('album-cover', albumid, size, cover) + #def add_featured_button(self): # self.featured_sel = hildon.TouchSelector(text=True) # self.featured_sel.append_text("Albums of the week") @@ -181,6 +193,7 @@ class Jamaui(object): # self.bbox.add(btn) def destroy(self, widget): + postoffice.disconnect('request-album-cover', self) gtk.main_quit() def show_about(self, w, win): @@ -231,7 +244,7 @@ JAMENDO is an online platform that distributes musical works under Creative Comm dialog.destroy() def open_link(self, d, url, data): - print "url: %s" % (url) + #print "url: %s" % (url) import webbrowser webbrowser.open_new(url) @@ -284,9 +297,9 @@ JAMENDO is an online platform that distributes musical works under Creative Comm result = dialog.run() val = entry.get_text() dialog.destroy() - print val, result + #print val, result if val and result == gtk.RESPONSE_OK: - print "new user name:", val + #print "new user name:", val settings.user = val self.save_settings() @@ -296,7 +309,7 @@ JAMENDO is an online platform that distributes musical works under Creative Comm self.favoriteswnd.show_all() def on_player(self, button): - open_playerwindow([]) + open_playerwindow() ''' def on_search(self, button):