X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=f490a670e4bb4e95a65c09eb39d5fabe929e6d43;hp=9fab60cbeaea599ea8307944fb73b58c0994d31c;hb=ff39958dd98644e73b7b77bdd986944134f78d09;hpb=580662426b8b734566b37de61deccf5b89970c6e

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 9fab60cb..f490a670 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -33,6 +33,8 @@
 #include "tabcompleter.h"
 #include <QPainter>
 
+const int leftMargin = 3;
+
 InputWidget::InputWidget(QWidget *parent)
   : AbstractItemView(parent),
     _networkId(0)
@@ -104,9 +106,18 @@ InputWidget::InputWidget(QWidget *parent)
   setEnableSpellCheck(s.value("EnableSpellCheck", false));
 #endif
 
+  s.notify("EnableEmacsMode", this, SLOT(setEnableEmacsMode(QVariant)));
+  setEnableEmacsMode(s.value("EnableEmacsMode", false));
+
   s.notify("ShowNickSelector", this, SLOT(setShowNickSelector(QVariant)));
   setShowNickSelector(s.value("ShowNickSelector", true));
 
+  s.notify("ShowStyleButtons", this, SLOT(setShowStyleButtons(QVariant)));
+  setShowStyleButtons(s.value("ShowStyleButtons", true));
+
+  s.notify("EnablePerChatHistory", this, SLOT(setEnablePerChatHistory(QVariant)));
+  setEnablePerChatHistory(s.value("EnablePerChatHistory", false));
+
   s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant)));
   setMaxLines(s.value("MaxNumLines", 5));
 
@@ -121,7 +132,7 @@ InputWidget::InputWidget(QWidget *parent)
   Action *activateInputline = coll->add<Action>("FocusInputLine");
   connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus()));
   activateInputline->setText(tr("Focus Input Line"));
-  activateInputline->setShortcut(tr("Ctrl+L"));
+  activateInputline->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
 
   connect(inputLine(), SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(currentCharFormatChanged(QTextCharFormat)));
 }
@@ -141,6 +152,11 @@ void InputWidget::setCustomFont(const QVariant &v) {
   QFont font = v.value<QFont>();
   if(font.family().isEmpty())
     font = QApplication::font();
+  // we don't want font styles as this conflics with mirc code richtext editing
+  font.setBold(false);
+  font.setItalic(false);
+  font.setUnderline(false);
+  font.setStrikeOut(false);
   ui.inputEdit->setCustomFont(font);
 }
 
@@ -148,10 +164,22 @@ void InputWidget::setEnableSpellCheck(const QVariant &v) {
   ui.inputEdit->setSpellCheckEnabled(v.toBool());
 }
 
+void InputWidget::setEnableEmacsMode(const QVariant &v) {
+  ui.inputEdit->setEmacsMode(v.toBool());
+}
+
 void InputWidget::setShowNickSelector(const QVariant &v) {
   ui.ownNick->setVisible(v.toBool());
 }
 
+void InputWidget::setShowStyleButtons(const QVariant &v) {
+  ui.showStyleButton->setVisible(v.toBool());
+}
+
+void InputWidget::setEnablePerChatHistory(const QVariant &v) {
+  _perChatHistory = v.toBool();
+}
+
 void InputWidget::setMaxLines(const QVariant &v) {
   ui.inputEdit->setMaxHeight(v.toInt());
 }
@@ -196,7 +224,29 @@ bool InputWidget::eventFilter(QObject *watched, QEvent *event) {
 }
 
 void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
-  Q_UNUSED(previous)
+  BufferId currentBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
+  BufferId previousBufferId = previous.data(NetworkModel::BufferIdRole).value<BufferId>();
+
+  if (_perChatHistory) {
+    //backup
+    historyMap[previousBufferId].history = inputLine()->history();
+    historyMap[previousBufferId].tempHistory = inputLine()->tempHistory();
+    historyMap[previousBufferId].idx = inputLine()->idx();
+    historyMap[previousBufferId].inputLine = inputLine()->html();
+
+    //restore
+    inputLine()->setHistory(historyMap[currentBufferId].history);
+    inputLine()->setTempHistory(historyMap[currentBufferId].tempHistory);
+    inputLine()->setIdx(historyMap[currentBufferId].idx);
+    inputLine()->setHtml(historyMap[currentBufferId].inputLine);
+    inputLine()->moveCursor(QTextCursor::End,QTextCursor::MoveAnchor);
+
+    // FIXME this really should be in MultiLineEdit (and the const int on top removed)
+    QTextBlockFormat format = inputLine()->textCursor().blockFormat();
+    format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents
+    inputLine()->textCursor().setBlockFormat(format);
+  }
+
   NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   if(networkId == _networkId)
     return;
@@ -358,7 +408,7 @@ void InputWidget::changeNick(const QString &newNick) const {
   Client::userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/NICK %1").arg(newNick));
 }
 
