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

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 5f5f0a03..6ac42be3 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -123,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));
 
@@ -210,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);
@@ -568,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);
     }
@@ -588,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);
     }