fixed issue that the video preview size was wrong during resizing the information...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 0bd24ecb3a5a73f8f291efd5e9a2397864113984..f2f23d27301da839a03cb323993ccf2cfaba164d 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -52,17 +52,18 @@
 #include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
 #include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"

+#include "dolphindetailsview.h"

 #include "dolphinfileitemdelegate.h"
 #include "dolphinfileitemdelegate.h"

+#include "dolphinnewmenuobserver.h"

 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinsortfilterproxymodel.h"

-#include "dolphindetailsview.h"

 #include "dolphin_detailsmodesettings.h"
 #include "dolphiniconsview.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphiniconsview.h"

-#include "dolphinsettings.h"

 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "renamedialog.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "renamedialog.h"

-#include "tooltipmanager.h"
+#include "tooltips/tooltipmanager.h"
+#include "settings/dolphinsettings.h"

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


@@ -88,6 +89,7 @@ DolphinView::DolphinView(QWidget* parent,
     m_tabsForFiles(false),
     m_isContextMenuOpen(false),
     m_ignoreViewProperties(false),
     m_tabsForFiles(false),
     m_isContextMenuOpen(false),
     m_ignoreViewProperties(false),

+    m_assureVisibleCurrentIndex(false),

     m_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),
     m_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),


@@ -103,7 +105,9 @@ DolphinView::DolphinView(QWidget* parent,
     m_toolTipManager(0),
     m_rootUrl(),
     m_currentItemUrl(),
     m_toolTipManager(0),
     m_rootUrl(),
     m_currentItemUrl(),

-    m_expandedViews()
+    m_createdItemUrl(),
+    m_selectedItems(),
+    m_expandedDragSource(0)

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


@@ -117,14 +121,16 @@ DolphinView::DolphinView(QWidget* parent,
     connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)),
             this, SLOT(slotRequestUrlChange(const KUrl&)));
 
     connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)),
             this, SLOT(slotRequestUrlChange(const KUrl&)));
 

-    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
-            this, SLOT(openContextMenu(const QPoint&)));
+    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&, const QList<QAction*>&)),
+            this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&)));

     connect(m_controller, SIGNAL(urlsDropped(const KFileItem&, const KUrl&, QDropEvent*)),
             this, SLOT(dropUrls(const KFileItem&, const KUrl&, QDropEvent*)));
     connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)),
             this, SLOT(updateSorting(DolphinView::Sorting)));
     connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(updateSortOrder(Qt::SortOrder)));
     connect(m_controller, SIGNAL(urlsDropped(const KFileItem&, const KUrl&, QDropEvent*)),
             this, SLOT(dropUrls(const KFileItem&, const KUrl&, QDropEvent*)));
     connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)),
             this, SLOT(updateSorting(DolphinView::Sorting)));
     connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(updateSortOrder(Qt::SortOrder)));

+    connect(m_controller, SIGNAL(sortFoldersFirstChanged(bool)),
+            this, SLOT(updateSortFoldersFirst(bool)));

     connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
             this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
     connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)),
     connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
             this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
     connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)),


@@ -142,6 +148,14 @@ DolphinView::DolphinView(QWidget* parent,
             this, SIGNAL(redirection(KUrl, KUrl)));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(restoreCurrentItem()));
             this, SIGNAL(redirection(KUrl, KUrl)));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(restoreCurrentItem()));

+    connect(m_dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
+            this, SLOT(slotRefreshItems()));
+
+    // When a new item has been created by the "Create New..." menu, the item should
+    // get selected and it must be assured that the item will get visible. As the
+    // creation is done asynchronously, several signals must be checked:
+    connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
+            this, SLOT(observeCreatedItem(const KUrl&)));

 
     applyViewProperties(url);
     m_topLayout->addWidget(itemView());
 
     applyViewProperties(url);
     m_topLayout->addWidget(itemView());


