X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/41dfbdf3d9c6acbdde4e8e38a5b0cfde8c8acd6a..7d7ecaafb18e85224fcf0b2432f3617edb9e3a2a:/src/dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 7edfdb285..a36d1aeb0 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -21,14 +21,15 @@
 #include "dolphincontextmenu.h"
 
 #include "dolphinmainwindow.h"
-#include "dolphinsettings.h"
-#include "dolphinview.h"
+#include "dolphinnewfilemenu.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
 #include <kactioncollection.h>
-#include <kfileplacesmodel.h>
 #include <kdesktopfile.h>
+#include <kfileitemlistproperties.h>
+#include <kfileplacesmodel.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
@@ -36,15 +37,13 @@
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmimetypetrader.h>
-#include <knewmenu.h>
+#include <kmodifierkeyinfo.h>
+#include <knewfilemenu.h>
 #include <konqmimedata.h>
-#include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
-#include <konq_menuactions.h>
-#include <konq_popupmenuinformation.h>
+#include <kfileitemactions.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
-#include <krun.h>
 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 
@@ -52,6 +51,11 @@
 #include <QtGui/QClipboard>
 #include <QtCore/QDir>
 
+#include "views/dolphinview.h"
+#include "views/viewmodecontroller.h"
+
+K_GLOBAL_STATIC(KModifierKeyInfo, m_keyInfo)
+
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :
@@ -59,13 +63,29 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     m_capabilities(0),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),
-    m_context(NoContext)
+    m_context(NoContext),
+    m_copyToMenu(parent),
+    m_customActions(),
+    m_popup(new KMenu(m_mainWindow)),
+    m_shiftPressed(false),
+    m_removeAction(0)
 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.
-    DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     m_selectedUrls = view->selectedUrls();
     m_selectedItems = view->selectedItems();
+
+    if (m_keyInfo != 0) {
+        if (m_keyInfo->isKeyPressed(Qt::Key_Shift) || m_keyInfo->isKeyLatched(Qt::Key_Shift)) {
+            m_shiftPressed = true;
+        }
+        connect(m_keyInfo, SIGNAL(keyPressed(Qt::Key, bool)),
+                this, SLOT(slotKeyModifierPressed(Qt::Key, bool)));
+    }
+
+    m_removeAction = new QAction(this);
+    connect(m_removeAction, SIGNAL(triggered()), this, SLOT(slotRemoveActionTriggered()));
 }
 
 DolphinContextMenu::~DolphinContextMenu()
@@ -74,14 +94,19 @@ DolphinContextMenu::~DolphinContextMenu()
     m_capabilities = 0;
 }
 
+void DolphinContextMenu::setCustomActions(const QList<QAction*>& actions)
+{
+    m_customActions = actions;
+}
+
 void DolphinContextMenu::open()
 {
     // get the context information
-    if (m_baseUrl.protocol() == "trash") {
+    if (m_baseUrl.protocol() == QLatin1String("trash")) {
         m_context |= TrashContext;
     }
 
-    if (!m_fileInfo.isNull() && (m_selectedItems.count() > 0)) {
+    if (!m_fileInfo.isNull() && !m_selectedItems.isEmpty()) {
         m_context |= ItemContext;
         // TODO: handle other use cases like devices + desktop files
     }
@@ -101,26 +126,55 @@ void DolphinContextMenu::open()
     }
 }
 
+void DolphinContextMenu::initializeModifierKeyInfo()
+{
+    // Access m_keyInfo, so that it gets instantiated by
+    // K_GLOBAL_STATIC
+    KModifierKeyInfo* keyInfo = m_keyInfo;
+    Q_UNUSED(keyInfo);
+}
+
+void DolphinContextMenu::slotKeyModifierPressed(Qt::Key key, bool pressed)
+{
+    m_shiftPressed = (key == Qt::Key_Shift) && pressed;
+    updateRemoveAction();
+}
+
+void DolphinContextMenu::slotRemoveActionTriggered()
+{
+    const KActionCollection* collection = m_mainWindow->actionCollection();
+    if (m_shiftPressed) {
+        collection->action("delete")->trigger();
+    } else {
+        collection->action("move_to_trash")->trigger();
+    }
+}
+
 void DolphinContextMenu::openTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
 
-    KMenu* popup = new KMenu(m_mainWindow);
-
-    addShowMenubarAction(popup);
+    addShowMenubarAction();
 
-    QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), popup);
+    QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), m_popup.data());
     KConfig trashConfig("trashrc", KConfig::SimpleConfig);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
