#include "dolphindetailsview.h"
+#include "additionalinfoaccessor.h"
#include "dolphinmodel.h"
-#include "dolphincontroller.h"
+#include "dolphinviewcontroller.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 "viewmodecontroller.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,
+ DolphinViewController* dolphinViewController,
+ const ViewModeController* viewModeController,
+ DolphinSortFilterProxyModel* proxyModel) :
QTreeView(parent),
m_autoResize(true),
m_expandingTogglePressed(false),
m_keyPressed(false),
m_useDefaultIndexAt(true),
m_ignoreScrollTo(false),
- m_controller(controller),
- m_selectionManager(0),
+ m_dolphinViewController(dolphinViewController),
+ m_viewModeController(viewModeController),
+ m_extensionsFactory(0),
+ m_expandableFoldersAction(0),
+ m_expandedUrls(),
m_font(),
m_decorationSize(),
m_band()
{
const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
Q_ASSERT(settings != 0);
- Q_ASSERT(controller != 0);
+ Q_ASSERT(dolphinViewController != 0);
+ Q_ASSERT(viewModeController != 0);
setLayoutDirection(Qt::LeftToRight);
setAcceptDrops(true);
setRootIsDecorated(settings->expandableFolders());
setItemsExpandable(settings->expandableFolders());
setEditTriggers(QAbstractItemView::NoEditTriggers);
+ setModel(proxyModel);
setMouseTracking(true);
- const ViewProperties props(controller->url());
+ const ViewProperties props(viewModeController->url());
setSortIndicatorSection(props.sorting());
setSortIndicatorOrder(props.sortOrder());
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)),
connect(parent, SIGNAL(sortOrderChanged(Qt::SortOrder)),
this, SLOT(setSortIndicatorOrder(Qt::SortOrder)));
- // TODO: Connecting to the signal 'activated()' is not possible, as kstyle
- // does not forward the single vs. doubleclick to it yet (KDE 4.1?). Hence it is
- // necessary connecting the signal 'singleClick()' or 'doubleClick' and to handle the
- // RETURN-key in keyPressEvent().
+ connect(this, SIGNAL(clicked(const QModelIndex&)),
+ dolphinViewController, SLOT(requestTab(const QModelIndex&)));
if (KGlobalSettings::singleClick()) {
connect(this, SIGNAL(clicked(const QModelIndex&)),
- controller, SLOT(triggerItem(const QModelIndex&)));
+ dolphinViewController, SLOT(triggerItem(const QModelIndex&)));
} else {
connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
- 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()));
+ dolphinViewController, SLOT(triggerItem(const QModelIndex&)));
}
connect(this, SIGNAL(entered(const QModelIndex&)),
this, SLOT(slotEntered(const QModelIndex&)));
connect(this, SIGNAL(viewportEntered()),
- controller, SLOT(emitViewportEntered()));
- connect(controller, SIGNAL(zoomLevelChanged(int)),
+ dolphinViewController, SLOT(emitViewportEntered()));
+ connect(viewModeController, SIGNAL(zoomLevelChanged(int)),
this, SLOT(setZoomLevel(int)));
- connect(controller->dolphinView(), SIGNAL(additionalInfoChanged()),
+ connect(dolphinViewController->view(), SIGNAL(additionalInfoChanged()),
this, SLOT(updateColumnVisibility()));
- connect(controller, SIGNAL(activationChanged(bool)),
+ connect(viewModeController, SIGNAL(activationChanged(bool)),
this, SLOT(slotActivationChanged(bool)));
if (settings->useSystemFont()) {
m_font = KGlobalSettings::generalFont();
} else {
m_font = QFont(settings->fontFamily(),
- settings->fontSize(),
+ qRound(settings->fontSize()),
settings->fontWeight(),
settings->italicFont());
+ m_font.setPointSizeF(settings->fontSize());
}
setVerticalScrollMode(QTreeView::ScrollPerPixel);
setHorizontalScrollMode(QTreeView::ScrollPerPixel);
-
- const DolphinView* view = controller->dolphinView();
+
+ const DolphinView* view = dolphinViewController->view();
connect(view, SIGNAL(showPreviewChanged()),
this, SLOT(slotShowPreviewChanged()));
- updateDecorationSize(view->showPreview());
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)));
+
+ connect(this, SIGNAL(expanded(const QModelIndex&)), this, SLOT(slotExpanded(const QModelIndex&)));
+ connect(this, SIGNAL(collapsed(const QModelIndex&)), this, SLOT(slotCollapsed(const QModelIndex&)));
+
+ updateDecorationSize(view->showPreview());
+
+ m_extensionsFactory = new ViewExtensionsFactory(this, dolphinViewController, viewModeController);
+ m_extensionsFactory->fileItemDelegate()->setMinimizedNameColumn(true);
+ m_extensionsFactory->setAutoFolderExpandingEnabled(settings->expandableFolders());
}
DolphinDetailsView::~DolphinDetailsView()
{
}
-bool DolphinDetailsView::event(QEvent* event)
+QSet<KUrl> DolphinDetailsView::expandedUrls() const
{
- if (event->type() == QEvent::Polish) {
- QHeaderView* headerView = header();
- headerView->setResizeMode(QHeaderView::Interactive);
- headerView->setMovable(false);
+ return m_expandedUrls;
+}
+
+QRegion DolphinDetailsView::visualRegionForSelection(const QItemSelection& selection) const
+{
+ // We have to make sure that the visualRect of each model index is inside the region.
+ // QTreeView::visualRegionForSelection does not do it right because it assumes implicitly
+ // that all visualRects have the same width, which is in general not the case here.
+ QRegion selectionRegion;
+ const QModelIndexList indexes = selection.indexes();
+
+ foreach(const QModelIndex& index, indexes) {
+ selectionRegion += visualRect(index);
+ }
+ return selectionRegion;
+}
+
+bool DolphinDetailsView::event(QEvent* event)
+{
+ switch (event->type()) {
+ case QEvent::Polish:
+ header()->setResizeMode(QHeaderView::Interactive);
updateColumnVisibility();
+ break;
- hideColumn(DolphinModel::Rating);
- hideColumn(DolphinModel::Tags);
- } else if (event->type() == QEvent::UpdateRequest) {
- // a wheel movement will scroll 4 items
- if (model()->rowCount() > 0) {
- verticalScrollBar()->setSingleStep((sizeHintForRow(0) / 3) * 4);
- }
+ case QEvent::FocusOut:
+ // If a key-press triggers an action that e. g. opens a dialog, the
+ // widget gets no key-release event. Assure that the pressed state
+ // is reset to prevent accidently setting the current index during a selection.
+ m_keyPressed = false;
+ break;
+
+ default:
+ break;
}
return QTreeView::event(event);
{
QStyleOptionViewItem viewOptions = QTreeView::viewOptions();
viewOptions.font = m_font;
+ viewOptions.fontMetrics = QFontMetrics(m_font);
viewOptions.showDecorationSelected = true;
viewOptions.decorationSize = m_decorationSize;
return viewOptions;
void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
{
QTreeView::contextMenuEvent(event);
- m_controller->triggerContextMenuRequest(event->pos());
+
+ DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+ m_expandableFoldersAction->setChecked(settings->expandableFolders());
+ m_dolphinViewController->triggerContextMenuRequest(event->pos(),
+ QList<QAction*>() << m_expandableFoldersAction);
}
void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
{
- m_controller->requestActivation();
+ m_dolphinViewController->requestActivation();
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;
- kDebug() << "m_expandingTogglePressed " << m_expandingTogglePressed;
- }
+ setState(QAbstractItemView::DraggingState);
}
if (!index.isValid() || (index.column() != DolphinModel::Name)) {
// the mouse press is done somewhere outside the filename column
if (QApplication::mouseButtons() & Qt::MidButton) {
- m_controller->replaceUrlByClipboard();
+ m_dolphinViewController->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::startDrag(Qt::DropActions supportedActions)
{
- DragAndDropHelper::instance().startDrag(this, supportedActions, m_controller);
+ DragAndDropHelper::instance().startDrag(this, supportedActions, m_dolphinViewController);
m_band.show = false;
}
setDirtyRegion(m_dropRect);
const QModelIndex index = indexAt(event->pos());
if (index.isValid() && (index.column() == DolphinModel::Name)) {
- const KFileItem item = m_controller->itemForIndex(index);
+ const KFileItem item = m_dolphinViewController->itemForIndex(index);
if (!item.isNull() && item.isDir()) {
m_dropRect = visualRect(index);
} else {
const QModelIndex index = indexAt(event->pos());
KFileItem item;
if (index.isValid() && (index.column() == DolphinModel::Name)) {
- item = m_controller->itemForIndex(index);
+ item = m_dolphinViewController->itemForIndex(index);
}
- m_controller->indicateDroppedUrls(item, m_controller->url(), event);
+ m_dolphinViewController->indicateDroppedUrls(item, m_viewModeController->url(), event);
QTreeView::dropEvent(event);
}
m_keyPressed = !(event->modifiers() & Qt::ControlModifier);
QTreeView::keyPressEvent(event);
- m_controller->handleKeyPressEvent(event);
+ m_dolphinViewController->handleKeyPressEvent(event);
}
void DolphinDetailsView::keyReleaseEvent(QKeyEvent* event)
void DolphinDetailsView::resizeEvent(QResizeEvent* event)
{
+ QTreeView::resizeEvent(event);
if (m_autoResize) {
resizeColumns();
}
- QTreeView::resizeEvent(event);
}
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();
- return;
- }
-
+ const int step = m_decorationSize.height();
+ verticalScrollBar()->setSingleStep(step);
QTreeView::wheelEvent(event);
}
void DolphinDetailsView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
{
QTreeView::currentChanged(current, previous);
+ m_extensionsFactory->handleCurrentIndexChange(current, previous);
// Stay consistent with QListView: When changing the current index by key presses,
// also change the selection.
if (m_keyPressed) {
- selectionModel()->select(current, QItemSelectionModel::ClearAndSelect);
+ setCurrentIndex(current);
}
+
+ // If folders are expanded, the width which is available for editing may have changed
+ // because it depends on the level of the current item in the folder hierarchy.
+ adjustMaximumSizeForEditing(current);
}
bool DolphinDetailsView::eventFilter(QObject* watched, QEvent* event)
// if the mouse is above an item and moved very fast outside the widget,
// no viewportEntered() signal might be emitted although the mouse has been moved
// above the viewport
- m_controller->emitViewportEntered();
+ m_dolphinViewController->emitViewportEntered();
}
return QTreeView::eventFilter(watched, event);
// the blank portion of the name column counts as empty space
const QModelIndex index = QTreeView::indexAt(point);
const bool isAboveEmptySpace = !m_useDefaultIndexAt &&
- (index.column() == KDirModel::Name) && !nameColumnRect(index).contains(point);
+ (index.column() == KDirModel::Name) && !visualRect(index).contains(point);
return isAboveEmptySpace ? QModelIndex() : index;
}
-void DolphinDetailsView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command)
+QRect DolphinDetailsView::visualRect(const QModelIndex& index) const
+{
+ QRect rect = QTreeView::visualRect(index);
+ const KFileItem item = m_dolphinViewController->itemForIndex(index);
+ if (!item.isNull()) {
+ const int width = DolphinFileItemDelegate::nameColumnWidth(item.text(), viewOptions());
+ rect.setWidth(width);
+ }
+
+ return rect;
+}
+
+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.
QTreeView::setSelection(rect, command);
m_useDefaultIndexAt = false;
} else {
-
// Use our own elastic band selection algorithm
updateElasticBandSelection();
}
void DolphinDetailsView::scrollTo(const QModelIndex & index, ScrollHint hint)
{
- if (m_ignoreScrollTo)
- return;
- QTreeView::scrollTo(index, hint);
+ if (!m_ignoreScrollTo) {
+ QTreeView::scrollTo(index, hint);
+ }
}
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)
// invoked, but Dolphin is not informed about this.
DolphinView::Sorting sorting = DolphinSortFilterProxyModel::sortingForColumn(column);
const Qt::SortOrder sortOrder = header()->sortIndicatorOrder();
- m_controller->indicateSortingChange(sorting);
- m_controller->indicateSortOrderChange(sortOrder);
+ m_dolphinViewController->indicateSortingChange(sorting);
+ m_dolphinViewController->indicateSortOrderChange(sortOrder);
}
void DolphinDetailsView::slotEntered(const QModelIndex& index)
{
if (index.column() == DolphinModel::Name) {
- m_controller->emitItemEntered(index);
+ m_dolphinViewController->emitItemEntered(index);
} else {
- m_controller->emitViewportEntered();
+ m_dolphinViewController->emitViewportEntered();
}
}
void DolphinDetailsView::updateElasticBand()
{
if (m_band.show) {
- QRect dirtyRegion(elasticBandRect());
+ QRect dirtyRegion(elasticBandRect());
const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
m_band.destination = viewport()->mapFromGlobal(QCursor::pos()) + scrollPos;
// Going above the (logical) top-left of the view causes complications during selection;
// we may as well prevent it.
- if (m_band.destination.y() < 0)
+ if (m_band.destination.y() < 0) {
m_band.destination.setY(0);
- if (m_band.destination.x() < 0)
+ }
+ 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();
}
{
const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);
DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-
- const bool showPreview = m_controller->dolphinView()->showPreview();
+
+ const bool showPreview = m_dolphinViewController->view()->showPreview();
if (showPreview) {
settings->setPreviewSize(size);
} else {
settings->setIconSize(size);
}
-
+
updateDecorationSize(showPreview);
}
-
void DolphinDetailsView::slotShowPreviewChanged()
{
- const DolphinView* view = m_controller->dolphinView();
+ const DolphinView* view = m_dolphinViewController->view();
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();
- QAction* action = popup.addAction(text);
- action->setCheckable(true);
- action->setChecked(!headerView->isSectionHidden(logicalIndex));
- action->setData(i);
+ const QString text = model()->headerData(logicalIndex, Qt::Horizontal).toString();
+ if (!text.isEmpty()) {
+ QAction* action = popup.addAction(text);
+ action->setCheckable(true);
+ action->setChecked(!headerView->isSectionHidden(logicalIndex));
+ action->setData(logicalIndex);
+ action->setEnabled(logicalIndex != DolphinModel::Name);
+ }
}
+ popup.addSeparator();
QAction* activatedAction = popup.exec(header()->mapToGlobal(pos));
if (activatedAction != 0) {
const bool show = activatedAction->isChecked();
const int columnIndex = activatedAction->data().toInt();
- KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();
+ KFileItemDelegate::InformationList list = m_dolphinViewController->view()->additionalInfo();
const KFileItemDelegate::Information info = infoForColumn(columnIndex);
if (show) {
Q_ASSERT(!list.contains(info));
list.removeAt(index);
}
- m_controller->indicateAdditionalInfoChange(list);
+ m_dolphinViewController->indicateAdditionalInfoChange(list);
setColumnHidden(columnIndex, !show);
+ resizeColumns();
}
}
void DolphinDetailsView::updateColumnVisibility()
{
- const KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();
- for (int i = DolphinModel::Size; i <= DolphinModel::Type; ++i) {
+ 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_dolphinViewController->view()->additionalInfo();
+ for (int i = DolphinModel::Name; i < DolphinModel::ExtraColumnCount; ++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);
}
+
+ // If the list columnPositions has been written by an older Dolphin version,
+ // its length might be smaller than DolphinModel::ExtraColumnCount. Therefore,
+ // we have to check if item number i exists before accessing it.
+ if (i < columnPositions.length()) {
+ const int position = columnPositions[i];
+
+ // The position might be outside the correct range if the list columnPositions
+ // has been written by a newer Dolphin version with more columns.
+ if (position < DolphinModel::ExtraColumnCount) {
+ const int from = headerView->visualIndex(i);
+ headerView->moveSection(from, position);
+ }
+ }
}
resizeColumns();
+
+ connect(headerView, SIGNAL(sectionMoved(int, int, int)),
+ this, SLOT(saveColumnPositions()));
+}
+
+void DolphinDetailsView::saveColumnPositions()
+{
+ QList<int> columnPositions;
+ for (int i = DolphinModel::Name; i < DolphinModel::ExtraColumnCount; ++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();
}
+
+ adjustMaximumSizeForEditing(currentIndex());
}
void DolphinDetailsView::slotActivationChanged(bool active)
void DolphinDetailsView::requestActivation()
{
- m_controller->requestActivation();
+ m_dolphinViewController->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_dolphinViewController, SLOT(triggerItem(QModelIndex)));
+ disconnect(this, SIGNAL(doubleClicked(QModelIndex)), m_dolphinViewController, SLOT(triggerItem(QModelIndex)));
+ if (KGlobalSettings::singleClick()) {
+ connect(this, SIGNAL(clicked(QModelIndex)), m_dolphinViewController, SLOT(triggerItem(QModelIndex)));
+ } else {
+ connect(this, SIGNAL(doubleClicked(QModelIndex)), m_dolphinViewController, SLOT(triggerItem(QModelIndex)));
+ }
}
void DolphinDetailsView::updateElasticBandSelection()
// Do some quick checks to see if we can rule out the need to
// update the selection.
Q_ASSERT(uniformRowHeights());
- QModelIndex dummyIndex = model()->index(0, 0);
+ QModelIndex dummyIndex = model()->index(0, 0);
if (!dummyIndex.isValid()) {
// No items in the model presumably.
return;
(selRect.top() / rowHeight == oldSelRect.top() / rowHeight) &&
(selRect.bottom() / rowHeight == oldSelRect.bottom() / rowHeight);
if (coveringSameRows) {
- // Covering the same rows, but have we moved far enough horizontally
+ // Covering the same rows, but have we moved far enough horizontally
// that we might have (de)selected some other items?
const bool itemSelectionChanged =
((selRect.left() > oldSelRect.left()) &&
(selRect.left() > m_band.insideNearestLeftEdge)) ||
- ((selRect.left() < oldSelRect.left()) &&
+ ((selRect.left() < oldSelRect.left()) &&
(selRect.left() <= m_band.outsideNearestLeftEdge)) ||
((selRect.right() < oldSelRect.right()) &&
(selRect.left() >= m_band.insideNearestRightEdge)) ||
return;
}
}
- }
- else {
+ } else {
// This is the only piece of optimization data that needs to be explicitly
// discarded.
m_band.lastSelectionOrigin = QPoint();
// Go through all indexes between the top and bottom of boundingRect, and
// update the selection.
- const int verticalCutoff = boundingRect.bottom();
+ const int verticalCutoff = boundingRect.bottom();
QModelIndex currIndex = startIndex;
QModelIndex lastIndex;
bool allItemsInBoundDone = false;
- // Calling selectionModel()->select(...) for each item that needs to be
+ // Calling selectionModel()->select(...) for each item that needs to be
// toggled is slow as each call emits selectionChanged(...) so store them
// and do the selection toggle in one batch.
QItemSelection itemsToToggle;
- // QItemSelection's deal with continuous ranges of indexes better than
+ // QItemSelection's deal with continuous ranges of indexes better than
// single indexes, so try to portion items that need to be toggled into ranges.
bool formingToggleIndexRange = false;
QModelIndex toggleIndexRangeBegin = QModelIndex();
do {
- QRect currIndexRect = nameColumnRect(currIndex);
+ QRect currIndexRect = visualRect(currIndex);
// Update some optimization info as we go.
const int cr = currIndexRect.right();
const int cl = currIndexRect.left();
const int sl = selRect.left();
const int sr = selRect.right();
- // "The right edge of the name is outside of the rect but nearer than m_outsideNearestLeft", etc
+ // "The right edge of the name is outside of the rect but nearer than m_outsideNearestLeft", etc
if ((cr < sl && cr > m_band.outsideNearestLeftEdge)) {
m_band.outsideNearestLeftEdge = cr;
}
formingToggleIndexRange = false;
// If this is the last item in the bounds and it is also the beginning of a range,
// don't toggle lastIndex - it will already have been dealt with.
- if (!allItemsInBoundDone || toggleIndexRangeBegin != currIndex) {
+ if (!allItemsInBoundDone || toggleIndexRangeBegin != currIndex) {
itemsToToggle.select(toggleIndexRangeBegin, lastIndex);
}
// Need to start a new range immediately with currIndex?
currIndex = nextIndex;
} while (!allItemsInBoundDone);
+
selectionModel()->select(itemsToToggle, QItemSelectionModel::Toggle);
m_band.lastSelectionOrigin = m_band.origin;
m_band.ignoreOldInfo = false;
}
-void DolphinDetailsView::updateDecorationSize(bool showPreview)
+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();
- const int iconSize = showPreview ? settings->previewSize() : settings->iconSize();
- setIconSize(QSize(iconSize, iconSize));
- m_decorationSize = QSize(iconSize, iconSize);
+ settings->setExpandableFolders(expandable);
+ setRootIsDecorated(expandable);
+ setItemsExpandable(expandable);
+
+ // The width of the space which is available for editing has changed
+ // because of the (dis)appearance of the expanding toggles
+ adjustMaximumSizeForEditing(currentIndex());
+}
- if (m_selectionManager != 0) {
- m_selectionManager->reset();
+void DolphinDetailsView::slotExpanded(const QModelIndex& index)
+{
+ KFileItem item = m_dolphinViewController->itemForIndex(index);
+ if (!item.isNull()) {
+ m_expandedUrls.insert(item.url());
}
+}
- doItemsLayout();
+void DolphinDetailsView::slotCollapsed(const QModelIndex& index)
+{
+ KFileItem item = m_dolphinViewController->itemForIndex(index);
+ if (!item.isNull()) {
+ m_expandedUrls.remove(item.url());
+ }
}
-QPoint DolphinDetailsView::contentsPos() const
+void DolphinDetailsView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
{
- // 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);
+ removeExpandedIndexes(parent, start, end);
+ QTreeView::rowsAboutToBeRemoved(parent, start, end);
+}
- 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);
+void DolphinDetailsView::removeExpandedIndexes(const QModelIndex& parent, int start, int end)
+{
+ if (m_expandedUrls.isEmpty()) {
+ return;
}
- const int y = scrollbar->sliderPosition() * maxHeight / visibleHeight;
- return QPoint(0, y);
+ for (int row = start; row <= end; row++) {
+ const QModelIndex index = model()->index(row, 0, parent);
+ if (isExpanded(index)) {
+ slotCollapsed(index);
+ removeExpandedIndexes(index, 0, model()->rowCount(index) - 1);
+ }
+ }
}
-KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const
+void DolphinDetailsView::updateDecorationSize(bool showPreview)
{
- KFileItemDelegate::Information info = KFileItemDelegate::NoInformation;
+ DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+ const int iconSize = showPreview ? settings->previewSize() : settings->iconSize();
+ setIconSize(QSize(iconSize, iconSize));
+ m_decorationSize = QSize(iconSize, iconSize);
- switch (columnIndex) {
- case DolphinModel::Size: info = KFileItemDelegate::Size; break;
- case DolphinModel::ModifiedTime: info = KFileItemDelegate::ModificationTime; break;
- case DolphinModel::Permissions: info = KFileItemDelegate::Permissions; break;
- case DolphinModel::Owner: info = KFileItemDelegate::Owner; break;
- case DolphinModel::Group: info = KFileItemDelegate::OwnerAndGroup; break;
- case DolphinModel::Type: info = KFileItemDelegate::FriendlyMimeType; break;
- default: break;
- }
+ doItemsLayout();
+}
- return info;
+KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const
+{
+ return AdditionalInfoAccessor::instance().keyForColumn(columnIndex);
}
void DolphinDetailsView::resizeColumns()
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::ExtraColumnCount];
+ const int defaultWidth = fontMetrics.width("xxxxxxxxxx");
+ for (int i = 0; i < DolphinModel::ExtraColumnCount; ++i) {
+ columnWidth[i] = defaultWidth;
+ }
+ columnWidth[DolphinModel::Size] = fontMetrics.width("00000 Items");
+ columnWidth[DolphinModel::ModifiedTime] = fontMetrics.width("0000-00-00 00:00");
int requiredWidth = 0;
for (int i = KDirModel::Size; i <= KDirModel::Type; ++i) {
// resize the name column in a way that the whole available width is used
columnWidth[KDirModel::Name] = viewport()->width() - requiredWidth;
- if (columnWidth[KDirModel::Name] < 120) {
- columnWidth[KDirModel::Name] = 120;
+
+ const int minNameWidth = 300;
+ if (columnWidth[KDirModel::Name] < minNameWidth) {
+ columnWidth[KDirModel::Name] = minNameWidth;
+
+ // It might be possible that the name column width can be
+ // decreased without clipping any text. For performance
+ // reasons the exact necessary width for full visible names is
+ // only checked for up to 200 items:
+ const int rowCount = model()->rowCount();
+ if (rowCount > 0 && rowCount < 200) {
+ const int nameWidth = sizeHintForColumn(DolphinModel::Name);
+ if (nameWidth + requiredWidth <= viewport()->width()) {
+ columnWidth[KDirModel::Name] = viewport()->width() - requiredWidth;
+ } else if (nameWidth < minNameWidth) {
+ columnWidth[KDirModel::Name] = nameWidth;
+ }
+ }
}
+
headerView->resizeSection(KDirModel::Name, columnWidth[KDirModel::Name]);
}
-QRect DolphinDetailsView::nameColumnRect(const QModelIndex& index) const
+bool DolphinDetailsView::isAboveExpandingToggle(const QPoint& pos) const
{
- QRect rect = visualRect(index);
- const KFileItem item = m_controller->itemForIndex(index);
- if (!item.isNull()) {
- const int width = DolphinFileItemDelegate::nameColumnWidth(item.text(), viewOptions());
- rect.setWidth(width);
+ // 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 = visualRect(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;
+}
- return rect;
+void DolphinDetailsView::adjustMaximumSizeForEditing(const QModelIndex& index)
+{
+ // Make sure that the full width of the "Name" column is available for "Rename Inline"
+ m_extensionsFactory->fileItemDelegate()->setMaximumSize(QTreeView::visualRect(index).size());
}
DolphinDetailsView::ElasticBand::ElasticBand() :
projects / dolphin.git / blobdiff