]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/dolphindetailsview.cpp
fixed regression: don't change the state, otherwise when having a split view it is...
[dolphin.git] / src / dolphindetailsview.cpp
index e33d94c18c74097f1c368cd6c54a88974127fc68..be7da836838f95c5d456b4ffc6a2931d69363e4f 100644 (file)
 
 #include "dolphinmodel.h"
 #include "dolphincontroller.h"
+#include "dolphinfileitemdelegate.h"
 #include "dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "draganddrophelper.h"
 #include "selectionmanager.h"
 #include "viewproperties.h"
+#include "zoomlevelinfo.h"
 
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
@@ -46,6 +48,9 @@
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),
        m_autoResize(true),
+    m_expandingTogglePressed(false),
+    m_keyPressed(false),
+    m_useDefaultIndexAt(true),
     m_controller(controller),
     m_selectionManager(0),
     m_font(),
@@ -58,6 +63,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     Q_ASSERT(settings != 0);
     Q_ASSERT(controller != 0);
 
+    setLayoutDirection(Qt::LeftToRight);
     setAcceptDrops(true);
     setSortingEnabled(true);
     setUniformRowHeights(true);
@@ -98,27 +104,29 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(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()));
-         }
     } 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()));
+    }
+
     connect(this, SIGNAL(entered(const QModelIndex&)),
             this, SLOT(slotEntered(const QModelIndex&)));
     connect(this, SIGNAL(viewportEntered()),
             controller, SLOT(emitViewportEntered()));
-    connect(controller, SIGNAL(zoomIn()),
-            this, SLOT(zoomIn()));
-    connect(controller, SIGNAL(zoomOut()),
-            this, SLOT(zoomOut()));
+    connect(controller, SIGNAL(zoomLevelChanged(int)),
+            this, SLOT(setZoomLevel(int)));
     connect(controller->dolphinView(), SIGNAL(additionalInfoChanged()),
             this, SLOT(updateColumnVisibility()));
+    connect(controller, SIGNAL(activationChanged(bool)),
+            this, SLOT(slotActivationChanged(bool)));
 
     if (settings->useSystemFont()) {
         m_font = KGlobalSettings::generalFont();
@@ -131,14 +139,20 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
 
     setVerticalScrollMode(QTreeView::ScrollPerPixel);
     setHorizontalScrollMode(QTreeView::ScrollPerPixel);
+    
+    const DolphinView* view = controller->dolphinView();
+    connect(view, SIGNAL(showPreviewChanged()),
+            this, SLOT(slotShowPreviewChanged()));
 
-    updateDecorationSize();
+    updateDecorationSize(view->showPreview());
 
     setFocus();
     viewport()->installEventFilter(this);
 
     connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
             this, SLOT(updateFont()));
+            
+    m_useDefaultIndexAt = false;
 }
 
 DolphinDetailsView::~DolphinDetailsView()
@@ -185,8 +199,10 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
 {
     m_controller->requestActivation();
 
+    const QModelIndex current = currentIndex();
     QTreeView::mousePressEvent(event);
 
+    m_expandingTogglePressed = false;
     const QModelIndex index = indexAt(event->pos());
     const bool updateState = index.isValid() &&
                              (index.column() == DolphinModel::Name) &&
@@ -197,24 +213,32 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
         const QRect rect = visualRect(index);
         if (event->pos().x() >= rect.x() + indentation()) {
             setState(QAbstractItemView::DraggingState);
+        } else {
+            m_expandingTogglePressed = true;
         }
     }
 
     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();
+        }
+
         const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
         if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
             clearSelection();
         }
+
+        // restore the current index, other columns are handled as viewport area
+        selectionModel()->setCurrentIndex(current, QItemSelectionModel::Current);
     }
 
-    if (event->button() == Qt::LeftButton) {
+    if ((event->button() == Qt::LeftButton) && !m_expandingTogglePressed) {
         m_showElasticBand = true;
-
-        const QPoint pos(contentsPos());
-        m_elasticBandOrigin = event->pos();
-        m_elasticBandOrigin.setX(m_elasticBandOrigin.x() + pos.x());
-        m_elasticBandOrigin.setY(m_elasticBandOrigin.y() + pos.y());
-        m_elasticBandDestination = event->pos();
+        const QPoint pos = contentsPos();
+        const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
+        m_elasticBandOrigin = event->pos() + pos + scrollPos;
+        m_elasticBandDestination = m_elasticBandOrigin;
     }
 }
 
