BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
: PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
_bufferInfo(bufferInfo),
- _activity(NoActivity)
+ _bufferName(bufferInfo.bufferName()),
+ _activity(Buffer::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();
+ if(bufferType() == BufferInfo::StatusBuffer) {
+ NetworkItem *networkItem = qobject_cast<NetworkItem *>(parent);
+ connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
+ }
+ setFlags(flags);
}
const BufferInfo &BufferItem::bufferInfo() const {
}
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();
}
-BufferItem::ActivityLevel BufferItem::activity() const {
- return _activity;
-}
-
-bool BufferItem::setActivity(const ActivityLevel &level) {
+bool BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
_activity = level;
emit dataChanged();
return true;
}
-void BufferItem::updateActivity(const ActivityLevel &level) {
- ActivityLevel oldActivity = _activity;
+void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) {
+ Buffer::ActivityLevel oldActivity = _activity;
_activity |= level;
if(oldActivity != _activity)
emit dataChanged();
case NetworkModel::ItemActiveRole:
return isActive();
case NetworkModel::BufferActivityRole:
- return qVariantFromValue((int)activity());
+ return (int)activityLevel();
default:
return PropertyMapItem::data(column, role);
}
bool BufferItem::setData(int column, const QVariant &value, int role) {
switch(role) {
case NetworkModel::BufferActivityRole:
- return setActivity((ActivityLevel)value.toInt());
- case NetworkModel::LastSeenRole:
- return setLastSeen();
+ return setActivityLevel((Buffer::ActivityLevel)value.toInt());
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 _bufferName;
+}
+
+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());
+ emit dataChanged(0);
}
QString BufferItem::topic() const {
}
void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
- Q_ASSERT(_ircChannel);
+ if(!_ircChannel) {
+ // If we parted the channel there might still be some ircUsers connected.
+ // in that case we just ignore the call
+ Q_ASSERT(childCount() == 0);
+ return;
+ }
bool success = false;
UserCategoryItem *categoryItem = 0;
}
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;
}
-
+*/
+/*
+// FIXME emit dataChanged()
bool BufferItem::setLastSeen() {
if(_lastSeen > _lastMsgInsert)
return false;
QDateTime BufferItem::lastSeen() {
return _lastSeen;
}
-
+*/
/*****************************************
* Network Items
*****************************************/
return qHash(_networkId);
}
-void NetworkItem::setActive(bool connected) {
- Q_UNUSED(connected);
- emit dataChanged();
-}
-
bool NetworkItem::isActive() const {
if(_network)
return _network->isConnected();
connect(network, SIGNAL(ircChannelAdded(QString)),
this, SLOT(attachIrcChannel(QString)));
connect(network, SIGNAL(connectedSet(bool)),
- this, SLOT(setActive(bool)));
+ this, SIGNAL(dataChanged()));
// FIXME: connect this and that...
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) {
connect(ircUser, SIGNAL(nickSet(QString)),
this, SLOT(setNick(QString)));
+ connect(ircUser, SIGNAL(awaySet(bool)),
+ this, SLOT(setAway(bool)));
}
QString IrcUserItem::nickName() const {
}
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 />"));
}
emit dataChanged(0);
}
+void IrcUserItem::setAway(bool away) {
+ Q_UNUSED(away);
+ emit dataChanged(0);
+}
+
/*****************************************
* NetworkModel
*****************************************/
// 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!
emit dataChanged(itemindex, itemindex);
}
+void NetworkModel::removeBuffer(BufferId bufferId) {
+ const int numNetworks = rootItem->childCount();
+ if(numNetworks == 0)
+ return;
+
+ for(int i = 0; i < numNetworks; i++) {
+ if(rootItem->child(i)->removeChildById(qHash(bufferId)))
+ break;
+ }
+}
+
+/*
void NetworkModel::updateBufferActivity(const Message &msg) {
BufferItem *buff = bufferItem(msg.bufferInfo());
Q_ASSERT(buff);
if(msg.type() == Message::Plain || msg.type() == Message::Notice)
level |= BufferItem::NewMessage;
- const Network *net = Client::network(msg.bufferInfo().networkId());
- if(net && (msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && msg.text().contains(net->myNick()))
- level |= BufferItem::Highlight;
+ if(msg.flags() & Message::Highlight)
+ level |= BufferItem::Highlight;
bufferItem(msg.bufferInfo())->updateActivity(level);
}
+*/
+
+void NetworkModel::setBufferActivity(const BufferInfo &info, Buffer::ActivityLevel level) {
+ BufferItem *buff = bufferItem(info);
+ Q_ASSERT(buff);
+
+ buff->setActivityLevel(level);
+}
const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
QVariant netVariant = index.data(NetworkIdRole);
NetworkId networkId = netVariant.value<NetworkId>();
return Client::network(networkId);
}
+
projects / quassel.git / blobdiff