Merge remote-tracking branch 'origin/KDE/4.11'

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 1c15c88a99c6d8699d5d053a1c42b86b974ca7bf..cc26198a0f4f333bbae4078c641fcbe5fcb6feea 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -29,11 +29,13 @@
 
 #include <KDesktopFile>
 #include <KFileItemDelegate>
 
 #include <KDesktopFile>
 #include <KFileItemDelegate>

+#include <KFileItemActions>

 #include <KFilePlacesModel>
 #include <KLocale>
 #include <KIconEffect>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
 #include <KFilePlacesModel>
 #include <KLocale>
 #include <KIconEffect>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>

+#include <KMessageWidget>

 #include <KNewFileMenu>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <KNewFileMenu>
 #include <konqmimedata.h>
 #include <konq_operations.h>


@@ -43,12 +45,14 @@
 #include <KUrlNavigator>
 #include <KRun>
 
 #include <KUrlNavigator>
 #include <KRun>
 

+#ifdef KActivities_FOUND
+#include <KActivities/ResourceInstance>
+#endif
+

 #include "dolphin_generalsettings.h"
 #include "dolphin_generalsettings.h"

-#include "dolphinmainwindow.h"

 #include "filterbar/filterbar.h"
 #include "search/dolphinsearchbox.h"
 #include "statusbar/dolphinstatusbar.h"
 #include "filterbar/filterbar.h"
 #include "search/dolphinsearchbox.h"
 #include "statusbar/dolphinstatusbar.h"

-#include "views/dolphinplacesmodel.h"

 #include "views/draganddrophelper.h"
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 #include "views/draganddrophelper.h"
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"


@@ -58,11 +62,18 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     m_topLayout(0),
     m_urlNavigator(0),
     m_searchBox(0),
     m_topLayout(0),
     m_urlNavigator(0),
     m_searchBox(0),

+    m_messageWidget(0),

     m_view(0),
     m_filterBar(0),
     m_statusBar(0),
     m_statusBarTimer(0),
     m_view(0),
     m_filterBar(0),
     m_statusBar(0),
     m_statusBarTimer(0),

-    m_statusBarTimestamp()
+    m_statusBarTimestamp(),
+    m_autoGrabFocus(true),
+    m_dropDestination(),
+    m_dropEvent(0)
+#ifdef KActivities_FOUND
+    , m_activityResourceInstance(0)
+#endif

 {
     hide();
 
 {
     hide();
 


@@ -70,7 +81,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 

-    m_urlNavigator = new KUrlNavigator(DolphinPlacesModel::instance(), url, this);
+    m_urlNavigator = new KUrlNavigator(new KFilePlacesModel(this), url, this);

     connect(m_urlNavigator, SIGNAL(urlsDropped(KUrl,QDropEvent*)),
             this, SLOT(dropUrls(KUrl,QDropEvent*)));
     connect(m_urlNavigator, SIGNAL(activated()),
     connect(m_urlNavigator, SIGNAL(urlsDropped(KUrl,QDropEvent*)),
             this, SLOT(dropUrls(KUrl,QDropEvent*)));
     connect(m_urlNavigator, SIGNAL(activated()),


@@ -87,29 +98,33 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
 
     m_searchBox = new DolphinSearchBox(this);
     m_searchBox->hide();
 
     m_searchBox = new DolphinSearchBox(this);
     m_searchBox->hide();

+    connect(m_searchBox, SIGNAL(activated()), this, SLOT(activate()));

     connect(m_searchBox, SIGNAL(closeRequest()), this, SLOT(closeSearchBox()));
     connect(m_searchBox, SIGNAL(closeRequest()), this, SLOT(closeSearchBox()));

-    connect(m_searchBox, SIGNAL(search(QString)), this, SLOT(startSearching(QString)));
+    connect(m_searchBox, SIGNAL(searchRequest()), this, SLOT(startSearching()));

     connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus()));
 
     connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus()));
 

+    m_messageWidget = new KMessageWidget(this);
+    m_messageWidget->setCloseButtonVisible(true);
+    m_messageWidget->hide();
+

     m_view = new DolphinView(url, this);
     m_view = new DolphinView(url, this);

