]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/dolphindetailsview.cpp
Group classes into folders, Dolphin is too big in the meantime for having a flat...
[dolphin.git] / src / dolphindetailsview.cpp
index be7da836838f95c5d456b4ffc6a2931d69363e4f..acfff6a65c2f49ed4f91e73607c82614a37415a2 100644 (file)
@@ -1,6 +1,6 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Peter Penz                                      *
- *   peter.penz@gmx.at                                                     *
+ *   Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at)                  *
+ *   Copyright (C) 2008 by Simon St. James (kdedevel@etotheipiplusone.com) *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -23,8 +23,9 @@
 #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 "viewproperties.h"
 
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),
-       m_autoResize(true),
+    m_autoResize(true),
     m_expandingTogglePressed(false),
     m_keyPressed(false),
     m_useDefaultIndexAt(true),
+    m_ignoreScrollTo(false),
     m_controller(controller),
     m_selectionManager(0),
+    m_autoScroller(0),
     m_font(),
     m_decorationSize(),
-    m_showElasticBand(false),
-    m_elasticBandOrigin(),
-    m_elasticBandDestination()
+    m_band()
 {
     const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
     Q_ASSERT(settings != 0);
@@ -76,6 +77,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     setEditTriggers(QAbstractItemView::NoEditTriggers);
 
     setMouseTracking(true);
+    m_autoScroller = new DolphinViewAutoScroller(this);
 
     const ViewProperties props(controller->url());
     setSortIndicatorSection(props.sorting());
@@ -97,10 +99,8 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     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&)),
+            controller, SLOT(requestTab(const QModelIndex&)));
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),
                 controller, SLOT(triggerItem(const QModelIndex&)));
@@ -139,7 +139,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
 
     setVerticalScrollMode(QTreeView::ScrollPerPixel);
     setHorizontalScrollMode(QTreeView::ScrollPerPixel);
-    
+
     const DolphinView* view = controller->dolphinView();
     connect(view, SIGNAL(showPreviewChanged()),
             this, SLOT(slotShowPreviewChanged()));
@@ -151,7 +151,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
 
     connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
             this, SLOT(updateFont()));
-            
+
     m_useDefaultIndexAt = false;
 }
 
@@ -170,11 +170,6 @@ bool DolphinDetailsView::event(QEvent* event)
 
         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);
-        }
     }
 
     return QTreeView::event(event);
@@ -229,37 +224,36 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
             clearSelection();
         }
 
-        // restore the current index, other columns are handled as viewport area
+        // restore the current index, other columns are handled as viewport area.
+        // setCurrentIndex(...) implicitly calls scrollTo(...), which we want to ignore.
+        m_ignoreScrollTo = true;
         selectionModel()->setCurrentIndex(current, QItemSelectionModel::Current);
