Merge pull request 'Wizard: rename cancel button to close' (#328) from tobtoht/feather:wizard_close into master

Reviewed-on: feather/feather#328

src/wizard/menu.cpp

@@ -38,10 +38,5 @@ int MenuPage::nextId() const {
 }
 
 bool MenuPage::validatePage() {
-    // Check if file exists
-    // Check if wallet has password
-    // Check if wallet can be decrypted with entered password
-
-    // TODO: Check if password is correct, otherwise show error message
     return true;
 }

src/wizard/network.cpp

@@ -12,7 +12,6 @@ NetworkPage::NetworkPage(AppContext *ctx, QWidget *parent) :
         m_ctx(ctx) {
     ui->setupUi(this);
     this->setTitle("Welcome to Feather!");
-    this->setButtonText(QWizard::FinishButton, "walletKeysFilesModel");
 
     ui->customFrame->hide();
 

src/wizard/restorewallet.cpp

@@ -18,7 +18,6 @@ RestorePage::RestorePage(AppContext *ctx, QWidget *parent) :
         m_ctx(ctx) {
     ui->setupUi(this);
     this->setTitle("Restore wallet");
-    this->setButtonText(QWizard::FinishButton, "walletKeysFilesModel");
     ui->restoreFrame->hide();
     ui->label_errorString->hide();
 

src/wizard/walletwizard.cpp

@@ -41,6 +41,7 @@ WalletWizard::WalletWizard(AppContext *ctx, WalletWizard::Page startPage, QWidge
     else
         setStartId(Page_Menu);
 
+    setButtonText(QWizard::CancelButton, "Close");
     setPixmap(QWizard::WatermarkPixmap, QPixmap(":/assets/images/banners/3.png"));
     setWizardStyle(WizardStyle::ModernStyle);
     setOption(QWizard::NoBackButtonOnStartPage);