#include "buffermodel.h"
#include "bufferviewfilter.h"
+#include "buffersettings.h"
#include "buffersyncer.h"
#include "client.h"
+#include "iconloader.h"
#include "mappedselectionmodel.h"
#include "network.h"
#include "networkmodel.h"
#include "uisettings.h"
-#include "global.h"
-
#include <QAction>
#include <QFlags>
#include <QHeaderView>
// to be on the safe side: call QTreeView's method aswell
BufferView::BufferView(QWidget *parent)
: QTreeView(parent),
+ showChannelList(tr("Show Channel List"), this),
_connectNetAction(tr("Connect"), this),
_disconnectNetAction(tr("Disconnect"), this),
_joinChannelAction(tr("Join Channel"), this),
_hideJoinAction(tr("Join Events"), this),
_hidePartAction(tr("Part Events"), this),
- _hideKillAction(tr("Kill Events"), this),
_hideQuitAction(tr("Quit Events"), this),
_hideModeAction(tr("Mode Events"), this)
{
- // currently no events can be hidden -> disable actions
_hideJoinAction.setCheckable(true);
_hidePartAction.setCheckable(true);
- _hideKillAction.setCheckable(true);
_hideQuitAction.setCheckable(true);
_hideModeAction.setCheckable(true);
- _hideJoinAction.setEnabled(false);
- _hidePartAction.setEnabled(false);
_ignoreListAction.setEnabled(false);
- _hideKillAction.setEnabled(false);
- _hideQuitAction.setEnabled(false);
- _hideModeAction.setEnabled(false);
+
+ showChannelList.setIcon(SmallIcon("format-list-unordered"));
+
+ connect(this, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(on_collapse(const QModelIndex &)));
+ connect(this, SIGNAL(expanded(const QModelIndex &)), this, SLOT(on_expand(const QModelIndex &)));
setSelectionMode(QAbstractItemView::ExtendedSelection);
}
setSortingEnabled(true);
sortByColumn(0, Qt::AscendingOrder);
-#ifndef Q_WS_QWS
- // this is a workaround to not join channels automatically... we need a saner way to navigate for qtopia anyway though,
- // such as mark first, activate at second click...
- connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
+
+ // activated() fails on X11 and Qtopia at least
+#if defined Q_WS_QWS or defined Q_WS_X11
+ connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex)));
#else
- connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex))); // Qtopia uses single click for activation
+ // afaik this is better on Mac and Windows
+ connect(this, SIGNAL(activated(QModelIndex)), SLOT(joinChannel(QModelIndex)));
#endif
}
void BufferView::setModel(QAbstractItemModel *model) {
delete selectionModel();
- if(QTreeView::model()) {
- disconnect(QTreeView::model(), SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
- }
-
+
QTreeView::setModel(model);
init();
// remove old Actions
if(!model)
return;
- connect(model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
-
QString sectionName;
QAction *showSection;
for(int i = 1; i < model->columnCount(); i++) {
connect(showSection, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
header()->addAction(showSection);
}
-
+
}
void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) {
if(model()) {
disconnect(this, 0, model(), 0);
+ disconnect(model(), 0, this, 0);
}
if(!model_) {
} else {
BufferViewFilter *filter = new BufferViewFilter(model_, config);
setModel(filter);
+ connect(filter, SIGNAL(configChanged()), this, SLOT(on_configChanged()));
}
setConfig(config);
}
if(QTreeView::selectionModel())
disconnect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
model(), SIGNAL(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
-
+
QTreeView::setSelectionModel(selectionModel);
BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
if(filter) {
void BufferView::setConfig(BufferViewConfig *config) {
if(_config == config)
return;
-
+
if(_config) {
disconnect(_config, 0, this, 0);
}
return;
BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-
+
Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));
}
continue;
removedRows << bufferId;
-
+
if(permanently)
config()->requestRemoveBufferPermanently(bufferId);
else
// 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);
}
}
-void BufferView::layoutChanged() {
+void BufferView::on_configChanged() {
Q_ASSERT(model());
- // expand all active networks
+ // expand all active networks... collapse inactive ones... unless manually changed
QModelIndex networkIdx;
+ NetworkId networkId;
for(int row = 0; row < model()->rowCount(); row++) {
networkIdx = model()->index(row, 0);
+ if(model()->rowCount(networkIdx) == 0)
+ continue;
+
+ networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value<NetworkId>();
+ if(!networkId.isValid())
+ continue;
+
update(networkIdx);
- if(model()->rowCount(networkIdx) > 0 && model()->data(networkIdx, NetworkModel::ItemActiveRole) == true) {
+
+ bool expandNetwork = false;
+ if(_expandedState.contains(networkId))
+ expandNetwork = _expandedState[networkId];
+ else
+ expandNetwork = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool();
+
+ if(expandNetwork)
expand(networkIdx);
- } else {
+ else
collapse(networkIdx);
- }
}
// update selection to current one
mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
}
+void BufferView::on_collapse(const QModelIndex &index) {
+ storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), false);
+}
+
+void BufferView::on_expand(const QModelIndex &index) {
+ storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), true);
+}
+
+void BufferView::storeExpandedState(NetworkId networkId, bool expanded) {
+ _expandedState[networkId] = expanded;
+}
+
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
QTreeView::dataChanged(topLeft, bottomRight);
-
+
// determine how many items have been changed and if any of them is a networkitem
// which just swichted from active to inactive or vice versa
if(topLeft.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
return;
for(int i = topLeft.row(); i <= bottomRight.row(); i++) {
- QModelIndex networkIdx = topLeft.sibling(topLeft.row(), 0);
+ QModelIndex networkIdx = topLeft.sibling(i, 0);
if(model()->rowCount(networkIdx) == 0)
continue;
}
}
-
void BufferView::toggleHeader(bool checked) {
QAction *action = qobject_cast<QAction *>(sender());
header()->setSectionHidden((action->property("column")).toInt(), !checked);
if(!index.isValid())
return false;
-// NetworkModel::itemTypes itemType = static_cast<NetworkModel::itemTypes>(index.data(NetworkModel::ItemTypeRole).toInt());
-// if(!(itemType & validItemTypes))
-// return false;
-
ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool()
? ActiveState
: InactiveState;
}
}
-QMenu *BufferView::createHideEventsSubMenu(QMenu &menu) {
- // QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), &menu);
+QMenu *BufferView::createHideEventsSubMenu(QMenu &menu, BufferId bufferId) {
+ int filter = BufferSettings(bufferId).messageFilter();
+ _hideJoinAction.setChecked(filter & Message::Join);
+ _hidePartAction.setChecked(filter & Message::Part);
+ _hideQuitAction.setChecked(filter & Message::Quit);
+ _hideModeAction.setChecked(filter & Message::Mode);
+
QMenu *hideEventsMenu = menu.addMenu(tr("Hide Events"));
hideEventsMenu->addAction(&_hideJoinAction);
hideEventsMenu->addAction(&_hidePartAction);
- hideEventsMenu->addAction(&_hideKillAction);
hideEventsMenu->addAction(&_hideQuitAction);
hideEventsMenu->addAction(&_hideModeAction);
return hideEventsMenu;
}
-//void BufferView::showContextMenu(const QPoint &pos) {
void BufferView::contextMenuEvent(QContextMenuEvent *event) {
QModelIndex index = indexAt(event->pos());
+ if(!index.isValid())
+ index = rootIndex();
if(!index.isValid())
return;
const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value<NetworkId>());
Q_CHECK_PTR(network);
- QIcon connectionStateIcon;
+ QPixmap connectionStateIcon;
if(network) {
if(network->connectionState() == Network::Initialized) {
- connectionStateIcon = QIcon(":/22x22/actions/network-connect");
+ connectionStateIcon = SmallIcon("network-connect");
} else if(network->connectionState() == Network::Disconnected) {
- connectionStateIcon = QIcon(":/22x22/actions/network-disconnect");
+ connectionStateIcon = SmallIcon("network-disconnect");
} else {
- connectionStateIcon = QIcon(":/22x22/actions/gear");
+ connectionStateIcon = SmallIcon("network-wired"); // FIXME network-connecting
}
}
-
+
QMenu contextMenu(this);
NetworkModel::itemType itemType = static_cast<NetworkModel::itemType>(index.data(NetworkModel::ItemTypeRole).toInt());
-
+
switch(itemType) {
case NetworkModel::NetworkItemType:
+ showChannelList.setData(index.data(NetworkModel::NetworkIdRole));
_disconnectNetAction.setIcon(connectionStateIcon);
_connectNetAction.setIcon(connectionStateIcon);
- addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState);
- addItemToMenu(_connectNetAction, contextMenu, index, InactiveState);
+ addItemToMenu(showChannelList, contextMenu, index, ActiveState);
+ addItemToMenu(_disconnectNetAction, contextMenu, network->connectionState() != Network::Disconnected);
+ addItemToMenu(_connectNetAction, contextMenu, network->connectionState() == Network::Disconnected);
addSeparatorToMenu(contextMenu, index, ActiveState);
addItemToMenu(_joinChannelAction, contextMenu, index, ActiveState);
break;
addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
addItemToMenu(_removeBufferAction, contextMenu, index, InactiveState);
- createHideEventsSubMenu(contextMenu);
+ createHideEventsSubMenu(contextMenu, bufferInfo.bufferId());
addItemToMenu(_ignoreListAction, contextMenu);
break;
case BufferInfo::QueryBuffer:
addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
addItemToMenu(_removeBufferAction, contextMenu);
- createHideEventsSubMenu(contextMenu);
+ createHideEventsSubMenu(contextMenu, bufferInfo.bufferId());
break;
default:
addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
default:
return;
}
-
+
if(contextMenu.actions().isEmpty())
return;
QAction *result = contextMenu.exec(QCursor::pos());
-
+
// Handle Result
if(network && result == &_connectNetAction) {
network->requestConnect();
bool ok;
QString channelName = QInputDialog::getText(this, tr("Join Channel"), tr("Input channel name:"), QLineEdit::Normal, QString(), &ok);
if(ok && !channelName.isEmpty()) {
- BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value<BufferInfo>();
- if(bufferInfo.isValid()) {
- Client::instance()->userInput(bufferInfo, QString("/J %1").arg(channelName));
- }
+ Client::instance()->userInput(BufferInfo::fakeStatusBuffer(index.data(NetworkModel::NetworkIdRole).value<NetworkId>()), QString("/J %1").arg(channelName));
}
#endif
return;
Client::instance()->userInput(bufferInfo, QString("/PART"));
return;
}
-
+
if(result == &_hideBufferTemporarilyAction) {
removeSelectedBuffers();
return;
return;
}
+ if(result == & _hideJoinAction) {
+ BufferId bufferId = index.data(NetworkModel::BufferIdRole).value<BufferId>();
+ BufferSettings(bufferId).filterMessage(Message::Join, _hideJoinAction.isChecked());
+ return;
+ }
+ if(result == &_hidePartAction) {
+ BufferId bufferId = index.data(NetworkModel::BufferIdRole).value<BufferId>();
+ BufferSettings(bufferId).filterMessage(Message::Part, _hidePartAction.isChecked());
+ return;
+ }
+ if(result == &_hideQuitAction) {
+ BufferId bufferId = index.data(NetworkModel::BufferIdRole).value<BufferId>();
+ BufferSettings(bufferId).filterMessage(Message::Quit, _hideQuitAction.isChecked());
+ return;
+ }
+ if(result == &_hideModeAction) {
+ BufferId bufferId = index.data(NetworkModel::BufferIdRole).value<BufferId>();
+ BufferSettings(bufferId).filterMessage(Message::Mode, _hideModeAction.isChecked());
+ return;
+ }
+
}
void BufferView::wheelEvent(QWheelEvent* event) {
}
selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect );
-
+
}
QSize BufferView::sizeHint() const {
return QTreeView::sizeHint();
-
+
if(!model())
return QTreeView::sizeHint();
projects / quassel.git / blobdiff