tMerge pull request #1170 from kyuupichan/tray_tip_wallet - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8f84a90ab513ab07fd411279e0a24dd0faf47ede
DIR parent 15826e18b863576bb4f5afaf00d86101030dbb45
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Thu, 30 Apr 2015 07:01:35 +0200
Merge pull request #1170 from kyuupichan/tray_tip_wallet
Tray tip wallet
Diffstat:
M gui/qt/main_window.py | 7 ++++---
M lib/wallet.py | 3 +++
2 files changed, 7 insertions(+), 3 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -211,8 +211,9 @@ class ElectrumWindow(QMainWindow):
self.dummy_address = a[0] if a else None
self.accounts_expanded = self.wallet.storage.get('accounts_expanded',{})
self.current_account = self.wallet.storage.get("current_account", None)
- title = 'Electrum ' + self.wallet.electrum_version + ' - ' + os.path.basename(self.wallet.storage.path)
- if self.wallet.is_watching_only(): title += ' [%s]' % (_('watching only'))
+ title = 'Electrum %s - %s' % (self.wallet.electrum_version, self.wallet.basename())
+ if self.wallet.is_watching_only():
+ title += ' [%s]' % (_('watching only'))
self.setWindowTitle( title )
self.update_history_tab()
self.update_wallet()
t@@ -536,7 +537,7 @@ class ElectrumWindow(QMainWindow):
text += "%s"%quote
if self.tray:
- self.tray.setToolTip(text)
+ self.tray.setToolTip("%s (%s)" % (text, self.wallet.basename()))
icon = QIcon(":icons/status_connected.png")
else:
text = _("Not connected")
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -231,6 +231,9 @@ class Abstract_Wallet(object):
def get_action(self):
pass
+ def basename(self):
+ return os.path.basename(self.storage.path)
+
def convert_imported_keys(self, password):
for k, v in self.imported_keys.items():
sec = pw_decode(v, password)