continue;
if(queryItem->bufferName().toLower() == ircUser->nick().toLower()) {
- queryItem->attachIrcUser(ircUser);
+ queryItem->setIrcUser(ircUser);
break;
}
}
}
bool BufferItem::setData(int column, const QVariant &value, int role) {
- qDebug() << "BufferItem::setData(int column, const QVariant &value, int role):" << this << column << value << role;
switch(role) {
case NetworkModel::BufferActivityRole:
setActivityLevel((BufferInfo::ActivityLevel)value.toInt());
: BufferItem(bufferInfo, parent),
_ircUser(0)
{
- setFlags(flags() | Qt::ItemIsDropEnabled);
+ setFlags(flags() | Qt::ItemIsDropEnabled | Qt::ItemIsEditable);
const Network *net = Client::network(bufferInfo.networkId());
if(!net)
return;
IrcUser *ircUser = net->ircUser(bufferInfo.bufferName());
- if(ircUser)
- attachIrcUser(ircUser);
+ setIrcUser(ircUser);
}
QVariant QueryBufferItem::data(int column, int role) const {
switch(role) {
case NetworkModel::IrcUserRole:
- return _ircUser;
+ return QVariant::fromValue<QObject *>(_ircUser);
case NetworkModel::UserAwayRole:
return (bool)_ircUser ? _ircUser->isAway() : false;
default:
}
}
+bool QueryBufferItem::setData(int column, const QVariant &value, int role) {
+ if(column != 0)
+ return BufferItem::setData(column, value, role);
+
+ switch(role) {
+ case Qt::EditRole:
+ {
+ QString newName = value.toString();
+ if(!newName.isEmpty()) {
+ Client::renameBuffer(bufferId(), newName);
+ return true;
+ } else {
+ return false;
+ }
+ }
+ break;
+ default:
+ return BufferItem::setData(column, value, role);
+ }
+}
+
+void QueryBufferItem::setBufferName(const QString &name) {
+ BufferItem::setBufferName(name);
+ NetworkId netId = data(0, NetworkModel::NetworkIdRole).value<NetworkId>();
+ const Network *net = Client::network(netId);
+ if(net)
+ setIrcUser(net->ircUser(name));
+}
+
QString QueryBufferItem::toolTip(int column) const {
// pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this...
Q_UNUSED(column);
return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
}
-void QueryBufferItem::attachIrcUser(IrcUser *ircUser) {
+void QueryBufferItem::setIrcUser(IrcUser *ircUser) {
+ if(_ircUser == ircUser)
+ return;
+
+ if(_ircUser) {
+ disconnect(_ircUser, 0, this, 0);
+ }
+
+ if(ircUser) {
+ connect(ircUser, SIGNAL(quited()), this, SLOT(removeIrcUser()));
+ connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
+ }
+
_ircUser = ircUser;
- connect(_ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
- connect(_ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
emit dataChanged();
}
-void QueryBufferItem::ircUserDestroyed() {
+void QueryBufferItem::removeIrcUser() {
_ircUser = 0;
emit dataChanged();
}
QVariant ChannelBufferItem::data(int column, int role) const {
switch(role) {
case NetworkModel::IrcChannelRole:
- return _ircChannel;
+ return QVariant::fromValue<QObject *>(_ircChannel);
default:
return BufferItem::data(column, role);
}
this, SLOT(join(QList<IrcUser *>)));
connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
this, SLOT(part(IrcUser *)));
- connect(ircChannel, SIGNAL(destroyed()),
- this, SLOT(ircChannelDestroyed()));
+ connect(ircChannel, SIGNAL(parted()),
+ this, SLOT(ircChannelParted()));
connect(ircChannel, SIGNAL(ircUserModesSet(IrcUser *, QString)),
this, SLOT(userModeChanged(IrcUser *)));
connect(ircChannel, SIGNAL(ircUserModeAdded(IrcUser *, QString)),
emit dataChanged();
}
-void ChannelBufferItem::ircChannelDestroyed() {
+void ChannelBufferItem::ircChannelParted() {
Q_CHECK_PTR(_ircChannel);
disconnect(_ircChannel, 0, this, 0);
_ircChannel = 0;
: PropertyMapItem(QStringList() << "categoryName", parent),
_category(category)
{
+ setFlags(Qt::ItemIsEnabled);
setTreeItemFlags(AbstractTreeItem::DeleteOnLastChildRemoved);
setObjectName(parent->data(0, Qt::DisplayRole).toString() + "/" + QString::number(category));
}
_ircUser(ircUser)
{
setObjectName(ircUser->nick());
- connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
+ connect(ircUser, SIGNAL(quited()), this, SLOT(ircUserQuited()));
connect(ircUser, SIGNAL(nickSet(QString)), this, SIGNAL(dataChanged()));
connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
}
return parent()->data(column, role);
case NetworkModel::BufferInfoRole:
return parent()->data(column, role);
+ case NetworkModel::IrcChannelRole:
+ return parent()->data(column, role);
case NetworkModel::IrcUserRole:
- return _ircUser.data();
+ return QVariant::fromValue<QObject *>(_ircUser.data());
case NetworkModel::UserAwayRole:
return (bool)_ircUser ? _ircUser->isAway() : false;
default:
return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
}
-// void IrcUserItem::ircUserDestroyed() {
-// parent()->removeChild(this);
-// if(parent()->childCount() == 0)
-// parent()->parent()->removeChild(parent());
-// }
-
/*****************************************
* NetworkModel
*****************************************/
return mimeData;
}
-bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) {
- Q_UNUSED(action)
- Q_UNUSED(row)
- Q_UNUSED(column)
-
- if(!mimeContainsBufferList(data))
- return false;
-
- // target must be a query
- BufferInfo::Type targetType = (BufferInfo::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
- if(targetType != BufferInfo::QueryBuffer)
- return false;
-
- QList< QPair<NetworkId, BufferId> > bufferList = mimeDataToBufferList(data);
-
- // exactly one buffer has to be dropped
- if(bufferList.count() != 1)
- return false;
-
- NetworkId netId = bufferList.first().first;
- BufferId bufferId = bufferList.first().second;
-
- // no self merges (would kill us)
- if(bufferId == parent.data(BufferIdRole).value<BufferId>())
- return false;
-
- NetworkItem *netItem = findNetworkItem(netId);
- Q_ASSERT(netItem);
-
- BufferItem *bufferItem = netItem->findBufferItem(bufferId);
- Q_ASSERT(bufferItem);
-
- // source must be a query too
- if(bufferItem->bufferType() != BufferInfo::QueryBuffer)
- return false;
-
- // TODO: warn user about buffermerge!
- qDebug() << "merging" << bufferId << parent.data(BufferIdRole).value<BufferId>();
- removeRow(parent.row(), parent.parent());
-
- return true;
-}
-
void NetworkModel::attachNetwork(Network *net) {
NetworkItem *netItem = networkItem(net->networkId());
netItem->attachNetwork(net);
}
return BufferId();
}
+
+void NetworkModel::sortBufferIds(QList<BufferId> &bufferIds) const {
+ QList<BufferItem *> bufferItems;
+ foreach(BufferId bufferId, bufferIds) {
+ if(_bufferItemCache.contains(bufferId))
+ bufferItems << _bufferItemCache[bufferId];
+ }
+
+ qSort(bufferItems.begin(), bufferItems.end(), bufferItemLessThan);
+
+ bufferIds.clear();
+ foreach(BufferItem *bufferItem, bufferItems) {
+ bufferIds << bufferItem->bufferId();
+ }
+}
+
+QList<BufferId> NetworkModel::allBufferIdsSorted() const {
+ QList<BufferId> bufferIds = allBufferIds();
+ sortBufferIds(bufferIds);
+ return bufferIds;
+}
+
+bool NetworkModel::bufferItemLessThan(const BufferItem *left, const BufferItem *right) {
+ int leftType = left->bufferType();
+ int rightType = right->bufferType();
+
+ if(leftType != rightType)
+ return leftType < rightType;
+ else
+ return QString::compare(left->bufferName(), right->bufferName(), Qt::CaseInsensitive) < 0;
+}
+