Clicking on items in dolphin part finally implemented.

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index a6ce985956fe875658a871e180d543284d5223d0..22f7940bd411c97e844ed768f9540ebfd3aea001 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -66,20 +66,21 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
                              m_proxyModel);
     setWidget(m_view);
 
                              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)));
+    connect(m_view, SIGNAL(infoMessage(QString)),
+            this, SLOT(slotInfoMessage(QString)));
+    connect(m_view, SIGNAL(errorMessage(QString)),
+            this, SLOT(slotErrorMessage(QString)));
+    connect(m_view, SIGNAL(itemTriggered(KFileItem)),
+            this, SLOT(slotItemTriggered(KFileItem)));

     // TODO connect to urlsDropped
     // TOOD connect to requestContextMenu
     // TODO connect to urlsDropped
     // TOOD connect to requestContextMenu

-    connect(m_view, SIGNAL(selectionChanged(KFileItemList)), m_extension, SIGNAL(selectionInfo(KFileItemList)));
+    connect(m_view, SIGNAL(selectionChanged(QList<KFileItem>)), m_extension, SIGNAL(selectionInfo(QList<KFileItem>)));

 
     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)
 
 
     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
     // TODO MMB-click should do something like KonqDirPart::mmbClicked
 
     // TODO updating the paste action


@@ -94,7 +95,7 @@ DolphinPart::~DolphinPart()
 
 KAboutData* DolphinPart::createAboutData()
 {
 
 KAboutData* DolphinPart::createAboutData()
 {

-    return new KAboutData("dolphinpart", 0, ki18nc("@info", "Dolphin Part"), "0.1");
+    return new KAboutData("dolphinpart", 0, ki18nc("@title", "Dolphin Part"), "0.1");

 }
 
 bool DolphinPart::openUrl(const KUrl& url)
 }
 
 bool DolphinPart::openUrl(const KUrl& url)


@@ -102,9 +103,8 @@ bool DolphinPart::openUrl(const KUrl& url)
     const QString prettyUrl = url.pathOrUrl();
     setWindowCaption(prettyUrl);
     m_extension->setLocationBarUrl(prettyUrl);
     const QString prettyUrl = url.pathOrUrl();
     setWindowCaption(prettyUrl);
     m_extension->setLocationBarUrl(prettyUrl);

-    const KParts::URLArgs args = m_extension->urlArgs();

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

-    if (args.reload)
+    if (arguments().reload())

         m_view->reload();
     emit started(0); // get the wheel to spin
     return true;
         m_view->reload();
     emit started(0); // get the wheel to spin
     return true;


@@ -136,4 +136,9 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item)
     emit m_extension->mouseOverInfo(&item);
 }
 
     emit m_extension->mouseOverInfo(&item);
 }
 

+void DolphinPart::slotItemTriggered(const KFileItem& item)
+{
+    emit m_extension->openUrlRequest(item.url());
+}
+

 #include "dolphinpart.moc"
 #include "dolphinpart.moc"