tminor fixes for wallet creation - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 620f9f68d49d650ec59e35ed268a1b56504562d0
DIR parent 5514d3bd74ab079beb0293d527e08dffd3105729
HTML Author: thomasv <thomasv@gitorious>
Date: Tue, 10 Sep 2013 14:20:44 +0200
minor fixes for wallet creation
Diffstat:
M gui/gui_classic.py | 2 +-
M gui/installwizard.py | 9 +++++----
M gui/password_dialog.py | 5 ++++-
M lib/wallet.py | 2 +-
4 files changed, 11 insertions(+), 7 deletions(-)
---
DIR diff --git a/gui/gui_classic.py b/gui/gui_classic.py
t@@ -2273,7 +2273,7 @@ class ElectrumGui:
storage = WalletStorage(self.config)
if not storage.file_exists:
import installwizard
- wizard = installwizard.InstallWizard(self.config, self.interface, self.blockchain, storage)
+ wizard = installwizard.InstallWizard(self.config, self.network, storage)
wallet = wizard.run()
if not wallet:
exit()
DIR diff --git a/gui/installwizard.py b/gui/installwizard.py
t@@ -14,11 +14,12 @@ import sys
class InstallWizard(QDialog):
- def __init__(self, config, interface, blockchain, storage):
+ def __init__(self, config, network, storage):
QDialog.__init__(self)
self.config = config
- self.interface = interface
- self.blockchain = blockchain
+ self.network = network
+ self.interface = network.interface
+ self.blockchain = network.blockchain
self.storage = storage
t@@ -330,7 +331,7 @@ class InstallWizard(QDialog):
self.network_dialog()
# start wallet threads
- wallet.start_threads(self.interface, self.blockchain)
+ wallet.start_threads(self.network)
if action == 'restore':
try:
DIR diff --git a/gui/password_dialog.py b/gui/password_dialog.py
t@@ -94,7 +94,10 @@ class PasswordDialog(QDialog):
QMessageBox.warning(self.parent, _('Error'), _('Failed to update password'), _('OK'))
return
- QMessageBox.information(self.parent, _('Success'), _('Password was updated successfully'), _('OK'))
+ if new_password:
+ QMessageBox.information(self.parent, _('Success'), _('Password was updated successfully'), _('OK'))
+ else:
+ QMessageBox.information(self.parent, _('Success'), _('This wallet is not encrypted'), _('OK'))
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -391,7 +391,7 @@ class Wallet:
def set_label(self, key, value):
- self.labels[account_id] = name
+ self.labels[key] = value
self.storage.put('labels', self.labels, True)