X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c00478bbc1001d10dcfc04e9b0ea251620837e85..4caebde3cb9e31fcb18b36e45afa287e9c03abd4:/src/dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 2c4c1eaa3..b6f2698c3 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,14 +18,15 @@
 */
 
 #include "dolphinpart.h"
-#include <kpropertiesdialog.h>
-#include <kglobalsettings.h>
+#include "dolphinviewactionhandler.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "dolphinmodel.h"
 
 #include <konq_operations.h>
 
+#include <kpropertiesdialog.h>
+#include <kglobalsettings.h>
 #include <kactioncollection.h>
 #include <kdirlister.h>
 #include <kiconloader.h>
@@ -93,6 +94,10 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
             this, SLOT(slotUrlChanged(KUrl)));
     connect(m_view, SIGNAL(modeChanged()),
             this, SLOT(updateViewActions()));
+    // TODO slotSortingChanged
+
+    m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
+    m_actionHandler->setCurrentView(m_view);
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
@@ -106,7 +111,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
     // [Q_PROPERTY introspection?]
 
     // TODO sort_by_* actions
-    // TODO show_*_info actions
 
     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)
@@ -125,16 +129,6 @@ void DolphinPart::createActions()
     viewModeActions->addAction(DolphinView::columnsModeAction(actionCollection()));
     connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*)));
 
-    KAction* renameAction = DolphinView::createRenameAction(actionCollection());
-    connect(renameAction, SIGNAL(triggered()), m_view, SLOT(renameSelectedItems()));
-
-    KAction* moveToTrashAction = DolphinView::createMoveToTrashAction(actionCollection());
-    connect(moveToTrashAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)),
-            this, SLOT(slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers)));
-
-    KAction* deleteAction = DolphinView::createDeleteAction(actionCollection());
-    connect(deleteAction, SIGNAL(triggered()), m_view, SLOT(deleteSelectedItems()));
-
     KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );
     editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
     connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType()));
@@ -144,10 +138,9 @@ void DolphinPart::createActions()
     propertiesAction->setShortcut(Qt::ALT+Qt::Key_Return);
     connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties()));
 
-    // Go menu
+    // View menu: all done by DolphinViewActionHandler
 
-    KAction* newDirAction = DolphinView::createNewDirAction(actionCollection());
-    connect(newDirAction, SIGNAL(triggered()), SLOT(createDir()));
+    // Go menu
 
     QActionGroup* goActionGroup = new QActionGroup(this);
     connect(goActionGroup, SIGNAL(triggered(QAction*)),
@@ -219,10 +212,10 @@ void DolphinPart::updatePasteAction()
 
 void DolphinPart::updateViewActions()
 {
+    m_actionHandler->updateViewActions();
     QAction* action = actionCollection()->action(m_view->currentViewModeActionName());
     if (action != 0) {
-        KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
-        toggleAction->setChecked(true);
+        action->setChecked(true);
     }
 }
 
@@ -398,17 +391,6 @@ void DolphinPartBrowserExtension::paste()
 
 ////
 
-void DolphinPart::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers)
-{
-    // Note: kde3's konq_mainwindow.cpp used to check
-    // reason == KAction::PopupMenuActivation && ...
-    // but this isn't supported anymore
-    if (modifiers & Qt::ShiftModifier)
-        m_view->deleteSelectedItems();
-    else
-        m_view->trashSelectedItems();
-}
-
 void DolphinPart::slotEditMimeType()
 {
     const KFileItemList items = m_view->selectedItems();
@@ -426,9 +408,4 @@ void DolphinPart::slotProperties()
     }
 }
 
-void DolphinPart::createDir()
-{
-    KonqOperations::newDir(m_view, url());
-}
-
 #include "dolphinpart.moc"