SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 99c76bee261327f64f047d0d005415406d59612a..ae6953aad09666886d0aea385ddedcc607ca4c2a 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"

+#include <kprotocolmanager.h>

 
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>
 
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>


@@ -34,25 +35,32 @@
 #include <kiconeffect.h>
 #include <kio/netaccess.h>
 #include <kio/previewjob.h>
 #include <kiconeffect.h>
 #include <kio/netaccess.h>
 #include <kio/previewjob.h>

+#include <kmenu.h>

 #include <kmimetyperesolver.h>
 #include <kmimetyperesolver.h>

+#include <knewmenu.h>

 #include <konqmimedata.h>
 #include <konqmimedata.h>

+#include <kfileitemlistproperties.h>

 #include <konq_operations.h>
 #include <konq_operations.h>

+#include <kshell.h>

 #include <kurl.h>
 #include <kurl.h>

+#include <kurlcombobox.h>
+#include <kurlnavigator.h>
+#include <krun.h>

 
 #include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
 
 #include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"

-#include "dolphinstatusbar.h"

 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
 #include "dolphincontextmenu.h"
 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
 #include "dolphincontextmenu.h"

+#include "draganddrophelper.h"

 #include "filterbar.h"
 #include "filterbar.h"

-#include "kurlnavigator.h"
+#include "statusbar/dolphinstatusbar.h"

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

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

 #include "dolphin_generalsettings.h"
 
 DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
 #include "dolphin_generalsettings.h"
 
 DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,


@@ -60,34 +68,41 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
                                            const KUrl& url) :
     QWidget(parent),
     m_showProgress(false),
                                            const KUrl& url) :
     QWidget(parent),
     m_showProgress(false),

+    m_isFolderWritable(false),

     m_mainWindow(mainWindow),
     m_topLayout(0),
     m_urlNavigator(0),
     m_view(0),
     m_filterBar(0),
     m_statusBar(0),
     m_mainWindow(mainWindow),
     m_topLayout(0),
     m_urlNavigator(0),
     m_view(0),
     m_filterBar(0),
     m_statusBar(0),

+    m_statusBarTimer(0),

     m_dirLister(0),
     m_proxyModel(0)
 {
     hide();
     m_dirLister(0),
     m_proxyModel(0)
 {
     hide();

-    setFocusPolicy(Qt::StrongFocus);
+

     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
     m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
     m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);

-    connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
-            m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl&, QDropEvent*)),
+            this, SLOT(dropUrls(const KUrl&, QDropEvent*)));

     connect(m_urlNavigator, SIGNAL(activated()),
             this, SLOT(activate()));
     connect(m_urlNavigator, SIGNAL(activated()),
             this, SLOT(activate()));

+    connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
+            this, SLOT(saveUrlCompletionMode(KGlobalSettings::Completion)));

 
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
 
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());

+    m_urlNavigator->setShowFullPath(settings->showFullPath());

     m_urlNavigator->setHomeUrl(settings->homeUrl());
     m_urlNavigator->setHomeUrl(settings->homeUrl());

+    KUrlComboBox* editor = m_urlNavigator->editor();
+    editor->setCompletionMode(KGlobalSettings::Completion(settings->urlCompletionMode()));

 
     m_dirLister = new DolphinDirLister();
     m_dirLister->setAutoUpdate(true);
 
     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);
     m_dirLister->setDelayedMimeTypes(true);
 
     m_dolphinModel = new DolphinModel(this);


@@ -96,31 +111,28 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
 
     m_proxyModel = new DolphinSortFilterProxyModel(this);
     m_proxyModel->setSourceModel(m_dolphinModel);
 
     m_proxyModel = new DolphinSortFilterProxyModel(this);
     m_proxyModel->setSourceModel(m_dolphinModel);

+    m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);

 
     connect(m_dirLister, SIGNAL(clear()),
 
     connect(m_dirLister, SIGNAL(clear()),

-            this, SLOT(updateStatusBar()));
+            this, SLOT(delayedStatusBarUpdate()));

     connect(m_dirLister, SIGNAL(percent(int)),
             this, SLOT(updateProgress(int)));
     connect(m_dirLister, SIGNAL(percent(int)),
             this, SLOT(updateProgress(int)));

