Tons of fixes/tweaks/changes in general

[jamaendo] / jamaui / ui.py

diff --git a/jamaui/ui.py b/jamaui/ui.py
index 8fc1997..f46feea 100644 (file)
--- a/jamaui/ui.py
+++ b/jamaui/ui.py
@@ -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,8 @@ 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)
+        log.debug("Created main window.")
 
     def save_settings(self):
         settings.save()
@@ -106,10 +108,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")
@@ -191,7 +193,8 @@ 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', self)
+        self.save_settings()
         gtk.main_quit()
 
     def show_about(self, w, win):
@@ -307,7 +310,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):