Preparing 0.5.2-2 release

[mussorgsky] / src / aa_selection_dialog.py

diff --git a/src/aa_selection_dialog.py b/src/aa_selection_dialog.py
index 704b67e..58892c6 100644 (file)
--- a/src/aa_selection_dialog.py
+++ b/src/aa_selection_dialog.py
@@ -5,6 +5,9 @@ from album_art_thread import MussorgskyAlbumArt
 
 RESPONSE_CLICK = 1
 
+import i18n
+_ = i18n.language.gettext
+
 class ClickableImage (gtk.EventBox):
 
     def __init__ (self, isRemoveOption=False):
@@ -51,7 +54,7 @@ class AlbumArtSelectionDialog (gtk.Dialog):
         Optionally downloader (for testing porpouses)
         """
         gtk.Dialog.__init__ (self,
-                             "Select album art", parent,
+                             _("Select album art"), parent,
                              gtk.DIALOG_DESTROY_WITH_PARENT,
                              (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
         self.artist = artist
@@ -87,23 +90,24 @@ 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.pack_start (hbox, padding=24)
+        
+        label = gtk.Label (_("New search:"))
+        self.entry = hildon.Entry (gtk.HILDON_SIZE_FINGER_HEIGHT)
+        self.entry.set_text (self.artist + " " +  self.album)
 
-        self.vbox.pack_start (hbox)
-
-        label = gtk.Label ("Search:")
-        entry = hildon.Entry (gtk.HILDON_SIZE_FINGER_HEIGHT)
-        entry.set_text (self.artist + " " +  self.album)
-        entry.grab_focus ()
+        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_text ("Go", "")
-        button.connect ("clicked", self.user_text_search_cb, entry)
-        self.hbox_research = gtk.HBox (homogeneous=False)
+        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 (entry)
+        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)
+        self.vbox.pack_start (self.hbox_research, padding=6)
 
     def __get_alternatives_async (self):
         results = self.downloader.get_alternatives (self.album,
@@ -132,17 +136,19 @@ class AlbumArtSelectionDialog (gtk.Dialog):
                 
         hildon.hildon_gtk_window_set_progress_indicator (self, 0)
         self.hbox_research.set_sensitive (True)
-
+        self.entry.grab_focus ()
+        self.entry.select_region (0, -1)
+        
     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)
-                #ev.set_default_image ()
+            self.hbox_research.set_sensitive (False)
             while (gtk.events_pending()):
                 gtk.main_iteration()
 
-            hildon.hildon_gtk_window_set_progress_indicator (self, 1)
             results = self.downloader.get_alternatives_free_text (user_text,
                                                                   self.size)
             self.__show_results (results)
@@ -175,10 +181,10 @@ if __name__ == "__main__":
     import time
     class MockDownloader:
         def __init__ (self):
-            self.alt = [("../hendrix.jpeg", "../hendrix-thumb.jpeg"),
-                        ("../hoover.jpeg", "../hoover-thumb.jpeg"),
-                        ("../backbeat.jpeg", "../backbeat-thumb.jpeg"),
-                        ("../dylan.jpeg", "../dylan-thumb.jpeg")]
+            self.alt = [("../hendrix.jpeg", "../thumb1.124.jpeg"),
+                        ("../hoover.jpeg", "../thumb2.124.jpeg"),
+                        ("../backbeat.jpeg", "../thumb3.124.jpeg"),
+                        ("../dylan.jpeg", "../thumb5.jpeg")]
         def get_alternatives (self, album, artist, amount):
             for a in self.alt:
                 time.sleep (1)
@@ -194,7 +200,7 @@ if __name__ == "__main__":
                               
 
     def clicked_button (self):
-        aadd = AlbumArtSelectionDialog (w, "rory gallagher", "irish tour", 4, MockDownloader ())
+        aadd = AlbumArtSelectionDialog (w, "joe henderson", "blue note", 4, MockDownloader ())
         aadd.show_all ()
         response = aadd.run ()
         if response == gtk.RESPONSE_CLOSE or response == gtk.RESPONSE_DELETE_EVENT or response == gtk.RESPONSE_REJECT: