X-Git-Url: http://git.maemo.org/git/?p=jamaendo;a=blobdiff_plain;f=jamaui%2Fsearch.py;h=4efe294c5709222e97be200f650d317c95129c8e;hp=a6c818f453fc8d5f9a78a0e29fca83d4281802d7;hb=75215e5b54a5357384db5166fbecaa65164d8b94;hpb=075b350ccd54818888b4149962de512489c42b0c

diff --git a/jamaui/search.py b/jamaui/search.py
index a6c818f..4efe294 100644
--- a/jamaui/search.py
+++ b/jamaui/search.py
@@ -2,6 +2,8 @@ import gtk
 import hildon
 import jamaendo
 from playerwindow import open_playerwindow
+from showartist import ShowArtist
+from showalbum import ShowAlbum
 
 class SearchWindow(hildon.StackableWindow):
     def __init__(self):
@@ -10,51 +12,96 @@ class SearchWindow(hildon.StackableWindow):
 
         vbox = gtk.VBox(False, 0)
 
-        hbox = gtk.HBox()
+
+        # Results list
+        self.panarea = hildon.PannableArea()
+        self.result_store = gtk.ListStore(str, int)
+        #self.result_store.append(['red'])
+        self.result_view = gtk.TreeView(self.result_store)
+        col = gtk.TreeViewColumn('Name')
+        self.result_view.append_column(col)
+        cell = gtk.CellRendererText()
+        col.pack_start(cell, True)
+        col.add_attribute(cell, 'text', 0)
+        self.result_view.set_search_column(0)
+        col.set_sort_column_id(0)
+        self.result_view.connect('row-activated', self.row_activated)
+
+        self.panarea.add(self.result_view)
+        vbox.pack_start(self.panarea, True, True, 0)
+
+
+        # Create selector for search mode
+        self.mode_selector = hildon.TouchSelector(text=True)
+
+        self.mode_selector.append_text("Artists")
+        self.mode_selector.append_text("Albums")
+        self.mode_selector.append_text("Tracks")
+        self.mode = hildon.PickerButton(gtk.HILDON_SIZE_FINGER_HEIGHT,
+                                        hildon.BUTTON_ARRANGEMENT_VERTICAL)
+        self.mode.set_title("Search for")
+        self.mode.set_selector(self.mode_selector)
+        self.mode_selector.connect("changed", self.mode_changed)
+        #vbox.pack_start(self.mode, False)
+        self.mode.set_active(1)
+
+
+        # Search box
+        hbox = gtk.HBox(False, 0)
         self.entry = hildon.Entry(gtk.HILDON_SIZE_FINGER_HEIGHT)
         self.entry.set_placeholder("Search")
         self.entry.connect('activate', self.on_search)
         btn = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        btn.set_label("Go")
+        btn.set_label(">>")
         btn.connect('clicked', self.on_search)
+        hbox.pack_start(self.mode, False)
         hbox.pack_start(self.entry, True, True, 0)
         hbox.pack_start(btn, False)
-
-        btnbox = gtk.HBox()
-        playbtn = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        playbtn.set_label("Play selected")
-        playbtn.connect('clicked', self.play_selected)
-        btnbox.pack_start(playbtn, False)
-
-        self.results = hildon.TouchSelector(text=True)
-        self.results.connect("changed", self.selection_changed)
-        self.results.set_column_selection_mode(hildon.TOUCH_SELECTOR_SELECTION_MODE_SINGLE)
-
         vbox.pack_start(hbox, False)
-        vbox.pack_start(self.results, True, True, 0)
-        vbox.pack_start(btnbox, False)
+
 
         self.add(vbox)
 
         self.idmap = {}
 
-        self.pwnd = None
+    def mode_changed(self, selector, user_data):
+        current_selection = selector.get_current_text()
+        print current_selection
 
     def on_search(self, w):
+        mode = self.mode.get_active()
         txt = self.entry.get_text()
-        for album in jamaendo.search_albums(query=txt):
-            title = "%s - %s" % (album.artist_name, album.name)
-            self.idmap[title] = album
-            self.results.append_text(title)
-
-    def selection_changed(self, results, userdata):
-        pass
-
-    def play_selected(self, btn):
-        current_selection = self.results.get_current_text()
-
-        album = self.idmap[current_selection]
-        tracks = jamaendo.get_tracks(album.ID)
-        if tracks:
-            wnd = open_playerwindow(tracks)
-            wnd.on_play(None)
+        self.result_store.clear()
+        if mode == 0:
+            for artist in jamaendo.search_artists(query=txt):
+                title = artist.name
+                self.idmap[artist.ID] = artist
+                self.result_store.append([title, artist.ID])
+        elif mode == 1:
+            for album in jamaendo.search_albums(query=txt):
+                title = "%s - %s" % (album.artist_name, album.name)
+                self.idmap[album.ID] = album
+                self.result_store.append([title, album.ID])
+        elif mode == 2:
+            for track in jamaendo.search_tracks(query=txt):
+                title = "%s - %s" % (track.artist_name, track.name)
+                self.idmap[track.ID] = track
+                self.result_store.append([title, track.ID])
+
+    def row_activated(self, treeview, path, view_column):
+        treeiter = self.result_store.get_iter(path)
+        title, _id = self.result_store.get(treeiter, 0, 1)
+        item = self.idmap[_id]
+        print _id, item
+        self.open_item(item)
+
+    def open_item(self, item):
+        if isinstance(item, jamaendo.Album):
+            wnd = ShowAlbum(item)
+            wnd.show_all()
+        elif isinstance(item, jamaendo.Artist):
+            wnd = ShowArtist(item)
+            wnd.show_all()
+        elif isinstance(item, jamaendo.Track):
+            wnd = open_playerwindow()
+            wnd.play_tracks([item])