AaronFiore/electrum
1
0
Fork 0
Code Activity

qt: rm some usages of get_parent_main_window

Browse Source 
instead, pass around the main window or config (whichever is actually needed)

fixes #6342
This commit is contained in:
SomberNight
2020-12-20 13:26:35 +01:00
parent 08c3d2ccd0
commit 096d853482
12 changed files with 89 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,9 @@ from PyQt5.QtWidgets import QFileDialog
from electrum.i18n import _
from electrum.plugin import run_hook
from electrum.simple_config import SimpleConfig
from .util import ButtonsTextEdit, MessageBoxMixin, ColorScheme, get_parent_main_window
from .util import ButtonsTextEdit, MessageBoxMixin, ColorScheme
class ShowQRTextEdit(ButtonsTextEdit):
@@ -32,10 +33,11 @@ class ShowQRTextEdit(ButtonsTextEdit):
class ScanQRTextEdit(ButtonsTextEdit, MessageBoxMixin):
def __init__(self, text="", allow_multi=False):
def __init__(self, text="", allow_multi=False, *, config: SimpleConfig):
ButtonsTextEdit.__init__(self, text)
self.allow_multi = allow_multi
self.setReadOnly(0)
self.config = config
self.setReadOnly(False)
self.addButton("file.png", self.file_input, _("Read file"))
icon = "camera_white.png" if ColorScheme.dark_scheme else "camera_dark.png"
self.addButton(icon, self.qr_input, _("Read QR code"))
@@ -60,11 +62,8 @@ class ScanQRTextEdit(ButtonsTextEdit, MessageBoxMixin):
def qr_input(self):
from electrum import qrscanner
window_or_wizard = get_parent_main_window(self, allow_wizard=True)
assert window_or_wizard
config = window_or_wizard.config
try:
data = qrscanner.scan_barcode(config.get_video_device())
data = qrscanner.scan_barcode(self.config.get_video_device())
except BaseException as e:
self.show_error(repr(e))
data = ''