LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-28 07:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

network_dialog: do not use parent for signalling

Browse source
This commit is contained in:
ThomasV 2017-07-08 15:35:48 +02:00
parent 5ae5c81c48
commit dd50259f68
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gui/qt/__init__.py
View file

@ -139,7 +139,7 @@ class ElectrumGui:
# Use a signal as can be called from daemon thread # Use a signal as can be called from daemon thread
self.app.emit(SIGNAL('new_window'), path, uri) self.app.emit(SIGNAL('new_window'), path, uri)
def show_network_dialog(self, parent): def show_network_dialog(self):
from network_dialog import NetworkDialog from network_dialog import NetworkDialog
if not self.daemon.network: if not self.daemon.network:
parent.show_warning(_('You are using Electrum in offline mode; restart Electrum if you want to get connected'), title=_('Offline')) parent.show_warning(_('You are using Electrum in offline mode; restart Electrum if you want to get connected'), title=_('Offline'))
@ -148,7 +148,7 @@ class ElectrumGui:
self.nd.show() self.nd.show()
self.nd.raise_() self.nd.raise_()
return return
self.nd = NetworkDialog(self.daemon.network, self.config, parent) self.nd = NetworkDialog(self.daemon.network, self.config)
self.nd.show() self.nd.show()
def create_window_for_wallet(self, wallet): def create_window_for_wallet(self, wallet):

4
gui/qt/main_window.py
View file

@ -478,7 +478,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
# Settings / Preferences are all reserved keywords in OSX using this as work around # Settings / Preferences are all reserved keywords in OSX using this as work around
tools_menu.addAction(_("Electrum preferences") if sys.platform == 'darwin' else _("Preferences"), self.settings_dialog) tools_menu.addAction(_("Electrum preferences") if sys.platform == 'darwin' else _("Preferences"), self.settings_dialog)
tools_menu.addAction(_("&Network"), lambda: self.gui_object.show_network_dialog(self)) tools_menu.addAction(_("&Network"), self.gui_object.show_network_dialog)
tools_menu.addAction(_("&Plugins"), self.plugins_dialog) tools_menu.addAction(_("&Plugins"), self.plugins_dialog)
tools_menu.addSeparator() tools_menu.addSeparator()
tools_menu.addAction(_("&Sign/verify message"), self.sign_verify_message) tools_menu.addAction(_("&Sign/verify message"), self.sign_verify_message)
@ -1728,7 +1728,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
sb.addPermanentWidget(StatusBarButton(QIcon(":icons/preferences.png"), _("Preferences"), self.settings_dialog ) ) sb.addPermanentWidget(StatusBarButton(QIcon(":icons/preferences.png"), _("Preferences"), self.settings_dialog ) )
self.seed_button = StatusBarButton(QIcon(":icons/seed.png"), _("Seed"), self.show_seed_dialog ) self.seed_button = StatusBarButton(QIcon(":icons/seed.png"), _("Seed"), self.show_seed_dialog )
sb.addPermanentWidget(self.seed_button) sb.addPermanentWidget(self.seed_button)
self.status_button = StatusBarButton(QIcon(":icons/status_disconnected.png"), _("Network"), lambda: self.gui_object.show_network_dialog(self)) self.status_button = StatusBarButton(QIcon(":icons/status_disconnected.png"), _("Network"), self.gui_object.show_network_dialog)
sb.addPermanentWidget(self.status_button) sb.addPermanentWidget(self.status_button)
run_hook('create_status_bar', sb) run_hook('create_status_bar', sb)
self.setStatusBar(sb) self.setStatusBar(sb)

15
gui/qt/network_dialog.py
View file

@ -38,21 +38,20 @@ protocol_names = ['TCP', 'SSL']
protocol_letters = 'ts' protocol_letters = 'ts'
class NetworkDialog(QDialog): class NetworkDialog(QDialog):
def __init__(self, network, config, parent): def __init__(self, network, config):
QDialog.__init__(self, parent) QDialog.__init__(self)
self.setWindowTitle(_('Network')) self.setWindowTitle(_('Network'))
self.setMinimumSize(400, 20) self.setMinimumSize(400, 20)
self.nlayout = NetworkChoiceLayout(network, config) self.nlayout = NetworkChoiceLayout(network, config)
vbox = QVBoxLayout(self) vbox = QVBoxLayout(self)
vbox.addLayout(self.nlayout.layout()) vbox.addLayout(self.nlayout.layout())
vbox.addLayout(Buttons(CloseButton(self))) vbox.addLayout(Buttons(CloseButton(self)))
self.connect(parent, QtCore.SIGNAL('updated'), self.on_update)
def do_exec(self): self.connect(self, QtCore.SIGNAL('updated'), self.on_update)
result = self.exec_() network.register_callback(self.on_network, ['updated'])
#if result:
# self.nlayout.accept() def on_network(self, event, *args):
return result self.emit(QtCore.SIGNAL('updated'), event, *args)
def on_update(self): def on_update(self):
self.nlayout.update() self.nlayout.update()