X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c12dc996f535f787ab828560068a2c8b7f98c5cf..d47557dcd17a028596c4e0e7b0aabc5db4847bed:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 761062585..0f3aa9761 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -38,7 +38,6 @@
 #include <KIO/PreviewJob>
 #include <KMessageWidget>
 #include <KNewFileMenu>
-#include <konqmimedata.h>
 #include <konq_operations.h>
 #include <KShell>
 #include <KUrl>
@@ -113,6 +112,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,
@@ -143,6 +144,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
             this, &DolphinViewContainer::showErrorMessage);
     connect(m_view, &DolphinView::urlIsFileError,
             this, &DolphinViewContainer::slotUrlIsFileError);
+    connect(m_view, &DolphinView::activated,
+            this, &DolphinViewContainer::activate);
 
     connect(m_urlNavigator, &KUrlNavigator::urlAboutToBeChanged,
             this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged);
@@ -300,6 +303,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();
 }
 
@@ -482,7 +488,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)
@@ -725,4 +740,3 @@ void DolphinViewContainer::saveViewState()
     m_urlNavigator->saveLocationState(locationState);
 }
 
-#include "dolphinviewcontainer.moc"