AaronFiore/electrum
1
0
Fork 0
Code Activity

fix callbacks

Browse Source
This commit is contained in:
ThomasV
2014-07-28 07:53:02 +02:00
parent 1ee4af8686
commit fb0574c5a0
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gui/qt/__init__.py
View File

@@ -164,13 +164,16 @@ class ElectrumGui:
wallet.start_threads(self.network)
# init tray
self.dark_icon = self.config.get("dark_icon", False)
icon = QIcon(":icons/electrum_dark_icon.png") if self.dark_icon else QIcon(':icons/electrum_light_icon.png')
self.tray = QSystemTrayIcon(icon, None)
self.tray.setToolTip('Electrum')
self.tray.activated.connect(self.tray_activated)
self.build_tray_menu()
self.tray.show()
if 1:
self.dark_icon = self.config.get("dark_icon", False)
icon = QIcon(":icons/electrum_dark_icon.png") if self.dark_icon else QIcon(':icons/electrum_light_icon.png')
self.tray = QSystemTrayIcon(icon, None)
self.tray.setToolTip('Electrum')
self.tray.activated.connect(self.tray_activated)
self.build_tray_menu()
self.tray.show()
else:
self.tray = None
# main window
self.main_window = w = ElectrumWindow(self.config, self.network, self)
@@ -206,6 +209,8 @@ class ElectrumGui:
w.update_wallet()
self.app.exec_()
if self.tray:
self.tray.hide()
# clipboard persistence
# see http://www.mail-archive.com/pyqt@riverbankcomputing.com/msg17328.html

7
gui/qt/main_window.py
View File

@@ -408,7 +408,8 @@ class ElectrumWindow(QMainWindow):
self.notify(_("New transaction received. %(amount)s %(unit)s") % { 'amount' : self.format_amount(v), 'unit' : self.base_unit()})
def notify(self, message):
self.tray.showMessage("Electrum", message, QSystemTrayIcon.Information, 20000)
if self.tray:
self.tray.showMessage("Electrum", message, QSystemTrayIcon.Information, 20000)
@@ -486,7 +487,8 @@ class ElectrumWindow(QMainWindow):
if quote:
text += "%s"%quote
self.tray.setToolTip(text)
if self.tray:
self.tray.setToolTip(text)
icon = QIcon(":icons/status_connected.png")
else:
text = _("Not connected")
@@ -2623,7 +2625,6 @@ class ElectrumWindow(QMainWindow):
NetworkDialog(self.wallet.network, self.config, self).do_exec()
def closeEvent(self, event):
self.tray.hide()
self.config.set_key("is_maximized", self.isMaximized())
if not self.isMaximized():
g = self.geometry()