-    connect(m_view, SIGNAL(urlChanged(KUrl)),             m_urlNavigator, SLOT(setUrl(KUrl)));
-    connect(m_view, SIGNAL(writeStateChanged(bool)),      this, SIGNAL(writeStateChanged(bool)));
-    connect(m_view, SIGNAL(requestItemInfo(KFileItem)),   this, SLOT(showItemInfo(KFileItem)));
-    connect(m_view, SIGNAL(errorMessage(QString)),        this, SLOT(showErrorMessage(QString)));
-    connect(m_view, SIGNAL(infoMessage(QString)),         this, SLOT(showInfoMessage(QString)));
-    connect(m_view, SIGNAL(itemActivated(KFileItem)),     this, SLOT(slotItemActivated(KFileItem)));
-    connect(m_view, SIGNAL(redirection(KUrl,KUrl)),       this, SLOT(redirect(KUrl,KUrl)));
-    connect(m_view, SIGNAL(startedPathLoading(KUrl)),     this, SLOT(slotStartedPathLoading()));
-    connect(m_view, SIGNAL(finishedPathLoading(KUrl)),    this, SLOT(slotFinishedPathLoading()));
-    connect(m_view, SIGNAL(itemCountChanged()),           this, SLOT(delayedStatusBarUpdate()));
-    connect(m_view, SIGNAL(pathLoadingProgress(int)),     this, SLOT(updateLoadingProgress(int)));
-    connect(m_view, SIGNAL(sortProgress(int)),            this, SLOT(updateSortProgress(int)));
-    connect(m_view, SIGNAL(infoMessage(QString)),         this, SLOT(showInfoMessage(QString)));
-    connect(m_view, SIGNAL(errorMessage(QString)),        this, SLOT(showErrorMessage(QString)));
-    connect(m_view, SIGNAL(urlIsFileError(KUrl)),         this, SLOT(openFile(KUrl)));
+    connect(m_view, SIGNAL(urlChanged(KUrl)),                   m_urlNavigator, SLOT(setUrl(KUrl)));
+    connect(m_view, SIGNAL(urlChanged(KUrl)),                   m_messageWidget, SLOT(hide()));
+    connect(m_view, SIGNAL(writeStateChanged(bool)),            this, SIGNAL(writeStateChanged(bool)));
+    connect(m_view, SIGNAL(requestItemInfo(KFileItem)),         this, SLOT(showItemInfo(KFileItem)));
+    connect(m_view, SIGNAL(itemActivated(KFileItem)),           this, SLOT(slotItemActivated(KFileItem)));
+    connect(m_view, SIGNAL(itemsActivated(KFileItemList)),      this, SLOT(slotItemsActivated(KFileItemList)));
+    connect(m_view, SIGNAL(redirection(KUrl,KUrl)),             this, SLOT(redirect(KUrl,KUrl)));
+    connect(m_view, SIGNAL(directoryLoadingStarted()),          this, SLOT(slotDirectoryLoadingStarted()));
+    connect(m_view, SIGNAL(directoryLoadingCompleted()),        this, SLOT(slotDirectoryLoadingCompleted()));
+    connect(m_view, SIGNAL(directoryLoadingCanceled()),         this, SLOT(slotDirectoryLoadingCanceled()));
+    connect(m_view, SIGNAL(itemCountChanged()),                 this, SLOT(delayedStatusBarUpdate()));
+    connect(m_view, SIGNAL(directoryLoadingProgress(int)),      this, SLOT(updateDirectoryLoadingProgress(int)));
+    connect(m_view, SIGNAL(directorySortingProgress(int)),      this, SLOT(updateDirectorySortingProgress(int)));

     connect(m_view, SIGNAL(selectionChanged(KFileItemList)),    this, SLOT(delayedStatusBarUpdate()));
     connect(m_view, SIGNAL(selectionChanged(KFileItemList)),    this, SLOT(delayedStatusBarUpdate()));

-    connect(m_view, SIGNAL(operationCompletedMessage(QString)), this, SLOT(showOperationCompletedMessage(QString)));

     connect(m_view, SIGNAL(urlAboutToBeChanged(KUrl)),          this, SLOT(slotViewUrlAboutToBeChanged(KUrl)));
     connect(m_view, SIGNAL(urlAboutToBeChanged(KUrl)),          this, SLOT(slotViewUrlAboutToBeChanged(KUrl)));

