// 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),
} else {
BufferViewFilter *filter = new BufferViewFilter(model_, config);
setModel(filter);
- connect(this, SIGNAL(removeBuffer(const QModelIndex &)),
- filter, SLOT(removeBuffer(const QModelIndex &)));
}
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);
}
}
header()->setSectionHidden((action->property("column")).toInt(), !checked);
}
-bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates requiredActiveState) {
+bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState) {
if(!index.isValid())
return false;
// if(!(itemType & validItemTypes))
// return false;
- itemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool()
- ? activeState
- : inactiveState;
+ ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool()
+ ? ActiveState
+ : InactiveState;
if(!(isActive & requiredActiveState))
return false;
return true;
}
-void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) {
+void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
if(checkRequirements(index, requiredActiveState)) {
menu.addAction(&action);
action.setVisible(true);
}
-void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) {
+void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
if(checkRequirements(index, requiredActiveState)) {
menu.addMenu(&subMenu);
subMenu.setVisible(true);
}
}
-void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) {
+void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
if(checkRequirements(index, requiredActiveState)) {
menu.addSeparator();
}
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);
- addSeparatorToMenu(contextMenu, index, activeState);
- addItemToMenu(_joinChannelAction, contextMenu, index, activeState);
+ addItemToMenu(showChannelList, contextMenu, index, ActiveState);
+ addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState);
+ addItemToMenu(_connectNetAction, contextMenu, index, InactiveState);
+ addSeparatorToMenu(contextMenu, index, ActiveState);
+ addItemToMenu(_joinChannelAction, contextMenu, index, ActiveState);
break;
case NetworkModel::BufferItemType:
{
BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
switch(bufferInfo.type()) {
case BufferInfo::ChannelBuffer:
- addItemToMenu(_joinBufferAction, contextMenu, index, inactiveState);
- addItemToMenu(_partBufferAction, contextMenu, index, activeState);
- addItemToMenu(_hideBufferAction, contextMenu, (bool)config());
- addItemToMenu(_removeBufferAction, contextMenu, index, inactiveState);
+ addItemToMenu(_joinBufferAction, contextMenu, index, InactiveState);
+ addItemToMenu(_partBufferAction, contextMenu, index, ActiveState);
+ 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));
+// BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+// if(bufferInfo.isValid()) {
+// Client::instance()->userInput(bufferInfo, 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?"),