From b7ea10609cca7d016735d59be4c3849aaad5cf4b Mon Sep 17 00:00:00 2001 From: Michael Wozniak Date: Sat, 27 Jun 2015 18:47:25 -0400 Subject: [PATCH 1/2] add seed scroll for multisig wallets --- gui/qt/installwizard.py | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index 01ec0521..5585a6a9 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -180,12 +180,24 @@ class InstallWizard(QDialog): def multi_mpk_dialog(self, xpub_hot, n): vbox = QVBoxLayout() + scroll = QScrollArea() + scroll.setEnabled(True) + scroll.setWidgetResizable(True) + vbox.addWidget(scroll) + + w = QWidget() + scroll.setWidget(w) + w.setMinimumHeight(n*20) + + innerVbox = QVBoxLayout() + w.setLayout(innerVbox) + vbox0 = seed_dialog.show_seed_box(MSG_SHOW_MPK, xpub_hot, 'hot') - vbox.addLayout(vbox0) + innerVbox.addLayout(vbox0) entries = [] for i in range(n): vbox2, seed_e2 = seed_dialog.enter_seed_box(MSG_ENTER_COLD_MPK, self, 'cold') - vbox.addLayout(vbox2) + innerVbox.addLayout(vbox2) entries.append(seed_e2) vbox.addStretch(1) button = OkButton(self, _('Next')) @@ -202,12 +214,25 @@ class InstallWizard(QDialog): def multi_seed_dialog(self, n): vbox = QVBoxLayout() + scroll = QScrollArea() + scroll.setEnabled(True) + scroll.setWidgetResizable(True) + vbox.addWidget(scroll) + + w = QWidget() + scroll.setWidget(w) + w.setMinimumHeight(n*20) + + innerVbox = QVBoxLayout() + w.setLayout(innerVbox) + + vbox0 = seed_dialog.show_seed_box(MSG_SHOW_MPK, xpub_hot, 'hot') vbox1, seed_e1 = seed_dialog.enter_seed_box(MSG_ENTER_SEED_OR_MPK, self, 'hot') - vbox.addLayout(vbox1) + innerVbox.addLayout(vbox1) entries = [seed_e1] for i in range(n): vbox2, seed_e2 = seed_dialog.enter_seed_box(MSG_ENTER_SEED_OR_MPK, self, 'cold') - vbox.addLayout(vbox2) + innerVbox.addLayout(vbox2) entries.append(seed_e2) vbox.addStretch(1) button = OkButton(self, _('Next')) From 4338944e3a4c008289cd5e52942866d018e078e1 Mon Sep 17 00:00:00 2001 From: Michael Wozniak Date: Sat, 27 Jun 2015 18:49:21 -0400 Subject: [PATCH 2/2] remove unnecessary lines --- gui/qt/installwizard.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index 5585a6a9..ee20ca07 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -187,7 +187,6 @@ class InstallWizard(QDialog): w = QWidget() scroll.setWidget(w) - w.setMinimumHeight(n*20) innerVbox = QVBoxLayout() w.setLayout(innerVbox) @@ -221,7 +220,6 @@ class InstallWizard(QDialog): w = QWidget() scroll.setWidget(w) - w.setMinimumHeight(n*20) innerVbox = QVBoxLayout() w.setLayout(innerVbox)