Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index de66613bec9894afdf8c4fca99dbd89eb7a2d94d..61179a3ac4446c2d97a73b44b49124b8f151e317 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -19,54 +19,81 @@
 
 #include "dolphiniconsview.h"
 
 
 #include "dolphiniconsview.h"
 

-#include "dolphinitemcategorizer.h"
+#include "dolphincategorydrawer.h"

 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"

-#include "dolphinitemcategorizer.h"
-

 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_iconsmodesettings.h"

+#include "draganddrophelper.h"

 
 

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

 #include <kdirmodel.h>
 #include <kdirmodel.h>

-#include <kfileitem.h>
-#include <kfileitemdelegate.h>

 
 #include <QAbstractProxyModel>
 
 #include <QAbstractProxyModel>

+#include <QApplication>
+#include <QPainter>

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

-        KListView(parent),
-        m_controller(controller),
-        m_itemCategorizer(0)
+    KCategorizedView(parent),
+    m_controller(controller),
+    m_categoryDrawer(0),
+    m_itemSize(),
+    m_dragging(false),
+    m_dropRect()

 {
     Q_ASSERT(controller != 0);
     setViewMode(QListView::IconMode);
     setResizeMode(QListView::Adjust);
 {
     Q_ASSERT(controller != 0);
     setViewMode(QListView::IconMode);
     setResizeMode(QListView::Adjust);

+    setSpacing(KDialog::spacingHint());
+    setMovement(QListView::Static);
+    setDragEnabled(true);
+    viewport()->setAcceptDrops(true);

 
 

+    setMouseTracking(true);

     viewport()->setAttribute(Qt::WA_Hover);
 
     viewport()->setAttribute(Qt::WA_Hover);
 

-    connect(this, SIGNAL(clicked(const QModelIndex&)),
-            controller, SLOT(triggerItem(const QModelIndex&)));
-    connect(this, SIGNAL(activated(const QModelIndex&)),
-            controller, SLOT(triggerItem(const QModelIndex&)));
-    connect(controller, SIGNAL(showPreviewChanged(bool)),
-            this, SLOT(updateGridSize(bool)));
+    // 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().
+    if (KGlobalSettings::singleClick()) {
+        connect(this, SIGNAL(clicked(const QModelIndex&)),
+                this, SLOT(triggerItem(const QModelIndex&)));
+    } else {
+        connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
+                this, SLOT(triggerItem(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(zoomIn()),
             this, SLOT(zoomIn()));
     connect(controller, SIGNAL(zoomOut()),
             this, SLOT(zoomOut()));
 

+    const DolphinView* view = controller->dolphinView();
+    connect(view, SIGNAL(showPreviewChanged()),
+            this, SLOT(slotShowPreviewChanged()));
+    connect(view, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
+            this, SLOT(slotAdditionalInfoChanged(const KFileItemDelegate::InformationList&)));
+
+    connect(this, SIGNAL(entered(const QModelIndex&)),
+            this, SLOT(slotEntered(const QModelIndex&)));
+

     // apply the icons mode settings to the widget
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
 
     // apply the icons mode settings to the widget
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
 

-    m_viewOptions = KListView::viewOptions();
+    m_viewOptions = KCategorizedView::viewOptions();
+    m_viewOptions.showDecorationSelected = true;

 
     QFont font(settings->fontFamily(), settings->fontSize());
     font.setItalic(settings->italicFont());
     font.setBold(settings->boldFont());
     m_viewOptions.font = font;
 
 
     QFont font(settings->fontFamily(), settings->fontSize());
     font.setItalic(settings->italicFont());
     font.setBold(settings->boldFont());
     m_viewOptions.font = font;
 

-    updateGridSize(controller->showPreview());
+    setWordWrap(settings->numberOfTextlines() > 1);
+    updateGridSize(view->showPreview(), 0);

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


@@ -74,17 +101,61 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     } else {
         setFlow(QListView::TopToBottom);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
     } else {
         setFlow(QListView::TopToBottom);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;

+        m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;

     }
 
     }
 

-    m_itemCategorizer = new DolphinItemCategorizer();
-    // setItemCategorizer(m_itemCategorizer);
+    m_categoryDrawer = new DolphinCategoryDrawer();
+    setCategoryDrawer(m_categoryDrawer);
+
+    setFocus();

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

-    setItemCategorizer(0);
-    delete m_itemCategorizer;
-    m_itemCategorizer = 0;
+    delete m_categoryDrawer;
+    m_categoryDrawer = 0;
+}
+
+QRect DolphinIconsView::visualRect(const QModelIndex& index) const
+{
+    const bool leftToRightFlow = (flow() == QListView::LeftToRight);
+
+    QRect itemRect = KCategorizedView::visualRect(index);
+    const int maxWidth  = m_itemSize.width();
+    const int maxHeight = m_itemSize.height();
+
+    if (itemRect.width() > maxWidth) {
+        // assure that the maximum item width is not exceeded
+        if (leftToRightFlow) {
+            const int left = itemRect.left() + (itemRect.width() - maxWidth) / 2;
+            itemRect.setLeft(left);
+        }
+        itemRect.setWidth(maxWidth);
+    }
+
+    if (itemRect.height() > maxHeight) {
+        // assure that the maximum item height is not exceeded
+        if (!leftToRightFlow) {
+            const int top = itemRect.top() + (itemRect.height() - maxHeight) / 2;
+            itemRect.setTop(top);
+        }
+        itemRect.setHeight(maxHeight);
+    }
+
+    KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast<KCategorizedSortFilterProxyModel*>(model());
+    if (leftToRightFlow && !proxyModel->isCategorizedModel()) {
+        // TODO: QListView::visualRect() calculates a wrong position of the items under
+        // certain circumstances (e. g. if the text is too long). This issue is bypassed
+        // by the following code (I'll try create a patch for Qt but as Dolphin must also work with
+        // Qt 4.3.0 this workaround must get applied at least for KDE 4.0).
+        const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+        const int margin = settings->gridSpacing();
+        const int gridWidth = gridSize().width();
+        const int gridIndex = (itemRect.left() - margin + 1) / gridWidth;
+        itemRect.moveLeft(gridIndex * gridWidth + margin);
+    }
+
+    return itemRect;

 }
 
 QStyleOptionViewItem DolphinIconsView::viewOptions() const
 }
 
 QStyleOptionViewItem DolphinIconsView::viewOptions() const


