File tree Expand file tree Collapse file tree 3 files changed +5
-14
lines changed Expand file tree Collapse file tree 3 files changed +5
-14
lines changed Original file line number Diff line number Diff line change @@ -1246,15 +1246,15 @@ void BitcoinGUI::setEncryptionStatus(int status)
1246
1246
labelWalletEncryptionIcon->setToolTip (tr (" Wallet is <b>encrypted</b> and currently <b>unlocked</b>" ));
1247
1247
encryptWalletAction->setChecked (true );
1248
1248
changePassphraseAction->setEnabled (true );
1249
- encryptWalletAction->setEnabled (false ); // TODO: decrypt currently not supported
1249
+ encryptWalletAction->setEnabled (false );
1250
1250
break ;
1251
1251
case WalletModel::Locked:
1252
1252
labelWalletEncryptionIcon->show ();
1253
1253
labelWalletEncryptionIcon->setPixmap (platformStyle->SingleColorIcon (" :/icons/lock_closed" ).pixmap (STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
1254
1254
labelWalletEncryptionIcon->setToolTip (tr (" Wallet is <b>encrypted</b> and currently <b>locked</b>" ));
1255
1255
encryptWalletAction->setChecked (true );
1256
1256
changePassphraseAction->setEnabled (true );
1257
- encryptWalletAction->setEnabled (false ); // TODO: decrypt currently not supported
1257
+ encryptWalletAction->setEnabled (false );
1258
1258
break ;
1259
1259
}
1260
1260
}
Original file line number Diff line number Diff line change 31
31
#include < QKeyEvent>
32
32
#include < QMenu>
33
33
#include < QMessageBox>
34
- #include < QScrollBar>
35
34
#include < QScreen>
35
+ #include < QScrollBar>
36
36
#include < QSettings>
37
37
#include < QString>
38
38
#include < QStringList>
39
39
#include < QTime>
40
40
#include < QTimer>
41
41
42
- // TODO: add a scrollback limit, as there is currently none
43
- // TODO: make it possible to filter out categories (esp debug messages when implemented)
44
- // TODO: receive errors and debug messages through ClientModel
45
42
46
43
const int CONSOLE_HISTORY = 50 ;
47
44
const int INITIAL_TRAFFIC_GRAPH_MINS = 30 ;
Original file line number Diff line number Diff line change @@ -304,16 +304,10 @@ WalletModel::EncryptionStatus WalletModel::getEncryptionStatus() const
304
304
305
305
bool WalletModel::setWalletEncrypted (bool encrypted, const SecureString &passphrase)
306
306
{
307
- if (encrypted)
308
- {
309
- // Encrypt
307
+ if (encrypted) {
310
308
return m_wallet->encryptWallet (passphrase);
311
309
}
312
- else
313
- {
314
- // Decrypt -- TODO; not supported yet
315
- return false ;
316
- }
310
+ return false ;
317
311
}
318
312
319
313
bool WalletModel::setWalletLocked (bool locked, const SecureString &passPhrase)
You can’t perform that action at this time.
0 commit comments