GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 7418169364 into merged_master (Bitcoin PR #18997)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:47 +00:00
commit 0cd860d74e
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/qt/bitcoingui.cpp
View file

@ -1224,7 +1224,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b>"));
encryptWalletAction->setChecked(true);
changePassphraseAction->setEnabled(true);
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
encryptWalletAction->setEnabled(false);
break;
case WalletModel::Locked:
labelWalletEncryptionIcon->show();
@ -1232,7 +1232,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>locked</b>"));
encryptWalletAction->setChecked(true);
changePassphraseAction->setEnabled(true);
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
encryptWalletAction->setEnabled(false);
break;
}
}

5
src/qt/rpcconsole.cpp
View file

@ -31,17 +31,14 @@
#include <QKeyEvent>
#include <QMenu>
#include <QMessageBox>
#include <QScrollBar>
#include <QScreen>
#include <QScrollBar>
#include <QSettings>
#include <QString>
#include <QStringList>
#include <QTime>
#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 INITIAL_TRAFFIC_GRAPH_MINS = 30;

10
src/qt/walletmodel.cpp
View file

@ -352,16 +352,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)