X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=f843eced573836b4bab992e04160f420053cadb4;hp=756d06415bf48a149244545fbb3e3491471dc1a7;hb=98144aaad0cd747f186edcd0e36a1d67326ac766;hpb=fe5ceb9ecfd9bbb83b96ba4f462b3f41688377bd

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 756d0641..f843eced 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -21,17 +21,20 @@
 #include "inputwidget.h"
 
 #include <QIcon>
+#include <QPainter>
+#include <QPixmap>
+#include <QRect>
 
 #include "action.h"
 #include "actioncollection.h"
 #include "bufferview.h"
 #include "client.h"
+#include "icon.h"
 #include "ircuser.h"
 #include "networkmodel.h"
 #include "qtui.h"
 #include "qtuisettings.h"
 #include "tabcompleter.h"
-#include <QPainter>
 
 const int leftMargin = 3;
 
@@ -61,10 +64,10 @@ InputWidget::InputWidget(QWidget *parent)
     ui.inputEdit->setMode(MultiLineEdit::MultiLine);
     ui.inputEdit->setPasteProtectionEnabled(true);
 
-    ui.boldButton->setIcon(QIcon::fromTheme("format-text-bold"));
-    ui.italicButton->setIcon(QIcon::fromTheme("format-text-italic"));
-    ui.underlineButton->setIcon(QIcon::fromTheme("format-text-underline"));
-    ui.clearButton->setIcon(QIcon::fromTheme("edit-clear"));
+    ui.boldButton->setIcon(icon::get("format-text-bold"));
+    ui.italicButton->setIcon(icon::get("format-text-italic"));
+    ui.underlineButton->setIcon(icon::get("format-text-underline"));
+    ui.clearButton->setIcon(icon::get("edit-clear"));
     ui.encryptionIconLabel->hide();
 
     _colorMenu = new QMenu();
@@ -96,8 +99,8 @@ InputWidget::InputWidget(QWidget *parent)
     connect(_colorFillMenu, SIGNAL(triggered(QAction *)), this, SLOT(colorHighlightChosen(QAction *)));
 
     // Needs to be done after adding the menu, otherwise the icon mysteriously vanishes until clicked
-    ui.textcolorButton->setIcon(QIcon::fromTheme("format-text-color"));
-    ui.highlightcolorButton->setIcon(QIcon::fromTheme("format-fill-color"));
+    ui.textcolorButton->setIcon(icon::get("format-text-color"));
+    ui.highlightcolorButton->setIcon(icon::get("format-fill-color"));
 
     // Show/hide style button
     connect(ui.showStyleButton, SIGNAL(toggled(bool)), this, SLOT(setStyleOptionsExpanded(bool)));
@@ -115,11 +118,6 @@ InputWidget::InputWidget(QWidget *parent)
 
     UiSettings s("InputWidget");
 
-#ifdef HAVE_KDE4
-    s.notify("EnableSpellCheck", this, SLOT(setEnableSpellCheck(QVariant)));
-    setEnableSpellCheck(s.value("EnableSpellCheck", false));
-#endif
-
     s.notify("EnableEmacsMode", this, SLOT(setEnableEmacsMode(QVariant)));
     setEnableEmacsMode(s.value("EnableEmacsMode", false));
 
@@ -146,7 +144,7 @@ InputWidget::InputWidget(QWidget *parent)
 
     ActionCollection *coll = QtUi::actionCollection();
 
-    Action *activateInputline = coll->add<Action>("FocusInputLine");
+    auto *activateInputline = coll->add<Action>("FocusInputLine");
     connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus()));
     activateInputline->setText(tr("Focus Input Line"));
     activateInputline->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
@@ -156,11 +154,6 @@ InputWidget::InputWidget(QWidget *parent)
 }
 
 
-InputWidget::~InputWidget()
-{
-}
-
-
 void InputWidget::setUseCustomFont(const QVariant &v)
 {
     if (v.toBool()) {
@@ -186,12 +179,6 @@ void InputWidget::setCustomFont(const QVariant &v)
 }
 
 
-void InputWidget::setEnableSpellCheck(const QVariant &v)
-{
-    ui.inputEdit->setSpellCheckEnabled(v.toBool());
-}
-
-
 void InputWidget::setEnableEmacsMode(const QVariant &v)
 {
     ui.inputEdit->setEmacsMode(v.toBool());
@@ -245,10 +232,10 @@ bool InputWidget::eventFilter(QObject *watched, QEvent *event)
     if (event->type() != QEvent::KeyPress)
         return false;
 
-    QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+    auto *keyEvent = static_cast<QKeyEvent *>(event);
 
     // keys from BufferView should be sent to (and focus) the input line
-    BufferView *view = qobject_cast<BufferView *>(watched);
+    auto *view = qobject_cast<BufferView *>(watched);
     if (view) {
         if (keyEvent->text().length() == 1 && !(keyEvent->modifiers() & (Qt::ControlModifier ^ Qt::AltModifier))) { // normal key press
             QChar c = keyEvent->text().at(0);
@@ -317,11 +304,11 @@ void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot
 
         bool encrypted = false;
 
-        IrcChannel *chan = qobject_cast<IrcChannel *>(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcChannelRole).value<QObject *>());
+        auto *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 *>());
+        auto *user = qobject_cast<IrcUser *>(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcUserRole).value<QObject *>());
         if (user)
             encrypted = user->encrypted();
 
@@ -382,7 +369,7 @@ const Network *InputWidget::currentNetwork() const
 BufferInfo InputWidget::currentBufferInfo() const
 {
     return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-};
+}
 
 
 void InputWidget::applyFormatActiveColor()