-    }
-
-    if ((event->button() == Qt::LeftButton) && !m_expandingTogglePressed) {
-        m_showElasticBand = true;
-        const QPoint pos = contentsPos();
-        const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
-        m_elasticBandOrigin = event->pos() + pos + scrollPos;
-        m_elasticBandDestination = m_elasticBandOrigin;
+        m_ignoreScrollTo = false;
+
+        if ((event->button() == Qt::LeftButton) && !m_expandingTogglePressed) {
+            // Inform Qt about what we are doing - otherwise it starts dragging items around!
+            setState(DragSelectingState);
+            m_band.show = true;
+            // Incremental update data will not be useful - start from scratch.
+            m_band.ignoreOldInfo = true;
+            const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
+            m_band.origin = event->pos()  + scrollPos;
+            m_band.destination = m_band.origin;
+            m_band.originalSelection = selectionModel()->selection();
+        }
     }
 }
 
 void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
 {
-    if (m_showElasticBand) {
+    if (m_band.show) {
         const QPoint mousePos = event->pos();
         const QModelIndex index = indexAt(mousePos);
         if (!index.isValid()) {
             // the destination of the selection rectangle is above the viewport. In this
             // case QTreeView does no selection at all, which is not the wanted behavior
             // in Dolphin -> select all items within the elastic band rectangle
-            clearSelection();
-
-            const int nameColumnWidth = header()->sectionSize(DolphinModel::Name);
-            QRect selRect = elasticBandRect();
-            const QRect nameColumnsRect(0, 0, nameColumnWidth, viewport()->height());
-            selRect = nameColumnsRect.intersected(selRect);
-
-            setSelection(selRect, QItemSelectionModel::Select);
-
+            updateElasticBandSelection();
         }
 
         // TODO: enable QTreeView::mouseMoveEvent(event) again, as soon
@@ -298,27 +292,28 @@ void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
     }
 
     m_expandingTogglePressed = false;
-    if (m_showElasticBand) {
+    if (m_band.show) {
+        setState(NoState);
         updateElasticBand();
-        m_showElasticBand = false;
+        m_band.show = false;
     }
 }
 
 void DolphinDetailsView::startDrag(Qt::DropActions supportedActions)
 {
-    DragAndDropHelper::startDrag(this, supportedActions);
-    m_showElasticBand = false;
+    DragAndDropHelper::instance().startDrag(this, supportedActions, m_controller);
+    m_band.show = false;
 }
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
 {
-    if (event->mimeData()->hasUrls()) {
+    if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) {
         event->acceptProposedAction();
     }
 
-    if (m_showElasticBand) {
+    if (m_band.show) {
         updateElasticBand();
-        m_showElasticBand = false;
+        m_band.show = false;
     }
 }
 
@@ -345,7 +340,7 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
         setDirtyRegion(m_dropRect);
     }
 
-    if (event->mimeData()->hasUrls()) {
+    if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) {
         // accept url drops, independently from the destination item
         event->acceptProposedAction();
     }
@@ -365,7 +360,7 @@ void DolphinDetailsView::dropEvent(QDropEvent* event)
 void DolphinDetailsView::paintEvent(QPaintEvent* event)
 {
     QTreeView::paintEvent(event);
-    if (m_showElasticBand) {
+    if (m_band.show) {
         // The following code has been taken from QListView
         // and adapted to DolphinDetailsView.
         // (C) 1992-2007 Trolltech ASA
@@ -401,10 +396,10 @@ 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)
@@ -419,12 +414,18 @@ void DolphinDetailsView::wheelEvent(QWheelEvent* event)
         return;
     }
 
+    const int height = m_decorationSize.height();
+    const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
+    verticalScrollBar()->setSingleStep(step);
     QTreeView::wheelEvent(event);
 }
 
 void DolphinDetailsView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
 {
     QTreeView::currentChanged(current, previous);
+    if (current.isValid() && !m_autoScroller->isActive()) {
+        scrollTo(current);
+    }
 
     // Stay consistent with QListView: When changing the current index by key presses,
     // also change the selection.
@@ -454,52 +455,35 @@ QModelIndex DolphinDetailsView::indexAt(const QPoint& point) const
     return isAboveEmptySpace ? QModelIndex() : index;
 }
 
-void DolphinDetailsView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command)
+void DolphinDetailsView::setSelection(const QRectrect, 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.
-    if (!m_showElasticBand) {
+    if (!m_band.show) {
         m_useDefaultIndexAt = true;
         QTreeView::setSelection(rect, command);
         m_useDefaultIndexAt = false;
     } else {
-        // Select the items contained within the elastic band.
-
-        // TODO - would this still work if the columns could be re-ordered
-        // (which I want to implement eventually :))?
-
-        // Very naive implementation - clears all selected, then walks a tree,
-        // selecting all items whose nameColumnRect(...) intersects rect.
-
-        // Choose a sensible startIndex - a parentless index in the 
-        // name column, as close to the top of the rect as we 
-        // can find.
-        QRect normalisedRect = rect.normalized();
-        QModelIndex startIndex = QTreeView::indexAt(normalisedRect.topLeft());
-        if (startIndex.isValid()) {
-            while (startIndex.parent().isValid()) {
-                startIndex = startIndex.parent();
-            }
-        } else {
-            // just pick the topmost row for safety
-            model()->index(0, KDirModel::Name);
-        }
-        startIndex = model()->index(startIndex.row(), KDirModel::Name);
-        clearSelection();
-        setSelectionRecursive(startIndex, normalisedRect, command);
+        // Use our own elastic band selection algorithm
+        updateElasticBandSelection();
+    }
+}
+
+void DolphinDetailsView::scrollTo(const QModelIndex & index, ScrollHint 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)
@@ -523,10 +507,18 @@ void DolphinDetailsView::slotEntered(const QModelIndex& index)
 
 void DolphinDetailsView::updateElasticBand()
 {
-    if (m_showElasticBand) {
-        QRect dirtyRegion(elasticBandRect());        
+    if (m_band.show) {
+        QRect dirtyRegion(elasticBandRect());
         const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
-        m_elasticBandDestination = viewport()->mapFromGlobal(QCursor::pos()) + scrollPos;
+        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) {
+            m_band.destination.setY(0);
+        }
+        if (m_band.destination.x() < 0) {
+            m_band.destination.setX(0);
+        }
         dirtyRegion = dirtyRegion.united(elasticBandRect());
         setDirtyRegion(dirtyRegion);
     }
@@ -534,11 +526,10 @@ void DolphinDetailsView::updateElasticBand()
 
 QRect DolphinDetailsView::elasticBandRect() const
 {
-    const QPoint pos(contentsPos());
     const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
 
-    const QPoint topLeft = m_elasticBandOrigin - pos - scrollPos;
-    const QPoint bottomRight = m_elasticBandDestination - pos - scrollPos;
+    const QPoint topLeft = m_band.origin - scrollPos;
+    const QPoint bottomRight = m_band.destination - scrollPos;
     return QRect(topLeft, bottomRight).normalized();
 }
 
@@ -546,14 +537,14 @@ void DolphinDetailsView::setZoomLevel(int level)
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-    
+
     const bool showPreview = m_controller->dolphinView()->showPreview();
     if (showPreview) {
         settings->setPreviewSize(size);
     } else {
         settings->setIconSize(size);
     }
-    
+
     updateDecorationSize(showPreview);
 }
 
@@ -597,6 +588,7 @@ void DolphinDetailsView::configureColumns(const QPoint& pos)
 
         m_controller->indicateAdditionalInfoChange(list);
         setColumnHidden(columnIndex, !show);
+        resizeColumns();
     }
 }
 
