AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #3593 from SomberNight/scan_qr_textedit_allow_multi

Browse Source 
ScanQRTextEdit optionally allows to concat data
This commit is contained in:
ThomasV
2017-12-31 18:04:21 +01:00
committed by GitHub
parent 5db7363cf8 3de5b91c15
commit 7ae1a4cdeb
7 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gui/qt/main_window.py
View File

@@ -2423,7 +2423,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
vbox = QVBoxLayout(d)
vbox.addWidget(QLabel(_("Enter private keys:")))
keys_e = ScanQRTextEdit()
keys_e = ScanQRTextEdit(allow_multi=True)
keys_e.setTabChangesFocus(True)
vbox.addWidget(keys_e)
@@ -2473,7 +2473,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.warn_if_watching_only()
def _do_import(self, title, msg, func):
text = text_dialog(self, title, msg + ' :', _('Import'))
text = text_dialog(self, title, msg + ' :', _('Import'),
allow_multi=True)
if not text:
return
bad = []