BufferView::BufferView(QWidget *parent)
: TreeViewTouch(parent)
{
- connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
- connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
+ connect(this, &QTreeView::collapsed, this, &BufferView::storeExpandedState);
+ connect(this, &QTreeView::expanded, this, &BufferView::storeExpandedState);
setSelectionMode(QAbstractItemView::ExtendedSelection);
QAbstractItemDelegate *oldDelegate = itemDelegate();
- BufferViewDelegate *tristateDelegate = new BufferViewDelegate(this);
+ auto *tristateDelegate = new BufferViewDelegate(this);
setItemDelegate(tristateDelegate);
delete oldDelegate;
}
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- // breaks with Qt 4.8
- if (QString("4.8.0") > qVersion()) // FIXME breaks with Qt versions >= 4.10!
- setAnimated(true);
+ setAnimated(true);
// FIXME This is to workaround bug #663
setUniformRowHeights(true);
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)));
+ disconnect(this, &QAbstractItemView::doubleClicked, this, &BufferView::joinChannel);
+ connect(this, &QAbstractItemView::doubleClicked, this, &BufferView::joinChannel);
#endif
}
showSection->setCheckable(true);
showSection->setChecked(!isColumnHidden(i));
showSection->setProperty("column", i);
- connect(showSection, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
+ connect(showSection, &QAction::toggled, this, &BufferView::toggleHeader);
header()->addAction(showSection);
}
- connect(model, SIGNAL(layoutChanged()), this, SLOT(on_layoutChanged()));
+ connect(model, &QAbstractItemModel::layoutChanged, this, &BufferView::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
void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config)
{
- BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
+ auto *filter = qobject_cast<BufferViewFilter *>(model());
if (filter) {
filter->setConfig(config);
setConfig(config);
}
if (model()) {
- disconnect(this, 0, model(), 0);
- disconnect(model(), 0, this, 0);
+ disconnect(this, nullptr, model(), nullptr);
+ disconnect(model(), nullptr, this, nullptr);
}
if (!model_) {
setModel(model_);
}
else {
- BufferViewFilter *filter = new BufferViewFilter(model_, config);
+ auto *filter = new BufferViewFilter(model_, config);
setModel(filter);
- connect(filter, SIGNAL(configChanged()), this, SLOT(on_configChanged()));
+ connect(filter, &BufferViewFilter::configChanged, this, &BufferView::on_configChanged);
}
setConfig(config);
}
return;
if (_config) {
- disconnect(_config, 0, this, 0);
+ disconnect(_config, nullptr, this, nullptr);
}
_config = config;
if (config) {
- connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(setRootIndexForNetworkId(const NetworkId &)));
+ connect(config, &BufferViewConfig::networkIdSet, this, &BufferView::setRootIndexForNetworkId);
setRootIndexForNetworkId(config->networkId());
}
else {
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?"),
+ int res = QMessageBox::question(nullptr, 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);
if (res == QMessageBox::Yes) {
storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
}
-#if QT_VERSION < 0x050000
-void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
-{
- TreeViewTouch::dataChanged(topLeft, bottomRight);
-#else
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
{
TreeViewTouch::dataChanged(topLeft, bottomRight, roles);
-#endif
// determine how many items have been changed and if any of them is a networkitem
// which just swichted from active to inactive or vice versa
void BufferView::toggleHeader(bool checked)
{
- QAction *action = qobject_cast<QAction *>(sender());
+ auto *action = qobject_cast<QAction *>(sender());
header()->setSectionHidden((action->property("column")).toInt(), !checked);
}
void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index)
{
- BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
+ auto *filter = qobject_cast<BufferViewFilter *>(model());
if (filter) {
QList<QAction *> filterActions = filter->actions(index);
if (!filterActions.isEmpty()) {
QModelIndex currentIndex = selectionModel()->currentIndex();
QModelIndex resultingIndex;
+ QModelIndex lastNetIndex = model()->index(model()->rowCount() - 1, 0, QModelIndex());
+
if (currentIndex.parent().isValid()) {
//If we are a child node just switch among siblings unless it's the first/last child
resultingIndex = currentIndex.sibling(currentIndex.row() + direction, 0);
//If we have a toplevel node, try and get an adjacent child
if (direction == Backward) {
QModelIndex newParent = currentIndex.sibling(currentIndex.row() - 1, 0);
+ if (currentIndex.row() == 0)
+ newParent = lastNetIndex;
if (model()->hasChildren(newParent))
resultingIndex = newParent.child(model()->rowCount(newParent) - 1, 0);
else
}
}
- if (!resultingIndex.isValid())
- return;
+ if (!resultingIndex.isValid()) {
+ if (direction == Forward)
+ resultingIndex = model()->index(0, 0, QModelIndex());
+ else
+ resultingIndex = lastNetIndex.child(model()->rowCount(lastNetIndex) - 1, 0);
+ }
selectionModel()->setCurrentIndex(resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
selectionModel()->select(resultingIndex, QItemSelectionModel::ClearAndSelect);
config()->requestRemoveBuffer(bufferId);
}
-void BufferView::filterTextChanged(QString filterString)
+void BufferView::filterTextChanged(const QString& filterString)
{
- BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
+ auto *filter = qobject_cast<BufferViewFilter *>(model());
if (!filter) {
return;
}
return TreeViewTouch::sizeHint();
if (model()->rowCount() == 0)
- return QSize(120, 50);
+ return {120, 50};
int columnSize = 0;
for (int i = 0; i < model()->columnCount(); i++) {
if (!isColumnHidden(i))
columnSize += sizeHintForColumn(i);
}
- return QSize(columnSize, 50);
+ return {columnSize, 50};
+}
+
+
+void BufferView::changeHighlight(BufferView::Direction direction)
+{
+ // If for some weird reason we get a new delegate
+ auto delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(_currentHighlight));
+ if (delegate) {
+ delegate->currentHighlight = QModelIndex();
+ }
+
+ QModelIndex newIndex = _currentHighlight;
+ if (!newIndex.isValid()) {
+ newIndex = model()->index(0, 0);
+ }
+
+ if (direction == Backward) {
+ newIndex = indexBelow(newIndex);
+ } else {
+ newIndex = indexAbove(newIndex);
+ }
+
+ if (!newIndex.isValid()) {
+ return;
+ }
+
+ _currentHighlight = newIndex;
+
+ delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(_currentHighlight));
+ if (delegate) {
+ delegate->currentHighlight = _currentHighlight;
+ }
+ viewport()->update();
}
+void BufferView::selectHighlighted()
+{
+ if (_currentHighlight.isValid()) {
+ selectionModel()->setCurrentIndex(_currentHighlight, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+ selectionModel()->select(_currentHighlight, QItemSelectionModel::ClearAndSelect);
+ } else {
+ selectFirstBuffer();
+ }
+
+ clearHighlight();
+}
+
+void BufferView::clearHighlight()
+{
+ // If for some weird reason we get a new delegate
+ auto delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(_currentHighlight));
+ if (delegate) {
+ delegate->currentHighlight = QModelIndex();
+ }
+ _currentHighlight = QModelIndex();
+ viewport()->update();
+}
// ****************************************
-// BufferViewDelgate
+// BufferViewDelegate
// ****************************************
class ColorsChangedEvent : public QEvent
{
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);
- QMouseEvent *me = static_cast<QMouseEvent *>(event);
+ auto *me = static_cast<QMouseEvent *>(event);
if (me->button() != Qt::LeftButton || !checkRect.contains(me->pos()))
return QStyledItemDelegate::editorEvent(event, model, option, index);
- Qt::CheckState state = static_cast<Qt::CheckState>(value.toInt());
+ auto state = static_cast<Qt::CheckState>(value.toInt());
if (state == Qt::Unchecked)
state = Qt::PartiallyChecked;
else if (state == Qt::PartiallyChecked)
// ==============================
BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent)
: QDockWidget(parent),
- _childWidget(0),
+ _childWidget(nullptr),
_widget(new QWidget(parent)),
_filterEdit(new QLineEdit(parent)),
_active(false),
setObjectName("BufferViewDock-" + QString::number(config->bufferViewId()));
toggleViewAction()->setData(config->bufferViewId());
setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
- connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(bufferViewRenamed(const QString &)));
- connect(config, SIGNAL(configChanged()), SLOT(configChanged()));
+ connect(config, &BufferViewConfig::bufferViewNameSet, this, &BufferViewDock::bufferViewRenamed);
+ connect(config, &BufferViewConfig::configChanged, this, &BufferViewDock::configChanged);
updateTitle();
_widget->setLayout(new QVBoxLayout);
_filterEdit->setFocusPolicy(Qt::ClickFocus);
_filterEdit->installEventFilter(this);
_filterEdit->setPlaceholderText(tr("Search..."));
- connect(_filterEdit, SIGNAL(returnPressed()), SLOT(onFilterReturnPressed()));
+ connect(_filterEdit, &QLineEdit::returnPressed, this, &BufferViewDock::onFilterReturnPressed);
_widget->layout()->addWidget(_filterEdit);
QDockWidget::setWidget(_widget);
void BufferViewDock::setLocked(bool locked) {
if (locked) {
- setFeatures(0);
+ setFeatures(nullptr);
}
else {
setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);
{
if (_oldFocusItem) {
_oldFocusItem->setFocus();
- _oldFocusItem = 0;
+ _oldFocusItem = nullptr;
}
if (!config()->showSearch()) {
}
BufferView *view = bufferView();
- if (!view || _filterEdit->text().isEmpty()) {
+ if (!view) {
return;
}
- view->selectFirstBuffer();
- _filterEdit->clear();
+ if (!_filterEdit->text().isEmpty()) {
+ view->selectHighlighted();
+ _filterEdit->clear();
+ } else {
+ view->clearHighlight();
+ }
}
void BufferViewDock::setActive(bool active)
return true;
}
} else if (event->type() == QEvent::KeyRelease) {
- QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
- if (keyEvent->key() != Qt::Key_Escape) {
+ auto keyEvent = static_cast<QKeyEvent*>(event);
+
+ BufferView *view = bufferView();
+ if (!view) {
return false;
}
- _filterEdit->clear();
+ switch (keyEvent->key()) {
+ case Qt::Key_Escape: {
+ _filterEdit->clear();
+
+ if (!_oldFocusItem) {
+ return false;
+ }
- if (_oldFocusItem) {
_oldFocusItem->setFocus();
- _oldFocusItem = 0;
+ _oldFocusItem = nullptr;
+ return true;
+ }
+ case Qt::Key_Down:
+ view->changeHighlight(BufferView::Backward);
+ return true;
+ case Qt::Key_Up:
+ view->changeHighlight(BufferView::Forward);
+ return true;
+ default:
+ break;
}
- return true;
+ return false;
}
return false;
{
BufferView *view = bufferView();
if (!view)
- return 0;
+ return nullptr;
else
return view->config();
}
_widget->layout()->addWidget(newWidget);
_childWidget = newWidget;
- connect(_filterEdit, SIGNAL(textChanged(QString)), bufferView(), SLOT(filterTextChanged(QString)));
+ connect(_filterEdit, &QLineEdit::textChanged, bufferView(), &BufferView::filterTextChanged);
}
void BufferViewDock::activateFilter()
_filterEdit->setFocus();
}
+
+
+void BufferViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+ QStyleOptionViewItem newOption = option;
+ if (index == currentHighlight) {
+ newOption.state |= QStyle::State_HasFocus;
+ }
+ QStyledItemDelegate::paint(painter, newOption, index);
+}
projects / quassel.git / blobdiff