/***************************************************************************
- * Copyright (C) 2005-2015 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include <QMenu>
#include <QMessageBox>
#include <QSet>
-#include <QTouchEvent>
-#include <QScrollBar>
-
#include "action.h"
#include "buffermodel.h"
* The TreeView showing the Buffers
*****************************************/
// Please be carefull when reimplementing methods which are used to inform the view about changes to the data
-// to be on the safe side: call QTreeView's method aswell
+// to be on the safe side: call QTreeView's method aswell (or TreeViewTouch's)
BufferView::BufferView(QWidget *parent)
- : QTreeView(parent)
+ : TreeViewTouch(parent)
{
connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
hideColumn(2);
setIndentation(10);
- expandAll();
+ // New entries will be expanded automatically when added; no need to call expandAll()
header()->hide(); // nobody seems to use this anyway
setAcceptDrops(true);
setDropIndicatorShown(true);
#endif
- setAttribute(Qt::WA_AcceptTouchEvents);
setSortingEnabled(true);
sortByColumn(0, Qt::AscendingOrder);
- // activated() fails on X11 and Qtopia at least
-#if defined Q_WS_QWS || defined Q_WS_X11
- disconnect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
- connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex)));
-#else
+#if defined Q_OS_MACOS || defined Q_OS_WIN
// afaik this is better on Mac and Windows
disconnect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
connect(this, SIGNAL(activated(QModelIndex)), SLOT(joinChannel(QModelIndex)));
+#else
+ disconnect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
+ connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex)));
#endif
}
{
delete selectionModel();
- QTreeView::setModel(model);
+ TreeViewTouch::setModel(model);
init();
// remove old Actions
QList<QAction *> oldactions = header()->actions();
}
connect(model, SIGNAL(layoutChanged()), this, SLOT(on_layoutChanged()));
+
+ // Make sure collapsation is correct after setting a model
+ // This might not be needed here, only in BufferView::setFilteredModel(). If issues arise, just
+ // move down to setFilteredModel (which calls this function).
+ setExpandedState();
}
Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));
}
-bool BufferView::event(QEvent *event) {
- if (event->type() == QEvent::TouchBegin && _lastTouchStart < QDateTime::currentMSecsSinceEpoch() - 1000) { //(slow) double tab = normal behaviour = select multiple. 1000 ok?
- _touchScrollInProgress = true;
- _lastTouchStart = QDateTime::currentMSecsSinceEpoch();
- setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
- return true;
- }
-
- if (event->type() == QEvent::TouchUpdate && _touchScrollInProgress) {
- QTouchEvent::TouchPoint p = ((QTouchEvent*)event)->touchPoints().at(0);
- verticalScrollBar()->setValue(verticalScrollBar()->value() - (p.pos().y() - p.lastPos().y()));
- return true;
- }
-#if QT_VERSION >= 0x050000
- if (event->type() == QEvent::TouchEnd || event->type() == QEvent::TouchCancel) {
-#else
- if (event->type() == QEvent::TouchEnd) {
-#endif
- _touchScrollInProgress = false;
- return true;
- }
-
- return QTreeView::event(event);
-}
-
-void BufferView::mousePressEvent(QMouseEvent * event) {
- if (!_touchScrollInProgress)
- QTreeView::mousePressEvent(event);
-}
-
-void BufferView::mouseMoveEvent(QMouseEvent * event) {
- if (!_touchScrollInProgress)
- QTreeView::mouseMoveEvent(event);
-}
void BufferView::keyPressEvent(QKeyEvent *event)
{
event->accept();
removeSelectedBuffers();
}
- QTreeView::keyPressEvent(event);
+ TreeViewTouch::keyPressEvent(event);
}
QPoint cursorPos = event->pos();
// check if we're really _on_ the item and not indicating a move to just above or below the item
+ // Magic margin number for this is from QAbstractItemViewPrivate::position()
const int margin = 2;
if (cursorPos.y() - indexRect.top() < margin
|| indexRect.bottom() - cursorPos.y() < margin)
- return QTreeView::dropEvent(event);
+ return TreeViewTouch::dropEvent(event);
+ // If more than one buffer was being dragged, treat this as a rearrangement instead of a merge request
QList<QPair<NetworkId, BufferId> > bufferList = Client::networkModel()->mimeDataToBufferList(event->mimeData());
if (bufferList.count() != 1)
- return QTreeView::dropEvent(event);
+ return TreeViewTouch::dropEvent(event);
+ // Get the Buffer ID of the buffer that was being dragged
BufferId bufferId2 = bufferList[0].second;
- if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
- return QTreeView::dropEvent(event);
-
- if (index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer)
- return QTreeView::dropEvent(event);
-
+ // Get the Buffer ID of the target buffer
BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value<BufferId>();
+
+ // If the source and target are the same buffer, this was an aborted rearrangement
if (bufferId1 == bufferId2)
- return QTreeView::dropEvent(event);
+ return TreeViewTouch::dropEvent(event);
+
+ // Get index of buffer that was being dragged
+ QModelIndex index2 = Client::networkModel()->bufferIndex(bufferId2);
+ // If the buffer being dragged is a channel and we're still joined to it, treat this as a rearrangement
+ // This prevents us from being joined to a channel with no associated UI elements
+ if (index2.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer && index2.data(NetworkModel::ItemActiveRole) == true)
+ return TreeViewTouch::dropEvent(event);
+
+ //If the source buffer is not mergeable(AKA not a Channel and not a Query), try rearranging instead
+ if (index2.data(NetworkModel::BufferTypeRole) != BufferInfo::ChannelBuffer && index2.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer)
+ return TreeViewTouch::dropEvent(event);
+
+ // If the target buffer is not mergeable(AKA not a Channel and not a Query), try rearranging instead
+ if (index.data(NetworkModel::BufferTypeRole) != BufferInfo::ChannelBuffer && index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer)
+ return TreeViewTouch::dropEvent(event);
+
+ // Confirm that the user really wants to merge the buffers before doing so
int res = QMessageBox::question(0, tr("Merge buffers permanently?"),
tr("Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n This cannot be reversed!").arg(Client::networkModel()->bufferName(bufferId2)).arg(Client::networkModel()->bufferName(bufferId1)),
QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
void BufferView::rowsInserted(const QModelIndex &parent, int start, int end)
{
- QTreeView::rowsInserted(parent, start, end);
+ TreeViewTouch::rowsInserted(parent, start, end);
// ensure that newly inserted network nodes are expanded per default
if (parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
{
Q_ASSERT(model());
- // expand all active networks... collapse inactive ones... unless manually changed
+ // Expand/collapse as needed
+ setExpandedState();
+
+ if (config()) {
+ // update selection to current one
+ Client::bufferModel()->synchronizeView(this);
+ }
+}
+
+
+void BufferView::setExpandedState()
+{
+ // Expand all active networks, collapse inactive ones... unless manually changed
QModelIndex networkIdx;
NetworkId networkId;
for (int row = 0; row < model()->rowCount(); row++) {
setExpandedState(networkIdx);
}
-
- if (config()) {
- // update selection to current one
- Client::bufferModel()->synchronizeView(this);
- }
}
#if QT_VERSION < 0x050000
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
{
- QTreeView::dataChanged(topLeft, bottomRight);
+ TreeViewTouch::dataChanged(topLeft, bottomRight);
#else
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
{
- QTreeView::dataChanged(topLeft, bottomRight, roles);
+ TreeViewTouch::dataChanged(topLeft, bottomRight, roles);
#endif
// determine how many items have been changed and if any of them is a networkitem
void BufferView::wheelEvent(QWheelEvent *event)
{
if (ItemViewSettings().mouseWheelChangesBuffer() == (bool)(event->modifiers() & Qt::AltModifier))
- return QTreeView::wheelEvent(event);
+ return TreeViewTouch::wheelEvent(event);
int rowDelta = (event->delta() > 0) ? -1 : 1;
changeBuffer((Direction)rowDelta);
QSize BufferView::sizeHint() const
{
- return QTreeView::sizeHint();
+ return TreeViewTouch::sizeHint();
if (!model())
- return QTreeView::sizeHint();
+ return TreeViewTouch::sizeHint();
if (model()->rowCount() == 0)
return QSize(120, 50);
if (!value.isValid())
return QStyledItemDelegate::editorEvent(event, model, option, index);
+#if QT_VERSION < 0x050000
QStyleOptionViewItemV4 viewOpt(option);
+#else
+ QStyleOptionViewItem viewOpt(option);
+#endif
initStyleOption(&viewOpt, index);
QRect checkRect = viewOpt.widget->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, viewOpt.widget);
projects / quassel.git / blobdiff