From a81d18bf6f76fa57cc42b948f09c31f6d35b8a2a Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Sun, 8 Feb 2015 19:01:33 +0100
Subject: [PATCH] Fixed some bugs in account creation
---
src/cutecoin/core/account.py | 5 +++++
src/cutecoin/core/app.py | 2 ++
src/cutecoin/gui/mainwindow.py | 5 +++--
src/cutecoin/gui/process_cfg_account.py | 2 +-
src/cutecoin/tools/exceptions.py | 15 +++++++--------
5 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/cutecoin/core/account.py b/src/cutecoin/core/account.py
index aad96327..14dd247b 100644
--- a/src/cutecoin/core/account.py
+++ b/src/cutecoin/core/account.py
@@ -130,6 +130,11 @@ class Account(object):
self.communities.append(community)
return community
+ def refresh_cache(self):
+ for w in self.wallets:
+ for c in self.communities:
+ w.refresh_cache(c)
+
def set_display_referential(self, index):
self.referential = index
diff --git a/src/cutecoin/core/app.py b/src/cutecoin/core/app.py
index 1b6339ba..4c5cb018 100644
--- a/src/cutecoin/core/app.py
+++ b/src/cutecoin/core/app.py
@@ -63,6 +63,8 @@ class Application(object):
def change_current_account(self, account):
if self.current_account is not None:
self.save_cache(self.current_account)
+
+ account.refresh_cache()
self.current_account = account
def load(self):
diff --git a/src/cutecoin/gui/mainwindow.py b/src/cutecoin/gui/mainwindow.py
index 392c12bc..16826ad0 100644
--- a/src/cutecoin/gui/mainwindow.py
+++ b/src/cutecoin/gui/mainwindow.py
@@ -96,8 +96,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
def open_add_account_dialog(self):
dialog = ProcessConfigureAccount(self.app, None)
- dialog.accepted.connect(self.refresh)
- dialog.exec_()
+ result = dialog.exec_()
+ if result == QDialog.Accepted:
+ self.action_change_account(self.app.current_account.name)
@pyqtSlot()
def loader_finished(self):
diff --git a/src/cutecoin/gui/process_cfg_account.py b/src/cutecoin/gui/process_cfg_account.py
index c8214b3c..576147f7 100644
--- a/src/cutecoin/gui/process_cfg_account.py
+++ b/src/cutecoin/gui/process_cfg_account.py
@@ -246,7 +246,7 @@ class ProcessConfigureAccount(QDialog, Ui_AccountConfigurationDialog):
nb_wallets = self.spinbox_wallets.value()
self.account.set_walletpool_size(nb_wallets, password)
- if len(self.app.accounts) == 0:
+ if len(self.app.accounts) == 1:
self.app.default_account = self.account.name
self.app.save(self.account)
diff --git a/src/cutecoin/tools/exceptions.py b/src/cutecoin/tools/exceptions.py
index 1cbc25c4..a240dbe1 100644
--- a/src/cutecoin/tools/exceptions.py
+++ b/src/cutecoin/tools/exceptions.py
@@ -95,12 +95,11 @@ class KeyAlreadyUsed(Error):
Constructor
'''
super() .__init__(
- "Cannot add account " +
- new_account.name +
- " : the key " +
- keyid +
- " is already used by " +
- found_account.name)
+"""Cannot add account {0} :
+the key {1} is already used by {2}""".format(new_account,
+ keyid,
+ found_account)
+ )
class NameAlreadyExists(Error):
@@ -110,13 +109,13 @@ class NameAlreadyExists(Error):
a key already used for another account.
'''
- def __init__(self, account):
+ def __init__(self, account_name):
'''
Constructor
'''
super() .__init__(
"Cannot add account " +
- account.name +
+ account_name +
" the name already exists")
--
GitLab