projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #984 without breaking topic input
[quassel.git]
/
src
/
qtui
/
inputwidget.h
diff --git
a/src/qtui/inputwidget.h
b/src/qtui/inputwidget.h
index
bc8edf5
..
38981fd
100644
(file)
--- a/
src/qtui/inputwidget.h
+++ b/
src/qtui/inputwidget.h
@@
-55,12
+55,14
@@
private slots:
void setCustomFont(const QVariant &font);
void setUseCustomFont(const QVariant &);
void setEnableSpellCheck(const QVariant &);
void setCustomFont(const QVariant &font);
void setUseCustomFont(const QVariant &);
void setEnableSpellCheck(const QVariant &);
+ void setEnableEmacsMode(const QVariant &);
void setShowNickSelector(const QVariant &);
void setShowStyleButtons(const QVariant &);
void setShowNickSelector(const QVariant &);
void setShowStyleButtons(const QVariant &);
+ void setEnablePerChatHistory(const QVariant &);
void setMaxLines(const QVariant &);
void setMultiLineEnabled(const QVariant &);
void setScrollBarsEnabled(const QVariant &);
void setMaxLines(const QVariant &);
void setMultiLineEnabled(const QVariant &);
void setScrollBarsEnabled(const QVariant &);
- void on
_inputEdit_textEntered(const QString &text) const
;
+ void on
TextEntered(const QString &text)
;
void changeNick(const QString &newNick) const;
void setNetwork(NetworkId networkId);
void changeNick(const QString &newNick) const;
void setNetwork(NetworkId networkId);
@@
-91,6
+93,17
@@
private:
QIcon createColorToolButtonIcon(const QIcon &icon, const QColor &color);
QTextCharFormat getFormatOfWordOrSelection();
void setFormatOnSelection(const QTextCharFormat &format);
QIcon createColorToolButtonIcon(const QIcon &icon, const QColor &color);
QTextCharFormat getFormatOfWordOrSelection();
void setFormatOnSelection(const QTextCharFormat &format);
+
+ bool _perChatHistory;
+ struct HistoryState {
+ QStringList history;
+ QHash<int, QString> tempHistory;
+ qint32 idx;
+ QString inputLine;
+ inline HistoryState() : idx(0) {};
+ };
+
+ QMap<BufferId, HistoryState> historyMap;
};
};