+    connect(m_view, SIGNAL(errorMessage(QString)),              this, SLOT(showErrorMessage(QString)));
+    connect(m_view, SIGNAL(urlIsFileError(KUrl)),               this, SLOT(slotUrlIsFileError(KUrl)));

 
     connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(KUrl)),
             this, SLOT(slotUrlNavigatorLocationAboutToBeChanged(KUrl)));
 
     connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(KUrl)),
             this, SLOT(slotUrlNavigatorLocationAboutToBeChanged(KUrl)));


@@ -117,38 +132,57 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
             this, SLOT(slotUrlNavigatorLocationChanged(KUrl)));
     connect(m_urlNavigator, SIGNAL(historyChanged()),
             this, SLOT(slotHistoryChanged()));
             this, SLOT(slotUrlNavigatorLocationChanged(KUrl)));
     connect(m_urlNavigator, SIGNAL(historyChanged()),
             this, SLOT(slotHistoryChanged()));

-
-    // initialize status bar
-    m_statusBar = new DolphinStatusBar(this, m_view);
-    connect(m_statusBar, SIGNAL(stopPressed()), this, SLOT(stopLoading()));
+    connect(m_urlNavigator, SIGNAL(returnPressed()),
+            this, SLOT(slotReturnPressed()));
+
+    // Initialize status bar
+    m_statusBar = new DolphinStatusBar(this);
+    m_statusBar->setUrl(m_view->url());
+    m_statusBar->setZoomLevel(m_view->zoomLevel());
+    connect(m_view, SIGNAL(urlChanged(KUrl)),                   m_statusBar, SLOT(setUrl(KUrl)));
+    connect(m_view, SIGNAL(zoomLevelChanged(int,int)),          m_statusBar, SLOT(setZoomLevel(int)));
+    connect(m_view, SIGNAL(infoMessage(QString)),               m_statusBar, SLOT(setText(QString)));
+    connect(m_view, SIGNAL(operationCompletedMessage(QString)), m_statusBar, SLOT(setText(QString)));
+    connect(m_statusBar, SIGNAL(stopPressed()),                 this, SLOT(stopDirectoryLoading()));
+    connect(m_statusBar, SIGNAL(zoomLevelChanged(int)),         this, SLOT(slotStatusBarZoomLevelChanged(int)));

 
     m_statusBarTimer = new QTimer(this);
     m_statusBarTimer->setSingleShot(true);
     m_statusBarTimer->setInterval(300);
 
     m_statusBarTimer = new QTimer(this);
     m_statusBarTimer->setSingleShot(true);
     m_statusBarTimer->setInterval(300);

-    connect(m_statusBarTimer, SIGNAL(timeout()),
-            this, SLOT(updateStatusBar()));
+    connect(m_statusBarTimer, SIGNAL(timeout()), this, SLOT(updateStatusBar()));

 
     KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
     connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)),
             this, SLOT(delayedStatusBarUpdate()));
 
 
     KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
     connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)),
             this, SLOT(delayedStatusBarUpdate()));
 

-    // initialize filter bar
+    // Initialize filter bar

     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
     connect(m_filterBar, SIGNAL(filterChanged(QString)),
             this, SLOT(setNameFilter(QString)));
     connect(m_filterBar, SIGNAL(closeRequest()),
             this, SLOT(closeFilterBar()));
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
     connect(m_filterBar, SIGNAL(filterChanged(QString)),
             this, SLOT(setNameFilter(QString)));
     connect(m_filterBar, SIGNAL(closeRequest()),
             this, SLOT(closeFilterBar()));

+    connect(m_filterBar, SIGNAL(focusViewRequest()),
+            this, SLOT(requestFocus()));

     connect(m_view, SIGNAL(urlChanged(KUrl)),
     connect(m_view, SIGNAL(urlChanged(KUrl)),

-            m_filterBar, SLOT(clear()));
+            m_filterBar, SLOT(slotUrlChanged()));

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

+    m_topLayout->addWidget(m_messageWidget);

     m_topLayout->addWidget(m_view);
     m_topLayout->addWidget(m_filterBar);
     m_topLayout->addWidget(m_statusBar);
 
     setSearchModeEnabled(isSearchUrl(url));
     m_topLayout->addWidget(m_view);
     m_topLayout->addWidget(m_filterBar);
     m_topLayout->addWidget(m_statusBar);
 
     setSearchModeEnabled(isSearchUrl(url));

+
+    // Initialize kactivities resource instance
+
+    #ifdef KActivities_FOUND
+    m_activityResourceInstance = new KActivities::ResourceInstance(
+            window()->winId(), url);
+    m_activityResourceInstance->setParent(this);
+    #endif

 }
 
 DolphinViewContainer::~DolphinViewContainer()
 }
 
 DolphinViewContainer::~DolphinViewContainer()


