X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=3c56673706c5b595712eb3bf656291fd5b0eda43;hb=61f33c7895e324f6e95034d86897ad2e963653f1;hp=f74903fc2c613a13493697d7834829690629f8e6;hpb=e1dc333ae055788dd1a2da86ca72aa126c157697;p=quassel.git diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index f74903fc..3c566737 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -21,17 +21,21 @@ #include "inputwidget.h" #include +#include +#include +#include #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 +#include "util.h" const int leftMargin = 3; @@ -40,7 +44,7 @@ InputWidget::InputWidget(QWidget *parent) _networkId(0) { ui.setupUi(this); - connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString))); + connect(ui.ownNick, selectOverload(&QComboBox::activated), this, &InputWidget::changeNick); layout()->setAlignment(ui.ownNick, Qt::AlignBottom); layout()->setAlignment(ui.inputEdit, Qt::AlignBottom); @@ -61,12 +65,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.textcolorButton->setIcon(QIcon::fromTheme("format-text-color")); - ui.highlightcolorButton->setIcon(QIcon::fromTheme("format-fill-color")); - 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(); @@ -90,18 +92,22 @@ InputWidget::InputWidget(QWidget *parent) ui.textcolorButton->setMenu(_colorMenu); // Set the default action to clear color (last added action) ui.textcolorButton->setDefaultAction(_colorMenu->actions().last()); - connect(_colorMenu, SIGNAL(triggered(QAction *)), this, SLOT(colorChosen(QAction *))); + connect(_colorMenu, &QMenu::triggered, this, &InputWidget::colorChosen); ui.highlightcolorButton->setMenu(_colorFillMenu); // Set the default action to clear fill color (last added action) ui.highlightcolorButton->setDefaultAction(_colorFillMenu->actions().last()); - connect(_colorFillMenu, SIGNAL(triggered(QAction *)), this, SLOT(colorHighlightChosen(QAction *))); + connect(_colorFillMenu, &QMenu::triggered, this, &InputWidget::colorHighlightChosen); + + // Needs to be done after adding the menu, otherwise the icon mysteriously vanishes until clicked + 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))); + connect(ui.showStyleButton, &QAbstractButton::toggled, this, &InputWidget::setStyleOptionsExpanded); // Clear formatting button - connect(ui.clearButton, SIGNAL(clicked()), this, SLOT(clearFormat())); + connect(ui.clearButton, &QAbstractButton::clicked, this, &InputWidget::clearFormat); new TabCompleter(ui.inputEdit); @@ -113,11 +119,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)); @@ -143,19 +144,10 @@ InputWidget::InputWidget(QWidget *parent) setMultiLineEnabled(s.value("EnableMultiLine", true)); ActionCollection *coll = QtUi::actionCollection(); + coll->addAction("FocusInputLine", new Action{tr("Focus Input Line"), coll, this, selectOverload<>(&QWidget::setFocus), QKeySequence(Qt::CTRL + Qt::Key_L)}); - Action *activateInputline = coll->add("FocusInputLine"); - connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus())); - activateInputline->setText(tr("Focus Input Line")); - activateInputline->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L)); - - connect(inputLine(), SIGNAL(textEntered(QString)), SLOT(onTextEntered(QString)), Qt::QueuedConnection); // make sure the line is already reset, bug #984 - connect(inputLine(), SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(currentCharFormatChanged(QTextCharFormat))); -} - - -InputWidget::~InputWidget() -{ + connect(inputLine(), &MultiLineEdit::textEntered, this, &InputWidget::onTextEntered, Qt::QueuedConnection); // make sure the line is already reset, bug #984 + connect(inputLine(), &QTextEdit::currentCharFormatChanged, this, &InputWidget::currentCharFormatChanged); } @@ -184,12 +176,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()); @@ -243,10 +229,10 @@ bool InputWidget::eventFilter(QObject *watched, QEvent *event) if (event->type() != QEvent::KeyPress) return false; - QKeyEvent *keyEvent = static_cast(event); + auto *keyEvent = static_cast(event); // keys from BufferView should be sent to (and focus) the input line - BufferView *view = qobject_cast(watched); + auto *view = qobject_cast(watched); if (view) { if (keyEvent->text().length() == 1 && !(keyEvent->modifiers() & (Qt::ControlModifier ^ Qt::AltModifier))) { // normal key press QChar c = keyEvent->text().at(0); @@ -315,11 +301,11 @@ void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot bool encrypted = false; - IrcChannel *chan = qobject_cast(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcChannelRole).value()); + auto *chan = qobject_cast(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcChannelRole).value()); if (chan) encrypted = chan->encrypted(); - IrcUser *user = qobject_cast(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcUserRole).value()); + auto *user = qobject_cast(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcUserRole).value()); if (user) encrypted = user->encrypted(); @@ -380,7 +366,7 @@ const Network *InputWidget::currentNetwork() const BufferInfo InputWidget::currentBufferInfo() const { return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value(); -}; +} void InputWidget::applyFormatActiveColor() @@ -433,16 +419,16 @@ 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; const Network *network = Client::network(networkId); if (network) { - connect(network, SIGNAL(identitySet(IdentityId)), this, SLOT(setIdentity(IdentityId))); + connect(network, &Network::identitySet, this, &InputWidget::setIdentity); connectMyIrcUser(); setIdentity(network->identity()); } @@ -457,16 +443,16 @@ void InputWidget::connectMyIrcUser() { const Network *network = currentNetwork(); if (network->me()) { - connect(network->me(), SIGNAL(nickSet(const QString &)), this, SLOT(updateNickSelector())); - connect(network->me(), SIGNAL(userModesSet(QString)), this, SLOT(updateNickSelector())); - connect(network->me(), SIGNAL(userModesAdded(QString)), this, SLOT(updateNickSelector())); - connect(network->me(), SIGNAL(userModesRemoved(QString)), this, SLOT(updateNickSelector())); - connect(network->me(), SIGNAL(awaySet(bool)), this, SLOT(updateNickSelector())); - disconnect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser())); + connect(network->me(), &IrcUser::nickSet, this, &InputWidget::updateNickSelector); + connect(network->me(), &IrcUser::userModesSet, this, &InputWidget::updateNickSelector); + connect(network->me(), &IrcUser::userModesAdded, this, &InputWidget::updateNickSelector); + connect(network->me(), &IrcUser::userModesRemoved, this, &InputWidget::updateNickSelector); + connect(network->me(), &IrcUser::awaySet, this, &InputWidget::updateNickSelector); + disconnect(network, &Network::myNickSet, this, &InputWidget::connectMyIrcUser); updateNickSelector(); } else { - connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser())); + connect(network, &Network::myNickSet, this, &InputWidget::connectMyIrcUser); } } @@ -478,13 +464,13 @@ 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; const Identity *identity = Client::identity(identityId); if (identity) { - connect(identity, SIGNAL(nicksSet(QStringList)), this, SLOT(updateNickSelector())); + connect(identity, &Identity::nicksSet, this, &InputWidget::updateNickSelector); } else { _identityId = 0; @@ -527,7 +513,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); } @@ -549,16 +535,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); @@ -570,30 +556,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); } @@ -681,7 +681,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)); } @@ -701,7 +701,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)); }