From d4dbc748c8543c93a188f35976a622bab5cf09c1 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Wed, 25 Nov 2020 12:34:14 +0100 Subject: [PATCH] SeedDialog: show restore height for 25 word seeds --- src/components.cpp | 4 +- src/dialog/seeddialog.cpp | 14 +++-- src/dialog/seeddialog.ui | 109 ++++++++++++++++++++++++++++++-------- 3 files changed, 99 insertions(+), 28 deletions(-) diff --git a/src/components.cpp b/src/components.cpp index 0fc5e39..30db7f8 100644 --- a/src/components.cpp +++ b/src/components.cpp @@ -68,9 +68,7 @@ HelpLabel::HelpLabel(QWidget *parent) : QLabel(parent) void HelpLabel::mouseReleaseEvent(QMouseEvent *event) { Q_UNUSED(event) - QMessageBox msgBox(QApplication::activeWindow()); - msgBox.setText(this->help_text); - msgBox.exec(); + QMessageBox::information(this, "Help", this->help_text); } void HelpLabel::enterEvent(QEvent *event) diff --git a/src/dialog/seeddialog.cpp b/src/dialog/seeddialog.cpp index b9918d5..4297e54 100644 --- a/src/dialog/seeddialog.cpp +++ b/src/dialog/seeddialog.cpp @@ -11,6 +11,8 @@ SeedDialog::SeedDialog(Wallet *wallet, QWidget *parent) ui->setupUi(this); ui->label_seedIcon->setPixmap(QPixmap(":/assets/images/seed.png").scaledToWidth(64, Qt::SmoothTransformation)); + ui->label_restoreHeight->setText(QString::number(wallet->getWalletCreationHeight())); + QString seed_14_words = wallet->getCacheAttribute("feather.seed"); QString seed_25_words = wallet->getSeed(); @@ -19,11 +21,17 @@ SeedDialog::SeedDialog(Wallet *wallet, QWidget *parent) this->setSeed(seed_25_words); } else { this->setSeed(seed_14_words); - connect(ui->check_toggleSeedType, &QCheckBox::toggled, [this, seed_25_words, seed_14_words](bool toggled){ - this->setSeed(toggled ? seed_25_words : seed_14_words); - }); + ui->widgetRestoreHeight->setVisible(false); } + connect(ui->check_toggleSeedType, &QCheckBox::toggled, [this, seed_25_words, seed_14_words](bool toggled){ + this->setSeed(toggled ? seed_25_words : seed_14_words); + ui->widgetRestoreHeight->setVisible(toggled); + }); + + ui->label_restoreHeightHelp->setHelpText("Should you restore your wallet in the future, " + "specifying this block number will recover your wallet quicker."); + this->adjustSize(); } diff --git a/src/dialog/seeddialog.ui b/src/dialog/seeddialog.ui index 2167bff..2806f8f 100644 --- a/src/dialog/seeddialog.ui +++ b/src/dialog/seeddialog.ui @@ -6,8 +6,8 @@ 0 0 - 542 - 259 + 590 + 346 @@ -34,26 +34,84 @@ - - - true - - - - 0 - 0 - - - - - 16777215 - 125 - - - - true - - + + + + + true + + + + 0 + 0 + + + + + 0 + 125 + + + + + 16777215 + 300 + + + + true + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Restore height: + + + + + + + TextLabel + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + @@ -86,6 +144,13 @@ + + + HelpLabel + QLabel +
components.h
+
+