X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=6ac42be31c4733642a4dc329bb710a71bdb1742e;hp=86052a00d39f76875ec43e7ed7b3dc6045cffded;hb=f8ac74fd09451dcb61f34730f5f605f0fadbb9e8;hpb=ac654fdeeece68d64561920479f064ad3c237e26 diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index 86052a00..6ac42be3 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 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 * @@ -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(action->data()) == "") { + if (action->data().value() == "") { color = Qt::transparent; fmt = getFormatOfWordOrSelection(); fmt.clearForeground(); setFormatOnSelection(fmt); } else { - color = QColor(inputLine()->rgbColorFromMirc(qVariantValue(action->data()))); + color = QColor(inputLine()->rgbColorFromMirc(action->data().value())); fmt.setForeground(color); mergeFormatOnSelection(fmt); } @@ -588,14 +597,14 @@ void InputWidget::colorHighlightChosen(QAction *action) { QTextCharFormat fmt; QColor color; - if (qVariantValue(action->data()) == "") { + if (action->data().value() == "") { color = Qt::transparent; fmt = getFormatOfWordOrSelection(); fmt.clearBackground(); setFormatOnSelection(fmt); } else { - color = QColor(inputLine()->rgbColorFromMirc(qVariantValue(action->data()))); + color = QColor(inputLine()->rgbColorFromMirc(action->data().value())); fmt.setBackground(color); mergeFormatOnSelection(fmt); }