Properly KIO::stat instead of simply using the KFileItem constructor when

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 356ff274ee7cfd612ba98e8827d88a8d11b46206..9d33329e5c53f20964e5cc0465bfffffaebd9434 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -21,13 +21,13 @@
 #include <kprotocolmanager.h>
 
 #include <QtGui/QApplication>
 #include <kprotocolmanager.h>
 
 #include <QtGui/QApplication>

-#include <QtGui/QClipboard>

 #include <QtGui/QKeyEvent>
 #include <QtGui/QItemSelection>
 #include <QtGui/QBoxLayout>
 #include <QtCore/QTimer>
 #include <QtGui/QScrollBar>
 
 #include <QtGui/QKeyEvent>
 #include <QtGui/QItemSelection>
 #include <QtGui/QBoxLayout>
 #include <QtCore/QTimer>
 #include <QtGui/QScrollBar>
 

+#include <kdesktopfile.h>

 #include <kfileitemdelegate.h>
 #include <kfileplacesmodel.h>
 #include <kglobalsettings.h>
 #include <kfileitemdelegate.h>
 #include <kfileplacesmodel.h>
 #include <kglobalsettings.h>


@@ -44,32 +44,28 @@
 #include <kshell.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
 #include <kshell.h>
 #include <kurl.h>
 #include <kurlcombobox.h>

+#include <kurlnavigator.h>

 #include <krun.h>
 
 #include <krun.h>
 

+#include "dolphin_generalsettings.h"

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

-#include "dolphincontroller.h"
-#include "dolphinstatusbar.h"
+#include "dolphinviewcontroller.h"

 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.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 "draganddrophelper.h"
 #include "filterbar.h"

-#include "kurlnavigator.h"
-#include "viewproperties.h"

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

-#include "dolphin_generalsettings.h"
+#include "statusbar/dolphinstatusbar.h"
+#include "viewmodecontroller.h"
+#include "viewproperties.h"

 
 

-DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
-                                           QWidget* parent,
-                                           const KUrl& url) :
+DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :

     QWidget(parent),
     QWidget(parent),

-    m_showProgress(false),

     m_isFolderWritable(false),
     m_isFolderWritable(false),

-    m_mainWindow(mainWindow),

     m_topLayout(0),
     m_urlNavigator(0),
     m_view(0),
     m_topLayout(0),
     m_urlNavigator(0),
     m_view(0),


@@ -96,7 +92,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());

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

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


@@ -113,6 +109,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     m_proxyModel->setSourceModel(m_dolphinModel);
     m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
 
     m_proxyModel->setSourceModel(m_dolphinModel);
     m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
 

+    connect(m_dirLister, SIGNAL(started(KUrl)),
+            this, SLOT(initializeProgress()));

     connect(m_dirLister, SIGNAL(clear()),
             this, SLOT(delayedStatusBarUpdate()));
     connect(m_dirLister, SIGNAL(percent(int)),
     connect(m_dirLister, SIGNAL(clear()),
             this, SLOT(delayedStatusBarUpdate()));
     connect(m_dirLister, SIGNAL(percent(int)),


@@ -128,17 +126,9 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)),
             this, SLOT(openFile(const KUrl&)));
 
     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&, 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)),
             this, SLOT(showItemInfo(KFileItem)));
     connect(m_view, SIGNAL(errorMessage(const QString&)),
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(showItemInfo(KFileItem)));
     connect(m_view, SIGNAL(errorMessage(const QString&)),


@@ -149,18 +139,19 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             this, SLOT(showOperationCompletedMessage(const QString&)));
     connect(m_view, SIGNAL(itemTriggered(KFileItem)),
             this, SLOT(slotItemTriggered(KFileItem)));
             this, SLOT(showOperationCompletedMessage(const QString&)));
     connect(m_view, SIGNAL(itemTriggered(KFileItem)),
             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&)),
     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&)));
+            this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(const KUrl&)),
+            this, SLOT(saveViewState()));

     connect(m_urlNavigator, SIGNAL(historyChanged()),
             this, SLOT(slotHistoryChanged()));
 
     connect(m_urlNavigator, SIGNAL(historyChanged()),
             this, SLOT(slotHistoryChanged()));
 

+    // initialize status bar

     m_statusBar = new DolphinStatusBar(this, m_view);
     m_statusBarTimer = new QTimer(this);
     m_statusBarTimer->setSingleShot(true);
     m_statusBar = new DolphinStatusBar(this, m_view);
     m_statusBarTimer = new QTimer(this);
     m_statusBarTimer->setSingleShot(true);


@@ -168,6 +159,11 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     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()));
+
+    // initialize filter bar

     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),