@@ -149,7 +163,8 @@ DolphinView::DolphinView(QWidget* parent,
 
 DolphinView::~DolphinView()
 {
 
 DolphinView::~DolphinView()
 {

-    deleteExpandedViews();
+    delete m_expandedDragSource;
+    m_expandedDragSource = 0;

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


@@ -313,7 +328,10 @@ bool DolphinView::hasSelection() const
 
 void DolphinView::clearSelection()
 {
 
 void DolphinView::clearSelection()
 {

-    itemView()->selectionModel()->clear();
+    QItemSelectionModel* selModel = itemView()->selectionModel();
+    const QModelIndex currentIndex = selModel->currentIndex();
+    selModel->setCurrentIndex(currentIndex, QItemSelectionModel::Current |
+                                            QItemSelectionModel::Clear);

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


@@ -393,7 +411,7 @@ void DolphinView::setZoomLevel(int level)
 
     if (level != zoomLevel()) {
         m_controller->setZoomLevel(level);
 
     if (level != zoomLevel()) {
         m_controller->setZoomLevel(level);

-        m_previewGenerator->updatePreviews();
+        m_previewGenerator->updateIcons();

         emit zoomLevelChanged(level);
     }
 }
         emit zoomLevelChanged(level);
     }
 }


@@ -427,6 +445,18 @@ Qt::SortOrder DolphinView::sortOrder() const
     return m_proxyModel->sortOrder();
 }
 
     return m_proxyModel->sortOrder();
 }
 

+void DolphinView::setSortFoldersFirst(bool foldersFirst)
+{
+    if (sortFoldersFirst() != foldersFirst) {
+        updateSortFoldersFirst(foldersFirst);
+    }
+}
+
+bool DolphinView::sortFoldersFirst() const
+{
+    return m_proxyModel->sortFoldersFirst();
+}
+

 void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
 {
     const KUrl viewPropsUrl = viewPropertiesUrl();
 void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
 {
     const KUrl viewPropsUrl = viewPropertiesUrl();


@@ -593,15 +623,15 @@ void DolphinView::changeSelection(const KFileItemList& selection)
     }
     const KUrl& baseUrl = url();
     KUrl url;
     }
     const KUrl& baseUrl = url();
     KUrl url;

-    QItemSelection new_selection;
+    QItemSelection newSelection;

     foreach(const KFileItem& item, selection) {
         url = item.url().upUrl();
         if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
             QModelIndex index = m_proxyModel->mapFromSource(m_dolphinModel->indexForItem(item));
     foreach(const KFileItem& item, selection) {
         url = item.url().upUrl();
         if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
             QModelIndex index = m_proxyModel->mapFromSource(m_dolphinModel->indexForItem(item));

-            new_selection.select(index, index);
+            newSelection.select(index, index);

         }
     }
         }
     }

-    itemView()->selectionModel()->select(new_selection,
+    itemView()->selectionModel()->select(newSelection,

                                          QItemSelectionModel::ClearAndSelect
                                          | QItemSelectionModel::Current);
 }
                                          QItemSelectionModel::ClearAndSelect
                                          | QItemSelectionModel::Current);
 }


@@ -625,30 +655,31 @@ void DolphinView::renameSelectedItems()
         const QString newName = dialog.newName();
         if (newName.isEmpty()) {
             emit errorMessage(dialog.errorString());
         const QString newName = dialog.newName();
         if (newName.isEmpty()) {
             emit errorMessage(dialog.errorString());

-        } else {
-            // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
-            // as one operation instead of n rename operations like it is done now...
-            Q_ASSERT(newName.contains('#'));
-
-            // currently the items are sorted by the selection order, resort
-            // them by the file name
-            qSort(items.begin(), items.end(), lessThan);
-
-            // iterate through all selected items and rename them...
-            int index = 1;
-            foreach (const KFileItem& item, items) {
-                const KUrl& oldUrl = item.url();
-                QString number;
-                number.setNum(index++);
-
-                QString name = newName;
-                name.replace('#', number);
-
-                if (oldUrl.fileName() != name) {
-                    KUrl newUrl = oldUrl;
-                    newUrl.setFileName(name);
-                    KonqOperations::rename(this, oldUrl, newUrl);
-                }
+            return;
+        }
+
+        // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
+        // as one operation instead of n rename operations like it is done now...
+        Q_ASSERT(newName.contains('#'));
+
+        // currently the items are sorted by the selection order, resort
+        // them by the file name
+        qSort(items.begin(), items.end(), lessThan);
+
+        // iterate through all selected items and rename them...
+        int index = 1;
+        foreach (const KFileItem& item, items) {
+            const KUrl& oldUrl = item.url();
+            QString number;
+            number.setNum(index++);
+
+            QString name = newName;
+            name.replace('#', number);
+
+            if (oldUrl.fileName() != name) {
+                KUrl newUrl = oldUrl;
+                newUrl.setFileName(name);
+                KonqOperations::rename(this, oldUrl, newUrl);

             }
         }
     } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
             }
         }
     } else if (DolphinSettings::instance().generalSettings()->renameInline()) {


@@ -672,13 +703,18 @@ void DolphinView::renameSelectedItems()
         const QString& newName = dialog.newName();
         if (newName.isEmpty()) {
             emit errorMessage(dialog.errorString());
         const QString& newName = dialog.newName();
         if (newName.isEmpty()) {
             emit errorMessage(dialog.errorString());

-        } else {
-            const KUrl& oldUrl = items.first().url();
-            KUrl newUrl = oldUrl;
-            newUrl.setFileName(newName);
-            KonqOperations::rename(this, oldUrl, newUrl);
+            return;

         }
         }

+
+        const KUrl& oldUrl = items.first().url();
+        KUrl newUrl = oldUrl;
+        newUrl.setFileName(newName);
+        KonqOperations::rename(this, oldUrl, newUrl);

     }
     }