@@ -230,11 +254,12 @@ void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
             clearSelection();
 
             const int nameColumnWidth = header()->sectionSize(DolphinModel::Name);
-            QRect selRect = QRect(m_elasticBandOrigin, m_elasticBandDestination).normalized();
+            QRect selRect = elasticBandRect();
             const QRect nameColumnsRect(0, 0, nameColumnWidth, viewport()->height());
             selRect = nameColumnsRect.intersected(selRect);
 
             setSelection(selRect, QItemSelectionModel::Select);
+
         }
 
         // TODO: enable QTreeView::mouseMoveEvent(event) again, as soon
@@ -248,11 +273,31 @@ void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
         // 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)
 {
-    QTreeView::mouseReleaseEvent(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);
+    }
+
+    m_expandingTogglePressed = false;
     if (m_showElasticBand) {
         updateElasticBand();
         m_showElasticBand = false;
@@ -308,18 +353,12 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
 
 void DolphinDetailsView::dropEvent(QDropEvent* event)
 {
-    const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-    if (!urls.isEmpty()) {
-        event->acceptProposedAction();
-        const QModelIndex index = indexAt(event->pos());
-        KFileItem item;
-        if (index.isValid() && (index.column() == DolphinModel::Name)) {
-            item = m_controller->itemForIndex(index);
-        }
-        m_controller->indicateDroppedUrls(urls,
-                                          m_controller->url(),
-                                          item);
+    const QModelIndex index = indexAt(event->pos());
+    KFileItem item;
+    if (index.isValid() && (index.column() == DolphinModel::Name)) {
+        item = m_controller->itemForIndex(index);
     }
+    m_controller->indicateDroppedUrls(item, m_controller->url(), event);
     QTreeView::dropEvent(event);
 }
 
@@ -345,10 +384,21 @@ void DolphinDetailsView::paintEvent(QPaintEvent* event)
 
 void DolphinDetailsView::keyPressEvent(QKeyEvent* event)
 {
+    // If the Control modifier is pressed, a multiple selection
+    // is done and DolphinDetailsView::currentChanged() may not
+    // not change the selection in a custom way.
+    m_keyPressed = !(event->modifiers() & Qt::ControlModifier);
+
     QTreeView::keyPressEvent(event);
     m_controller->handleKeyPressEvent(event);
 }
 
+void DolphinDetailsView::keyReleaseEvent(QKeyEvent* event)
+{
+    QTreeView::keyReleaseEvent(event);
+    m_keyPressed = false;
+}
+
 void DolphinDetailsView::resizeEvent(QResizeEvent* event)
 {
     if (m_autoResize) {
@@ -378,7 +428,7 @@ void DolphinDetailsView::currentChanged(const QModelIndex& current, const QModel
 
     // Stay consistent with QListView: When changing the current index by key presses,
     // also change the selection.
-    if (QApplication::mouseButtons() == Qt::NoButton) {
+    if (m_keyPressed) {
         selectionModel()->select(current, QItemSelectionModel::ClearAndSelect);
     }
 }
@@ -395,6 +445,51 @@ bool DolphinDetailsView::eventFilter(QObject* watched, QEvent* event)
     return QTreeView::eventFilter(watched, event);
 }
 
+QModelIndex DolphinDetailsView::indexAt(const QPoint& point) const
+{
+    // 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);
+    return isAboveEmptySpace ? QModelIndex() : index;
+}
+
+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.
+    if (!m_showElasticBand) {
+        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);
+    }
+}
+
 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
 {
     QHeaderView* headerView = header();
@@ -419,12 +514,9 @@ void DolphinDetailsView::synchronizeSortingState(int column)
 
 void DolphinDetailsView::slotEntered(const QModelIndex& index)
 {
-    const QPoint pos = viewport()->mapFromGlobal(QCursor::pos());
-    const int nameColumnWidth = header()->sectionSize(DolphinModel::Name);
-    if (pos.x() < nameColumnWidth) {
+    if (index.column() == DolphinModel::Name) {
         m_controller->emitItemEntered(index);
-    }
-    else {
+    } else {
         m_controller->emitViewportEntered();
     }
 }
@@ -432,8 +524,9 @@ void DolphinDetailsView::slotEntered(const QModelIndex& index)
 void DolphinDetailsView::updateElasticBand()
 {
     if (m_showElasticBand) {
-        QRect dirtyRegion(elasticBandRect());
-        m_elasticBandDestination = viewport()->mapFromGlobal(QCursor::pos());
+        QRect dirtyRegion(elasticBandRect());        
+        const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
+        m_elasticBandDestination = viewport()->mapFromGlobal(QCursor::pos()) + scrollPos;
         dirtyRegion = dirtyRegion.united(elasticBandRect());
         setDirtyRegion(dirtyRegion);
     }
@@ -442,34 +535,33 @@ void DolphinDetailsView::updateElasticBand()
 QRect DolphinDetailsView::elasticBandRect() const
 {
     const QPoint pos(contentsPos());
-    const QPoint topLeft(m_elasticBandOrigin.x() - pos.x(), m_elasticBandOrigin.y() - pos.y());
-    return QRect(topLeft, m_elasticBandDestination).normalized();
+    const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
+
+    const QPoint topLeft = m_elasticBandOrigin - pos - scrollPos;
+    const QPoint bottomRight = m_elasticBandDestination - pos - scrollPos;
+    return QRect(topLeft, bottomRight).normalized();
 }
 
-void DolphinDetailsView::zoomIn()
+void DolphinDetailsView::setZoomLevel(int level)
 {
-    if (isZoomInPossible()) {
-        DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-        switch (settings->iconSize()) {
-        case KIconLoader::SizeSmall:  settings->setIconSize(KIconLoader::SizeMedium); break;
-        case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeLarge); break;
-        default: Q_ASSERT(false); break;
-        }
-        updateDecorationSize();
+    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);
 }
 
-void DolphinDetailsView::zoomOut()
+
+void DolphinDetailsView::slotShowPreviewChanged()
 {
-    if (isZoomOutPossible()) {
-        DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-        switch (settings->iconSize()) {
-        case KIconLoader::SizeLarge:  settings->setIconSize(KIconLoader::SizeMedium); break;
-        case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeSmall); break;
-        default: Q_ASSERT(false); break;
-        }
-        updateDecorationSize();
-    }
+    const DolphinView* view = m_controller->dolphinView();
+    updateDecorationSize(view->showPreview());
 }
 
 void DolphinDetailsView::configureColumns(const QPoint& pos)
@@ -532,6 +624,11 @@ void DolphinDetailsView::slotHeaderSectionResized(int logicalIndex, int oldSize,
     }
 }
 
+void DolphinDetailsView::slotActivationChanged(bool active)
+{
+    setAlternatingRowColors(active);
+}
+
 void DolphinDetailsView::disableAutoResizing()
 {
     m_autoResize = false;
@@ -552,28 +649,13 @@ void DolphinDetailsView::updateFont()
     }
 }
 
-bool DolphinDetailsView::isZoomInPossible() const
-{
-    DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-    return settings->iconSize() < KIconLoader::SizeLarge;
-}
-
-bool DolphinDetailsView::isZoomOutPossible() const
-{
-    DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-    return settings->iconSize() > KIconLoader::SizeSmall;
-}
-
-void DolphinDetailsView::updateDecorationSize()
+void DolphinDetailsView::updateDecorationSize(bool showPreview)
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-    const int iconSize = settings->iconSize();
+    const int iconSize = showPreview ? settings->previewSize() : settings->iconSize();
     setIconSize(QSize(iconSize, iconSize));
     m_decorationSize = QSize(iconSize, iconSize);
 
-    m_controller->setZoomInPossible(isZoomInPossible());
-    m_controller->setZoomOutPossible(isZoomOutPossible());
-
     if (m_selectionManager != 0) {
         m_selectionManager->reset();
     }
@@ -652,4 +734,54 @@ void DolphinDetailsView::resizeColumns()
     headerView->resizeSection(KDirModel::Name, columnWidth[KDirModel::Name]);
 }
 
+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());
+        rect.setWidth(width);
+    }
+
+    return rect;
+}
+
+void DolphinDetailsView::setSelectionRecursive(const QModelIndex& startIndex,
+                                               const QRect& rect,
+                                               QItemSelectionModel::SelectionFlags command)
+{
+    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"