-    connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)),
-            this, SLOT(updateStatusBar()));
+    connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)),
+            this, SLOT(delayedStatusBarUpdate()));

     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(slotDirListerCompleted()));
     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
             this, SLOT(showInfoMessage(const QString&)));
     connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
             this, SLOT(showErrorMessage(const QString&)));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(slotDirListerCompleted()));
     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
             this, SLOT(showInfoMessage(const QString&)));
     connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
             this, SLOT(showErrorMessage(const QString&)));

+    connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)),
+            this, SLOT(openFile(const KUrl&)));

 
 

-    m_view = new DolphinView(this,
-                             url,
-                             m_dirLister,
-                             m_dolphinModel,
-                             m_proxyModel);
+    m_view = new DolphinView(this, url, m_proxyModel);

     connect(m_view, SIGNAL(urlChanged(const KUrl&)),
             m_urlNavigator, SLOT(setUrl(const KUrl&)));
     connect(m_view, SIGNAL(urlChanged(const KUrl&)),
             m_urlNavigator, SLOT(setUrl(const KUrl&)));

-    connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&)),
-            this, SLOT(openContextMenu(KFileItem, const KUrl&)));
-    connect(m_view, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
-            m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
+    connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)),
+            this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)));

     connect(m_view, SIGNAL(contentsMoved(int, int)),
             this, SLOT(saveContentsPos(int, int)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
     connect(m_view, SIGNAL(contentsMoved(int, int)),
             this, SLOT(saveContentsPos(int, int)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),


@@ -135,13 +147,22 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             this, SLOT(slotItemTriggered(KFileItem)));
     connect(m_view, SIGNAL(startedPathLoading(const KUrl&)),
             this, SLOT(saveRootUrl(const KUrl&)));
             this, SLOT(slotItemTriggered(KFileItem)));
     connect(m_view, SIGNAL(startedPathLoading(const KUrl&)),
             this, SLOT(saveRootUrl(const KUrl&)));

+    connect(m_view, SIGNAL(redirection(KUrl, KUrl)),
+            this, SLOT(redirect(KUrl, KUrl)));
+    connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)),
+            this, SLOT(delayedStatusBarUpdate()));

 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(restoreView(const KUrl&)));
 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(restoreView(const KUrl&)));

-
-    m_statusBar = new DolphinStatusBar(this, url);
-    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
-            m_statusBar, SLOT(updateSpaceInfoContent(const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(historyChanged()),
+            this, SLOT(slotHistoryChanged()));
+
+    m_statusBar = new DolphinStatusBar(this, m_view);
+    m_statusBarTimer = new QTimer(this);
+    m_statusBarTimer->setSingleShot(true);
+    m_statusBarTimer->setInterval(300);
+    connect(m_statusBarTimer, SIGNAL(timeout()),
+            this, SLOT(updateStatusBar()));

 
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
 
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());


@@ -149,6 +170,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             this, SLOT(setNameFilter(const QString&)));
     connect(m_filterBar, SIGNAL(closeRequest()),
             this, SLOT(closeFilterBar()));
             this, SLOT(setNameFilter(const QString&)));
     connect(m_filterBar, SIGNAL(closeRequest()),
             this, SLOT(closeFilterBar()));

+    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
+            m_filterBar, SLOT(clear()));

 
     m_topLayout->addWidget(m_urlNavigator);
     m_topLayout->addWidget(m_view);
 
     m_topLayout->addWidget(m_urlNavigator);
     m_topLayout->addWidget(m_view);


@@ -158,14 +181,27 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
 
 DolphinViewContainer::~DolphinViewContainer()
 {
 
 DolphinViewContainer::~DolphinViewContainer()
 {

+    m_dirLister->disconnect();
+
+    delete m_proxyModel;
+    m_proxyModel = 0;

     delete m_dolphinModel;
     m_dolphinModel = 0;
     m_dirLister = 0; // deleted by m_dolphinModel
 }
 
     delete m_dolphinModel;
     m_dolphinModel = 0;
     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_urlNavigator->url()) {
+        m_urlNavigator->setUrl(newUrl);
+        // Temporary disable the 'File'->'Create New...' menu until
+        // the write permissions can be checked in a fast way at
+        // DolphinViewContainer::slotDirListerCompleted().
+        m_isFolderWritable = false;
+        if (isActive()) {
+            m_mainWindow->newMenu()->menu()->setEnabled(false);
+        }
+    }

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


