From 4fedba444a54a05ac7383b110692926cdcbe3ea3 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Tue, 14 May 2013 17:00:53 +0200
Subject: Keyboard shortcuts are now usable

---
 data/mat.ui | 16 +++++++---------
 mat-gui     | 21 +++++----------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/data/mat.ui b/data/mat.ui
index 83d1702..db16d67 100644
--- a/data/mat.ui
+++ b/data/mat.ui
@@ -183,7 +183,6 @@
         </child>
         <child>
           <object class="GtkToolbar" id="Toolbar">
-            <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
               <object class="GtkToolButton" id="add">
@@ -263,8 +262,8 @@
             <property name="can_focus">False</property>
             <child>
               <object class="GtkTreeView" id="Treeview">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
+                <property name="events"/>
                 <property name="hexpand">True</property>
                 <property name="model">Liststore</property>
                 <property name="rules_hint">True</property>
@@ -273,12 +272,6 @@
                 <property name="rubber_banding">True</property>
                 <signal name="drag-data-received" handler="cb_drag_data_received" swapped="no"/>
                 <signal name="row-activated" handler="cb_popup_metadata" swapped="no"/>
-                <signal name="key-press-event" handler="cb_treeview_keyboard_event" swapped="no"/>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection1">
-                    <property name="mode">multiple</property>
-                  </object>
-                </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="tvc_path">
                     <property name="resizable">True</property>
@@ -490,6 +483,11 @@
                 <property name="entry_text_column">1</property>
                 <property name="id_column">1</property>
                 <signal name="changed" handler="cb_update_supported_popup" swapped="no"/>
+                <child internal-child="entry">
+                  <object class="GtkEntry" id="comboboxtext-entry2">
+                    <property name="can_focus">False</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/mat-gui b/mat-gui
index fe6edae..de77a47 100755
--- a/mat-gui
+++ b/mat-gui
@@ -100,8 +100,10 @@ class GUI(object):
 
     def __set_drag_treeview(self):
         ''' Setup the drag'n'drop handling by the treeview '''
-        self.treeview.drag_dest_set(Gtk.DestDefaults.MOTION |
-            Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP,
+        self.treeview.drag_dest_set(
+            Gtk.DestDefaults.MOTION |
+            Gtk.DestDefaults.HIGHLIGHT |
+            Gtk.DestDefaults.DROP,
             [], Gdk.DragAction.COPY)
         targets = Gtk.TargetList.new([])
         targets.add_uri_targets(80)
@@ -123,17 +125,6 @@ class GUI(object):
         remaining = self.builder.get_object('supported_remaining').get_buffer()
         remaining.set_text(self.supported_dict.list[index]['remaining'])
 
-    def cb_treeview_keyboard_event(self, widget, event):
-        '''
-            Remove selected files from the treeview
-            when the use hit the 'suppr' key
-        '''
-        if Gdk.keyval_name(event.keyval) == "Delete":
-            rows = []
-            self.treeview.get_selection().selected_foreach(
-                lambda model, path, iter: rows.append(iter))
-            [self.liststore.remove(i) for i in rows]
-
     def cb_close_application(self, _):
         ''' Close the application '''
         Gtk.main_quit()
@@ -168,8 +159,6 @@ class GUI(object):
         '''
             Popup that display on double-clic
             metadata from a file
-
-            FIXME: use a prettier GUI ?
         '''
         label = '<b>%s</b>\'s metadatas:\n' % self.liststore[row][1]
         meta = ''
@@ -181,7 +170,7 @@ class GUI(object):
             self.liststore[row][6] = 1
             iterator = self.liststore[row][0].file.get_meta().iteritems()
             for i, j in iterator:
-                name = '-<b>' + str(i) + '</b> : '
+                name = '-<b>' + str(i) + '</b>: '
                 meta += (name + str(j) + '\n')
 
         w = Gtk.MessageDialog(self.window,
-- 
cgit v1.3