AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #3439: ScanQRTextEdit optionally allows to concat data

Browse Source
This commit is contained in:
SomberNight
2017-12-24 03:30:04 +01:00
parent 13bf539d17
commit aef0444867
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gui/qt/qrtextedit.py
View File

@@ -33,8 +33,9 @@ class ShowQRTextEdit(ButtonsTextEdit):
class ScanQRTextEdit(ButtonsTextEdit, MessageBoxMixin):
def __init__(self, text=""):
def __init__(self, text="", allow_multi=False):
ButtonsTextEdit.__init__(self, text)
self.allow_multi = allow_multi
self.setReadOnly(0)
self.addButton(":icons/file.png", self.file_input, _("Read file"))
icon = ":icons/qrcode_white.png" if ColorScheme.dark_scheme else ":icons/qrcode.png"
@@ -58,7 +59,11 @@ class ScanQRTextEdit(ButtonsTextEdit, MessageBoxMixin):
data = ''
if not data:
data = ''
self.setText(data)
if self.allow_multi:
new_text = self.text() + data + '\n'
else:
new_text = data
self.setText(new_text)
return data
def contextMenuEvent(self, e):