Few UI improvements in download-dialog

[mussorgsky] / src / aa_selection_dialog.py

diff --git a/src/aa_selection_dialog.py b/src/aa_selection_dialog.py
index bd6daa3..fad7b49 100644 (file)
--- a/src/aa_selection_dialog.py
+++ b/src/aa_selection_dialog.py
@@ -54,7 +54,6 @@ class AlbumArtSelectionDialog (gtk.Dialog):
                              "Select album art", parent,
                              gtk.DIALOG_DESTROY_WITH_PARENT,
                              (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
-        self.DEFAULT_ALBUM = size+1
         self.artist = artist
         self.album = album
         self.size = size
@@ -88,14 +87,34 @@ class AlbumArtSelectionDialog (gtk.Dialog):
         image.connect ("button-release-event", self.click_on_img)
         self.images.append (image)
         hbox.pack_start (image, expand=False, fill=True)
-
-        self.vbox.add (hbox)
+        self.vbox.pack_start (hbox, padding=6)
+        
+        label = gtk.Label ("New search:")
+        self.entry = hildon.Entry (gtk.HILDON_SIZE_FINGER_HEIGHT)
+        self.entry.set_text (self.artist + " " +  self.album)
+
+        img = gtk.Image ()
+        img.set_from_icon_name ("general_search", gtk.ICON_SIZE_LARGE_TOOLBAR)
+        button = hildon.Button (gtk.HILDON_SIZE_FINGER_HEIGHT,
+                                hildon.BUTTON_ARRANGEMENT_HORIZONTAL)
+        button.set_image (img)
+        button.connect ("clicked", self.user_text_search_cb, self.entry)
+        self.hbox_research = gtk.HBox (homogeneous=False, spacing=6)
+        self.hbox_research.pack_start (label, expand=False)
+        self.hbox_research.pack_start (self.entry)
+        self.hbox_research.pack_start (button, expand=False)
+        self.hbox_research.set_sensitive (False)
+        self.vbox.pack_start (self.hbox_research, padding=6)
 
     def __get_alternatives_async (self):
+        results = self.downloader.get_alternatives (self.album,
+                                                    self.artist,
+                                                    self.size)
+        self.__show_results (results)
+        
+    def __show_results (self, generator):
         counter = 0
-        for (path, thumb) in self.downloader.get_alternatives (self.album,
-                                                               self.artist,
-                                                               self.size):
+        for (path, thumb) in generator:
             print path, thumb
             if (self.cancel):
                 return False
@@ -113,7 +132,23 @@ class AlbumArtSelectionDialog (gtk.Dialog):
                 counter += 1
                 
         hildon.hildon_gtk_window_set_progress_indicator (self, 0)
+        self.hbox_research.set_sensitive (True)
+        self.entry.grab_focus ()
+        
+    def user_text_search_cb (self, w, entry):
+        user_text = entry.get_text ()
+        if user_text and len (user_text) > 0:
+            hildon.hildon_gtk_window_set_progress_indicator (self, 1)
+            for ev in self.images[:-1]:
+                ev.set_sensitive (False)
+            self.hbox_research.set_sensitive (False)
+            while (gtk.events_pending()):
+                gtk.main_iteration()
 
+            results = self.downloader.get_alternatives_free_text (user_text,
+                                                                  self.size)
+            self.__show_results (results)
+            
 
     def click_on_img (self, image, event):
         if (image.is_remove_option ()):
@@ -150,6 +185,10 @@ if __name__ == "__main__":
             for a in self.alt:
                 time.sleep (1)
                 yield a
+        def get_alternatives_free_text (self, user_text, amount=4):
+            for a in [("free%d" % i, "thumb%d" %i) for i in range (0, amount)]:
+                time.sleep (1)
+                yield a
         def save_alternative (self, artist, album, img, thumb):
             return ("/home/user/.cache/media-art/" + img, "/home/user/.thumbnails/normal/" + thumb)
         def reset_alternative (self, artist, album):