X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/43b2b591ece9c4485d9c8c03f27a733ddccdac5f..093efca22dfd247f06e2a669ad968300e71ef08d:/src/dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 394dae317..3da04c113 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -19,9 +19,9 @@
 
 #include "dolphiniconsview.h"
 
+#include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
-#include "dolphinitemcategorizer.h"
 
 #include "dolphin_iconsmodesettings.h"
 
@@ -35,6 +35,7 @@
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     KCategorizedView(parent),
     m_controller(controller),
+    m_categoryDrawer(0),
     m_itemSize(),
     m_dragging(false),
     m_dropRect()
@@ -46,6 +47,10 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
 
+    // 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&)),
                 controller, SLOT(triggerItem(const QModelIndex&)));
@@ -89,43 +94,44 @@ 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
 {
-    if (itemCategorizer() == 0) {
-        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);
-        }
+    const bool leftToRightFlow = (flow() == QListView::LeftToRight);
 
-        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);
+    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);
+    }
 
-        return itemRect;
+    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);
     }
 
-    return KCategorizedView::visualRect(index);
+    return itemRect;
 }
 
 QStyleOptionViewItem DolphinIconsView::viewOptions() const
@@ -186,11 +192,13 @@ 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();
         }
     }
+
     KCategorizedView::dropEvent(event);
     m_dragging = false;
 }
@@ -206,6 +214,20 @@ void DolphinIconsView::paintEvent(QPaintEvent* event)
     }
 }
 
+void DolphinIconsView::keyPressEvent(QKeyEvent* event)
+{
+    KCategorizedView::keyPressEvent(event);
+
+    const QItemSelectionModel* selModel = selectionModel();
+    const QModelIndex currentIndex = selModel->currentIndex();
+    const bool triggerItem = currentIndex.isValid()
+                             && (event->key() == Qt::Key_Return)
+                             && (selModel->selectedIndexes().count() <= 1);
+    if (triggerItem) {
+        m_controller->triggerItem(currentIndex);
+    }
+}
+
 void DolphinIconsView::slotShowPreviewChanged(bool showPreview)
 {
     updateGridSize(showPreview, m_controller->showAdditionalInfo());