mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gui: Remove un-actionable TODO

Browse Source
This commit is contained in:
MarcoFalke committed 2020-05-17 10:52:31 -04:00
1 parent dc5333d31f
commit 4444dbf4d5
3 files changed
+4 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/qt/bitcoingui.cpp
+2 -2
View File
@@ -1246,7 +1246,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b>")); labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b>"));
encryptWalletAction->setChecked(true); encryptWalletAction->setChecked(true);
changePassphraseAction->setEnabled(true); changePassphraseAction->setEnabled(true);
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported encryptWalletAction->setEnabled(false);
break; break;
case WalletModel::Locked: case WalletModel::Locked:
labelWalletEncryptionIcon->show(); labelWalletEncryptionIcon->show();
@@ -1254,7 +1254,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>locked</b>")); labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>locked</b>"));
encryptWalletAction->setChecked(true); encryptWalletAction->setChecked(true);
changePassphraseAction->setEnabled(true); changePassphraseAction->setEnabled(true);
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported encryptWalletAction->setEnabled(false);
break; break;
} }
} }
src/qt/rpcconsole.cpp
+1 -4
View File
@@ -31,17 +31,14 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <QScrollBar>
#include <QScreen> #include <QScreen>
#include <QScrollBar>
#include <QSettings> #include <QSettings>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QTime> #include <QTime>
#include <QTimer> #include <QTimer>
// 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 int CONSOLE_HISTORY = 50;
const int INITIAL_TRAFFIC_GRAPH_MINS = 30; const int INITIAL_TRAFFIC_GRAPH_MINS = 30;
src/qt/walletmodel.cpp
+1 -7
View File
@@ -304,17 +304,11 @@ WalletModel::EncryptionStatus WalletModel::getEncryptionStatus() const
bool WalletModel::setWalletEncrypted(bool encrypted, const SecureString &passphrase) bool WalletModel::setWalletEncrypted(bool encrypted, const SecureString &passphrase)
{ {
if(encrypted) if (encrypted) {
{
// Encrypt
return m_wallet->encryptWallet(passphrase); return m_wallet->encryptWallet(passphrase);
} }
else
{
// Decrypt -- TODO; not supported yet
return false; return false;
} }
}
bool WalletModel::setWalletLocked(bool locked, const SecureString &passPhrase) bool WalletModel::setWalletLocked(bool locked, const SecureString &passPhrase)
{ {