1
0

More cleanup now self.window is gone

No need for self.main_window in gui object.
No need for hooks "init_qt" and "close_main_window".
This commit is contained in:
Neil Booth
2015-09-04 18:29:52 +09:00
parent bbd50ba83c
commit 835bc4e4aa
3 changed files with 8 additions and 19 deletions

View File

@@ -228,7 +228,11 @@ class ElectrumGui:
self.config.set_key('gui_last_wallet', path)
# add to recently visited
w.update_recently_visited(path)
w.show()
# initial configuration
if self.config.get('hide_gui') is True and self.tray.isVisible():
w.hide()
else:
w.show()
self.windows.append(w)
self.build_tray_menu()
self.plugins.on_new_window(w)
@@ -251,20 +255,10 @@ class ElectrumGui:
if os.path.exists(last_wallet):
self.config.cmdline_options['default_wallet_path'] = last_wallet
# main window
self.main_window = self.start_new_window(self.config.get_wallet_path(),
self.config.get('url'))
if not self.main_window:
if not self.start_new_window(self.config.get_wallet_path(),
self.config.get('url')):
return
# plugins interact with main window
run_hook('init_qt', self)
# initial configuration
if self.config.get('hide_gui') is True and self.tray.isVisible():
self.main_window.hide()
signal.signal(signal.SIGINT, lambda *args: self.app.quit())
# main loop
@@ -274,5 +268,4 @@ class ElectrumGui:
event = QtCore.QEvent(QtCore.QEvent.Clipboard)
self.app.sendEvent(self.app.clipboard(), event)
if self.tray:
self.tray.hide()
self.tray.hide()