X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.h;h=b5770355b308f96559ba26d02342d5ec86c26b8b;hp=da014c38974a7b2de1a9cc08de4ef96e9c0057e5;hb=ff39958dd98644e73b7b77bdd986944134f78d09;hpb=27921f7bb1ae86aabc13a5a279624a2d61cc3f2a

diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h
index da014c38..b5770355 100644
--- a/src/qtui/inputwidget.h
+++ b/src/qtui/inputwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -55,12 +55,14 @@ private slots:
   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 setEnablePerChatHistory(const QVariant &);
   void setMaxLines(const QVariant &);
   void setMultiLineEnabled(const QVariant &);
   void setScrollBarsEnabled(const QVariant &);
-
-  void on_inputEdit_textEntered(const QString &text) const;
+  void on_inputEdit_textEntered(const QString &text);
   void changeNick(const QString &newNick) const;
 
   void setNetwork(NetworkId networkId);
@@ -73,11 +75,11 @@ private slots:
 
   void currentCharFormatChanged(const QTextCharFormat &format);
   void on_showStyleButton_toggled(bool checked);
-  void on_boldButton_toggled(bool checked);
-  void on_italicButton_toggled(bool checked);
-  void on_underlineButton_toggled(bool checked);
-  void colorChoosen(QAction * action);
-  void colorHighlightChoosen(QAction * action);
+  void on_boldButton_clicked(bool checked);
+  void on_italicButton_clicked(bool checked);
+  void on_underlineButton_clicked(bool checked);
+  void colorChosen(QAction *action);
+  void colorHighlightChosen(QAction *action);
 
 private:
   Ui::InputWidget ui;
@@ -86,13 +88,22 @@ private:
   IdentityId _identityId;
   QMenu *_colorMenu, *_colorFillMenu;
 
-  void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
+  void mergeFormatOnSelection(const QTextCharFormat &format);
   void fontChanged(const QFont &f);
-  void colorChanged(const QColor &fg);
-  void colorHighlightChanged(const QColor &bg);
-  QIcon createColorToolButtonIcon(const QIcon &icon, QColor color);
+  QIcon createColorToolButtonIcon(const QIcon &icon, const QColor &color);
   QTextCharFormat getFormatOfWordOrSelection();
-  void setFormatOnWordOrSelection(const QTextCharFormat &format);
+  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;
 };