AaronFiore/electrum
1
0
Fork 0
Code Activity

account names

Browse Source
This commit is contained in:
thomasv
2013-09-03 10:09:13 +02:00
parent a417816e69
commit 3ecd81c94a
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/gui_classic.py
View File

@@ -316,7 +316,7 @@ class ElectrumWindow(QMainWindow):
self.notify_transactions()
# account selector
accounts = self.wallet.get_accounts()
accounts = self.wallet.get_account_names()
self.account_selector.clear()
if len(accounts) > 1:
self.account_selector.addItems([_("All accounts")] + accounts.values())
@@ -1272,7 +1272,7 @@ class ElectrumWindow(QMainWindow):
account_items = []
for k, account in account_items:
name = self.wallet.labels.get(k, 'unnamed account')
name = self.wallet.get_account_name(k)
c,u = self.wallet.get_account_balance(k)
account_item = QTreeWidgetItem( [ name, '', self.format_amount(c+u), ''] )
l.addTopLevelItem(account_item)
@@ -1371,7 +1371,7 @@ class ElectrumWindow(QMainWindow):
if s == _("All accounts"):
self.current_account = None
else:
accounts = self.wallet.get_accounts()
accounts = self.wallet.get_account_names()
for k, v in accounts.items():
if v == s:
self.current_account = k

5
gui/installwizard.py
View File

@@ -194,7 +194,8 @@ class InstallWizard(QDialog):
traceback.print_exc(file=sys.stdout)
exit()
if not keep_it: exit()
if not keep_it: return
self.password_dialog(wallet)
return wallet