X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=1b01c21dd468f176fd823a8141216a2034feca11;hp=23a6a62abd2d872cce407e1b2a038c60c83430b8;hb=f033a6c23d48561d064eeb6aaeb6eea1190cc4af;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index 23a6a62a..1b01c21d 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2010 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -22,6 +22,7 @@ #include "action.h" #include "actioncollection.h" +#include "bufferview.h" #include "client.h" #include "iconloader.h" #include "ircuser.h" @@ -29,42 +30,182 @@ #include "networkmodel.h" #include "qtui.h" #include "qtuisettings.h" +#include "tabcompleter.h" +#include InputWidget::InputWidget(QWidget *parent) : AbstractItemView(parent), _networkId(0) { ui.setupUi(this); - connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString))); connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString))); - connect(this, SIGNAL(userInput(BufferInfo, QString)), Client::instance(), SIGNAL(sendInput(BufferInfo, QString))); + + layout()->setAlignment(ui.ownNick, Qt::AlignBottom); + layout()->setAlignment(ui.inputEdit, Qt::AlignBottom); + layout()->setAlignment(ui.showStyleButton, Qt::AlignBottom); + layout()->setAlignment(ui.styleFrame, Qt::AlignBottom); + + ui.styleFrame->setVisible(false); + setFocusProxy(ui.inputEdit); + ui.ownNick->setFocusProxy(ui.inputEdit); ui.ownNick->setSizeAdjustPolicy(QComboBox::AdjustToContents); ui.ownNick->installEventFilter(new MouseWheelFilter(this)); ui.inputEdit->installEventFilter(new JumpKeyHandler(this)); - - QtUiSettings s; - bool useInputLineFont = s.value("UseInputLineFont", QVariant(false)).toBool(); - if(useInputLineFont) { - ui.inputEdit->setFont(s.value("InputLineFont").value()); + ui.inputEdit->installEventFilter(this); + + ui.inputEdit->setMinHeight(1); + ui.inputEdit->setMaxHeight(5); + ui.inputEdit->setMode(MultiLineEdit::MultiLine); + ui.inputEdit->setPasteProtectionEnabled(true); + + ui.boldButton->setIcon(SmallIcon("format-text-bold")); + ui.italicButton->setIcon(SmallIcon("format-text-italic")); + ui.underlineButton->setIcon(SmallIcon("format-text-underline")); + ui.textcolorButton->setIcon(SmallIcon("format-text-color")); + ui.highlightcolorButton->setIcon(SmallIcon("format-fill-color")); + + _colorMenu = new QMenu(); + _colorFillMenu = new QMenu(); + + QStringList names; + names << tr("White") << tr("Black") << tr("Dark blue") << tr("Dark green") << tr("Red") << tr("Dark red") << tr("Dark magenta") << tr("Orange") + << tr("Yellow") << tr("Green") << tr("Dark cyan") << tr("Cyan") << tr("Blue") << tr("Magenta") << tr("Dark gray") << tr("Light gray"); + + QPixmap pix(16, 16); + for (int i = 0; i < inputLine()->mircColorMap().count(); i++) { + pix.fill(inputLine()->mircColorMap().values()[i]); + _colorMenu->addAction(pix, names[i])->setData(inputLine()->mircColorMap().keys()[i]); + _colorFillMenu->addAction(pix, names[i])->setData(inputLine()->mircColorMap().keys()[i]); } + pix.fill(Qt::transparent); + _colorMenu->addAction(pix, tr("Clear Color"))->setData(""); + _colorFillMenu->addAction(pix, tr("Clear Color"))->setData(""); + + ui.textcolorButton->setMenu(_colorMenu); + connect(_colorMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorChosen(QAction*))); + ui.highlightcolorButton->setMenu(_colorFillMenu); + connect(_colorFillMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorHighlightChosen(QAction*))); + + new TabCompleter(ui.inputEdit); + + UiStyleSettings fs("Fonts"); + fs.notify("UseCustomInputWidgetFont", this, SLOT(setUseCustomFont(QVariant))); + fs.notify("InputWidget", this, SLOT(setCustomFont(QVariant))); + if(fs.value("UseCustomInputWidgetFont", false).toBool()) + setCustomFont(fs.value("InputWidget", QFont())); + + UiSettings s("InputWidget"); + +#ifdef HAVE_KDE + s.notify("EnableSpellCheck", this, SLOT(setEnableSpellCheck(QVariant))); + setEnableSpellCheck(s.value("EnableSpellCheck", false)); +#endif + + s.notify("ShowNickSelector", this, SLOT(setShowNickSelector(QVariant))); + setShowNickSelector(s.value("ShowNickSelector", true)); + + s.notify("ShowStyleButtons", this, SLOT(setShowStyleButtons(QVariant))); + setShowStyleButtons(s.value("ShowStyleButtons", true)); + + s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant))); + setMaxLines(s.value("MaxNumLines", 5)); + + s.notify("EnableScrollBars", this, SLOT(setScrollBarsEnabled(QVariant))); + setScrollBarsEnabled(s.value("EnableScrollBars", true)); + + s.notify("EnableMultiLine", this, SLOT(setMultiLineEnabled(QVariant))); + setMultiLineEnabled(s.value("EnableMultiLine", true)); + ActionCollection *coll = QtUi::actionCollection(); Action *activateInputline = coll->add("FocusInputLine"); connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus())); activateInputline->setText(tr("Focus Input Line")); activateInputline->setShortcut(tr("Ctrl+L")); + + connect(inputLine(), SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(currentCharFormatChanged(QTextCharFormat))); } InputWidget::~InputWidget() { } +void InputWidget::setUseCustomFont(const QVariant &v) { + if(v.toBool()) { + UiStyleSettings fs("Fonts"); + setCustomFont(fs.value("InputWidget")); + } else + setCustomFont(QFont()); +} + +void InputWidget::setCustomFont(const QVariant &v) { + QFont font = v.value(); + if(font.family().isEmpty()) + font = QApplication::font(); + ui.inputEdit->setCustomFont(font); +} + +void InputWidget::setEnableSpellCheck(const QVariant &v) { + ui.inputEdit->setSpellCheckEnabled(v.toBool()); +} + +void InputWidget::setShowNickSelector(const QVariant &v) { + ui.ownNick->setVisible(v.toBool()); +} + +void InputWidget::setShowStyleButtons(const QVariant &v) { + ui.showStyleButton->setVisible(v.toBool()); +} + +void InputWidget::setMaxLines(const QVariant &v) { + ui.inputEdit->setMaxHeight(v.toInt()); +} + +void InputWidget::setScrollBarsEnabled(const QVariant &v) { + ui.inputEdit->setScrollBarsEnabled(v.toBool()); +} + +void InputWidget::setMultiLineEnabled(const QVariant &v) { + ui.inputEdit->setMode(v.toBool()? MultiLineEdit::MultiLine : MultiLineEdit::SingleLine); +} + +bool InputWidget::eventFilter(QObject *watched, QEvent *event) { + if(event->type() != QEvent::KeyPress) + return false; + + QKeyEvent *keyEvent = static_cast(event); + + // keys from BufferView should be sent to (and focus) the input line + BufferView *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); + if(c.isLetterOrNumber() || c.isSpace() || c.isPunct() || c.isSymbol()) { + setFocus(); + QCoreApplication::sendEvent(inputLine(), keyEvent); + return true; + } + } + return false; + } else if(watched == ui.inputEdit) { + if(keyEvent->matches(QKeySequence::Find)) { + QAction *act = GraphicalUi::actionCollection()->action("ToggleSearchBar"); + if(act) { + act->toggle(); + return true; + } + } + return false; + } + return false; +} + void InputWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { + Q_UNUSED(previous) NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value(); - NetworkId previousNetworkId = previous.data(NetworkModel::NetworkIdRole).value(); - if(networkId == previousNetworkId) + if(networkId == _networkId) return; setNetwork(networkId); @@ -97,7 +238,7 @@ void InputWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int void InputWidget::updateEnabledState() { QModelIndex currentIndex = selectionModel()->currentIndex(); - + const Network *net = Client::networkModel()->networkByIndex(currentIndex); bool enabled = false; if(net) { @@ -133,13 +274,11 @@ void InputWidget::setNetwork(NetworkId networkId) { const Network *network = Client::network(networkId); if(network) { connect(network, SIGNAL(identitySet(IdentityId)), this, SLOT(setIdentity(IdentityId))); - if(network->me()) - connectMyIrcUser(); - else - connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser())); + connectMyIrcUser(); setIdentity(network->identity()); } else { setIdentity(0); + _networkId = 0; } } @@ -152,6 +291,9 @@ void InputWidget::connectMyIrcUser() { 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())); + updateNickSelector(); + } else { + connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser())); } } @@ -167,8 +309,9 @@ void InputWidget::setIdentity(IdentityId identityId) { const Identity *identity = Client::identity(identityId); if(identity) { - connect(identity, SIGNAL(nicksSet(QStringList)), - this, SLOT(updateNickSelector())); + connect(identity, SIGNAL(nicksSet(QStringList)), this, SLOT(updateNickSelector())); + } else { + _identityId = 0; } updateNickSelector(); } @@ -182,7 +325,7 @@ void InputWidget::updateNickSelector() const { const Identity *identity = Client::identity(net->identity()); if(!identity) { - qWarning() << "InputWidget::updateNickSelector(): can't find Identity for Network" << net->networkId(); + qWarning() << "InputWidget::updateNickSelector(): can't find Identity for Network" << net->networkId() << "IdentityId:" << net->identity(); return; } @@ -197,9 +340,12 @@ void InputWidget::updateNickSelector() const { return; IrcUser *me = net->me(); - if(me) - nicks[nickIdx] = net->myNick() + QString(" (+%1)").arg(me->userModes()); - + if(me) { + nicks[nickIdx] = net->myNick(); + if(!me->userModes().isEmpty()) + nicks[nickIdx] += QString(" (+%1)").arg(me->userModes()); + } + ui.ownNick->addItems(nicks); if(me && me->isAway()) @@ -212,13 +358,132 @@ void InputWidget::changeNick(const QString &newNick) const { const Network *net = currentNetwork(); if(!net || net->isMyNick(newNick)) return; - emit userInput(currentBufferInfo(), QString("/nick %1").arg(newNick)); + + // we reset the nick selecter as we have no confirmation yet, that this will succeed. + // if the action succeeds it will be properly updated anyways. + updateNickSelector(); + Client::userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/NICK %1").arg(newNick)); +} + +void InputWidget::on_inputEdit_textEntered(const QString &text) const { + Client::userInput(currentBufferInfo(), text); + ui.boldButton->setChecked(false); + ui.underlineButton->setChecked(false); + ui.italicButton->setChecked(false); + + QTextCharFormat fmt; + fmt.setFontWeight(QFont::Normal); + fmt.setFontUnderline(false); + fmt.setFontItalic(false); + fmt.clearForeground(); + fmt.clearBackground(); + inputLine()->setCurrentCharFormat(fmt); +} + +void InputWidget::mergeFormatOnSelection(const QTextCharFormat &format) { + QTextCursor cursor = inputLine()->textCursor(); + cursor.mergeCharFormat(format); + inputLine()->mergeCurrentCharFormat(format); +} + +void InputWidget::setFormatOnSelection(const QTextCharFormat &format) { + QTextCursor cursor = inputLine()->textCursor(); + cursor.setCharFormat(format); + inputLine()->setCurrentCharFormat(format); +} + +QTextCharFormat InputWidget::getFormatOfWordOrSelection() { + QTextCursor cursor = inputLine()->textCursor(); + return cursor.charFormat(); +} + +void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) { + fontChanged(format.font()); +} + +void InputWidget::on_boldButton_clicked(bool checked) { + QTextCharFormat fmt; + fmt.setFontWeight(checked ? QFont::Bold : QFont::Normal); + mergeFormatOnSelection(fmt); } -void InputWidget::sendText(QString text) { - emit userInput(currentBufferInfo(), text); +void InputWidget::on_underlineButton_clicked(bool checked) { + QTextCharFormat fmt; + fmt.setFontUnderline(checked); + mergeFormatOnSelection(fmt); } +void InputWidget::on_italicButton_clicked(bool checked) { + QTextCharFormat fmt; + fmt.setFontItalic(checked); + mergeFormatOnSelection(fmt); +} + +void InputWidget::fontChanged(const QFont &f) +{ + ui.boldButton->setChecked(f.bold()); + ui.italicButton->setChecked(f.italic()); + ui.underlineButton->setChecked(f.underline()); +} + +void InputWidget::colorChosen(QAction *action) { + QTextCharFormat fmt; + QColor color; + if (qVariantValue(action->data()) == "") { + color = Qt::transparent; + fmt = getFormatOfWordOrSelection(); + fmt.clearForeground(); + setFormatOnSelection(fmt); + } + else { + color = QColor(inputLine()->rgbColorFromMirc(qVariantValue(action->data()))); + fmt.setForeground(color); + mergeFormatOnSelection(fmt); + } + ui.textcolorButton->setDefaultAction(action); + ui.textcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-text-color"), color)); +} + +void InputWidget::colorHighlightChosen(QAction *action) { + QTextCharFormat fmt; + QColor color; + if (qVariantValue(action->data()) == "") { + color = Qt::transparent; + fmt = getFormatOfWordOrSelection(); + fmt.clearBackground(); + setFormatOnSelection(fmt); + } + else { + color = QColor(inputLine()->rgbColorFromMirc(qVariantValue(action->data()))); + fmt.setBackground(color); + mergeFormatOnSelection(fmt); + } + ui.highlightcolorButton->setDefaultAction(action); + ui.highlightcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-fill-color"), color)); +} + +void InputWidget::on_showStyleButton_toggled(bool checked) { + ui.styleFrame->setVisible(checked); + if (checked) { + ui.showStyleButton->setArrowType(Qt::LeftArrow); + } + else { + ui.showStyleButton->setArrowType(Qt::RightArrow); + } +} + +QIcon InputWidget::createColorToolButtonIcon(const QIcon &icon, const QColor &color) { + QPixmap pixmap(16, 16); + pixmap.fill(Qt::transparent); + QPainter painter(&pixmap); + QPixmap image = icon.pixmap(16,16); + QRect target(0, 0, 16, 14); + QRect source(0, 0, 16, 14); + painter.fillRect(QRect(0, 14, 16, 16), color); + painter.drawPixmap(target, image, source); + + return QIcon(pixmap); +} // MOUSE WHEEL FILTER MouseWheelFilter::MouseWheelFilter(QObject *parent)