_connectNetAction(tr("Connect"), this),
_disconnectNetAction(tr("Disconnect"), this),
_joinChannelAction(tr("Join Channel"), this),
_joinBufferAction(tr("Join"), this),
_partBufferAction(tr("Part"), 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),
_removeBufferAction(tr("Delete buffer"), this),
_ignoreListAction(tr("Ignore list"), this),
_hideJoinAction.setCheckable(true);
_hidePartAction.setCheckable(true);
_hideKillAction.setCheckable(true);
_hideJoinAction.setCheckable(true);
_hidePartAction.setCheckable(true);
_hideKillAction.setCheckable(true);
+ 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 &)));
+
if(model()) {
disconnect(this, 0, model(), 0);
if(model()) {
disconnect(this, 0, model(), 0);
- connect(this, SIGNAL(removeBuffer(const QModelIndex &)),
- filter, SLOT(removeBuffer(const QModelIndex &)));
+ connect(filter, SIGNAL(configChanged()), this, SLOT(on_configChanged()));
- 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);
for(int row = 0; row < model()->rowCount(); row++) {
networkIdx = model()->index(row, 0);
for(int row = 0; row < model()->rowCount(); row++) {
networkIdx = model()->index(row, 0);
- 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)
+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);
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
QTreeView::dataChanged(topLeft, bottomRight);
void BufferView::toggleHeader(bool checked) {
QAction *action = qobject_cast<QAction *>(sender());
header()->setSectionHidden((action->property("column")).toInt(), !checked);
void BufferView::toggleHeader(bool checked) {
QAction *action = qobject_cast<QAction *>(sender());
header()->setSectionHidden((action->property("column")).toInt(), !checked);
void BufferView::contextMenuEvent(QContextMenuEvent *event) {
QModelIndex index = indexAt(event->pos());
void BufferView::contextMenuEvent(QContextMenuEvent *event) {
QModelIndex index = indexAt(event->pos());
addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState);
addItemToMenu(_connectNetAction, contextMenu, index, InactiveState);
addSeparatorToMenu(contextMenu, index, ActiveState);
addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState);
addItemToMenu(_connectNetAction, contextMenu, index, InactiveState);
addSeparatorToMenu(contextMenu, index, ActiveState);
case BufferInfo::ChannelBuffer:
addItemToMenu(_joinBufferAction, contextMenu, index, InactiveState);
addItemToMenu(_partBufferAction, contextMenu, index, ActiveState);
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(_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(_removeBufferAction, contextMenu);
createHideEventsSubMenu(contextMenu);
break;
default:
- addItemToMenu(_hideBufferAction, contextMenu, (bool)config());
+ addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
+ addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
bool ok;
QString channelName = QInputDialog::getText(this, tr("Join Channel"), tr("Input channel name:"), QLineEdit::Normal, QString(), &ok);
if(ok && !channelName.isEmpty()) {
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));
if(result == &_partBufferAction) {
BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
if(result == &_partBufferAction) {
BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
if(result == &_removeBufferAction) {
BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
int res = QMessageBox::question(this, tr("Remove buffer permanently?"),
if(result == &_removeBufferAction) {
BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
int res = QMessageBox::question(this, tr("Remove buffer permanently?"),