#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>
+#include "util.h"
const int leftMargin = 3;
_networkId(0)
{
ui.setupUi(this);
- connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString)));
+ connect(ui.ownNick, selectOverload<const QString&>(&QComboBox::activated), this, &InputWidget::changeNick);
layout()->setAlignment(ui.ownNick, Qt::AlignBottom);
layout()->setAlignment(ui.inputEdit, Qt::AlignBottom);
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();
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);
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));
ActionCollection *coll = QtUi::actionCollection();
-
Action *activateInputline = coll->add<Action>("FocusInputLine");
- connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus()));
+
auto *activateInputline = coll->add<Action>("FocusInputLine");
+ connect(activateInputline, &QAction::triggered, this, selectOverload<>(&QWidget::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);
}
}
-void InputWidget::setEnableSpellCheck(const QVariant &v)
-{
- ui.inputEdit->setSpellCheckEnabled(v.toBool());
-}
-
-
void InputWidget::setEnableEmacsMode(const QVariant &v)
{
ui.inputEdit->setEmacsMode(v.toBool());
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);
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();
BufferInfo InputWidget::currentBufferInfo() const
{
return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-};
+}
void InputWidget::applyFormatActiveColor()
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());
}
{
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);
}
}
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;
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);
}
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);
} 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);
}
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));
}
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));
}
projects / quassel.git / blobdiff