X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=be18830b0795eb1938c4f91cbed24e0e2a00adaf;hp=f885819d20a20701483098df50609c44419beed3;hb=a9c2f4157175cfb775980eb72c8312cdffcbfe00;hpb=dcdc88676f6bf6c961c554e1ff0d160082ba0973 diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index f885819d..be18830b 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,35 +20,67 @@ #include "inputwidget.h" -#include "ircuser.h" -#include "client.h" -#include "networkmodel.h" -#include "jumpkeyhandler.h" -#include "qtuisettings.h" - #include "action.h" #include "actioncollection.h" +#include "bufferview.h" +#include "client.h" +#include "iconloader.h" +#include "ircuser.h" +#include "jumpkeyhandler.h" +#include "networkmodel.h" #include "qtui.h" +#include "qtuisettings.h" +#include "tabcompleter.h" 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); + 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)); + ui.inputEdit->installEventFilter(this); - QtUiSettings s; - bool useInputLineFont = s.value("UseInputLineFont", QVariant(false)).toBool(); - if(useInputLineFont) { - ui.inputEdit->setFont(s.value("InputLineFont").value()); - } + ui.inputEdit->setMinHeight(1); + ui.inputEdit->setMaxHeight(5); + ui.inputEdit->setMode(MultiLineEdit::MultiLine); + ui.inputEdit->setPasteProtectionEnabled(true); + + 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("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(); @@ -56,17 +88,113 @@ InputWidget::InputWidget(QWidget *parent) connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus())); activateInputline->setText(tr("Focus Input Line")); activateInputline->setShortcut(tr("Ctrl+L")); + + actionTextBold = coll->add("TextBold"); + QFont bold; + bold.setBold(true); + actionTextBold->setFont(bold); + actionTextBold->setText(tr("Bold")); + actionTextBold->setShortcut(tr("Ctrl+B")); + actionTextBold->setCheckable(true); + connect(actionTextBold, SIGNAL(triggered()), SLOT(textBold())); + + actionTextUnderline = coll->add("TextUnderline"); + QFont underline; + underline.setUnderline(true); + actionTextUnderline->setFont(underline); + actionTextUnderline->setText(tr("Underline")); + actionTextUnderline->setShortcut(tr("Ctrl+U")); + actionTextUnderline->setCheckable(true); + connect(actionTextUnderline, SIGNAL(triggered()), SLOT(textUnderline())); + + actionTextItalic = coll->add("TextItalic"); + QFont italic; + italic.setItalic(true); + actionTextItalic->setFont(italic); + actionTextItalic->setText(tr("Italic")); + actionTextItalic->setShortcut(tr("Ctrl+I")); + actionTextItalic->setCheckable(true); + connect(actionTextItalic, SIGNAL(triggered()), SLOT(textItalic())); + + 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::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) { - if(current.data(NetworkModel::BufferInfoRole) == previous.data(NetworkModel::BufferInfoRole)) + Q_UNUSED(previous) + NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value(); + if(networkId == _networkId) return; - const Network *net = Client::networkModel()->networkByIndex(current); - setNetwork(net); + setNetwork(networkId); updateNickSelector(); updateEnabledState(); } @@ -78,9 +206,25 @@ void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot } }; +void InputWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) { + NetworkId networkId; + QModelIndex child; + for(int row = start; row <= end; row++) { + child = model()->index(row, 0, parent); + if(NetworkModel::NetworkItemType != child.data(NetworkModel::ItemTypeRole).toInt()) + continue; + networkId = child.data(NetworkModel::NetworkIdRole).value(); + if(networkId == _networkId) { + setNetwork(0); + updateNickSelector(); + return; + } + } +} + void InputWidget::updateEnabledState() { QModelIndex currentIndex = selectionModel()->currentIndex(); - + const Network *net = Client::networkModel()->networkByIndex(currentIndex); bool enabled = false; if(net) { @@ -100,8 +244,8 @@ BufferInfo InputWidget::currentBufferInfo() const { return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value(); }; -void InputWidget::setNetwork(const Network *network) { - if(!network || _networkId == network->networkId()) +void InputWidget::setNetwork(NetworkId networkId) { + if(_networkId == networkId) return; const Network *previousNet = Client::network(_networkId); @@ -111,20 +255,35 @@ void InputWidget::setNetwork(const Network *network) { disconnect(previousNet->me(), 0, this, 0); } + _networkId = networkId; + + const Network *network = Client::network(networkId); if(network) { - _networkId = network->networkId(); connect(network, SIGNAL(identitySet(IdentityId)), this, SLOT(setIdentity(IdentityId))); - if(network->me()) { - connect(network->me(), SIGNAL(nickSet(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())); - } + connectMyIrcUser(); + setIdentity(network->identity()); + } else { + setIdentity(0); + _networkId = 0; } - setIdentity(network->identity()); } -void InputWidget::setIdentity(const IdentityId &identityId) { +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())); + updateNickSelector(); + } else { + connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser())); + } +} + +void InputWidget::setIdentity(IdentityId identityId) { if(_identityId == identityId) return; @@ -132,11 +291,13 @@ void InputWidget::setIdentity(const IdentityId &identityId) { if(previousIdentity) disconnect(previousIdentity, 0, this, 0); + _identityId = identityId; + const Identity *identity = Client::identity(identityId); if(identity) { - _identityId = identityId; - connect(identity, SIGNAL(nicksSet(QStringList)), - this, SLOT(updateNickSelector())); + connect(identity, SIGNAL(nicksSet(QStringList)), this, SLOT(updateNickSelector())); + } else { + _identityId = 0; } updateNickSelector(); } @@ -150,7 +311,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; } @@ -161,10 +322,21 @@ void InputWidget::updateNickSelector() const { nickIdx = 0; } - if(net->me() && nickIdx < nicks.count()) - nicks[nickIdx] = net->myNick() + QString(" (+%1)").arg(net->me()->userModes()); - + if(nicks.isEmpty()) + return; + + IrcUser *me = net->me(); + 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()) + ui.ownNick->setItemData(nickIdx, SmallIcon("user-away"), Qt::DecorationRole); + ui.ownNick->setCurrentIndex(nickIdx); } @@ -172,13 +344,73 @@ 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); + actionTextBold->setChecked(false); + actionTextUnderline->setChecked(false); + actionTextItalic->setChecked(false); + inputLine()->setFontWeight(QFont::Normal); + inputLine()->setFontUnderline(false); + inputLine()->setFontItalic(false); } -void InputWidget::sendText(QString text) { - emit userInput(currentBufferInfo(), text); +void InputWidget::mergeFormatOnWordOrSelection(const QTextCharFormat &format) { + QTextCursor cursor = inputLine()->textCursor(); + if (!cursor.hasSelection()) + cursor.select(QTextCursor::WordUnderCursor); + cursor.mergeCharFormat(format); + inputLine()->mergeCurrentCharFormat(format); } +void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) { + fontChanged(format.font()); + colorChanged(format.foreground().color(), format.background().color()); +} + +void InputWidget::textBold() +{ + if (inputLine()->hasFocus()) { + QTextCharFormat fmt; + fmt.setFontWeight(actionTextBold->isChecked() ? QFont::Bold : QFont::Normal); + mergeFormatOnWordOrSelection(fmt); + } +} + +void InputWidget::textUnderline() +{ + if (inputLine()->hasFocus()) { + QTextCharFormat fmt; + fmt.setFontUnderline(actionTextUnderline->isChecked()); + mergeFormatOnWordOrSelection(fmt); + } +} + +void InputWidget::textItalic() +{ + if (inputLine()->hasFocus()) { + QTextCharFormat fmt; + fmt.setFontItalic(actionTextItalic->isChecked()); + mergeFormatOnWordOrSelection(fmt); + } +} + +void InputWidget::fontChanged(const QFont &f) +{ + actionTextBold->setChecked(f.bold()); + actionTextItalic->setChecked(f.italic()); + actionTextUnderline->setChecked(f.underline()); +} + +void InputWidget::colorChanged(const QColor &fg, const QColor &bg) { + //TODO update colorpicker +} // MOUSE WHEEL FILTER MouseWheelFilter::MouseWheelFilter(QObject *parent)