Simplify DolphinController: don't remember the show-preview state in the controller...

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 9939591fd1e03a714e6ebe6c3ea88528f6061285..3a76286e70f889ef095b0f9cf20903dc9bb7706c 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,6 +18,9 @@
 */
 
 #include "dolphinpart.h"
+#include <kactioncollection.h>
+#include <ktoggleaction.h>
+#include <QActionGroup>
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "dolphinmodel.h"
@@ -67,6 +70,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
                              m_proxyModel);
     setWidget(m_view);
 
+    setXMLFile("dolphinpart.rc");
+
     connect(m_view, SIGNAL(infoMessage(QString)),
             this, SLOT(slotInfoMessage(QString)));
     connect(m_view, SIGNAL(errorMessage(QString)),
@@ -75,13 +80,18 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
             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(selectionChanged(KFileItemList)),
+            m_extension, SIGNAL(selectionInfo(KFileItemList)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(slotRequestItemInfo(KFileItem)));
+    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
+            this, SLOT(slotUrlChanged(const KUrl&)));
+
+    createActions();
+    updateViewActions();
 
-    // TODO provide a way to switch from iconview to listview (and others)
+    // TODO provide these actions in the menu, merged with the existing view-mode-actions somehow
+    // [Q_PROPERTY introspection?]
 
     // TODO connect to urlsDropped
 
@@ -102,6 +112,24 @@ DolphinPart::~DolphinPart()
     delete m_dirLister;
 }
 
+void DolphinPart::createActions()
+{
+    QActionGroup* viewModeActions = new QActionGroup(this);
+    viewModeActions->addAction(DolphinView::iconsModeAction(actionCollection()));
+    viewModeActions->addAction(DolphinView::detailsModeAction(actionCollection()));
+    viewModeActions->addAction(DolphinView::columnsModeAction(actionCollection()));
+    connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*)));
+}
+
+void DolphinPart::updateViewActions()
+{
+    QAction* action = actionCollection()->action(m_view->currentViewModeActionName());
+    if (action != 0) {
+        KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
+        toggleAction->setChecked(true);
+    }
+}
+
 KAboutData* DolphinPart::createAboutData()
 {
     return new KAboutData("dolphinpart", 0, ki18nc("@title", "Dolphin Part"), "0.1");
@@ -147,7 +175,7 @@ void DolphinPart::slotErrorMessage(const QString& msg)
 
 void DolphinPart::slotRequestItemInfo(const KFileItem& item)
 {
-    emit m_extension->mouseOverInfo(&item);
+    emit m_extension->mouseOverInfo(item);
 }
 
 void DolphinPart::slotItemTriggered(const KFileItem& item)
@@ -172,7 +200,9 @@ void DolphinPart::slotItemTriggered(const KFileItem& item)
 
 void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
 {
-    KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems;
+    KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems
+                                                      | KParts::BrowserExtension::ShowProperties
+                                                      | KParts::BrowserExtension::ShowUrlOperations;
     // TODO KonqKfmIconView had if ( !rootItem->isWritable() )
     //            popupFlags |= KParts::BrowserExtension::NoDeletion;
 
@@ -185,11 +215,24 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
         item = KFileItem( S_IFDIR, (mode_t)-1, url() );
     }
 
-    // TODO port popupMenu to QList<KFileItem>
-    KFileItem* itemCopy = new KFileItem(item); // ugly
-    KFileItemList items; items.append(itemCopy);
-    emit m_extension->popupMenu( 0, QCursor::pos(), items, KParts::OpenUrlArguments(), KParts::BrowserArguments(), popupFlags );
-    delete itemCopy;
+    KFileItemList items; items.append(item);
+    emit m_extension->popupMenu( QCursor::pos(), items, KParts::OpenUrlArguments(), KParts::BrowserArguments(), popupFlags );
+}
+
+void DolphinPart::slotViewModeActionTriggered(QAction* action)
+{
+    const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
+    m_view->setMode(mode);
+}
+
+void DolphinPart::slotUrlChanged(const KUrl& url)
+{
+    if (m_view->url() != url) {
+        // If the view URL is not equal to 'url', then an inner URL change has
+        // been done (e. g. by activating an existing column in the column view).
+        // From the hosts point of view this must be handled like changing the URL.
+        emit m_extension->openUrlRequest(url);
+    }
 }
 
 #include "dolphinpart.moc"