@@ -94,14 +165,29 @@ QStyleOptionViewItem DolphinIconsView::viewOptions() const
 
 void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
 {
 
 void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
 {

-    KListView::contextMenuEvent(event);
+    KCategorizedView::contextMenuEvent(event);

     m_controller->triggerContextMenuRequest(event->pos());
 }
 
     m_controller->triggerContextMenuRequest(event->pos());
 }
 

-void DolphinIconsView::mouseReleaseEvent(QMouseEvent* event)
+void DolphinIconsView::mousePressEvent(QMouseEvent* event)
+{
+    m_controller->requestActivation();
+    if (!indexAt(event->pos()).isValid()) {
+        const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
+        if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
+            clearSelection();
+        }
+    }
+
+    KCategorizedView::mousePressEvent(event);
+}
+
+void DolphinIconsView::startDrag(Qt::DropActions supportedActions)

 {
 {

-    KListView::mouseReleaseEvent(event);
-    m_controller->triggerActivation();
+    // TODO: invoking KCategorizedView::startDrag() should not be necessary, we'll
+    // fix this in KDE 4.1
+    KCategorizedView::startDrag(supportedActions);
+    DragAndDropHelper::startDrag(this, supportedActions);

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


@@ -109,44 +195,101 @@ void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
     if (event->mimeData()->hasUrls()) {
         event->acceptProposedAction();
     }
     if (event->mimeData()->hasUrls()) {
         event->acceptProposedAction();
     }

+    m_dragging = true;

 }
 
 }
 

-void DolphinIconsView::dropEvent(QDropEvent* event)
+void DolphinIconsView::dragLeaveEvent(QDragLeaveEvent* event)

 {
 {

-    const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-    if (!urls.isEmpty()) {
-        m_controller->indicateDroppedUrls(urls,
-                                          indexAt(event->pos()),
-                                          event->source());
-        event->acceptProposedAction();
+    KCategorizedView::dragLeaveEvent(event);
+
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
+    m_dragging = false;
+    setDirtyRegion(m_dropRect);
+}
+
+void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
+{
+    KCategorizedView::dragMoveEvent(event);
+
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
+    const QModelIndex index = indexAt(event->pos());
+    setDirtyRegion(m_dropRect);
+
+    m_dropRect.setSize(QSize()); // set as invalid
+    if (index.isValid()) {
+        const KFileItem item = itemForIndex(index);
+        if (!item.isNull() && item.isDir()) {
+            m_dropRect = visualRect(index);
+        }

     }
     }

-    KListView::dropEvent(event);
+    setDirtyRegion(m_dropRect);

 }
 
 }
 

