diff --git a/src/sakia/gui/certification.py b/src/sakia/gui/certification.py
index d1956eeab0f9179615623c7c4a8cbff1a06647a6..75019a208876c7cc3eb6bae050ad44082d146839 100644
--- a/src/sakia/gui/certification.py
+++ b/src/sakia/gui/certification.py
@@ -42,6 +42,12 @@ class CertificationDialog(QObject):
self.password_asker = password_asker
self.community = self.account.communities[0]
+ self.ui.radio_contact.toggled.connect(lambda c, radio="contact": self.recipient_mode_changed(radio))
+ self.ui.radio_pubkey.toggled.connect(lambda c, radio="pubkey": self.recipient_mode_changed(radio))
+ self.ui.radio_search.toggled.connect(lambda c, radio="search": self.recipient_mode_changed(radio))
+ self.ui.button_box.accepted.connect(self.accept)
+ self.ui.button_box.rejected.connect(self.widget.reject)
+
for community in self.account.communities:
self.ui.combo_community.addItem(community.currency)
@@ -52,11 +58,6 @@ class CertificationDialog(QObject):
self.ui.radio_pubkey.setChecked(True)
self.ui.radio_contact.setEnabled(False)
- self.ui.radio_contact.toggled.connect(lambda c, radio="contact": self.recipient_mode_changed(radio))
- self.ui.radio_pubkey.toggled.connect(lambda c, radio="pubkey": self.recipient_mode_changed(radio))
- self.ui.radio_search.toggled.connect(lambda c, radio="search": self.recipient_mode_changed(radio))
- self.ui.button_box.accepted.connect(self.accept)
- self.ui.button_box.rejected.connect(self.widget.reject)
self.ui.search_user.button_reset.hide()
self.ui.search_user.init(self.app)
self.ui.search_user.change_account(self.account)
@@ -107,7 +108,7 @@ class CertificationDialog(QObject):
toast.display(self.tr("Certification"),
self.tr("Success sending certification"))
else:
- await QAsyncMessageBox.information(self, self.tr("Certification"),
+ await QAsyncMessageBox.information(self.widget, self.tr("Certification"),
self.tr("Success sending certification"))
QApplication.restoreOverrideCursor()
self.widget.accept()
@@ -116,7 +117,7 @@ class CertificationDialog(QObject):
toast.display(self.tr("Certification"), self.tr("Could not broadcast certification : {0}"
.format(result[1])))
else:
- await QAsyncMessageBox.critical(self, self.tr("Certification"),
+ await QAsyncMessageBox.critical(self.widget, self.tr("Certification"),
self.tr("Could not broadcast certification : {0}"
.format(result[1])))
QApplication.restoreOverrideCursor()
@@ -172,7 +173,7 @@ class CertificationDialog(QObject):
def async_exec(self):
future = asyncio.Future()
- self.finished.connect(lambda r: future.set_result(r))
+ self.widget.finished.connect(lambda r: future.set_result(r))
self.widget.open()
self.refresh()
return future
diff --git a/src/sakia/gui/transfer.py b/src/sakia/gui/transfer.py
index 72afc7b4d8354c36d61910dd7da11c9a0c326f53..69847078168e6ddf58397af743d08c758fcd2156 100644
--- a/src/sakia/gui/transfer.py
+++ b/src/sakia/gui/transfer.py
@@ -61,7 +61,7 @@ class TransferMoneyDialog(QObject):
self.ui.search_user.init(self.app)
self.ui.search_user.change_account(self.account)
self.ui.search_user.change_community(self.community)
-
+
regexp = QRegExp('^([ a-zA-Z0-9-_:/;*?\[\]\(\)\\\?!^+=@&~#{}|<>%.]{0,255})$')
validator = QRegExpValidator(regexp)
self.ui.edit_message.setValidator(validator)
@@ -147,7 +147,7 @@ class TransferMoneyDialog(QObject):
toast.display(self.tr("Transfer"),
self.tr("Success sending money to {0}").format(recipient))
else:
- await QAsyncMessageBox.information(self, self.tr("Transfer"),
+ await QAsyncMessageBox.information(self.widget, self.tr("Transfer"),
self.tr("Success sending money to {0}").format(recipient))
QApplication.restoreOverrideCursor()
@@ -160,7 +160,7 @@ class TransferMoneyDialog(QObject):
if self.app.preferences['notifications']:
toast.display(self.tr("Transfer"), "Error : {0}".format(result[1]))
else:
- await QAsyncMessageBox.critical(self, self.tr("Transfer"), result[1])
+ await QAsyncMessageBox.critical(self.widget, self.tr("Transfer"), result[1])
QApplication.restoreOverrideCursor()
self.ui.button_box.setEnabled(True)
@@ -218,8 +218,8 @@ class TransferMoneyDialog(QObject):
def async_exec(self):
future = asyncio.Future()
- self.finished.connect(lambda r: future.set_result(r))
- self.open()
+ self.widget.finished.connect(lambda r: future.set_result(r))
+ self.widget.open()
return future
def exec(self):
diff --git a/src/sakia/tests/functional/certification/test_certification.py b/src/sakia/tests/functional/certification/test_certification.py
index 2dc224d93f37cb6f9dc8ed6f67e293c51950f47c..fbaaab98b7787f343163e6ee0050c047211db7ea 100644
--- a/src/sakia/tests/functional/certification/test_certification.py
+++ b/src/sakia/tests/functional/certification/test_certification.py
@@ -74,9 +74,9 @@ class TestCertificationDialog(unittest.TestCase, QuamashTest):
async def exec_test():
await asyncio.sleep(1)
- QTest.mouseClick(certification_dialog.radio_pubkey, Qt.LeftButton)
- QTest.keyClicks(certification_dialog.edit_pubkey, "FADxcH5LmXGmGFgdixSes6nWnC4Vb4pRUBYT81zQRhjn")
- QTest.mouseClick(certification_dialog.button_box.button(QDialogButtonBox.Ok), Qt.LeftButton)
+ QTest.mouseClick(certification_dialog.ui.radio_pubkey, Qt.LeftButton)
+ QTest.keyClicks(certification_dialog.ui.edit_pubkey, "FADxcH5LmXGmGFgdixSes6nWnC4Vb4pRUBYT81zQRhjn")
+ QTest.mouseClick(certification_dialog.ui.button_box.button(QDialogButtonBox.Ok), Qt.LeftButton)
await asyncio.sleep(1)
topWidgets = QApplication.topLevelWidgets()
for w in topWidgets:
diff --git a/src/sakia/tests/functional/transfer/test_transfer.py b/src/sakia/tests/functional/transfer/test_transfer.py
index ee348926d27d7f35be38cbb16a4b5d264372c9a8..e22b9015f3660c239528a177f81498f9d730fd23 100644
--- a/src/sakia/tests/functional/transfer/test_transfer.py
+++ b/src/sakia/tests/functional/transfer/test_transfer.py
@@ -80,10 +80,10 @@ class TestTransferDialog(unittest.TestCase, QuamashTest):
async def exec_test():
await asyncio.sleep(1)
self.account.wallets[0].caches[self.community.currency].available_sources = await self.wallet.sources(self.community)
- QTest.mouseClick(transfer_dialog.radio_pubkey, Qt.LeftButton)
- QTest.keyClicks(transfer_dialog.edit_pubkey, "FADxcH5LmXGmGFgdixSes6nWnC4Vb4pRUBYT81zQRhjn")
- transfer_dialog.spinbox_amount.setValue(10)
- QTest.mouseClick(transfer_dialog.button_box.button(QDialogButtonBox.Ok), Qt.LeftButton)
+ QTest.mouseClick(transfer_dialog.ui.radio_pubkey, Qt.LeftButton)
+ QTest.keyClicks(transfer_dialog.ui.edit_pubkey, "FADxcH5LmXGmGFgdixSes6nWnC4Vb4pRUBYT81zQRhjn")
+ transfer_dialog.ui.spinbox_amount.setValue(10)
+ QTest.mouseClick(transfer_dialog.ui.button_box.button(QDialogButtonBox.Ok), Qt.LeftButton)
await asyncio.sleep(1)
topWidgets = QApplication.topLevelWidgets()
for w in topWidgets: