Added Rafael López's item categorizer into Dolphin (it's currently deactivated in...

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 4d121eabddbea20dba2f8969a1f67dae07c91f16..de66613bec9894afdf8c4fca99dbd89eb7a2d94d 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -19,8 +19,10 @@
 
 #include "dolphiniconsview.h"
 
 
 #include "dolphiniconsview.h"
 

+#include "dolphinitemcategorizer.h"

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

+#include "dolphinitemcategorizer.h"

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


@@ -29,17 +31,23 @@
 #include <kfileitemdelegate.h>
 
 #include <QAbstractProxyModel>
 #include <kfileitemdelegate.h>
 
 #include <QAbstractProxyModel>

+#include <QPoint>

 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :

-    QListView(parent),
-    m_controller(controller)
+        KListView(parent),
+        m_controller(controller),
+        m_itemCategorizer(0)

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

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

     connect(this, SIGNAL(clicked(const QModelIndex&)),
             controller, SLOT(triggerItem(const QModelIndex&)));
     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)));
     connect(controller, SIGNAL(zoomIn()),
     connect(controller, SIGNAL(showPreviewChanged(bool)),
             this, SLOT(updateGridSize(bool)));
     connect(controller, SIGNAL(zoomIn()),


@@ -51,29 +59,32 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
 
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
 

-    m_viewOptions = QListView::viewOptions();
-    m_viewOptions.font = QFont(settings->fontFamily(), settings->fontSize());
+    m_viewOptions = KListView::viewOptions();
+
+    QFont font(settings->fontFamily(), settings->fontSize());
+    font.setItalic(settings->italicFont());
+    font.setBold(settings->boldFont());
+    m_viewOptions.font = font;

 
     updateGridSize(controller->showPreview());
 
     if (settings->arrangement() == QListView::TopToBottom) {
         setFlow(QListView::LeftToRight);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Top;
 
     updateGridSize(controller->showPreview());
 
     if (settings->arrangement() == QListView::TopToBottom) {
         setFlow(QListView::LeftToRight);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Top;

-    }
-    else {
+    } else {

         setFlow(QListView::TopToBottom);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
     }
 
         setFlow(QListView::TopToBottom);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
     }
 

-    KFileItemDelegate* delegate = new KFileItemDelegate(parent);
-    const KFileItemDelegate::AdditionalInformation info =
-        static_cast<KFileItemDelegate::AdditionalInformation>(settings->additionalInfo());
-    delegate->setAdditionalInformation(info);
-    setItemDelegate(delegate);
+    m_itemCategorizer = new DolphinItemCategorizer();
+    // setItemCategorizer(m_itemCategorizer);

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

+    setItemCategorizer(0);
+    delete m_itemCategorizer;
+    m_itemCategorizer = 0;

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


@@ -83,13 +94,13 @@ QStyleOptionViewItem DolphinIconsView::viewOptions() const
 
 void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
 {
 
 void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
 {

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

     m_controller->triggerContextMenuRequest(event->pos());
 }
 
 void DolphinIconsView::mouseReleaseEvent(QMouseEvent* event)
 {
     m_controller->triggerContextMenuRequest(event->pos());
 }
 
 void DolphinIconsView::mouseReleaseEvent(QMouseEvent* event)
 {

-    QListView::mouseReleaseEvent(event);
+    KListView::mouseReleaseEvent(event);

     m_controller->triggerActivation();
 }
 
     m_controller->triggerActivation();
 }
 


@@ -103,13 +114,13 @@ void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
 void DolphinIconsView::dropEvent(QDropEvent* event)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
 void DolphinIconsView::dropEvent(QDropEvent* event)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());

-    if (urls.isEmpty() || (event->source() == this)) {
-        QListView::dropEvent(event);
-    }
-    else {
+    if (!urls.isEmpty()) {
+        m_controller->indicateDroppedUrls(urls,
+                                          indexAt(event->pos()),
+                                          event->source());

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

-        m_controller->indicateDroppedUrls(urls, event->pos());

     }
     }

+    KListView::dropEvent(event);

 }
 
 void DolphinIconsView::updateGridSize(bool showPreview)
 }
 
 void DolphinIconsView::updateGridSize(bool showPreview)


