X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/22fcc2c4c5c337a2d0ba387f1d6ac5d38428cd2f..e8c3df5f60aae3c34545c4112b9ec1c323ee66fd:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 601e5f141..f66847334 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -21,61 +21,88 @@ #include "dolphincontextmenu.h" #include "dolphinmainwindow.h" -#include "dolphinsettings.h" -#include "dolphinview.h" +#include "dolphinnewfilemenu.h" #include "dolphinviewcontainer.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dolphin_generalsettings.h" +#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_fileInfo(fileInfo), m_baseUrl(baseUrl), - m_context(NoContext) + m_baseFileItem(0), + m_selectedItems(), + m_selectedItemsProperties(0), + m_context(NoContext), + m_copyToMenu(parent), + m_customActions(), + m_command(None) { // 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(); - m_selectedUrls = view->selectedUrls(); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); m_selectedItems = view->selectedItems(); + + m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection()); } DolphinContextMenu::~DolphinContextMenu() { + delete m_selectedItemsProperties; + m_selectedItemsProperties = 0; +} + +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; } - 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 } @@ -93,48 +120,45 @@ void DolphinContextMenu::open() Q_ASSERT(m_context == NoContext); openViewportContextMenu(); } + + return m_command; +} + +void DolphinContextMenu::keyPressEvent(QKeyEvent *ev) +{ + if (ev->key() == Qt::Key_Shift) { + m_removeAction->update(); + } + KMenu::keyPressEvent(ev); } +void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev) +{ + if (ev->key() == Qt::Key_Shift) { + m_removeAction->update(); + } + KMenu::keyReleaseEvent(ev); +} void DolphinContextMenu::openTrashContextMenu() { Q_ASSERT(m_context & TrashContext); - KMenu* popup = new KMenu(m_mainWindow); - - addShowMenubarAction(popup); - - 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"), this); KConfig trashConfig("trashrc", KConfig::SimpleConfig); emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true)); - popup->addAction(emptyTrashAction); + addAction(emptyTrashAction); - QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"), - i18nc("@action:inmenu Add current folder to places", "Add to Places")); + addCustomActions(); QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); - popup->addAction(propertiesAction); - - QAction *action = popup->exec(QCursor::pos()); - if (action == emptyTrashAction) { - const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will get 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(i18n("Trash"), url); - } - } + addAction(propertiesAction); + + addShowMenuBarAction(); - popup->deleteLater(); + if (exec(m_pos) == emptyTrashAction) { + KonqOperations::emptyTrash(m_mainWindow); + } } void DolphinContextMenu::openTrashItemContextMenu() @@ -142,277 +166,358 @@ void DolphinContextMenu::openTrashItemContextMenu() Q_ASSERT(m_context & TrashContext); Q_ASSERT(m_context & ItemContext); - KMenu* popup = new KMenu(m_mainWindow); - - addShowMenubarAction(popup); - QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow); - popup->addAction(restoreAction); + addAction(restoreAction); QAction* deleteAction = m_mainWindow->actionCollection()->action("delete"); - popup->addAction(deleteAction); + addAction(deleteAction); QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); - popup->addAction(propertiesAction); + addAction(propertiesAction); - if (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()); + } - popup->deleteLater(); + KonqOperations::restoreTrashedItems(selectedUrls, m_mainWindow); + } } void DolphinContextMenu::openItemContextMenu() { Q_ASSERT(!m_fileInfo.isNull()); - KMenu* popup = new KMenu(m_mainWindow); - addShowMenubarAction(popup); - insertDefaultItemActions(popup); + QAction* openParentInNewWindowAction = 0; + QAction* openParentInNewTabAction = 0; + QAction* addToPlacesAction = 0; + if (m_selectedItems.count() == 1) { + if (m_fileInfo.isDir()) { + // setup 'Create New' menu + DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown()); + newFileMenu->checkUpToDate(); + newFileMenu->setPopupFiles(m_fileInfo.url()); + newFileMenu->setEnabled(selectedItemsProperties().supportsWriting()); + connect(newFileMenu, SIGNAL(fileCreated(KUrl)), newFileMenu, SLOT(deleteLater())); + connect(newFileMenu, SIGNAL(directoryCreated(KUrl)), newFileMenu, SLOT(deleteLater())); + + KMenu* menu = newFileMenu->menu(); + menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); + menu->setIcon(KIcon("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(KIcon("bookmark-new"), + i18nc("@action:inmenu Add selected folder to places", + "Add to Places")); + } - popup->addSeparator(); + addSeparator(); + } else if (m_baseUrl.protocol().contains("search")) { + openParentInNewWindowAction = new QAction(KIcon("window-new"), + i18nc("@action:inmenu", + "Open Path in New Window"), + this); + addAction(openParentInNewWindowAction); + + openParentInNewTabAction = new QAction(KIcon("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; + } + } - // 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")); + if (selectionHasOnlyDirs) { + // insert 'Open in new tab' entry + addAction(m_mainWindow->actionCollection()->action("open_in_new_tabs")); + addSeparator(); + } } - // Insert 'Open With...' sub menu - QVector openWithVector; - const QList openWithActions = insertOpenWithItems(popup, openWithVector); + insertDefaultItemActions(); - // Insert 'Actions' sub menu - KonqMenuActions menuActions; - menuActions.setItems(m_selectedItems); - if (menuActions.addActionsTo(popup)) - popup->addSeparator(); + addSeparator(); - // insert 'Properties...' entry - QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); - popup->addAction(propertiesAction); + KFileItemActions fileItemActions; + fileItemActions.setItemListProperties(selectedItemsProperties()); + addServiceActions(fileItemActions); - QAction* activatedAction = popup->exec(QCursor::pos()); + addFileItemPluginActions(); - if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) { - const KUrl selectedUrl(m_fileInfo.url()); - if (selectedUrl.isValid()) { - DolphinSettings::instance().placesModel()->addPlace(placesName(selectedUrl), - selectedUrl); - } - } else if (openWithActions.contains(activatedAction)) { - // one of the 'Open With' items has been selected - if (openWithActions.last() == activatedAction) { - // the item 'Other...' has been selected - KRun::displayOpenWithDialog(m_selectedUrls, m_mainWindow); - } else { - int id = openWithActions.indexOf(activatedAction); - KService::Ptr servicePtr = openWithVector[id]; - KRun::run(*servicePtr, m_selectedUrls, m_mainWindow); - } + addVersionControlPluginActions(); + + // insert 'Copy To' and 'Move To' sub menus + if (GeneralSettings::showCopyMoveMenu()) { + m_copyToMenu.setItems(m_selectedItems); + m_copyToMenu.setReadOnly(!selectedItemsProperties().supportsWriting()); + m_copyToMenu.addActionsTo(this); } - openWithVector.clear(); - popup->deleteLater(); + // insert 'Properties...' entry + QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); + 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() { - KMenu* popup = new KMenu(m_mainWindow); - - addShowMenubarAction(popup); - // 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->hiddenFilesShown()); + newFileMenu->checkUpToDate(); + newFileMenu->setPopupFiles(m_baseUrl); + 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(KIcon("bookmark-new"), + i18nc("@action:inmenu Add current folder to places", "Add to Places")); + } + + addSeparator(); - QAction* pasteAction = m_mainWindow->actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); - popup->addAction(pasteAction); + QAction* pasteAction = createPasteAction(); + addAction(pasteAction); + addSeparator(); - // setup 'View Mode' menu - KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode")); + // Insert service actions + const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem()); + KFileItemActions fileItemActions; + fileItemActions.setItemListProperties(baseUrlProperties); + addServiceActions(fileItemActions); - QAction* iconsMode = m_mainWindow->actionCollection()->action("icons"); - viewModeMenu->addAction(iconsMode); + addFileItemPluginActions(); - QAction* detailsMode = m_mainWindow->actionCollection()->action("details"); - viewModeMenu->addAction(detailsMode); + addVersionControlPluginActions(); - QAction* columnsMode = m_mainWindow->actionCollection()->action("columns"); - viewModeMenu->addAction(columnsMode); + addCustomActions(); - QAction* previewsMode = m_mainWindow->actionCollection()->action("previews"); - viewModeMenu->addAction(previewsMode); + 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); + } + } +} - popup->addMenu(viewModeMenu); +void DolphinContextMenu::insertDefaultItemActions() +{ + const KActionCollection* collection = m_mainWindow->actionCollection(); - popup->addSeparator(); + // Insert 'Cut', 'Copy' and 'Paste' + addAction(collection->action(KStandardAction::name(KStandardAction::Cut))); + addAction(collection->action(KStandardAction::name(KStandardAction::Copy))); + addAction(createPasteAction()); - QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"), - i18nc("@action:inmenu Add current folder to places", "Add to Places")); - popup->addSeparator(); + addSeparator(); - QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties")); + // Insert 'Rename' + QAction* renameAction = collection->action("rename"); + addAction(renameAction); - QAction* action = popup->exec(QCursor::pos()); - if (action == propertiesAction) { - const KUrl& url = m_mainWindow->activeViewContainer()->url(); - KPropertiesDialog dialog(url, m_mainWindow); - dialog.exec(); - } else if (action == addToPlacesAction) { - const KUrl& url = m_mainWindow->activeViewContainer()->url(); - if (url.isValid()) { - DolphinSettings::instance().placesModel()->addPlace(placesName(url), url); - } + // Insert 'Move to Trash' and/or 'Delete' + if (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false)) { + addAction(collection->action("move_to_trash")); + addAction(collection->action("delete")); + } else { + addAction(m_removeAction); + m_removeAction->update(); } +} - popup->deleteLater(); +void DolphinContextMenu::addShowMenuBarAction() +{ + 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); + } } -void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) +bool DolphinContextMenu::placeExists(const KUrl& url) const { - Q_ASSERT(popup != 0); - const KActionCollection* collection = m_mainWindow->actionCollection(); + PlacesItemModel model; - // insert 'Cut', 'Copy' and 'Paste' - QAction* cutAction = collection->action(KStandardAction::stdName(KStandardAction::Cut)); - QAction* copyAction = collection->action(KStandardAction::stdName(KStandardAction::Copy)); - QAction* pasteAction = collection->action(KStandardAction::stdName(KStandardAction::Paste)); + const int count = model.count(); + for (int i = 0; i < count; ++i) { + const KUrl placeUrl = model.placesItem(i)->url(); + if (placeUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { + return true; + } + } - popup->addAction(cutAction); - popup->addAction(copyAction); - popup->addAction(pasteAction); - popup->addSeparator(); + return false; +} - // insert 'Rename' - QAction* renameAction = collection->action("rename"); - popup->addAction(renameAction); - - // insert 'Move to Trash' and (optionally) 'Delete' - KConfigGroup kdeConfig(KGlobal::config(), "KDE"); - bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false); - const KUrl& url = m_mainWindow->activeViewContainer()->url(); - if (url.isLocalFile()) { - QAction* moveToTrashAction = collection->action("move_to_trash"); - popup->addAction(moveToTrashAction); +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() && selectedItemsProperties().supportsWriting()); + connect(action, SIGNAL(triggered()), m_mainWindow, SLOT(pasteIntoFolder())); } else { - showDeleteCommand = true; + action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste)); } - if (showDeleteCommand) { - QAction* deleteAction = collection->action("delete"); - popup->addAction(deleteAction); + return action; +} + +KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const +{ + if (!m_selectedItemsProperties) { + m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems); } + return *m_selectedItemsProperties; } -QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, - QVector& openWithVector) +KFileItem DolphinContextMenu::baseFileItem() { - // Parts of the following code have been taken - // from the class KonqOperations located in - // libqonq/konq_operations.h of Konqueror. - // (Copyright (C) 2000 David Faure ) - - // Prepare 'Open With' sub menu. Usually a sub menu is created, where all applications - // are listed which are registered to open the item. As last entry "Other..." will be - // attached which allows to select a custom application. If no applications are registered - // no sub menu is created at all, only "Open With..." will be offered. - bool insertOpenWithItems = true; - const QString contextMimeType(m_fileInfo.mimetype()); - - QListIterator mimeIt(m_selectedItems); - while (insertOpenWithItems && mimeIt.hasNext()) { - KFileItem item = mimeIt.next(); - insertOpenWithItems = (contextMimeType == item.mimetype()); + if (!m_baseFileItem) { + m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl); } + return *m_baseFileItem; +} - QList openWithActions; - if (insertOpenWithItems) { - // fill the 'Open with' sub menu with application types - const KMimeType::Ptr mimePtr = KMimeType::findByUrl(m_fileInfo.url()); - KService::List offers = KMimeTypeTrader::self()->query(mimePtr->name(), - "Application", - "Type == 'Application'"); - if (offers.count() > 0) { - KService::List::Iterator it; - KMenu* openWithMenu = new KMenu(i18nc("@title:menu", "Open With")); - for (it = offers.begin(); it != offers.end(); ++it) { - // The offer list from the KTrader returns duplicate - // application entries. Although this seems to be a configuration - // problem outside the scope of Dolphin, duplicated entries just - // will be skipped here. - const QString appName((*it)->name()); - if (!containsEntry(openWithMenu, appName)) { - const KIcon icon((*it)->icon()); - QAction* action = openWithMenu->addAction(icon, appName); - openWithVector.append(*it); - openWithActions << action; - } - } +void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions) +{ + fileItemActions.setParentWidget(m_mainWindow); - openWithMenu->addSeparator(); - QAction* action = openWithMenu->addAction(i18nc("@action:inmenu Open With", "&Other...")); + // insert 'Open With...' action or sub menu + fileItemActions.addOpenWithActionsTo(this, "DesktopEntryName != 'dolphin'"); - openWithActions << action; - popup->addMenu(openWithMenu); - } else { - // No applications are registered, hence just offer - // a "Open With..." item instead of a sub menu containing - // only one entry. - QAction* action = popup->addAction(i18nc("@title:menu", "Open With...")); - openWithActions << action; - } + // insert 'Actions' sub menu + fileItemActions.addServiceActionsTo(this); +} + +void DolphinContextMenu::addFileItemPluginActions() +{ + KFileItemListProperties props; + if (m_selectedItems.isEmpty()) { + props.setItems(KFileItemList() << baseFileItem()); } else { - // At least one of the selected items has a different MIME type. In this case - // just show a disabled "Open With..." entry. - QAction* action = popup->addAction(i18nc("@title:menu", "Open With...")); - action->setEnabled(false); + props = selectedItemsProperties(); } - return openWithActions; -} + QString commonMimeType = props.mimeType(); + if (commonMimeType.isEmpty()) { + commonMimeType = QLatin1String("application/octet-stream"); + } -bool DolphinContextMenu::containsEntry(const KMenu* menu, - const QString& entryName) const -{ - Q_ASSERT(menu != 0); + const KService::List pluginServices = KMimeTypeTrader::self()->query(commonMimeType, "KFileItemAction/Plugin", "exist Library"); + if (pluginServices.isEmpty()) { + return; + } - const QList list = menu->actions(); - const uint count = list.count(); - for (uint i = 0; i < count; ++i) { - const QAction* action = list.at(i); - if (action->text() == entryName) { - return true; + const KConfig config("kservicemenurc", KConfig::NoGlobals); + const KConfigGroup showGroup = config.group("Show"); + + foreach (const KSharedPtr& service, pluginServices) { + // Old API (kdelibs-4.6.0 only) + KFileItemActionPlugin* plugin = service->createInstance(); + if (plugin) { + if (!showGroup.readEntry(service->desktopEntryName(), true)) { + // The plugin has been disabled + continue; + } + + plugin->setParent(this); + addActions(plugin->actions(props, m_mainWindow)); } - } + // New API (kdelibs >= 4.6.1) + KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance(); + if (abstractPlugin) { + if (!showGroup.readEntry(service->desktopEntryName(), abstractPlugin->enabledByDefault())) { + // The plugin has been disabled + continue; + } - return false; + abstractPlugin->setParent(this); + addActions(abstractPlugin->actions(props, m_mainWindow)); + } + } } -void DolphinContextMenu::addShowMenubarAction(KMenu* menu) +void DolphinContextMenu::addVersionControlPluginActions() { - KAction* showMenuBar = m_mainWindow->showMenuBarAction(); - if (!m_mainWindow->menuBar()->isVisible()) { - // TODO: it should not be necessary to uncheck the menu - // bar action, but currently the action states don't get - // updated if the menu is disabled - showMenuBar->setChecked(false); - menu->addAction(showMenuBar); - menu->addSeparator(); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + const QList versionControlActions = view->versionControlActions(m_selectedItems); + if (!versionControlActions.isEmpty()) { + foreach (QAction* action, versionControlActions) { + addAction(action); + } + addSeparator(); } } -QString DolphinContextMenu::placesName(const KUrl& url) const +void DolphinContextMenu::addCustomActions() { - QString name = url.fileName(); - if (name.isEmpty()) { - name = url.host(); + foreach (QAction* action, m_customActions) { + addAction(action); } - return name; } #include "dolphincontextmenu.moc"