From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 19 Aug 2009 06:51:54 +0000 (+0200)
Subject: Rename setters to be more Qt-like
X-Git-Tag: 0.5-rc1~55
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=65c5a05ece190678187f8244b9752db76f45bf00;hp=add78447a3d6507bccb3e99c68d6cddf5faefd27

Rename setters to be more Qt-like

Also add a setter for enabling wordwrap in the MultiLineEdit. Will be needed
for the topic widget.
---

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 7534ab69..ce9189ed 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -95,7 +95,7 @@ void InputWidget::setCustomFont(const QVariant &v) {
 }
 
 void InputWidget::setEnableSpellCheck(const QVariant &v) {
-  ui.inputEdit->enableSpellCheck(v.toBool());
+  ui.inputEdit->setSpellCheckEnabled(v.toBool());
 }
 
 void InputWidget::setShowNickSelector(const QVariant &v) {
@@ -107,7 +107,7 @@ void InputWidget::setMaxLines(const QVariant &v) {
 }
 
 void InputWidget::setEnableScrollBars(const QVariant &v) {
-  ui.inputEdit->enableScrollBars(v.toBool());
+  ui.inputEdit->setScrollBarsEnabled(v.toBool());
 }
 
 bool InputWidget::eventFilter(QObject *watched, QEvent *event) {
diff --git a/src/qtui/ui/inputwidget.ui b/src/qtui/ui/inputwidget.ui
index a6571662..21291e74 100644
--- a/src/qtui/ui/inputwidget.ui
+++ b/src/qtui/ui/inputwidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>585</width>
-    <height>52</height>
+    <height>192</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -41,7 +41,7 @@
       <enum>Qt::ScrollBarAsNeeded</enum>
      </property>
      <property name="lineWrapMode">
-      <enum>QTextEdit::NoWrap</enum>
+      <enum>QTextEdit::WidgetWidth</enum>
      </property>
     </widget>
    </item>
diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index a79ef28d..934c7462 100644
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -54,7 +54,7 @@ MultiLineEdit::MultiLineEdit(QWidget *parent)
   enableFindReplace(false);
 #endif
 
-  setMode(SingleLine);
+  setMode(SingleLine); setLineWrapMode(WidgetWidth);
   reset();
 
   connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
@@ -91,7 +91,7 @@ void MultiLineEdit::setMaxHeight(int lines) {
   computeSizeHint();
 }
 
-void MultiLineEdit::enableScrollBars(bool enable) {
+void MultiLineEdit::setScrollBarsEnabled(bool enable) {
   if(_scrollBarsEnabled == enable)
     return;
 
@@ -151,7 +151,7 @@ QSize MultiLineEdit::minimumSizeHint() const {
   return sizeHint();
 }
 
-void MultiLineEdit::enableSpellCheck(bool enable) {
+void MultiLineEdit::setSpellCheckEnabled(bool enable) {
 #ifdef HAVE_KDE
   setCheckSpellingEnabled(enable);
 #else
@@ -159,6 +159,10 @@ void MultiLineEdit::enableSpellCheck(bool enable) {
 #endif
 }
 
+void MultiLineEdit::setWordWrapEnabled(bool enable) {
+  setLineWrapMode(enable? WidgetWidth : NoWrap);
+}
+
 void MultiLineEdit::historyMoveBack() {
   addToHistory(text(), true);
 
diff --git a/src/uisupport/multilineedit.h b/src/uisupport/multilineedit.h
index 67264dda..dbe9580a 100644
--- a/src/uisupport/multilineedit.h
+++ b/src/uisupport/multilineedit.h
@@ -67,8 +67,11 @@ public slots:
   void setMode(Mode mode);
   void setMinHeight(int numLines);
   void setMaxHeight(int numLines);
-  void enableScrollBars(bool enable = true);
-  void enableSpellCheck(bool enable = true);
+  void setScrollBarsEnabled(bool enable = true);
+  void setSpellCheckEnabled(bool enable = true);
+
+  // Note: Enabling wrap will make isSingleLine() not work correctly, so only use this if minHeight() > 1!
+  void setWordWrapEnabled(bool enable = true);
 
 signals:
   void textEntered(const QString &text);