@@ -435,9 +422,9 @@ void InputWidget::setNetwork(NetworkId networkId)
 
     const Network *previousNet = Client::network(_networkId);
     if (previousNet) {
-        disconnect(previousNet, 0, this, 0);
+        disconnect(previousNet, nullptr, this, nullptr);
         if (previousNet->me())
-            disconnect(previousNet->me(), 0, this, 0);
+            disconnect(previousNet->me(), nullptr, this, nullptr);
     }
 
     _networkId = networkId;
@@ -480,7 +467,7 @@ void InputWidget::setIdentity(IdentityId identityId)
 
     const Identity *previousIdentity = Client::identity(_identityId);
     if (previousIdentity)
-        disconnect(previousIdentity, 0, this, 0);
+        disconnect(previousIdentity, nullptr, this, nullptr);
 
     _identityId = identityId;
 
@@ -529,7 +516,7 @@ void InputWidget::updateNickSelector() const
     ui.ownNick->addItems(nicks);
 
     if (me && me->isAway())
-        ui.ownNick->setItemData(nickIdx, QIcon::fromTheme("user-away"), Qt::DecorationRole);
+        ui.ownNick->setItemData(nickIdx, icon::get({"im-user-away", "user-away"}), Qt::DecorationRole);
 
     ui.ownNick->setCurrentIndex(nickIdx);
 }
@@ -551,16 +538,16 @@ void InputWidget::changeNick(const QString &newNick) const
 void InputWidget::onTextEntered(const QString &text)
 {
     Client::userInput(currentBufferInfo(), text);
-    ui.boldButton->setChecked(false);
-    ui.underlineButton->setChecked(false);
-    ui.italicButton->setChecked(false);
 
+    // Remove formatting from entered text
+    // TODO: Offer a way to convert pasted text to mIRC formatting codes
     setFormatClear(true);
 }
 
 
 void InputWidget::setFormatClear(const bool global)
 {
+    // Apply formatting
     QTextCharFormat fmt;
     fmt.setFontWeight(QFont::Normal);
     fmt.setFontUnderline(false);
@@ -572,30 +559,44 @@ void InputWidget::setFormatClear(const bool global)
     } else {
         setFormatOnSelection(fmt);
     }
+
+    // Make sure UI state follows
+    ui.boldButton->setChecked(false);
+    ui.italicButton->setChecked(false);
+    ui.underlineButton->setChecked(false);
 }
 
 
 void InputWidget::setFormatBold(const bool bold)
 {
+    // Apply formatting
     QTextCharFormat fmt;
     fmt.setFontWeight(bold ? QFont::Bold : QFont::Normal);
     mergeFormatOnSelection(fmt);
+    // Make sure UI state follows
+    ui.boldButton->setChecked(bold);
 }
 
 
 void InputWidget::setFormatItalic(const bool italic)
 {
+    // Apply formatting
     QTextCharFormat fmt;
     fmt.setFontItalic(italic);
     mergeFormatOnSelection(fmt);
+    // Make sure UI state follows
+    ui.italicButton->setChecked(italic);
 }
 
 
 void InputWidget::setFormatUnderline(const bool underline)
 {
+    // Apply formatting
     QTextCharFormat fmt;
     fmt.setFontUnderline(underline);
     mergeFormatOnSelection(fmt);
+    // Make sure UI state follows
+    ui.underlineButton->setChecked(underline);
 }
 
 
@@ -683,7 +684,7 @@ void InputWidget::colorChosen(QAction *action)
         mergeFormatOnSelection(fmt);
     }
     ui.textcolorButton->setDefaultAction(action);
-    ui.textcolorButton->setIcon(createColorToolButtonIcon(QIcon::fromTheme("format-text-color"), color));
+    ui.textcolorButton->setIcon(createColorToolButtonIcon(icon::get("format-text-color"), color));
 }
 
 
@@ -703,7 +704,7 @@ void InputWidget::colorHighlightChosen(QAction *action)
         mergeFormatOnSelection(fmt);
     }
     ui.highlightcolorButton->setDefaultAction(action);
-    ui.highlightcolorButton->setIcon(createColorToolButtonIcon(QIcon::fromTheme("format-fill-color"), color));
+    ui.highlightcolorButton->setIcon(createColorToolButtonIcon(icon::get("format-fill-color"), color));
 }