started KeychainBackupWizard

Author: CodeShark

mSIGNA.pro

@@ -93,6 +93,7 @@ HEADERS = \
     src/signatureactions.h \
     src/requestpaymentdialog.h \
     src/networksettingsdialog.h \
+    src/keychainbackupwizard.h \
     src/keychainbackupdialog.h \
     src/viewbip32dialog.h \
     src/importbip32dialog.h \
@@ -148,6 +149,7 @@ SOURCES = \
     src/signatureactions.cpp \
     src/requestpaymentdialog.cpp \
     src/networksettingsdialog.cpp \
+    src/keychainbackupwizard.cpp \
     src/keychainbackupdialog.cpp \
     src/viewbip32dialog.cpp \
     src/importbip32dialog.cpp \

src/mainwindow.cpp

@@ -57,6 +57,7 @@
 #include "keychainbackupdialog.h"
 #include "viewbip32dialog.h"
 #include "importbip32dialog.h"
+#include "keychainbackupwizard.h"
 #include "viewbip39dialog.h"
 #include "importbip39dialog.h"
 #include "passphrasedialog.h"
@@ -698,9 +699,9 @@ void MainWindow::newKeychain()
                 secure_bytes_t seed = getRandomBytes(32);
 
                 // Prompt user to write down and verify word list
-                ViewBIP39Dialog viewDlg(name, seed, this);
-                viewDlg.exec();
-
+                KeychainBackupWizard backupWizard(name, seed, this);
+                if (!backupWizard.exec()) return;
+/*
                 while (true)
                 {
                     try
@@ -717,7 +718,7 @@ void MainWindow::newKeychain()
                         showError(e.what());
                     } 
                 }
-
+*/
                 CoinDB::VaultLock lock(synchedVault);
                 if (!synchedVault.isVaultOpen()) throw std::runtime_error("No vault is open.");
                 synchedVault.getVault()->newKeychain(name.toStdString(), seed);

src/viewbip39dialog.cpp

@@ -22,16 +22,42 @@
 
 ViewBIP39Dialog::ViewBIP39Dialog(const QString& name, const secure_bytes_t& seed, QWidget* parent)
     : QDialog(parent)
+{
+    init(QString(), name, seed);
+}
+
+ViewBIP39Dialog::ViewBIP39Dialog(const QString& prompt, const QString& name, const secure_bytes_t& seed, QWidget* parent)
+    : QDialog(parent)
+{
+    init(prompt, name, seed);
+}
+
+void ViewBIP39Dialog::init(const QString& prompt, const QString& name, const secure_bytes_t& seed)
 {
     setWindowTitle(tr("Wordlist for ") + name);
 
+    // Buttons
+    QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
+                                     | QDialogButtonBox::Cancel);
+
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
     QLineEdit* wordlistEdit = new QLineEdit();
     wordlistEdit->setReadOnly(true);
     wordlistEdit->setText(Coin::BIP39::toWordlist(seed).c_str());
 
     QVBoxLayout* mainLayout = new QVBoxLayout();
-    mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
+    //mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
+
+    if (!prompt.isEmpty())
+    {
+        QLabel* promptLabel= new QLabel(prompt);
+        mainLayout->addWidget(promptLabel);
+    }
+
     mainLayout->addWidget(wordlistEdit);
+    mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);
 
     resize(1000, 100);

src/viewbip39dialog.h

@@ -20,5 +20,9 @@ class ViewBIP39Dialog : public QDialog
 
 public:
     ViewBIP39Dialog(const QString& name, const secure_bytes_t& seed, QWidget* parent = NULL);
+    ViewBIP39Dialog(const QString& prompt, const QString& name, const secure_bytes_t& seed, QWidget* parent = NULL);
+
+protected:
+    void init(const QString& prompt, const QString& name, const secure_bytes_t& seed);
 };