Restore the "Edit->Selection" menu from Konqueror 3 for file

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 19e01cb900499aee715906dfdaf06518dd4cc8aa..e057c950acd6d83ce4ccd2347ceb38484e0d5b47 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006-2009 by Peter Penz <peter.penz@gmx.at>             *

  *   Copyright (C) 2006 by Gregor Kališnik <gregor@podnapisi.net>          *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   Copyright (C) 2006 by Gregor Kališnik <gregor@podnapisi.net>          *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -60,12 +60,11 @@
 #include "dolphiniconsview.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "dolphiniconsview.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"

-#include "folderexpander.h"

 #include "renamedialog.h"
 #include "settings/dolphinsettings.h"
 #include "renamedialog.h"
 #include "settings/dolphinsettings.h"

-#include "versioncontrolobserver.h"

 #include "viewproperties.h"
 #include "zoomlevelinfo.h"
 #include "viewproperties.h"
 #include "zoomlevelinfo.h"

+#include "dolphindetailsviewexpander.h"

 
 /**
  * Helper function for sorting items with qSort() in
 
 /**
  * Helper function for sorting items with qSort() in


@@ -94,13 +93,12 @@ DolphinView::DolphinView(QWidget* parent,
     m_viewAccessor(proxyModel),
     m_selectionModel(0),
     m_selectionChangedTimer(0),
     m_viewAccessor(proxyModel),
     m_selectionModel(0),
     m_selectionChangedTimer(0),

-    m_versionControlObserver(0),

     m_rootUrl(),
     m_activeItemUrl(),
     m_rootUrl(),
     m_activeItemUrl(),

+    m_restoredContentsPosition(),

     m_createdItemUrl(),
     m_selectedItems(),
     m_createdItemUrl(),
     m_selectedItems(),

-    m_newFileNames(),
-    m_expandedDragSource(0)
+    m_newFileNames()

 {
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
 {
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);


@@ -138,8 +136,8 @@ DolphinView::DolphinView(QWidget* parent,
             this, SLOT(clearHoverInformation()));
 
     KDirLister* dirLister = m_viewAccessor.dirLister();
             this, SLOT(clearHoverInformation()));
 
     KDirLister* dirLister = m_viewAccessor.dirLister();

-    connect(dirLister, SIGNAL(redirection(KUrl, KUrl)),
-            this, SIGNAL(redirection(KUrl, KUrl)));
+    connect(dirLister, SIGNAL(redirection(KUrl,KUrl)),
+            this, SLOT(slotRedirection(KUrl,KUrl)));

     connect(dirLister, SIGNAL(completed()),
             this, SLOT(slotDirListerCompleted()));
     connect(dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
     connect(dirLister, SIGNAL(completed()),
             this, SLOT(slotDirListerCompleted()));
     connect(dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),


@@ -151,14 +149,18 @@ DolphinView::DolphinView(QWidget* parent,
     connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
             this, SLOT(observeCreatedItem(const KUrl&)));
 
     connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
             this, SLOT(observeCreatedItem(const KUrl&)));
 

+    m_selectionChangedTimer = new QTimer(this);
+    m_selectionChangedTimer->setSingleShot(true);
+    m_selectionChangedTimer->setInterval(300);
+    connect(m_selectionChangedTimer, SIGNAL(timeout()),
+            this, SLOT(emitSelectionChangedSignal()));
+

     applyViewProperties();
     m_topLayout->addWidget(m_viewAccessor.itemView());
 }
 
 DolphinView::~DolphinView()
 {
     applyViewProperties();
     m_topLayout->addWidget(m_viewAccessor.itemView());
 }
 
 DolphinView::~DolphinView()
 {

-    delete m_expandedDragSource;
-    m_expandedDragSource = 0;

 }
 
 const KUrl& DolphinView::url() const
 }
 
 const KUrl& DolphinView::url() const


@@ -283,42 +285,10 @@ bool DolphinView::supportsCategorizedSorting() const
     return m_viewAccessor.supportsCategorizedSorting();
 }
 
     return m_viewAccessor.supportsCategorizedSorting();
 }
 

-void DolphinView::selectAll()
-{
-    QAbstractItemView* view = m_viewAccessor.itemView();
-    // TODO: there seems to be a bug in QAbstractItemView::selectAll(); if
-    // the Ctrl-key is pressed (e. g. for Ctrl+A), selectAll() inverts the
-    // selection instead of selecting all items. This is bypassed for KDE 4.0
-    // by invoking clearSelection() first.
-    view->clearSelection();
-    view->selectAll();
-}
-
-void DolphinView::invertSelection()
-{
-    QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel();
-    const QAbstractItemModel* itemModel = selectionModel->model();
-
-    const QModelIndex topLeft = itemModel->index(0, 0);
-    const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
-                                                     itemModel->columnCount() - 1);
-
-    const QItemSelection selection(topLeft, bottomRight);
-    selectionModel->select(selection, QItemSelectionModel::Toggle);
-}
-

 bool DolphinView::hasSelection() const
 {
 bool DolphinView::hasSelection() const
 {

-    return m_viewAccessor.itemView()->selectionModel()->hasSelection();
-}
-
-void DolphinView::clearSelection()
-{
-    QItemSelectionModel* selModel = m_viewAccessor.itemView()->selectionModel();
-    const QModelIndex currentIndex = selModel->currentIndex();
-    selModel->setCurrentIndex(currentIndex, QItemSelectionModel::Current |
-                                            QItemSelectionModel::Clear);
-    m_selectedItems.clear();
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    return view && view->selectionModel()->hasSelection();

 }
 
 KFileItemList DolphinView::selectedItems() const
 }
 
 KFileItemList DolphinView::selectedItems() const


@@ -358,19 +328,37 @@ int DolphinView::selectedItemsCount() const
     return m_viewAccessor.itemView()->selectionModel()->selectedIndexes().count();
 }
 
     return m_viewAccessor.itemView()->selectionModel()->selectedIndexes().count();
 }
 

+QItemSelectionModel* DolphinView::selectionModel() const
+{
+    return m_viewAccessor.itemView()->selectionModel();
+}
+

 void DolphinView::setContentsPosition(int x, int y)
 {
     QAbstractItemView* view = m_viewAccessor.itemView();
 void DolphinView::setContentsPosition(int x, int y)
 {
     QAbstractItemView* view = m_viewAccessor.itemView();

+    Q_ASSERT(view != 0);

     view->horizontalScrollBar()->setValue(x);
     view->verticalScrollBar()->setValue(y);
 
     m_loadingDirectory = false;
 }
 
     view->horizontalScrollBar()->setValue(x);
     view->verticalScrollBar()->setValue(y);
 
     m_loadingDirectory = false;
 }
 

+void DolphinView::setRestoredContentsPosition(const QPoint& pos)
+{
+    // TODO: This function is called by DolphinViewContainer.
+    // If it makes use of DolphinView::restoreState(...) to restore the
+    // view state in KDE 4.5, this function can be removed.
+    m_restoredContentsPosition = pos;
+}
+

 QPoint DolphinView::contentsPosition() const
 {
 QPoint DolphinView::contentsPosition() const
 {

-    const int x = m_viewAccessor.itemView()->horizontalScrollBar()->value();
-    const int y = m_viewAccessor.itemView()->verticalScrollBar()->value();
+    // TODO: If DolphinViewContainer uses DolphinView::saveState(...) to save the
+    // view state in KDE 4.5, this code can be moved to DolphinView::saveState.
+    QAbstractItemView* view = m_viewAccessor.itemView();
+    Q_ASSERT(view != 0);
+    const int x = view->horizontalScrollBar()->value();
+    const int y = view->verticalScrollBar()->value();

     return QPoint(x, y);
 }
 
     return QPoint(x, y);
 }
 


@@ -570,9 +558,7 @@ QString DolphinView::statusBarText() const
 
 QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const
 {
 
 QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const
 {

-    return items.isEmpty()
-           ? m_versionControlObserver->contextMenuActions(url().path(KUrl::AddTrailingSlash))
-           : m_versionControlObserver->contextMenuActions(items);
+    return m_controller->versionControlActions(items);

 }
 
 void DolphinView::setUrl(const KUrl& url)
 }
 
 void DolphinView::setUrl(const KUrl& url)


@@ -581,6 +567,39 @@ void DolphinView::setUrl(const KUrl& url)
     updateView(url, KUrl());
 }
 
     updateView(url, KUrl());
 }
 

+void DolphinView::selectAll()
+{
+    QAbstractItemView* view = m_viewAccessor.itemView();
+    // TODO: there seems to be a bug in QAbstractItemView::selectAll(); if
+    // the Ctrl-key is pressed (e. g. for Ctrl+A), selectAll() inverts the
+    // selection instead of selecting all items. This is bypassed for KDE 4.0
+    // by invoking clearSelection() first.
+    view->clearSelection();
+    view->selectAll();
+}
+
+void DolphinView::invertSelection()
+{
+    QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel();
+    const QAbstractItemModel* itemModel = selectionModel->model();
+
+    const QModelIndex topLeft = itemModel->index(0, 0);
+    const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
+                                                     itemModel->columnCount() - 1);
+
+    const QItemSelection selection(topLeft, bottomRight);
+    selectionModel->select(selection, QItemSelectionModel::Toggle);
+}
+
+void DolphinView::clearSelection()
+{
+    QItemSelectionModel* selModel = m_viewAccessor.itemView()->selectionModel();
+    const QModelIndex currentIndex = selModel->currentIndex();
+    selModel->setCurrentIndex(currentIndex, QItemSelectionModel::Current |
+                                            QItemSelectionModel::Clear);
+    m_selectedItems.clear();
+}
+

 void DolphinView::changeSelection(const KFileItemList& selection)
 {
     clearSelection();
 void DolphinView::changeSelection(const KFileItemList& selection)
 {
     clearSelection();


@@ -626,7 +645,7 @@ void DolphinView::renameSelectedItems()
             return;
         }
         delete dialog;
             return;
         }
         delete dialog;

-        
+

         // the selection would be invalid after renaming the items, so just clear
         // it before
         clearSelection();
         // the selection would be invalid after renaming the items, so just clear
         // it before
         clearSelection();


@@ -753,8 +772,6 @@ void DolphinView::setShowPreview(bool show)
     // As the view does not emit a signal when the icon size has been changed,
     // the used zoom level of the controller must be adjusted manually:
     updateZoomLevel(oldZoomLevel);
     // As the view does not emit a signal when the icon size has been changed,
     // the used zoom level of the controller must be adjusted manually:
     updateZoomLevel(oldZoomLevel);

-
-    loadDirectory(viewPropsUrl);

 }
 
 void DolphinView::setShowHiddenFiles(bool show)
 }
 
 void DolphinView::setShowHiddenFiles(bool show)


@@ -769,8 +786,6 @@ void DolphinView::setShowHiddenFiles(bool show)
 
     m_viewAccessor.dirLister()->setShowingDotFiles(show);
     emit showHiddenFilesChanged();
 
     m_viewAccessor.dirLister()->setShowingDotFiles(show);
     emit showHiddenFilesChanged();

-
-    loadDirectory(viewPropsUrl);

 }
 
 void DolphinView::setCategorizedSorting(bool categorized)
 }
 
 void DolphinView::setCategorizedSorting(bool categorized)


@@ -833,20 +848,6 @@ void DolphinView::mouseReleaseEvent(QMouseEvent* event)
     setActive(true);
 }
 
     setActive(true);
 }
 

-void DolphinView::wheelEvent(QWheelEvent* event)
-{
-    if (event->modifiers() & Qt::ControlModifier) {
-        const int delta = event->delta();
-        const int level = zoomLevel();
-        if (delta > 0) {
-            setZoomLevel(level + 1);
-        } else if (delta < 0) {
-            setZoomLevel(level - 1);
-        }
-        event->accept();
-    }
-}
-

 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
     switch (event->type()) {
 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
     switch (event->type()) {


@@ -856,18 +857,6 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
         }
         break;
 
         }
         break;
 

-    case QEvent::MouseButtonPress:
-        if ((watched == m_viewAccessor.itemView()->viewport()) && (m_expandedDragSource != 0)) {
-            // Listening to a mousebutton press event to delete expanded views is a
-            // workaround, as it seems impossible for the FolderExpander to know when
-            // a dragging outside a view has been finished. However it works quite well:
-            // A mousebutton press event indicates that a drag operation must be
-            // finished already.
-            m_expandedDragSource->deleteLater();
-            m_expandedDragSource = 0;
-        }
-        break;
-

     case QEvent::DragEnter:
         if (watched == m_viewAccessor.itemView()->viewport()) {
             setActive(true);
     case QEvent::DragEnter:
         if (watched == m_viewAccessor.itemView()->viewport()) {
             setActive(true);


@@ -884,6 +873,24 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
         }
         break;
 
         }
         break;
 

+    case QEvent::Wheel:
+        if (watched == m_viewAccessor.itemView()->viewport()) {
+            // Ctrl+wheel events should cause icon zooming, but not if the left mouse button is pressed
+            // (the user is probably trying to scroll during a selection in that case)
+            QWheelEvent* wheelEvent = static_cast<QWheelEvent*>(event);
+            if (wheelEvent->modifiers() & Qt::ControlModifier && !(wheelEvent->buttons() & Qt::LeftButton)) {
+                const int delta = wheelEvent->delta();
+                const int level = zoomLevel();
+                if (delta > 0) {
+                    setZoomLevel(level + 1);
+                } else if (delta < 0) {
+                    setZoomLevel(level - 1);
+                }
+                return true;
+            }
+        }
+        break;
+        

     default:
         break;
     }
     default:
         break;
     }


@@ -1059,6 +1066,8 @@ bool DolphinView::isTabsForFilesEnabled() const
 
 void DolphinView::activateItem(const KUrl& url)
 {
 
 void DolphinView::activateItem(const KUrl& url)
 {

+    // TODO: If DolphinViewContainer uses DolphinView::restoreState(...) to restore the
+    // view state in KDE 4.5, this function can be removed.

     m_activeItemUrl = url;
 }
 
     m_activeItemUrl = url;
 }
 


@@ -1067,26 +1076,53 @@ bool DolphinView::itemsExpandable() const
     return m_viewAccessor.itemsExpandable();
 }
 
     return m_viewAccessor.itemsExpandable();
 }
 

-void DolphinView::deleteWhenNotDragSource(QAbstractItemView *view)
+void DolphinView::restoreState(QDataStream &stream)

 {
 {

-    if (view == 0)
-        return;
+     // current item
+    stream >> m_activeItemUrl;

 
 

-    if (DragAndDropHelper::instance().isDragSource(view)) {
-        // We must store for later deletion.
-        if (m_expandedDragSource != 0) {
-            // The old stored view is obviously not the drag source anymore.
-            m_expandedDragSource->deleteLater();
-            m_expandedDragSource = 0;
-        }
-        view->hide();
-        m_expandedDragSource = view;
+    // view position
+    stream >> m_restoredContentsPosition;
+
+    // expanded folders (only relevant for the details view - will be ignored by the view in other view modes)
+    QSet<KUrl> urlsToExpand;
+    stream >> urlsToExpand;
+    const DolphinDetailsViewExpander* expander = m_viewAccessor.setExpandedUrls(urlsToExpand);
+
+    if (expander) {
+        m_expanderActive = true;
+        connect (expander, SIGNAL(completed()), this, SLOT(slotLoadingCompleted()));

     }
     else {
     }
     else {

-        view->deleteLater();
+        m_expanderActive = false;

     }
 }
 
     }
 }
 

+void DolphinView::saveState(QDataStream &stream)
+{
+    // current item
+    KFileItem currentItem;
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+
+    if(view) {
+        const QModelIndex proxyIndex = view->currentIndex();
+        const QModelIndex dirModelIndex = m_viewAccessor.proxyModel()->mapToSource(proxyIndex);
+        currentItem = m_viewAccessor.dirModel()->itemForIndex(dirModelIndex);
+    }
+
+    KUrl currentUrl;
+    if (!currentItem.isNull())
+        currentUrl = currentItem.url();
+
+    stream << currentUrl;
+
+    // view position
+    stream << contentsPosition();
+
+    // expanded folders (only relevant for the details view - the set will be empty in other view modes)
+    stream << m_viewAccessor.expandedUrls();
+}
+

 void DolphinView::observeCreatedItem(const KUrl& url)
 {
     m_createdItemUrl = url;
 void DolphinView::observeCreatedItem(const KUrl& url)
 {
     m_createdItemUrl = url;


@@ -1115,6 +1151,11 @@ void DolphinView::restoreSelection()
 
 void DolphinView::emitContentsMoved()
 {
 
 void DolphinView::emitContentsMoved()
 {

+    // TODO: If DolphinViewContainer uses DolphinView::saveState(...) to save the
+    // view state in KDE 4.5, the contentsMoved signal might not be needed anymore,
+    // depending on how the implementation is done.
+    // In that case, the code in contentsPosition() can be moved to saveState().
+

     // only emit the contents moved signal if no directory loading is ongoing
     // (this would reset the contents position always to (0, 0))
     if (!m_loadingDirectory) {
     // only emit the contents moved signal if no directory loading is ongoing
     // (this would reset the contents position always to (0, 0))
     if (!m_loadingDirectory) {


@@ -1150,19 +1191,8 @@ void DolphinView::slotRequestUrlChange(const KUrl& url)
 
 void DolphinView::slotDirListerCompleted()
 {
 
 void DolphinView::slotDirListerCompleted()
 {

-    if (!m_activeItemUrl.isEmpty()) {
-        // assure that the current item remains visible
-        const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_activeItemUrl);
-        if (dirIndex.isValid()) {
-            const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
-            QAbstractItemView* view = m_viewAccessor.itemView();
-            const bool clearSelection = !hasSelection();
-            view->setCurrentIndex(proxyIndex);
-            if (clearSelection) {
-                view->clearSelection();
-            }
-            m_activeItemUrl.clear();
-        }
+    if (!m_expanderActive) {
+        slotLoadingCompleted();

     }
 
     if (!m_newFileNames.isEmpty()) {
     }
 
     if (!m_newFileNames.isEmpty()) {


@@ -1184,6 +1214,31 @@ void DolphinView::slotDirListerCompleted()
     }
 }
 
     }
 }
 

+void DolphinView::slotLoadingCompleted()
+{
+    m_expanderActive = false;
+    m_loadingDirectory = false; 
+
+    if (!m_activeItemUrl.isEmpty()) {
+        // assure that the current item remains visible
+        const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_activeItemUrl);
+        if (dirIndex.isValid()) {
+            const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+            QAbstractItemView* view = m_viewAccessor.itemView();
+            const bool clearSelection = !hasSelection();
+            view->setCurrentIndex(proxyIndex);
+            if (clearSelection) {
+                view->clearSelection();
+            }
+            m_activeItemUrl.clear();
+        }
+    }
+
+    // Restore the contents position. This has to be done using a Qt::QueuedConnection
+    // because the view might not be in its final state yet.
+    QMetaObject::invokeMethod(this, "restoreContentsPosition", Qt::QueuedConnection);
+}
+

 void DolphinView::slotRefreshItems()
 {
     if (m_assureVisibleCurrentIndex) {
 void DolphinView::slotRefreshItems()
 {
     if (m_assureVisibleCurrentIndex) {


@@ -1205,13 +1260,13 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
     }
 
     m_loadingDirectory = true;
     }
 
     m_loadingDirectory = true;

+    m_expanderActive = false;

 
     if (reload) {
         m_selectedItems = selectedItems();
         connect(m_viewAccessor.dirLister(), SIGNAL(completed()), this, SLOT(restoreSelection()));
     }
 
 
     if (reload) {
         m_selectedItems = selectedItems();
         connect(m_viewAccessor.dirLister(), SIGNAL(completed()), this, SLOT(restoreSelection()));
     }
 

-    m_viewAccessor.dirLister()->stop();

     m_viewAccessor.dirLister()->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
 }
 
     m_viewAccessor.dirLister()->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
 }
 


@@ -1237,7 +1292,7 @@ void DolphinView::applyViewProperties()
         createView();
     }
     Q_ASSERT(m_viewAccessor.itemView() != 0);
         createView();
     }
     Q_ASSERT(m_viewAccessor.itemView() != 0);

-    Q_ASSERT(m_fileItemDelegate != 0);
+    Q_ASSERT(m_viewAccessor.itemDelegate() != 0);

 
     const bool showHiddenFiles = props.showHiddenFiles();
     if (showHiddenFiles != m_viewAccessor.dirLister()->showingDotFiles()) {
 
     const bool showHiddenFiles = props.showHiddenFiles();
     if (showHiddenFiles != m_viewAccessor.dirLister()->showingDotFiles()) {


@@ -1299,6 +1354,7 @@ void DolphinView::applyViewProperties()
 void DolphinView::createView()
 {
     deleteView();
 void DolphinView::createView()
 {
     deleteView();

+

     Q_ASSERT(m_viewAccessor.itemView() == 0);
     m_viewAccessor.createView(this, m_controller, m_mode);
 
     Q_ASSERT(m_viewAccessor.itemView() == 0);
     m_viewAccessor.createView(this, m_controller, m_mode);
 


@@ -1306,33 +1362,10 @@ void DolphinView::createView()
     Q_ASSERT(view != 0);
     view->installEventFilter(this);
     view->viewport()->installEventFilter(this);
     Q_ASSERT(view != 0);
     view->installEventFilter(this);
     view->viewport()->installEventFilter(this);

-    setFocusProxy(view);
-
-    /* TODO: enable folder expanding again later
-
-    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.
-        FolderExpander* folderExpander = new FolderExpander(view, m_viewAccessor.proxyModel());
-        folderExpander->setEnabled(m_viewAccessor.hasExpandableFolders());
-        connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)),
-                m_controller, SLOT(triggerItem(const QModelIndex&)));
-
-    }
-    else {
-        // Listen out for requests to delete the current column.
-        connect(m_viewAccessor.columnsContainer(), SIGNAL(requestColumnDeletion(QAbstractItemView*)),
-                this, SLOT(deleteWhenNotDragSource(QAbstractItemView*)));
-    }*/

 
     m_controller->setItemView(view);
 
     m_controller->setItemView(view);

