// 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),
_joinBufferAction(tr("Join"), this),
_partBufferAction(tr("Part"), this),
- _hideBufferAction(tr("Hide selected buffers"), this),
+ _hideBufferTemporarilyAction(tr("Hide buffers"), this),
+ _hideBufferPermanentlyAction(tr("Hide buffers permanently"), this),
_removeBufferAction(tr("Delete buffer"), this),
_ignoreListAction(tr("Ignore list"), this),
_hideModeAction(tr("Mode Events"), this)
{
- // currently no events can be hidden -> disable actions
_hideJoinAction.setCheckable(true);
_hidePartAction.setCheckable(true);
_hideKillAction.setCheckable(true);
_hideQuitAction.setEnabled(false);
_hideModeAction.setEnabled(false);
+ showChannelList.setIcon(QIcon(":/16x16/actions/oxygen/16x16/actions/format-list-unordered.png"));
+
+ 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);
}
void BufferView::setModel(QAbstractItemModel *model) {
delete selectionModel();
- if(QTreeView::model()) {
- disconnect(QTreeView::model(), SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
- }
QTreeView::setModel(model);
init();
if(!model)
return;
- connect(model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
-
QString sectionName;
QAction *showSection;
for(int i = 1; i < model->columnCount(); i++) {
if(model()) {
disconnect(this, 0, model(), 0);
+ disconnect(model(), 0, this, 0);
}
if(!model_) {
} else {
BufferViewFilter *filter = new BufferViewFilter(model_, config);
setModel(filter);
- connect(this, SIGNAL(removeBuffer(const QModelIndex &)),
- filter, SLOT(removeBuffer(const QModelIndex &)));
+ connect(filter, SIGNAL(configChanged()), this, SLOT(on_configChanged()));
}
setConfig(config);
}
QTreeView::keyPressEvent(event);
}
-void BufferView::removeSelectedBuffers() {
- QSet<int> removedRows;
+void BufferView::removeSelectedBuffers(bool permanently) {
+ if(!config())
+ return;
+
+ BufferId bufferId;
+ QSet<BufferId> removedRows;
foreach(QModelIndex index, selectionModel()->selectedIndexes()) {
- if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType && !removedRows.contains(index.row())) {
- removedRows << index.row();
- emit removeBuffer(index);
- }
+ if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
+ continue;
+
+ bufferId = index.data(NetworkModel::BufferIdRole).value<BufferId>();
+ if(removedRows.contains(bufferId))
+ continue;
+
+ removedRows << bufferId;
+
+ if(permanently)
+ config()->requestRemoveBufferPermanently(bufferId);
+ else
+ config()->requestRemoveBuffer(bufferId);
}
}
}
}
-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);
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;
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;
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;
case BufferInfo::ChannelBuffer:
addItemToMenu(_joinBufferAction, contextMenu, index, InactiveState);
addItemToMenu(_partBufferAction, contextMenu, index, ActiveState);
- addItemToMenu(_hideBufferAction, contextMenu, (bool)config());
+ addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
+ addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
addItemToMenu(_removeBufferAction, contextMenu, index, InactiveState);
createHideEventsSubMenu(contextMenu);
addItemToMenu(_ignoreListAction, contextMenu);
break;
case BufferInfo::QueryBuffer:
- addItemToMenu(_hideBufferAction, contextMenu, (bool)config());
+ addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
+ addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
addItemToMenu(_removeBufferAction, contextMenu);
createHideEventsSubMenu(contextMenu);
break;
default:
- addItemToMenu(_hideBufferAction, contextMenu, (bool)config());
+ addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
+ addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
break;
}
}
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;
if(result == &_partBufferAction) {
BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
- Client::instance()->userInput(bufferInfo, QString("/PART %1").arg(bufferInfo.bufferName()));
+ Client::instance()->userInput(bufferInfo, QString("/PART"));
return;
}
- if(result == &_hideBufferAction) {
+ if(result == &_hideBufferTemporarilyAction) {
removeSelectedBuffers();
return;
}
+ if(result == &_hideBufferPermanentlyAction) {
+ removeSelectedBuffers(true);
+ return;
+ }
+
if(result == &_removeBufferAction) {
BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
int res = QMessageBox::question(this, tr("Remove buffer permanently?"),
projects / quassel.git / blobdiff