* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index a7b256d2be8ab261e1413e1516c6872fda959aff..f5b69bade49cb6e9e7cb7830543ec88d97048987 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -21,11 +21,13 @@
 
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
 
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"

-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
+#include "dolphinviewautoscroller.h"

 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "selectionmanager.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "selectionmanager.h"

+#include "zoomlevelinfo.h"

 
 #include <kcategorizedsortfilterproxymodel.h>
 #include <kdialog.h>
 
 #include <kcategorizedsortfilterproxymodel.h>
 #include <kdialog.h>


@@ -34,8 +36,6 @@
 
 #include <QAbstractProxyModel>
 #include <QApplication>
 
 #include <QAbstractProxyModel>
 #include <QApplication>

-#include <QPainter>
-#include <QPoint>

 #include <QScrollBar>
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
 #include <QScrollBar>
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :


@@ -43,6 +43,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     m_enableScrollTo(false),
     m_controller(controller),
     m_selectionManager(0),
     m_enableScrollTo(false),
     m_controller(controller),
     m_selectionManager(0),

+    m_autoScroller(0),

     m_categoryDrawer(0),
     m_font(),
     m_decorationSize(),
     m_categoryDrawer(0),
     m_font(),
     m_decorationSize(),


@@ -52,42 +53,41 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     m_dropRect()
 {
     Q_ASSERT(controller != 0);
     m_dropRect()
 {
     Q_ASSERT(controller != 0);

+    setLayoutDirection(Qt::LeftToRight);

     setViewMode(QListView::IconMode);
     setResizeMode(QListView::Adjust);
     setViewMode(QListView::IconMode);
     setResizeMode(QListView::Adjust);

-    setSpacing(KDialog::spacingHint());

     setMovement(QListView::Static);
     setDragEnabled(true);
     setEditTriggers(QAbstractItemView::NoEditTriggers);
     viewport()->setAcceptDrops(true);
 
     setMouseTracking(true);
     setMovement(QListView::Static);
     setDragEnabled(true);
     setEditTriggers(QAbstractItemView::NoEditTriggers);
     viewport()->setAcceptDrops(true);
 
     setMouseTracking(true);

+    m_autoScroller = new DolphinViewAutoScroller(this);

 
 

-    // 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&)));
     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&)));
     }
     } 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&)),
             controller, SLOT(emitItemEntered(const QModelIndex&)));
     connect(this, SIGNAL(viewportEntered()),
             controller, SLOT(emitViewportEntered()));
     connect(this, SIGNAL(entered(const QModelIndex&)),
             controller, SLOT(emitItemEntered(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)));

 
     const DolphinView* view = controller->dolphinView();
     connect(view, SIGNAL(showPreviewChanged()),
 
     const DolphinView* view = controller->dolphinView();
     connect(view, SIGNAL(showPreviewChanged()),


@@ -126,8 +126,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
 
     setFocus();
 
 
     setFocus();
 

-    connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
-            this, SLOT(updateFont()));
+    connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)),
+            this, SLOT(slotGlobalSettingsChanged(int)));

 }
 
 DolphinIconsView::~DolphinIconsView()
 }
 
 DolphinIconsView::~DolphinIconsView()


@@ -154,7 +154,7 @@ void DolphinIconsView::dataChanged(const QModelIndex& topLeft, const QModelIndex
     KCategorizedView::dataChanged(topLeft, bottomRight);
 
     KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast<KCategorizedSortFilterProxyModel*>(model());
     KCategorizedView::dataChanged(topLeft, bottomRight);
 
     KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast<KCategorizedSortFilterProxyModel*>(model());

-    if ((flow() == QListView::LeftToRight) && !proxyModel->isCategorizedModel()) {
+    if (!proxyModel->isCategorizedModel()) {

         // bypass a QListView issue that items are not layout correctly if the decoration size of
         // an index changes
         scheduleDelayedItemsLayout();
         // bypass a QListView issue that items are not layout correctly if the decoration size of
         // an index changes
         scheduleDelayedItemsLayout();


@@ -192,6 +192,9 @@ void DolphinIconsView::mousePressEvent(QMouseEvent* event)
     }
 
     if (!index.isValid()) {
     }
 
     if (!index.isValid()) {

+        if (QApplication::mouseButtons() & Qt::MidButton) {
+            m_controller->replaceUrlByClipboard();
+        }

         const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
         if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
             clearSelection();
         const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
         if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
             clearSelection();


@@ -206,12 +209,12 @@ void DolphinIconsView::startDrag(Qt::DropActions supportedActions)
     // TODO: invoking KCategorizedView::startDrag() should not be necessary, we'll
     // fix this in KDE 4.1
     KCategorizedView::startDrag(supportedActions);
     // TODO: invoking KCategorizedView::startDrag() should not be necessary, we'll
     // fix this in KDE 4.1
     KCategorizedView::startDrag(supportedActions);

-    DragAndDropHelper::startDrag(this, supportedActions);
+    DragAndDropHelper::instance().startDrag(this, supportedActions, m_controller);

 }
 
 void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
 {
 }
 
 void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
 {

-    if (event->mimeData()->hasUrls()) {
+    if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) {

         event->acceptProposedAction();
     }
 }
         event->acceptProposedAction();
     }
 }


