Assure that no empty error message is shown in the statusbar. This should not happen...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 4a81b12ea949802b804cddf18db3ead37f8ae8d0..5899404793361b156efcdd43e8175cfc81c451fb 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -62,6 +62,7 @@
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "renamedialog.h"
+#include "revisioncontrolobserver.h"
 #include "tooltips/tooltipmanager.h"
 #include "settings/dolphinsettings.h"
 #include "viewproperties.h"
@@ -104,6 +105,7 @@ DolphinView::DolphinView(QWidget* parent,
     m_proxyModel(proxyModel),
     m_previewGenerator(0),
     m_toolTipManager(0),
+    m_revisionControlObserver(0),
     m_rootUrl(),
     m_activeItemUrl(),
     m_createdItemUrl(),
@@ -520,6 +522,10 @@ void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
         loadDirectory(url);
     }
 
+    // When changing the URL there is no need to keep the revision
+    // data of the previous URL.
+    m_dolphinModel->clearRevisionData();
+
     emit startedPathLoading(url);
 }
 
@@ -607,6 +613,13 @@ QString DolphinView::statusBarText() const
     return text;
 }
 
+QList<QAction*> DolphinView::revisionControlActions(const KFileItemList& items) const
+{
+    return items.isEmpty()
+           ? m_revisionControlObserver->contextMenuActions(url().path(KUrl::AddTrailingSlash))
+           : m_revisionControlObserver->contextMenuActions(items);
+}
+
 void DolphinView::setUrl(const KUrl& url)
 {
     m_newFileNames.clear();
@@ -1460,6 +1473,14 @@ void DolphinView::createView()
     m_previewGenerator = new KFilePreviewGenerator(view);
     m_previewGenerator->setPreviewShown(m_showPreview);
 
+    m_revisionControlObserver = new RevisionControlObserver(view);
+    connect(m_revisionControlObserver, SIGNAL(infoMessage(const QString&)),
+            this, SIGNAL(infoMessage(const QString&)));
+    connect(m_revisionControlObserver, SIGNAL(errorMessage(const QString&)),
+            this, SIGNAL(errorMessage(const QString&)));
+    connect(m_revisionControlObserver, SIGNAL(operationCompletedMessage(const QString&)),
+            this, SIGNAL(operationCompletedMessage(const QString&)));
+
     if (DolphinSettings::instance().generalSettings()->showToolTips()) {
         m_toolTipManager = new ToolTipManager(view, m_proxyModel);
         connect(m_controller, SIGNAL(hideToolTip()),