X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=737387fbcfa8ffca3936742f547112523b966205;hp=0c66767884002a619a9afcf9af55ed0538b6b5df;hb=983164018267de71e92c025ff81e4f10b8ddc5b0;hpb=1b2d3ea62867220d7bffc3b23dda1dc14d429007 diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index 0c667678..737387fb 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,66 +20,109 @@ #include "inputwidget.h" -#include "ircuser.h" +#include "action.h" +#include "actioncollection.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" InputWidget::InputWidget(QWidget *parent) : AbstractItemView(parent), - validBuffer(false) + _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))); setFocusProxy(ui.inputEdit); + ui.ownNick->setSizeAdjustPolicy(QComboBox::AdjustToContents); ui.ownNick->installEventFilter(new MouseWheelFilter(this)); - ui.inputEdit->installEventFilter(new JumpKeyHandler(this)); + ui.inputEdit->installEventFilter(new JumpKeyHandler(this)); + + 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::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { - Q_UNUSED(previous); - - validBuffer = current.isValid(); +void InputWidget::setCustomFont(const QVariant &v) { + QFont font = v.value(); + if(font.family().isEmpty()) + font = QApplication::font(); + ui.inputEdit->setCustomFont(font); +} - if(!validBuffer) - return; - - QVariant variant; - variant = current.data(NetworkModel::BufferInfoRole); - if(!variant.isValid()) +void InputWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { + Q_UNUSED(previous) + NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value(); + if(networkId == _networkId) return; - currentBufferInfo = current.data(NetworkModel::BufferInfoRole).value(); - 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; + } + } +} -const Network *InputWidget::currentNetwork() const { - if(!validBuffer) - return 0; +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); } -void InputWidget::setNetwork(const Network *network) { - if(!network || _networkId == network->networkId()) +BufferInfo InputWidget::currentBufferInfo() const { + return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value(); +}; + +void InputWidget::setNetwork(NetworkId networkId) { + if(_networkId == networkId) return; const Network *previousNet = Client::network(_networkId); @@ -89,20 +132,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; @@ -110,11 +168,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(); } @@ -128,7 +188,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; } @@ -139,10 +199,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); } @@ -150,11 +221,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); }