X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f8302197daca5667aa3d4963528ce09e344eb27f..d6488887ecf69d7f192b94de8dce34fae0b7eb76:/src/dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index a0871ce06..e25c2882f 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -22,11 +22,14 @@
 #include "dolphinview.h"
 #include "dolphinmodel.h"
 
+#include <konq_operations.h>
+
 #include <kactioncollection.h>
 #include <kdirlister.h>
 #include <kmessagebox.h>
 #include <kparts/genericfactory.h>
 #include <ktoggleaction.h>
+#include <kconfiggroup.h>
 
 #include <QActionGroup>
 #include <QApplication>
@@ -91,8 +94,9 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
 
     createActions();
     updateViewActions();
+    slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions
 
-    // TODO provide these actions in the menu, merged with the existing view-mode-actions somehow
+    // TODO provide the viewmode actions in the menu, merged with the existing view-mode-actions somehow
     // [Q_PROPERTY introspection?]
 
     // TODO sort_by_* actions
@@ -104,8 +108,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
     // (sort of spacial navigation)
 
     // TODO MMB-click should do something like KonqDirPart::mmbClicked
-
-    // TODO updating the trash and del actions too - or removing special handling of those from konq?
 }
 
 DolphinPart::~DolphinPart()
@@ -121,11 +123,23 @@ void DolphinPart::createActions()
     viewModeActions->addAction(DolphinView::columnsModeAction(actionCollection()));
     connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*)));
 
-    KAction* renameAction = new KAction(i18nc("@action:inmenu", "Rename..."), this);
+    KAction* renameAction = DolphinView::createRenameAction(actionCollection());
     connect(renameAction, SIGNAL(triggered()), m_view, SLOT(renameSelectedItems()));
-    renameAction->setEnabled(false);
-    renameAction->setShortcut(Qt::Key_F2);
-    actionCollection()->addAction("rename", renameAction);
+
+    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()));
+
+    // 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);
 }
 
 void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
@@ -136,13 +150,18 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
         stateChanged("has_no_selection");
     } else {
         stateChanged("has_selection");
+    }
 
-        QAction* renameAction = actionCollection()->action("rename");
-        Q_ASSERT(renameAction);
-        if (renameAction) {
-            renameAction->setEnabled(true);
+    QStringList actions;
+    actions << "rename" << "move_to_trash" << "delete";
+    foreach(const QString& actionName, actions) {
+        QAction* action = actionCollection()->action(actionName);
+        Q_ASSERT(action);
+        if (action) {
+            action->setEnabled(hasSelection);
         }
     }
+
     emit m_extension->enableAction("cut", hasSelection);
     emit m_extension->enableAction("copy", hasSelection);
 }
@@ -165,7 +184,7 @@ void DolphinPart::updateViewActions()
 
 KAboutData* DolphinPart::createAboutData()
 {
-    return new KAboutData("dolphinpart", 0, ki18nc("@title", "Dolphin Part"), "0.1");
+    return new KAboutData("dolphinpart", "dolphin", ki18nc("@title", "Dolphin Part"), "0.1");
 }
 
 bool DolphinPart::openUrl(const KUrl& url)
@@ -178,10 +197,10 @@ bool DolphinPart::openUrl(const KUrl& url)
     const QString prettyUrl = url.pathOrUrl();
     emit setWindowCaption(prettyUrl);
     emit m_extension->setLocationBarUrl(prettyUrl);
+    emit started(0); // get the wheel to spin
     m_view->setUrl(url);
     if (reload)
         m_view->reload();
-    emit started(0); // get the wheel to spin
     return true;
 }
 
@@ -250,16 +269,45 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
 
     KParts::BrowserExtension::ActionGroupMap actionGroups;
     QList<QAction *> editActions;
-    editActions.append(actionCollection()->action("rename"));
-    actionGroups.insert("editactions", editActions);
-
-    KFileItemList items; items.append(item);
-    emit m_extension->popupMenu(QCursor::pos(),
-                                items,
-                                KParts::OpenUrlArguments(),
-                                KParts::BrowserArguments(),
-                                popupFlags,
-                                actionGroups);
+
+    if (!item.isNull()) { // only for context menu on one or more items
+        // TODO if ( sMoving )
+        editActions.append(actionCollection()->action("rename"));
+
+        bool addTrash = false;
+        bool addDel = false;
+
+        // TODO if ( sMoving && !isIntoTrash && !isTrashLink )
+        addTrash = true;
+
+        /* TODO if ( sDeleting ) */ {
+            if ( !item.isLocalFile() )
+                addDel = true;
+            else if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
+                addTrash = false;
+                addDel = true;
+            }
+            else {
+                KConfigGroup configGroup( KGlobal::config(), "KDE" );
+                if ( configGroup.readEntry( "ShowDeleteCommand", false) )
+                    addDel = true;
+            }
+        }
+
+        if (addTrash)
+            editActions.append(actionCollection()->action("move_to_trash"));
+        if (addDel)
+            editActions.append(actionCollection()->action("delete"));
+        actionGroups.insert("editactions", editActions);
+
+        KFileItemList items; items.append(item);
+        emit m_extension->popupMenu(QCursor::pos(),
+                                    items,
+                                    KParts::OpenUrlArguments(),
+                                    KParts::BrowserArguments(),
+                                    popupFlags,
+                                    actionGroups);
+    }
 }
 
 void DolphinPart::slotViewModeActionTriggered(QAction* action)
@@ -295,4 +343,22 @@ void DolphinPartBrowserExtension::paste()
     m_part->view()->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());
+}
+
 #include "dolphinpart.moc"