X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4822c2cc3bcdc70d73bb76dd627b04312d463265..3614b7fea7563300974982cca27a787749ea3f0f:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 2a2994086..952ffcc99 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -22,73 +22,72 @@ #include "dolphinmainwindow.h" #include "dolphinnewfilemenu.h" -#include "settings/dolphinsettings.h" #include "dolphinviewcontainer.h" #include "dolphin_generalsettings.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dolphinremoveaction.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include + +#include +#include -#include -#include -#include +#include +#include +#include #include "views/dolphinview.h" #include "views/viewmodecontroller.h" DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, + const QPoint& pos, const KFileItem& fileInfo, const KUrl& baseUrl) : + KMenu(parent), + m_pos(pos), m_mainWindow(parent), - m_capabilities(0), m_fileInfo(fileInfo), m_baseUrl(baseUrl), + m_baseFileItem(0), + m_selectedItems(), + m_selectedItemsProperties(0), m_context(NoContext), m_copyToMenu(parent), m_customActions(), - m_popup(new KMenu(m_mainWindow)), - m_shiftPressed(false), - m_keyInfo(), + m_command(None), 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. const DolphinView* view = m_mainWindow->activeViewContainer()->view(); - m_selectedUrls = view->selectedUrls(); m_selectedItems = view->selectedItems(); - - 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() { - delete m_capabilities; - m_capabilities = 0; + delete m_selectedItemsProperties; + m_selectedItemsProperties = 0; } void DolphinContextMenu::setCustomActions(const QList& actions) @@ -96,10 +95,10 @@ void DolphinContextMenu::setCustomActions(const QList& actions) m_customActions = actions; } -void DolphinContextMenu::open() +DolphinContextMenu::Command DolphinContextMenu::open() { // get the context information - if (m_baseUrl.protocol() == "trash") { + if (m_baseUrl.protocol() == QLatin1String("trash")) { m_context |= TrashContext; } @@ -121,65 +120,44 @@ void DolphinContextMenu::open() Q_ASSERT(m_context == NoContext); openViewportContextMenu(); } + + return m_command; } -void DolphinContextMenu::slotKeyModifierPressed(Qt::Key key, bool pressed) +void DolphinContextMenu::keyPressEvent(QKeyEvent *ev) { - m_shiftPressed = (key == Qt::Key_Shift) && pressed; - updateRemoveAction(); + if (m_removeAction && ev->key() == Qt::Key_Shift) { + m_removeAction->update(); + } + KMenu::keyPressEvent(ev); } -void DolphinContextMenu::slotRemoveActionTriggered() +void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev) { - const KActionCollection* collection = m_mainWindow->actionCollection(); - if (m_shiftPressed) { - collection->action("delete")->trigger(); - } else { - collection->action("move_to_trash")->trigger(); + if (m_removeAction && ev->key() == Qt::Key_Shift) { + m_removeAction->update(); } + KMenu::keyReleaseEvent(ev); } void DolphinContextMenu::openTrashContextMenu() { Q_ASSERT(m_context & TrashContext); - addShowMenubarAction(); - - QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), m_popup.data()); + QAction* emptyTrashAction = new QAction(QIcon::fromTheme("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), this); KConfig trashConfig("trashrc", KConfig::SimpleConfig); emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true)); - m_popup->addAction(emptyTrashAction); - - 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); - } + addAction(emptyTrashAction); addCustomActions(); QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); - m_popup->addAction(propertiesAction); - - 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, - text, - QString(), - KGuiItem(i18nc("@action:button", "Empty Trash"), - KIcon("user-trash")) - ) == KMessageBox::Continue; - if (del) { - KonqOperations::emptyTrash(m_mainWindow); - } - } else if (action == addToPlacesAction) { - const KUrl& url = m_mainWindow->activeViewContainer()->url(); - if (url.isValid()) { - DolphinSettings::instance().placesModel()->addPlace(i18nc("@label", "Trash"), url); - } + addAction(propertiesAction); + + addShowMenuBarAction(); + + if (exec(m_pos) == emptyTrashAction) { + KonqOperations::emptyTrash(m_mainWindow); } } @@ -188,19 +166,22 @@ void DolphinContextMenu::openTrashItemContextMenu() Q_ASSERT(m_context & TrashContext); Q_ASSERT(m_context & ItemContext); - addShowMenubarAction(); - QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow); - m_popup->addAction(restoreAction); + addAction(restoreAction); QAction* deleteAction = m_mainWindow->actionCollection()->action("delete"); - m_popup->addAction(deleteAction); + addAction(deleteAction); QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); - m_popup->addAction(propertiesAction); + addAction(propertiesAction); - if (m_popup->exec(QCursor::pos()) == restoreAction) { - KonqOperations::restoreTrashedItems(m_selectedUrls, m_mainWindow); + if (exec(m_pos) == restoreAction) { + KUrl::List selectedUrls; + foreach (const KFileItem &item, m_selectedItems) { + selectedUrls.append(item.url()); + } + + KonqOperations::restoreTrashedItems(selectedUrls, m_mainWindow); } } @@ -208,179 +189,239 @@ void DolphinContextMenu::openItemContextMenu() { Q_ASSERT(!m_fileInfo.isNull()); - if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) { - // 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")); - m_popup->addSeparator(); + QAction* openParentInNewWindowAction = 0; + QAction* openParentInNewTabAction = 0; + QAction* addToPlacesAction = 0; + const KFileItemListProperties& selectedItemsProps = selectedItemsProperties(); + + if (m_selectedItems.count() == 1) { + if (m_fileInfo.isDir()) { + // setup 'Create New' menu + DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown()); + newFileMenu->checkUpToDate(); + newFileMenu->setPopupFiles(m_fileInfo.url()); + newFileMenu->setEnabled(selectedItemsProps.supportsWriting()); + connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater); + connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater); + + QMenu* menu = newFileMenu->menu(); + menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); + menu->setIcon(QIcon::fromTheme("document-new")); + addMenu(menu); + addSeparator(); + + // insert 'Open in new window' and 'Open in new tab' entries + addAction(m_mainWindow->actionCollection()->action("open_in_new_window")); + addAction(m_mainWindow->actionCollection()->action("open_in_new_tab")); + + // insert 'Add to Places' entry + if (!placeExists(m_fileInfo.url())) { + addToPlacesAction = addAction(QIcon::fromTheme("bookmark-new"), + i18nc("@action:inmenu Add selected folder to places", + "Add to Places")); + } + + addSeparator(); + } else if (m_baseUrl.protocol().contains("search")) { + openParentInNewWindowAction = new QAction(QIcon::fromTheme("window-new"), + i18nc("@action:inmenu", + "Open Path in New Window"), + this); + addAction(openParentInNewWindowAction); + + openParentInNewTabAction = new QAction(QIcon::fromTheme("tab-new"), + i18nc("@action:inmenu", + "Open Path in New Tab"), + this); + addAction(openParentInNewTabAction); + + addSeparator(); + } else if (!DolphinView::openItemAsFolderUrl(m_fileInfo).isEmpty()) { + // insert 'Open in new window' and 'Open in new tab' entries + addAction(m_mainWindow->actionCollection()->action("open_in_new_window")); + addAction(m_mainWindow->actionCollection()->action("open_in_new_tab")); + + addSeparator(); + } + } else { + bool selectionHasOnlyDirs = true; + foreach (const KFileItem& item, m_selectedItems) { + const KUrl& url = DolphinView::openItemAsFolderUrl(item); + if (url.isEmpty()) { + selectionHasOnlyDirs = false; + break; + } + } + + if (selectionHasOnlyDirs) { + // insert 'Open in new tab' entry + addAction(m_mainWindow->actionCollection()->action("open_in_new_tabs")); + addSeparator(); + } } - addShowMenubarAction(); - insertDefaultItemActions(); - m_popup->addSeparator(); + insertDefaultItemActions(selectedItemsProps); + + addSeparator(); KFileItemActions fileItemActions; - fileItemActions.setItemListProperties(capabilities()); + fileItemActions.setItemListProperties(selectedItemsProps); addServiceActions(fileItemActions); - addVersionControlActions(); + addFileItemPluginActions(); + + addVersionControlPluginActions(); // insert 'Copy To' and 'Move To' sub menus - if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) { + if (GeneralSettings::showCopyMoveMenu()) { m_copyToMenu.setItems(m_selectedItems); - m_copyToMenu.setReadOnly(!capabilities().supportsWriting()); - m_copyToMenu.addActionsTo(m_popup.data()); - m_popup->addSeparator(); - } - - // insert 'Add to Places' entry if exactly one item is selected - QAction* addToPlacesAction = 0; - if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1) && !placeExists(m_fileInfo.url())) { - addToPlacesAction = m_popup->addAction(KIcon("bookmark-new"), - i18nc("@action:inmenu Add selected folder to places", "Add to Places")); + m_copyToMenu.setReadOnly(!selectedItemsProps.supportsWriting()); + m_copyToMenu.addActionsTo(this); } // insert 'Properties...' entry QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); - m_popup->addAction(propertiesAction); - - QAction* activatedAction = m_popup->exec(QCursor::pos()); - - if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) { - const KUrl selectedUrl(m_fileInfo.url()); - if (selectedUrl.isValid()) { - DolphinSettings::instance().placesModel()->addPlace(placesName(selectedUrl), - selectedUrl); + addAction(propertiesAction); + + QAction* activatedAction = exec(m_pos); + if (activatedAction) { + if (activatedAction == addToPlacesAction) { + const KUrl selectedUrl(m_fileInfo.url()); + if (selectedUrl.isValid()) { + PlacesItemModel model; + const QString text = selectedUrl.fileName(); + PlacesItem* item = model.createPlacesItem(text, selectedUrl); + model.appendItemToGroup(item); + } + } else if (activatedAction == openParentInNewWindowAction) { + m_command = OpenParentFolderInNewWindow; + } else if (activatedAction == openParentInNewTabAction) { + m_command = OpenParentFolderInNewTab; } } } void DolphinContextMenu::openViewportContextMenu() { - addShowMenubarAction(); - // setup 'Create New' menu KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu(); const DolphinView* view = m_mainWindow->activeViewContainer()->view(); - newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles()); + newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown()); newFileMenu->checkUpToDate(); newFileMenu->setPopupFiles(m_baseUrl); - m_popup->addMenu(newFileMenu->menu()); - m_popup->addSeparator(); + addMenu(newFileMenu->menu()); + addSeparator(); + + // Insert 'New Window' and 'New Tab' entries. Don't use "open_in_new_window" and + // "open_in_new_tab" here, as the current selection should get ignored. + addAction(m_mainWindow->actionCollection()->action("new_window")); + addAction(m_mainWindow->actionCollection()->action("new_tab")); + + // Insert 'Add to Places' entry if exactly one item is selected + QAction* addToPlacesAction = 0; + if (!placeExists(m_mainWindow->activeViewContainer()->url())) { + addToPlacesAction = addAction(QIcon::fromTheme("bookmark-new"), + i18nc("@action:inmenu Add current folder to places", "Add to Places")); + } - // 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(); + addSeparator(); QAction* pasteAction = createPasteAction(); - m_popup->addAction(pasteAction); - m_popup->addSeparator(); + addAction(pasteAction); + addSeparator(); - // insert service actions - const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl); - const KFileItemListProperties baseUrlProperties(KFileItemList() << item); + // Insert service actions + const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem()); KFileItemActions fileItemActions; fileItemActions.setItemListProperties(baseUrlProperties); addServiceActions(fileItemActions); - addVersionControlActions(); + addFileItemPluginActions(); - // 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")); - } + addVersionControlPluginActions(); addCustomActions(); - 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(); - } else if ((addToPlacesAction != 0) && (action == addToPlacesAction)) { - const KUrl& url = m_mainWindow->activeViewContainer()->url(); - if (url.isValid()) { - DolphinSettings::instance().placesModel()->addPlace(placesName(url), url); + QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); + addAction(propertiesAction); + + addShowMenuBarAction(); + + QAction* action = exec(m_pos); + if (addToPlacesAction && (action == addToPlacesAction)) { + const DolphinViewContainer* container = m_mainWindow->activeViewContainer(); + if (container->url().isValid()) { + PlacesItemModel model; + PlacesItem* item = model.createPlacesItem(container->placesText(), + container->url()); + model.appendItemToGroup(item); } } } -void DolphinContextMenu::insertDefaultItemActions() +void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties& properties) { const KActionCollection* collection = m_mainWindow->actionCollection(); // 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()); + addAction(collection->action(KStandardAction::name(KStandardAction::Cut))); + addAction(collection->action(KStandardAction::name(KStandardAction::Copy))); + addAction(createPasteAction()); - m_popup->addSeparator(); + addSeparator(); // Insert 'Rename' QAction* renameAction = collection->action("rename"); - m_popup->addAction(renameAction); + addAction(renameAction); // 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() -{ - KAction* showMenuBar = m_mainWindow->showMenuBarAction(); - if (!m_mainWindow->menuBar()->isVisible()) { - m_popup->addAction(showMenuBar); - m_popup->addSeparator(); + if (properties.supportsDeleting()) { + const bool showDeleteAction = (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false) || + !properties.isLocal()); + const bool showMoveToTrashAction = (properties.isLocal() && + properties.supportsMoving()); + + if (showDeleteAction && showMoveToTrashAction) { + delete m_removeAction; + m_removeAction = 0; + addAction(m_mainWindow->actionCollection()->action("move_to_trash")); + addAction(m_mainWindow->actionCollection()->action("delete")); + } else if (showDeleteAction && !showMoveToTrashAction) { + addAction(m_mainWindow->actionCollection()->action("delete")); + } else { + if (!m_removeAction) { + m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection()); + } + addAction(m_removeAction); + m_removeAction->update(); + } } } -QString DolphinContextMenu::placesName(const KUrl& url) const +void DolphinContextMenu::addShowMenuBarAction() { - QString name = url.fileName(); - if (name.isEmpty()) { - name = url.host(); + const KActionCollection* ac = m_mainWindow->actionCollection(); + QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar)); + if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) { + addSeparator(); + addAction(showMenuBar); } - return name; } bool DolphinContextMenu::placeExists(const KUrl& url) const { - const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel(); - const int count = placesModel->rowCount(); + PlacesItemModel model; + const int count = model.count(); for (int i = 0; i < count; ++i) { - const QModelIndex index = placesModel->index(i, 0); - - if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) { + const KUrl placeUrl = model.placesItem(i)->url(); + if (placeUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { return true; } } + return false; } @@ -389,11 +430,10 @@ QAction* DolphinContextMenu::createPasteAction() QAction* action = 0; const bool isDir = !m_fileInfo.isNull() && m_fileInfo.isDir(); if (isDir && (m_selectedItems.count() == 1)) { - action = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste Into Folder"), this); - const QMimeData* mimeData = QApplication::clipboard()->mimeData(); - const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData); - action->setEnabled(!pasteData.isEmpty() && capabilities().supportsWriting()); - connect(action, SIGNAL(triggered()), m_mainWindow, SLOT(pasteIntoFolder())); + const QPair pasteInfo = KonqOperations::pasteInfo(m_fileInfo.url()); + action = new QAction(QIcon::fromTheme("edit-paste"), i18nc("@action:inmenu", "Paste Into Folder"), this); + action->setEnabled(pasteInfo.first); + connect(action, &QAction::triggered, m_mainWindow, &DolphinMainWindow::pasteIntoFolder); } else { action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste)); } @@ -401,12 +441,20 @@ QAction* DolphinContextMenu::createPasteAction() return action; } -KFileItemListProperties& DolphinContextMenu::capabilities() +KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const +{ + if (!m_selectedItemsProperties) { + m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems); + } + return *m_selectedItemsProperties; +} + +KFileItem DolphinContextMenu::baseFileItem() { - if (m_capabilities == 0) { - m_capabilities = new KFileItemListProperties(m_selectedItems); + if (!m_baseFileItem) { + m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl); } - return *m_capabilities; + return *m_baseFileItem; } void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions) @@ -414,41 +462,72 @@ void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions) fileItemActions.setParentWidget(m_mainWindow); // insert 'Open With...' action or sub menu - fileItemActions.addOpenWithActionsTo(m_popup.data(), "DesktopEntryName != 'dolphin'"); + fileItemActions.addOpenWithActionsTo(this, "DesktopEntryName != 'dolphin'"); // insert 'Actions' sub menu - if (fileItemActions.addServiceActionsTo(m_popup.data())) { - m_popup->addSeparator(); + fileItemActions.addServiceActionsTo(this); +} + +void DolphinContextMenu::addFileItemPluginActions() +{ + KFileItemListProperties props; + if (m_selectedItems.isEmpty()) { + props.setItems(KFileItemList() << baseFileItem()); + } else { + props = selectedItemsProperties(); + } + + QString commonMimeType = props.mimeType(); + if (commonMimeType.isEmpty()) { + commonMimeType = QLatin1String("application/octet-stream"); + } + + const KService::List pluginServices = KMimeTypeTrader::self()->query(commonMimeType, "KFileItemAction/Plugin", "exist Library"); + if (pluginServices.isEmpty()) { + return; + } + + const KConfig config("kservicemenurc", KConfig::NoGlobals); + const KConfigGroup showGroup = config.group("Show"); + + foreach (const KService::Ptr& service, pluginServices) { + if (!showGroup.readEntry(service->desktopEntryName(), true)) { + // The plugin has been disabled + continue; + } + + // Old API (kdelibs-4.6.0 only) + KFileItemActionPlugin* plugin = service->createInstance(); + if (plugin) { + plugin->setParent(this); + addActions(plugin->actions(props, m_mainWindow)); + } + // New API (kdelibs >= 4.6.1) + KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance(); + if (abstractPlugin) { + abstractPlugin->setParent(this); + addActions(abstractPlugin->actions(props, m_mainWindow)); + } } } -void DolphinContextMenu::addVersionControlActions() +void DolphinContextMenu::addVersionControlPluginActions() { const DolphinView* view = m_mainWindow->activeViewContainer()->view(); const QList versionControlActions = view->versionControlActions(m_selectedItems); if (!versionControlActions.isEmpty()) { foreach (QAction* action, versionControlActions) { - m_popup->addAction(action); + addAction(action); } - m_popup->addSeparator(); + addSeparator(); } } void DolphinContextMenu::addCustomActions() { foreach (QAction* action, m_customActions) { - m_popup->addAction(action); + 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"