@@ -177,6 +213,9 @@ void DolphinViewContainer::setActive(bool active)
 {
     m_urlNavigator->setActive(active);
     m_view->setActive(active);
 {
     m_urlNavigator->setActive(active);
     m_view->setActive(active);

+    if (active) {
+        m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
+    }

 }
 
 bool DolphinViewContainer::isActive() const
 }
 
 bool DolphinViewContainer::isActive() const


@@ -185,20 +224,61 @@ bool DolphinViewContainer::isActive() const
     return m_view->isActive();
 }
 
     return m_view->isActive();
 }
 

+void DolphinViewContainer::refresh()
+{
+    m_view->refresh();
+    m_statusBar->refresh();
+}
+

 bool DolphinViewContainer::isFilterBarVisible() const
 {
     return m_filterBar->isVisible();
 }
 
 bool DolphinViewContainer::isFilterBarVisible() const
 {
     return m_filterBar->isVisible();
 }
 

+void DolphinViewContainer::showFilterBar(bool show)
+{
+    Q_ASSERT(m_filterBar != 0);
+    if (show) {
+        m_filterBar->show();
+    } else {
+        closeFilterBar();
+    }
+}
+

 bool DolphinViewContainer::isUrlEditable() const
 {
     return m_urlNavigator->isUrlEditable();
 }
 
 bool DolphinViewContainer::isUrlEditable() const
 {
     return m_urlNavigator->isUrlEditable();
 }
 

-KFileItem DolphinViewContainer::fileItem(const QModelIndex& index) const
+void DolphinViewContainer::delayedStatusBarUpdate()

 {
 {

-    const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
-    return m_dolphinModel->itemForIndex(dolphinModelIndex);
+    // Invoke updateStatusBar() with a small delay. This assures that
+    // when a lot of delayedStatusBarUpdates() are done in a short time,
+    // no bottleneck is given.
+    m_statusBarTimer->start();
+}
+
+void DolphinViewContainer::updateStatusBar()
+{
+    // As the item count information is less important
+    // in comparison with other messages, it should only
+    // be shown if:
+    // - the status bar is empty or
+    // - shows already the item count information or
+    // - shows only a not very important information
+    // - if any progress is given don't show the item count info at all
+    const QString msg(m_statusBar->message());
+    const bool updateStatusBarMsg = (msg.isEmpty()
+                                     || (msg == m_statusBar->defaultText())
+                                     || (m_statusBar->type() == DolphinStatusBar::Information))
+                                    && (m_statusBar->progress() == 100);
+
+    const QString text(m_view->statusBarText());
+    m_statusBar->setDefaultText(text);
+
+    if (updateStatusBarMsg) {
+        m_statusBar->setMessage(text, DolphinStatusBar::Default);
+    }

 }
 
 void DolphinViewContainer::updateProgress(int percent)
 }
 
 void DolphinViewContainer::updateProgress(int percent)


@@ -230,14 +310,34 @@ void DolphinViewContainer::slotDirListerCompleted()
     }
 
     updateStatusBar();
     }
 
     updateStatusBar();

+    QMetaObject::invokeMethod(this, "restoreContentsPos", Qt::QueuedConnection);

 
 

-    QTimer::singleShot(100, this, SLOT(restoreContentsPos()));
+    // Enable the 'File'->'Create New...' menu only if the directory
+    // supports writing.
+    KFileItem item = m_dirLister->rootItem();
+    if (item.isNull()) {
+        // it is unclear whether writing is supported
+        m_isFolderWritable = true;
+    } else {
+        KFileItemListProperties capabilities(KFileItemList() << item);
+        m_isFolderWritable = capabilities.supportsWriting();
+    }
+
+    if (isActive()) {
+        m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
+    }

 }
 
 void DolphinViewContainer::showItemInfo(const KFileItem& item)
 {
     if (item.isNull()) {
 }
 
 void DolphinViewContainer::showItemInfo(const KFileItem& item)
 {
     if (item.isNull()) {

-        m_statusBar->clear();
+        // Only clear the status bar if unimportant messages are shown.
+        // This prevents that information- or error-messages get hidden
+        // by moving the mouse above the viewport or when closing the
+        // context menu.
+        if (m_statusBar->type() == DolphinStatusBar::Default) {
+            m_statusBar->clear();
+        }

     } else {
         m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default);
     }
     } else {
         m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default);
     }


