diff --git a/src/qt/forms/privacydialog.ui b/src/qt/forms/privacydialog.ui index a1c67bce7a411..e646afbed69b4 100644 --- a/src/qt/forms/privacydialog.ui +++ b/src/qt/forms/privacydialog.ui @@ -343,78 +343,31 @@ - - - - 131 - 0 - - - - Enter an amount of Piv to convert to zPIV - - - Mint Zerocoin + + + Qt::Horizontal - - - - - + - 60 - 0 + 40 + 20 - - 0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - zPIV - - - - - - - Available for minting are coins which are confirmed and not locked or Masternode collaterals. - - - Available for Minting: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + - - - - 75 - true - - - - Enter an amount of Piv to convert to zPIV + + + color: red; +font-weight: bold; - 0.000 000 00 PIV - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + zPIV minting is DISABLED - + Qt::Horizontal @@ -427,7 +380,7 @@ - + 80 @@ -435,177 +388,15 @@ - Reset Zerocoin Wallet DB. Deletes transactions that did not make it into the blockchain. - - - Reset - - - - - - - - - - - - 131 - 27 - - - - - 131 - 16777215 - - - - + Rescan the complete blockchain for Zerocoin mints and their meta-data. - Coin Control... - - - false + ReScan - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - 75 - true - - - - Quantity: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 0 - - - - - - - true - - - - 75 - true - - - - Amount: - - - 0 - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0 - - - 0 - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - true - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0.00 PIV - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + 80 @@ -613,28 +404,15 @@ - Rescan the complete blockchain for Zerocoin mints and their meta-data. + Reset Zerocoin Wallet DB. Deletes transactions that did not make it into the blockchain. - ReScan + Reset - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -693,6 +471,47 @@ + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + color: red; +font-weight: bold; + + + zPIV spending is NOT private (links back to the mint transaction) + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + diff --git a/src/qt/privacydialog.cpp b/src/qt/privacydialog.cpp index 63904fa391691..d6c0d0e13818d 100644 --- a/src/qt/privacydialog.cpp +++ b/src/qt/privacydialog.cpp @@ -36,11 +36,11 @@ PrivacyDialog::PrivacyDialog(QWidget* parent) : QDialog(parent, Qt::WindowSystem // "Spending 999999 zPIV ought to be enough for anybody." - Bill Gates, 2017 ui->zPIVpayAmount->setValidator( new QDoubleValidator(0.0, 21000000.0, 20, this) ); - ui->labelMintAmountValue->setValidator( new QIntValidator(0, 999999, this) ); + //ui->labelMintAmountValue->setValidator( new QIntValidator(0, 999999, this) ); // disable MINT // Default texts for (mini-) coincontrol - ui->labelCoinControlQuantity->setText (tr("Coins automatically selected")); - ui->labelCoinControlAmount->setText (tr("Coins automatically selected")); + //ui->labelCoinControlQuantity->setText (tr("Coins automatically selected")); // disable MINT + //ui->labelCoinControlAmount->setText (tr("Coins automatically selected")); // disable MINT ui->labelzPIVSyncStatus->setText("(" + tr("out of sync") + ")"); // Sunken frame for minting messages @@ -50,6 +50,7 @@ PrivacyDialog::PrivacyDialog(QWidget* parent) : QDialog(parent, Qt::WindowSystem ui->TEMintStatus->setPlainText(tr("Mint Status: Okay")); // Coin Control signals + /* [disable MINT and coinControl] connect(ui->pushButtonCoinControl, SIGNAL(clicked()), this, SLOT(coinControlButtonClicked())); // Coin Control: clipboard actions @@ -59,6 +60,7 @@ PrivacyDialog::PrivacyDialog(QWidget* parent) : QDialog(parent, Qt::WindowSystem connect(clipboardAmountAction, SIGNAL(triggered()), this, SLOT(coinControlClipboardAmount())); ui->labelCoinControlQuantity->addAction(clipboardQuantityAction); ui->labelCoinControlAmount->addAction(clipboardAmountAction); + */ // Denomination labels ui->labelzDenom1Text->setText(tr("Denom. with value 1:")); @@ -155,7 +157,8 @@ void PrivacyDialog::on_addressBookButton_clicked() ui->zPIVpayAmount->setFocus(); } } - +/* disable MINT + * void PrivacyDialog::on_pushButtonMintzPIV_clicked() { if (!walletModel || !walletModel->getOptionsModel()) @@ -236,7 +239,7 @@ void PrivacyDialog::on_pushButtonMintzPIV_clicked() return; } - +*/ void PrivacyDialog::on_pushButtonMintReset_clicked() { ui->TEMintStatus->setPlainText(tr("Starting ResetMintZerocoin: rescanning complete blockchain, this will need up to 30 minutes depending on your hardware.\nPlease be patient...")); @@ -522,6 +525,8 @@ void PrivacyDialog::on_payTo_textChanged(const QString& address) updateLabel(address); } +/* DISABLE MINTs: no need for coinCointrol + // Coin Control: copy label "Quantity" to clipboard void PrivacyDialog::coinControlClipboardQuantity() { @@ -563,7 +568,7 @@ void PrivacyDialog::coinControlUpdateLabels() ui->labelCoinControlAmount->setText (tr("Coins automatically selected")); } } - +*/ void PrivacyDialog::on_pushButtonShowDenoms_clicked() { @@ -709,7 +714,6 @@ void PrivacyDialog::setBalance(const CAmount& balance, const CAmount& unconfirme ui->labelzAvailableAmount->setText(QString::number(zerocoinBalance/COIN) + QString(" zPIV ")); ui->labelzAvailableAmount_2->setText(QString::number(matureZerocoinBalance/COIN) + QString(" zPIV ")); ui->labelzAvailableAmount_4->setText(QString::number(zerocoinBalance/COIN) + QString(" zPIV ")); - ui->labelzPIVAmountValue->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, balance - immatureBalance - nLockedBalance, false, BitcoinUnits::separatorAlways)); // Display AutoMint status updateAutomintStatus(); @@ -801,20 +805,21 @@ void PrivacyDialog::updateAutomintStatus() void PrivacyDialog::updateSPORK16Status() { // Update/enable labels, buttons and tooltips depending on the current SPORK_16 status - bool fButtonsEnabled = ui->pushButtonMintzPIV->isEnabled(); + //bool fButtonsEnabled = ui->pushButtonMintzPIV->isEnabled(); + bool fButtonsEnabled = false; bool fMaintenanceMode = GetAdjustedTime() > GetSporkValue(SPORK_16_ZEROCOIN_MAINTENANCE_MODE); if (fMaintenanceMode && fButtonsEnabled) { // Mint zPIV - ui->pushButtonMintzPIV->setEnabled(false); - ui->pushButtonMintzPIV->setToolTip(tr("zPIV is currently disabled due to maintenance.")); + //ui->pushButtonMintzPIV->setEnabled(false); + //ui->pushButtonMintzPIV->setToolTip(tr("zPIV is currently disabled due to maintenance.")); // Spend zPIV ui->pushButtonSpendzPIV->setEnabled(false); ui->pushButtonSpendzPIV->setToolTip(tr("zPIV is currently disabled due to maintenance.")); } else if (!fMaintenanceMode && !fButtonsEnabled) { // Mint zPIV - ui->pushButtonMintzPIV->setEnabled(true); - ui->pushButtonMintzPIV->setToolTip(tr("PrivacyDialog", "Enter an amount of PIV to convert to zPIV", 0)); + //ui->pushButtonMintzPIV->setEnabled(true); + //ui->pushButtonMintzPIV->setToolTip(tr("PrivacyDialog", "Enter an amount of PIV to convert to zPIV", 0)); // Spend zPIV ui->pushButtonSpendzPIV->setEnabled(true); diff --git a/src/qt/privacydialog.h b/src/qt/privacydialog.h index acca75b279ad8..976a3cf5eb316 100644 --- a/src/qt/privacydialog.h +++ b/src/qt/privacydialog.h @@ -82,13 +82,13 @@ private slots: void on_payTo_textChanged(const QString& address); void on_addressBookButton_clicked(); // void coinControlFeatureChanged(bool); - void coinControlButtonClicked(); +// MINT disabled void coinControlButtonClicked(); // void coinControlChangeChecked(int); // void coinControlChangeEdited(const QString&); - void coinControlUpdateLabels(); +// MINT disabled void coinControlUpdateLabels(); - void coinControlClipboardQuantity(); - void coinControlClipboardAmount(); +// MINT disabled void coinControlClipboardQuantity(); +// MINT disabled void coinControlClipboardAmount(); // void coinControlClipboardFee(); // void coinControlClipboardAfterFee(); // void coinControlClipboardBytes(); @@ -96,7 +96,7 @@ private slots: // void coinControlClipboardLowOutput(); // void coinControlClipboardChange(); - void on_pushButtonMintzPIV_clicked(); +// MINT disabled void on_pushButtonMintzPIV_clicked(); void on_pushButtonMintReset_clicked(); void on_pushButtonSpentReset_clicked(); void on_pushButtonSpendzPIV_clicked();