use "Sort by" instead of "Sort By"

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 2a88fe6b8d764077277b9de7951d46e2600203fd..1bc1edac0575a2c1c6aaf0ecbbe9aa3f05e2b28d 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -66,20 +66,25 @@ 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)));
-    // TODO connect to urlsDropped
-    // TOOD connect to requestContextMenu
-    connect(m_view, SIGNAL(selectionChanged(QList<KFileItem>)), m_extension, SIGNAL(selectionInfo(QList<KFileItem>)));
+    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)));
+    connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&)),
+            this, SLOT(slotOpenContextMenu(KFileItem, const KUrl&)));
+    connect(m_view, SIGNAL(selectionChanged(QList<KFileItem>)),
+            m_extension, SIGNAL(selectionInfo(QList<KFileItem>)));
+
+    connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
+            this, SLOT(slotRequestItemInfo(KFileItem)));

 
 

-    connect(m_view, SIGNAL(requestItemInfo(KFileItem)), this, SLOT(slotRequestItemInfo(KFileItem)));
+    // TODO connect to urlsDropped

 
     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)
 
 
     // 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


@@ -100,10 +105,15 @@ KAboutData* DolphinPart::createAboutData()
 bool DolphinPart::openUrl(const KUrl& url)
 {
     const QString prettyUrl = url.pathOrUrl();
 bool DolphinPart::openUrl(const KUrl& url)
 {
     const QString prettyUrl = url.pathOrUrl();

-    setWindowCaption(prettyUrl);
-    m_extension->setLocationBarUrl(prettyUrl);
+    emit setWindowCaption(prettyUrl);
+    emit m_extension->setLocationBarUrl(prettyUrl);
+    const bool reload = arguments().reload();
+    if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started
+        return true;
+    }
+    setUrl(url); // remember it at the KParts level

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

-    if (arguments().reload())
+    if (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;


@@ -135,4 +145,24 @@ 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());
+}
+
+void DolphinPart::slotOpenContextMenu(const KFileItem& item, const KUrl&)
+{
+    // TODO KonqKfmIconView had if ( !rootItem->isWritable() )
+    //            popupFlags |= KParts::BrowserExtension::NoDeletion;
+
+    // and when clicking on the viewport:
+    //        KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;
+
+
+    KFileItem* itemCopy = new KFileItem(item); // ugly
+    KFileItemList items; items.append(itemCopy);
+    emit m_extension->popupMenu( 0, QCursor::pos(), items );
+    delete itemCopy;
+}
+

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