* increased version to 11

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index b8a39cffc6316f3b9f7f49ff5b928682d7fd0ecf..60aa056a73b858507cee1ca0ea2a39d20da0cca6 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -31,6 +31,7 @@
 #include <kaboutdata.h>
 #include <kactioncollection.h>
 #include <kconfiggroup.h>
+#include <kdebug.h>
 #include <kdirlister.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
@@ -70,7 +71,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     }
     m_dirLister->setDelayedMimeTypes(true);
 
-    //connect(m_dirLister, SIGNAL(started(KUrl)), this, SLOT(slotStarted()));
     connect(m_dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted(KUrl)));
     connect(m_dirLister, SIGNAL(canceled(KUrl)), this, SLOT(slotCanceled(KUrl)));
     connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int)));
@@ -81,18 +81,16 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     m_proxyModel = new DolphinSortFilterProxyModel(this);
     m_proxyModel->setSourceModel(m_dolphinModel);
 
-    m_view = new DolphinView(parentWidget,
-                             KUrl(),
-                             m_dirLister,
-                             m_dolphinModel,
-                             m_proxyModel);
+    m_view = new DolphinView(parentWidget, KUrl(), m_proxyModel);
     m_view->setTabsForFilesEnabled(true);
     setWidget(m_view);
 
     setXMLFile("dolphinpart.rc");
 
     connect(m_view, SIGNAL(infoMessage(QString)),
-            this, SLOT(slotInfoMessage(QString)));
+            this, SLOT(slotMessage(QString)));
+    connect(m_view, SIGNAL(operationCompletedMessage(QString)),
+            this, SLOT(slotMessage(QString)));
     connect(m_view, SIGNAL(errorMessage(QString)),
             this, SLOT(slotErrorMessage(QString)));
     connect(m_view, SIGNAL(itemTriggered(KFileItem)),
@@ -306,7 +304,7 @@ void DolphinPart::slotCanceled(const KUrl& url)
     slotCompleted(url);
 }
 
-void DolphinPart::slotInfoMessage(const QString& msg)
+void DolphinPart::slotMessage(const QString& msg)
 {
     emit setStatusBarText(msg);
 }
@@ -436,7 +434,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
 void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
 {
     //kDebug() << oldUrl << newUrl << "currentUrl=" << url();
-    if (oldUrl == url()) {
+    if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash /* #207572 */)) {
         KParts::ReadOnlyPart::setUrl(newUrl);
         const QString prettyUrl = newUrl.pathOrUrl();
         emit m_extension->setLocationBarUrl(prettyUrl);