mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
Merge #18997: gui: Remove un-actionable TODO
4444dbf4d5047dd1c92973f7167a74a0779e61a3 gui: Remove un-actionable TODO (MarcoFalke) Pull request description: With encryption turned on by default for all wallets in consideration (#18889), I believe that wallet decryption will not be implemented ever or at least any time soon. So remove that TODO comment for now. If deemed important, a brainstorming issue can be opened instead. Also remove some TODOs in the RPC console, which I don't understand. Maybe the gui was meant to show the debug log interactively? In any case, if deemed important, this should be filed as a brainstorming feature request, so that trade-offs of different solutions can be discussed. ACKs for top commit: laanwj: Thanks. ACK 4444dbf4d5047dd1c92973f7167a74a0779e61a3 achow101: ACK 4444dbf4d5047dd1c92973f7167a74a0779e61a3 Tree-SHA512: f7ddb37a14178f575da5409ea1c34e34bde37d79b2b56eaaf606a069e2b91c9d7b734529f5c68664b2fa5aa831117c8d19cce823743671cd6c31b81d68b8c70c
This commit is contained in:
parent
bbcb2d3998
commit
01adc81ebf
@ -1814,7 +1814,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
|
||||
changePassphraseAction->setEnabled(true);
|
||||
unlockWalletAction->setVisible(false);
|
||||
lockWalletAction->setVisible(true);
|
||||
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
|
||||
encryptWalletAction->setEnabled(false);
|
||||
break;
|
||||
case WalletModel::UnlockedForMixingOnly:
|
||||
labelWalletEncryptionIcon->show();
|
||||
@ -1823,7 +1823,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
|
||||
changePassphraseAction->setEnabled(true);
|
||||
unlockWalletAction->setVisible(true);
|
||||
lockWalletAction->setVisible(true);
|
||||
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
|
||||
encryptWalletAction->setEnabled(false);
|
||||
break;
|
||||
case WalletModel::Locked:
|
||||
labelWalletEncryptionIcon->show();
|
||||
@ -1832,7 +1832,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
|
||||
changePassphraseAction->setEnabled(true);
|
||||
unlockWalletAction->setVisible(true);
|
||||
lockWalletAction->setVisible(false);
|
||||
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
|
||||
encryptWalletAction->setEnabled(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -40,17 +40,14 @@
|
||||
#include <QKeyEvent>
|
||||
#include <QMenu>
|
||||
#include <QMessageBox>
|
||||
#include <QScrollBar>
|
||||
#include <QScreen>
|
||||
#include <QScrollBar>
|
||||
#include <QSettings>
|
||||
#include <QTime>
|
||||
#include <QTimer>
|
||||
#include <QStringList>
|
||||
#include <QStyledItemDelegate>
|
||||
|
||||
// TODO: add a scrollback limit, as there is currently none
|
||||
// TODO: make it possible to filter out categories (esp debug messages when implemented)
|
||||
// TODO: receive errors and debug messages through ClientModel
|
||||
|
||||
const int CONSOLE_HISTORY = 50;
|
||||
const QSize FONT_RANGE(4, 40);
|
||||
|
@ -363,16 +363,10 @@ WalletModel::EncryptionStatus WalletModel::getEncryptionStatus() const
|
||||
|
||||
bool WalletModel::setWalletEncrypted(bool encrypted, const SecureString &passphrase)
|
||||
{
|
||||
if(encrypted)
|
||||
{
|
||||
// Encrypt
|
||||
if (encrypted) {
|
||||
return m_wallet->encryptWallet(passphrase);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Decrypt -- TODO; not supported yet
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool WalletModel::setWalletLocked(bool locked, const SecureString &passPhrase, bool fMixing)
|
||||
|
Loading…
Reference in New Issue
Block a user