-void InputWidget::on_inputEdit_textEntered(const QString &text) const {
+void InputWidget::on_inputEdit_textEntered(const QString &text) {
   Client::userInput(currentBufferInfo(), text);
   ui.boldButton->setChecked(false);
   ui.underlineButton->setChecked(false);
@@ -371,20 +421,22 @@ void InputWidget::on_inputEdit_textEntered(const QString &text) const {
   fmt.clearForeground();
   fmt.clearBackground();
   inputLine()->setCurrentCharFormat(fmt);
+
+#ifdef HAVE_KDE
+  // Set highlighter back to active in case it was deactivated by too many errors.
+  if(ui.inputEdit->highlighter())
+    ui.inputEdit->highlighter()->setActive(true);
+#endif
 }
 
-void InputWidget::mergeFormatOnWordOrSelection(const QTextCharFormat &format) {
+void InputWidget::mergeFormatOnSelection(const QTextCharFormat &format) {
   QTextCursor cursor = inputLine()->textCursor();
-  if (!cursor.hasSelection())
-    cursor.select(QTextCursor::WordUnderCursor);
   cursor.mergeCharFormat(format);
   inputLine()->mergeCurrentCharFormat(format);
 }
 
-void InputWidget::setFormatOnWordOrSelection(const QTextCharFormat &format) {
+void InputWidget::setFormatOnSelection(const QTextCharFormat &format) {
   QTextCursor cursor = inputLine()->textCursor();
-  if (!cursor.hasSelection())
-    cursor.select(QTextCursor::WordUnderCursor);
   cursor.setCharFormat(format);
   inputLine()->setCurrentCharFormat(format);
 }
@@ -396,33 +448,24 @@ QTextCharFormat InputWidget::getFormatOfWordOrSelection() {
 
 void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) {
   fontChanged(format.font());
-
-  if (format.foreground().isOpaque())
-    colorChanged(format.foreground().color());
-  else
-    colorChanged(Qt::transparent);
-  if (format.background().isOpaque())
-    colorHighlightChanged(format.background().color());
-  else
-    colorHighlightChanged(Qt::transparent);
 }
 
 void InputWidget::on_boldButton_clicked(bool checked) {
   QTextCharFormat fmt;
   fmt.setFontWeight(checked ? QFont::Bold : QFont::Normal);
-  mergeFormatOnWordOrSelection(fmt);
+  mergeFormatOnSelection(fmt);
 }
 
 void InputWidget::on_underlineButton_clicked(bool checked) {
   QTextCharFormat fmt;
   fmt.setFontUnderline(checked);
-  mergeFormatOnWordOrSelection(fmt);
+  mergeFormatOnSelection(fmt);
 }
 
 void InputWidget::on_italicButton_clicked(bool checked) {
   QTextCharFormat fmt;
   fmt.setFontItalic(checked);
-  mergeFormatOnWordOrSelection(fmt);
+  mergeFormatOnSelection(fmt);
 }
 
 void InputWidget::fontChanged(const QFont &f)
@@ -439,12 +482,12 @@ void InputWidget::colorChosen(QAction *action) {
     color = Qt::transparent;
     fmt = getFormatOfWordOrSelection();
     fmt.clearForeground();
-    setFormatOnWordOrSelection(fmt);
+    setFormatOnSelection(fmt);
   }
   else {
     color = QColor(inputLine()->rgbColorFromMirc(qVariantValue<QString>(action->data())));
     fmt.setForeground(color);
-    mergeFormatOnWordOrSelection(fmt);
+    mergeFormatOnSelection(fmt);
   }
   ui.textcolorButton->setDefaultAction(action);
   ui.textcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-text-color"), color));
@@ -457,35 +500,17 @@ void InputWidget::colorHighlightChosen(QAction *action) {
     color = Qt::transparent;
     fmt = getFormatOfWordOrSelection();
     fmt.clearBackground();
-    setFormatOnWordOrSelection(fmt);
+    setFormatOnSelection(fmt);
   }
   else {
     color = QColor(inputLine()->rgbColorFromMirc(qVariantValue<QString>(action->data())));
     fmt.setBackground(color);
-    mergeFormatOnWordOrSelection(fmt);
+    mergeFormatOnSelection(fmt);
   }
   ui.highlightcolorButton->setDefaultAction(action);
   ui.highlightcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-fill-color"), color));
 }
 
-void InputWidget::colorChanged(const QColor &fg) {
-  if (fg == Qt::transparent)
-    ui.textcolorButton->setDefaultAction(_colorMenu->actions().last());
-  else
-    ui.textcolorButton->setDefaultAction(_colorMenu->actions().value(inputLine()->mircColorFromRGB(fg.name()).toInt()));
-
-  ui.textcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-text-color"), fg));
-}
-
-void InputWidget::colorHighlightChanged(const QColor &bg) {
-  if (bg == Qt::transparent)
-    ui.highlightcolorButton->setDefaultAction(_colorFillMenu->actions().last());
-  else
-    ui.highlightcolorButton->setDefaultAction(_colorFillMenu->actions().value(inputLine()->mircColorFromRGB(bg.name()).toInt()));
-
-  ui.highlightcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-fill-color"), bg));
-}
-
 void InputWidget::on_showStyleButton_toggled(bool checked) {
   ui.styleFrame->setVisible(checked);
   if (checked) {