Merge lp:~francesco-marella/pasaffe/clone_context-menu into lp:~mdeslaur/pasaffe/trunk

[Francesco Marella]

[Marc Deslauriers (mdeslaur)]

Looks good, thanks!

review: Approve

=== modified file 'data/ui/PasaffeWindow.ui'
--- data/ui/PasaffeWindow.ui	2011-08-22 21:11:16 +0000
+++ data/ui/PasaffeWindow.ui	2011-09-28 18:38:22 +0000
@@ -9,6 +9,26 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-copy</property>
   </object>
+  <object class="GtkImage" id="image10">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gnome-stock-text-indent</property>
+  </object>
+  <object class="GtkImage" id="image11">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-copy</property>
+  </object>
+  <object class="GtkImage" id="image12">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-copy</property>
+  </object>
+  <object class="GtkImage" id="image13">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-copy</property>
+  </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -49,6 +69,11 @@
     <property name="stock">gtk-info</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkImage" id="image9">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-copy</property>
+  </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name entry_name -->
@@ -57,6 +82,93 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkMenu" id="menu_popup">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="mnu_add1">
+        <property name="label">gtk-add</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <signal name="activate" handler="on_mnu_add_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="mnu_edit1">
+        <property name="label">gtk-edit</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <signal name="activate" handler="on_mnu_edit1_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="mnu_clone1">
+        <property name="label" translatable="yes">Clone</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="image">image13</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_mnu_clone_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="mnu_delete1">
+        <property name="label">gtk-delete</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <signal name="activate" handler="on_mnu_delete_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="url_copy1">
+        <property name="label" translatable="yes">Copy URL</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="image">image12</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_url_copy_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="username_copy1">
+        <property name="label" translatable="yes">Copy Username</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="image">image11</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_username_copy_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="password_copy1">
+        <property name="label" translatable="yes">Copy Password</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="image">image10</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_password_copy_activate" swapped="no"/>
+      </object>
+    </child>
+  </object>
   <object class="PasaffeWindow" id="pasaffe_window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Pasaffe</property>
@@ -166,49 +278,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="mnu_cut">
-                        <property name="label">gtk-cut</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="x" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="on_mnu_cut_activate" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="mnu_copy">
-                        <property name="label">gtk-copy</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="on_mnu_copy_activate" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="mnu_paste">
-                        <property name="label">gtk-paste</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="v" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="on_mnu_paste_activate" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                      </object>
-                    </child>
-                    <child>
                       <object class="GtkImageMenuItem" id="mnu_add">
                         <property name="label">gtk-add</property>
                         <property name="visible">True</property>
@@ -220,6 +289,17 @@
                       </object>
                     </child>
                     <child>
+                      <object class="GtkImageMenuItem" id="mnu_clone">
+                        <property name="label">Clone</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="image">image9</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_mnu_clone_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkImageMenuItem" id="mnu_delete">
                         <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
@@ -581,6 +661,7 @@
                     <property name="model">liststore1</property>
                     <property name="headers_visible">False</property>
                     <signal name="cursor-changed" handler="on_treeview1_cursor_changed" swapped="no"/>
+                    <signal name="button-press-event" handler="on_treeview1_button_press_event" swapped="no"/>
                     <signal name="row-activated" handler="on_treeview1_row_activated" swapped="no"/>
                     <child>
                       <object class="GtkTreeViewColumn" id="treeviewcolumn1">

=== modified file 'pasaffe/PasaffeWindow.py'
--- pasaffe/PasaffeWindow.py	2011-09-27 06:58:19 +0000
+++ pasaffe/PasaffeWindow.py	2011-09-28 18:38:22 +0000
@@ -240,6 +240,18 @@
         self.ui.display_secrets.set_active(False)
         self.ui.mnu_display_secrets.set_active(False)
 
+    def on_treeview1_button_press_event(self, treeview, event):
+        if event.button == 3:
+            x = int(event.x)
+            y = int(event.y)
+            time = event.time
+            pthinfo = treeview.get_path_at_pos(x, y)
+            if pthinfo is not None:
+                path, col, cellx, celly = pthinfo
+                treeview.grab_focus()
+                treeview.set_cursor(path, col, 0)
+                self.ui.menu_popup.popup(None, None, None, 3, time)
+
     def add_entry(self):
         self.disable_idle_timeout()
 
@@ -272,6 +284,47 @@
             self.save_db()
         self.set_idle_timeout()
 
+    def clone_entry(self, entry_uuid):
+        record_list = ( 3, 4, 5, 6, 13 )
+        self.disable_idle_timeout()
+
+        # Make sure dialog isn't already open
+        if self.editdetails_dialog is not None:
+            self.editdetails_dialog.present()
+            return
+
+        uuid = os.urandom(16)
+        uuid_hex = uuid.encode("hex")
+        timestamp = struct.pack("<I", int(time.time()))
+        new_entry = {1: uuid, 3: '', 4: '', 5: '', 6: '',
+                     7: timestamp, 8: timestamp, 12: timestamp, 13: ''}
+
+        for record in self.passfile.records:
+            if record[1] == entry_uuid.decode("hex"):
+                for record_type in record_list:
+                    if record.has_key(record_type):
+                        new_entry[record_type] = record[record_type]
+                break
+
+        self.passfile.records.append(new_entry)
+
+        response = self.edit_entry(uuid_hex)
+        if response != gtk.RESPONSE_OK:
+            self.delete_entry(uuid_hex)
+        else:
+            self.display_entries()
+            item = self.ui.treeview1.get_model().get_iter_first()
+            while (item != None):
+                if self.ui.liststore1.get_value(item, 1) == uuid_hex:
+                    self.ui.treeview1.get_selection().select_iter(item)
+                    self.display_data(uuid_hex)
+                    break
+                else:
+                    item = self.ui.treeview1.get_model().iter_next(item)
+        if preferences['auto-save'] == True:
+            self.save_db()
+        self.set_idle_timeout()
+
     def remove_entry(self):
         treemodel, treeiter = self.ui.treeview1.get_selection().get_selected()
         if treeiter != None:
@@ -423,17 +476,11 @@
         else:
             self.set_idle_timeout()
 
-    def on_mnu_cut_activate(self, menuitem):
-        print "TODO: implement on_mnu_cut_activate()"
-
-    def on_mnu_copy_activate(self, menuitem):
-        self.set_idle_timeout()
-        clipboard = gtk.clipboard_get()
-        self.ui.textview1.get_buffer().copy_clipboard(clipboard)
-        clipboard.store()
-
-    def on_mnu_paste_activate(self, menuitem):
-        print "TODO: implement on_mnu_paste_activate()"
+    def on_mnu_clone_activate(self, menuitem):
+        treemodel, treeiter = self.ui.treeview1.get_selection().get_selected()
+        if treeiter != None:
+            entry_uuid = treemodel.get_value(treeiter, 1)
+            self.clone_entry(entry_uuid)
 
     def on_username_copy_activate(self, menuitem):
         self.copy_selected_entry_item(4)
@@ -483,6 +530,12 @@
     def on_mnu_add_activate(self, menuitem):
         self.add_entry()
 
+    def on_mnu_edit1_activate(self, menuitem):
+        treemodel, treeiter = self.ui.treeview1.get_selection().get_selected()
+        if treeiter != None:
+            entry_uuid = treemodel.get_value(treeiter, 1)
+            self.edit_entry(entry_uuid)
+
     def on_mnu_delete_activate(self, menuitem):
         self.remove_entry()