@@ -125,12 +136,11 @@ void DolphinIconsView::updateGridSize(bool showPreview)
         const int previewSize = settings->previewSize();
         const int diff = previewSize - size;
         Q_ASSERT(diff >= 0);
         const int previewSize = settings->previewSize();
         const int diff = previewSize - size;
         Q_ASSERT(diff >= 0);

-        gridWidth += diff;
+        gridWidth  += diff;

         gridHeight += diff;
 
         size = previewSize;
         gridHeight += diff;
 
         size = previewSize;

-     }
-
+    }

 
     m_viewOptions.decorationSize = QSize(size, size);
     setGridSize(QSize(gridWidth, gridHeight));
 
     m_viewOptions.decorationSize = QSize(size, size);
     setGridSize(QSize(gridWidth, gridHeight));


@@ -144,20 +154,27 @@ void DolphinIconsView::zoomIn()
     if (isZoomInPossible()) {
         IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
 
     if (isZoomInPossible()) {
         IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
 

+        const int oldIconSize = settings->iconSize();
+        int newIconSize = oldIconSize;
+

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

-        }
-        else {
-            const int iconSize = increasedIconSize(settings->iconSize());
-            settings->setIconSize(iconSize);
-            if (settings->previewSize() < iconSize) {
+        } else {
+            newIconSize = increasedIconSize(oldIconSize);
+            settings->setIconSize(newIconSize);
+            if (settings->previewSize() < newIconSize) {

                 // assure that the preview size is always >= the icon size
                 // assure that the preview size is always >= the icon size

-                settings->setPreviewSize(iconSize);
+                settings->setPreviewSize(newIconSize);

             }
         }
 
             }
         }
 

+        // increase also the grid size
+        const int diff = newIconSize - oldIconSize;
+        settings->setGridWidth(settings->gridWidth() + diff);
+        settings->setGridHeight(settings->gridHeight() + diff);
+

         updateGridSize(showPreview);
     }
 }
         updateGridSize(showPreview);
     }
 }


@@ -167,19 +184,27 @@ void DolphinIconsView::zoomOut()
     if (isZoomOutPossible()) {
         IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
 
     if (isZoomOutPossible()) {
         IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
 

+        const int oldIconSize = settings->iconSize();
+        int newIconSize = oldIconSize;
+

         const bool showPreview = m_controller->showPreview();
         if (showPreview) {
             const int previewSize = decreasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);
             if (settings->iconSize() > previewSize) {
                 // assure that the icon size is always <= the preview size
         const bool showPreview = m_controller->showPreview();
         if (showPreview) {
             const int previewSize = decreasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);
             if (settings->iconSize() > previewSize) {
                 // assure that the icon size is always <= the preview size

-                settings->setIconSize(previewSize);
+                newIconSize = previewSize;
+                settings->setIconSize(newIconSize);

             }
             }

+        } else {
+            newIconSize = decreasedIconSize(settings->iconSize());
+            settings->setIconSize(newIconSize);

         }
         }

-        else {
-            const int iconSize = decreasedIconSize(settings->iconSize());
-            settings->setIconSize(iconSize);
-        }
+
+        // decrease also the grid size
+        const int diff = oldIconSize - newIconSize;
+        settings->setGridWidth(settings->gridWidth() - diff);
+        settings->setGridHeight(settings->gridHeight() - diff);

 
         updateGridSize(showPreview);
     }
 
         updateGridSize(showPreview);
     }


@@ -204,12 +229,12 @@ int DolphinIconsView::increasedIconSize(int size) const
     // TODO: get rid of K3Icon sizes
     int incSize = 0;
     switch (size) {
     // TODO: get rid of K3Icon sizes
     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;
-        default: Q_ASSERT(false); break;
+    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;
+    default: Q_ASSERT(false); break;

     }
     return incSize;
 }
     }
     return incSize;
 }


@@ -219,12 +244,12 @@ int DolphinIconsView::decreasedIconSize(int size) const
     // TODO: get rid of K3Icon sizes
     int decSize = 0;
     switch (size) {
     // TODO: get rid of K3Icon sizes
     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;
-        default: Q_ASSERT(false); break;
+    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;
+    default: Q_ASSERT(false); break;

     }
     return decSize;
 }
     }
     return decSize;
 }