Improved gui.

fuzzyopen/fuzzyopen.py

@@ -85,17 +85,14 @@ def _init_glade( self ):
     self._hit_list = self._fuzzyopen_glade.get_object( "hit_list" )
     self._hit_list.connect("select-cursor-row", self.on_select_from_list)
     self._hit_list.connect("button_press_event", self.on_list_mouse)
-    self._liststore = gtk.ListStore(gtk.gdk.Pixbuf, str, str, str)
+    self._liststore = gtk.ListStore(gtk.gdk.Pixbuf, str, str)
     self._hit_list.set_model(self._liststore)
     column0 = gtk.TreeViewColumn("Icon", gtk.CellRendererPixbuf(), pixbuf=0)
     column0.set_sizing(gtk.TREE_VIEW_COLUMN_AUTOSIZE)
-    column1 = gtk.TreeViewColumn("Token", gtk.CellRendererText(), markup=1)
+    column1 = gtk.TreeViewColumn("File", gtk.CellRendererText(), markup=1)
     column1.set_sizing(gtk.TREE_VIEW_COLUMN_AUTOSIZE)
-    column2 = gtk.TreeViewColumn("File", gtk.CellRendererText(), markup=2)
-    column2.set_sizing(gtk.TREE_VIEW_COLUMN_AUTOSIZE)
     self._hit_list.append_column(column0)
     self._hit_list.append_column(column1)
-    self._hit_list.append_column(column2)
     self._hit_list.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
 
   #mouse event on list

fuzzyopen/suggestion.py

@@ -58,21 +58,21 @@ def suggest( self, sub ):
   def _metadata( self, suggestion ):
     target = os.path.join(self._filepath, suggestion[1])
     time_string = util.relative_time(os.stat(target).st_mtime)
-    highlight = suggestion[0] + "\nMODIFY " + time_string
+    highlight = "<span size='x-large'>" + suggestion[0] + "</span>\n" + self._token_string( suggestion[1] ) + "MODIFY " + time_string
     if self._git and (suggestion[1] in self._git_files):
       index = self._git_files.index(suggestion[1])
       highlight += self._git_string(index)
-    file_icon = gio.File(suggestion[1]).query_info('standard::icon').get_icon()
+    file_icon = gio.File(os.path.join(self._filepath, suggestion[1])).query_info('standard::icon').get_icon()
     icon = gtk.icon_theme_get_default().lookup_by_gicon(file_icon, 40, gtk.ICON_LOOKUP_USE_BUILTIN)
-    return (icon and icon.load_icon(), self._token_string( suggestion[1] ), highlight, suggestion[1])
+    return (icon and icon.load_icon(), highlight, suggestion[1])
 
   def _token_string( self, file ):
     token = os.path.splitext(file)[-1]
     if token != '':
       token = token[1:]
     else:
       token = '.'
-    return "<span variant='smallcaps' size='x-large' foreground='#FFFFFF' background='#929292'><b>" + token.upper() + '</b></span>'
+    return "<span variant='smallcaps' foreground='#FFFFFF' background='#B2B2B2'><b> " + token.upper() + ' </b></span> '
 
   def _git_string( self, line_id ):
     add = int(self._git_with_diff[line_id][0])