-
-    m_selectionChangedTimer = new QTimer(this);
-    m_selectionChangedTimer->setSingleShot(true);
-    m_selectionChangedTimer->setInterval(300);
-    connect(m_selectionChangedTimer, SIGNAL(timeout()),
-            this, SLOT(emitSelectionChangedSignal()));
+    connect(m_controller, SIGNAL(selectionChanged()),
+            this, SLOT(emitDelayedSelectionChangedSignal()));

 
     // When changing the view mode, the selection is lost due to reinstantiating
     // a new item view with a custom selection model. Pass the ownership of the
 
     // When changing the view mode, the selection is lost due to reinstantiating
     // a new item view with a custom selection model. Pass the ownership of the


@@ -1344,23 +1377,12 @@ void DolphinView::createView()
     }
     m_selectionModel->setParent(this);
 
     }
     m_selectionModel->setParent(this);
 

-    view->setSelectionMode(QAbstractItemView::ExtendedSelection);
-
-    m_versionControlObserver = new VersionControlObserver(view);
-    connect(m_versionControlObserver, SIGNAL(infoMessage(const QString&)),
-            this, SIGNAL(infoMessage(const QString&)));
-    connect(m_versionControlObserver, SIGNAL(errorMessage(const QString&)),
-            this, SIGNAL(errorMessage(const QString&)));
-    connect(m_versionControlObserver, SIGNAL(operationCompletedMessage(const QString&)),
-            this, SIGNAL(operationCompletedMessage(const QString&)));
-
-    connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
-            this, SLOT(emitDelayedSelectionChangedSignal()));

     connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(emitContentsMoved()));
     connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(emitContentsMoved()));
 
     connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(emitContentsMoved()));
     connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(emitContentsMoved()));
 