-    popup->addAction(emptyTrashAction);
+    m_popup->addAction(emptyTrashAction);
 
-    QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
+    QAction* addToPlacesAction = m_popup->addAction(KIcon("bookmark-new"),
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
 
+    // Don't show if url is already in places
+    if (placeExists(m_mainWindow->activeViewContainer()->url())) {
+        addToPlacesAction->setVisible(false);
+    }
+
+    addCustomActions();
+
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
-    popup->addAction(propertiesAction);
+    m_popup->addAction(propertiesAction);
 
-    QAction *action = popup->exec(QCursor::pos());
+    QAction *action = m_popup->exec(QCursor::pos());
     if (action == emptyTrashAction) {
         const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will be deleted."));
         const bool del = KMessageBox::warningContinueCancel(m_mainWindow,
@@ -138,8 +192,6 @@ void DolphinContextMenu::openTrashContextMenu()
             DolphinSettings::instance().placesModel()->addPlace(i18nc("@label", "Trash"), url);
         }
     }
-
-    popup->deleteLater();
 }
 
 void DolphinContextMenu::openTrashItemContextMenu()
@@ -147,70 +199,78 @@ void DolphinContextMenu::openTrashItemContextMenu()
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 
-    KMenu* popup = new KMenu(m_mainWindow);
-
-    addShowMenubarAction(popup);
+    addShowMenubarAction();
 
     QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);
-    popup->addAction(restoreAction);
+    m_popup->addAction(restoreAction);
 
     QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");
-    popup->addAction(deleteAction);
+    m_popup->addAction(deleteAction);
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
-    popup->addAction(propertiesAction);
+    m_popup->addAction(propertiesAction);
 
-    if (popup->exec(QCursor::pos()) == restoreAction) {
+    if (m_popup->exec(QCursor::pos()) == restoreAction) {
         KonqOperations::restoreTrashedItems(m_selectedUrls, m_mainWindow);
     }
-
-    popup->deleteLater();
 }
 
 void DolphinContextMenu::openItemContextMenu()
 {
     Q_ASSERT(!m_fileInfo.isNull());
 
-    KMenu* popup = new KMenu(m_mainWindow);
-    addShowMenubarAction(popup);
-    insertDefaultItemActions(popup);
-
-    popup->addSeparator();
-
-    // insert 'Bookmark This Folder' entry if exactly one item is selected
     QAction* addToPlacesAction = 0;
     if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
-        addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
-                                             i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
+        // setup 'Create New' menu
+        DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_popup.data(), m_mainWindow);
+        const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+        newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+        newFileMenu->checkUpToDate();
+        newFileMenu->setPopupFiles(m_fileInfo.url());
+        newFileMenu->setEnabled(capabilities().supportsWriting());
+
+        KMenu* menu = newFileMenu->menu();
+        menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
+        menu->setIcon(KIcon("document-new"));
+        m_popup->addMenu(menu);
+        m_popup->addSeparator();
+
+        // insert 'Open in new window' and 'Open in new tab' entries
+        m_popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
+        m_popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
+
+        // insert 'Add to Places' entry
+        if (!placeExists(m_fileInfo.url())) {
+            addToPlacesAction = m_popup->addAction(KIcon("bookmark-new"),
+                                                   i18nc("@action:inmenu Add selected folder to places",
+                                                         "Add to Places"));
+        }
+
+        m_popup->addSeparator();
     }
+    addShowMenubarAction();
+    insertDefaultItemActions();
 
-    KonqPopupMenuInformation popupInfo;
-    popupInfo.setItems(m_selectedItems);
-    popupInfo.setParentWidget(m_mainWindow);
-    KonqMenuActions menuActions;
-    menuActions.setPopupMenuInfo(popupInfo);
+    m_popup->addSeparator();
 
-    // Insert 'Open With...' action or sub menu
-    menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
+    KFileItemActions fileItemActions;
+    fileItemActions.setItemListProperties(capabilities());
+    addServiceActions(fileItemActions);
 
-    // Insert 'Actions' sub menu
-    if (menuActions.addActionsTo(popup)) {
-        popup->addSeparator();
-    }
+    addVersionControlActions();
 