+
+    // assure that the current index remains visible when KDirLister
+    // will notify the view about changed items
+    m_assureVisibleCurrentIndex = true;

 }
 
 void DolphinView::trashSelectedItems()
 }
 
 void DolphinView::trashSelectedItems()


@@ -796,6 +832,11 @@ void DolphinView::toggleSortOrder()
     setSortOrder(order);
 }
 
     setSortOrder(order);
 }
 

+void DolphinView::toggleSortFoldersFirst()
+{
+    setSortFoldersFirst(!sortFoldersFirst());
+}
+

 void DolphinView::toggleAdditionalInfo(QAction* action)
 {
     const KFileItemDelegate::Information info =
 void DolphinView::toggleAdditionalInfo(QAction* action)
 {
     const KFileItemDelegate::Information info =


@@ -847,13 +888,14 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
         break;
 
     case QEvent::MouseButtonPress:
         break;
 
     case QEvent::MouseButtonPress:

-        if ((watched == itemView()->viewport()) && (m_expandedViews.count() > 0)) {
+        if ((watched == 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.
             // 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.

-            deleteExpandedViews();
+            m_expandedDragSource->deleteLater();
+            m_expandedDragSource = 0;

         }
         break;
 
         }
         break;
 


@@ -863,6 +905,20 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
         }
         break;
 
         }
         break;
 

+    case QEvent::KeyPress:
+        if (watched == itemView()) {
+            if (m_toolTipManager != 0) {
+                m_toolTipManager->hideTip();
+            }
+
+            // clear the selection when Escape has been pressed
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (keyEvent->key() == Qt::Key_Escape) {
+                clearSelection();
+            }
+        }
+        break;
+

     default:
         break;
     }
     default:
         break;
     }


@@ -900,7 +956,8 @@ void DolphinView::emitSelectionChangedSignal()
     emit selectionChanged(DolphinView::selectedItems());
 }
 
     emit selectionChanged(DolphinView::selectedItems());
 }
 

-void DolphinView::openContextMenu(const QPoint& pos)
+void DolphinView::openContextMenu(const QPoint& pos,
+                                  const QList<QAction*>& customActions)

 {
     KFileItem item;
     if (isColumnViewActive()) {
 {
     KFileItem item;
     if (isColumnViewActive()) {


@@ -918,7 +975,7 @@ void DolphinView::openContextMenu(const QPoint& pos)
     }
 
     m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192
     }
 
     m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192

-    emit requestContextMenu(item, url());
+    emit requestContextMenu(item, url(), customActions);

     m_isContextMenuOpen = false;
 }
 
     m_isContextMenuOpen = false;
 }
 


@@ -949,6 +1006,16 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
     emit sortOrderChanged(order);
 }
 

+void DolphinView::updateSortFoldersFirst(bool foldersFirst)
+{
+    ViewProperties props(viewPropertiesUrl());
+    props.setSortFoldersFirst(foldersFirst);
+
+    m_proxyModel->setSortFoldersFirst(foldersFirst);
+
+    emit sortFoldersFirstChanged(foldersFirst);
+}
+

 void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
 {
     ViewProperties props(viewPropertiesUrl());
 void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
 {
     ViewProperties props(viewPropertiesUrl());


@@ -1014,30 +1081,7 @@ void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
 
 QPair<bool, QString> DolphinView::pasteInfo() const
 {
 
 QPair<bool, QString> DolphinView::pasteInfo() const
 {

-    QPair<bool, QString> ret;
-    QClipboard* clipboard = QApplication::clipboard();
-    const QMimeData* mimeData = clipboard->mimeData();
-
-    KUrl::List urls = KUrl::List::fromMimeData(mimeData);
-    if (!urls.isEmpty()) {
-        // disable the paste action if no writing is supported
-        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url());
-        ret.first = KonqFileItemCapabilities(KFileItemList() << item).supportsWriting();
-
-        if (urls.count() == 1) {
-            const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, urls.first(), true);
-            ret.second = item.isDir() ? i18nc("@action:inmenu", "Paste One Folder") :
-                                        i18nc("@action:inmenu", "Paste One File");
-
-        } else {
-            ret.second = i18ncp("@action:inmenu", "Paste One Item", "Paste %1 Items", urls.count());
-        }
-    } else {
-        ret.first = false;
-        ret.second = i18nc("@action:inmenu", "Paste");
-    }
-
-    return ret;
+    return KonqOperations::pasteInfo(url());

 }
 
 void DolphinView::setTabsForFilesEnabled(bool tabsForFiles)
 }
 
 void DolphinView::setTabsForFilesEnabled(bool tabsForFiles)


