simplify show_seed dialog
This commit is contained in:
parent
5086fd6b27
commit
f93bc5951c
|
@ -240,9 +240,15 @@ class InstallWizard(QDialog):
|
||||||
|
|
||||||
def show_seed(self, wallet):
|
def show_seed(self, wallet):
|
||||||
from seed_dialog import make_seed_dialog
|
from seed_dialog import make_seed_dialog
|
||||||
|
|
||||||
|
vbox = make_seed_dialog(wallet.seed, wallet.imported_keys)
|
||||||
|
vbox.addLayout(ok_cancel_buttons(self, _("Next")))
|
||||||
|
|
||||||
if self.layout(): QWidget().setLayout(self.layout())
|
if self.layout(): QWidget().setLayout(self.layout())
|
||||||
make_seed_dialog(self, wallet.seed, wallet.imported_keys)
|
self.setLayout(vbox)
|
||||||
self.exec_()
|
|
||||||
|
if not self.exec_():
|
||||||
|
exit()
|
||||||
|
|
||||||
|
|
||||||
def password_dialog(self, wallet):
|
def password_dialog(self, wallet):
|
||||||
|
|
|
@ -1491,8 +1491,8 @@ class ElectrumWindow(QMainWindow):
|
||||||
QMessageBox.warning(self, _('Error'), _('Incorrect Password'), _('OK'))
|
QMessageBox.warning(self, _('Error'), _('Incorrect Password'), _('OK'))
|
||||||
return
|
return
|
||||||
from seed_dialog import SeedDialog
|
from seed_dialog import SeedDialog
|
||||||
d = SeedDialog(self)
|
d = SeedDialog(self, seed, self.wallet.imported_keys)
|
||||||
d.show_seed(seed, self.wallet.imported_keys)
|
d.exec_()
|
||||||
else:
|
else:
|
||||||
l = {}
|
l = {}
|
||||||
for k in self.wallet.master_private_keys.keys():
|
for k in self.wallet.master_private_keys.keys():
|
||||||
|
|
|
@ -25,15 +25,16 @@ from qrcodewidget import QRCodeWidget
|
||||||
from util import close_button
|
from util import close_button
|
||||||
|
|
||||||
class SeedDialog(QDialog):
|
class SeedDialog(QDialog):
|
||||||
def __init__(self, parent):
|
def __init__(self, parent, seed, imported_keys):
|
||||||
QDialog.__init__(self, parent)
|
QDialog.__init__(self, parent)
|
||||||
self.setModal(1)
|
self.setModal(1)
|
||||||
self.setWindowTitle('Electrum' + ' - ' + _('Seed'))
|
self.setWindowTitle('Electrum' + ' - ' + _('Seed'))
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
|
|
||||||
def show_seed(self, seed, imported_keys):
|
vbox = make_seed_dialog(seed, imported_keys)
|
||||||
make_seed_dialog(self, seed, imported_keys)
|
vbox.addLayout(close_button(self))
|
||||||
self.exec_()
|
self.setLayout(vbox)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class PrivateKeysDialog(QDialog):
|
class PrivateKeysDialog(QDialog):
|
||||||
|
@ -54,7 +55,7 @@ class PrivateKeysDialog(QDialog):
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def make_seed_dialog(self, seed, imported_keys):
|
def make_seed_dialog(seed, imported_keys):
|
||||||
|
|
||||||
brainwallet = ' '.join(mnemonic.mn_encode(seed))
|
brainwallet = ' '.join(mnemonic.mn_encode(seed))
|
||||||
|
|
||||||
|
@ -92,6 +93,4 @@ def make_seed_dialog(self, seed, imported_keys):
|
||||||
vbox.addLayout(grid)
|
vbox.addLayout(grid)
|
||||||
vbox.addWidget(label2)
|
vbox.addWidget(label2)
|
||||||
|
|
||||||
vbox.addLayout(close_button(self))
|
return vbox
|
||||||
|
|
||||||
self.setLayout(vbox)
|
|
||||||
|
|
Loading…
Reference in New Issue