X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=dc8b6a6a6b1ada1fb4c88cda00e9158f41b7fa6f;hp=53b64c83547aa1545d2a2493f47e94c652a161dd;hb=b819fa39f3053f047f5389456570d00020051688;hpb=100cfa79242249feff3bc3265787b46d2dc621b0 diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index 53b64c83..dc8b6a6a 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,54 +20,143 @@ #include "inputwidget.h" -#include "ircuser.h" +#include "action.h" +#include "actioncollection.h" +#include "bufferview.h" #include "client.h" -#include "networkmodel.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.inputEdit, SIGNAL(textEntered(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)); - 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); + + new TabCompleter(ui.inputEdit); + + QtUiStyleSettings s("Fonts"); + s.notify("InputLine", this, SLOT(setCustomFont(QVariant))); + setCustomFont(s.value("InputLine", QFont())); + + 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")); } InputWidget::~InputWidget() { } +void InputWidget::setCustomFont(const QVariant &v) { + QFont font = v.value(); + if(font.family().isEmpty()) + font = QApplication::font(); + ui.inputEdit->setCustomFont(font); +} + +bool InputWidget::eventFilter(QObject *watched, QEvent *event) { + if(event->type() != QEvent::KeyPress) + return false; + + // keys from BufferView should be sent to (and focus) the input line + BufferView *view = qobject_cast(watched); + if(view) { + QKeyEvent *keyEvent = static_cast(event); + 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; + } else + return false; + } + } + return false; +} + +void InputWidget::keyPressEvent(QKeyEvent * event) { + if(event->matches(QKeySequence::Find)) { + QAction *act = GraphicalUi::actionCollection()->action("ToggleSearchBar"); + if(act) { + act->toggle(); + return; + } + } + AbstractItemView::keyPressEvent(event); +} + 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; - setNetwork(Client::networkModel()->networkByIndex(current)); + setNetwork(networkId); updateNickSelector(); - ui.inputEdit->setEnabled(current.data(NetworkModel::ItemActiveRole).value()); + updateEnabledState(); } void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { QItemSelectionRange changedArea(topLeft, bottomRight); - QModelIndex currentIndex = selectionModel()->currentIndex(); - if(changedArea.contains(currentIndex)) { - ui.inputEdit->setEnabled(currentIndex.data(NetworkModel::ItemActiveRole).value()); + if(changedArea.contains(selectionModel()->currentIndex())) { + updateEnabledState(); } }; +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) { + // disable inputline if it's a channelbuffer we parted from or... + enabled = (currentIndex.data(NetworkModel::ItemActiveRole).value() || (currentIndex.data(NetworkModel::BufferTypeRole).toInt() != BufferInfo::ChannelBuffer)); + // ... if we're not connected to the network at all + enabled &= net->isConnected(); + } + ui.inputEdit->setEnabled(enabled); +} const Network *InputWidget::currentNetwork() const { return Client::network(_networkId); @@ -77,8 +166,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); @@ -88,20 +177,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; @@ -109,11 +213,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(); } @@ -127,7 +233,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; } @@ -138,10 +244,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); } @@ -149,11 +266,15 @@ 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::sendText(QString text) { - emit userInput(currentBufferInfo(), text); +void InputWidget::sendText(const QString &text) const { + Client::userInput(currentBufferInfo(), text); }