@@ -194,23 +190,9 @@ DolphinViewContainer::~DolphinViewContainer()
     m_dirLister = 0; // deleted by m_dolphinModel
 }
 
     m_dirLister = 0; // deleted by m_dolphinModel
 }
 

-void DolphinViewContainer::setUrl(const KUrl& newUrl)
+KUrl DolphinViewContainer::url() const

 {
 {

-    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
-{
-    return m_urlNavigator->url();
+    return m_urlNavigator->locationUrl();

 }
 
 void DolphinViewContainer::setActive(bool active)
 }
 
 void DolphinViewContainer::setActive(bool active)


@@ -218,7 +200,7 @@ void DolphinViewContainer::setActive(bool active)
     m_urlNavigator->setActive(active);
     m_view->setActive(active);
     if (active) {
     m_urlNavigator->setActive(active);
     m_view->setActive(active);
     if (active) {

-        m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
+        emit writeStateChanged(m_isFolderWritable);

     }
 }
 
     }
 }
 


@@ -239,6 +221,20 @@ bool DolphinViewContainer::isFilterBarVisible() const
     return m_filterBar->isVisible();
 }
 
     return m_filterBar->isVisible();
 }
 

+void DolphinViewContainer::setUrl(const KUrl& newUrl)
+{
+    if (newUrl != m_urlNavigator->locationUrl()) {
+        m_urlNavigator->setLocationUrl(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()) {
+            emit writeStateChanged(false);
+        }
+    }
+}
+

 void DolphinViewContainer::showFilterBar(bool show)
 {
     Q_ASSERT(m_filterBar != 0);
 void DolphinViewContainer::showFilterBar(bool show)
 {
     Q_ASSERT(m_filterBar != 0);


@@ -249,11 +245,6 @@ void DolphinViewContainer::showFilterBar(bool show)
     }
 }
 
     }
 }
 

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

 void DolphinViewContainer::delayedStatusBarUpdate()
 {
     // Invoke updateStatusBar() with a small delay. This assures that
 void DolphinViewContainer::delayedStatusBarUpdate()
 {
     // Invoke updateStatusBar() with a small delay. This assures that


@@ -271,13 +262,13 @@ void DolphinViewContainer::updateStatusBar()
     // - 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
     // - 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 QString msg = m_statusBar->message();

     const bool updateStatusBarMsg = (msg.isEmpty()
                                      || (msg == m_statusBar->defaultText())
                                      || (m_statusBar->type() == DolphinStatusBar::Information))
                                     && (m_statusBar->progress() == 100);
 
     const bool updateStatusBarMsg = (msg.isEmpty()
                                      || (msg == m_statusBar->defaultText())
                                      || (m_statusBar->type() == DolphinStatusBar::Information))
                                     && (m_statusBar->progress() == 100);
 

-    const QString text(m_view->statusBarText());
+    const QString text = m_view->statusBarText();

     m_statusBar->setDefaultText(text);
 
     if (updateStatusBarMsg) {
     m_statusBar->setDefaultText(text);
 
     if (updateStatusBarMsg) {


@@ -285,36 +276,38 @@ void DolphinViewContainer::updateStatusBar()
     }
 }
 
     }
 }
 

-void DolphinViewContainer::updateProgress(int percent)
+void DolphinViewContainer::initializeProgress()

 {
 {

-    if (!m_showProgress) {
-        // Only show the directory loading progress if the status bar does
-        // not contain another progress information. This means that
-        // the directory loading progress information has the lowest priority.
-        const QString progressText(m_statusBar->progressText());
-        const QString loadingText(i18nc("@info:progress", "Loading folder..."));
-        m_showProgress = progressText.isEmpty() || (progressText == loadingText);
-        if (m_showProgress) {
-            m_statusBar->setProgressText(loadingText);
-            m_statusBar->setProgress(0);
-        }
+    if (url().protocol() == "nepomuksearch") {
+        // The Nepomuk IO-slave does not provide progress information right away. Give
+        // an immediate hint to the user that a searching is done:
+        m_statusBar->setProgressText(i18nc("@info", "Searching..."));
+        m_statusBar->setProgress(-1);

     }
     }

+ }

 
 

-    if (m_showProgress) {
-        m_statusBar->setProgress(percent);
+void DolphinViewContainer::updateProgress(int percent)
+{
+    if (m_statusBar->progressText().isEmpty()) {
+        m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder..."));

     }
     }

+    m_statusBar->setProgress(percent);

 }
 
 void DolphinViewContainer::slotDirListerCompleted()
 {
 }
 
 void DolphinViewContainer::slotDirListerCompleted()
 {

-    if (m_showProgress) {
+    if (!m_statusBar->progressText().isEmpty()) {

         m_statusBar->setProgressText(QString());
         m_statusBar->setProgress(100);
         m_statusBar->setProgressText(QString());
         m_statusBar->setProgress(100);

-        m_showProgress = false;

     }
 
     }
 

-    delayedStatusBarUpdate();
-    QMetaObject::invokeMethod(this, "restoreContentsPos", Qt::QueuedConnection);
+    if ((url().protocol() == "nepomuksearch") && (m_dirLister->items().count() == 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:
+        m_statusBar->setMessage(i18nc("@info:status", "No items found."), DolphinStatusBar::Information);
+    } else {
+        updateStatusBar();
+    }

 
     // Enable the 'File'->'Create New...' menu only if the directory
     // supports writing.
 
     // Enable the 'File'->'Create New...' menu only if the directory
     // supports writing.


@@ -328,14 +321,20 @@ void DolphinViewContainer::slotDirListerCompleted()
     }
 
     if (isActive()) {
     }
 
     if (isActive()) {

-        m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
+        emit writeStateChanged(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);
     }


@@ -370,37 +369,23 @@ void DolphinViewContainer::setNameFilter(const QString& nameFilter)
     delayedStatusBarUpdate();
 }
 
     delayedStatusBarUpdate();
 }
 

