summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d2268cc)
- The InputLine isn't cleared as often (KeyUp/Down)
- Changed InputLine history entries are preserved until a line is sent
- As soon as a new line is sent, changed history entries are restored, the sent line gets appended to the history
- KeyDown on the last line also appends lines to the history
case Qt::Key_Up:
event->accept();
case Qt::Key_Up:
event->accept();
- if(addToHistory(text())) {
- clear();
- break;
- }
+ addToHistory(text(), true);
case Qt::Key_Down:
event->accept();
case Qt::Key_Down:
event->accept();
- if(addToHistory(text())) {
- clear();
- break;
- }
+ addToHistory(text(), true);
- if(idx < history.count())
+ if(idx < history.count()) {
-
- if(idx < history.count())
- setText(history[idx]);
- else
- clear();
+ if(idx < history.count() || tempHistory.contains(idx)) // tempHistory might have an entry for idx == history.count() + 1
+ showHistoryEntry();
+ else
+ resetLine(); // equals clear() in this case
+ } else {
+ addToHistory(text());
+ resetLine();
+ }
-bool InputLine::addToHistory(const QString &text) {
+bool InputLine::addToHistory(const QString &text, bool temporary) {
if(text.isEmpty())
return false;
Q_ASSERT(0 <= idx && idx <= history.count());
if(history.isEmpty() || text != history[idx - (int)(idx == history.count())]) {
if(text.isEmpty())
return false;
Q_ASSERT(0 <= idx && idx <= history.count());
if(history.isEmpty() || text != history[idx - (int)(idx == history.count())]) {
- // if we change an entry of the history the changed entry is appended to the list and we seek to the end
- // we could also easily change the entry in the history... per setting maybe?
- history << text;
- idx = history.count();
+ // if an entry of the history is changed, we remember it and show it again at this
+ // position until a line was actually sent
+ // sent lines get appended to the history
+ if(temporary) {
+ tempHistory[idx] = text;
+ } else {
+ history << text;
+ tempHistory.clear();
+ }
return true;
} else {
return false;
return true;
} else {
return false;
void InputLine::on_returnPressed() {
addToHistory(text());
emit sendText(text());
void InputLine::on_returnPressed() {
addToHistory(text());
emit sendText(text());
}
void InputLine::on_textChanged(QString newText) {
}
void InputLine::on_textChanged(QString newText) {
emit returnPressed();
insert(remainder);
}
emit returnPressed();
insert(remainder);
}
+void InputLine::resetLine() {
+ // every time the InputLine is cleared we also reset history index
+ idx = history.count();
+ clear();
+}
+
+void InputLine::showHistoryEntry() {
+ // if the user changed the history, display the changed line
+ tempHistory.contains(idx) ? setText(tempHistory[idx]) : setText(history[idx]);
+}
void on_returnPressed();
void on_textChanged(QString newText);
void on_returnPressed();
void on_textChanged(QString newText);
- bool addToHistory(const QString &text);
+ bool addToHistory(const QString &text, bool temporary = false);
signals:
void sendText(QString text);
private:
QStringList history;
signals:
void sendText(QString text);
private:
QStringList history;
+ QHash<int, QString> tempHistory;
qint32 idx;
TabCompleter *tabCompleter;
int bindModifier;
int jumpModifier;
qint32 idx;
TabCompleter *tabCompleter;
int bindModifier;
int jumpModifier;
+
+ void resetLine();
+ void showHistoryEntry();