add new tray icon, and activate window in showNormal

diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index 24e7104..68f51f9 100644 (file)
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -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)
@@ -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)

diff --git a/icons.qrc b/icons.qrc
index e3ee3be..f116a96 100644 (file)
--- a/icons.qrc
+++ b/icons.qrc
@@ -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>

diff --git a/icons/electrum_dark_icon.png b/icons/electrum_dark_icon.png
new file mode 100644 (file)
index 0000000..e836a2f
Binary files /dev/null and b/icons/electrum_dark_icon.png differ

diff --git a/icons/electrum_light_icon.png b/icons/electrum_light_icon.png
new file mode 100644 (file)
index 0000000..04c88b2
Binary files /dev/null and b/icons/electrum_light_icon.png differ