-void DolphinViewContainer::openContextMenu(const KFileItem& item,
-                                           const KUrl& url,
-                                           const QList<QAction*>& customActions)
-{
-    DolphinContextMenu contextMenu(m_mainWindow, item, url);
-    contextMenu.setCustomActions(customActions);
-    contextMenu.open();
-}
-
-void DolphinViewContainer::saveContentsPos(int x, int y)
-{
-    m_urlNavigator->savePosition(x, y);
-}
-
-void DolphinViewContainer::restoreContentsPos()
+void DolphinViewContainer::activate()

 {
 {

-    if (!url().isEmpty()) {
-        const QPoint pos = m_urlNavigator->savedPosition();
-        m_view->setContentsPosition(pos.x(), pos.y());
-    }
+    setActive(true);

 }
 
 }
 

-void DolphinViewContainer::activate()
+void DolphinViewContainer::saveViewState()

 {
 {

-    setActive(true);
+    QByteArray locationState;
+    QDataStream stream(&locationState, QIODevice::WriteOnly);
+    m_view->saveState(stream);
+    m_urlNavigator->saveLocationState(locationState);

 }
 
 }
 

-void DolphinViewContainer::restoreView(const KUrl& url)
+void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)

 {
     if (KProtocolManager::supportsListing(url)) {
 {
     if (KProtocolManager::supportsListing(url)) {

-        m_view->updateView(url, m_urlNavigator->savedRootUrl());
+        m_view->setUrl(url);

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


@@ -430,7 +415,7 @@ void DolphinViewContainer::restoreView(const KUrl& url)
                                    "Protocol not supported by Dolphin, Konqueror has been launched"));
         }
 
                                    "Protocol not supported by Dolphin, Konqueror has been launched"));
         }
 

-        QString secureUrl = KShell::quoteArg(url.pathOrUrl());
+        const QString secureUrl = KShell::quoteArg(url.pathOrUrl());

         const QString command = app + ' ' + secureUrl;
         KRun::runCommand(command, app, app, this);
     } else {
         const QString command = app + ' ' + secureUrl;
         KRun::runCommand(command, app, app, this);
     } else {


@@ -438,12 +423,6 @@ void DolphinViewContainer::restoreView(const KUrl& url)
     }
 }
 
     }
 }
 

-void DolphinViewContainer::saveRootUrl(const KUrl& url)
-{
-    Q_UNUSED(url);
-    m_urlNavigator->saveRootUrl(m_view->rootUrl());
-}
-

 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {
     DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this);
 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {
     DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this);


@@ -454,7 +433,13 @@ void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
     Q_UNUSED(oldUrl);
     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);
     Q_UNUSED(oldUrl);
     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);

-    m_urlNavigator->setUrl(newUrl);
+
+    // Assure that the location state is reset for redirection URLs. This
+    // allows to skip redirection URLs when going back or forward in the
+    // URL history.
+    m_urlNavigator->saveLocationState(QByteArray());
+    m_urlNavigator->setLocationUrl(newUrl);
+

     m_urlNavigator->blockSignals(block);
 }
 
     m_urlNavigator->blockSignals(block);
 }
 


@@ -472,12 +457,11 @@ void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion com
 
 void DolphinViewContainer::slotHistoryChanged()
 {
 
 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);
+    QByteArray locationState = m_urlNavigator->locationState();
+
+    if (!locationState.isEmpty()) {
+        QDataStream stream(&locationState, QIODevice::ReadOnly);
+        m_view->restoreState(stream);

     }
 }
 
     }
 }
 


@@ -506,6 +490,16 @@ void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
         }
     }
 
         }
     }
 

+    if (item.mimetype() == "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();
 }