diff --git a/src/sakia/gui/navigation/identity/controller.py b/src/sakia/gui/navigation/identity/controller.py index 186f1e2e21898d46789de74e1a55cd179edbebe9..4dc80e6757a7d700a5a52b321a38f88cfa12cb72 100644 --- a/src/sakia/gui/navigation/identity/controller.py +++ b/src/sakia/gui/navigation/identity/controller.py @@ -19,7 +19,7 @@ class IdentityController(QObject): The informations component """ - def __init__(self, parent, view, model): + def __init__(self, parent, view, model, certification): """ Constructor of the informations component @@ -29,6 +29,7 @@ class IdentityController(QObject): super().__init__(parent) self.view = view self.model = model + self.certification = certification self._logger = logging.getLogger('sakia') self.view.button_membership.clicked.connect(self.send_join_demand) @@ -47,7 +48,7 @@ class IdentityController(QObject): certification = CertificationController.integrate_to_main_view(None, app, connection) view = IdentityView(parent.view, certification.view) model = IdentityModel(None, app, connection, blockchain_service, identities_service, sources_service) - identity = cls(parent, view, model) + identity = cls(parent, view, model, certification) certification.accepted.connect(view.clear) certification.rejected.connect(view.clear) identity.refresh_localized_data() diff --git a/src/sakia/gui/navigation/identity/identity.ui b/src/sakia/gui/navigation/identity/identity.ui index 2943dab63cc4d5b0748eb49f2f3ca166e7627f27..0b15bbfcaf19fb16ac445ccb6fbfe54e26b20ab9 100644 --- a/src/sakia/gui/navigation/identity/identity.ui +++ b/src/sakia/gui/navigation/identity/identity.ui @@ -34,11 +34,7 @@ QGroupBox::title { <number>0</number> </property> <widget class="QWidget" name="page_empty"> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <item> - <widget class="QWidget" name="widget" native="true"/> - </item> - </layout> + <layout class="QVBoxLayout" name="verticalLayout_3"/> </widget> </widget> </item> diff --git a/src/sakia/gui/sub/search_user/controller.py b/src/sakia/gui/sub/search_user/controller.py index 666769b874db83d28c00902dbbf4f7c7995f5e85..67649e7e893e23ce84fece8e246f49383a33cf68 100644 --- a/src/sakia/gui/sub/search_user/controller.py +++ b/src/sakia/gui/sub/search_user/controller.py @@ -1,7 +1,6 @@ from PyQt5.QtCore import pyqtSignal, QObject from sakia.data.entities import Identity from sakia.decorators import asyncify -import re from .model import SearchUserModel from .view import SearchUserView diff --git a/src/sakia/gui/sub/search_user/view.py b/src/sakia/gui/sub/search_user/view.py index f84085e8ba6f8e467a9fc09d354f5f2bceba55a5..8f8c42053c124e81fadff07de4f3da73f90f950f 100644 --- a/src/sakia/gui/sub/search_user/view.py +++ b/src/sakia/gui/sub/search_user/view.py @@ -3,6 +3,7 @@ from PyQt5.QtCore import QT_TRANSLATE_NOOP, pyqtSignal, Qt, QStringListModel from sakia.data.entities import Contact from .search_user_uic import Ui_SearchUserWidget import re +import asyncio class SearchUserView(QWidget, Ui_SearchUserWidget): @@ -71,9 +72,3 @@ class SearchUserView(QWidget, Ui_SearchUserWidget): completer.setModel(model) completer.activated.connect(self.search, type=Qt.QueuedConnection) self.combobox_search.setCompleter(completer) - - def keyPressEvent(self, event): - if event.key() == Qt.Key_Return: - return - - super().keyPressEvent(event) diff --git a/src/sakia/gui/sub/user_information/controller.py b/src/sakia/gui/sub/user_information/controller.py index 727e72a7dbefcf1a28f0d9a6c3a59bd3c8e533c6..1e6f3264cad6c8bd27a4fb7f50ad35763196fc0d 100644 --- a/src/sakia/gui/sub/user_information/controller.py +++ b/src/sakia/gui/sub/user_information/controller.py @@ -84,8 +84,10 @@ class UserInformationController(QObject): @asyncify async def search_identity(self, identity): + self.view.show_busy() await self.model.load_identity(identity) self.refresh() + self.view.hide_busy() def change_identity(self, identity): """