@@ -1055,6 +1099,52 @@ bool DolphinView::itemsExpandable() const
     return (m_detailsView != 0) && m_detailsView->itemsExpandable();
 }
 
     return (m_detailsView != 0) && m_detailsView->itemsExpandable();
 }
 

+void DolphinView::deleteWhenNotDragSource(QAbstractItemView *view)
+{
+    if (view == 0)
+        return;
+
+    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;
+    }
+    else {
+        view->deleteLater();
+    }
+}
+
+void DolphinView::observeCreatedItem(const KUrl& url)
+{
+    m_createdItemUrl = url;
+    connect(m_dolphinModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+            this, SLOT(selectAndScrollToCreatedItem()));
+}
+
+void DolphinView::selectAndScrollToCreatedItem()
+{
+    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_createdItemUrl);
+    if (dirIndex.isValid()) {
+        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+        itemView()->setCurrentIndex(proxyIndex);
+    }
+
+    disconnect(m_dolphinModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+               this, SLOT(selectAndScrollToCreatedItem()));
+    m_createdItemUrl = KUrl();
+}
+
+void DolphinView::restoreSelection()
+{
+    disconnect(m_dirLister, SIGNAL(completed()), this, SLOT(restoreSelection()));
+    changeSelection(m_selectedItems);
+}
+

 void DolphinView::emitContentsMoved()
 {
     // only emit the contents moved signal if:
 void DolphinView::emitContentsMoved()
 {
     // only emit the contents moved signal if:


@@ -1095,26 +1185,27 @@ void DolphinView::slotRequestUrlChange(const KUrl& url)
 
 void DolphinView::restoreCurrentItem()
 {
 
 void DolphinView::restoreCurrentItem()
 {

-    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_currentItemUrl);
-    if (dirIndex.isValid()) {
-        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
-        QAbstractItemView* view = itemView();
-        const bool clearSelection = !hasSelection();
-        view->setCurrentIndex(proxyIndex);
-        if (clearSelection) {
-            view->clearSelection();
+    if (!m_currentItemUrl.isEmpty()) {
+        const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_currentItemUrl);
+        if (dirIndex.isValid()) {
+            const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+            QAbstractItemView* view = itemView();
+            const bool clearSelection = !hasSelection();
+            view->setCurrentIndex(proxyIndex);
+            if (clearSelection) {
+                view->clearSelection();
+            }

         }
         }

+        m_currentItemUrl.clear();

     }
 }
 
     }
 }
 

-void DolphinView::enterDir(const QModelIndex& index, QAbstractItemView* view)
+void DolphinView::slotRefreshItems()

 {
 {

-    // Deleting a view that is the root of a drag operation is not allowed, otherwise
-    // the dragging gets automatically cancelled by Qt. So before entering a new
-    // directory, the current view is remembered in m_expandedViews and deleted
-    // later when the drag operation has been finished (see DolphinView::eventFilter()).
-    m_expandedViews.append(view);
-    m_controller->triggerItem(index);
+    if (m_assureVisibleCurrentIndex) {
+        m_assureVisibleCurrentIndex = false;
+        itemView()->scrollTo(itemView()->currentIndex());
+    }

 }
 
 void DolphinView::loadDirectory(const KUrl& url, bool reload)
 }
 
 void DolphinView::loadDirectory(const KUrl& url, bool reload)


@@ -1131,6 +1222,11 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
 
     m_loadingDirectory = true;
 
 
     m_loadingDirectory = true;
 

+    if (reload) {
+        m_selectedItems = selectedItems();
+        connect(m_dirLister, SIGNAL(completed()), this, SLOT(restoreSelection()));
+    }
+

     m_dirLister->stop();
     m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
 
     m_dirLister->stop();
     m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
 


@@ -1210,6 +1306,12 @@ void DolphinView::applyViewProperties(const KUrl& url)
         emit sortOrderChanged(sortOrder);
     }
 
         emit sortOrderChanged(sortOrder);
     }
 

