Remove custom fees + save sent setting
This commit is contained in:
parent
2b94c7f6d0
commit
65bdcd6367
|
@ -6,8 +6,8 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>538</width>
|
<width>626</width>
|
||||||
<height>458</height>
|
<height>713</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -174,19 +174,6 @@
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="nopeersWarning">
|
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true">color: red;</string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>zcashd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work.</string>
|
|
||||||
</property>
|
|
||||||
<property name="wordWrap">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="syncingWarning">
|
<widget class="QLabel" name="syncingWarning">
|
||||||
<property name="styleSheet">
|
<property name="styleSheet">
|
||||||
|
@ -200,19 +187,6 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="warningLabel">
|
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true">color: red;</string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>You are using a custom fee. Since fees are transparent, you are giving up some privacy. Please use this only if you know what you are doing!</string>
|
|
||||||
</property>
|
|
||||||
<property name="wordWrap">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="Line" name="line">
|
<widget class="Line" name="line">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
|
|
@ -257,11 +257,6 @@ void MainWindow::setupSettingsModal() {
|
||||||
settings.setupUi(&settingsDialog);
|
settings.setupUi(&settingsDialog);
|
||||||
Settings::saveRestore(&settingsDialog);
|
Settings::saveRestore(&settingsDialog);
|
||||||
|
|
||||||
// Setup save sent check box
|
|
||||||
QObject::connect(settings.chkSaveTxs, &QCheckBox::stateChanged, [=](auto checked) {
|
|
||||||
Settings::getInstance()->setSaveZtxs(checked);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Setup theme combo
|
// Setup theme combo
|
||||||
int theme_index = settings.comboBoxTheme->findText(Settings::getInstance()->get_theme_name(), Qt::MatchExactly);
|
int theme_index = settings.comboBoxTheme->findText(Settings::getInstance()->get_theme_name(), Qt::MatchExactly);
|
||||||
settings.comboBoxTheme->setCurrentIndex(theme_index);
|
settings.comboBoxTheme->setCurrentIndex(theme_index);
|
||||||
|
@ -272,12 +267,6 @@ void MainWindow::setupSettingsModal() {
|
||||||
QMessageBox::information(this, tr("Restart"), tr("Please restart ZecWallet to have the theme apply"), QMessageBox::Ok);
|
QMessageBox::information(this, tr("Restart"), tr("Please restart ZecWallet to have the theme apply"), QMessageBox::Ok);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Save sent transactions
|
|
||||||
settings.chkSaveTxs->setChecked(Settings::getInstance()->getSaveZtxs());
|
|
||||||
|
|
||||||
// Custom fees
|
|
||||||
settings.chkCustomFees->setChecked(Settings::getInstance()->getAllowCustomFees());
|
|
||||||
|
|
||||||
// Check for updates
|
// Check for updates
|
||||||
settings.chkCheckUpdates->setChecked(Settings::getInstance()->getCheckForUpdates());
|
settings.chkCheckUpdates->setChecked(Settings::getInstance()->getCheckForUpdates());
|
||||||
|
|
||||||
|
@ -332,13 +321,6 @@ void MainWindow::setupSettingsModal() {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsDialog.exec() == QDialog::Accepted) {
|
if (settingsDialog.exec() == QDialog::Accepted) {
|
||||||
// Custom fees
|
|
||||||
bool customFees = settings.chkCustomFees->isChecked();
|
|
||||||
Settings::getInstance()->setAllowCustomFees(customFees);
|
|
||||||
ui->minerFeeAmt->setReadOnly(!customFees);
|
|
||||||
if (!customFees)
|
|
||||||
ui->minerFeeAmt->setText(Settings::getDecimalString(Settings::getMinerFee()));
|
|
||||||
|
|
||||||
// Check for updates
|
// Check for updates
|
||||||
Settings::getInstance()->setCheckForUpdates(settings.chkCheckUpdates->isChecked());
|
Settings::getInstance()->setCheckForUpdates(settings.chkCheckUpdates->isChecked());
|
||||||
|
|
||||||
|
|
|
@ -59,8 +59,7 @@ void MainWindow::setupSendTab() {
|
||||||
});
|
});
|
||||||
|
|
||||||
// Fee amount changed
|
// Fee amount changed
|
||||||
// Disable custom fees if settings say no
|
ui->minerFeeAmt->setReadOnly(true);
|
||||||
ui->minerFeeAmt->setReadOnly(!Settings::getInstance()->getAllowCustomFees());
|
|
||||||
QObject::connect(ui->minerFeeAmt, &QLineEdit::textChanged, [=](auto txt) {
|
QObject::connect(ui->minerFeeAmt, &QLineEdit::textChanged, [=](auto txt) {
|
||||||
ui->lblMinerFeeUSD->setText(Settings::getUSDFromZecAmount(txt.toDouble()));
|
ui->lblMinerFeeUSD->setText(Settings::getUSDFromZecAmount(txt.toDouble()));
|
||||||
});
|
});
|
||||||
|
@ -472,13 +471,8 @@ void MainWindow::maxAmountChecked(int checked) {
|
||||||
sumAllAmounts += amt->text().toDouble();
|
sumAllAmounts += amt->text().toDouble();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Settings::getInstance()->getAllowCustomFees()) {
|
sumAllAmounts += Settings::getMinerFee();
|
||||||
sumAllAmounts = ui->minerFeeAmt->text().toDouble();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
sumAllAmounts += Settings::getMinerFee();
|
|
||||||
}
|
|
||||||
|
|
||||||
auto addr = ui->inputsCombo->currentText();
|
auto addr = ui->inputsCombo->currentText();
|
||||||
|
|
||||||
auto maxamount = rpc->getModel()->getAllBalances().value(addr) - sumAllAmounts;
|
auto maxamount = rpc->getModel()->getAllBalances().value(addr) - sumAllAmounts;
|
||||||
|
@ -528,11 +522,7 @@ Tx MainWindow::createTxFromSendPage() {
|
||||||
tx.toAddrs.push_back( ToFields{addr, amt, memo} );
|
tx.toAddrs.push_back( ToFields{addr, amt, memo} );
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Settings::getInstance()->getAllowCustomFees()) {
|
tx.fee = Settings::getMinerFee();
|
||||||
tx.fee = ui->minerFeeAmt->text().toDouble();
|
|
||||||
} else {
|
|
||||||
tx.fee = Settings::getMinerFee();
|
|
||||||
}
|
|
||||||
|
|
||||||
return tx;
|
return tx;
|
||||||
}
|
}
|
||||||
|
@ -675,13 +665,6 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
|
||||||
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
confirm.gridLayout->addWidget(minerFeeUSD, row, 2, 1, 1);
|
confirm.gridLayout->addWidget(minerFeeUSD, row, 2, 1, 1);
|
||||||
minerFeeUSD->setText(Settings::getUSDFromZecAmount(tx.fee));
|
minerFeeUSD->setText(Settings::getUSDFromZecAmount(tx.fee));
|
||||||
|
|
||||||
if (Settings::getInstance()->getAllowCustomFees() && tx.fee != Settings::getMinerFee()) {
|
|
||||||
confirm.warningLabel->setVisible(true);
|
|
||||||
} else {
|
|
||||||
// Default fee
|
|
||||||
confirm.warningLabel->setVisible(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Recurring payment info, show only if there is exactly one destination address
|
// Recurring payment info, show only if there is exactly one destination address
|
||||||
|
|
|
@ -131,15 +131,6 @@ void Settings::setAllowFetchPrices(bool allow) {
|
||||||
QSettings().setValue("options/allowfetchprices", allow);
|
QSettings().setValue("options/allowfetchprices", allow);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Settings::getAllowCustomFees() {
|
|
||||||
// Load from the QT Settings.
|
|
||||||
return QSettings().value("options/customfees", false).toBool();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Settings::setAllowCustomFees(bool allow) {
|
|
||||||
QSettings().setValue("options/customfees", allow);
|
|
||||||
}
|
|
||||||
|
|
||||||
QString Settings::get_theme_name() {
|
QString Settings::get_theme_name() {
|
||||||
// Load from the QT Settings.
|
// Load from the QT Settings.
|
||||||
return QSettings().value("options/theme_name", false).toString();
|
return QSettings().value("options/theme_name", false).toString();
|
||||||
|
@ -149,14 +140,6 @@ void Settings::set_theme_name(QString theme_name) {
|
||||||
QSettings().setValue("options/theme_name", theme_name);
|
QSettings().setValue("options/theme_name", theme_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Settings::getSaveZtxs() {
|
|
||||||
// Load from the QT Settings.
|
|
||||||
return QSettings().value("options/savesenttx", true).toBool();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Settings::setSaveZtxs(bool save) {
|
|
||||||
QSettings().setValue("options/savesenttx", save);
|
|
||||||
}
|
|
||||||
|
|
||||||
//=================================
|
//=================================
|
||||||
// Static Stuff
|
// Static Stuff
|
||||||
|
|
|
@ -54,12 +54,6 @@ public:
|
||||||
int getBlockNumber();
|
int getBlockNumber();
|
||||||
void setBlockNumber(int number);
|
void setBlockNumber(int number);
|
||||||
|
|
||||||
bool getSaveZtxs();
|
|
||||||
void setSaveZtxs(bool save);
|
|
||||||
|
|
||||||
bool getAllowCustomFees();
|
|
||||||
void setAllowCustomFees(bool allow);
|
|
||||||
|
|
||||||
bool getAllowFetchPrices();
|
bool getAllowFetchPrices();
|
||||||
void setAllowFetchPrices(bool allow);
|
void setAllowFetchPrices(bool allow);
|
||||||
|
|
||||||
|
|
206
src/settings.ui
206
src/settings.ui
|
@ -145,135 +145,7 @@
|
||||||
<string>Options</string>
|
<string>Options</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<item row="1" column="0" colspan="2">
|
<item row="8" column="1">
|
||||||
<widget class="QLabel" name="label_5">
|
|
||||||
<property name="text">
|
|
||||||
<string>Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab.</string>
|
|
||||||
</property>
|
|
||||||
<property name="wordWrap">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="chkSaveTxs">
|
|
||||||
<property name="text">
|
|
||||||
<string>Remember shielded transactions</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="0">
|
|
||||||
<widget class="QCheckBox" name="chkCustomFees">
|
|
||||||
<property name="text">
|
|
||||||
<string>Allow custom fees</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="0" colspan="2">
|
|
||||||
<widget class="QLabel" name="label_8">
|
|
||||||
<property name="text">
|
|
||||||
<string>Connect to github on startup to check for updates</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="9" column="0" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="chkFetchPrices">
|
|
||||||
<property name="text">
|
|
||||||
<string>Fetch ZEC / USD prices</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="10" column="0" colspan="2">
|
|
||||||
<widget class="QLabel" name="label_10">
|
|
||||||
<property name="text">
|
|
||||||
<string>Connect to the internet to fetch ZEC prices</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="0" colspan="2">
|
|
||||||
<widget class="QLabel" name="lblTor">
|
|
||||||
<property name="text">
|
|
||||||
<string>Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally.</string>
|
|
||||||
</property>
|
|
||||||
<property name="wordWrap">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="13" column="0">
|
|
||||||
<widget class="QLabel" name="label_20">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Theme</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QPushButton" name="btnClearSaved">
|
|
||||||
<property name="text">
|
|
||||||
<string>Clear History</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="15" column="0" colspan="2">
|
|
||||||
<spacer name="verticalSpacer_2">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>20</width>
|
|
||||||
<height>40</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0" colspan="2">
|
|
||||||
<widget class="QLabel" name="label_6">
|
|
||||||
<property name="text">
|
|
||||||
<string>Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. </string>
|
|
||||||
</property>
|
|
||||||
<property name="wordWrap">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="0" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="chkCheckUpdates">
|
|
||||||
<property name="text">
|
|
||||||
<string>Check github for updates at startup</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0">
|
|
||||||
<widget class="QCheckBox" name="chkTor">
|
|
||||||
<property name="text">
|
|
||||||
<string>Connect via Tor</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<spacer name="horizontalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="13" column="1">
|
|
||||||
<widget class="QComboBox" name="comboBoxTheme">
|
<widget class="QComboBox" name="comboBoxTheme">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
|
||||||
|
@ -303,7 +175,64 @@
|
||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="14" column="0" colspan="2">
|
<item row="3" column="0" colspan="2">
|
||||||
|
<widget class="QLabel" name="label_8">
|
||||||
|
<property name="text">
|
||||||
|
<string>Connect to github on startup to check for updates</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="10" column="0" colspan="2">
|
||||||
|
<spacer name="verticalSpacer_2">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>20</width>
|
||||||
|
<height>40</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="0" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="chkFetchPrices">
|
||||||
|
<property name="text">
|
||||||
|
<string>Fetch ZEC / USD prices</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QCheckBox" name="chkTor">
|
||||||
|
<property name="text">
|
||||||
|
<string>Connect via Tor</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="8" column="0">
|
||||||
|
<widget class="QLabel" name="label_20">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Theme</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="chkCheckUpdates">
|
||||||
|
<property name="text">
|
||||||
|
<string>Check github for updates at startup</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="9" column="0" colspan="2">
|
||||||
<widget class="Line" name="line_2">
|
<widget class="Line" name="line_2">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
||||||
|
@ -316,6 +245,23 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="5" column="0" colspan="2">
|
||||||
|
<widget class="QLabel" name="label_10">
|
||||||
|
<property name="text">
|
||||||
|
<string>Connect to the internet to fetch ZEC prices</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0" colspan="2">
|
||||||
|
<widget class="QLabel" name="lblTor">
|
||||||
|
<property name="text">
|
||||||
|
<string>Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally.</string>
|
||||||
|
</property>
|
||||||
|
<property name="wordWrap">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="tab_3">
|
<widget class="QWidget" name="tab_3">
|
||||||
|
|
Loading…
Reference in New Issue