@@ -261,100 +361,23 @@ void DolphinViewContainer::showOperationCompletedMessage(const QString& msg)
 void DolphinViewContainer::closeFilterBar()
 {
     m_filterBar->hide();
 void DolphinViewContainer::closeFilterBar()
 {
     m_filterBar->hide();

+    m_filterBar->clear();
+    m_view->setFocus();

     emit showFilterBarChanged(false);
 }
 
     emit showFilterBarChanged(false);
 }
 

-QString DolphinViewContainer::defaultStatusBarText() const
-{
-    int folderCount = 0;
-    int fileCount = 0;
-    m_view->calculateItemCount(fileCount, folderCount);
-    return KIO::itemsSummaryString(fileCount + folderCount,
-                                   fileCount,
-                                   folderCount,
-                                   0, false);
-}
-
-QString DolphinViewContainer::selectionStatusBarText() const
-{
-    QString text;
-    const KFileItemList list = m_view->selectedItems();
-    if (list.isEmpty()) {
-        // when an item is triggered, it is temporary selected but selectedItems()
-        // will return an empty list
-        return QString();
-    }
-
-    int fileCount = 0;
-    int folderCount = 0;
-    KIO::filesize_t byteSize = 0;
-    KFileItemList::const_iterator it = list.begin();
-    const KFileItemList::const_iterator end = list.end();
-    while (it != end) {
-        const KFileItem& item = *it;
-        if (item.isDir()) {
-            ++folderCount;
-        } else {
-            ++fileCount;
-            byteSize += item.size();
-        }
-        ++it;
-    }
-
-    if (folderCount > 0) {
-        text = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
-        if (fileCount > 0) {
-            text += ", ";
-        }
-    }
-
-    if (fileCount > 0) {
-        const QString sizeText(KIO::convertSize(byteSize));
-        text += i18ncp("@info:status", "1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
-    }
-
-    return text;
-}
-
-void DolphinViewContainer::showFilterBar(bool show)
-{
-    Q_ASSERT(m_filterBar != 0);
-    m_filterBar->setVisible(show);
-}
-
-void DolphinViewContainer::updateStatusBar()
-{
-    // As the item count information is less important
-    // in comparison with other messages, it should only
-    // be shown if:
-    // - the status bar is empty or
-    // - shows already the item count information or
-    // - shows only a not very important information
-    // - if any progress is given don't show the item count info at all
-    const QString msg(m_statusBar->message());
-    const bool updateStatusBarMsg = (msg.isEmpty() ||
-                                     (msg == m_statusBar->defaultText()) ||
-                                     (m_statusBar->type() == DolphinStatusBar::Information)) &&
-                                    (m_statusBar->progress() == 100);
-
-    const QString text(m_view->hasSelection() ? selectionStatusBarText() : defaultStatusBarText());
-    m_statusBar->setDefaultText(text);
-
-    if (updateStatusBarMsg) {
-        m_statusBar->setMessage(text, DolphinStatusBar::Default);
-    }
-}
-

 void DolphinViewContainer::setNameFilter(const QString& nameFilter)
 {
     m_view->setNameFilter(nameFilter);
 void DolphinViewContainer::setNameFilter(const QString& nameFilter)
 {
     m_view->setNameFilter(nameFilter);

-    updateStatusBar();
+    delayedStatusBarUpdate();

 }
 
 void DolphinViewContainer::openContextMenu(const KFileItem& item,
 }
 
 void DolphinViewContainer::openContextMenu(const KFileItem& item,

-                                           const KUrl& url)
+                                           const KUrl& url,
+                                           const QList<QAction*>& customActions)

 {
     DolphinContextMenu contextMenu(m_mainWindow, item, url);
 {
     DolphinContextMenu contextMenu(m_mainWindow, item, url);

+    contextMenu.setCustomActions(customActions);

     contextMenu.open();
 }
 
     contextMenu.open();
 }
 


@@ -378,7 +401,43 @@ void DolphinViewContainer::activate()
 
 void DolphinViewContainer::restoreView(const KUrl& url)
 {
 
 void DolphinViewContainer::restoreView(const KUrl& url)
 {

-    m_view->updateView(url, m_urlNavigator->savedRootUrl());
+    if (KProtocolManager::supportsListing(url)) {
+        m_view->updateView(url, m_urlNavigator->savedRootUrl());
+        if (isActive()) {
+            // When an URL has been entered, the view should get the focus.
+            // The focus must be requested asynchronously, as changing the URL might create
+            // a new view widget. Using QTimer::singleShow() works reliable, however
+            // QMetaObject::invokeMethod() with a queued connection does not work, which might
+            // indicate that we should pass a hint to DolphinView::updateView()
+            // regarding the focus instead. To test: Enter an URL and press CTRL+Enter.
+            // Expected result: The view should get the focus.
+            QTimer::singleShot(0, this, SLOT(requestFocus()));
+        }
+    } else if (KProtocolManager::isSourceProtocol(url)) {
+        QString app = "konqueror";
+        if (url.protocol().startsWith(QLatin1String("http"))) {
+            showErrorMessage(i18nc("@info:status",
+                                   "Dolphin does not support web pages, the web browser has been launched"));
+            const KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "General");
+            const QString browser = config.readEntry("BrowserApplication");
+            if (!browser.isEmpty()) {
+                app = browser;
+                if (app.startsWith('!')) {
+                    // a literal command has been configured, remove the '!' prefix
+                    app = app.mid(1);
+                }
+            }
+        } else {
+            showErrorMessage(i18nc("@info:status",
+                                   "Protocol not supported by Dolphin, Konqueror has been launched"));
+        }
+
+        QString secureUrl = KShell::quoteArg(url.pathOrUrl());
+        const QString command = app + ' ' + secureUrl;
+        KRun::runCommand(command, app, app, this);
+    } else {
+        showErrorMessage(i18nc("@info:status", "Invalid protocol"));
+    }

 }
 
 void DolphinViewContainer::saveRootUrl(const KUrl& url)
 }
 
 void DolphinViewContainer::saveRootUrl(const KUrl& url)