-void DolphinIconsView::updateGridSize(bool showPreview)
+void DolphinIconsView::dropEvent(QDropEvent* event)

 {
 {

-    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
-    Q_ASSERT(settings != 0);
+    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 = itemForIndex(index);
+            m_controller->indicateDroppedUrls(urls,
+                                              m_controller->url(),
+                                              item);
+            event->acceptProposedAction();
+        }
+    }

 
 

-    int gridWidth = settings->gridWidth();
-    int gridHeight = settings->gridHeight();
-    int size = settings->iconSize();
+    KCategorizedView::dropEvent(event);

 
 

-    if (showPreview) {
-        const int previewSize = settings->previewSize();
-        const int diff = previewSize - size;
-        Q_ASSERT(diff >= 0);
-        gridWidth  += diff;
-        gridHeight += diff;
+    m_dragging = false;
+}

 
 

-        size = previewSize;
+void DolphinIconsView::paintEvent(QPaintEvent* event)
+{
+    KCategorizedView::paintEvent(event);
+
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
+    if (m_dragging) {
+        const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight);
+        DragAndDropHelper::drawHoverIndication(viewport(), m_dropRect, brush);
+    }
+}
+
+void DolphinIconsView::keyPressEvent(QKeyEvent* event)
+{
+    KCategorizedView::keyPressEvent(event);
+
+    const QItemSelectionModel* selModel = selectionModel();
+    const QModelIndex currentIndex = selModel->currentIndex();
+    const bool trigger = currentIndex.isValid()
+                         && (event->key() == Qt::Key_Return)
+                         && (selModel->selectedIndexes().count() <= 1);
+    if (trigger) {
+        triggerItem(currentIndex);

     }
     }

+}

 
 

-    m_viewOptions.decorationSize = QSize(size, size);
-    setGridSize(QSize(gridWidth, gridHeight));
+void DolphinIconsView::triggerItem(const QModelIndex& index)
+{
+    m_controller->triggerItem(itemForIndex(index));
+}

 
 

-    m_controller->setZoomInPossible(isZoomInPossible());
-    m_controller->setZoomOutPossible(isZoomOutPossible());
+void DolphinIconsView::slotEntered(const QModelIndex& index)
+{
+    m_controller->emitItemEntered(itemForIndex(index));
+}
+
+void DolphinIconsView::slotShowPreviewChanged()
+{
+    const DolphinView* view = m_controller->dolphinView();
+    const int infoCount = view->additionalInfo().count();
+    updateGridSize(view->showPreview(), infoCount);
+}
+
+void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info)
+{
+    const bool showPreview = m_controller->dolphinView()->showPreview();
+    updateGridSize(showPreview, info.count());

 }
 
 void DolphinIconsView::zoomIn()
 }
 
 void DolphinIconsView::zoomIn()


@@ -157,7 +300,7 @@ void DolphinIconsView::zoomIn()
         const int oldIconSize = settings->iconSize();
         int newIconSize = oldIconSize;
 
         const int oldIconSize = settings->iconSize();
         int newIconSize = oldIconSize;
 

-        const bool showPreview = m_controller->showPreview();
+        const bool showPreview = m_controller->dolphinView()->showPreview();

         if (showPreview) {
             const int previewSize = increasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);
         if (showPreview) {
             const int previewSize = increasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);


@@ -172,10 +315,11 @@ void DolphinIconsView::zoomIn()
 
         // increase also the grid size
         const int diff = newIconSize - oldIconSize;
 
         // increase also the grid size
         const int diff = newIconSize - oldIconSize;

-        settings->setGridWidth(settings->gridWidth() + diff);
-        settings->setGridHeight(settings->gridHeight() + diff);
+        settings->setItemWidth(settings->itemWidth() + diff);
+        settings->setItemHeight(settings->itemHeight() + diff);

 
 

-        updateGridSize(showPreview);
+        const int infoCount = m_controller->dolphinView()->additionalInfo().count();
+        updateGridSize(showPreview, infoCount);

     }
 }
 
     }
 }
 


@@ -187,7 +331,7 @@ void DolphinIconsView::zoomOut()
         const int oldIconSize = settings->iconSize();
         int newIconSize = oldIconSize;
 
         const int oldIconSize = settings->iconSize();
         int newIconSize = oldIconSize;
 

