Allow opening multiple windows

This commit is contained in:
tobtoht
2021-05-18 18:08:40 +02:00
parent cc01924858
commit f43949a346
110 changed files with 1839 additions and 1903 deletions
+36 -35
View File
@@ -15,29 +15,28 @@
#include "PageSetRestoreHeight.h"
#include "PageHardwareDevice.h"
#include "PageNetworkTor.h"
#include "globals.h"
#include "constants.h"
#include <QLineEdit>
#include <QVBoxLayout>
#include <QScreen>
WalletWizard::WalletWizard(AppContext *ctx, WalletWizard::Page startPage, QWidget *parent)
: QWizard(parent)
, m_ctx(ctx)
WalletWizard::WalletWizard(QWidget *parent)
: QWizard(parent)
{
this->setWindowTitle("Welcome to Feather Wallet");
this->setWindowIcon(QIcon(":/assets/images/appicons/64x64.png"));
m_walletKeysFilesModel = new WalletKeysFilesModel(m_ctx, this);
m_walletKeysFilesModel = new WalletKeysFilesModel(this);
m_walletKeysFilesModel->refresh();
auto networkPage = new PageNetwork(m_ctx, this);
auto networkTorPage = new PageNetworkTor(m_ctx, this);
auto menuPage = new PageMenu(m_ctx, &m_wizardFields, m_walletKeysFilesModel, this);
auto openWalletPage = new PageOpenWallet(m_ctx, m_walletKeysFilesModel, this);
auto createWallet = new PageWalletFile(m_ctx, &m_wizardFields , this);
auto createWalletSeed = new PageWalletSeed(m_ctx, &m_wizardFields, this);
auto walletSetPasswordPage = new PageSetPassword(m_ctx, &m_wizardFields, this);
auto networkPage = new PageNetwork(this);
auto networkTorPage = new PageNetworkTor(this);
auto menuPage = new PageMenu(&m_wizardFields, m_walletKeysFilesModel, this);
auto openWalletPage = new PageOpenWallet(m_walletKeysFilesModel, this);
auto createWallet = new PageWalletFile(&m_wizardFields , this);
auto createWalletSeed = new PageWalletSeed(&m_wizardFields, this);
auto walletSetPasswordPage = new PageSetPassword(&m_wizardFields, this);
setPage(Page_Menu, menuPage);
setPage(Page_WalletFile, createWallet);
setPage(Page_OpenWallet, openWalletPage);
@@ -45,22 +44,18 @@ WalletWizard::WalletWizard(AppContext *ctx, WalletWizard::Page startPage, QWidge
setPage(Page_SetPasswordPage, walletSetPasswordPage);
setPage(Page_Network, networkPage);
setPage(Page_NetworkTor, networkTorPage);
setPage(Page_WalletRestoreSeed, new PageWalletRestoreSeed(m_ctx, &m_wizardFields, this));
setPage(Page_WalletRestoreKeys, new PageWalletRestoreKeys(m_ctx, &m_wizardFields, this));
setPage(Page_SetRestoreHeight, new PageSetRestoreHeight(m_ctx, &m_wizardFields, this));
setPage(Page_HardwareDevice, new PageHardwareDevice(m_ctx, &m_wizardFields, this));
setPage(Page_WalletRestoreSeed, new PageWalletRestoreSeed(&m_wizardFields, this));
setPage(Page_WalletRestoreKeys, new PageWalletRestoreKeys(&m_wizardFields, this));
setPage(Page_SetRestoreHeight, new PageSetRestoreHeight(&m_wizardFields, this));
setPage(Page_HardwareDevice, new PageHardwareDevice(&m_wizardFields, this));
setStartId(startPage);
setStartId(Page_Menu);
setButtonText(QWizard::CancelButton, "Close");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/assets/images/banners/3.png"));
setWizardStyle(WizardStyle::ModernStyle);
setOption(QWizard::NoBackButtonOnStartPage);
connect(this, &QWizard::rejected, [=]{
return QApplication::exit(1);
});
connect(networkTorPage, &PageNetworkTor::initialNetworkConfigured, [this](){
emit initialNetworkConfigured();
});
@@ -72,7 +67,9 @@ WalletWizard::WalletWizard(AppContext *ctx, WalletWizard::Page startPage, QWidge
emit skinChanged("Native");
});
connect(walletSetPasswordPage, &PageSetPassword::createWallet, this, &WalletWizard::createWallet);
connect(walletSetPasswordPage, &PageSetPassword::createWallet, this, &WalletWizard::onCreateWallet);
connect(createWallet, &PageWalletFile::defaultWalletDirChanged, [this](const QString &walletDir){
emit defaultWalletDirChanged(walletDir);
});
@@ -82,12 +79,16 @@ WalletWizard::WalletWizard(AppContext *ctx, WalletWizard::Page startPage, QWidge
});
}
void WalletWizard::createWallet() {
WalletWizard::~WalletWizard() {
qDebug() << "We're killing the walletwizard";
}
void WalletWizard::onCreateWallet() {
auto walletPath = QString("%1/%2").arg(m_wizardFields.walletDir, m_wizardFields.walletName);
int currentBlockHeight = 0;
if (appData()->heights.contains(m_ctx->networkType)) {
currentBlockHeight = appData()->heights[m_ctx->networkType];
if (appData()->heights.contains(constants::networkType)) {
currentBlockHeight = appData()->heights[constants::networkType];
}
if (m_wizardFields.mode == WizardMode::CreateWalletFromDevice) {
@@ -96,23 +97,23 @@ void WalletWizard::createWallet() {
restoreHeight = m_wizardFields.restoreHeight;
}
m_ctx->createWalletFromDevice(walletPath, m_wizardFields.password, restoreHeight);
emit createWalletFromDevice(walletPath, m_wizardFields.password, restoreHeight);
return;
}
if (m_wizardFields.mode == WizardMode::RestoreFromKeys) {
m_ctx->createWalletFromKeys(walletPath,
m_wizardFields.password,
m_wizardFields.address,
m_wizardFields.secretViewKey,
m_wizardFields.secretSpendKey,
m_wizardFields.restoreHeight);
emit createWalletFromKeys(walletPath,
m_wizardFields.password,
m_wizardFields.address,
m_wizardFields.secretViewKey,
m_wizardFields.secretSpendKey,
m_wizardFields.restoreHeight);
return;
}
auto seed = FeatherSeed(m_ctx->networkType, QString::fromStdString(globals::coinName), m_ctx->seedLanguage, m_wizardFields.seed.split(" "));
auto seed = FeatherSeed(constants::networkType, QString::fromStdString(constants::coinName), constants::seedLanguage, m_wizardFields.seed.split(" "));
if (m_wizardFields.mode == WizardMode::CreateWallet) {
if (m_wizardFields.mode == WizardMode::CreateWallet && currentBlockHeight > 0) {
qInfo() << "New wallet, setting restore height to latest blockheight: " << currentBlockHeight;
seed.setRestoreHeight(currentBlockHeight);
}
@@ -120,5 +121,5 @@ void WalletWizard::createWallet() {
if (m_wizardFields.mode == WizardMode::RestoreFromSeed && m_wizardFields.seedType == SeedType::MONERO)
seed.setRestoreHeight(m_wizardFields.restoreHeight);
m_ctx->createWallet(seed, walletPath, m_wizardFields.password, m_wizardFields.seedOffsetPassphrase);
emit createWallet(seed, walletPath, m_wizardFields.password, m_wizardFields.seedOffsetPassphrase);
}