tadd new tray icon, and activate window in showNormal - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 4652783cfd015d93c848d4c5e94406e28edd6cbc
DIR parent 7a1feb8e67aefaf9be8c427853cdbf685e6cf199
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 11 Oct 2013 12:24:43 +0200
add new tray icon, and activate window in showNormal
Diffstat:
M gui/qt/main_window.py | 4 +++-
M icons.qrc | 2 ++
A icons/electrum_dark_icon.png | 0
A icons/electrum_light_icon.png | 0
4 files changed, 5 insertions(+), 1 deletion(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -127,6 +127,8 @@ class ElectrumWindow(QMainWindow):
if reason == QSystemTrayIcon.DoubleClick:
self.showNormal()
+ def showNormal(self):
+ self.setWindowState(self.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
def __init__(self, config, network):
QMainWindow.__init__(self)
t@@ -137,7 +139,7 @@ class ElectrumWindow(QMainWindow):
self._close_electrum = False
self.lite = None
- self.icon = QIcon(':icons/electrum.png')
+ self.icon = QIcon(':icons/electrum_light_icon.png')
self.tray = QSystemTrayIcon(self.icon, self)
self.tray.setToolTip('Electrum')
self.tray.activated.connect(self.tray_activated)
DIR diff --git a/icons.qrc b/icons.qrc
t@@ -17,6 +17,8 @@
<file>icons/status_waiting.png</file>
<file>icons/status_lagging.png</file>
<file>icons/switchgui.png</file>
+ <file>icons/electrum_light_icon.png</file>
+ <file>icons/electrum_dark_icon.png</file>
<file>icons/unconfirmed.png</file>
<file>icons/network.png</file>
</qresource>
DIR diff --git a/icons/electrum_dark_icon.png b/icons/electrum_dark_icon.png
Binary files differ.
DIR diff --git a/icons/electrum_light_icon.png b/icons/electrum_light_icon.png
Binary files differ.