The else path is never reached -> removed it (thanks to Simon St James for the hint)

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 24b331d84b9607a0940f56b79722131979aaf508..42136f4459b487656ff2e9ffee70bcca1638c63f 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -53,13 +53,16 @@
 #include "dolphincontroller.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"
+#include "dolphin_detailsmodesettings.h"
 #include "dolphiniconsview.h"
 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
-#include "iconmanager.h"
+#include "folderexpander.h"
+#include "kfilepreviewgenerator.h"
 #include "renamedialog.h"
 #include "tooltipmanager.h"
 #include "viewproperties.h"
+#include "zoomlevelinfo.h"
 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
@@ -84,7 +87,7 @@ DolphinView::DolphinView(QWidget* parent,
     m_dolphinModel(dolphinModel),
     m_dirLister(dirLister),
     m_proxyModel(proxyModel),
-    m_iconManager(0),
+    m_previewGenerator(0),
     m_toolTipManager(0),
     m_rootUrl(),
     m_currentItemUrl()
@@ -362,15 +365,15 @@ QPoint DolphinView::contentsPosition() const
 
 void DolphinView::setZoomLevel(int level)
 {
-    if (level < zoomLevelMinimum()) {
-        level = zoomLevelMinimum();
-    } else if (level > zoomLevelMaximum()) {
-        level = zoomLevelMaximum();
+    if (level < ZoomLevelInfo::minimumLevel()) {
+        level = ZoomLevelInfo::minimumLevel();
+    } else if (level > ZoomLevelInfo::maximumLevel()) {
+        level = ZoomLevelInfo::maximumLevel();
     }
     
     if (level != zoomLevel()) {
         m_controller->setZoomLevel(level);
-        m_iconManager->updatePreviews();
+        m_previewGenerator->updatePreviews();
         emit zoomLevelChanged(level);
     }
 }
@@ -380,16 +383,6 @@ int DolphinView::zoomLevel() const
     return m_controller->zoomLevel();
 }
 
-int DolphinView::zoomLevelMinimum() const
-{
-    return m_controller->zoomLevelMinimum();
-}
-
-int DolphinView::zoomLevelMaximum() const
-{
-    return m_controller->zoomLevelMaximum();
-}
-
 void DolphinView::setSorting(Sorting sorting)
 {
     if (sorting != this->sorting()) {
@@ -459,7 +452,7 @@ void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
         return;
     }
 
-    m_iconManager->cancelPreviews();
+    m_previewGenerator->cancelPreviews();
     m_controller->setUrl(url); // emits urlChanged, which we forward
 
     if (!rootUrl.isEmpty() && rootUrl.isParentOf(url)) {
@@ -603,12 +596,13 @@ void DolphinView::renameSelectedItems()
 void DolphinView::trashSelectedItems()
 {
     emit doingOperation(KIO::FileUndoManager::Trash);
-    KonqOperations::del(this, KonqOperations::TRASH, selectedUrls());
+    const KUrl::List list = simplifiedSelectedUrls();
+    KonqOperations::del(this, KonqOperations::TRASH, list);
 }
 
 void DolphinView::deleteSelectedItems()
 {
-    const KUrl::List list = selectedUrls();
+    const KUrl::List list = simplifiedSelectedUrls();
     const bool del = KonqOperations::askDeleteConfirmation(list,
                      KonqOperations::DEL,
                      KonqOperations::DEFAULT_CONFIRMATION,
@@ -624,7 +618,7 @@ void DolphinView::deleteSelectedItems()
 void DolphinView::cutSelectedItems()
 {
     QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = selectedUrls();
+    const KUrl::List kdeUrls = simplifiedSelectedUrls();
     const KUrl::List mostLocalUrls;
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
     QApplication::clipboard()->setMimeData(mimeData);
@@ -663,7 +657,7 @@ void DolphinView::setShowPreview(bool show)
     props.setShowPreview(show);
 
     m_showPreview = show;
-    m_iconManager->setShowPreview(show);
+    m_previewGenerator->setShowPreview(show);
     
     const int oldZoomLevel = m_controller->zoomLevel();
     emit showPreviewChanged();
@@ -741,7 +735,6 @@ void DolphinView::toggleAdditionalInfo(QAction* action)
     }
 }
 
-
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);
@@ -1114,7 +1107,7 @@ void DolphinView::applyViewProperties(const KUrl& url)
     const bool showPreview = props.showPreview();
     if (showPreview != m_showPreview) {
         m_showPreview = showPreview;
-        m_iconManager->setShowPreview(showPreview);
+        m_previewGenerator->setShowPreview(showPreview);
         
         const int oldZoomLevel = m_controller->zoomLevel();
         emit showPreviewChanged();
@@ -1155,6 +1148,20 @@ void DolphinView::createView()
     Q_ASSERT(view != 0);
     view->installEventFilter(this);
 
+    if (m_mode != ColumnView) {
+        // Give the view the ability to auto-expand its directories on hovering
+        // (the column view takes care about this itself). If the details view
+        // uses expandable folders, the auto-expanding should be used always.
+        DolphinSettings& settings = DolphinSettings::instance();
+        const bool enabled = settings.generalSettings()->autoExpandFolders() ||
+                            ((m_detailsView != 0) && settings.detailsModeSettings()->expandableFolders());
+
+        FolderExpander* folderExpander = new FolderExpander(view, m_proxyModel);
+        folderExpander->setEnabled(enabled);
+        connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)),
+                m_controller, SLOT(triggerItem(const QModelIndex&)));
+    }
+
     m_controller->setItemView(view);
 
     m_fileItemDelegate = new KFileItemDelegate(view);
@@ -1173,8 +1180,8 @@ void DolphinView::createView()
 
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-    m_iconManager = new IconManager(view, m_proxyModel);
-    m_iconManager->setShowPreview(m_showPreview);
+    m_previewGenerator = new KFilePreviewGenerator(view, m_proxyModel);
+    m_previewGenerator->setShowPreview(m_showPreview);
 
     if (DolphinSettings::instance().generalSettings()->showToolTips()) {
         m_toolTipManager = new ToolTipManager(view, m_proxyModel);
@@ -1208,7 +1215,7 @@ void DolphinView::deleteView()
         m_detailsView = 0;
         m_columnView = 0;
         m_fileItemDelegate = 0;
-        m_iconManager = 0;
+        m_previewGenerator = 0;
         m_toolTipManager = 0;
     }
 }
@@ -1260,11 +1267,20 @@ void DolphinView::pasteToUrl(const KUrl& url)
 
 void DolphinView::updateZoomLevel(int oldZoomLevel)
 {       
-    const int newZoomLevel = DolphinController::zoomLevelForIconSize(itemView()->iconSize());
+    const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(itemView()->iconSize());
     if (oldZoomLevel != newZoomLevel) {
         m_controller->setZoomLevel(newZoomLevel);
         emit zoomLevelChanged(newZoomLevel);
     }
 }
 
+KUrl::List DolphinView::simplifiedSelectedUrls() const
+{
+    KUrl::List list = selectedUrls();
+    if ((m_detailsView != 0) && m_detailsView->itemsExpandable()) {
+        list = KonqOperations::simplifiedUrlList(list);
+    }
+    return list;
+}
+
 #include "dolphinview.moc"