/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel Project *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "buffersettings.h"
#include "buffersyncer.h"
#include "client.h"
-#include "iconloader.h"
+#include "contextmenuactionprovider.h"
+#include "graphicalui.h"
#include "network.h"
#include "networkmodel.h"
-#include "networkmodelactionprovider.h"
-#include "quasselui.h"
-#include "uisettings.h"
-
-bool TristateDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) {
- if(event->type() != QEvent::MouseButtonRelease)
- return QStyledItemDelegate::editorEvent(event, model, option, index);
-
- if(!(model->flags(index) & Qt::ItemIsUserCheckable))
- return QStyledItemDelegate::editorEvent(event, model, option, index);
-
- QVariant value = index.data(Qt::CheckStateRole);
- if(!value.isValid())
- return QStyledItemDelegate::editorEvent(event, model, option, index);
-
- QStyleOptionViewItemV4 viewOpt(option);
- initStyleOption(&viewOpt, index);
-
- QRect checkRect = viewOpt.widget->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, viewOpt.widget);
- QMouseEvent *me = static_cast<QMouseEvent*>(event);
-
- if(me->button() != Qt::LeftButton || !checkRect.contains(me->pos()))
- return QStyledItemDelegate::editorEvent(event, model, option, index);
-
- Qt::CheckState state = static_cast<Qt::CheckState>(value.toInt());
- if(state == Qt::Unchecked)
- state = Qt::PartiallyChecked;
- else if(state == Qt::PartiallyChecked)
- state = Qt::Checked;
- else
- state = Qt::Unchecked;
- model->setData(index, state, Qt::CheckStateRole);
- return true;
-}
-
-
-
+#include "contextmenuactionprovider.h"
/*****************************************
* The TreeView showing the Buffers
BufferView::BufferView(QWidget *parent)
: QTreeView(parent)
{
- connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(on_collapse(const QModelIndex &)));
- connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(on_expand(const QModelIndex &)));
+ connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
+ connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
setSelectionMode(QAbstractItemView::ExtendedSelection);
QAbstractItemDelegate *oldDelegate = itemDelegate();
- TristateDelegate *tristateDelegate = new TristateDelegate(this);
+ BufferViewDelegate *tristateDelegate = new BufferViewDelegate(this);
setItemDelegate(tristateDelegate);
delete oldDelegate;
}
// activated() fails on X11 and Qtopia at least
#if defined Q_WS_QWS || defined Q_WS_X11
+ disconnect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex)));
#else
// afaik this is better on Mac and Windows
+ disconnect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
connect(this, SIGNAL(activated(QModelIndex)), SLOT(joinChannel(QModelIndex)));
#endif
}
header()->addAction(showSection);
}
+ connect(model, SIGNAL(layoutChanged()), this, SLOT(on_layoutChanged()));
}
void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) {
continue;
removedRows << bufferId;
+ }
+ foreach(BufferId bufferId, removedRows) {
if(permanently)
config()->requestRemoveBufferPermanently(bufferId);
else
}
}
-void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
+void BufferView::rowsInserted(const QModelIndex &parent, int start, int end) {
QTreeView::rowsInserted(parent, start, end);
// ensure that newly inserted network nodes are expanded per default
if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
return;
- if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemActiveRole) == true) {
- // without updating the parent the expand will have no effect... Qt Bug?
- update(parent);
- expand(parent);
+ setExpandedState(parent);
+}
+
+void BufferView::on_layoutChanged() {
+ int numNets = model()->rowCount(QModelIndex());
+ for(int row = 0; row < numNets; row++) {
+ QModelIndex networkIdx = model()->index(row, 0, QModelIndex());
+ setExpandedState(networkIdx);
}
}
if(!networkId.isValid())
continue;
- update(networkIdx);
-
- bool expandNetwork = false;
- if(_expandedState.contains(networkId))
- expandNetwork = _expandedState[networkId];
- else
- expandNetwork = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool();
-
- if(expandNetwork)
- expand(networkIdx);
- else
- collapse(networkIdx);
+ setExpandedState(networkIdx);
}
if(config()) {
// update selection to current one
Client::bufferModel()->synchronizeView(this);
}
-
- return;
}
-void BufferView::on_collapse(const QModelIndex &index) {
- storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), false);
-}
+void BufferView::storeExpandedState(const QModelIndex &networkIdx) {
+ NetworkId networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value<NetworkId>();
-void BufferView::on_expand(const QModelIndex &index) {
- storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), true);
+ int oldState = 0;
+ if(isExpanded(networkIdx))
+ oldState |= WasExpanded;
+ if(model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool())
+ oldState |= WasActive;
+
+ _expandedState[networkId] = oldState;
}
-void BufferView::storeExpandedState(NetworkId networkId, bool expanded) {
- _expandedState[networkId] = expanded;
+void BufferView::setExpandedState(const QModelIndex &networkIdx) {
+ if(model()->data(networkIdx, NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
+ return;
+
+ if(model()->rowCount(networkIdx) == 0)
+ return;
+
+ NetworkId networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value<NetworkId>();
+
+ bool networkActive = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool();
+ bool expandNetwork = networkActive;
+ if(_expandedState.contains(networkId)) {
+ int oldState = _expandedState[networkId];
+ if((bool)(oldState & WasActive) == networkActive)
+ expandNetwork = (bool)(oldState & WasExpanded);
+ }
+
+ if(expandNetwork != isExpanded(networkIdx)) {
+ update(networkIdx);
+ setExpanded(networkIdx, expandNetwork);
+ }
+ storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
}
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
for(int i = topLeft.row(); i <= bottomRight.row(); i++) {
QModelIndex networkIdx = topLeft.sibling(i, 0);
- if(model()->rowCount(networkIdx) == 0)
- continue;
-
- bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
-#ifdef SPUTDEV
- if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, true);
-#else
- if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, isActive);
-#endif
+ setExpandedState(networkIdx);
}
}
indexList.removeAll(index);
indexList.prepend(index);
- Client::mainUi()->actionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config());
+ GraphicalUi::contextMenuActionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config());
}
void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index) {
}
void BufferView::menuActionTriggered(QAction *result) {
- NetworkModelActionProvider::ActionType type = (NetworkModelActionProvider::ActionType)result->data().toInt();
+ ContextMenuActionProvider::ActionType type = (ContextMenuActionProvider::ActionType)result->data().toInt();
switch(type) {
- case NetworkModelActionProvider::HideBufferTemporarily:
+ case ContextMenuActionProvider::HideBufferTemporarily:
removeSelectedBuffers();
break;
- case NetworkModelActionProvider::HideBufferPermanently:
+ case ContextMenuActionProvider::HideBufferPermanently:
removeSelectedBuffers(true);
break;
default:
}
void BufferView::wheelEvent(QWheelEvent* event) {
- if(UiSettings().value("MouseWheelChangesBuffers", QVariant(true)).toBool() == (bool)(event->modifiers() & Qt::AltModifier))
+ if(ItemViewSettings().mouseWheelChangesBuffer() == (bool)(event->modifiers() & Qt::AltModifier))
return QTreeView::wheelEvent(event);
int rowDelta = ( event->delta() > 0 ) ? -1 : 1;
return QSize(columnSize, 50);
}
+
+// ****************************************
+// BufferViewDelgate
+// ****************************************
+class ColorsChangedEvent : public QEvent {
+public:
+ ColorsChangedEvent() : QEvent(QEvent::User) {};
+};
+
+BufferViewDelegate::BufferViewDelegate(QObject *parent)
+ : QStyledItemDelegate(parent)
+{
+}
+
+void BufferViewDelegate::customEvent(QEvent *event) {
+ if(event->type() != QEvent::User)
+ return;
+
+ event->accept();
+}
+
+bool BufferViewDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) {
+ if(event->type() != QEvent::MouseButtonRelease)
+ return QStyledItemDelegate::editorEvent(event, model, option, index);
+
+ if(!(model->flags(index) & Qt::ItemIsUserCheckable))
+ return QStyledItemDelegate::editorEvent(event, model, option, index);
+
+ QVariant value = index.data(Qt::CheckStateRole);
+ if(!value.isValid())
+ return QStyledItemDelegate::editorEvent(event, model, option, index);
+
+ QStyleOptionViewItemV4 viewOpt(option);
+ initStyleOption(&viewOpt, index);
+
+ QRect checkRect = viewOpt.widget->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, viewOpt.widget);
+ QMouseEvent *me = static_cast<QMouseEvent*>(event);
+
+ if(me->button() != Qt::LeftButton || !checkRect.contains(me->pos()))
+ return QStyledItemDelegate::editorEvent(event, model, option, index);
+
+ Qt::CheckState state = static_cast<Qt::CheckState>(value.toInt());
+ if(state == Qt::Unchecked)
+ state = Qt::PartiallyChecked;
+ else if(state == Qt::PartiallyChecked)
+ state = Qt::Checked;
+ else
+ state = Qt::Unchecked;
+ model->setData(index, state, Qt::CheckStateRole);
+ return true;
+}
+
// ==============================
// BufferView Dock
// ==============================
setWindowTitle(newName);
toggleViewAction()->setText(newName);
}
+
+int BufferViewDock::bufferViewId() const {
+ BufferView *view = bufferView();
+ if(!view)
+ return 0;
+
+ if(view->config())
+ return view->config()->bufferViewId();
+ else
+ return 0;
+}
+
+BufferViewConfig *BufferViewDock::config() const {
+ BufferView *view = bufferView();
+ if(!view)
+ return 0;
+ else
+ return view->config();
+}
projects / quassel.git / blobdiff