conduit r1241 - in trunk: . conduit/modules/FspotModule

[jstowers svn gnome org]

Author: jstowers
Date: Thu Jan 17 11:01:07 2008
New Revision: 1241
URL: http://svn.gnome.org/viewvc/conduit?rev=1241&view=rev

Log:
2008-01-17  John Stowers  <john stowers gmail com>

	* conduit/modules/FspotModule/FspotModule.py:
	* conduit/modules/FspotModule/config.glade: Sort the tags by name and
	allow search as you type in the config window. Fixes bug #355797 (maxxer)



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/FspotModule/FspotModule.py
   trunk/conduit/modules/FspotModule/config.glade

Modified: trunk/conduit/modules/FspotModule/FspotModule.py
==============================================================================
--- trunk/conduit/modules/FspotModule/FspotModule.py	(original)
+++ trunk/conduit/modules/FspotModule/FspotModule.py	Thu Jan 17 11:01:07 2008
@@ -22,8 +22,8 @@
 	"FspotSource" : { "type": "dataprovider" }
 }
 
-ID_IDX = 0
-NAME_IDX = 1
+NAME_IDX = 0
+ID_IDX = 1
 
 PHOTO_DB = os.path.join(os.path.expanduser("~"),".gnome2", "f-spot", "photos.db")
 
@@ -58,7 +58,7 @@
             #Get a list of all tags for the config dialog
             cur.execute("SELECT id, name FROM tags ORDER BY name")
             for tagid, tagname in cur:
-                tags.append( (tagid,tagname) )
+                tags.append( (tagname,tagid) )
             con.close()
 
         return tags
@@ -132,14 +132,14 @@
 						)
         tagtreeview = tree.get_widget("tagtreeview")
         #Build a list of all the tags
-        list_store = gtk.ListStore( gobject.TYPE_INT,       #ID_IDX
-                                    gobject.TYPE_STRING,    #NAME_IDX
+        list_store = gtk.ListStore( gobject.TYPE_STRING,    #NAME_IDX
+				     gobject.TYPE_INT,       #ID_IDX
                                     gobject.TYPE_BOOLEAN,   #active
                                     )
         #Fill the list store
         i = 0
         for t in self._get_all_tags():
-            list_store.append((t[ID_IDX],t[NAME_IDX],t[ID_IDX] in self.enabledTags))
+            list_store.append((t[NAME_IDX],t[ID_IDX],t[ID_IDX] in self.enabledTags))
             i += 1
         #Set up the treeview
         tagtreeview.set_model(list_store)

Modified: trunk/conduit/modules/FspotModule/config.glade
==============================================================================
--- trunk/conduit/modules/FspotModule/config.glade	(original)
+++ trunk/conduit/modules/FspotModule/config.glade	Thu Jan 17 11:01:07 2008
@@ -116,7 +116,7 @@
 		  <property name="rules_hint">False</property>
 		  <property name="reorderable">False</property>
 		  <property name="enable_search">True</property>
-		  <property name="search_column">1</property>
+		  <property name="search_column">0</property>
 		  <property name="fixed_height_mode">False</property>
 		  <property name="hover_selection">False</property>
 		  <property name="hover_expand">False</property>