AaronFiore/electrum
1
0
Fork 0
Code Activity

better account naming/renaming

Browse Source
This commit is contained in:
ThomasV
2013-10-04 19:02:01 +02:00
parent 43002f2ede
commit fbf91a67ad
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/main_window.py
View File

@@ -1071,7 +1071,7 @@ class ElectrumWindow(QMainWindow):
self.update_history_tab() self.update_history_tab()
def edit_account_label(self, k): def edit_account_label(self, k):
text, ok = QInputDialog.getText(self, _('Rename account'), _('Name') + ':') text, ok = QInputDialog.getText(self, _('Rename account'), _('Name') + ':', text = self.wallet.labels.get(k,''))
if ok: if ok:
label = unicode(text) label = unicode(text)
self.wallet.set_label(k,label) self.wallet.set_label(k,label)

16
lib/wallet.py
View File

@@ -900,7 +900,21 @@ class Wallet:
else: else:
name = 'Old account' name = 'Old account'
else: else:
name = self.labels.get(k, 'Unnamed account') default = "Unnamed account"
m = re.match("m/0'/(\d+)", k)
if m:
num = m.group(1)
if num == '0':
default = "Main account"
else:
default = "Account %s"%num
m = re.match("m/1'/(\d+) & m/2'/(\d+)", k)
if m:
num = m.group(1)
default = "2of2 account %s"%num
name = self.labels.get(k, default)
return name return name
def get_account_names(self): def get_account_names(self):