X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=541ddb5d172b622c1afb7b225656e91309ece50f;hp=dbeb571b7b055b3dae81692244e2924efdc608e5;hb=e2aa07398950ba83b47d1772eb8fb23bc8fdd931;hpb=748f25bbae0e0ca8df58ec69df8d19c84ae77252 diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp index dbeb571b..541ddb5d 100644 --- a/src/qtui/bufferwidget.cpp +++ b/src/qtui/bufferwidget.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -20,19 +20,20 @@ #include "bufferwidget.h" #include "buffer.h" -#include "chatline.h" +#include "chatline-old.h" #include "chatwidget.h" #include "settings.h" - -BufferWidget::BufferWidget(QWidget *parent) : QWidget(parent) { +#include "client.h" +#include "network.h" + +BufferWidget::BufferWidget(QWidget *parent) + : QWidget(parent), + _currentBuffer(0), + _currentNetwork(0) +{ ui.setupUi(this); - - curBuf = 0; - //setBaseSize(QSize(600,400)); - //setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + ui.ownNick->clear(); // TODO add nick history connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed())); - connect(this, SIGNAL(nickListUpdated(QStringList)), ui.inputEdit, SLOT(updateNickList(QStringList))); - } void BufferWidget::init() { @@ -40,95 +41,73 @@ void BufferWidget::init() { } BufferWidget::~BufferWidget() { - foreach(BufferState *s, states.values()) { - delete s; - } } -void BufferWidget::setBuffer(Buffer *buf) { - BufferState *state; - curBuf = buf; - if(states.contains(buf)) { - state = states[buf]; +BufferId BufferWidget::currentBuffer() const { + return _currentBuffer; +} + +void BufferWidget::setCurrentBuffer(BufferId bufferId) { + ChatWidget *chatWidget; + if(_chatWidgets.contains(bufferId)) { + chatWidget = _chatWidgets[bufferId]; } else { - BufferState *s = new BufferState; - s->currentLine = Settings::guiValue(QString("BufferStates/%1/%2/currentLine").arg(buf->networkName()).arg(buf->bufferName()), -1).toInt(); - if(buf->bufferType() == Buffer::ChannelType) { - s->splitterState = Settings::guiValue(QString("BufferStates/%1/%2/splitter").arg(buf->networkName()).arg(buf->bufferName())).toByteArray(); - s->splitter = new QSplitter(this); - s->chatWidget = new ChatWidget(s->splitter); - s->nickTree = new QTreeWidget(s->splitter); - s->nickTree->headerItem()->setHidden(true); - s->nickTree->setRootIsDecorated(false); - s->page = s->splitter; - s->ownNick = buf->ownNick(); - s->topic = buf->topic(); - updateNickList(s, buf->nickList()); - s->splitter->restoreState(s->splitterState); - connect(buf, SIGNAL(nickListChanged(QVariantMap)), this, SLOT(updateNickList(QVariantMap))); - connect(s->nickTree, SIGNAL(itemExpanded(QTreeWidgetItem *)), this, SLOT(itemExpansionChanged(QTreeWidgetItem*))); - connect(s->nickTree, SIGNAL(itemCollapsed(QTreeWidgetItem *)), this, SLOT(itemExpansionChanged(QTreeWidgetItem*))); - } else { - s->splitter = 0; s->nickTree = 0; - s->chatWidget = new ChatWidget(this); - s->page = s->chatWidget; - s->ownNick = buf->ownNick(); - s->topic = buf->bufferName(); + Buffer *buf = Client::buffer(bufferId); + if(!buf) { + qWarning() << "BufferWidget::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId; + return; } - s->opsExpanded = Settings::guiValue(QString("BufferStates/%1/%2/opsExpanded").arg(buf->networkName()).arg(buf->bufferName()), true).toBool(); - s->voicedExpanded = Settings::guiValue(QString("BufferStates/%1/%2/voicedExpanded").arg(buf->networkName()).arg(buf->bufferName()), true).toBool(); - s->usersExpanded = Settings::guiValue(QString("BufferStates/%1/%2/usersExpanded").arg(buf->networkName()).arg(buf->bufferName()), true).toBool(); - states[buf] = s; - state = s; - state->chatWidget->init(networkName, bufferName); + chatWidget = new ChatWidget(this); + chatWidget->init(bufferId); QList lines; QList msgs = buf->contents(); foreach(AbstractUiMsg *msg, msgs) { lines.append(dynamic_cast(msg)); } - state->chatWidget->setContents(lines); - connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), state->chatWidget, SLOT(appendMsg(AbstractUiMsg *))); - connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), state->chatWidget, SLOT(prependMsg(AbstractUiMsg *))); - connect(buf, SIGNAL(topicSet(QString)), this, SLOT(setTopic(QString))); - connect(buf, SIGNAL(ownNickSet(QString)), this, SLOT(setOwnNick(QString))); - ui.stackedWidget->addWidget(s->page); + chatWidget->setContents(lines); + connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *))); + connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *))); + _chatWidgets[bufferId] = chatWidget; + ui.stackedWidget->addWidget(chatWidget); } - ui.stackedWidget->setCurrentWidget(state->page); - ui.topicEdit->setText(buf->topic()); - chatWidget = state->chatWidget; - nickTree = state->nickTree; - splitter = state->splitter; - //ui.ownNick->set + ui.stackedWidget->setCurrentWidget(chatWidget); disconnect(this, SIGNAL(userInput(QString)), 0, 0); - connect(this, SIGNAL(userInput(QString)), buf, SLOT(processUserInput(QString))); - state->chatWidget->setFocusProxy(ui.inputEdit); + connect(this, SIGNAL(userInput(QString)), Client::buffer(bufferId), SLOT(processUserInput(QString))); + chatWidget->setFocusProxy(ui.inputEdit); ui.inputEdit->setFocus(); - ui.topicEdit->setText(state->topic); - ui.ownNick->clear(); // TODO add nick history - ui.ownNick->addItem(state->ownNick); - updateTitle(); + +} + +NetworkId BufferWidget::currentNetwork() const { + return _currentNetwork; +} + +void BufferWidget::setCurrentNetwork(NetworkId networkId) { + Network *net = Client::network(networkId); + if(!net) + return; + _currentNetwork = networkId; + + ui.ownNick->clear(); + ui.ownNick->addItem(net->myNick()); +} + +void BufferWidget::removeBuffer(BufferId bufferId) { + if(!_chatWidgets.contains(bufferId)) + return; + + ChatWidget *chatWidget = _chatWidgets.take(bufferId); + ui.stackedWidget->removeWidget(chatWidget); + chatWidget->deleteLater(); } void BufferWidget::saveState() { - foreach(Buffer *buf, states.keys()) { - BufferState *s = states[buf]; - if(s->splitter) Settings::setGuiValue(QString("BufferStates/%1/%2/splitter").arg(buf->networkName()).arg(buf->bufferName()), s->splitter->saveState()); - Settings::setGuiValue(QString("BufferStates/%1/%2/currentLine").arg(buf->networkName()).arg(buf->bufferName()), s->currentLine); - Settings::setGuiValue(QString("BufferStates/%1/%2/opsExpanded").arg(buf->networkName()).arg(buf->bufferName()), s->opsExpanded); - Settings::setGuiValue(QString("BufferStates/%1/%2/voicedExpanded").arg(buf->networkName()).arg(buf->bufferName()), s->voicedExpanded); - Settings::setGuiValue(QString("BufferStates/%1/%2/usersExpanded").arg(buf->networkName()).arg(buf->bufferName()), s->usersExpanded); - } } QSize BufferWidget::sizeHint() const { return QSize(800,400); } -void BufferWidget::updateTitle() { - QString title = QString("%1 in %2 [%3]: %4").arg(ui.ownNick->currentText()).arg(bufferName).arg(networkName).arg(ui.topicEdit->text()); - setWindowTitle(title); -} - void BufferWidget::enterPressed() { QStringList lines = ui.inputEdit->text().split('\n', QString::SkipEmptyParts); foreach(QString msg, lines) { @@ -138,19 +117,7 @@ void BufferWidget::enterPressed() { ui.inputEdit->clear(); } -void BufferWidget::setActive(bool act) { - if(act != active) { - active = act; - //renderContents(); - //scrollToEnd(); - } -} -void BufferWidget::resizeEvent ( QResizeEvent * event ) { - //qDebug() << "resizing:" << bufferName << event->size(); - QWidget::resizeEvent(event); - -} /* void BufferWidget::displayMsg(Message msg) { @@ -158,76 +125,3 @@ void BufferWidget::displayMsg(Message msg) { } */ -void BufferWidget::setOwnNick(QString nick) { - Buffer *buf = qobject_cast(sender()); - Q_ASSERT(buf); - states[buf]->ownNick = nick; - if(buf == curBuf) { - ui.ownNick->clear(); - ui.ownNick->addItem(nick); - updateTitle(); - } -} - -void BufferWidget::setTopic(QString topic) { - Buffer *buf = qobject_cast(sender()); - Q_ASSERT(buf); - states[buf]->topic = topic; - if(buf == curBuf) { - ui.topicEdit->setText(topic); - updateTitle(); - } -} - - -void BufferWidget::updateNickList(QVariantMap nicks) { - Buffer *buf = qobject_cast(sender()); - Q_ASSERT(buf); - updateNickList(states[buf], nicks); -} - -// TODO Use 005 -void BufferWidget::updateNickList(BufferState *state, QVariantMap nicks) { - emit nickListUpdated(nicks.keys()); - QTreeWidget *tree = state->nickTree; - if(!tree) return; - tree->clear(); - if(nicks.count() != 1) tree->setHeaderLabel(tr("%1 Users").arg(nicks.count())); - else tree->setHeaderLabel(tr("1 User")); - QTreeWidgetItem *ops = new QTreeWidgetItem(); - QTreeWidgetItem *voiced = new QTreeWidgetItem(); - QTreeWidgetItem *users = new QTreeWidgetItem(); - // To sort case-insensitive, we have to put all nicks in a map which is sorted by (lowercase) key... - QMap sorted; - foreach(QString n, nicks.keys()) { sorted[n.toLower()] = n; } - foreach(QString n, sorted.keys()) { - QString nick = sorted[n]; - QString mode = nicks[nick].toMap()["Channels"].toMap()[bufferName].toMap()["Mode"].toString(); - if(mode.contains('o')) { new QTreeWidgetItem(ops, QStringList(QString("@%1").arg(nick))); } - else if(mode.contains('v')) { new QTreeWidgetItem(voiced, QStringList(QString("+%1").arg(nick))); } - else new QTreeWidgetItem(users, QStringList(nick)); - } - if(ops->childCount()) { - ops->setText(0, tr("%1 Operators").arg(ops->childCount())); - tree->addTopLevelItem(ops); - ops->setExpanded(state->opsExpanded); - } else delete ops; - if(voiced->childCount()) { - voiced->setText(0, tr("%1 Voiced").arg(voiced->childCount())); - tree->addTopLevelItem(voiced); - voiced->setExpanded(state->voicedExpanded); - } else delete voiced; - if(users->childCount()) { - users->setText(0, tr("%1 Users").arg(users->childCount())); - tree->addTopLevelItem(users); - users->setExpanded(state->usersExpanded); - } else delete users; -} - -// TODO Use 005 and additional user modes -void BufferWidget::itemExpansionChanged(QTreeWidgetItem *item) { - if(item->child(0)->text(0).startsWith('@')) states[curBuf]->opsExpanded = item->isExpanded(); - else if(item->child(0)->text(0).startsWith('+')) states[curBuf]->voicedExpanded = item->isExpanded(); - else states[curBuf]->usersExpanded = item->isExpanded(); -} -