Merge pull request #3892

b8edf6c Qt: Fix ESC in disablewallet mode (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2014-03-21 09:24:14 +01:00
commit 162c33d246
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 8 additions and 0 deletions

View file

@ -331,6 +331,13 @@ void RPCConsole::clear()
tr("Type <b>help</b> for an overview of available commands.")), true);
}
void RPCConsole::reject()
{
// Ignore escape keypress if this is not a seperate window
if(windowType() != Qt::Widget)
QDialog::reject();
}
void RPCConsole::message(int category, const QString &message, bool html)
{
QTime time = QTime::currentTime();

View file

@ -47,6 +47,7 @@ private slots:
public slots:
void clear();
void reject();
void message(int category, const QString &message, bool html = false);
/** Set number of connections shown in the UI */
void setNumConnections(int count);