diff --git a/src/sakia/gui/navigation/controller.py b/src/sakia/gui/navigation/controller.py index 2e8293bd809ee5e26fabc9a07ff9dd91aee46783..0d4b3ba7bc4a208d65facdb13478201e2bcec965 100644 --- a/src/sakia/gui/navigation/controller.py +++ b/src/sakia/gui/navigation/controller.py @@ -135,48 +135,47 @@ class NavigationController(QObject): mapped = self.view.splitter.mapFromParent(point) index = self.view.tree_view.indexAt(mapped) raw_data = self.view.tree_view.model().data(index, GenericTreeModel.ROLE_RAW_DATA) - if raw_data and raw_data["component"] == "Informations": - menu = QMenu(self.view) - if raw_data['misc']['connection'].uid: - action_view_in_wot = QAction(self.tr("View in Web of Trust"), menu) - menu.addAction(action_view_in_wot) - action_view_in_wot.triggered.connect(lambda c: - self.model.view_in_wot(raw_data['misc']['connection'])) - - action_gen_revokation = QAction(self.tr("Save revokation document"), menu) - menu.addAction(action_gen_revokation) - action_gen_revokation.triggered.connect(lambda c: - self.action_save_revokation(raw_data['misc']['connection'])) - - action_publish_uid = QAction(self.tr("Publish UID"), menu) - menu.addAction(action_publish_uid) - action_publish_uid.triggered.connect(lambda c: - self.publish_uid(raw_data['misc']['connection'])) - identity_published = self.model.identity_published(raw_data['misc']['connection']) - action_publish_uid.setEnabled(not identity_published) - - action_export_identity = QAction(self.tr("Export identity document"), menu) - menu.addAction(action_export_identity) - action_export_identity.triggered.connect(lambda c: - self.export_identity_document(raw_data['misc']['connection'])) - - action_leave = QAction(self.tr("Leave the currency"), menu) - menu.addAction(action_leave) - action_leave.triggered.connect(lambda c: self.send_leave(raw_data['misc']['connection'])) - action_leave.setEnabled(self.model.identity_is_member(raw_data['misc']['connection'])) - - copy_pubkey = QAction(menu.tr("Copy pubkey to clipboard"), menu.parent()) - copy_pubkey.triggered.connect(lambda checked, - c=raw_data['misc']['connection']: \ - NavigationModel.copy_pubkey_to_clipboard(c)) - menu.addAction(copy_pubkey) - - action_remove = QAction(self.tr("Remove the connection"), menu) - menu.addAction(action_remove) - action_remove.triggered.connect(lambda c: self.remove_connection(raw_data['misc']['connection'])) - # Show the context menu. - - menu.popup(QCursor.pos()) + menu = QMenu(self.view) + if raw_data['misc']['connection'].uid: + action_view_in_wot = QAction(self.tr("View in Web of Trust"), menu) + menu.addAction(action_view_in_wot) + action_view_in_wot.triggered.connect(lambda c: + self.model.view_in_wot(raw_data['misc']['connection'])) + + action_gen_revokation = QAction(self.tr("Save revokation document"), menu) + menu.addAction(action_gen_revokation) + action_gen_revokation.triggered.connect(lambda c: + self.action_save_revokation(raw_data['misc']['connection'])) + + action_publish_uid = QAction(self.tr("Publish UID"), menu) + menu.addAction(action_publish_uid) + action_publish_uid.triggered.connect(lambda c: + self.publish_uid(raw_data['misc']['connection'])) + identity_published = self.model.identity_published(raw_data['misc']['connection']) + action_publish_uid.setEnabled(not identity_published) + + action_export_identity = QAction(self.tr("Export identity document"), menu) + menu.addAction(action_export_identity) + action_export_identity.triggered.connect(lambda c: + self.export_identity_document(raw_data['misc']['connection'])) + + action_leave = QAction(self.tr("Leave the currency"), menu) + menu.addAction(action_leave) + action_leave.triggered.connect(lambda c: self.send_leave(raw_data['misc']['connection'])) + action_leave.setEnabled(self.model.identity_is_member(raw_data['misc']['connection'])) + + copy_pubkey = QAction(menu.tr("Copy pubkey to clipboard"), menu.parent()) + copy_pubkey.triggered.connect(lambda checked, + c=raw_data['misc']['connection']: \ + NavigationModel.copy_pubkey_to_clipboard(c)) + menu.addAction(copy_pubkey) + + action_remove = QAction(self.tr("Remove the connection"), menu) + menu.addAction(action_remove) + action_remove.triggered.connect(lambda c: self.remove_connection(raw_data['misc']['connection'])) + # Show the context menu. + + menu.popup(QCursor.pos()) @asyncify async def publish_uid(self, connection): diff --git a/src/sakia/models/generic_tree.py b/src/sakia/models/generic_tree.py index 284b11493a415185c9bca3b71c2b631b7f5e5509..65dd15c7c63397c54f7851eea90dc37a58ca7fca 100644 --- a/src/sakia/models/generic_tree.py +++ b/src/sakia/models/generic_tree.py @@ -166,5 +166,5 @@ class GenericTreeModel(QAbstractItemModel): def insert_node(self, raw_data): self.beginInsertRows(QModelIndex(), self.rowCount(QModelIndex()), 0) - parse_node(raw_data, self.root_item.children[0]) + parse_node(raw_data, self.root_item) self.endInsertRows()