@@ -239,7 +242,7 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
             m_dropRect.setSize(QSize()); // set as invalid
         }
     }
             m_dropRect.setSize(QSize()); // set as invalid
         }
     }

-    if (event->mimeData()->hasUrls()) {
+    if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) {

         // accept url drops, independently from the destination item
         event->acceptProposedAction();
     }
         // accept url drops, independently from the destination item
         event->acceptProposedAction();
     }


@@ -249,26 +252,18 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
 
 void DolphinIconsView::dropEvent(QDropEvent* event)
 {
 
 void DolphinIconsView::dropEvent(QDropEvent* event)
 {

-    if (!selectionModel()->isSelected(indexAt(event->pos()))) {
-        const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-        if (!urls.isEmpty()) {
-            const QModelIndex index = indexAt(event->pos());
-            const KFileItem item = m_controller->itemForIndex(index);
-            m_controller->indicateDroppedUrls(urls,
-                                              m_controller->url(),
-                                              item);
-            event->acceptProposedAction();
-        }
-    }
+    const QModelIndex index = indexAt(event->pos());
+    const KFileItem item = m_controller->itemForIndex(index);
+    m_controller->indicateDroppedUrls(item, m_controller->url(), event);

 
     KCategorizedView::dropEvent(event);
 }
 
 void DolphinIconsView::keyPressEvent(QKeyEvent* event)
 {
 
     KCategorizedView::dropEvent(event);
 }
 
 void DolphinIconsView::keyPressEvent(QKeyEvent* event)
 {

+    m_enableScrollTo = true; // see DolphinIconsView::scrollTo()

     KCategorizedView::keyPressEvent(event);
     m_controller->handleKeyPressEvent(event);
     KCategorizedView::keyPressEvent(event);
     m_controller->handleKeyPressEvent(event);

-    m_enableScrollTo = true; // see DolphinIconsView::scrollTo()

 }
 
 void DolphinIconsView::wheelEvent(QWheelEvent* event)
 }
 
 void DolphinIconsView::wheelEvent(QWheelEvent* event)


@@ -282,6 +277,10 @@ void DolphinIconsView::wheelEvent(QWheelEvent* event)
         event->ignore();
         return;
     }
         event->ignore();
         return;
     }

+
+    horizontalScrollBar()->setSingleStep(m_itemSize.width() / 10);
+    verticalScrollBar()->setSingleStep(m_itemSize.height() / 10);
+

     KCategorizedView::wheelEvent(event);
     // if the icons are aligned left to right, the vertical wheel event should
     // be applied to the horizontal scrollbar
     KCategorizedView::wheelEvent(event);
     // if the icons are aligned left to right, the vertical wheel event should
     // be applied to the horizontal scrollbar


@@ -315,6 +314,21 @@ void DolphinIconsView::leaveEvent(QEvent* event)
     m_controller->emitViewportEntered();
 }
 
     m_controller->emitViewportEntered();
 }
 

+void DolphinIconsView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
+{
+    KCategorizedView::currentChanged(current, previous);
+    if (current.isValid() && !m_autoScroller->isActive()) {
+        scrollTo(current);
+    }
+}
+
+void DolphinIconsView::resizeEvent(QResizeEvent* event)
+{
+    KCategorizedView::resizeEvent(event);
+    const DolphinView* view = m_controller->dolphinView();
+    updateGridSize(view->showPreview(), view->additionalInfo().count());
+}
+

 void DolphinIconsView::slotShowPreviewChanged()
 {
     const DolphinView* view = m_controller->dolphinView();
 void DolphinIconsView::slotShowPreviewChanged()
 {
     const DolphinView* view = m_controller->dolphinView();


@@ -328,56 +342,28 @@ void DolphinIconsView::slotAdditionalInfoChanged()
     updateGridSize(showPreview, view->additionalInfo().count());
 }
 
     updateGridSize(showPreview, view->additionalInfo().count());
 }
 