+    setFocusProxy(m_viewAccessor.layoutTarget());

     m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
 }
 
     m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
 }
 


@@ -1378,13 +1400,14 @@ void DolphinView::deleteView()
         m_topLayout->removeWidget(view);
         view->close();
 
         m_topLayout->removeWidget(view);
         view->close();
 

+        // disconnect all signal/slots

         disconnect(view);
         m_controller->disconnect(view);
         view->disconnect();
         disconnect(view);
         m_controller->disconnect(view);
         view->disconnect();

-
-        // TODO: move this code into ViewAccessor::deleteView()
-        deleteWhenNotDragSource(view);
-        view = 0;
+        disconnect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
+                   this, SLOT(emitContentsMoved()));
+        disconnect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+                   this, SLOT(emitContentsMoved()));

 
         m_viewAccessor.deleteView();
     }
 
         m_viewAccessor.deleteView();
     }


@@ -1434,8 +1457,15 @@ DolphinView::ViewAccessor::ViewAccessor(DolphinSortFilterProxyModel* proxyModel)
     m_iconsView(0),
     m_detailsView(0),
     m_columnsContainer(0),
     m_iconsView(0),
     m_detailsView(0),
     m_columnsContainer(0),

-    m_proxyModel(proxyModel)
+    m_proxyModel(proxyModel),
+    m_dragSource(0)
+{
+}
+
+DolphinView::ViewAccessor::~ViewAccessor()

 {
 {

+    delete m_dragSource;
+    m_dragSource = 0;

 }
 
 void DolphinView::ViewAccessor::createView(QWidget* parent,
 }
 
 void DolphinView::ViewAccessor::createView(QWidget* parent,


@@ -1464,13 +1494,31 @@ void DolphinView::ViewAccessor::createView(QWidget* parent,
 
 void DolphinView::ViewAccessor::deleteView()
 {
 
 void DolphinView::ViewAccessor::deleteView()
 {

-    // TODO: Move the deleteWhenNotDragSource() code into the view
-    // accessor, so that creating and deleting is fully done by
-    // the view accessor.
+    QAbstractItemView* view = itemView();
+    if (view != 0) {
+        if (DragAndDropHelper::instance().isDragSource(view)) {
+            // The view is a drag source (the feature "Open folders
+            // during drag operations" is used). Deleting the view
+            // during an ongoing drag operation is not allowed, so
+            // this will postponed.
+            if (m_dragSource != 0) {
+                // the old stored view is obviously not the drag source anymore
+                m_dragSource->deleteLater();
+                m_dragSource = 0;
+            }
+            view->hide();
+            m_dragSource = view;
+        } else {
+            view->deleteLater();
+        }
+    }
+

     m_iconsView = 0;
     m_detailsView = 0;
 
     m_iconsView = 0;
     m_detailsView = 0;
 

-    m_columnsContainer->deleteLater();
+    if (m_columnsContainer != 0) {
+        m_columnsContainer->deleteLater();
+    }

     m_columnsContainer = 0;
 }
 
     m_columnsContainer = 0;
 }
 


@@ -1480,6 +1528,11 @@ void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url)
     if (m_columnsContainer != 0) {
         m_columnsContainer->showColumn(url);
     }
     if (m_columnsContainer != 0) {
         m_columnsContainer->showColumn(url);
     }

+
+    if(!m_detailsViewExpander.isNull()) {
+        // Stop expanding items in the current folder
+        m_detailsViewExpander->stop();
+    }

 }
 
 QAbstractItemView* DolphinView::ViewAccessor::itemView() const
 }
 
 QAbstractItemView* DolphinView::ViewAccessor::itemView() const