+    const bool sortFoldersFirst = props.sortFoldersFirst();
+    if (sortFoldersFirst != m_proxyModel->sortFoldersFirst()) {
+        m_proxyModel->setSortFoldersFirst(sortFoldersFirst);
+        emit sortFoldersFirstChanged(sortFoldersFirst);
+    }
+

     KFileItemDelegate::InformationList info = props.additionalInfo();
     if (info != m_fileItemDelegate->showInformation()) {
         m_fileItemDelegate->setShowInformation(info);
     KFileItemDelegate::InformationList info = props.additionalInfo();
     if (info != m_fileItemDelegate->showInformation()) {
         m_fileItemDelegate->setShowInformation(info);


@@ -1279,8 +1381,13 @@ void DolphinView::createView()
 
         FolderExpander* folderExpander = new FolderExpander(view, m_proxyModel);
         folderExpander->setEnabled(enabled);
 
         FolderExpander* folderExpander = new FolderExpander(view, m_proxyModel);
         folderExpander->setEnabled(enabled);

-        connect(folderExpander, SIGNAL(enterDir(const QModelIndex&, QAbstractItemView*)),
-                this, SLOT(enterDir(const QModelIndex&, QAbstractItemView*)));
+        connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)),
+                m_controller, SLOT(triggerItem(const QModelIndex&)));
+    }
+    else {
+        // Listen out for requests to delete the current column.
+        connect(m_columnView, SIGNAL(requestColumnDeletion(QAbstractItemView*)),
+                this, SLOT(deleteWhenNotDragSource(QAbstractItemView*)));

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


@@ -1336,29 +1443,22 @@ void DolphinView::deleteView()
         m_topLayout->removeWidget(view);
         view->close();
 
         m_topLayout->removeWidget(view);
         view->close();
 

+        // m_previewGenerator's parent is not always destroyed, and we
+        // don't want two active at once - manually delete.
+        delete m_previewGenerator;
+        m_previewGenerator = 0;
+

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

-        bool deleteView = true;
-        foreach (const QAbstractItemView* expandedView, m_expandedViews) {
-            if (view == expandedView) {
-                // the current view got already expanded and must stay alive
-                // until the dragging has been completed
-                deleteView = false;
-                break;
-            }
-        }
-        if (deleteView) {
-            view->deleteLater();
-        }
+        deleteWhenNotDragSource(view);

         view = 0;
 
         m_iconsView = 0;
         m_detailsView = 0;
         m_columnView = 0;
         m_fileItemDelegate = 0;
         view = 0;
 
         m_iconsView = 0;
         m_detailsView = 0;
         m_columnView = 0;
         m_fileItemDelegate = 0;

-        m_previewGenerator = 0;

         m_toolTipManager = 0;
     }
 }
         m_toolTipManager = 0;
     }
 }


@@ -1394,16 +1494,7 @@ bool DolphinView::isCutItem(const KFileItem& item) const
 
 void DolphinView::pasteToUrl(const KUrl& url)
 {
 
 void DolphinView::pasteToUrl(const KUrl& url)
 {

-    QClipboard* clipboard = QApplication::clipboard();
-    const QMimeData* mimeData = clipboard->mimeData();
-
-    const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
-    if (KonqMimeData::decodeIsCutSelection(mimeData)) {
-        KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, url);
-        clipboard->clear();
-    } else {
-        KonqOperations::copy(this, KonqOperations::COPY, sourceUrls, url);
-    }
+    KonqOperations::doPaste(this, url);

 }
 
 void DolphinView::updateZoomLevel(int oldZoomLevel)
 }
 
 void DolphinView::updateZoomLevel(int oldZoomLevel)


@@ -1424,17 +1515,6 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const
     return list;
 }
 
     return list;
 }
 

-void DolphinView::deleteExpandedViews()
-{
-    const QAbstractItemView* view = itemView();
-    foreach (QAbstractItemView* expandedView, m_expandedViews) {
-        if (expandedView != view) {
-            expandedView->deleteLater();
-        }
-    }
-    m_expandedViews.clear();
-}
-

 QMimeData* DolphinView::selectionMimeData() const
 {
     if (isColumnViewActive()) {
 QMimeData* DolphinView::selectionMimeData() const
 {
     if (isColumnViewActive()) {


@@ -1447,4 +1527,5 @@ QMimeData* DolphinView::selectionMimeData() const
     return m_dolphinModel->mimeData(selection.indexes());
 }
 
     return m_dolphinModel->mimeData(selection.indexes());
 }
 

+

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