-        const bool showPreview = m_controller->showPreview();
+        const bool showPreview = m_controller->dolphinView()->showPreview();

         if (showPreview) {
             const int previewSize = decreasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);
         if (showPreview) {
             const int previewSize = decreasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);


@@ -203,37 +347,39 @@ void DolphinIconsView::zoomOut()
 
         // decrease also the grid size
         const int diff = oldIconSize - newIconSize;
 
         // decrease also the grid size
         const int diff = oldIconSize - newIconSize;

-        settings->setGridWidth(settings->gridWidth() - diff);
-        settings->setGridHeight(settings->gridHeight() - diff);
+        settings->setItemWidth(settings->itemWidth() - diff);
+        settings->setItemHeight(settings->itemHeight() - diff);

 
 

-        updateGridSize(showPreview);
+        const int infoCount = m_controller->dolphinView()->additionalInfo().count();
+        updateGridSize(showPreview, infoCount);

     }
 }
 
 bool DolphinIconsView::isZoomInPossible() const
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     }
 }
 
 bool DolphinIconsView::isZoomInPossible() const
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();

-    const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize();
-    return size < K3Icon::SizeEnormous;
+    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();
 }
 
 bool DolphinIconsView::isZoomOutPossible() const
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();

-    const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize();
-    return size > K3Icon::SizeSmall;
+    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 DolphinIconsView::increasedIconSize(int size) const
 {

-    // TODO: get rid of K3Icon sizes

     int incSize = 0;
     switch (size) {
     int incSize = 0;
     switch (size) {

-    case K3Icon::SizeSmall:       incSize = K3Icon::SizeSmallMedium; break;
-    case K3Icon::SizeSmallMedium: incSize = K3Icon::SizeMedium; break;
-    case K3Icon::SizeMedium:      incSize = K3Icon::SizeLarge; break;
-    case K3Icon::SizeLarge:       incSize = K3Icon::SizeHuge; break;
-    case K3Icon::SizeHuge:        incSize = K3Icon::SizeEnormous; break;
+    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;
     default: Q_ASSERT(false); break;
     }
     return incSize;


@@ -241,17 +387,64 @@ int DolphinIconsView::increasedIconSize(int size) const
 
 int DolphinIconsView::decreasedIconSize(int size) const
 {
 
 int DolphinIconsView::decreasedIconSize(int size) const
 {

-    // TODO: get rid of K3Icon sizes

     int decSize = 0;
     switch (size) {
     int decSize = 0;
     switch (size) {

-    case K3Icon::SizeSmallMedium: decSize = K3Icon::SizeSmall; break;
-    case K3Icon::SizeMedium: decSize = K3Icon::SizeSmallMedium; break;
-    case K3Icon::SizeLarge: decSize = K3Icon::SizeMedium; break;
-    case K3Icon::SizeHuge: decSize = K3Icon::SizeLarge; break;
-    case K3Icon::SizeEnormous: decSize = K3Icon::SizeHuge; break;
+    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;
     }
     return decSize;
 }
 
     default: Q_ASSERT(false); break;
     }
     return decSize;
 }
 

+void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
+{
+    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    Q_ASSERT(settings != 0);
+
+    int itemWidth = settings->itemWidth();
+    int itemHeight = settings->itemHeight();
+    int size = settings->iconSize();
+
+    if (showPreview) {
+        const int previewSize = settings->previewSize();
+        const int diff = previewSize - size;
+        Q_ASSERT(diff >= 0);
+        itemWidth  += diff;
+        itemHeight += diff;
+
+        size = previewSize;
+    }
+
+    Q_ASSERT(additionalInfoCount >= 0);
+    itemHeight += additionalInfoCount * m_viewOptions.font.pointSize() * 2;
+
+    if (settings->arrangement() == QListView::TopToBottom) {
+        // 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_viewOptions.decorationSize = QSize(itemWidth, size);
+    } else {
+        m_viewOptions.decorationSize = QSize(size, size);
+    }
+
+    const int spacing = settings->gridSpacing();
+    setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
+
+    m_itemSize = QSize(itemWidth, itemHeight);
+
+    m_controller->setZoomInPossible(isZoomInPossible());
+    m_controller->setZoomOutPossible(isZoomOutPossible());
+}
+
+KFileItem DolphinIconsView::itemForIndex(const QModelIndex& index) const
+{
+    QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(model());
+    KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
+    const QModelIndex dirIndex = proxyModel->mapToSource(index);
+    return dirModel->itemForIndex(dirIndex);
+}
+

 #include "dolphiniconsview.moc"
 #include "dolphiniconsview.moc"