QT_MOD = core network sql script
SRCS = core.cpp corebacklogmanager.cpp corebufferviewconfig.cpp corebufferviewmanager.cpp coresession.cpp coresettings.cpp networkconnection.cpp sqlitestorage.cpp abstractsqlstorage.cpp storage.cpp basichandler.cpp \
- ircserverhandler.cpp userinputhandler.cpp ctcphandler.cpp coreusersettings.cpp sessionthread.cpp sslserver.cpp
+ ircserverhandler.cpp userinputhandler.cpp ctcphandler.cpp coreusersettings.cpp sessionthread.cpp
HDRS = core.h corebacklogmanager.h corebufferviewconfig.h corebufferviewmanager.h coresession.h coresettings.h networkconnection.h sqlitestorage.h abstractsqlstorage.h storage.h basichandler.h \
- ircserverhandler.h userinputhandler.h ctcphandler.h coreusersettings.h sessionthread.h sslserver.h
+ ircserverhandler.h userinputhandler.h ctcphandler.h coreusersettings.h sessionthread.h
+
+contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
+ SRCS += sslserver.cpp
+ HDRS += sslserver.h
+}
#include <QLineEdit>
#include <QMenu>
#include <QMessageBox>
+#include <QSet>
/*****************************************
* The TreeView showing the Buffers
connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
this, SLOT(showContextMenu(const QPoint &)));
+
+ setSelectionMode(QAbstractItemView::ExtendedSelection);
}
void BufferView::init() {
void BufferView::keyPressEvent(QKeyEvent *event) {
if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) {
event->accept();
- QModelIndex index = selectionModel()->selectedIndexes().first();
- if(index.isValid()) {
+ removeSelectedBuffers();
+ }
+ QTreeView::keyPressEvent(event);
+}
+
+void BufferView::removeSelectedBuffers() {
+ QSet<int> removedRows;
+ foreach(QModelIndex index, selectionModel()->selectedIndexes()) {
+ if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType && !removedRows.contains(index.row())) {
+ removedRows << index.row();
emit removeBuffer(index);
}
}
- QTreeView::keyPressEvent(event);
}
void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
QAction *joinBufferAction = new QAction(tr("Join"), this);
QAction *partBufferAction = new QAction(tr("Part"), this);
+ QAction *hideBufferAction = new QAction(tr("Remove buffers"), this);
+ hideBufferAction->setToolTip(tr("Removes the selected buffers from a custom view but leaves the buffer itself untouched"));
QAction *removeBufferAction = new QAction(tr("Delete buffer"), this);
QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), this);
if(bufferInfo.type() != BufferInfo::ChannelBuffer && bufferInfo.type() != BufferInfo::QueryBuffer) return;
contextMenu.addAction(joinBufferAction);
contextMenu.addAction(partBufferAction);
+ if(config())
+ contextMenu.addAction(hideBufferAction);
contextMenu.addAction(removeBufferAction);
contextMenu.addMenu(hideEventsMenu);
contextMenu.addAction(ignoreListAction);
}
}
#endif
- } else
- if(result == joinBufferAction) {
+ } else if(result == joinBufferAction) {
Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(channelname));
- } else
- if(result == partBufferAction) {
+ } else if(result == partBufferAction) {
Client::instance()->userInput(bufferInfo, QString("/PART %1").arg(channelname));
- } else
- if(result == removeBufferAction) {
+ } else if(result == hideBufferAction) {
+ removeSelectedBuffers();
+ } else if(result == removeBufferAction) {
int res = QMessageBox::question(this, tr("Remove buffer permanently?"),
tr("Do you want to delete the buffer \"%1\" permanently? This will delete all related data, including all backlog "
"data, from the core's database!").arg(bufferInfo.bufferName()),
#include "bufferviewfilter.h"
+#include <QCoreApplication>
+
#include "buffermodel.h"
#include "client.h"
#include "networkmodel.h"
}
void BufferViewFilter::removeBuffer(const QModelIndex &index) {
- if(!config())
+ if(!config() || !index.isValid() || index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
return;
-
+
BufferId bufferId = data(index, NetworkModel::BufferIdRole).value<BufferId>();
config()->requestRemoveBuffer(bufferId);
}
void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous) {
Q_UNUSED(current);
if(previous.isValid())
- qApp->postEvent(this, new CheckRemovalEvent(previous));
+ QCoreApplication::postEvent(this, new CheckRemovalEvent(previous));
}
void BufferViewFilter::customEvent(QEvent *event) {