Qt/RPCConsole: Save current command entry when browsing history

Shell-like, but doesn't store changed history commands until executing it.
This commit is contained in:
Jonas Schnelli 2015-03-13 21:51:27 +01:00 committed by Luke Dashjr
parent dce853ef76
commit fc95daa97f
2 changed files with 11 additions and 0 deletions

View file

@ -751,6 +751,8 @@ void RPCConsole::on_lineEdit_returnPressed()
if(!cmd.isEmpty()) if(!cmd.isEmpty())
{ {
cmdBeforeBrowsing = QString();
message(CMD_REQUEST, cmd); message(CMD_REQUEST, cmd);
Q_EMIT cmdRequest(cmd); Q_EMIT cmdRequest(cmd);
// Remove command, if already in history // Remove command, if already in history
@ -769,6 +771,11 @@ void RPCConsole::on_lineEdit_returnPressed()
void RPCConsole::browseHistory(int offset) void RPCConsole::browseHistory(int offset)
{ {
// store current text when start browsing through the history
if (historyPtr == history.size()) {
cmdBeforeBrowsing = ui->lineEdit->text();
}
historyPtr += offset; historyPtr += offset;
if(historyPtr < 0) if(historyPtr < 0)
historyPtr = 0; historyPtr = 0;
@ -777,6 +784,9 @@ void RPCConsole::browseHistory(int offset)
QString cmd; QString cmd;
if(historyPtr < history.size()) if(historyPtr < history.size())
cmd = history.at(historyPtr); cmd = history.at(historyPtr);
else if (!cmdBeforeBrowsing.isNull()) {
cmd = cmdBeforeBrowsing;
}
ui->lineEdit->setText(cmd); ui->lineEdit->setText(cmd);
} }

View file

@ -140,6 +140,7 @@ private:
ClientModel *clientModel; ClientModel *clientModel;
QStringList history; QStringList history;
int historyPtr; int historyPtr;
QString cmdBeforeBrowsing;
QList<NodeId> cachedNodeids; QList<NodeId> cachedNodeids;
const PlatformStyle *platformStyle; const PlatformStyle *platformStyle;
RPCTimerInterface *rpcTimerInterface; RPCTimerInterface *rpcTimerInterface;