#include "bufferviewfilter.h"
-#include <QColor>
+#include <QCoreApplication>
#include "buffermodel.h"
#include "client.h"
#include "uisettings.h"
+class CheckRemovalEvent : public QEvent {
+public:
+ CheckRemovalEvent(const QModelIndex &source_index) : QEvent(QEvent::User), index(source_index) {};
+ QPersistentModelIndex index;
+};
+
/*****************************************
* The Filter for the Tree View
*****************************************/
{
setConfig(config);
setSourceModel(model);
- connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(source_rowsInserted(const QModelIndex &, int, int)));
- // setSortCaseSensitivity(Qt::CaseInsensitive);
setDynamicSortFilter(true);
+
+ loadColors();
+
+ connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)),
+ this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex)));
+}
+
+void BufferViewFilter::loadColors() {
+ UiSettings s("QtUi/Colors");
+ _FgColorInactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))).value<QColor>();
+ _FgColorNoActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))).value<QColor>();
+ _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value<QColor>();
+ _FgColorNewMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))).value<QColor>();
+ _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value<QColor>();
}
void BufferViewFilter::setConfig(BufferViewConfig *config) {
}
_config = config;
- if(config) {
- connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(invalidate()));
- connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(invalidate()));
- connect(config, SIGNAL(addNewBuffersAutomaticallySet(bool)), this, SLOT(invalidate()));
- connect(config, SIGNAL(sortAlphabeticallySet(bool)), this, SLOT(invalidate()));
- connect(config, SIGNAL(hideInactiveBuffersSet(bool)), this, SLOT(invalidate()));
- connect(config, SIGNAL(allowedBufferTypesSet(int)), this, SLOT(invalidate()));
- connect(config, SIGNAL(minimumActivitySet(int)), this, SLOT(invalidate()));
- connect(config, SIGNAL(bufferListSet()), this, SLOT(invalidate()));
- connect(config, SIGNAL(bufferAdded(const BufferId &, int)), this, SLOT(invalidate()));
- connect(config, SIGNAL(bufferMoved(const BufferId &, int)), this, SLOT(invalidate()));
- connect(config, SIGNAL(bufferRemoved(const BufferId &)), this, SLOT(invalidate()));
+ if(config->isInitialized()) {
+ configInitialized();
+ } else {
+ connect(config, SIGNAL(initDone()), this, SLOT(configInitialized()));
+ invalidate();
}
+}
+
+void BufferViewFilter::configInitialized() {
+ if(!config())
+ return;
+
+ connect(config(), SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(addNewBuffersAutomaticallySet(bool)), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(sortAlphabeticallySet(bool)), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(hideInactiveBuffersSet(bool)), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(allowedBufferTypesSet(int)), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(minimumActivitySet(int)), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(bufferListSet()), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(bufferAdded(const BufferId &, int)), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(bufferMoved(const BufferId &, int)), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(bufferRemoved(const BufferId &)), this, SLOT(invalidate()));
+ connect(config(), SIGNAL(bufferPermanentlyRemoved(const BufferId &)), this, SLOT(invalidate()));
+
+ disconnect(config(), SIGNAL(initDone()), this, SLOT(configInitialized()));
+
invalidate();
}
return true;
}
-void BufferViewFilter::addBuffer(const BufferId &bufferId) {
- if(config()->bufferList().contains(bufferId))
+void BufferViewFilter::addBuffer(const BufferId &bufferId) const {
+ if(!config() || config()->bufferList().contains(bufferId))
return;
int pos = config()->bufferList().count();
config()->requestAddBuffer(bufferId, pos);
}
-void BufferViewFilter::removeBuffer(const QModelIndex &index) {
+bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
+ // no config -> "all buffers" -> accept everything
if(!config())
- return;
-
- BufferId bufferId = data(index, NetworkModel::BufferIdRole).value<BufferId>();
- config()->requestRemoveBuffer(bufferId);
-}
+ return true;
+ BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
+ Q_ASSERT(bufferId.isValid());
-bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
- if(!_config)
- return true;
+ int activityLevel = source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt();
+
+ if(!config()->bufferList().contains(bufferId)) {
+ // add the buffer if...
+ if(config()->isInitialized() && !config()->removedBuffers().contains(bufferId) // it hasn't been manually removed and either
+ && ((config()->addNewBuffersAutomatically() && !config()->temporarilyRemovedBuffers().contains(bufferId)) // is totally unknown to us (a new buffer)...
+ || (config()->temporarilyRemovedBuffers().contains(bufferId) && activityLevel > Buffer::OtherActivity))) { // or was just temporarily hidden and has a new message waiting for us.
+ addBuffer(bufferId);
+ }
+ // note: adding the buffer to the valid list does not temper with the following filters ("show only channels" and stuff)
+ return false;
+ }
+
+ if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
+ return false;
- if(!(_config->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt()))
+ if(!(config()->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt()))
return false;
- if(_config->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool())
+ if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool())
return false;
- if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) {
- if(!Client::bufferModel()->standardSelectionModel()->isSelected(source_bufferIndex))
+ if(config()->minimumActivity() > activityLevel) {
+ if(bufferId != Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>())
return false;
}
- BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
- return _config->bufferList().contains(bufferId);
+ return true;
}
bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const {
return false;
}
- if(source_parent == QModelIndex())
+ if(!source_parent.isValid())
return filterAcceptNetwork(child);
else
return filterAcceptBuffer(child);
if(config()) {
return config()->bufferList().indexOf(leftBufferId) < config()->bufferList().indexOf(rightBufferId);
} else
- return leftBufferId < rightBufferId;
+ return bufferIdLessThan(leftBufferId, rightBufferId);
}
bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
}
QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
- UiSettings s("QtUi/Colors");
- QVariant inactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray)));
- QVariant noActivity = s.value("noActivityFG", QVariant(QColor(Qt::black)));
- QVariant highlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta)));
- QVariant newMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green)));
- QVariant otherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen)));
-
if(!index.data(NetworkModel::ItemActiveRole).toBool())
- return inactiveActivity;
+ return _FgColorInactiveActivity;
Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
if(activity & Buffer::Highlight)
- return highlightActivity;
+ return _FgColorHighlightActivity;
if(activity & Buffer::NewMessage)
- return newMessageActivity;
+ return _FgColorNewMessageActivity;
if(activity & Buffer::OtherActivity)
- return otherActivity;
-
- return noActivity;
+ return _FgColorOtherActivity;
+ return _FgColorNoActivity;
}
-void BufferViewFilter::source_rowsInserted(const QModelIndex &parent, int start, int end) {
- if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
- return;
+void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous) {
+ Q_UNUSED(current);
+ if(previous.isValid())
+ QCoreApplication::postEvent(this, new CheckRemovalEvent(previous));
+}
- if(!config() || !config()->addNewBuffersAutomatically())
+void BufferViewFilter::customEvent(QEvent *event) {
+ if(event->type() != QEvent::User)
return;
+
+ CheckRemovalEvent *removalEvent = static_cast<CheckRemovalEvent *>(event);
+ checkItemForRemoval(removalEvent->index);
+
+ event->accept();
+}
- for(int row = start; row <= end; row++) {
- addBuffer(parent.child(row, 0).data(NetworkModel::BufferIdRole).value<BufferId>());
- }
+void BufferViewFilter::checkItemsForRemoval(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
+ QModelIndex source_topLeft = mapToSource(topLeft);
+ QModelIndex source_bottomRight = mapToSource(bottomRight);
+ emit _dataChanged(source_topLeft, source_bottomRight);
}
// ******************************
if(leftType != rightType)
return leftType < rightType;
else
- return Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString() < Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString();
+ return QString::compare(Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString(), Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0;
}
projects / quassel.git / blobdiff