mirror of
https://github.com/wownero/wowlet.git
synced 2026-10-17 07:11:29 +02:00
main: remove donations
This commit is contained in:
@@ -24,7 +24,6 @@ option(TOR_DIR "Directory containing Tor binaries to embed inside Feather" OFF)
|
||||
option(CHECK_UPDATES "Enable checking for application updates" OFF)
|
||||
option(PLATFORM_INSTALLER "Built-in updater fetches installer (windows-only)" OFF)
|
||||
option(USE_DEVICE_TREZOR "Trezor support compilation" ON)
|
||||
option(DONATE_BEG "Prompt donation window every once in a while" OFF)
|
||||
option(WITH_SCANNER "Enable webcam QR scanner" ON)
|
||||
option(STACK_TRACE "Dump stack trace on crash (Linux only)" OFF)
|
||||
|
||||
|
||||
@@ -53,14 +53,6 @@ For information on how Feather is maintained, see: [MAINTENANCE.md](https://gith
|
||||
|
||||
To report a security vulnerability, see: [SECURITY.md](https://github.com/feather-wallet/feather/blob/master/SECURITY.md)
|
||||
|
||||
## Support
|
||||
|
||||
Feather is funded entirely through donations. We don't take a cut from transaction fees and make no money from exchange integrations.
|
||||
|
||||
Donations help pay for hosting, build servers, domain names, e-mail and other recurring costs. Any amount helps.
|
||||
|
||||
`47ntfT2Z5384zku39pTM6hGcnLnvpRYW2Azm87GiAAH2bcTidtq278TL6HmwyL8yjMeERqGEBs3cqC8vvHPJd1cWQrGC65f`
|
||||
|
||||
## License
|
||||
|
||||
Feather is free and open-source software, [licensed under BSD-3](https://raw.githubusercontent.com/feather-wallet/feather/master/LICENSE).
|
||||
|
||||
@@ -289,7 +289,7 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}"
|
||||
|
||||
|
||||
# Set appropriate CMake options for build type
|
||||
CMAKEVARS="-DWITH_SCANNER=On -DCHECK_UPDATES=On -DSELF_CONTAINED=On -DDONATE_BEG=On -DFEATHER_TARGET_TRIPLET=${HOST} -DWITH_PLUGIN_REDDIT=Off"
|
||||
CMAKEVARS="-DWITH_SCANNER=On -DCHECK_UPDATES=On -DSELF_CONTAINED=On -DFEATHER_TARGET_TRIPLET=${HOST} -DWITH_PLUGIN_REDDIT=Off"
|
||||
|
||||
if [[ -n "${TAG}" ]]; then
|
||||
CMAKEVARS+=" -DOFFICIAL_BUILD=On"
|
||||
|
||||
Vendored
+1
-1
Submodule external/feather-docs updated: 39397f4534...08d68bf5c4
@@ -120,10 +120,6 @@ MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *pa
|
||||
connect(&appData()->prices, &Prices::fiatPricesUpdated, this, &MainWindow::updateBalance);
|
||||
connect(&appData()->prices, &Prices::cryptoPricesUpdated, this, &MainWindow::updateBalance);
|
||||
|
||||
#ifdef DONATE_BEG
|
||||
this->donationNag();
|
||||
#endif
|
||||
|
||||
connect(m_windowManager->eventFilter, &EventFilter::userActivity, this, &MainWindow::userActivity);
|
||||
connect(&m_checkUserActivity, &QTimer::timeout, this, &MainWindow::checkUserActivity);
|
||||
m_checkUserActivity.setInterval(5000);
|
||||
@@ -407,7 +403,6 @@ void MainWindow::initMenu() {
|
||||
#endif
|
||||
|
||||
connect(ui->actionOfficialWebsite, &QAction::triggered, [this](){Utils::externalLinkWarning(this, "https://featherwallet.org");});
|
||||
connect(ui->actionDonate_to_Feather, &QAction::triggered, this, &MainWindow::donateButtonClicked);
|
||||
connect(ui->actionDocumentation, &QAction::triggered, this, &MainWindow::onShowDocumentation);
|
||||
connect(ui->actionReport_bug, &QAction::triggered, this, &MainWindow::onReportBug);
|
||||
connect(ui->actionShow_debug_info, &QAction::triggered, this, &MainWindow::showDebugInfo);
|
||||
@@ -515,10 +510,6 @@ void MainWindow::initWalletContext() {
|
||||
connect(m_wallet, &Wallet::deviceButtonPressed, this, &MainWindow::onDeviceButtonPressed);
|
||||
connect(m_wallet, &Wallet::deviceError, this, &MainWindow::onDeviceError);
|
||||
|
||||
connect(m_wallet, &Wallet::donationSent, this, []{
|
||||
conf()->set(Config::donateBeg, -1);
|
||||
});
|
||||
|
||||
connect(m_wallet, &Wallet::multiBroadcast, this, &MainWindow::onMultiBroadcast);
|
||||
}
|
||||
|
||||
@@ -1288,11 +1279,6 @@ void MainWindow::changeEvent(QEvent* event)
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::donateButtonClicked() {
|
||||
m_sendWidget->fill(constants::donationAddress, constants::donationDescription);
|
||||
ui->tabWidget->setCurrentIndex(this->findTab("Send"));
|
||||
}
|
||||
|
||||
void MainWindow::showHistoryTab() {
|
||||
this->raise();
|
||||
ui->tabWidget->setCurrentIndex(this->findTab("History"));
|
||||
@@ -1776,32 +1762,6 @@ void MainWindow::updateTitle() {
|
||||
this->setWindowTitle(title);
|
||||
}
|
||||
|
||||
void MainWindow::donationNag() {
|
||||
if (m_wallet->nettype() != NetworkType::Type::MAINNET)
|
||||
return;
|
||||
|
||||
if (m_wallet->viewOnly())
|
||||
return;
|
||||
|
||||
if (m_wallet->balanceAll() == 0)
|
||||
return;
|
||||
|
||||
auto donationCounter = conf()->get(Config::donateBeg).toInt();
|
||||
if (donationCounter == -1)
|
||||
return;
|
||||
|
||||
donationCounter++;
|
||||
if (donationCounter % constants::donationBoundary == 0) {
|
||||
auto msg = "Feather development is funded entirely through donations.\n\nPlease consider supporting "
|
||||
"the project. Donate any amount to remove this reminder.";
|
||||
int ret = QMessageBox::information(this, "Donate to Feather", msg, QMessageBox::Yes, QMessageBox::No);
|
||||
if (ret == QMessageBox::Yes) {
|
||||
this->donateButtonClicked();
|
||||
}
|
||||
}
|
||||
conf()->set(Config::donateBeg, donationCounter);
|
||||
}
|
||||
|
||||
void MainWindow::addToRecentlyOpened(QString keysFile) {
|
||||
auto recent = conf()->get(Config::recentlyOpenedWallets).toList();
|
||||
|
||||
|
||||
@@ -152,7 +152,6 @@ private slots:
|
||||
void showAddressChecker();
|
||||
void showURDialog();
|
||||
|
||||
void donateButtonClicked();
|
||||
void payToMany();
|
||||
void showHistoryTab();
|
||||
void skinChanged(const QString &skinName);
|
||||
|
||||
@@ -595,8 +595,6 @@
|
||||
<addaction name="actionDocumentation"/>
|
||||
<addaction name="actionReport_bug"/>
|
||||
<addaction name="actionShow_debug_info"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionDonate_to_Feather"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuView">
|
||||
<property name="title">
|
||||
|
||||
@@ -94,11 +94,6 @@ void SendWidget::addressEdited() {
|
||||
}
|
||||
|
||||
ui->btn_openAlias->setVisible(ui->lineAddress->isOpenAlias());
|
||||
|
||||
// Clear donation description if address no longer matches
|
||||
if (ui->lineDescription->text() == constants::donationDescription && ui->lineAddress->text() != constants::donationAddress) {
|
||||
ui->lineDescription->clear();
|
||||
}
|
||||
}
|
||||
|
||||
void SendWidget::amountEdited(const QString &text) {
|
||||
|
||||
@@ -19,11 +19,6 @@ namespace constants
|
||||
const quint64 kdfRounds = 1;
|
||||
|
||||
const QString seedLanguage = "English"; // todo: move me
|
||||
|
||||
// donation constants
|
||||
const QString donationAddress = "47ntfT2Z5384zku39pTM6hGcnLnvpRYW2Azm87GiAAH2bcTidtq278TL6HmwyL8yjMeERqGEBs3cqC8vvHPJd1cWQrGC65f";
|
||||
const QString donationDescription = "Donation to the Feather development team";
|
||||
const int donationBoundary = 25;
|
||||
}
|
||||
|
||||
#endif //FEATHER_CONSTANTS_H
|
||||
|
||||
@@ -957,12 +957,6 @@ void Wallet::onTransactionCreated(Monero::PendingTransaction *mtx, const QVector
|
||||
|
||||
PendingTransaction *tx = new PendingTransaction(mtx, this);
|
||||
|
||||
for (auto &addr : address) {
|
||||
if (addr == constants::donationAddress) {
|
||||
this->donationSending = true;
|
||||
}
|
||||
}
|
||||
|
||||
// tx created, but not sent yet. ask user to verify first.
|
||||
emit transactionCreated(tx, address);
|
||||
}
|
||||
@@ -1014,12 +1008,6 @@ void Wallet::onTransactionCommitted(bool success, PendingTransaction *tx, const
|
||||
// Let MainWindow handle this
|
||||
emit multiBroadcast(txHexMap);
|
||||
}
|
||||
|
||||
// this tx was a donation to Feather, stop our nagging
|
||||
if (this->donationSending) {
|
||||
this->donationSending = false;
|
||||
emit donationSent();
|
||||
}
|
||||
}
|
||||
|
||||
void Wallet::disposeTransaction(PendingTransaction *t) {
|
||||
|
||||
@@ -463,7 +463,6 @@ signals:
|
||||
|
||||
void transactionCreated(PendingTransaction *tx, const QVector<QString> &address);
|
||||
|
||||
void donationSent();
|
||||
void walletRefreshed();
|
||||
|
||||
void initiateTransaction();
|
||||
@@ -525,7 +524,6 @@ private:
|
||||
FutureScheduler m_scheduler;
|
||||
|
||||
bool m_useSSL;
|
||||
bool donationSending = false;
|
||||
bool m_newWallet = false;
|
||||
bool m_forceKeyImageSync = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user