AaronFiore/electrum
1
0
Fork 0
Code Activity

use config instead of watchtower_window to decide if we close the app

Browse Source
This commit is contained in:
ThomasV
2019-05-07 08:38:28 +02:00
parent e53ecb9b77
commit db60634774
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
electrum/gui/qt/__init__.py
View File

@@ -147,9 +147,8 @@ class ElectrumGui(Logger):
else: else:
m = self.tray.contextMenu() m = self.tray.contextMenu()
m.clear() m.clear()
if self.watchtower_window: if self.config.get('lightning'):
submenu = m.addMenu(_("watchtower")) m.addAction(_("Watchtower"), self.show_watchtower_dialog)
submenu.addAction(_("Show/Hide"), self.watchtower_window.show_or_hide)
for window in self.windows: for window in self.windows:
name = window.wallet.basename() name = window.wallet.basename()
submenu = m.addMenu(name) submenu = m.addMenu(name)
@@ -182,6 +181,8 @@ class ElectrumGui(Logger):
def close(self): def close(self):
for window in self.windows: for window in self.windows:
window.close() window.close()
if self.nd:
self.nd.close()
if self.watchtower_window: if self.watchtower_window:
self.watchtower_window.close() self.watchtower_window.close()
@@ -189,11 +190,10 @@ class ElectrumGui(Logger):
# Use a signal as can be called from daemon thread # Use a signal as can be called from daemon thread
self.app.new_window_signal.emit(path, uri) self.app.new_window_signal.emit(path, uri)
def create_watchtower_window(self): def show_watchtower_dialog(self, parent=None):
from .watchtower_window import WatchTowerWindow from .watchtower_window import WatchTowerWindow
self.watchtower_window = WatchTowerWindow(self) if not self.watchtower_window:
self.watchtower_window = WatchTowerWindow(self)
def show_watchtower_dialog(self, parent):
self.watchtower_window.bring_to_top() self.watchtower_window.bring_to_top()
def show_network_dialog(self, parent): def show_network_dialog(self, parent):
@@ -337,8 +337,6 @@ class ElectrumGui(Logger):
self.logger.exception('') self.logger.exception('')
return return
self.timer.start() self.timer.start()
# todo: create this only if channels need it
self.create_watchtower_window()
self.config.open_last_wallet() self.config.open_last_wallet()
path = self.config.get_wallet_path() path = self.config.get_wallet_path()
@@ -352,7 +350,9 @@ class ElectrumGui(Logger):
return return
# check if a wizard is in progress # check if a wizard is in progress
with self._num_wizards_lock: with self._num_wizards_lock:
if self._num_wizards_in_progress > 0 or len(self.windows) > 0 or self.watchtower_window: if self._num_wizards_in_progress > 0 or len(self.windows) > 0:
return
if self.config.get('lightning'):
return return
self.app.quit() self.app.quit()
self.app.setQuitOnLastWindowClosed(False) # so _we_ can decide whether to quit self.app.setQuitOnLastWindowClosed(False) # so _we_ can decide whether to quit