testing git push

[jamaendo] / jamaui / ui.py

diff --git a/jamaui/ui.py b/jamaui/ui.py
index 8fc1997..2c0ad65 100644 (file)
--- a/jamaui/ui.py
+++ b/jamaui/ui.py
@@ -38,7 +38,7 @@ gobject.threads_init()
 
 log = logging.getLogger(__name__)
 
-VERSION = '0.1'
+VERSION = '0.2'
 
 try:
     import hildon
@@ -80,12 +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.set_icon('jamaendo')
+
         self.window.connect("destroy", self.destroy)
 
         self.CONFDIR = os.path.expanduser('~/MyDocs/.jamaendo')
@@ -93,7 +94,9 @@ class Jamaui(object):
         settings.set_filename(os.path.join(self.CONFDIR, 'ui_settings'))
         settings.load()
 
-        postoffice.connect('request-album-cover', self.on_request_cover)
+        postoffice.connect('request-album-cover', self, self.on_request_cover)
+        postoffice.connect('request-images', self, self.on_request_images)
+        log.debug("Created main window.")
 
     def save_settings(self):
         settings.save()
@@ -106,10 +109,10 @@ class Jamaui(object):
         #search.connect("clicked", self.on_search)
         #self.menu.append(search)
 
-        #player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
-        #player.set_label("Open player")
-        #player.connect("clicked", self.on_player)
-        #self.menu.append(player)
+        player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+        player.set_label("Open player")
+        player.connect("clicked", self.on_player)
+        self.menu.append(player)
 
         player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
         player.set_label("Favorites")
@@ -174,9 +177,15 @@ class Jamaui(object):
     def on_request_cover(self, albumid, size):
         jamaendo.get_album_cover_async(self.got_album_cover, int(albumid), size)
 
+    def on_request_images(self, urls):
+        jamaendo.get_images_async(self.got_images, urls)
+
     def got_album_cover(self, albumid, size, cover):
         postoffice.notify('album-cover', albumid, size, cover)
 
+    def got_images(self, images):
+        postoffice.notify('images', images)
+
     #def add_featured_button(self):
     #    self.featured_sel = hildon.TouchSelector(text=True)
     #    self.featured_sel.append_text("Albums of the week")
@@ -191,14 +200,18 @@ class Jamaui(object):
     #    self.bbox.add(btn)
 
     def destroy(self, widget):
-        postoffice.disconnect('request-album-cover', self.on_request_cover)
+        postoffice.disconnect(['request-album-cover', 'request-images'], self)
+        self.save_settings()
+        from player import the_player
+        if the_player:
+            the_player.stop()
         gtk.main_quit()
 
     def show_about(self, w, win):
         dialog = gtk.AboutDialog()
         dialog.set_program_name("jamaendo")
-        dialog.set_website("http://github.com/krig")
-        dialog.set_website_label("http://github.com/krig")
+        dialog.set_website("http://jamaendo.garage.maemo.org/")
+        dialog.set_website_label("http://jamaendo.garage.maemo.org/")
         dialog.set_version(VERSION)
         dialog.set_license("""Copyright (c) 2010, Kristoffer Gronlund
 All rights reserved.
@@ -255,11 +268,12 @@ JAMENDO is an online platform that distributes musical works under Creative Comm
 
     def on_featured(self, button):
         dialog = hildon.PickerDialog(self.window)
-        sel = hildon.TouchSelector(text=True)
+        sel = hildon.TouchSelectorEntry(text=True)
         for feature, _ in FeaturedWindow.features:
             sel.append_text(feature)
         dialog.set_selector(sel)
         dialog.set_title("Featured")
+        sel.unselect_all(0)
         if dialog.run() == gtk.RESPONSE_OK:
             txt = sel.get_current_text()
             self.featuredwnd = FeaturedWindow(txt)
@@ -307,7 +321,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):