_bufferInfo(bufferInfo),
_activity(NoActivity)
{
- // determine BufferType
- if(bufferInfo.bufferName().isEmpty())
- _type = StatusType;
- else if(isChannelName(bufferInfo.bufferName()))
- _type = ChannelType;
- else
- _type = QueryType;
-
Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
- if(bufferType() == QueryType)
+ if(bufferType() == BufferInfo::QueryBuffer)
flags |= Qt::ItemIsDropEnabled;
setFlags(flags);
-}
+ _lastSeen = BufferSettings(bufferInfo.bufferId()).lastSeen();
+}
const BufferInfo &BufferItem::bufferInfo() const {
return _bufferInfo;
}
quint64 BufferItem::id() const {
- return bufferInfo().bufferId().toInt();
+ return qHash(bufferInfo().bufferId());
}
bool BufferItem::isStatusBuffer() const {
- return bufferType() == StatusType;
+ return bufferType() == BufferInfo::StatusBuffer;
}
-BufferItem::Type BufferItem::bufferType() const {
- return _type;
+BufferInfo::Type BufferItem::bufferType() const {
+ return bufferInfo().type();
}
bool BufferItem::isActive() const {
- if(bufferType() == ChannelType)
+ if(bufferType() == BufferInfo::ChannelBuffer)
return _ircChannel;
else
return qobject_cast<NetworkItem *>(parent())->isActive();
return _activity;
}
-void BufferItem::setActivity(const ActivityLevel &level) {
+bool BufferItem::setActivity(const ActivityLevel &level) {
_activity = level;
emit dataChanged();
+ return true;
}
void BufferItem::updateActivity(const ActivityLevel &level) {
+ ActivityLevel oldActivity = _activity;
_activity |= level;
- emit dataChanged();
+ if(oldActivity != _activity)
+ emit dataChanged();
}
QVariant BufferItem::data(int column, int role) const {
bool BufferItem::setData(int column, const QVariant &value, int role) {
switch(role) {
case NetworkModel::BufferActivityRole:
- setActivity((ActivityLevel)value.toInt());
+ return setActivity((ActivityLevel)value.toInt());
+ case NetworkModel::LastSeenRole:
+ return setLastSeen();
default:
return PropertyMapItem::setData(column, value, role);
}
}
QString BufferItem::bufferName() const {
- if(bufferType() == StatusType)
+ if(bufferType() == BufferInfo::StatusBuffer)
return tr("Status Buffer");
else
return bufferInfo().bufferName();
return QString();
}
+void BufferItem::ircUserDestroyed() {
+ // PRIVATE
+ IrcUser *ircUser = static_cast<IrcUser *>(sender());
+ removeUserFromCategory(ircUser);
+ emit dataChanged(2);
+}
+
int BufferItem::nickCount() const {
if(_ircChannel)
return _ircChannel->ircUsers().count();
return;
addUserToCategory(ircUser);
+ connect(ircUser, SIGNAL(destroyed()),
+ this, SLOT(ircUserDestroyed()));
emit dataChanged(2);
}
return;
}
+ disconnect(ircUser, 0, this, 0);
removeUserFromCategory(ircUser);
emit dataChanged(2);
}
}
if(!success) {
- qDebug() << "didn't find User:" << ircUser << (quint64)ircUser;
+ qDebug() << "didn't find User:" << ircUser << qHash(ircUser);
qDebug() << "==== Childlist for Item:" << this << id() << bufferName() << "====";
for(int i = 0; i < childCount(); i++) {
categoryItem = qobject_cast<UserCategoryItem *>(child(i));
UserCategoryItem *categoryItem;
int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
- if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
+ if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser)))
return; // already in the right category;
removeUserFromCategory(ircUser);
addUserToCategory(ircUser);
}
+void BufferItem::setLastMsgInsert(QDateTime msgDate) {
+ if(msgDate.isValid() && msgDate > _lastMsgInsert)
+ _lastMsgInsert = msgDate;
+}
+
+bool BufferItem::setLastSeen() {
+ if(_lastSeen > _lastMsgInsert)
+ return false;
+
+ _lastSeen = _lastMsgInsert;
+ BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
+ return true;
+}
+
+QDateTime BufferItem::lastSeen() {
+ return _lastSeen;
+}
+
/*****************************************
* Network Items
*****************************************/
}
quint64 NetworkItem::id() const {
- return _networkId.toInt();
+ return qHash(_networkId);
}
void NetworkItem::setActive(bool connected) {
BufferItem *bufferItem;
for(int i = 0; i < childCount(); i++) {
bufferItem = qobject_cast<BufferItem *>(child(i));
- if(bufferItem->bufferName() == ircChannel->name()) {
+ if(bufferItem->bufferName().toLower() == ircChannel->name().toLower()) {
bufferItem->attachIrcChannel(ircChannel);
break;
}
*****************************************/
// 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::Category> UserCategoryItem::categories = QList<UserCategoryItem::Category>()
- << UserCategoryItem::Category('q', "Owners")
- << UserCategoryItem::Category('a', "Admins")
- << UserCategoryItem::Category('a', "Admins")
- << UserCategoryItem::Category('o', "Operators")
- << UserCategoryItem::Category('h', "Half-Ops")
- << UserCategoryItem::Category('v', "Voiced");
+ << 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"));
UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
: PropertyMapItem(QStringList() << "categoryId", parent),
if(_category < categories.count())
return categories[_category].displayString;
else
- return QString("Users");
+ return tr("Users");
}
quint64 UserCategoryItem::id() const {
}
bool UserCategoryItem::removeUser(IrcUser *ircUser) {
- return removeChildById((quint64)ircUser);
+ return removeChildById(qHash(ircUser));
}
int UserCategoryItem::categoryFromModes(const QString &modes) {
*****************************************/
IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
: PropertyMapItem(QStringList() << "nickName", parent),
- _ircUser(ircUser)
+ _ircUser(ircUser),
+ _id(qHash(ircUser))
{
// we don't need to handle the ircUser's destroyed signal since it's automatically removed
// by the IrcChannel::ircUserParted();
}
QString IrcUserItem::nickName() const {
- return _ircUser->nick();
+ if(_ircUser)
+ return _ircUser->nick();
+ else
+ return QString();
+}
+
+bool IrcUserItem::isActive() const {
+ if(_ircUser)
+ return !_ircUser->isAway();
+ else
+ return false;
}
IrcUser *IrcUserItem::ircUser() {
}
quint64 IrcUserItem::id() const {
- return (quint64)_ircUser;
+ return _id;
}
QVariant IrcUserItem::data(int column, int role) const {
switch(role) {
case NetworkModel::ItemActiveRole:
- return !_ircUser->isAway();
+ return isActive();
case NetworkModel::ItemTypeRole:
return NetworkModel::IrcUserItemType;
case NetworkModel::BufferIdRole:
}
idleTime = idleTime % timeUnit[i].first;
}
- toolTip.append(QString("idling since %1").arg(idleString));
+ toolTip.append(tr("idling since %1").arg(idleString));
}
- if(!_ircUser->server().isEmpty()) toolTip.append(QString("server: %1").arg(_ircUser->server()));
+ if(!_ircUser->server().isEmpty()) toolTip.append(tr("server: %1").arg(_ircUser->server()));
return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
}
// experimental stuff :)
QModelIndex NetworkModel::networkIndex(NetworkId networkId) {
- return indexById(networkId.toInt());
+ return indexById(qHash(networkId));
}
NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) {
return netItem;
}
+void NetworkModel::networkRemoved(const NetworkId &networkId) {
+ rootItem->removeChildById(qHash(networkId));
+}
+
QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
AbstractTreeItem *netItem, *bufferItem;
for(int i = 0; i < rootItem->childCount(); i++) {
netItem = rootItem->child(i);
- if((bufferItem = netItem->childById(bufferId.toInt()))) {
- return indexById(bufferItem->id(), networkIndex(netItem->id()));
+ if((bufferItem = netItem->childById(qHash(bufferId)))) {
+ return indexByItem(bufferItem);
}
}
return QModelIndex();
return false;
// target must be a query
- BufferItem::Type targetType = (BufferItem::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
- if(targetType != BufferItem::QueryType)
+ BufferInfo::Type targetType = (BufferInfo::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
+ if(targetType != BufferInfo::QueryBuffer)
return false;
QList< QPair<NetworkId, BufferId> > bufferList = mimeDataToBufferList(data);
if(bufferId == parent.data(BufferIdRole).value<BufferId>())
return false;
- Q_ASSERT(rootItem->childById(netId.toInt()));
- Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt()));
+ Q_ASSERT(rootItem->childById(qHash(netId)));
+ Q_ASSERT(rootItem->childById(qHash(netId))->childById(qHash(bufferId)));
// source must be a query too
- BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId.toInt())->childById(bufferId.toInt())->data(0, BufferTypeRole).toInt();
- if(sourceType != BufferItem::QueryType)
+ BufferInfo::Type sourceType = (BufferInfo::Type)rootItem->childById(qHash(netId))->childById(qHash(bufferId))->data(0, BufferTypeRole).toInt();
+ if(sourceType != BufferInfo::QueryBuffer)
return false;
// TODO: warn user about buffermerge!
}
void NetworkModel::updateBufferActivity(const Message &msg) {
+ BufferItem *buff = bufferItem(msg.bufferInfo());
+ Q_ASSERT(buff);
+
+ buff->setLastMsgInsert(msg.timestamp());
+
+ if(buff->lastSeen() >= msg.timestamp())
+ return;
+
BufferItem::ActivityLevel level = BufferItem::OtherActivity;
if(msg.type() == Message::Plain || msg.type() == Message::Notice)
level |= BufferItem::NewMessage;
- const Network *net = Client::network(msg.bufferInfo().networkId());
- if(net && msg.text().contains(net->myNick()))
- level |= BufferItem::Highlight;
-
+ if(msg.flags() & Message::Highlight)
+ level |= BufferItem::Highlight;
+
bufferItem(msg.bufferInfo())->updateActivity(level);
}
+const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
+ QVariant netVariant = index.data(NetworkIdRole);
+ if(!netVariant.isValid())
+ return 0;
+
+ NetworkId networkId = netVariant.value<NetworkId>();
+ return Client::network(networkId);
+}
+
projects / quassel.git / blobdiff