From a0b4d28b25f1c6a46affa4fbf53efad39bf10933 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Sat, 24 Jan 2015 11:50:35 +0100
Subject: [PATCH] Fixed misuses of qt methods in dialogs
self.close() replaced with super().accept()
QErrorMessage replaced with QMessageBox.critical()
---
src/cutecoin/gui/add_contact.py | 2 +-
src/cutecoin/gui/certification.py | 6 ++++--
src/cutecoin/gui/import_account.py | 11 ++++++-----
src/cutecoin/gui/process_cfg_account.py | 3 +--
src/cutecoin/gui/process_cfg_community.py | 3 +--
src/cutecoin/gui/transfer.py | 3 +--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/cutecoin/gui/add_contact.py b/src/cutecoin/gui/add_contact.py
index 4e9546d3..b004ce0f 100644
--- a/src/cutecoin/gui/add_contact.py
+++ b/src/cutecoin/gui/add_contact.py
@@ -35,7 +35,7 @@ class AddContactDialog(QDialog, Ui_AddContactDialog):
if result:
self.main_window.menu_contacts_list.addAction(name)
self.main_window.app.save(self.account)
- self.close()
+ super().accept()
def name_edited(self, new_name):
name_ok = len(new_name) > 0
diff --git a/src/cutecoin/gui/certification.py b/src/cutecoin/gui/certification.py
index 7ced4776..a70d4820 100644
--- a/src/cutecoin/gui/certification.py
+++ b/src/cutecoin/gui/certification.py
@@ -50,17 +50,19 @@ class CertificationDialog(QDialog, Ui_CertificationDialog):
QMessageBox.critical(self, "Certification",
"Something wrong happened : {0}".format(e),
QMessageBox.Ok)
+ return
except NoPeerAvailable as e:
QMessageBox.critical(self, "Certification",
"Couldn't connect to network : {0}".format(e),
QMessageBox.Ok)
+ return
except Exception as e:
QMessageBox.critical(self, "Error",
"{0}".format(e),
QMessageBox.Ok)
+ return
- self.accepted.emit()
- self.close()
+ super().accept()
def change_current_community(self, index):
self.community = self.certifier.communities[index]
diff --git a/src/cutecoin/gui/import_account.py b/src/cutecoin/gui/import_account.py
index 39ae9493..5fd598c8 100644
--- a/src/cutecoin/gui/import_account.py
+++ b/src/cutecoin/gui/import_account.py
@@ -4,7 +4,7 @@ Created on 22 mai 2014
@author: inso
'''
import re
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QMessageBox, QErrorMessage, QFileDialog
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QMessageBox, QFileDialog
from cutecoin.tools.exceptions import Error
from cutecoin.gen_resources.import_account_uic import Ui_ImportAccountDialog
@@ -30,13 +30,14 @@ class ImportAccountDialog(QDialog, Ui_ImportAccountDialog):
account_name = self.edit_name.text()
try:
self.app.import_account(self.selected_file, account_name)
- except Error as e:
- QErrorMessage(self).showMessage(e.message)
+ except Exception as e:
+ QMessageBox.critical(self, "Error",
+ "{0}".format(e),
+ QMessageBox.Ok)
return
QMessageBox.information(self, "Account import",
"Account imported succefully !")
- self.accepted.emit()
- self.close()
+ super().accept()
def import_account(self):
self.selected_file = QFileDialog.getOpenFileName(self,
diff --git a/src/cutecoin/gui/process_cfg_account.py b/src/cutecoin/gui/process_cfg_account.py
index a2dd2ff3..b620be5e 100644
--- a/src/cutecoin/gui/process_cfg_account.py
+++ b/src/cutecoin/gui/process_cfg_account.py
@@ -241,5 +241,4 @@ class ProcessConfigureAccount(QDialog, Ui_AccountConfigurationDialog):
nb_wallets = self.spinbox_wallets.value()
self.account.set_walletpool_size(nb_wallets, password)
self.app.save(self.account)
- self.accepted.emit()
- self.close()
+ super().accept()
diff --git a/src/cutecoin/gui/process_cfg_community.py b/src/cutecoin/gui/process_cfg_community.py
index 5fc7a86c..8cbf6230 100644
--- a/src/cutecoin/gui/process_cfg_community.py
+++ b/src/cutecoin/gui/process_cfg_community.py
@@ -192,5 +192,4 @@ class ProcessConfigureCommunity(QDialog, Ui_CommunityConfigurationDialog):
if self.community not in self.account.communities:
self.account.add_community(self.community)
- self.accepted.emit()
- self.close()
+ super().accept()
diff --git a/src/cutecoin/gui/transfer.py b/src/cutecoin/gui/transfer.py
index 458f42b9..3931789a 100644
--- a/src/cutecoin/gui/transfer.py
+++ b/src/cutecoin/gui/transfer.py
@@ -86,8 +86,7 @@ class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog):
"{0}".format(e),
QMessageBox.Ok)
return
- self.accepted.emit()
- self.close()
+ super().accept()
def amount_changed(self):
amount = self.spinbox_amount.value()
--
GitLab