Add menu entries in the browse panel (only UI, no implementation)

[mussorgsky] / src / browse_panel.py

diff --git a/src/browse_panel.py b/src/browse_panel.py
index 521dd1c..50d0228 100755 (executable)
--- a/src/browse_panel.py
+++ b/src/browse_panel.py
@@ -4,6 +4,15 @@ import gtk, gobject
 from edit_panel_tm import MussorgskyEditPanel
 from utils import escape_html, Set
 
+# Shared with edit_panel_tm
+URI_COLUMN = 0
+ARTIST_COLUMN = 2
+TITLE_COLUMN = 3
+ALBUM_COLUMN = 4
+MIME_COLUMN = 5
+UI_COLUMN = 6
+SEARCH_COLUMN = 7
+
 class MussorgskyBrowsePanel (hildon.StackableWindow):
 
     def __init__ (self, songs_list):
@@ -16,32 +25,39 @@ class MussorgskyBrowsePanel (hildon.StackableWindow):
         self.artist_set = Set ()
         self.albums_set = Set ()
 
-        # (uri, "Music", artist, title, album, mimetype) + "string"
-        full_model = gtk.ListStore (str, str, str, str, str, str, str)
+        # (uri, "Music", artist, title, album, mimetype) + "string" + search_string
+        self.full_model = gtk.ListStore (str, str, str, str, str, str, str, str)
         for (uri, category, artist, title, album, mime) in songs_list:
             text = "<b>%s</b>\n<small>%s</small>" % (escape_html (title),
                                                      escape_html (artist) + " / " + escape_html (album))
-            full_model.append ((uri, category, artist, title, album, mime, text))
+            search_str = artist.lower () + " " + title.lower () + " " + album.lower ()
+            self.full_model.append ((uri, category, artist, title, album, mime, text, search_str))
             self.artist_set.insert (artist)
             self.albums_set.insert (album)
             
-        self.filtered_model = full_model.filter_new ()
+        self.filtered_model = self.full_model.filter_new ()
         self.treeview.set_model (self.filtered_model)
-        self.treeview.set_fixed_height_mode (True)
-        print self.filtered_model
-        self.filtered_model.connect ("row_changed", self.row_changed_cb)
-        self.kpid = self.connect ("key-press-event", self.key_pressed_cb)
-
-    def row_changed_cb (self, model, path, it):
-        print "In", self.__class__,"row-changed: ", model, path
+        self.filtered_model.set_visible_func (self.entry_equals, self.search_entry)
 
+        self.kpid = self.connect ("key-press-event", self.key_pressed_cb)
 
     def __create_view (self):
         vbox = gtk.VBox (homogeneous=False)
+
+        menu = hildon.AppMenu ()
+        all_items = gtk.RadioButton (None, "All")
+        all_items.set_mode (False)
+        all_items.connect ("clicked", self.__show_all_items)
+        menu.add_filter (all_items)
+        broken_items = gtk.RadioButton (all_items, "Uncomplete")
+        broken_items.set_mode (False)
+        broken_items.connect ("clicked", self.__show_uncomplete_items)
+        menu.add_filter (broken_items)
+        menu.show_all ()
+        self.set_app_menu (menu)
         
         self.treeview = gtk.TreeView ()
         self.treeview.connect ("row-activated", self.row_activated_cb)
-
         desc_column = gtk.TreeViewColumn ("Song", gtk.CellRendererText (), markup=6)
         desc_column.set_expand (True)
         self.treeview.append_column (desc_column)
@@ -58,7 +74,7 @@ class MussorgskyBrowsePanel (hildon.StackableWindow):
         self.search_close = gtk.Button (stock=gtk.STOCK_CLOSE)
         self.search_hbox.pack_start (self.search_close, expand=False)
         self.search_close.connect ("clicked", self.close_search_cb)
-        
+
         # Hide it when the window is created
         self.search_box_visible = False
         self.search_hbox.set_no_show_all (True)
@@ -67,10 +83,14 @@ class MussorgskyBrowsePanel (hildon.StackableWindow):
         self.add (vbox)
 
     def search_type (self, widget):
-        print "Search"
-        self.filtered_model.set_visible_func (self.entry_equals, widget)
+        if len (widget.get_text()) == 0:
+            self.treeview.set_model (self.full_model)
+            return
+            
+        if (len (widget.get_text ()) < 3):
+            return
         self.filtered_model.refilter ()
-        #self.treeview.set_model (self.filtered_model)
+        self.treeview.set_model (self.filtered_model)
 
     def close_search_cb (self, widget):
         assert not self.search_box_visible
@@ -88,14 +108,13 @@ class MussorgskyBrowsePanel (hildon.StackableWindow):
                 self.search_hbox.set_no_show_all (False)
                 self.search_hbox.show_all ()
                 
-            print "key:", gtk.gdk.keyval_name(event.keyval)
             self.search_entry.grab_focus ()
             self.search_entry.connect ("changed", self.search_type)
             self.disconnect (self.kpid)
     
     def entry_equals (self, model, it, user_data):
         t = user_data.get_text ()
-        return t.lower () in model.get_value (it, 6).lower()
+        return t.lower () in model.get_value (it, SEARCH_COLUMN)
 
     def row_activated_cb (self, treeview, path, view_colum):
         edit_view = MussorgskyEditPanel ()
@@ -103,14 +122,13 @@ class MussorgskyBrowsePanel (hildon.StackableWindow):
         edit_view.set_album_alternatives (self.albums_set.as_list ())
         edit_view.set_model (self.treeview.get_model (), self.treeview.get_model ().get_iter (path))
         edit_view.show_all ()
-        edit_view.connect ("destroy", self.after_edit)
-
-    def after_edit (self, widget):
-        while (gtk.events_pending()):
-            gtk.main_iteration()
-        self.treeview.queue_draw ()
-        while (gtk.events_pending()):
-            gtk.main_iteration()
+
+
+    def __show_all_items (self, button):
+        pass
+
+    def __show_uncomplete_items (self, button):
+        pass
 
 if __name__ == "__main__":