@@ -387,33 +446,78 @@ void DolphinViewContainer::saveRootUrl(const KUrl& url)
     m_urlNavigator->saveRootUrl(m_view->rootUrl());
 }
 
     m_urlNavigator->saveRootUrl(m_view->rootUrl());
 }
 

+void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
+{
+    DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this);
+}
+
+void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
+{
+    Q_UNUSED(oldUrl);
+    const bool block = m_urlNavigator->signalsBlocked();
+    m_urlNavigator->blockSignals(true);
+    m_urlNavigator->setUrl(newUrl);
+    m_urlNavigator->blockSignals(block);
+}
+
+void DolphinViewContainer::requestFocus()
+{
+    m_view->setFocus();
+}
+
+void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion completion)
+{
+    DolphinSettings& settings = DolphinSettings::instance();
+    settings.generalSettings()->setUrlCompletionMode(completion);
+    settings.save();
+}
+
+void DolphinViewContainer::slotHistoryChanged()
+{
+    const int index = m_urlNavigator->historyIndex();
+    if (index > 0) {
+        // The "Go Forward" action is enabled. Try to mark
+        // the previous directory as active item:
+        const KUrl url = m_urlNavigator->historyUrl(index - 1);
+        m_view->activateItem(url);
+    }
+}
+

 void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
 {
 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);
 
     if (item.isDir()) {
         m_view->setUrl(url);

-    } else if (item.isFile()) {
-        // allow to browse through ZIP and tar files
-        KMimeType::Ptr mime = item.mimeTypePtr();
-        if (mime->is("application/zip")) {
-            url.setProtocol("zip");
-            m_view->setUrl(url);
-        } else 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");
+        return;
+    }
+
+    const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    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);
             m_view->setUrl(url);

-        } else {
-            item.run();
+            return;

         }
         }

-    } else {
-        item.run();

     }
     }

+
+    item.run();
+}
+
+void DolphinViewContainer::openFile(const KUrl& url)
+{
+    // Using m_dolphinModel for getting the file item instance is not possible
+    // here: openFile() is triggered by an error of the directory lister
+    // job, so the file item must be received "manually".
+    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
+    slotItemTriggered(item);

 }
 
 #include "dolphinviewcontainer.moc"
 }
 
 #include "dolphinviewcontainer.moc"