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

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index fefec95a1..1cdf73f3e 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -23,29 +23,31 @@
 #include "dolphinview.h"
 #include "dolphinmodel.h"
 
+#include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 
 #include <kaboutdata.h>
 #include <kactioncollection.h>
 #include <kconfiggroup.h>
-#include <kdebug.h>
 #include <kdirlister.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpluginfactory.h>
-#include <kpropertiesdialog.h>
 #include <ktoggleaction.h>
+#include <kio/netaccess.h>
+#include <ktoolinvocation.h>
+#include <kauthorized.h>
+#include <knewmenu.h>
+#include <kmenu.h>
 
 #include <QActionGroup>
 #include <QApplication>
 #include <QClipboard>
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
-// The componentdata name must be dolphinpart so that dolphinpart.rc is found
-// Alternatively we would have to install it as dolphin/dolphinpart.rc
-K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart"))
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)
@@ -116,8 +118,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     m_actionHandler->updateViewActions();
     slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions
 
-    // TODO sort_by_* actions
-
     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)
 
@@ -131,15 +131,16 @@ DolphinPart::~DolphinPart()
 
 void DolphinPart::createActions()
 {
+    // Edit menu
+
+    m_newMenu = new KNewMenu(actionCollection(), widget(), "new_menu");
+    connect(m_newMenu->menu(), SIGNAL(aboutToShow()),
+            this, SLOT(updateNewMenu()));
+
     KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );
     editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
     connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType()));
 
-    KAction *propertiesAction = actionCollection()->addAction( "properties" );
-    propertiesAction->setText( i18nc("@action:inmenu Edit", "Properties") );
-    propertiesAction->setShortcut(Qt::ALT+Qt::Key_Return);
-    connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties()));
-
     // View menu: all done by DolphinViewActionHandler
 
     // Go menu
@@ -163,6 +164,16 @@ void DolphinPart::createActions()
     createGoAction("go_autostart", "",
                    i18nc("@action:inmenu Go", "Autostart"), KGlobalSettings::autostartPath(),
                    goActionGroup);
+
+    // Tools menu
+    if (KAuthorized::authorizeKAction("shell_access")) {
+        KAction* action = actionCollection()->addAction("open_terminal");
+        action->setIcon(KIcon("utilities-terminal"));
+        action->setText(i18nc("@action:inmenu Tools", "Open &Terminal"));
+        connect(action, SIGNAL(triggered()), SLOT(slotOpenTerminal()));
+        action->setShortcut(Qt::Key_F4);
+    }
+
 }
 
 void DolphinPart::createGoAction(const char* name, const char* iconName,
@@ -185,24 +196,38 @@ void DolphinPart::slotGoTriggered(QAction* action)
 void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
 {
     const bool hasSelection = !selection.isEmpty();
+
+    QAction* renameAction  = actionCollection()->action("rename");
+    QAction* moveToTrashAction = actionCollection()->action("move_to_trash");
+    QAction* deleteAction = actionCollection()->action("delete");
+    QAction* editMimeTypeAction = actionCollection()->action("editMimeType");
+    QAction* propertiesAction = actionCollection()->action("properties");
+    QAction* deleteWithTrashShortcut = actionCollection()->action("delete_shortcut"); // see DolphinViewActionHandler
+
     if (!hasSelection) {
         stateChanged("has_no_selection");
+
+        emit m_extension->enableAction("cut", false);
+        emit m_extension->enableAction("copy", false);
+        deleteWithTrashShortcut->setEnabled(false);
+        editMimeTypeAction->setEnabled(false);
     } else {
         stateChanged("has_selection");
-    }
 
-    QStringList actions;
-    actions << "rename" << "move_to_trash" << "delete" << "editMimeType" << "properties";
-    foreach(const QString& actionName, actions) {
-        QAction* action = actionCollection()->action(actionName);
-        Q_ASSERT(action);
-        if (action) {
-            action->setEnabled(hasSelection);
-        }
+        // TODO share this code with DolphinMainWindow::updateEditActions (and the desktop code)
+        // in libkonq
+        KonqFileItemCapabilities capabilities(selection);
+        const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
+
+        renameAction->setEnabled(capabilities.supportsMoving());
+        moveToTrashAction->setEnabled(enableMoveToTrash);
+        deleteAction->setEnabled(capabilities.supportsDeleting());
+        deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash);
+        editMimeTypeAction->setEnabled(true);
+        propertiesAction->setEnabled(true);
+        emit m_extension->enableAction("cut", capabilities.supportsMoving());
+        emit m_extension->enableAction("copy", true);
     }
-
-    emit m_extension->enableAction("cut", hasSelection);
-    emit m_extension->enableAction("copy", hasSelection);
 }
 
 void DolphinPart::updatePasteAction()
@@ -317,12 +342,12 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
         // If the parent directory of the selected item is writable, moving
         // and deleting are possible.
         KFileItem parentDir = m_dirLister->rootItem();
-        if (!parentDir.isWritable()) {
+        if (!parentDir.isNull() && !parentDir.isWritable()) {
             popupFlags |= KParts::BrowserExtension::NoDeletion;
             sDeleting = false;
             sMoving = false;
         }
-    
+
         if ( sMoving )
             editActions.append(actionCollection()->action("rename"));
 
@@ -331,7 +356,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
 
         bool isIntoTrash = _item.url().protocol() == "trash";
 
-        if ( sMoving && !isIntoTrash )
+        if ( sMoving && !isIntoTrash && item.isLocalFile() )
             addTrash = true;
 
         if ( sDeleting ) {
@@ -369,6 +394,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
 
 void DolphinPart::slotUrlChanged(const KUrl& url)
 {
+    KParts::ReadOnlyPart::setUrl(url);
     QString prettyUrl = url.pathOrUrl();
     emit m_extension->setLocationBarUrl(prettyUrl);
 }
@@ -415,15 +441,6 @@ void DolphinPart::slotEditMimeType()
     }
 }
 
-void DolphinPart::slotProperties()
-{
-    const KFileItemList items = m_view->selectedItems();
-    if (!items.isEmpty()) {
-        KPropertiesDialog dialog(items.first().url(), m_view);
-        dialog.exec();
-    }
-}
-
 void DolphinPart::setCurrentViewMode(const QString& viewModeName)
 {
     QAction* action = actionCollection()->action(viewModeName);
@@ -444,4 +461,30 @@ void DolphinPart::setNameFilter(const QString& nameFilter)
     // TODO save/restore name filter in saveState/restoreState like KonqDirPart did in kde3?
 }
 
+void DolphinPart::slotOpenTerminal()
+{
+    QString dir(QDir::homePath());
+
+    KUrl u(url());
+
+    // If the given directory is not local, it can still be the URL of an
+    // ioslave using UDS_LOCAL_PATH which to be converted first.
+    u = KIO::NetAccess::mostLocalUrl(u, widget());
+
+    //If the URL is local after the above conversion, set the directory.
+    if (u.isLocalFile()) {
+        dir = u.path();
+    }
+
+    KToolInvocation::invokeTerminal(QString(), dir);
+}
+
+void DolphinPart::updateNewMenu()
+{
+    // As requested by KNewMenu :
+    m_newMenu->slotCheckUpToDate();
+    // And set the files that the menu apply on :
+    m_newMenu->setPopupFiles(url());
+}
+
 #include "dolphinpart.moc"