-    // Insert 'Copy To' and 'Move To' sub menus
+    // insert 'Copy To' and 'Move To' sub menus
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);
         m_copyToMenu.setReadOnly(!capabilities().supportsWriting());
-        m_copyToMenu.addActionsTo(popup);
-        popup->addSeparator();
+        m_copyToMenu.addActionsTo(m_popup.data());
     }
 
     // insert 'Properties...' entry
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
-    popup->addAction(propertiesAction);
+    m_popup->addAction(propertiesAction);
 
-    QAction* activatedAction = popup->exec(QCursor::pos());
+    QAction* activatedAction = m_popup->exec(QCursor::pos());
 
     if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) {
         const KUrl selectedUrl(m_fileInfo.url());
@@ -219,111 +279,96 @@ void DolphinContextMenu::openItemContextMenu()
                                                                 selectedUrl);
         }
     }
-
-    popup->deleteLater();
 }
 
 void DolphinContextMenu::openViewportContextMenu()
 {
-    KMenu* popup = new KMenu(m_mainWindow);
-
-    addShowMenubarAction(popup);
+    addShowMenubarAction();
 
     // setup 'Create New' menu
-    KNewMenu* newMenu = m_mainWindow->newMenu();
-    newMenu->slotCheckUpToDate();
-    newMenu->setPopupFiles(m_baseUrl);
-    popup->addMenu(newMenu->menu());
-    popup->addSeparator();
+    KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+    newFileMenu->checkUpToDate();
+    newFileMenu->setPopupFiles(m_baseUrl);
+    m_popup->addMenu(newFileMenu->menu());
+    m_popup->addSeparator();
+
+    // insert 'Open in new window' and 'Open in new tab' entries
+    m_popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
+    m_popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
+    m_popup->addSeparator();
 
     QAction* pasteAction = createPasteAction();
-    popup->addAction(pasteAction);
-
-    // setup 'View Mode' menu
-    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"));
+    m_popup->addAction(pasteAction);
+    m_popup->addSeparator();
 
-    QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
-    viewModeMenu->addAction(iconsMode);
+    // insert service actions
+    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
+    const KFileItemListProperties baseUrlProperties(KFileItemList() << item);
+    KFileItemActions fileItemActions;
+    fileItemActions.setItemListProperties(baseUrlProperties);
+    addServiceActions(fileItemActions);
 
-    QAction* detailsMode = m_mainWindow->actionCollection()->action("details");
-    viewModeMenu->addAction(detailsMode);
+    addVersionControlActions();
 
-    QAction* columnsMode = m_mainWindow->actionCollection()->action("columns");
-    viewModeMenu->addAction(columnsMode);
-
-    popup->addMenu(viewModeMenu);
-
-    popup->addSeparator();
-
-    QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
-                                                  i18nc("@action:inmenu Add current folder to places", "Add to Places"));
-    popup->addSeparator();
+    // insert 'Add to Places' entry if exactly one item is selected
+    QAction* addToPlacesAction = 0;
+    if (!placeExists(m_mainWindow->activeViewContainer()->url())) {
+        addToPlacesAction = m_popup->addAction(KIcon("bookmark-new"),
+                                             i18nc("@action:inmenu Add current folder to places", "Add to Places"));
+    }
 
-    QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
+    addCustomActions();
 
-    QAction* action = popup->exec(QCursor::pos());
+    QAction* propertiesAction = m_popup->addAction(i18nc("@action:inmenu", "Properties"));
+    propertiesAction->setIcon(KIcon("document-properties"));
+    QAction* action = m_popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
-                
+
         KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
-        dialog->raise();
-        dialog->activateWindow();
-    } else if (action == addToPlacesAction) {
+    } else if ((addToPlacesAction != 0) && (action == addToPlacesAction)) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
         }
     }
-
-    popup->deleteLater();
 }
 