@@ -162,8 +196,17 @@ KUrl DolphinViewContainer::url() const
 
 void DolphinViewContainer::setActive(bool active)
 {
 
 void DolphinViewContainer::setActive(bool active)
 {

+    m_searchBox->setActive(active);

     m_urlNavigator->setActive(active);
     m_view->setActive(active);
     m_urlNavigator->setActive(active);
     m_view->setActive(active);

+
+    #ifdef KActivities_FOUND
+    if (active) {
+        m_activityResourceInstance->notifyFocusedIn();
+    } else {
+        m_activityResourceInstance->notifyFocusedOut();
+    }
+    #endif

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


@@ -172,6 +215,16 @@ bool DolphinViewContainer::isActive() const
     return m_view->isActive();
 }
 
     return m_view->isActive();
 }
 

+void DolphinViewContainer::setAutoGrabFocus(bool grab)
+{
+    m_autoGrabFocus = grab;
+}
+
+bool DolphinViewContainer::autoGrabFocus() const
+{
+    return m_autoGrabFocus;
+}
+

 const DolphinStatusBar* DolphinViewContainer::statusBar() const
 {
     return m_statusBar;
 const DolphinStatusBar* DolphinViewContainer::statusBar() const
 {
     return m_statusBar;


@@ -202,14 +255,28 @@ DolphinView* DolphinViewContainer::view()
     return m_view;
 }
 
     return m_view;
 }
 

-const DolphinSearchBox* DolphinViewContainer::searchBox() const
+void DolphinViewContainer::showMessage(const QString& msg, MessageType type)

 {
 {

-    return m_searchBox;
-}
+    if (msg.isEmpty()) {
+        return;
+    }

 
 

-DolphinSearchBox* DolphinViewContainer::searchBox()
-{
-    return m_searchBox;
+    m_messageWidget->setText(msg);
+
+    switch (type) {
+    case Information: m_messageWidget->setMessageType(KMessageWidget::Information); break;
+    case Warning:     m_messageWidget->setMessageType(KMessageWidget::Warning); break;
+    case Error:       m_messageWidget->setMessageType(KMessageWidget::Error); break;
+    default:
+        Q_ASSERT(false);
+        break;
+    }
+
+    m_messageWidget->setWordWrap(false);
+    const int unwrappedWidth = m_messageWidget->sizeHint().width();
+    m_messageWidget->setWordWrap(unwrappedWidth > size().width());
+
+    m_messageWidget->animatedShow();

 }
 
 void DolphinViewContainer::readSettings()
 }
 
 void DolphinViewContainer::readSettings()


@@ -265,6 +332,8 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
             m_searchBox->setSearchPath(url);
         }
     } else {
             m_searchBox->setSearchPath(url);
         }
     } else {

+        m_view->setViewPropertiesContext(QString());
+

         // Restore the URL for the URL navigator. If Dolphin has been
         // started with a search-URL, the home URL is used as fallback.
         const KUrl url = m_searchBox->searchPath();
         // Restore the URL for the URL navigator. If Dolphin has been
         // started with a search-URL, the home URL is used as fallback.
         const KUrl url = m_searchBox->searchPath();


@@ -276,8 +345,6 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
             }
         }
     }
             }
         }
     }

-
-    emit searchModeChanged(enabled);

 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const
 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const


@@ -285,11 +352,31 @@ bool DolphinViewContainer::isSearchModeEnabled() const
     return m_searchBox->isVisible();
 }
 
     return m_searchBox->isVisible();
 }
 

+QString DolphinViewContainer::placesText() const
+{
+    QString text;
+
+    if (isSearchModeEnabled()) {
+        text = m_searchBox->searchPath().fileName() + QLatin1String(": ") + m_searchBox->text();
+    } else {
+        text = url().fileName();
+        if (text.isEmpty()) {
+            text = url().host();
+        }
+    }
+
+    return text;
+}
+

 void DolphinViewContainer::setUrl(const KUrl& newUrl)
 {
     if (newUrl != m_urlNavigator->locationUrl()) {
         m_urlNavigator->setLocationUrl(newUrl);
     }
 void DolphinViewContainer::setUrl(const KUrl& newUrl)
 {
     if (newUrl != m_urlNavigator->locationUrl()) {
         m_urlNavigator->setLocationUrl(newUrl);
     }

+
+    #ifdef KActivities_FOUND
+    m_activityResourceInstance->setUri(newUrl);
+    #endif

 }
 
 void DolphinViewContainer::setFilterBarVisible(bool visible)
 }
 
 void DolphinViewContainer::setFilterBarVisible(bool visible)


