Change signature of requestItemInfo signal, to avoid fileitem -> url -> index -> fileitem roundtrip in dolphin,

 and to match the BrowserExtension mouseOverInfo() signal.
Started to implement more of the part (e.g. spinning wheel in konq).

svn path=/trunk/KDE/kdebase/apps/; revision=682440

1 files changed, 71 insertions, 4 deletions

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 2a766afd4..c0d807910 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,27 +18,41 @@
 */
 
 #include "dolphinpart.h"
-#include <kparts/genericfactory.h>
-#include "dolphinview.h"
 #include "dolphinsortfilterproxymodel.h"
-#include <kdirmodel.h>
+#include "dolphinview.h"
+
 #include <kdirlister.h>
+#include <kdirmodel.h>
+#include <kmessagebox.h>
+#include <kparts/browserextension.h>
+#include <kparts/genericfactory.h>
 
 typedef KParts::GenericFactory<DolphinPart> DolphinPartFactory;
 K_EXPORT_COMPONENT_FACTORY(dolphinpart, DolphinPartFactory)
 
+class DolphinPartBrowserExtension : public KParts::BrowserExtension
+{
+public:
+    DolphinPartBrowserExtension( KParts::ReadOnlyPart* part )
+        : KParts::BrowserExtension( part ) {}
+};
+
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringList& args)
     : KParts::ReadOnlyPart(parent)
 {
     Q_UNUSED(args)
     setComponentData( DolphinPartFactory::componentData() );
-    //setBrowserExtension( new DolphinPartBrowserExtension( this ) );
+    m_extension = new DolphinPartBrowserExtension(this);
 
     m_dirLister = new KDirLister;
     m_dirLister->setAutoUpdate(true);
     m_dirLister->setMainWindow(parentWidget->topLevelWidget());
     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)));
+
     m_dirModel = new KDirModel(this);
     m_dirModel->setDirLister(m_dirLister);
 
@@ -51,6 +65,26 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
                              m_dirModel,
                              m_proxyModel);
     setWidget(m_view);
+
+    connect(m_view, SIGNAL(infoMessage(QString)), this, SLOT(slotInfoMessage(QString)));
+    connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString)));
+    // TODO connect to urlsDropped
+    // TOOD connect to requestContextMenu
+    connect(m_view, SIGNAL(selectionChanged(KFileItemList)), m_extension, SIGNAL(selectionInfo(KFileItemList)));
+
+    connect(m_view, SIGNAL(requestItemInfo(KFileItem)), this, SLOT(slotRequestItemInfo(KFileItem)));
+
+    // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
+    // (sort of spacial navigation)
+
+    // TODO when clicking on a file we want to emit m_extension->openUrlRequest(url, args)
+    // to be able to embed the viewer
+
+    // TODO MMB-click should do something like KonqDirPart::mmbClicked
+
+    // TODO updating the paste action
+    // if (paste) emit m_extension->setActionText( "paste", actionText );
+    // emit m_extension->enableAction( "paste", paste );
 }
 
 DolphinPart::~DolphinPart()
@@ -65,8 +99,41 @@ KAboutData* DolphinPart::createAboutData()
 
 bool DolphinPart::openUrl(const KUrl& url)
 {
+    const QString prettyUrl = url.pathOrUrl();
+    setWindowCaption(prettyUrl);
+    m_extension->setLocationBarUrl(prettyUrl);
+    const KParts::URLArgs args = m_extension->urlArgs();
     m_view->setUrl(url);
+    if (args.reload)
+        m_view->reload();
+    emit started(0); // get the wheel to spin
     return true;
 }
 
+void DolphinPart::slotCompleted(const KUrl& url)
+{
+    Q_UNUSED(url)
+    emit completed();
+}
+
+void DolphinPart::slotCanceled(const KUrl& url)
+{
+    slotCompleted(url);
+}
+
+void DolphinPart::slotInfoMessage(const QString& msg)
+{
+    emit setStatusBarText(msg);
+}
+
+void DolphinPart::slotErrorMessage(const QString& msg)
+{
+    KMessageBox::error(m_view, msg);
+}
+
+void DolphinPart::slotRequestItemInfo(const KFileItem& item)
+{
+    emit m_extension->mouseOverInfo(&item);
+}
+
 #include "dolphinpart.moc"