-void DolphinIconsView::zoomIn()
+void DolphinIconsView::setZoomLevel(int level)

 {
 {

-    if (isZoomInPossible()) {
-        IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
-
-        const int oldIconSize = settings->iconSize();
-        int newIconSize = oldIconSize;
-
-        const bool showPreview = m_controller->dolphinView()->showPreview();
-        if (showPreview) {
-            const int previewSize = increasedIconSize(settings->previewSize());
-            settings->setPreviewSize(previewSize);
-        } else {
-            newIconSize = increasedIconSize(oldIconSize);
-            settings->setIconSize(newIconSize);
-        }
+    IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();

 
 

-        // increase also the grid size
-        const int diff = newIconSize - oldIconSize;
-        settings->setItemWidth(settings->itemWidth() + diff);
-        settings->setItemHeight(settings->itemHeight() + diff);
+    const int oldIconSize = settings->iconSize();
+    int newIconSize = oldIconSize;

 
 

-        updateGridSize(showPreview, additionalInfoCount());
+    const bool showPreview = m_controller->dolphinView()->showPreview();
+    if (showPreview) {
+        const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(level);
+        settings->setPreviewSize(previewSize);
+    } else {
+        newIconSize = ZoomLevelInfo::iconSizeForZoomLevel(level);
+        settings->setIconSize(newIconSize);

     }
     }

-}

 
 

-void DolphinIconsView::zoomOut()
-{
-    if (isZoomOutPossible()) {
-        IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
-
-        const int oldIconSize = settings->iconSize();
-        int newIconSize = oldIconSize;
+    // increase also the grid size
+    const int diff = newIconSize - oldIconSize;
+    settings->setItemWidth(settings->itemWidth() + diff);
+    settings->setItemHeight(settings->itemHeight() + diff);

 
 

-        const bool showPreview = m_controller->dolphinView()->showPreview();
-        if (showPreview) {
-            const int previewSize = decreasedIconSize(settings->previewSize());
-            settings->setPreviewSize(previewSize);
-        } else {
-            newIconSize = decreasedIconSize(settings->iconSize());
-            settings->setIconSize(newIconSize);
-        }
-
-        // decrease also the grid size
-        const int diff = oldIconSize - newIconSize;
-        settings->setItemWidth(settings->itemWidth() - diff);
-        settings->setItemHeight(settings->itemHeight() - diff);
-
-        updateGridSize(showPreview, additionalInfoCount());
-    }
+    updateGridSize(showPreview, additionalInfoCount());

 }
 
 void DolphinIconsView::requestActivation()
 }
 
 void DolphinIconsView::requestActivation()


@@ -385,58 +371,23 @@ void DolphinIconsView::requestActivation()
     m_controller->requestActivation();
 }
 
     m_controller->requestActivation();
 }
 

-void DolphinIconsView::updateFont()
+void DolphinIconsView::slotGlobalSettingsChanged(int category)

 {
 {

+    Q_UNUSED(category);
+

     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);

-

     if (settings->useSystemFont()) {
         m_font = KGlobalSettings::generalFont();
     }
     if (settings->useSystemFont()) {
         m_font = KGlobalSettings::generalFont();
     }

-}
-
-bool DolphinIconsView::isZoomInPossible() const
-{
-    IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
-    const bool showPreview = m_controller->dolphinView()->showPreview();
-    const int size = showPreview ? settings->previewSize() : settings->iconSize();
-    return size < KIconLoader::SizeEnormous;
-}
-
-bool DolphinIconsView::isZoomOutPossible() const
-{
-    IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
-    const bool showPreview = m_controller->dolphinView()->showPreview();
-    const int size = showPreview ? settings->previewSize() : settings->iconSize();
-    return size > KIconLoader::SizeSmall;
-}
-
-int DolphinIconsView::increasedIconSize(int size) const
-{
-    int incSize = 0;
-    switch (size) {
-    case KIconLoader::SizeSmall:       incSize = KIconLoader::SizeSmallMedium; break;
-    case KIconLoader::SizeSmallMedium: incSize = KIconLoader::SizeMedium; break;
-    case KIconLoader::SizeMedium:      incSize = KIconLoader::SizeLarge; break;
-    case KIconLoader::SizeLarge:       incSize = KIconLoader::SizeHuge; break;
-    case KIconLoader::SizeHuge:        incSize = KIconLoader::SizeEnormous; break;
-    default: Q_ASSERT(false); break;
-    }
-    return incSize;
-}

 
 

