From a417816e69be2d6733c50887197cca71223ea1ae Mon Sep 17 00:00:00 2001 From: thomasv Date: Tue, 3 Sep 2013 09:52:55 +0200 Subject: [PATCH] disable 'new account' in old wallets --- gui/gui_classic.py | 6 ++++-- lib/wallet.py | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gui/gui_classic.py b/gui/gui_classic.py index 5241867cc..5269490ce 100644 --- a/gui/gui_classic.py +++ b/gui/gui_classic.py @@ -325,6 +325,8 @@ class ElectrumWindow(QMainWindow): else: self.account_selector.hide() + self.new_account.setEnabled(self.wallet.seed_version>4) + self.update_lock_icon() self.update_buttons_on_seed() self.update_console() @@ -426,8 +428,8 @@ class ElectrumWindow(QMainWindow): new_contact = wallet_menu.addAction(_("&New contact")) new_contact.triggered.connect(self.new_contact_dialog) - new_account = wallet_menu.addAction(_("&New account")) - new_account.triggered.connect(self.new_account_dialog) + self.new_account = wallet_menu.addAction(_("&New account")) + self.new_account.triggered.connect(self.new_account_dialog) import_menu = menubar.addMenu(_("&Import")) in_labels = import_menu.addAction(_("&Labels")) diff --git a/lib/wallet.py b/lib/wallet.py index 7c42dae9b..6cc609c7e 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -370,7 +370,6 @@ class Wallet: def create_old_account(self): - print self.seed mpk = OldAccount.mpk_from_seed(self.seed) self.storage.put('master_public_key', mpk, True) self.accounts[0] = OldAccount({'mpk':mpk, 0:[], 1:[]})