X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fnetworkmodel.cpp;h=6c6a3e806f2f3271bb2735895a3eb8b09f46621e;hb=4ba498c04b9aefee2e3ab9d2eb0645f86e5d1968;hp=75dd515ae29a03a4bbaa60117c5c1b2ba76a24e7;hpb=819b4ac594c6f7d2dba211322abd907a3991771b;p=quassel.git
diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 75dd515a..6c6a3e80 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -33,7 +33,6 @@
#include "util.h" // get rid of this (needed for isChannelName)
-// #define PHONDEV
/*****************************************
* Fancy Buffer Items
@@ -145,6 +144,9 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
}
void BufferItem::ircChannelDestroyed() {
+ Q_CHECK_PTR(_ircChannel);
+ disconnect(_ircChannel, 0, this, 0);
+ _ircChannel = 0;
emit dataChanged();
removeAllChilds();
}
@@ -160,7 +162,7 @@ void BufferItem::setBufferName(const QString &name) {
_bufferName = name;
// as long as we need those bufferInfos, we have to update that one aswell.
// pretty ugly though :/
- _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), _bufferInfo.bufferName());
+ _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name);
emit dataChanged(0);
}
@@ -289,14 +291,14 @@ QString BufferItem::toolTip(int column) const {
switch(bufferType()) {
case BufferInfo::StatusBuffer: {
QString netName = Client::network(bufferInfo().networkId())->networkName();
- toolTip.append(QString("Status buffer from %1").arg(netName));
+ toolTip.append(tr("Status buffer of %1").arg(netName));
break;
}
case BufferInfo::ChannelBuffer:
- toolTip.append(QString("
Channel %1
").arg(bufferName()));
+ toolTip.append(tr("Channel %1").arg(bufferName()));
if(isActive()) {
//TODO: add channel modes
- toolTip.append(QString("Users: %1").arg(nickCount()));
+ toolTip.append(tr("Users: %1").arg(nickCount()));
BufferSettings s;
bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
@@ -306,23 +308,23 @@ QString BufferItem::toolTip(int column) const {
_topic.replace(QString("<"), QString("<"));
_topic.replace(QString(">"), QString(">"));
toolTip.append(QString(" "));
- toolTip.append(QString("Topic: %1").arg(_topic));
+ toolTip.append(tr("Topic: %1").arg(_topic));
}
}
} else {
- toolTip.append(QString("Not active
Double-click to join"));
+ toolTip.append(tr("Not active
Double-click to join"));
}
break;
case BufferInfo::QueryBuffer:
- toolTip.append(QString("Query with %1").arg(bufferName()));
- if(topic() != "") toolTip.append(QString("Away Message: %1").arg(topic()));
+ toolTip.append(tr("Query with %1").arg(bufferName()));
+ if(topic() != "") toolTip.append(tr("Away Message: %1").arg(topic()));
break;
default: //this should not happen
- toolTip.append(QString("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName()));
+ toolTip.append(tr("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName()));
break;
}
- return QString(" %1
").arg(toolTip.join("
"));
+ return tr(" %1
").arg(toolTip.join("
"));
}
/*
@@ -415,7 +417,9 @@ void NetworkItem::attachNetwork(Network *network) {
this, SLOT(attachIrcChannel(QString)));
connect(network, SIGNAL(connectedSet(bool)),
this, SIGNAL(dataChanged()));
-
+ connect(network, SIGNAL(destroyed()),
+ this, SIGNAL(dataChanged()));
+
emit dataChanged();
}
@@ -463,27 +467,26 @@ QString NetworkItem::toolTip(int column) const {
*****************************************/
// we hardcode this even though we have PREFIX in network... but that wouldn't help with mapping modes to
// category strings anyway.
-// TODO make this translateable depending on the number of users in a category
-// -> we can't set the real string here, because tr() needs to get the actual number as second param
-// -> tr("%n User(s)", n) needs to be used somewhere where we do know the user number n
-const QList UserCategoryItem::categories = QList()
- << UserCategoryItem::Category('q', tr("Owners"))
- << UserCategoryItem::Category('a', tr("Admins"))
- << UserCategoryItem::Category('o', tr("Operators"))
- << UserCategoryItem::Category('h', tr("Half-Ops"))
- << UserCategoryItem::Category('v', tr("Voiced"));
+const QList UserCategoryItem::categories = QList() << 'q' << 'a' << 'o' << 'h' << 'v';
UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
- : PropertyMapItem(QStringList() << "categoryId", parent),
+ : PropertyMapItem(QStringList() << "categoryName", parent),
_category(category)
{
+
}
-QString UserCategoryItem::categoryId() {
- if(_category < categories.count())
- return categories[_category].displayString;
- else
- return tr("Users");
+// caching this makes no sense, since we display the user number dynamically
+QString UserCategoryItem::categoryName() const {
+ int n = childCount();
+ switch(_category) {
+ case 0: return tr("%n Owner(s)", 0, n);
+ case 1: return tr("%n Admin(s)", 0, n);
+ case 2: return tr("%n Operator(s)", 0, n);
+ case 3: return tr("%n Half-Op(s)", 0, n);
+ case 4: return tr("%n Voiced", 0, n);
+ default: return tr("%n User(s)", 0, n);
+ }
}
quint64 UserCategoryItem::id() const {
@@ -503,7 +506,7 @@ bool UserCategoryItem::removeUser(IrcUser *ircUser) {
int UserCategoryItem::categoryFromModes(const QString &modes) {
for(int i = 0; i < categories.count(); i++) {
- if(modes.contains(categories[i].mode))
+ if(modes.contains(categories[i]))
return i;
}
return categories.count();
@@ -511,6 +514,8 @@ int UserCategoryItem::categoryFromModes(const QString &modes) {
QVariant UserCategoryItem::data(int column, int role) const {
switch(role) {
+ case TreeModel::SortRole:
+ return _category;
case NetworkModel::ItemActiveRole:
return true;
case NetworkModel::ItemTypeRole:
@@ -526,7 +531,7 @@ QVariant UserCategoryItem::data(int column, int role) const {
}
}
-
+
/*****************************************
* Irc User Items
*****************************************/
@@ -590,30 +595,17 @@ QString IrcUserItem::toolTip(int column) const {
if(_ircUser->isAway()) toolTip[0].append(" is away");
if(!_ircUser->awayMessage().isEmpty()) toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName());
- if(!_ircUser->ircOperator().isEmpty()) toolTip.append(_ircUser->ircOperator());
+ if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(nickName()).arg(_ircUser->ircOperator()));
+ if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost());
+ if(!_ircUser->whoisServiceReply().isEmpty()) toolTip.append(_ircUser->whoisServiceReply());
+
toolTip.append(_ircUser->hostmask().remove(0, _ircUser->hostmask().indexOf("!")+1));
if(_ircUser->idleTime().isValid()) {
QDateTime now = QDateTime::currentDateTime();
QDateTime idle = _ircUser->idleTime();
int idleTime = idle.secsTo(now);
-
- QList< QPair > timeUnit;
- timeUnit.append(qMakePair(365*60*60, tr("year")));
- timeUnit.append(qMakePair(24*60*60, tr("day")));
- timeUnit.append(qMakePair(60*60, tr("h")));
- timeUnit.append(qMakePair(60, tr("min")));
- timeUnit.append(qMakePair(1, tr("sec")));
-
- QString idleString(' ');
- for(int i=0; i < timeUnit.size(); i++) {
- int n = idleTime / timeUnit[i].first;
- if(n > 0) {
- idleString += QString("%1 %2 ").arg(QString::number(n), timeUnit[i].second);
- }
- idleTime = idleTime % timeUnit[i].first;
- }
- toolTip.append(tr("idling since %1").arg(idleString));
+ toolTip.append(tr("idling since %1").arg(secondsToString(idleTime)));
}
if(_ircUser->loginTime().isValid()) {
toolTip.append(tr("login time: %1").arg(_ircUser->loginTime().toString()));