-int DolphinIconsView::decreasedIconSize(int size) const
-{
-    int decSize = 0;
-    switch (size) {
-    case KIconLoader::SizeSmallMedium: decSize = KIconLoader::SizeSmall; break;
-    case KIconLoader::SizeMedium: decSize = KIconLoader::SizeSmallMedium; break;
-    case KIconLoader::SizeLarge: decSize = KIconLoader::SizeMedium; break;
-    case KIconLoader::SizeHuge: decSize = KIconLoader::SizeLarge; break;
-    case KIconLoader::SizeEnormous: decSize = KIconLoader::SizeHuge; break;
-    default: Q_ASSERT(false); break;
+    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)));

     }
     }

-    return decSize;

 }
 
 void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
 }
 
 void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)


@@ -460,25 +411,48 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
     Q_ASSERT(additionalInfoCount >= 0);
     itemHeight += additionalInfoCount * m_font.pointSize() * 2;
 
     Q_ASSERT(additionalInfoCount >= 0);
     itemHeight += additionalInfoCount * m_font.pointSize() * 2;
 

+    // Optimize the item size of the grid in a way to prevent large gaps on the
+    // right border (= row arrangement) or the bottom border (= column arrangement).
+    // There is no public API in QListView to find out the used width of the viewport
+    // for the layout. The following calculation of 'contentWidth'/'contentHeight'
+    // is based on QListViewPrivate::prepareItemsLayout() (Copyright (C) 2009 Nokia Corporation).
+    int frameAroundContents = 0;
+    if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) {
+        frameAroundContents = style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2;
+    }
+    const int spacing = settings->gridSpacing();

     if (settings->arrangement() == QListView::TopToBottom) {
     if (settings->arrangement() == QListView::TopToBottom) {

+        const int contentWidth = viewport()->width() - 1
+                                 - frameAroundContents
+                                 - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, horizontalScrollBar());
+        const int gridWidth = itemWidth + spacing * 2;
+        const int horizItemCount = contentWidth / gridWidth;
+        if (horizItemCount > 0) {
+            itemWidth += (contentWidth - horizItemCount * gridWidth) / horizItemCount;
+        }
+

         // The decoration width indirectly defines the maximum
         // width for the text wrapping. To use the maximum item width
         // for text wrapping, it is used as decoration width.
         m_decorationSize = QSize(itemWidth, size);
         setIconSize(QSize(itemWidth, size));
     } else {
         // The decoration width indirectly defines the maximum
         // width for the text wrapping. To use the maximum item width
         // for text wrapping, it is used as decoration width.
         m_decorationSize = QSize(itemWidth, size);
         setIconSize(QSize(itemWidth, size));
     } else {

+        const int contentHeight = viewport()->height() - 1
+                                  - frameAroundContents
+                                  - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, verticalScrollBar());
+        const int gridHeight = itemHeight + spacing;
+        const int vertItemCount = contentHeight / gridHeight;
+        if (vertItemCount > 0) {
+            itemHeight += (contentHeight - vertItemCount * gridHeight) / vertItemCount;
+        }
+

         m_decorationSize = QSize(size, size);
         setIconSize(QSize(size, size));
     }
 
     m_itemSize = QSize(itemWidth, itemHeight);
         m_decorationSize = QSize(size, size);
         setIconSize(QSize(size, size));
     }
 
     m_itemSize = QSize(itemWidth, itemHeight);

-
-    const int spacing = settings->gridSpacing();

     setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
 
     setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
 

-    m_controller->setZoomInPossible(isZoomInPossible());
-    m_controller->setZoomOutPossible(isZoomOutPossible());
-

     KFileItemDelegate* delegate = dynamic_cast<KFileItemDelegate*>(itemDelegate());
     if (delegate != 0) {
         delegate->setMaximumSize(m_itemSize);
     KFileItemDelegate* delegate = dynamic_cast<KFileItemDelegate*>(itemDelegate());
     if (delegate != 0) {
         delegate->setMaximumSize(m_itemSize);