@@ -619,7 +611,12 @@ void DolphinDetailsView::slotHeaderSectionResized(int logicalIndex, int oldSize,
     Q_UNUSED(logicalIndex);
     Q_UNUSED(oldSize);
     Q_UNUSED(newSize);
-    if (QApplication::mouseButtons() & Qt::LeftButton) {
+    // 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, 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();
     }
 }
@@ -649,6 +646,189 @@ void DolphinDetailsView::updateFont()
     }
 }
 
+void DolphinDetailsView::updateElasticBandSelection()
+{
+    if (!m_band.show) {
+        return;
+    }
+
+    // Ensure the elastic band itself is up-to-date, in
+    // case we are being called due to e.g. a drag event.
+    updateElasticBand();
+
+    // Clip horizontally to the name column, as some filenames will be
+    // longer than the column.  We don't clip vertically as origin
+    // may be above or below the current viewport area.
+    const int nameColumnX = header()->sectionPosition(DolphinModel::Name);
+    const int nameColumnWidth = header()->sectionSize(DolphinModel::Name);
+    QRect selRect = elasticBandRect().normalized();
+    QRect nameColumnArea(nameColumnX, selRect.y(), nameColumnWidth, selRect.height());
+    selRect = nameColumnArea.intersect(selRect).normalized();
+    // Get the last elastic band rectangle, expressed in viewpoint coordinates.
+    const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
+    QRect oldSelRect = QRect(m_band.lastSelectionOrigin - scrollPos, m_band.lastSelectionDestination - scrollPos).normalized();
+
+    if (selRect.isNull()) {
+        selectionModel()->select(m_band.originalSelection, QItemSelectionModel::ClearAndSelect);
+        m_band.ignoreOldInfo = true;
+        return;
+    }
+
+    if (!m_band.ignoreOldInfo) {
+        // 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);
+        if (!dummyIndex.isValid()) {
+            // No items in the model presumably.
+            return;
+        }
+
+        // If the elastic band does not cover the same rows as before, we'll
+        // need to re-check, and also invalidate the old item distances.
+        const int rowHeight = QTreeView::rowHeight(dummyIndex);
+        const bool coveringSameRows =
+            (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
+            // 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() <= m_band.outsideNearestLeftEdge)) ||
+                ((selRect.right() < oldSelRect.right()) &&
+                 (selRect.left() >= m_band.insideNearestRightEdge)) ||
+                ((selRect.right() > oldSelRect.right()) &&
+                 (selRect.right() >= m_band.outsideNearestRightEdge));
+
+            if (!itemSelectionChanged) {
+                return;
+            }
+        }
+    }
+    else {
+        // This is the only piece of optimization data that needs to be explicitly
+        // discarded.
+        m_band.lastSelectionOrigin = QPoint();
+        m_band.lastSelectionDestination = QPoint();
+        oldSelRect = selRect;
+    }
+
+    // Do the selection from scratch. Force a update of the horizontal distances info.
+    m_band.insideNearestLeftEdge   = nameColumnX + nameColumnWidth + 1;
+    m_band.insideNearestRightEdge  = nameColumnX - 1;
+    m_band.outsideNearestLeftEdge  = nameColumnX - 1;
+    m_band.outsideNearestRightEdge = nameColumnX + nameColumnWidth + 1;
+
+    // Include the old selection rect as well, so we can deselect
+    // items that were inside it but not in the new selRect.
+    const QRect boundingRect = selRect.united(oldSelRect).normalized();
+    if (boundingRect.isNull()) {
+        return;
+    }
+
+    // Get the index of the item in this row in the name column.
+    // TODO - would this still work if the columns could be re-ordered?
+    QModelIndex startIndex = QTreeView::indexAt(boundingRect.topLeft());
+    if (startIndex.parent().isValid()) {
+        startIndex = startIndex.parent().child(startIndex.row(), KDirModel::Name);
+    } else {
+        startIndex = model()->index(startIndex.row(), KDirModel::Name);
+    }
+    if (!startIndex.isValid()) {
+        selectionModel()->select(m_band.originalSelection, QItemSelectionModel::ClearAndSelect);
+        m_band.ignoreOldInfo = true;
+        return;
+    }
+
+   // Go through all indexes between the top and bottom of boundingRect, and
+   // update the selection.
+   const int verticalCutoff = boundingRect.bottom();
+   QModelIndex currIndex = startIndex;
+   QModelIndex lastIndex;
+   bool allItemsInBoundDone = false;
+
+   // 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
+   // 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);
+
+        // 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
+       if ((cr < sl && cr > m_band.outsideNearestLeftEdge)) {
+           m_band.outsideNearestLeftEdge = cr;
+       }
+       if ((cl > sr && cl < m_band.outsideNearestRightEdge)) {
+           m_band.outsideNearestRightEdge = cl;
+       }
+       if ((cl >= sl && cl <= sr && cl > m_band.insideNearestRightEdge)) {
+           m_band.insideNearestRightEdge = cl;
+       }
+       if ((cr >= sl && cr <= sr && cr < m_band.insideNearestLeftEdge)) {
+           m_band.insideNearestLeftEdge = cr;
+       }
+
+       bool currentlySelected = selectionModel()->isSelected(currIndex);
+       bool originallySelected = m_band.originalSelection.contains(currIndex);
+       bool intersectsSelectedRect = currIndexRect.intersects(selRect);
+       bool shouldBeSelected = (intersectsSelectedRect && !originallySelected) || (!intersectsSelectedRect && originallySelected);
+       bool needToToggleItem = (currentlySelected && !shouldBeSelected) || (!currentlySelected && shouldBeSelected);
+       if (needToToggleItem && !formingToggleIndexRange) {
+            toggleIndexRangeBegin = currIndex;
+            formingToggleIndexRange = true;
+       }
+
+       // NOTE: indexBelow actually walks up and down expanded trees for us.
+       QModelIndex nextIndex = indexBelow(currIndex);
+       allItemsInBoundDone = !nextIndex.isValid() || currIndexRect.top() > verticalCutoff;
+
+       const bool commitToggleIndexRange = formingToggleIndexRange &&
+                                           (!needToToggleItem ||
+                                            allItemsInBoundDone ||
+                                            currIndex.parent() != toggleIndexRangeBegin.parent());
+       if (commitToggleIndexRange) {
+           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) {
+               itemsToToggle.select(toggleIndexRangeBegin, lastIndex);
+           }
+            // Need to start a new range immediately with currIndex?
+           if (needToToggleItem) {
+               toggleIndexRangeBegin = currIndex;
+               formingToggleIndexRange = true;
+           }
+           if (allItemsInBoundDone && needToToggleItem) {
+                // Toggle the very last item in the bounds.
+               itemsToToggle.select(currIndex, currIndex);
+           }
+       }
+
+       // next item
+       lastIndex = currIndex;
+       currIndex = nextIndex;
+    } while (!allItemsInBoundDone);
+
+    selectionModel()->select(itemsToToggle, QItemSelectionModel::Toggle);
+
+    m_band.lastSelectionOrigin = m_band.origin;
+    m_band.lastSelectionDestination = m_band.destination;
+    m_band.ignoreOldInfo = false;
+}
+
 void DolphinDetailsView::updateDecorationSize(bool showPreview)
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
@@ -663,24 +843,6 @@ void DolphinDetailsView::updateDecorationSize(bool showPreview)
     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;
@@ -728,9 +890,26 @@ void DolphinDetailsView::resizeColumns()
 
     // 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 < 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]);
 }
 
@@ -739,49 +918,25 @@ QRect DolphinDetailsView::nameColumnRect(const QModelIndex& index) const
     QRect rect = visualRect(index);
     const KFileItem item = m_controller->itemForIndex(index);
     if (!item.isNull()) {
-        const int width = DolphinFileItemDelegate::nameColumnWidth(item.name(), viewOptions());
+        const int width = DolphinFileItemDelegate::nameColumnWidth(item.text(), viewOptions());
         rect.setWidth(width);
     }
 
     return rect;
 }
 
-void DolphinDetailsView::setSelectionRecursive(const QModelIndex& startIndex,
-                                               const QRect& rect,
-                                               QItemSelectionModel::SelectionFlags command)
+DolphinDetailsView::ElasticBand::ElasticBand() :
+    show(false),
+    origin(),
+    destination(),
+    lastSelectionOrigin(),
+    lastSelectionDestination(),
+    ignoreOldInfo(true),
+    outsideNearestLeftEdge(0),
+    outsideNearestRightEdge(0),
+    insideNearestLeftEdge(0),
+    insideNearestRightEdge(0)
 {
-    if (!startIndex.isValid()) {
-        return;
-    }
-    
-    // rect is assumed to be in viewport coordinates and normalized.
-    // Move down through the siblings of startIndex, exploring the children
-    // of any expanded nodes.
-    Q_ASSERT(rect.width() >= 0 && rect.height() >= 0);
-    QModelIndex currIndex = startIndex;
-    do {
-        const QModelIndex belowIndex = indexBelow(currIndex);
-        if (isExpanded(currIndex)) {
-            // If belowIndex exists and is above the top of rect, then we need not explore
-            // the children of currIndex as they will always be above "below".  Otherwise,
-            // explore the children.
-            if (!belowIndex.isValid() || visualRect(belowIndex).bottom() >= rect.top()) {
-                setSelectionRecursive(currIndex.child(0, currIndex.column()), rect, command);
-            }
-        }
-
-        QRect itemContentRect = nameColumnRect(currIndex);
-        if (itemContentRect.top() > rect.bottom()) {
-            // All remaining items will be below itemContentRect, so we may cull.
-            return;
-        }
-
-        if (itemContentRect.intersects(rect)) {
-            selectionModel()->select(currIndex, QItemSelectionModel::Select);   
-        }
-
-        currIndex = belowIndex;
-    } while (currIndex.isValid());
 }
 
 #include "dolphindetailsview.moc"