From: Dirk Rettschlag Date: Tue, 26 Jan 2010 11:38:23 +0000 (+0100) Subject: added different information in the TopicWidget based on BufferType X-Git-Tag: 0.6-beta1~63 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7c74d84b7684b2e7d96736a1122184c2ce19fcc7 added different information in the TopicWidget based on BufferType --- diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 6bc96f80..8feb777a 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -424,7 +424,7 @@ QString QueryBufferItem::toolTip(int column) const { toolTip.append(tr("Query with %1").arg(bufferName())); if(_ircUser) { - if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes())); + if(_ircUser->userModes() != "") toolTip[0].append(QString(" (+%1)").arg(_ircUser->userModes())); if(_ircUser->isAway()) { toolTip[0].append(QString(" (away%1)").arg(!_ircUser->awayMessage().isEmpty() ? (QString(" ") + _ircUser->awayMessage()) : QString())); } diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp index 8ec55e4b..366582ab 100644 --- a/src/qtui/topicwidget.cpp +++ b/src/qtui/topicwidget.cpp @@ -48,18 +48,19 @@ TopicWidget::TopicWidget(QWidget *parent) setCustomFont(fs.value("TopicWidget", QFont())); _mouseEntered = false; + _readonly = false; } void TopicWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(previous); - setTopic(current.sibling(current.row(), 1).data().toString()); + setTopic(current); } void TopicWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { QItemSelectionRange changedArea(topLeft, bottomRight); QModelIndex currentTopicIndex = selectionModel()->currentIndex().sibling(selectionModel()->currentIndex().row(), 1); if(changedArea.contains(currentTopicIndex)) - setTopic(currentTopicIndex.data().toString()); + setTopic(selectionModel()->currentIndex()); }; void TopicWidget::setUseCustomFont(const QVariant &v) { @@ -87,16 +88,56 @@ void TopicWidget::setCustomFont(const QFont &f) { ui.topicLabel->setCustomFont(font); } -void TopicWidget::setTopic(const QString &newtopic) { - if(_topic == newtopic) +void TopicWidget::setTopic(const QModelIndex &index) { + BufferId id = index.sibling(index.row(), 0).data(NetworkModel::BufferIdRole).value(); + if(!id.isValid()) return; + const Network *network = Client::network(Client::networkModel()->networkId(id)); + + QString newtopic; + if(Client::networkModel()->bufferType(id) == BufferInfo::StatusBuffer) { + newtopic = QString("%1 (%2) | %3 | %4") + .arg(Qt::escape(network->networkName())) + .arg(Qt::escape(network->currentServer())) + .arg(tr("Users: %1").arg(network->ircUsers().count())) + .arg(tr("Lag: %1 msecs").arg(network->latency())); + _readonly = true; + } else if(Client::networkModel()->bufferType(id) == BufferInfo::QueryBuffer) { + newtopic = QString("%1").arg(index.sibling(index.row(), 0).data().toString()); + const IrcUser *user = network->ircUser(QString(index.sibling(index.row(), 0).data().toString())); + if (user) { + if(!user->userModes().isEmpty()) + newtopic.append(QString(" (+%1)").arg(user->userModes())); + if(!user->realName().isEmpty()) + newtopic.append(QString(" | %1").arg(user->realName())); + newtopic.append(QString(" | %1").arg(user->hostmask().remove(0, user->hostmask().indexOf("!")+1))); + } + _readonly = true; + } else if(Client::networkModel()->bufferType(id) == BufferInfo::ChannelBuffer) { + newtopic = index.sibling(index.row(), 1).data().toString(); + _readonly = false; + } + else { + newtopic = ""; + _readonly = true; + } + + ui.topicEditButton->setVisible(!_readonly); + _topic = newtopic; ui.topicLabel->setText(newtopic); ui.topicLineEdit->setText(newtopic); switchPlain(); } +void TopicWidget::setReadOnly(const bool &readonly) { + if(_readonly == readonly) + return; + + _readonly = readonly; +} + void TopicWidget::updateResizeMode() { StyledLabel::ResizeMode mode = StyledLabel::NoResize; UiSettings s("TopicWidget"); @@ -146,20 +187,20 @@ void TopicWidget::switchPlain() { // filter for the input widget to switch back to normal mode bool TopicWidget::eventFilter(QObject *obj, QEvent *event) { - + if(event->type() == QEvent::FocusOut && !_mouseEntered) { switchPlain(); return true; } - + if(event->type() == QEvent::Enter) { _mouseEntered = true; } - + if(event->type() == QEvent::Leave) { _mouseEntered = false; } - + if(event->type() != QEvent::KeyRelease) return QObject::eventFilter(obj, event); @@ -171,4 +212,4 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event) { } return false; -} +} \ No newline at end of file diff --git a/src/qtui/topicwidget.h b/src/qtui/topicwidget.h index b8fcb420..f293851d 100644 --- a/src/qtui/topicwidget.h +++ b/src/qtui/topicwidget.h @@ -31,10 +31,12 @@ class TopicWidget : public AbstractItemView { public: TopicWidget(QWidget *parent = 0); - void setTopic(const QString &newtopic); + void setTopic(const QModelIndex& index); void setCustomFont(const QFont &); + void setReadOnly(const bool &readonly); virtual bool eventFilter(QObject *obj, QEvent *event); + inline bool isReadOnly() const { return _readonly; } protected slots: virtual void currentChanged(const QModelIndex ¤t, const QModelIndex &previous); @@ -55,6 +57,8 @@ private: QString _topic; bool _mouseEntered; + bool _readonly; + };