renamed IconManager to KFilePreviewGenerator

[dolphin.git] / src / dolphincolumnwidget.cpp

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 2ca4cdbbfea88fc13dc91fc53d96efd89985f1f2..5b3ffae59171c51d89d1217fe6124f1ab1e21f53 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -28,6 +28,8 @@
 #include "dolphin_columnmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
+#include "folderexpander.h"
+#include "kfilepreviewgenerator.h"
 #include "selectionmanager.h"
 #include "tooltipmanager.h"
 
@@ -37,11 +39,8 @@
 #include <kio/previewjob.h>
 #include <kiconeffect.h>
 #include <kjob.h>
-#include <kmimetyperesolver.h>
 #include <konqmimedata.h>
 
-#include "iconmanager.h"
-
 #include <QApplication>
 #include <QClipboard>
 #include <QPainter>
@@ -61,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);
@@ -123,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()));
@@ -133,9 +131,8 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
                 m_selectionManager, SLOT(reset()));
     }
 
-    new KMimeTypeResolver(this, m_dolphinModel);
-    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);
@@ -145,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()
@@ -161,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();
@@ -211,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);
@@ -248,6 +250,33 @@ void DolphinColumnWidget::editItem(const KFileItem& item)
     }
 }
 
+KFileItem DolphinColumnWidget::itemAt(const QPoint& pos) const
+{
+    KFileItem item;
+    const QModelIndex index = indexAt(pos);
+    if (index.isValid() && (index.column() == DolphinModel::Name)) {
+        const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
+        item = m_dolphinModel->itemForIndex(dolphinModelIndex);
+    }
+    return item;
+}
+
+KFileItemList DolphinColumnWidget::selectedItems() const
+{
+    const QItemSelection selection = m_proxyModel->mapSelectionToSource(selectionModel()->selection());
+    KFileItemList itemList;
+
+    const QModelIndexList indexList = selection.indexes();
+    foreach (const QModelIndex &index, indexList) {
+        KFileItem item = m_dolphinModel->itemForIndex(index);
+        if (!item.isNull()) {
+            itemList.append(item);
+        }
+    }
+
+    return itemList;
+}
+
 QStyleOptionViewItem DolphinColumnWidget::viewOptions() const
 {
     QStyleOptionViewItem viewOptions = QListView::viewOptions();
@@ -362,17 +391,18 @@ 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);
 
     const QModelIndex index = indexAt(event->pos());
-    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);
+    if (!index.isValid()) {
+        clearSelection();
     }
+
+    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)