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

9
gui/qt/installwizard.py
View File

@@ -332,8 +332,9 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
def remove_from_recently_open(self, filename):
self.config.remove_from_recently_open(filename)
def text_input(self, title, message, is_valid):
slayout = KeysLayout(parent=self, title=message, is_valid=is_valid)
def text_input(self, title, message, is_valid, allow_multi=False):
slayout = KeysLayout(parent=self, title=message, is_valid=is_valid,
allow_multi=allow_multi)
self.exec_layout(slayout, title, next_enabled=False)
return slayout.get_text()
@@ -343,8 +344,8 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
return slayout.get_seed(), slayout.is_bip39, slayout.is_ext
@wizard_dialog
def add_xpub_dialog(self, title, message, is_valid, run_next):
return self.text_input(title, message, is_valid)
def add_xpub_dialog(self, title, message, is_valid, run_next, allow_multi=False):
return self.text_input(title, message, is_valid, allow_multi)
@wizard_dialog
def add_cosigner_dialog(self, run_next, index, is_valid):