X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=6ac42be31c4733642a4dc329bb710a71bdb1742e;hp=bfc0a22605ef2a4371857db8a8757f2de76e2cfb;hb=2b44b945cf50e3dbfeabe4e5aee10db4b13f5a64;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index bfc0a226..6ac42be3 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -65,6 +65,7 @@ InputWidget::InputWidget(QWidget *parent)
     ui.underlineButton->setIcon(SmallIcon("format-text-underline"));
     ui.textcolorButton->setIcon(SmallIcon("format-text-color"));
     ui.highlightcolorButton->setIcon(SmallIcon("format-fill-color"));
+    ui.encryptionIconLabel->hide();
 
     _colorMenu = new QMenu();
     _colorFillMenu = new QMenu();
@@ -122,6 +123,9 @@ InputWidget::InputWidget(QWidget *parent)
     s.notify("EnableScrollBars", this, SLOT(setScrollBarsEnabled(QVariant)));
     setScrollBarsEnabled(s.value("EnableScrollBars", true));
 
+    s.notify("EnableLineWrap", this, SLOT(setLineWrapEnabled(QVariant)));
+    setLineWrapEnabled(s.value("EnableLineWrap", false));
+
     s.notify("EnableMultiLine", this, SLOT(setMultiLineEnabled(QVariant)));
     setMultiLineEnabled(s.value("EnableMultiLine", true));
 
@@ -209,6 +213,12 @@ void InputWidget::setScrollBarsEnabled(const QVariant &v)
 }
 
 
+void InputWidget::setLineWrapEnabled(const QVariant &v)
+{
+    ui.inputEdit->setLineWrapEnabled(v.toBool());
+}
+
+
 void InputWidget::setMultiLineEnabled(const QVariant &v)
 {
     ui.inputEdit->setMode(v.toBool() ? MultiLineEdit::MultiLine : MultiLineEdit::SingleLine);
@@ -289,8 +299,24 @@ void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot
     QItemSelectionRange changedArea(topLeft, bottomRight);
     if (changedArea.contains(selectionModel()->currentIndex())) {
         updateEnabledState();
+
+        bool encrypted = false;
+
+        IrcChannel *chan = qobject_cast<IrcChannel *>(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcChannelRole).value<QObject *>());
+        if (chan)
+            encrypted = chan->encrypted();
+
+        IrcUser *user = qobject_cast<IrcUser *>(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcUserRole).value<QObject *>());
+        if (user)
+            encrypted = user->encrypted();
+
+        if (encrypted)
+            ui.encryptionIconLabel->show();
+        else
+            ui.encryptionIconLabel->hide();
     }
-};
+}
+
 
 void InputWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
 {
@@ -551,14 +577,14 @@ void InputWidget::colorChosen(QAction *action)
 {
     QTextCharFormat fmt;
     QColor color;
-    if (qVariantValue<QString>(action->data()) == "") {
+    if (action->data().value<QString>() == "") {
         color = Qt::transparent;
         fmt = getFormatOfWordOrSelection();
         fmt.clearForeground();
         setFormatOnSelection(fmt);
     }
     else {
-        color = QColor(inputLine()->rgbColorFromMirc(qVariantValue<QString>(action->data())));
+        color = QColor(inputLine()->rgbColorFromMirc(action->data().value<QString>()));
         fmt.setForeground(color);
         mergeFormatOnSelection(fmt);
     }
@@ -571,14 +597,14 @@ void InputWidget::colorHighlightChosen(QAction *action)
 {
     QTextCharFormat fmt;
     QColor color;
-    if (qVariantValue<QString>(action->data()) == "") {
+    if (action->data().value<QString>() == "") {
         color = Qt::transparent;
         fmt = getFormatOfWordOrSelection();
         fmt.clearBackground();
         setFormatOnSelection(fmt);
     }
     else {
-        color = QColor(inputLine()->rgbColorFromMirc(qVariantValue<QString>(action->data())));
+        color = QColor(inputLine()->rgbColorFromMirc(action->data().value<QString>()));
         fmt.setBackground(color);
         mergeFormatOnSelection(fmt);
     }