Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-23 12:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Reviewed-on: https://git.wownero.com/feather/feather/pulls/328
This commit is contained in:
tobtoht 2021-02-04 00:07:46 +00:00
commit 41635e39bb
4 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/wizard/menu.cpp
View file

@ -38,10 +38,5 @@ int MenuPage::nextId() const {
} }
bool MenuPage::validatePage() { 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; return true;
} }

1
src/wizard/network.cpp
View file

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

1
src/wizard/restorewallet.cpp
View file

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

1
src/wizard/walletwizard.cpp
View file

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