@@ -323,17 +410,12 @@ void DolphinViewContainer::updateStatusBar()
 {
     m_statusBarTimestamp.start();
 
 {
     m_statusBarTimestamp.start();
 

-    const QString newMessage = m_view->statusBarText();
-    m_statusBar->setDefaultText(newMessage);
-
-    // We don't want to override errors. Other messages are only protected by
-    // the Statusbar itself depending on timings (see DolphinStatusBar::setMessage).
-    if (m_statusBar->type() != DolphinStatusBar::Error) {
-        m_statusBar->setMessage(newMessage, DolphinStatusBar::Default);
-    }
+    const QString text = m_view->statusBarText();
+    m_statusBar->setDefaultText(text);
+    m_statusBar->resetToDefaultText();

 }
 
 }
 

-void DolphinViewContainer::updateLoadingProgress(int percent)
+void DolphinViewContainer::updateDirectoryLoadingProgress(int percent)

 {
     if (m_statusBar->progressText().isEmpty()) {
         m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder..."));
 {
     if (m_statusBar->progressText().isEmpty()) {
         m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder..."));


@@ -341,7 +423,7 @@ void DolphinViewContainer::updateLoadingProgress(int percent)
     m_statusBar->setProgress(percent);
 }
 
     m_statusBar->setProgress(percent);
 }
 

-void DolphinViewContainer::updateSortProgress(int percent)
+void DolphinViewContainer::updateDirectorySortingProgress(int percent)

 {
     if (m_statusBar->progressText().isEmpty()) {
         m_statusBar->setProgressText(i18nc("@info:progress", "Sorting..."));
 {
     if (m_statusBar->progressText().isEmpty()) {
         m_statusBar->setProgressText(i18nc("@info:progress", "Sorting..."));


@@ -349,7 +431,7 @@ void DolphinViewContainer::updateSortProgress(int percent)
     m_statusBar->setProgress(percent);
 }
 
     m_statusBar->setProgress(percent);
 }
 

-void DolphinViewContainer::slotStartedPathLoading()
+void DolphinViewContainer::slotDirectoryLoadingStarted()

 {
     if (isSearchUrl(url())) {
         // Search KIO-slaves usually don't provide any progress information. Give
 {
     if (isSearchUrl(url())) {
         // Search KIO-slaves usually don't provide any progress information. Give


@@ -361,26 +443,42 @@ void DolphinViewContainer::slotStartedPathLoading()
         // Trigger an undetermined progress indication. The progress
         // information in percent will be triggered by the percent() signal
         // of the directory lister later.
         // Trigger an undetermined progress indication. The progress
         // information in percent will be triggered by the percent() signal
         // of the directory lister later.

-        updateLoadingProgress(-1);
+        updateDirectoryLoadingProgress(-1);

     }
 }
 
     }
 }
 

-void DolphinViewContainer::slotFinishedPathLoading()
+void DolphinViewContainer::slotDirectoryLoadingCompleted()

 {
     if (!m_statusBar->progressText().isEmpty()) {
         m_statusBar->setProgressText(QString());
         m_statusBar->setProgress(100);
     }
 
 {
     if (!m_statusBar->progressText().isEmpty()) {
         m_statusBar->setProgressText(QString());
         m_statusBar->setProgress(100);
     }
 

-    if (isSearchUrl(url()) && m_view->items().isEmpty()) {
+    if (isSearchUrl(url()) && m_view->itemsCount() == 0) {

         // The dir lister has been completed on a Nepomuk-URI and no items have been found. Instead
         // of showing the default status bar information ("0 items") a more helpful information is given:
         // The dir lister has been completed on a Nepomuk-URI and no items have been found. Instead
         // of showing the default status bar information ("0 items") a more helpful information is given:

-        m_statusBar->setMessage(i18nc("@info:status", "No items found."), DolphinStatusBar::Information);
+        m_statusBar->setText(i18nc("@info:status", "No items found."));

     } else {
         updateStatusBar();
     }
 }
 
     } else {
         updateStatusBar();
     }
 }
 

+void DolphinViewContainer::slotDirectoryLoadingCanceled()
+{
+    if (!m_statusBar->progressText().isEmpty()) {
+        m_statusBar->setProgressText(QString());
+        m_statusBar->setProgress(100);
+    }
+
+    m_statusBar->setText(QString());
+}
+
+void DolphinViewContainer::slotUrlIsFileError(const KUrl& url)
+{
+    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
+    slotItemActivated(item);
+}
+

 void DolphinViewContainer::slotItemActivated(const KFileItem& item)
 {
     // It is possible to activate items on inactive views by
 void DolphinViewContainer::slotItemActivated(const KFileItem& item)
 {
     // It is possible to activate items on inactive views by


@@ -388,81 +486,35 @@ void DolphinViewContainer::slotItemActivated(const KFileItem& item)
     // results in an active view.
     m_view->setActive(true);
 
     // results in an active view.
     m_view->setActive(true);
 

-    KUrl url = item.targetUrl();
-
-    if (item.isDir()) {
+    const KUrl& url = DolphinView::openItemAsFolderUrl(item, GeneralSettings::browseThroughArchives());
+    if (!url.isEmpty()) {

         m_view->setUrl(url);
         return;
     }
 
         m_view->setUrl(url);
         return;
     }
 

-    if (GeneralSettings::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;
-        }
-    }
-
-    if (item.mimetype() == QLatin1String("application/x-desktop")) {
-        // Redirect to the URL in Type=Link desktop files
-        KDesktopFile desktopFile(url.toLocalFile());
-        if (desktopFile.hasLinkType()) {
-            url = desktopFile.readUrl();
-            m_view->setUrl(url);
-            return;
-        }
-    }
-

     item.run();
 }
 
     item.run();
 }
 

-void DolphinViewContainer::openFile(const KUrl& url)
+void DolphinViewContainer::slotItemsActivated(const KFileItemList& items)

 {
 {

-    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
-    slotItemActivated(item);
+    Q_ASSERT(items.count() >= 2);
+
+    KFileItemActions fileItemActions(this);
+    fileItemActions.runPreferredApplications(items, QString());

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

-        // 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();
-        }
+        m_statusBar->resetToDefaultText();

     } else {
     } else {

-        const QString message = item.isDir() ? item.text() : item.getStatusBarInfo();
-        m_statusBar->setMessage(message, DolphinStatusBar::Default);
+        m_statusBar->setText(item.getStatusBarInfo());

     }
 }
 
     }
 }
 

