X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b8a4e0fac2820ec8fc442c2abeea700ae4947e01..b5432d60372e2dad6d31cd4e6d28e4da5d47a7e4:/src/dolphincolumnwidget.cpp

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 6d983f71f..5b3ffae59 100644
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -28,7 +28,8 @@
 #include "dolphin_columnmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
-#include "iconmanager.h"
+#include "folderexpander.h"
+#include "kfilepreviewgenerator.h"
 #include "selectionmanager.h"
 #include "tooltipmanager.h"
 
@@ -59,7 +60,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),
-    m_iconManager(0),
+    m_previewGenerator(0),
     m_dropRect()
 {
     setMouseTracking(true);
@@ -121,9 +122,8 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     m_proxyModel->setSortOrder(dolphinView->sortOrder());
 
     setModel(m_proxyModel);
-    const bool useSelManager = KGlobalSettings::singleClick() &&
-                               DolphinSettings::instance().generalSettings()->showSelectionToggle();
-    if (useSelManager) {
+
+    if (DolphinSettings::instance().generalSettings()->showSelectionToggle()) {
         m_selectionManager = new SelectionManager(this);
         connect(m_selectionManager, SIGNAL(selectionChanged()),
                 this, SLOT(requestActivation()));
@@ -131,8 +131,8 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
                 m_selectionManager, SLOT(reset()));
     }
 
-    m_iconManager = new IconManager(this, m_proxyModel);
-    m_iconManager->setShowPreview(m_view->m_controller->dolphinView()->showPreview());
+    m_previewGenerator = new KFilePreviewGenerator(this, m_proxyModel);
+    m_previewGenerator->setShowPreview(m_view->m_controller->dolphinView()->showPreview());
 
     if (DolphinSettings::instance().generalSettings()->showToolTips()) {
         new ToolTipManager(this, m_proxyModel);
@@ -142,6 +142,11 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
 
     connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
             this, SLOT(updateFont()));
+     
+    FolderExpander* folderExpander = new FolderExpander(this, m_proxyModel);
+    folderExpander->setEnabled(DolphinSettings::instance().generalSettings()->autoExpandFolders());
+    connect (folderExpander, SIGNAL(enterDir(const QModelIndex&)),
+             m_view->m_controller, SLOT(triggerItem(const QModelIndex&)));
 }
 
 DolphinColumnWidget::~DolphinColumnWidget()
@@ -158,8 +163,8 @@ void DolphinColumnWidget::setDecorationSize(const QSize& size)
     setIconSize(size);
     m_decorationSize = size;
     doItemsLayout();
-    if (m_iconManager != 0) {
-        m_iconManager->updatePreviews();
+    if (m_previewGenerator != 0) {
+        m_previewGenerator->updatePreviews();
     }
     if (m_selectionManager != 0) {
         m_selectionManager->reset();
@@ -208,7 +213,7 @@ void DolphinColumnWidget::setShowHiddenFiles(bool show)
 
 void DolphinColumnWidget::setShowPreview(bool show)
 {
-    m_iconManager->setShowPreview(show);
+    m_previewGenerator->setShowPreview(show);
 
     m_dirLister->stop();
     m_dirLister->openUrl(m_url, KDirLister::Reload);
@@ -386,6 +391,7 @@ void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event)
         Q_ASSERT(m_view->m_controller->itemView() == this);
         m_view->m_controller->triggerUrlChangeRequest(m_url);
     }
+    Q_ASSERT(m_active);
 
     QListView::contextMenuEvent(event);
 
@@ -394,13 +400,9 @@ void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event)
         clearSelection();
     }
 
-    if (index.isValid() || m_active) {
-        // Only open a context menu above an item or if the mouse is above
-        // the active column.
-        const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos());
-        Q_ASSERT(m_view->m_controller->itemView() == this);
-        m_view->m_controller->triggerContextMenuRequest(pos);
-    }
+    const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos());
+    Q_ASSERT(m_view->m_controller->itemView() == this);
+    m_view->m_controller->triggerContextMenuRequest(pos);
 }
 
 void DolphinColumnWidget::wheelEvent(QWheelEvent* event)