/***************************************************************************
- * Copyright (C) 2005-2016 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 *
header()->hide(); // nobody seems to use this anyway
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
// breaks with Qt 4.8
if (QString("4.8.0") > qVersion()) // FIXME breaks with Qt versions >= 4.10!
setAnimated(true);
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
}
}
-void BufferView::keyPressEvent(QKeyEvent *event)
-{
- if (event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) {
- event->accept();
- removeSelectedBuffers();
- }
- TreeViewTouch::keyPressEvent(event);
-}
-
-
void BufferView::dropEvent(QDropEvent *event)
{
QModelIndex index = indexAt(event->pos());
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);
//The check above means we won't be looking at a network, which should always be the first row, so we can just go backwards.
changeBuffer(Backward);
- /*if(removedRows.contains(bufferId))
- continue;
-
- removedRows << bufferId;*/
- /*if(permanently)
- config()->requestRemoveBufferPermanently(bufferId);
- else*/
config()->requestRemoveBuffer(bufferId);
}
-void BufferView::filterTextChanged(QString filterString)
+void BufferView::filterTextChanged(const QString& filterString)
{
BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
if (!filter) {
}
+void BufferView::changeHighlight(BufferView::Direction direction)
+{
+ // If for some weird reason we get a new delegate
+ BufferViewDelegate *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
+ BufferViewDelegate *delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(_currentHighlight));
+ if (delegate) {
+ delegate->currentHighlight = QModelIndex();
+ }
+ _currentHighlight = QModelIndex();
+ viewport()->update();
+}
+
// ****************************************
-// BufferViewDelgate
+// BufferViewDelegate
// ****************************************
class ColorsChangedEvent : public QEvent
{
QDockWidget::setWidget(_widget);
}
+void BufferViewDock::setLocked(bool locked) {
+ if (locked) {
+ setFeatures(0);
+ }
+ else {
+ setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);
+ }
+}
void BufferViewDock::updateTitle()
{
}
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)
}
} else if (event->type() == QEvent::KeyRelease) {
QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
- if (keyEvent->key() != Qt::Key_Escape) {
+
+ 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;
_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