#include "dolphinmodel.h"
#include "dolphincontroller.h"
#include "dolphinfileitemdelegate.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
#include "dolphinsortfilterproxymodel.h"
#include "dolphinviewautoscroller.h"
#include "draganddrophelper.h"
-#include "selectionmanager.h"
+#include "viewextensionsfactory.h"
#include "viewproperties.h"
#include "zoomlevelinfo.h"
#include <klocale.h>
#include <kmenu.h>
-#include <QAbstractProxyModel>
#include <QAction>
#include <QApplication>
#include <QHeaderView>
#include <QPainter>
#include <QScrollBar>
-DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
+DolphinDetailsView::DolphinDetailsView(QWidget* parent,
+ DolphinController* controller,
+ DolphinSortFilterProxyModel* proxyModel) :
QTreeView(parent),
m_autoResize(true),
m_expandingTogglePressed(false),
m_useDefaultIndexAt(true),
m_ignoreScrollTo(false),
m_controller(controller),
- m_selectionManager(0),
- m_autoScroller(0),
+ m_extensionsFactory(0),
+ m_expandableFoldersAction(0),
m_font(),
m_decorationSize(),
m_band()
setRootIsDecorated(settings->expandableFolders());
setItemsExpandable(settings->expandableFolders());
setEditTriggers(QAbstractItemView::NoEditTriggers);
+ setModel(proxyModel);
setMouseTracking(true);
- m_autoScroller = new DolphinViewAutoScroller(this);
const ViewProperties props(controller->url());
setSortIndicatorSection(props.sorting());
this, SLOT(synchronizeSortingState(int)));
headerView->setContextMenuPolicy(Qt::CustomContextMenu);
connect(headerView, SIGNAL(customContextMenuRequested(const QPoint&)),
- this, SLOT(configureColumns(const QPoint&)));
+ this, SLOT(configureSettings(const QPoint&)));
connect(headerView, SIGNAL(sectionResized(int, int, int)),
this, SLOT(slotHeaderSectionResized(int, int, int)));
connect(headerView, SIGNAL(sectionHandleDoubleClicked(int)),
controller, SLOT(triggerItem(const QModelIndex&)));
}
- if (DolphinSettings::instance().generalSettings()->showSelectionToggle()) {
- m_selectionManager = new SelectionManager(this);
- connect(m_selectionManager, SIGNAL(selectionChanged()),
- this, SLOT(requestActivation()));
- connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
- m_selectionManager, SLOT(reset()));
- }
-
connect(this, SIGNAL(entered(const QModelIndex&)),
this, SLOT(slotEntered(const QModelIndex&)));
connect(this, SIGNAL(viewportEntered()),
controller, SLOT(emitViewportEntered()));
+ connect(controller, SIGNAL(nameFilterChanged(const QString&)),
+ this, SLOT(setNameFilter(const QString&)));
connect(controller, SIGNAL(zoomLevelChanged(int)),
this, SLOT(setZoomLevel(int)));
connect(controller->dolphinView(), SIGNAL(additionalInfoChanged()),
setFocus();
viewport()->installEventFilter(this);
- connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
- this, SLOT(updateFont()));
+ connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)),
+ this, SLOT(slotGlobalSettingsChanged(int)));
m_useDefaultIndexAt = false;
+
+ m_expandableFoldersAction = new QAction(i18nc("@option:check", "Expandable Folders"), this);
+ m_expandableFoldersAction->setCheckable(true);
+ connect(m_expandableFoldersAction, SIGNAL(toggled(bool)),
+ this, SLOT(setFoldersExpandable(bool)));
+
+ m_extensionsFactory = new ViewExtensionsFactory(this, controller);
+ m_extensionsFactory->fileItemDelegate()->setMinimizedNameColumn(true);
}
DolphinDetailsView::~DolphinDetailsView()
bool DolphinDetailsView::event(QEvent* event)
{
if (event->type() == QEvent::Polish) {
- QHeaderView* headerView = header();
- headerView->setResizeMode(QHeaderView::Interactive);
- headerView->setMovable(false);
-
+ header()->setResizeMode(QHeaderView::Interactive);
updateColumnVisibility();
-
- hideColumn(DolphinModel::Rating);
- hideColumn(DolphinModel::Tags);
}
return QTreeView::event(event);
void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
{
QTreeView::contextMenuEvent(event);
- m_controller->triggerContextMenuRequest(event->pos());
+
+ DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+ m_expandableFoldersAction->setChecked(settings->expandableFolders());
+ m_controller->triggerContextMenuRequest(event->pos(),
+ QList<QAction*>() << m_expandableFoldersAction);
}
void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
const QModelIndex current = currentIndex();
QTreeView::mousePressEvent(event);
- m_expandingTogglePressed = false;
+ m_expandingTogglePressed = isAboveExpandingToggle(event->pos());
+
const QModelIndex index = indexAt(event->pos());
const bool updateState = index.isValid() &&
(index.column() == DolphinModel::Name) &&
(event->button() == Qt::LeftButton);
if (updateState) {
- // TODO: See comment in DolphinIconsView::mousePressEvent(). Only update
- // the state if no expanding/collapsing area has been hit:
- const QRect rect = visualRect(index);
- if (event->pos().x() >= rect.x() + indentation()) {
- setState(QAbstractItemView::DraggingState);
- } else {
- m_expandingTogglePressed = true;
- }
+ setState(QAbstractItemView::DraggingState);
}
if (!index.isValid() || (index.column() != DolphinModel::Name)) {
m_controller->replaceUrlByClipboard();
}
- const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
- if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
+ const Qt::KeyboardModifiers mod = QApplication::keyboardModifiers();
+ if (!m_expandingTogglePressed && !(mod & Qt::ShiftModifier) && !(mod & Qt::ControlModifier)) {
clearSelection();
}
m_band.show = true;
// Incremental update data will not be useful - start from scratch.
m_band.ignoreOldInfo = true;
- const QPoint pos = contentsPos();
const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
- m_band.origin = event->pos() + pos + scrollPos;
+ m_band.origin = event->pos() + scrollPos;
m_band.destination = m_band.origin;
m_band.originalSelection = selectionModel()->selection();
}
void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
{
+ if (m_expandingTogglePressed) {
+ // Per default QTreeView starts either a selection or a drag operation when dragging
+ // the expanding toggle button (Qt-issue - see TODO comment in DolphinIconsView::mousePressEvent()).
+ // Turn off this behavior in Dolphin to stay predictable:
+ setState(QAbstractItemView::NoState);
+ return;
+ }
+
if (m_band.show) {
const QPoint mousePos = event->pos();
const QModelIndex index = indexAt(mousePos);
// QTreeView::mouseMoveEvent(event);
QAbstractItemView::mouseMoveEvent(event);
}
-
- if (m_expandingTogglePressed) {
- // Per default QTreeView starts either a selection or a drag operation when dragging
- // the expanding toggle button (Qt-issue - see TODO comment in DolphinIconsView::mousePressEvent()).
- // Turn off this behavior in Dolphin to stay predictable:
- clearSelection();
- setState(QAbstractItemView::NoState);
- }
}
void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
{
- const QModelIndex index = indexAt(event->pos());
- if (index.isValid() && (index.column() == DolphinModel::Name)) {
- QTreeView::mouseReleaseEvent(event);
- } else {
- // don't change the current index if the cursor is released
- // above any other column than the name column, as the other
- // columns act as viewport
- const QModelIndex current = currentIndex();
- QTreeView::mouseReleaseEvent(event);
- selectionModel()->setCurrentIndex(current, QItemSelectionModel::Current);
+ if (!m_expandingTogglePressed) {
+ const QModelIndex index = indexAt(event->pos());
+ if (index.isValid() && (index.column() == DolphinModel::Name)) {
+ QTreeView::mouseReleaseEvent(event);
+ } else {
+ // don't change the current index if the cursor is released
+ // above any other column than the name column, as the other
+ // columns act as viewport
+ const QModelIndex current = currentIndex();
+ QTreeView::mouseReleaseEvent(event);
+ selectionModel()->setCurrentIndex(current, QItemSelectionModel::Current);
+ }
}
-
m_expandingTogglePressed = false;
+
if (m_band.show) {
setState(NoState);
updateElasticBand();
void DolphinDetailsView::wheelEvent(QWheelEvent* event)
{
- if (m_selectionManager != 0) {
- m_selectionManager->reset();
- }
-
// let Ctrl+wheel events propagate to the DolphinView for icon zooming
if (event->modifiers() & Qt::ControlModifier) {
event->ignore();
void DolphinDetailsView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
{
QTreeView::currentChanged(current, previous);
- if (current.isValid() && !m_autoScroller->isActive()) {
- scrollTo(current);
- }
+ m_extensionsFactory->handleCurrentIndexChange(current, previous);
// Stay consistent with QListView: When changing the current index by key presses,
// also change the selection.
return isAboveEmptySpace ? QModelIndex() : index;
}
-void DolphinDetailsView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command)
+void DolphinDetailsView::setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags command)
{
// We must override setSelection() as Qt calls it internally and when this happens
// we must ensure that the default indexAt() is used.
void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
{
- QHeaderView* headerView = header();
- headerView->setSortIndicator(sorting, headerView->sortIndicatorOrder());
+ header()->setSortIndicator(sorting, header()->sortIndicatorOrder());
}
void DolphinDetailsView::setSortIndicatorOrder(Qt::SortOrder sortOrder)
{
- QHeaderView* headerView = header();
- headerView->setSortIndicator(headerView->sortIndicatorSection(), sortOrder);
+ header()->setSortIndicator(header()->sortIndicatorSection(), sortOrder);
}
void DolphinDetailsView::synchronizeSortingState(int column)
if (m_band.destination.x() < 0) {
m_band.destination.setX(0);
}
-
dirtyRegion = dirtyRegion.united(elasticBandRect());
setDirtyRegion(dirtyRegion);
}
QRect DolphinDetailsView::elasticBandRect() const
{
- const QPoint pos(contentsPos());
const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
- const QPoint topLeft = m_band.origin - pos - scrollPos;
- const QPoint bottomRight = m_band.destination - pos - scrollPos;
+ const QPoint topLeft = m_band.origin - scrollPos;
+ const QPoint bottomRight = m_band.destination - scrollPos;
return QRect(topLeft, bottomRight).normalized();
}
+void DolphinDetailsView::setNameFilter(const QString& nameFilter)
+{
+ DolphinSortFilterProxyModel* proxyModel = static_cast<DolphinSortFilterProxyModel*>(model());
+ proxyModel->setFilterRegExp(nameFilter);
+}
+
void DolphinDetailsView::setZoomLevel(int level)
{
const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);
updateDecorationSize(showPreview);
}
-
void DolphinDetailsView::slotShowPreviewChanged()
{
const DolphinView* view = m_controller->dolphinView();
updateDecorationSize(view->showPreview());
}
-void DolphinDetailsView::configureColumns(const QPoint& pos)
+void DolphinDetailsView::configureSettings(const QPoint& pos)
{
KMenu popup(this);
popup.addTitle(i18nc("@title:menu", "Columns"));
+ // add checkbox items for each column
QHeaderView* headerView = header();
- for (int i = DolphinModel::Size; i <= DolphinModel::Type; ++i) {
+ const int columns = model()->columnCount();
+ for (int i = 0; i < columns; ++i) {
const int logicalIndex = headerView->logicalIndex(i);
- const QString text = model()->headerData(i, Qt::Horizontal).toString();
+ const QString text = model()->headerData(logicalIndex, Qt::Horizontal).toString();
QAction* action = popup.addAction(text);
action->setCheckable(true);
action->setChecked(!headerView->isSectionHidden(logicalIndex));
- action->setData(i);
+ action->setData(logicalIndex);
+ action->setEnabled(logicalIndex != DolphinModel::Name);
}
+ popup.addSeparator();
QAction* activatedAction = popup.exec(header()->mapToGlobal(pos));
if (activatedAction != 0) {
void DolphinDetailsView::updateColumnVisibility()
{
+ QHeaderView* headerView = header();
+ disconnect(headerView, SIGNAL(sectionMoved(int, int, int)),
+ this, SLOT(saveColumnPositions()));
+
+ const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+ const QList<int> columnPositions = settings->columnPositions();
+
const KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();
- for (int i = DolphinModel::Size; i <= DolphinModel::Type; ++i) {
+ for (int i = DolphinModel::Name; i <= DolphinModel::Version; ++i) {
const KFileItemDelegate::Information info = infoForColumn(i);
- const bool hide = !list.contains(info);
+ const bool hide = !list.contains(info) && (i != DolphinModel::Name);
if (isColumnHidden(i) != hide) {
setColumnHidden(i, hide);
}
+
+ const int from = headerView->visualIndex(i);
+ headerView->moveSection(from, columnPositions[i]);
}
-
+
resizeColumns();
+
+ connect(headerView, SIGNAL(sectionMoved(int, int, int)),
+ this, SLOT(saveColumnPositions()));
+
+}
+
+void DolphinDetailsView::saveColumnPositions()
+{
+ QList<int> columnPositions;
+ for (int i = DolphinModel::Name; i <= DolphinModel::Version; ++i) {
+ columnPositions.append(header()->visualIndex(i));
+ }
+
+ DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+ settings->setColumnPositions(columnPositions);
}
void DolphinDetailsView::slotHeaderSectionResized(int logicalIndex, int oldSize, int newSize)
Q_UNUSED(newSize);
// If the user changes the size of the headers, the autoresize feature should be
// turned off. As there is no dedicated interface to find out whether the header
- // section has been resized by the user or by a resize event, the following approach is used:
- if ((QApplication::mouseButtons() & Qt::LeftButton) && isVisible()) {
+ // section has been resized by the user or by a resize event, another approach is used.
+ // Attention: Take care when changing the if-condition to verify that there is no
+ // regression in combination with bug 178630 (see fix in comment #8).
+ if ((QApplication::mouseButtons() & Qt::LeftButton) && header()->underMouse()) {
disableAutoResizing();
}
}
m_controller->requestActivation();
}
-void DolphinDetailsView::updateFont()
+void DolphinDetailsView::slotGlobalSettingsChanged(int category)
{
+ Q_UNUSED(category);
+
const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
Q_ASSERT(settings != 0);
-
if (settings->useSystemFont()) {
m_font = KGlobalSettings::generalFont();
}
+ //Disconnect then reconnect, since the settings have been changed, the connection requirements may have also.
+ disconnect(this, SIGNAL(clicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex)));
+ disconnect(this, SIGNAL(doubleClicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex)));
+ if (KGlobalSettings::singleClick()) {
+ connect(this, SIGNAL(clicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex)));
+ } else {
+ connect(this, SIGNAL(doubleClicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex)));
+ }
}
void DolphinDetailsView::updateElasticBandSelection()
m_band.ignoreOldInfo = false;
}
+void DolphinDetailsView::setFoldersExpandable(bool expandable)
+{
+ if (!expandable) {
+ // collapse all expanded folders, as QTreeView::setItemsExpandable(false)
+ // does not do this task
+ const int rowCount = model()->rowCount();
+ for (int row = 0; row < rowCount; ++row) {
+ setExpanded(model()->index(row, 0), false);
+ }
+ }
+ DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+ settings->setExpandableFolders(expandable);
+ setRootIsDecorated(expandable);
+ setItemsExpandable(expandable);
+}
+
void DolphinDetailsView::updateDecorationSize(bool showPreview)
{
DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
setIconSize(QSize(iconSize, iconSize));
m_decorationSize = QSize(iconSize, iconSize);
- if (m_selectionManager != 0) {
- m_selectionManager->reset();
- }
-
doItemsLayout();
}
-QPoint DolphinDetailsView::contentsPos() const
-{
- // implementation note: the horizonal position is ignored currently, as no
- // horizontal scrolling is done anyway during a selection
- const QScrollBar* scrollbar = verticalScrollBar();
- Q_ASSERT(scrollbar != 0);
-
- const int maxHeight = maximumViewportSize().height();
- const int height = scrollbar->maximum() - scrollbar->minimum() + 1;
- const int visibleHeight = model()->rowCount() + 1 - height;
- if (visibleHeight <= 0) {
- return QPoint(0, 0);
- }
-
- const int y = scrollbar->sliderPosition() * maxHeight / visibleHeight;
- return QPoint(0, y);
-}
-
KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const
{
KFileItemDelegate::Information info = KFileItemDelegate::NoInformation;
QHeaderView* headerView = header();
QFontMetrics fontMetrics(viewport()->font());
- int columnWidth[KDirModel::ColumnCount];
- columnWidth[KDirModel::Size] = fontMetrics.width("00000 Items");
- columnWidth[KDirModel::ModifiedTime] = fontMetrics.width("0000-00-00 00:00");
- columnWidth[KDirModel::Permissions] = fontMetrics.width("xxxxxxxxxx");
- columnWidth[KDirModel::Owner] = fontMetrics.width("xxxxxxxxxx");
- columnWidth[KDirModel::Group] = fontMetrics.width("xxxxxxxxxx");
- columnWidth[KDirModel::Type] = fontMetrics.width("XXXX Xxxxxxx");
+ int columnWidth[DolphinModel::Version + 1];
+ columnWidth[DolphinModel::Size] = fontMetrics.width("00000 Items");
+ columnWidth[DolphinModel::ModifiedTime] = fontMetrics.width("0000-00-00 00:00");
+ columnWidth[DolphinModel::Permissions] = fontMetrics.width("xxxxxxxxxx");
+ columnWidth[DolphinModel::Owner] = fontMetrics.width("xxxxxxxxxx");
+ columnWidth[DolphinModel::Group] = fontMetrics.width("xxxxxxxxxx");
+ columnWidth[DolphinModel::Type] = fontMetrics.width("XXXX Xxxxxxx");
+ columnWidth[DolphinModel::Version] = fontMetrics.width("xxxxxxxx");
int requiredWidth = 0;
for (int i = KDirModel::Size; i <= KDirModel::Type; ++i) {
// reasons the exact necessary width for full visible names is
// only checked for up to 200 items:
const int rowCount = model()->rowCount();
- if (rowCount < 200) {
+ if (rowCount > 0 && rowCount < 200) {
const int nameWidth = sizeHintForColumn(DolphinModel::Name);
if (nameWidth + requiredWidth <= viewport()->width()) {
columnWidth[KDirModel::Name] = viewport()->width() - requiredWidth;
return rect;
}
+bool DolphinDetailsView::isAboveExpandingToggle(const QPoint& pos) const
+{
+ // QTreeView offers no public API to get the information whether an index has an
+ // expanding toggle and what boundaries the toggle has. The following approach
+ // also assumes a toggle for file items.
+ if (itemsExpandable()) {
+ const QModelIndex index = QTreeView::indexAt(pos);
+ if (index.isValid() && (index.column() == KDirModel::Name)) {
+ QRect rect = nameColumnRect(index);
+ const int toggleSize = rect.height();
+ if (isRightToLeft()) {
+ rect.moveRight(rect.right());
+ } else {
+ rect.moveLeft(rect.x() - toggleSize);
+ }
+ rect.setWidth(toggleSize);
+
+ QStyleOption opt;
+ opt.initFrom(this);
+ opt.rect = rect;
+ rect = style()->subElementRect(QStyle::SE_TreeViewDisclosureItem, &opt, this);
+
+ return rect.contains(pos);
+ }
+ }
+ return false;
+}
+
DolphinDetailsView::ElasticBand::ElasticBand() :
show(false),
origin(),
projects / dolphin.git / blobdiff