AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #1170 from kyuupichan/tray_tip_wallet

Browse Source 
Tray tip wallet
This commit is contained in:
ThomasV
2015-04-30 07:01:35 +02:00
parent 15826e18b8 db2517b901
commit 8f84a90ab5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/qt/main_window.py
View File

@@ -211,8 +211,9 @@ class ElectrumWindow(QMainWindow):
self.dummy_address = a[0] if a else None self.dummy_address = a[0] if a else None
self.accounts_expanded = self.wallet.storage.get('accounts_expanded',{}) self.accounts_expanded = self.wallet.storage.get('accounts_expanded',{})
self.current_account = self.wallet.storage.get("current_account", None) self.current_account = self.wallet.storage.get("current_account", None)
title = 'Electrum ' + self.wallet.electrum_version + ' - ' + os.path.basename(self.wallet.storage.path) title = 'Electrum %s - %s' % (self.wallet.electrum_version, self.wallet.basename())
if self.wallet.is_watching_only(): title += ' [%s]' % (_('watching only')) if self.wallet.is_watching_only():
title += ' [%s]' % (_('watching only'))
self.setWindowTitle( title ) self.setWindowTitle( title )
self.update_history_tab() self.update_history_tab()
self.update_wallet() self.update_wallet()
@@ -536,7 +537,7 @@ class ElectrumWindow(QMainWindow):
text += "%s"%quote text += "%s"%quote
if self.tray: if self.tray:
self.tray.setToolTip(text) self.tray.setToolTip("%s (%s)" % (text, self.wallet.basename()))
icon = QIcon(":icons/status_connected.png") icon = QIcon(":icons/status_connected.png")
else: else:
text = _("Not connected") text = _("Not connected")

3
lib/wallet.py
View File

@@ -231,6 +231,9 @@ class Abstract_Wallet(object):
def get_action(self): def get_action(self):
pass pass
def basename(self):
return os.path.basename(self.storage.path)
def convert_imported_keys(self, password): def convert_imported_keys(self, password):
for k, v in self.imported_keys.items(): for k, v in self.imported_keys.items():
sec = pw_decode(v, password) sec = pw_decode(v, password)