people want tabs, give them tabs

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index e6966affb153b30e01af5f06e36e8b97602930eb..6bc620ee21b217e12bae6a948fa38b30339afd3b 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
+#include <kprotocolmanager.h>
 
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>
@@ -67,10 +68,12 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     m_filterBar(0),
     m_statusBar(0),
     m_dirLister(0),
-    m_proxyModel(0)
+    m_proxyModel(0),
+    m_previousUrl(),
+    m_currentUrl()
 {
     hide();
-    setFocusPolicy(Qt::StrongFocus);
+
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
@@ -87,7 +90,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
 
     m_dirLister = new DolphinDirLister();
     m_dirLister->setAutoUpdate(true);
-    m_dirLister->setMainWindow(this);
+    m_dirLister->setMainWindow(window());
     m_dirLister->setDelayedMimeTypes(true);
 
     m_dolphinModel = new DolphinModel(this);
@@ -166,14 +169,18 @@ DolphinViewContainer::~DolphinViewContainer()
     m_dirLister = 0; // deleted by m_dolphinModel
 }
 
-void DolphinViewContainer::setUrl(const KUrl& url)
+void DolphinViewContainer::setUrl(const KUrl& newUrl)
 {
-    m_urlNavigator->setUrl(url);
+    if (newUrl != m_currentUrl) {
+        m_previousUrl = m_currentUrl;
+        m_currentUrl = newUrl;
+        m_urlNavigator->setUrl(newUrl);
+    }
 }
 
 const KUrl& DolphinViewContainer::url() const
 {
-    return m_urlNavigator->url();
+    return m_currentUrl;
 }
 
 void DolphinViewContainer::setActive(bool active)
@@ -198,12 +205,6 @@ bool DolphinViewContainer::isUrlEditable() const
     return m_urlNavigator->isUrlEditable();
 }
 
-KFileItem DolphinViewContainer::fileItem(const QModelIndex& index) const
-{
-    const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
-    return m_dolphinModel->itemForIndex(dolphinModelIndex);
-}
-
 void DolphinViewContainer::updateProgress(int percent)
 {
     if (!m_showProgress) {
@@ -233,7 +234,7 @@ void DolphinViewContainer::slotDirListerCompleted()
     }
 
     updateStatusBar();
-
+    m_view->setCurrentItem(m_previousUrl);
     QTimer::singleShot(100, this, SLOT(restoreContentsPos()));
 }
 
@@ -392,9 +393,7 @@ void DolphinViewContainer::saveRootUrl(const KUrl& url)
 
 void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
 {
-    // Prefer the local path over the URL.
-    bool isLocal;
-    KUrl url = item.mostLocalUrl(isLocal);
+    KUrl url = item.targetUrl();
 
     if (item.isDir()) {
         m_view->setUrl(url);
@@ -402,25 +401,16 @@ void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
     }
 
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    const bool browseThroughArchives = settings->browseThroughArchives() &&
-                                       item.isFile() && url.isLocalFile();
-    if (browseThroughArchives) {
-        KMimeType::Ptr mime = item.mimeTypePtr();
-
-        // Don't use mime->is("application/zip"), as this would
-        // also browse through Open Office files:
-        if (mime->name() == "application/zip") {
-            url.setProtocol("zip");
-            m_view->setUrl(url);
-            return;
-        }
-
-        if (mime->is("application/x-tar") ||
-            mime->is("application/x-tarz") ||
-            mime->is("application/x-bzip-compressed-tar") ||
-            mime->is("application/x-compressed-tar") ||
-            mime->is("application/x-tzo")) {
-            url.setProtocol("tar");
+    const bool browseThroughArchives = settings->browseThroughArchives();
+    if (browseThroughArchives && item.isFile() && url.isLocalFile()) {
+        // Generic mechanism for redirecting to tar:/<path>/ when clicking on a tar file,
+        // zip:/<path>/ when clicking on a zip file, etc.
+        // The .protocol file specifies the mimetype that the kioslave handles.
+        // Note that we don't use mimetype inheritance since we don't want to
+        // open OpenDocument files as zip folders...
+        const QString protocol = KProtocolManager::protocolForArchiveMimetype(item.mimetype());
+        if (!protocol.isEmpty()) {
+            url.setProtocol(protocol);
             m_view->setUrl(url);
             return;
         }