Postpone the creating of the dir lister to the first show event. This assures that...

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index de66613bec9894afdf8c4fca99dbd89eb7a2d94d..35789f75439e02cb934dd858baefdedaaaf14d4b 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -19,7 +19,6 @@
 
 #include "dolphiniconsview.h"
 
-#include "dolphinitemcategorizer.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
 #include "dolphinitemcategorizer.h"
@@ -34,9 +33,8 @@
 #include <QPoint>
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
-        KListView(parent),
-        m_controller(controller),
-        m_itemCategorizer(0)
+    KListView(parent),
+    m_controller(controller)
 {
     Q_ASSERT(controller != 0);
     setViewMode(QListView::IconMode);
@@ -44,8 +42,13 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
 
     viewport()->setAttribute(Qt::WA_Hover);
 
-    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&)));
+    } else {
+        connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
+                controller, SLOT(triggerItem(const QModelIndex&)));
+    }
     connect(this, SIGNAL(activated(const QModelIndex&)),
             controller, SLOT(triggerItem(const QModelIndex&)));
     connect(controller, SIGNAL(showPreviewChanged(bool)),
@@ -60,6 +63,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     Q_ASSERT(settings != 0);
 
     m_viewOptions = KListView::viewOptions();
+    m_viewOptions.showDecorationSelected = true;
 
     QFont font(settings->fontFamily(), settings->fontSize());
     font.setItalic(settings->italicFont());
@@ -75,16 +79,10 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
         setFlow(QListView::TopToBottom);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
     }
-
-    m_itemCategorizer = new DolphinItemCategorizer();
-    // setItemCategorizer(m_itemCategorizer);
 }
 
 DolphinIconsView::~DolphinIconsView()
 {
-    setItemCategorizer(0);
-    delete m_itemCategorizer;
-    m_itemCategorizer = 0;
 }
 
 QStyleOptionViewItem DolphinIconsView::viewOptions() const