mirror of
https://github.com/feather-wallet/feather.git
synced 2024-12-22 19:49:28 +00:00
Clean up accidental changes to make PR cleaner
This commit is contained in:
parent
7ec47fd929
commit
4b5800f0e5
7 changed files with 5 additions and 13 deletions
|
@ -28,7 +28,7 @@ option(DONATE_BEG "Prompt donation window every once in a while" OFF)
|
|||
option(WITH_SCANNER "Enable webcam QR scanner" OFF)
|
||||
option(STACK_TRACE "Dump stack trace on crash (Linux only)" OFF)
|
||||
|
||||
#
|
||||
# Plugins
|
||||
option(WITH_PLUGIN_HOME "Include Home tab plugin" ON)
|
||||
option(WITH_PLUGIN_TICKERS "Include Tickers Home plugin" ON)
|
||||
option(WITH_PLUGIN_CROWDFUNDING "Include Crowdfunding Home plugin" ON)
|
||||
|
@ -115,7 +115,6 @@ endif()
|
|||
# libzip
|
||||
if(CHECK_UPDATES OR WITH_PLUGIN_ATOMIC)
|
||||
set(ZLIB_USE_STATIC_LIBS "ON")
|
||||
message("libzip inclueded")
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_path(LIBZIP_INCLUDE_DIRS zip.h)
|
||||
find_library(LIBZIP_LIBRARIES zip)
|
||||
|
|
|
@ -18,4 +18,3 @@ qt_mingw32_packages := qt
|
|||
|
||||
tor_linux_packages := libevent tor_linux
|
||||
tor_darwin_packages := tor_darwin
|
||||
tor_mingw32_packages := tor_mingw32
|
||||
|
|
|
@ -70,7 +70,6 @@ MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *pa
|
|||
this->restoreGeo();
|
||||
|
||||
this->initStatusBar();
|
||||
|
||||
this->initPlugins();
|
||||
this->initWidgets();
|
||||
this->initMenu();
|
||||
|
|
|
@ -246,7 +246,7 @@ void ReceiveWidget::updateQrCode(){
|
|||
|
||||
void ReceiveWidget::showQrCodeDialog() {
|
||||
SubaddressRow* row = this->currentEntry();
|
||||
|
||||
if (!row) return;
|
||||
QString address = this->getAddress(row->getRow());
|
||||
QrCode qr(address, QrCode::Version::AUTO, QrCode::ErrorCorrectionLevel::HIGH);
|
||||
QrCodeDialog dialog{this, &qr, "Address"};
|
||||
|
|
|
@ -11,8 +11,6 @@
|
|||
#include <QPointer>
|
||||
#include <QDir>
|
||||
|
||||
|
||||
|
||||
class Config : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
|
|
@ -38,8 +38,6 @@ WalletWizard::WalletWizard(QWidget *parent)
|
|||
auto networkWebsocketPage = new PageNetworkWebsocket(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);
|
||||
|
|
|
@ -82,8 +82,7 @@ public:
|
|||
Page_HardwareDevice,
|
||||
Page_NetworkProxy,
|
||||
Page_NetworkWebsocket,
|
||||
Page_Plugins,
|
||||
Page_Atomic
|
||||
Page_Plugins
|
||||
};
|
||||
|
||||
explicit WalletWizard(QWidget *parent = nullptr);
|
||||
|
|
Loading…
Reference in a new issue