Port dolphin to the KFileItemDelegate API changes.

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 42a039c8c12f05cc127797efe353e9bef1d4120d..9e2d3ee02382b3f70b5da840e7d388afea78a04c 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -19,6 +19,7 @@
 
 #include "dolphiniconsview.h"
 
+#include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
 
@@ -34,6 +35,7 @@
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     KCategorizedView(parent),
     m_controller(controller),
+    m_categoryDrawer(0),
     m_itemSize(),
     m_dragging(false),
     m_dropRect()
@@ -92,10 +94,15 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
         m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
     }
+
+    m_categoryDrawer = new DolphinCategoryDrawer();
+    setCategoryDrawer(m_categoryDrawer);
 }
 
 DolphinIconsView::~DolphinIconsView()
 {
+    delete m_categoryDrawer;
+    m_categoryDrawer = 0;
 }
 
 QRect DolphinIconsView::visualRect(const QModelIndex& index) const
@@ -185,6 +192,7 @@ void DolphinIconsView::dropEvent(QDropEvent* event)
         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
         if (!urls.isEmpty()) {
             m_controller->indicateDroppedUrls(urls,
+                                              m_controller->url(),
                                               indexAt(event->pos()),
                                               event->source());
             event->acceptProposedAction();
@@ -295,26 +303,25 @@ bool DolphinIconsView::isZoomInPossible() const
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize();
-    return size < K3Icon::SizeEnormous;
+    return size < KIconLoader::SizeEnormous;
 }
 
 bool DolphinIconsView::isZoomOutPossible() const
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize();
-    return size > K3Icon::SizeSmall;
+    return size > KIconLoader::SizeSmall;
 }
 
 int DolphinIconsView::increasedIconSize(int size) const
 {
-    // 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;
+    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;
@@ -322,14 +329,13 @@ int DolphinIconsView::increasedIconSize(int size) const
 
 int DolphinIconsView::decreasedIconSize(int size) const
 {
-    // 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;
+    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;