Forwardport 773570:

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 155884bfab5907c166ad6d93d82a90748993017f..b6f2698c3df018e96313a4537ffa3b536113c9a1 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,16 +18,18 @@
 */
 
 #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>
 #include <kmessagebox.h>
 #include <kparts/genericfactory.h>
 #include <ktoggleaction.h>
@@ -47,6 +49,9 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
     setComponentData( DolphinPartFactory::componentData() );
     m_extension = new DolphinPartBrowserExtension(this);
 
+    // make sure that other apps using this part find Dolphin's view-file-columns icons
+    KIconLoader::global()->addAppDir("dolphin");
+
     m_dirLister = new KDirLister;
     m_dirLister->setAutoUpdate(true);
     m_dirLister->setMainWindow(parentWidget->topLevelWidget());
@@ -89,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()),
@@ -102,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)
@@ -121,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()));
@@ -140,13 +138,7 @@ void DolphinPart::createActions()
     propertiesAction->setShortcut(Qt::ALT+Qt::Key_Return);
     connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties()));
 
-    // This action doesn't appear in the GUI, it's for the shortcut only.
-    // KNewMenu takes care of the GUI stuff.
-    KAction* newDirAction = actionCollection()->addAction( "create_dir" );
-    newDirAction->setText( i18n("Create Folder..." ) );
-    connect(newDirAction, SIGNAL(triggered()), SLOT(slotNewDir()));
-    newDirAction->setShortcut(Qt::Key_F10);
-    widget()->addAction(newDirAction);
+    // View menu: all done by DolphinViewActionHandler
 
     // Go menu
 
@@ -220,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);
     }
 }
 
@@ -399,22 +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::slotNewDir()
-{
-    KonqOperations::newDir(widget(), url());
-}
-
 void DolphinPart::slotEditMimeType()
 {
     const KFileItemList items = m_view->selectedItems();