-void DolphinViewContainer::showInfoMessage(const QString& msg)
-{
-    m_statusBar->setMessage(msg, DolphinStatusBar::Information);
-}
-
-void DolphinViewContainer::showErrorMessage(const QString& msg)
-{
-    m_statusBar->setMessage(msg, DolphinStatusBar::Error);
-}
-
-void DolphinViewContainer::showOperationCompletedMessage(const QString& msg)
-{
-    m_statusBar->setMessage(msg, DolphinStatusBar::OperationCompleted);
-}
-

 void DolphinViewContainer::closeFilterBar()
 {
 void DolphinViewContainer::closeFilterBar()
 {

-    m_filterBar->hide();
-    m_filterBar->clear();
+    m_filterBar->closeFilterBar();

     m_view->setFocus();
     emit showFilterBarChanged(false);
 }
     m_view->setFocus();
     emit showFilterBarChanged(false);
 }


@@ -504,11 +556,13 @@ void DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged(const KUrl&
 
 void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
 {
 
 void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
 {

+    slotReturnPressed();
+

     if (KProtocolManager::supportsListing(url)) {
         setSearchModeEnabled(isSearchUrl(url));
         m_view->setUrl(url);
 
     if (KProtocolManager::supportsListing(url)) {
         setSearchModeEnabled(isSearchUrl(url));
         m_view->setUrl(url);
 

-        if (isActive() && !isSearchUrl(url)) {
+        if (m_autoGrabFocus && isActive() && !isSearchUrl(url)) {

             // 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.
             // 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.


@@ -517,8 +571,10 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
     } else if (KProtocolManager::isSourceProtocol(url)) {
         QString app = "konqueror";
         if (url.protocol().startsWith(QLatin1String("http"))) {
     } 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"));
+            showMessage(i18nc("@info:status", // krazy:exclude=qmethods
+                              "Dolphin does not support web pages, the web browser has been launched"),
+                        Information);
+

             const KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "General");
             const QString browser = config.readEntry("BrowserApplication");
             if (!browser.isEmpty()) {
             const KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "General");
             const QString browser = config.readEntry("BrowserApplication");
             if (!browser.isEmpty()) {


@@ -529,21 +585,52 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
                 }
             }
         } else {
                 }
             }
         } else {

-            showErrorMessage(i18nc("@info:status",
-                                   "Protocol not supported by Dolphin, Konqueror has been launched"));
+            showMessage(i18nc("@info:status",
+                              "Protocol not supported by Dolphin, Konqueror has been launched"),
+                        Information);

         }
 
         const QString secureUrl = KShell::quoteArg(url.pathOrUrl());
         const QString command = app + ' ' + secureUrl;
         KRun::runCommand(command, app, app, this);
     } else {
         }
 
         const QString secureUrl = KShell::quoteArg(url.pathOrUrl());
         const QString command = app + ' ' + secureUrl;
         KRun::runCommand(command, app, app, this);
     } else {

-        showErrorMessage(i18nc("@info:status", "Invalid protocol"));
+        showMessage(i18nc("@info:status", "Invalid protocol"), Error);

     }
 }
 
 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {
     }
 }
 
 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {

-    DragAndDropHelper::dropUrls(KFileItem(), destination, event);
+    m_dropDestination = destination;
+
+    const QMimeData* mimeData = event->mimeData();
+    QMimeData* mimeDataCopy = new QMimeData;
+    foreach (const QString& format, mimeData->formats()) {
+        mimeDataCopy->setData(format, mimeData->data(format));
+    }
+
+    m_dropEvent.reset(new QDropEvent(event->pos(),
+                                     event->possibleActions(),
+                                     mimeDataCopy,
+                                     event->mouseButtons(),
+                                     event->keyboardModifiers()));
+
+    QTimer::singleShot(0, this, SLOT(dropUrlsDelayed()));
+}
+
+void DolphinViewContainer::dropUrlsDelayed()
+{
+    if (m_dropEvent.isNull()) {
+        return;
+    }
+
+    QString error;
+    DragAndDropHelper::dropUrls(KFileItem(), m_dropDestination, m_dropEvent.data(), error);
+    if (!error.isEmpty()) {
+        showMessage(error, Error);
+    }
+
+    delete m_dropEvent->mimeData();
+    m_dropEvent.reset();

 }
 
 void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
 }
 
 void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)


