Merge doPaste and doPasteV2. Remove unused QPoint. Remove unused editMimeType.

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 87a2ceb4d21bda32f6540733a1e33b8ba5ee7f14..14bc4b7bc90bc8ad7f3a2214523107144341cf25 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -20,25 +20,16 @@
 #include "dolphinviewcontainer.h"
 #include <KProtocolManager>
 
-#include <QApplication>
-#include <QKeyEvent>
-#include <QItemSelection>
-#include <QBoxLayout>
 #include <QTimer>
-#include <QScrollBar>
 #include <QMimeData>
+#include <QVBoxLayout>
 
-#include <KDesktopFile>
-#include <KFileItemDelegate>
 #include <KFileItemActions>
 #include <KFilePlacesModel>
-#include <KLocale>
-#include <KIconEffect>
+#include <KLocalizedString>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
 #include <KMessageWidget>
-#include <KNewFileMenu>
-#include <konqmimedata.h>
 #include <konq_operations.h>
 #include <KShell>
 #include <KUrl>
@@ -47,7 +38,6 @@
 #include <KRun>
 
 #ifdef KActivities_FOUND
-#include <KActivities/ResourceInstance>
 #endif
 
 #include "dolphin_generalsettings.h"
@@ -113,6 +103,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
             m_urlNavigator, &KUrlNavigator::setUrl);
     connect(m_view, &DolphinView::urlChanged,
             m_messageWidget, &KMessageWidget::hide);
+    connect(m_view, &DolphinView::directoryLoadingCompleted,
+            m_messageWidget, &KMessageWidget::hide);
     connect(m_view, &DolphinView::writeStateChanged,
             this, &DolphinViewContainer::writeStateChanged);
     connect(m_view, &DolphinView::requestItemInfo,
@@ -302,6 +294,9 @@ void DolphinViewContainer::showMessage(const QString& msg, MessageType type)
     const int unwrappedWidth = m_messageWidget->sizeHint().width();
     m_messageWidget->setWordWrap(unwrappedWidth > size().width());
 
+    if (m_messageWidget->isVisible()) {
+        m_messageWidget->hide();
+    }
     m_messageWidget->animatedShow();
 }
 
@@ -484,7 +479,16 @@ void DolphinViewContainer::slotDirectoryLoadingCanceled()
 void DolphinViewContainer::slotUrlIsFileError(const KUrl& url)
 {
     const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
-    slotItemActivated(item);
+
+    // Find out if the file can be opened in the view (for example, this is the
+    // case if the file is an archive). The mime type must be known for that.
+    item.determineMimeType();
+    const KUrl& folderUrl = DolphinView::openItemAsFolderUrl(item, true);
+    if (!folderUrl.isEmpty()) {
+        m_view->setUrl(folderUrl);
+    } else {
+        slotItemActivated(item);
+    }
 }
 
 void DolphinViewContainer::slotItemActivated(const KFileItem& item)