@@ -1522,16 +1575,31 @@ bool DolphinView::ViewAccessor::supportsCategorizedSorting() const
     return m_iconsView != 0;
 }
 
     return m_iconsView != 0;
 }
 

-bool DolphinView::ViewAccessor::hasExpandableFolders() const
+bool DolphinView::ViewAccessor::itemsExpandable() const

 {
 {

-    const DolphinSettings& settings = DolphinSettings::instance();
-    return settings.generalSettings()->autoExpandFolders() ||
-           ((m_detailsView != 0) && settings.detailsModeSettings()->expandableFolders());
+    return (m_detailsView != 0) && m_detailsView->itemsExpandable();

 }
 
 }
 

-bool DolphinView::ViewAccessor::itemsExpandable() const
+
+QSet<KUrl> DolphinView::ViewAccessor::expandedUrls() const

 {
 {

-    return (m_detailsView != 0) && m_detailsView->itemsExpandable();
+    if(m_detailsView != 0) {
+        return m_detailsView->expandedUrls();
+    }
+    else {
+        return QSet<KUrl>();
+    }
+}
+
+const DolphinDetailsViewExpander* DolphinView::ViewAccessor::setExpandedUrls(const QSet<KUrl>& urlsToExpand)
+{
+    if((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) {
+        m_detailsViewExpander = new DolphinDetailsViewExpander(m_detailsView, urlsToExpand);
+        return m_detailsViewExpander;
+    }
+    else {
+        return 0;
+    }

 }
 
 bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const
 }
 
 bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const


@@ -1541,7 +1609,6 @@ bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const
     return m_detailsView != 0;
 }
 
     return m_detailsView != 0;
 }
 

-

 DolphinModel* DolphinView::ViewAccessor::dirModel() const
 {
     return static_cast<DolphinModel*>(proxyModel()->sourceModel());
 DolphinModel* DolphinView::ViewAccessor::dirModel() const
 {
     return static_cast<DolphinModel*>(proxyModel()->sourceModel());


@@ -1560,4 +1627,18 @@ KDirLister* DolphinView::ViewAccessor::dirLister() const
     return dirModel()->dirLister();
 }
 
     return dirModel()->dirLister();
 }
 

+void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
+{
+    emit redirection(oldUrl, newUrl);
+    m_controller->redirectToUrl(newUrl); // #186947
+}
+
+void DolphinView::restoreContentsPosition()
+{
+    if (!m_restoredContentsPosition.isNull()) {
+        setContentsPosition(m_restoredContentsPosition.x(), m_restoredContentsPosition.y());
+        m_restoredContentsPosition = QPoint();
+    }
+}
+

 #include "dolphinview.moc"
 #include "dolphinview.moc"