@@ -581,11 +668,18 @@ void DolphinViewContainer::slotHistoryChanged()
     }
 }
 
     }
 }
 

-void DolphinViewContainer::startSearching(const QString &text)
+void DolphinViewContainer::slotReturnPressed()
+{
+    if (!GeneralSettings::editableUrl()) {
+        m_urlNavigator->setUrlEditable(false);
+    }
+}
+
+void DolphinViewContainer::startSearching()

 {
 {

-    Q_UNUSED(text);

     const KUrl url = m_searchBox->urlForSearching();
     if (url.isValid() && !url.isEmpty()) {
     const KUrl url = m_searchBox->urlForSearching();
     if (url.isValid() && !url.isEmpty()) {

+        m_view->setViewPropertiesContext("search");

         m_urlNavigator->setLocationUrl(url);
     }
 }
         m_urlNavigator->setLocationUrl(url);
     }
 }


@@ -595,12 +689,22 @@ void DolphinViewContainer::closeSearchBox()
     setSearchModeEnabled(false);
 }
 
     setSearchModeEnabled(false);
 }
 

-void DolphinViewContainer::stopLoading()
+void DolphinViewContainer::stopDirectoryLoading()

 {
     m_view->stopLoading();
     m_statusBar->setProgress(100);
 }
 
 {
     m_view->stopLoading();
     m_statusBar->setProgress(100);
 }
 

+void DolphinViewContainer::slotStatusBarZoomLevelChanged(int zoomLevel)
+{
+    m_view->setZoomLevel(zoomLevel);
+}
+
+void DolphinViewContainer::showErrorMessage(const QString& msg)
+{
+    showMessage(msg, Error);
+}
+

 bool DolphinViewContainer::isSearchUrl(const KUrl& url) const
 {
     const QString protocol = url.protocol();
 bool DolphinViewContainer::isSearchUrl(const KUrl& url) const
 {
     const QString protocol = url.protocol();