Using browse panel in edit_metadata

[mussorgsky] / src / browse_panel.py

diff --git a/src/browse_panel.py b/src/browse_panel.py
index 57b39c0..521dd1c 100755 (executable)
--- a/src/browse_panel.py
+++ b/src/browse_panel.py
@@ -5,10 +5,9 @@ from edit_panel_tm import MussorgskyEditPanel
 from utils import escape_html, Set
 
 class MussorgskyBrowsePanel (hildon.StackableWindow):
-#class MussorgskyBrowsePanel (gtk.Window):
+
     def __init__ (self, songs_list):
         hildon.StackableWindow.__init__ (self)
-        #gtk.Window.__init__ (self)
         self.set_title ("Browse collection")
         self.set_border_width (12)
         self.__create_view ()
@@ -18,18 +17,25 @@ class MussorgskyBrowsePanel (hildon.StackableWindow):
         self.albums_set = Set ()
 
         # (uri, "Music", artist, title, album, mimetype) + "string"
-        self.full_model = gtk.ListStore (str, str, str, str, str, str, str)
+        full_model = gtk.ListStore (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))
-            self.full_model.append ((uri, category, artist, title, album, mime, text))
+            full_model.append ((uri, category, artist, title, album, mime, text))
             self.artist_set.insert (artist)
             self.albums_set.insert (album)
             
-        self.filtered_model = self.full_model.filter_new ()
-        self.treeview.set_model (self.full_model)
+        self.filtered_model = 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
+
+
     def __create_view (self):
         vbox = gtk.VBox (homogeneous=False)
         
@@ -39,18 +45,14 @@ class MussorgskyBrowsePanel (hildon.StackableWindow):
         desc_column = gtk.TreeViewColumn ("Song", gtk.CellRendererText (), markup=6)
         desc_column.set_expand (True)
         self.treeview.append_column (desc_column)
-        self.treeview.set_enable_search (True)
-        self.treeview.set_search_column (6)
-        self.treeview.set_search_equal_func (self.entry_equals)
 
         pannable_area = hildon.PannableArea ()
-        #pannable_area = gtk.ScrolledWindow ()
         pannable_area.add (self.treeview)
         
         vbox.pack_start (pannable_area, expand=True)
         
         self.search_hbox = gtk.HBox ()
-        self.search_entry = gtk.Entry ()
+        self.search_entry = hildon.Entry (gtk.HILDON_SIZE_FINGER_HEIGHT)
         self.search_hbox.pack_start (self.search_entry, expand=True)
         
         self.search_close = gtk.Button (stock=gtk.STOCK_CLOSE)
@@ -68,7 +70,7 @@ class MussorgskyBrowsePanel (hildon.StackableWindow):
         print "Search"
         self.filtered_model.set_visible_func (self.entry_equals, widget)
         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
@@ -90,7 +92,6 @@ class MussorgskyBrowsePanel (hildon.StackableWindow):
             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 ()
@@ -100,10 +101,16 @@ class MussorgskyBrowsePanel (hildon.StackableWindow):
         edit_view = MussorgskyEditPanel ()
         edit_view.set_artist_alternatives (self.artist_set.as_list ())
         edit_view.set_album_alternatives (self.albums_set.as_list ())
-        
-        edit_view.set_model (treeview.get_model(), treeview.get_model ().get_iter (path))
+        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()
 
 if __name__ == "__main__":
 
@@ -120,7 +127,7 @@ if __name__ == "__main__":
               "Artist%d" % i,
               "Title <%d>" % i,
               "album <%d>" % i,
-              "audio/mp3") for i in range (0, 100)]
+              "audio/mpeg") for i in range (0, 100)]
 
     window = MussorgskyBrowsePanel (songs)
     window.connect ("destroy", gtk.main_quit )