electrum

commit 9cff42328d5b6c92c87a2b41bb1f4e463c39aab7
parent e39e2ed8f13b543c1c56a90b9b8465bc6d9571a3
Author: SomberNight <somber.night@protonmail.com>
Date:   Sat, 19 Jan 2019 23:11:21 +0100

qt contact list: fix copying address, sort order

closes #5015

Diffstat:
M
electrum/gui/qt/contact_list.py
 | 
14
++++++++------

1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/electrum/gui/qt/contact_list.py b/electrum/gui/qt/contact_list.py
@@ -60,20 +60,20 @@ class ContactList(MyTreeView):
 
     def create_menu(self, position):
         menu = QMenu()
-        selected = self.selected_in_column(0)
+        idx = self.indexAt(position)
+        column = idx.column() or 0
+        selected = self.selected_in_column(column)
         selected_keys = []
-        for idx in selected:
-            sel_key = self.model().itemFromIndex(idx).data(Qt.UserRole)
+        for s_idx in selected:
+            sel_key = self.model().itemFromIndex(s_idx).data(Qt.UserRole)
             selected_keys.append(sel_key)
-        idx = self.indexAt(position)
         if not selected or not idx.isValid():
             menu.addAction(_("New contact"), lambda: self.parent.new_contact_dialog())
             menu.addAction(_("Import file"), lambda: self.import_contacts())
             menu.addAction(_("Export file"), lambda: self.export_contacts())
         else:
-            column = idx.column()
             column_title = self.model().horizontalHeaderItem(column).text()
-            column_data = '\n'.join(self.model().itemFromIndex(idx).text() for idx in selected)
+            column_data = '\n'.join(self.model().itemFromIndex(s_idx).text() for s_idx in selected)
             menu.addAction(_("Copy {}").format(column_title), lambda: self.parent.app.clipboard().setText(column_data))
             if column in self.editable_columns:
                 item = self.model().itemFromIndex(idx)
@@ -107,4 +107,6 @@ class ContactList(MyTreeView):
                 idx = self.model().index(row_count, 0)
                 set_current = QPersistentModelIndex(idx)
         self.set_current_idx(set_current)
+        # FIXME refresh loses sort order; so set "default" here:
+        self.sortByColumn(0, Qt.AscendingOrder)
         run_hook('update_contacts_tab', self)