Merge pull request #3030 from achow101/tray-menu-fix
Modify tray context menu instead of creating a new one
This commit is contained in:
commit
8c55bbd1f3
|
@ -114,8 +114,12 @@ class ElectrumGui:
|
||||||
|
|
||||||
def build_tray_menu(self):
|
def build_tray_menu(self):
|
||||||
# Avoid immediate GC of old menu when window closed via its action
|
# Avoid immediate GC of old menu when window closed via its action
|
||||||
self.old_menu = self.tray.contextMenu()
|
if self.tray.contextMenu() is None:
|
||||||
m = QMenu()
|
m = QMenu()
|
||||||
|
self.tray.setContextMenu(m)
|
||||||
|
else:
|
||||||
|
m = self.tray.contextMenu()
|
||||||
|
m.clear()
|
||||||
for window in self.windows:
|
for window in self.windows:
|
||||||
submenu = m.addMenu(window.wallet.basename())
|
submenu = m.addMenu(window.wallet.basename())
|
||||||
submenu.addAction(_("Show/Hide"), window.show_or_hide)
|
submenu.addAction(_("Show/Hide"), window.show_or_hide)
|
||||||
|
@ -123,7 +127,6 @@ class ElectrumGui:
|
||||||
m.addAction(_("Dark/Light"), self.toggle_tray_icon)
|
m.addAction(_("Dark/Light"), self.toggle_tray_icon)
|
||||||
m.addSeparator()
|
m.addSeparator()
|
||||||
m.addAction(_("Exit Electrum"), self.close)
|
m.addAction(_("Exit Electrum"), self.close)
|
||||||
self.tray.setContextMenu(m)
|
|
||||||
|
|
||||||
def tray_icon(self):
|
def tray_icon(self):
|
||||||
if self.dark_icon:
|
if self.dark_icon:
|
||||||
|
|
Loading…
Reference in New Issue