X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=737387fbcfa8ffca3936742f547112523b966205;hp=f885819d20a20701483098df50609c44419beed3;hb=983164018267de71e92c025ff81e4f10b8ddc5b0;hpb=dcdc88676f6bf6c961c554e1ff0d160082ba0973 diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index f885819d..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,15 +20,15 @@ #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 "client.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), @@ -37,18 +37,15 @@ InputWidget::InputWidget(QWidget *parent) 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)); - QtUiSettings s; - bool useInputLineFont = s.value("UseInputLineFont", QVariant(false)).toBool(); - if(useInputLineFont) { - ui.inputEdit->setFont(s.value("InputLineFont").value()); - } + QtUiStyleSettings s("Fonts"); + s.notify("InputLine", this, SLOT(setCustomFont(QVariant))); + setCustomFont(s.value("InputLine", QFont())); ActionCollection *coll = QtUi::actionCollection(); @@ -61,12 +58,20 @@ InputWidget::InputWidget(QWidget *parent) InputWidget::~InputWidget() { } +void InputWidget::setCustomFont(const QVariant &v) { + QFont font = v.value(); + if(font.family().isEmpty()) + font = QApplication::font(); + ui.inputEdit->setCustomFont(font); +} + 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,6 +83,22 @@ 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(); @@ -100,8 +121,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 +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; @@ -132,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(); } @@ -150,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; } @@ -161,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); } @@ -172,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); }