-void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
+void DolphinContextMenu::insertDefaultItemActions()
 {
-    Q_ASSERT(popup != 0);
     const KActionCollection* collection = m_mainWindow->actionCollection();
 
-    // insert 'Cut', 'Copy' and 'Paste'
-    QAction* cutAction = collection->action(KStandardAction::name(KStandardAction::Cut));
-    QAction* copyAction  = collection->action(KStandardAction::name(KStandardAction::Copy));
-    QAction* pasteAction = createPasteAction();
+    // Insert 'Cut', 'Copy' and 'Paste'
+    m_popup->addAction(collection->action(KStandardAction::name(KStandardAction::Cut)));
+    m_popup->addAction(collection->action(KStandardAction::name(KStandardAction::Copy)));
+    m_popup->addAction(createPasteAction());
 
-    popup->addAction(cutAction);
-    popup->addAction(copyAction);
-    popup->addAction(pasteAction);
-    popup->addSeparator();
+    m_popup->addSeparator();
 
-    // insert 'Rename'
+    // Insert 'Rename'
     QAction* renameAction = collection->action("rename");
-    popup->addAction(renameAction);
-
-    // insert 'Move to Trash' and (optionally) 'Delete'
-    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
-    KConfigGroup configGroup(globalConfig, "KDE");
-    bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
-    
-    const KUrl& url = m_mainWindow->activeViewContainer()->url();
-    if (url.isLocalFile()) {
-        QAction* moveToTrashAction = collection->action("move_to_trash");
-        popup->addAction(moveToTrashAction);
-    } else {
-        showDeleteCommand = true;
-    }
+    m_popup->addAction(renameAction);
 
-    if (showDeleteCommand) {
-        QAction* deleteAction = collection->action("delete");
-        popup->addAction(deleteAction);
+    // Insert 'Move to Trash' and/or 'Delete'
+    if (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false)) {
+        m_popup->addAction(collection->action("move_to_trash"));
+        m_popup->addAction(collection->action("delete"));
+    } else {
+        m_popup->addAction(m_removeAction);
+        updateRemoveAction();
     }
 }
 
-void DolphinContextMenu::addShowMenubarAction(KMenu* menu)
+void DolphinContextMenu::addShowMenubarAction()
 {
     KAction* showMenuBar = m_mainWindow->showMenuBarAction();
     if (!m_mainWindow->menuBar()->isVisible()) {
-        menu->addAction(showMenuBar);
-        menu->addSeparator();
+        m_popup->addAction(showMenuBar);
+        m_popup->addSeparator();
     }
 }
 
@@ -336,6 +381,21 @@ QString DolphinContextMenu::placesName(const KUrl& url) const
     return name;
 }
 
+bool DolphinContextMenu::placeExists(const KUrl& url) const
+{
+    const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
+    const int count = placesModel->rowCount();
+
+    for (int i = 0; i < count; ++i) {
+        const QModelIndex index = placesModel->index(i, 0);
+
+        if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) {
+            return true;
+        }
+    }
+    return false;
+}
+
 QAction* DolphinContextMenu::createPasteAction()
 {
     QAction* action = 0;
@@ -353,12 +413,52 @@ QAction* DolphinContextMenu::createPasteAction()
     return action;
 }
 
-KonqFileItemCapabilities& DolphinContextMenu::capabilities()
+KFileItemListProperties& DolphinContextMenu::capabilities()
 {
     if (m_capabilities == 0) {
-        m_capabilities = new KonqFileItemCapabilities(m_selectedItems);
+        m_capabilities = new KFileItemListProperties(m_selectedItems);
     }
     return *m_capabilities;
 }
 
+void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
+{
+    fileItemActions.setParentWidget(m_mainWindow);
+
+    // insert 'Open With...' action or sub menu
+    fileItemActions.addOpenWithActionsTo(m_popup.data(), "DesktopEntryName != 'dolphin'");
+
+    // insert 'Actions' sub menu
+    fileItemActions.addServiceActionsTo(m_popup.data());
+}
+
+void DolphinContextMenu::addVersionControlActions()
+{
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
+    if (!versionControlActions.isEmpty()) {
+        foreach (QAction* action, versionControlActions) {
+            m_popup->addAction(action);
+        }
+        m_popup->addSeparator();
+    }
+}
+
+void DolphinContextMenu::addCustomActions()
+{
+    foreach (QAction* action, m_customActions) {
+        m_popup->addAction(action);
+    }
+}
+
+void DolphinContextMenu::updateRemoveAction()
+{
+    const KActionCollection* collection = m_mainWindow->actionCollection();
+    const bool moveToTrash = capabilities().isLocal() && !m_shiftPressed;
+    const QAction* action = moveToTrash ? collection->action("move_to_trash") : collection->action("delete");
+    m_removeAction->setText(action->text());
+    m_removeAction->setIcon(action->icon());
+    m_removeAction->setShortcuts(action->shortcuts());
+}
+
 #include "dolphincontextmenu.moc"