AaronFiore/electrum
1
0
Fork 0
Code Activity

use get_config instead of passing window to ScanQRTextEdit

Browse Source
This commit is contained in:
ThomasV
2015-05-08 19:58:29 +02:00
parent f2c2f9d738
commit 1cb6c08a13
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gui/qt/qrtextedit.py
View File

@@ -7,8 +7,9 @@ from util import ButtonsTextEdit
class ShowQRTextEdit(ButtonsTextEdit):
def __init__(self, text=None):
super(ShowQRTextEdit, self).__init__(text)
ButtonsTextEdit__init__(self, text)
self.setReadOnly(1)
self.addButton(":icons/qrcode.png", self.qr_show, _("Show as QR code"))
run_hook('show_text_edit', self)
@@ -28,13 +29,10 @@ class ShowQRTextEdit(ButtonsTextEdit):
class ScanQRTextEdit(ButtonsTextEdit):
def __init__(self, win, text=""):
super(ScanQRTextEdit,self).__init__(text)
def __init__(self, text=""):
ButtonsTextEdit.__init__(self, text)
self.setReadOnly(0)
self.win = win
assert win, "You must pass a window with access to the config to ScanQRTextEdit constructor."
if win:
assert hasattr(win,"config"), "You must pass a window with access to the config to ScanQRTextEdit constructor."
self.addButton(":icons/file.png", self.file_input, _("Read file"))
self.addButton(":icons/qrcode.png", self.qr_input, _("Read QR code"))
run_hook('scan_text_edit', self)
@@ -48,9 +46,9 @@ class ScanQRTextEdit(ButtonsTextEdit):
self.setText(data)
def qr_input(self):
from electrum import qrscanner
from electrum import qrscanner, get_config
try:
data = qrscanner.scan_qr(self.win.config)
data = qrscanner.scan_qr(get_config())
except BaseException, e:
QMessageBox.warning(self, _('Error'), _(e), _('OK'))
return ""