AaronFiore/electrum
1
0
Fork 0
Code Activity

qt wizard: fix scanning qr code when restoring from xpub

Browse Source 
fixes #6342
This commit is contained in:
SomberNight
2020-07-08 01:51:14 +02:00
parent 4961020e01
commit 1c9a6f5770
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/gui/qt/qrtextedit.py
View File

@@ -60,9 +60,9 @@ class ScanQRTextEdit(ButtonsTextEdit, MessageBoxMixin):
def qr_input(self): def qr_input(self):
from electrum import qrscanner from electrum import qrscanner
main_window = get_parent_main_window(self) window_or_wizard = get_parent_main_window(self, allow_wizard=True)
assert main_window assert window_or_wizard
config = main_window.config config = window_or_wizard.config
try: try:
data = qrscanner.scan_barcode(config.get_video_device()) data = qrscanner.scan_barcode(config.get_video_device())
except BaseException as e: except BaseException as e:

13
electrum/gui/qt/util.py
View File

@@ -30,6 +30,7 @@ from electrum.invoices import PR_UNPAID, PR_PAID, PR_EXPIRED, PR_INFLIGHT, PR_UN
if TYPE_CHECKING: if TYPE_CHECKING:
from .main_window import ElectrumWindow from .main_window import ElectrumWindow
from .installwizard import InstallWizard
if platform.system() == 'Windows': if platform.system() == 'Windows':
@@ -945,19 +946,23 @@ def export_meta_gui(electrum_window, title, exporter):
.format(title, str(filename))) .format(title, str(filename)))
def get_parent_main_window(widget): def get_parent_main_window(
widget, *, allow_wizard: bool = False,
) -> Union[None, 'ElectrumWindow', 'InstallWizard']:
"""Returns a reference to the ElectrumWindow this widget belongs to.""" """Returns a reference to the ElectrumWindow this widget belongs to."""
from .main_window import ElectrumWindow from .main_window import ElectrumWindow
from .transaction_dialog import TxDialog from .transaction_dialog import TxDialog
from .installwizard import InstallWizard
for _ in range(100): for _ in range(100):
if widget is None: if widget is None:
return None return None
if isinstance(widget, ElectrumWindow): if isinstance(widget, ElectrumWindow):
return widget return widget
elif isinstance(widget, TxDialog): if isinstance(widget, TxDialog):
return widget.main_window return widget.main_window
else: if isinstance(widget, InstallWizard) and allow_wizard:
widget = widget.parentWidget() return widget
widget = widget.parentWidget()
return None return None