X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3ebd1027a23502a30a821d27b1f9946dcd595543..78d4fffee8694281190ceab84f47bd2f2dfc8235:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index d27aa99cd..9b49f7c89 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -21,431 +21,425 @@ #include "dolphincontextmenu.h" #include "dolphinmainwindow.h" -#include "dolphinsettings.h" +#include "dolphinnewmenu.h" +#include "settings/dolphinsettings.h" #include "dolphinview.h" -#include "editbookmarkdialog.h" - -#include +#include "dolphinviewcontainer.h" +#include "dolphin_generalsettings.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 + +DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, + const KFileItem& fileInfo, + const KUrl& baseUrl) : + m_mainWindow(parent), + m_capabilities(0), + m_fileInfo(fileInfo), + m_baseUrl(baseUrl), + m_context(NoContext), + m_copyToMenu(parent), + m_customActions() +{ + // 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(); +} + +DolphinContextMenu::~DolphinContextMenu() +{ + delete m_capabilities; + m_capabilities = 0; +} -DolphinContextMenu::DolphinContextMenu(DolphinView* parent, - KFileItem* fileInfo) : - m_dolphinView(parent), - m_fileInfo(fileInfo) +void DolphinContextMenu::setCustomActions(const QList& actions) { + m_customActions = actions; } void DolphinContextMenu::open() { - if (m_fileInfo == 0) { - openViewportContextMenu(); + // get the context information + if (m_baseUrl.protocol() == "trash") { + m_context |= TrashContext; } - else { + + if (!m_fileInfo.isNull() && !m_selectedItems.isEmpty()) { + m_context |= ItemContext; + // TODO: handle other use cases like devices + desktop files + } + + // open the corresponding popup for the context + if (m_context & TrashContext) { + if (m_context & ItemContext) { + openTrashItemContextMenu(); + } else { + openTrashContextMenu(); + } + } else if (m_context & ItemContext) { openItemContextMenu(); + } else { + Q_ASSERT(m_context == NoContext); + openViewportContextMenu(); } } -DolphinContextMenu::~DolphinContextMenu() +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); + KConfig trashConfig("trashrc", KConfig::SimpleConfig); + emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true)); + popup->addAction(emptyTrashAction); + + QAction* addToPlacesAction = 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(popup); + + 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 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); + } + } + + popup->deleteLater(); +} + +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); + + QAction* deleteAction = m_mainWindow->actionCollection()->action("delete"); + popup->addAction(deleteAction); + + QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); + popup->addAction(propertiesAction); + + if (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); + if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) { + // setup 'Create New' menu + DolphinNewMenu* newMenu = new DolphinNewMenu(popup, m_mainWindow); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + newMenu->setViewShowsHiddenFiles(view->showHiddenFiles()); + newMenu->checkUpToDate(); + newMenu->setPopupFiles(m_fileInfo.url()); + newMenu->setEnabled(capabilities().supportsWriting()); + + KMenu* menu = newMenu->menu(); + menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); + menu->setIcon(KIcon("document-new")); + popup->addMenu(newMenu->menu()); + popup->addSeparator(); + + // insert 'Open in new window' and 'Open in new tab' entries + popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window")); + popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab")); + popup->addSeparator(); + } + 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")); + // Don't show if url is already in places + if (placeExists(m_fileInfo.url())) { + addToPlacesAction->setVisible(false); + } + } + + KFileItemActions menuActions; + menuActions.setParentWidget(m_mainWindow); + menuActions.setItemListProperties(m_selectedItems); + + // insert 'Open With...' action or sub menu + menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'"); + + // insert 'Actions' sub menu + if (menuActions.addServiceActionsTo(popup)) { + popup->addSeparator(); + } + + // insert version control actions + addVersionControlActions(popup); + + // 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(); + } + + // insert 'Properties...' entry + QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); + popup->addAction(propertiesAction); + + QAction* activatedAction = 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); + } + } + + popup->deleteLater(); } void DolphinContextMenu::openViewportContextMenu() { - assert(m_fileInfo == 0); - DolphinMainWindow* dolphin = m_dolphinView->mainWindow(); - KMenu* popup = new KMenu(m_dolphinView); + KMenu* popup = new KMenu(m_mainWindow); + + addShowMenubarAction(popup); // setup 'Create New' menu - KNewMenu* newMenu = dolphin->newMenu(); - newMenu->slotCheckUpToDate(); - newMenu->setPopupFiles(m_dolphinView->url()); + KNewFileMenu* newMenu = m_mainWindow->newMenu(); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + newMenu->setViewShowsHiddenFiles(view->showHiddenFiles()); + newMenu->checkUpToDate(); + newMenu->setPopupFiles(m_baseUrl); popup->addMenu(newMenu->menu()); popup->addSeparator(); - QAction* pasteAction = dolphin->actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); + QAction* pasteAction = createPasteAction(); popup->addAction(pasteAction); // setup 'View Mode' menu - KMenu* viewModeMenu = new KMenu(i18n("View Mode")); + KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"), popup); - QAction* iconsMode = dolphin->actionCollection()->action("icons"); + QAction* iconsMode = m_mainWindow->actionCollection()->action("icons"); viewModeMenu->addAction(iconsMode); - QAction* detailsMode = dolphin->actionCollection()->action("details"); + QAction* detailsMode = m_mainWindow->actionCollection()->action("details"); viewModeMenu->addAction(detailsMode); - QAction* previewsMode = dolphin->actionCollection()->action("previews"); - viewModeMenu->addAction(previewsMode); + QAction* columnsMode = m_mainWindow->actionCollection()->action("columns"); + viewModeMenu->addAction(columnsMode); popup->addMenu(viewModeMenu); - popup->addSeparator(); - QAction* bookmarkAction = popup->addAction(i18n("Bookmark this folder")); popup->addSeparator(); - QAction* propertiesAction = popup->addAction(i18n("Properties...")); + addVersionControlActions(popup); - QAction* activatedAction = popup->exec(QCursor::pos()); - if (activatedAction == propertiesAction) { - new KPropertiesDialog(dolphin->activeView()->url()); + QAction* addToPlacesAction = 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); } - else if (activatedAction == bookmarkAction) { - const KUrl& url = dolphin->activeView()->url(); - KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), - url.fileName(), - url, - "bookmark"); - if (!bookmark.isNull()) { - KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); - KBookmarkGroup root = manager->root(); - root.addBookmark(manager, bookmark); - manager->emitChanged(root); + + addCustomActions(popup); + + QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties")); + propertiesAction->setIcon(KIcon("document-properties")); + QAction* action = 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 (action == addToPlacesAction) { + const KUrl& url = m_mainWindow->activeViewContainer()->url(); + if (url.isValid()) { + DolphinSettings::instance().placesModel()->addPlace(placesName(url), url); } } popup->deleteLater(); } -void DolphinContextMenu::openItemContextMenu() +void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) { - assert(m_fileInfo != 0); - - KMenu* popup = new KMenu(m_dolphinView); - DolphinMainWindow* dolphin = m_dolphinView->mainWindow(); - const KUrl::List urls = m_dolphinView->selectedUrls(); + Q_ASSERT(popup != 0); + const KActionCollection* collection = m_mainWindow->actionCollection(); // insert 'Cut', 'Copy' and 'Paste' - const KStandardAction::StandardAction actionNames[] = { - KStandardAction::Cut, - KStandardAction::Copy, - KStandardAction::Paste - }; + QAction* cutAction = collection->action(KStandardAction::name(KStandardAction::Cut)); + QAction* copyAction = collection->action(KStandardAction::name(KStandardAction::Copy)); + QAction* pasteAction = createPasteAction(); - const int count = sizeof(actionNames) / sizeof(KStandardAction::StandardAction); - for (int i = 0; i < count; ++i) { - QAction* action = dolphin->actionCollection()->action(KStandardAction::stdName(actionNames[i])); - if (action != 0) { - popup->addAction(action); - } - } + popup->addAction(cutAction); + popup->addAction(copyAction); + popup->addAction(pasteAction); popup->addSeparator(); // insert 'Rename' - QAction* renameAction = dolphin->actionCollection()->action("rename"); + QAction* renameAction = collection->action("rename"); popup->addAction(renameAction); - // insert 'Move to Trash' for local Urls, otherwise insert 'Delete' - const KUrl& url = dolphin->activeView()->url(); + // 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 = dolphin->actionCollection()->action("move_to_trash"); + QAction* moveToTrashAction = collection->action("move_to_trash"); popup->addAction(moveToTrashAction); + } else { + showDeleteCommand = true; } - else { - QAction* deleteAction = dolphin->actionCollection()->action("delete"); + + if (showDeleteCommand) { + QAction* deleteAction = collection->action("delete"); popup->addAction(deleteAction); } +} - // insert 'Bookmark this folder...' entry - // urls is a list of selected items, so insert boolmark menu if - // urls contains only one item, i.e. no multiple selection made - QAction* bookmarkAction = 0; - if (m_fileInfo->isDir() && (urls.count() == 1)) { - bookmarkAction = popup->addAction(i18n("Bookmark this folder")); +void DolphinContextMenu::addShowMenubarAction(KMenu* menu) +{ + KAction* showMenuBar = m_mainWindow->showMenuBarAction(); + if (!m_mainWindow->menuBar()->isVisible()) { + menu->addAction(showMenuBar); + menu->addSeparator(); } +} - // Insert 'Open With...' sub menu - QVector openWithVector; - const QList openWithActions = insertOpenWithItems(popup, openWithVector); - - // Insert 'Actions' sub menu - QVector actionsVector; - const QList serviceActions = insertActionItems(popup, actionsVector); - popup->addSeparator(); +QString DolphinContextMenu::placesName(const KUrl& url) const +{ + QString name = url.fileName(); + if (name.isEmpty()) { + name = url.host(); + } + return name; +} - // insert 'Properties...' entry - QAction* propertiesAction = dolphin->actionCollection()->action("properties"); - popup->addAction(propertiesAction); +bool DolphinContextMenu::placeExists(const KUrl& url) const +{ + const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel(); + const int count = placesModel->rowCount(); - QAction* activatedAction = popup->exec(QCursor::pos()); + for (int i = 0; i < count; ++i) { + const QModelIndex index = placesModel->index(i, 0); - if ((bookmarkAction!= 0) && (activatedAction == bookmarkAction)) { - const KUrl selectedUrl(m_fileInfo->url()); - KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), - selectedUrl.fileName(), - selectedUrl, - "bookmark"); - if (!bookmark.isNull()) { - KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); - KBookmarkGroup root = manager->root(); - root.addBookmark(manager, bookmark); - manager->emitChanged(root); - } - } - else if (serviceActions.contains(activatedAction)) { - // one of the 'Actions' items has been selected - int id = serviceActions.indexOf(activatedAction); - KDEDesktopMimeType::executeService(urls, actionsVector[id]); - } - 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(urls, m_dolphinView); - } - else { - int id = openWithActions.indexOf(activatedAction); - KService::Ptr servicePtr = openWithVector[id]; - KRun::run(*servicePtr, urls, m_dolphinView); + if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) { + return true; } } - - openWithVector.clear(); - actionsVector.clear(); - popup->deleteLater(); + return false; } -QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, - QVector& openWithVector) +QAction* DolphinContextMenu::createPasteAction() { - // 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. - const KFileItemList list = m_dolphinView->selectedItems(); - - bool insertOpenWithItems = true; - const QString contextMimeType(m_fileInfo->mimetype()); - - QListIterator mimeIt(list); - while (insertOpenWithItems && mimeIt.hasNext()) { - KFileItem* item = mimeIt.next(); - insertOpenWithItems = (contextMimeType == item->mimetype()); - } - - 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(i18n("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; - } - } - - openWithMenu->addSeparator(); - QAction* action = openWithMenu->addAction(i18n("&Other...")); - - openWithActions << action; - popup->addSeparator(); - 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(i18n("Open With...")); - openWithActions << action; - } - } - else { - // At least one of the selected items has a different MIME type. In this case - // just show a disabled "Open With..." entry. - popup->addSeparator(); - QAction* action = popup->addAction(i18n("Open With...")); - action->setEnabled(false); + 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())); + } else { + action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste)); } - return openWithActions; + return action; } -QList DolphinContextMenu::insertActionItems(KMenu* popup, - QVector& actionsVector) +KFileItemListProperties& DolphinContextMenu::capabilities() { - // 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 ) - - KMenu* actionsMenu = new KMenu(i18n("Actions")); - - QList serviceActions; - - QStringList dirs = KGlobal::dirs()->findDirs("data", "dolphin/servicemenus/"); - - KMenu* menu = 0; - for (QStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { - QDir dir(*dirIt); - QStringList filters; - filters << "*.desktop"; - dir.setNameFilters(filters); - QStringList entries = dir.entryList(QDir::Files); - - for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { - KConfigGroup cfg(KSharedConfig::openConfig( *dirIt + *entryIt, KConfig::OnlyLocal), "Desktop Entry" ); - if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) { - //const QStringList types = cfg.readListEntry("ServiceTypes"); - QStringList types; - types = cfg.readEntry("ServiceTypes", types); - for (QStringList::ConstIterator it = types.begin(); it != types.end(); ++it) { - // check whether the mime type is equal or whether the - // mimegroup (e. g. image/*) is supported - - bool insert = false; - if ((*it) == "all/allfiles") { - // The service type is valid for all files, but not for directories. - // Check whether the selected items only consist of files... - const KFileItemList list = m_dolphinView->selectedItems(); - - QListIterator mimeIt(list); - insert = true; - while (insert && mimeIt.hasNext()) { - KFileItem* item = mimeIt.next(); - insert = !item->isDir(); - } - } - - if (!insert) { - // Check whether the MIME types of all selected files match - // to the mimetype of the service action. As soon as one MIME - // type does not match, no service menu is shown at all. - const KFileItemList list = m_dolphinView->selectedItems(); - - QListIterator mimeIt(list); - insert = true; - while (insert && mimeIt.hasNext()) { - KFileItem* item = mimeIt.next(); - const QString mimeType(item->mimetype()); - const QString mimeGroup(mimeType.left(mimeType.indexOf('/'))); - - insert = (*it == mimeType) || - ((*it).right(1) == "*") && - ((*it).left((*it).indexOf('/')) == mimeGroup); - } - } - - if (insert) { - menu = actionsMenu; - - const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); - if (!submenuName.isEmpty()) { - menu = new KMenu(submenuName); - actionsMenu->addMenu(menu); - } - - Q3ValueList userServices = - KDEDesktopMimeType::userDefinedServices(*dirIt + *entryIt, true); - - Q3ValueList::Iterator serviceIt; - for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) { - KDEDesktopMimeType::Service service = (*serviceIt); - if (!service.m_strIcon.isEmpty()) { - QAction* action = menu->addAction(SmallIcon(service.m_strIcon), - service.m_strName); - serviceActions << action; - } - else { - QAction *action = menu->addAction(service.m_strName); - serviceActions << action; - } - actionsVector.append(service); - } - } - } - } - } - } - - const int itemsCount = actionsMenu->actions().count(); - if (itemsCount == 0) { - // no actions are available at all, hence show the "Actions" - // submenu disabled - actionsMenu->setEnabled(false); + if (m_capabilities == 0) { + m_capabilities = new KFileItemListProperties(m_selectedItems); } + return *m_capabilities; +} - if (itemsCount == 1) { - // Exactly one item is available. Instead of showing a sub menu with - // only one item, show the item directly in the root menu. - if (menu == actionsMenu) { - // The item is an action, hence show the action in the root menu. - const QList actions = actionsMenu->actions(); - assert(actions.count() == 1); - - const QString text = actions[0]->text(); - const QIcon icon = actions[0]->icon(); - if (icon.isNull()) { - QAction* action = popup->addAction(text); - serviceActions.clear(); - serviceActions << action; - } - else { - QAction* action = popup->addAction(icon, text); - serviceActions.clear(); - serviceActions << action; - } - } - else { - // The item is a sub menu, hence show the sub menu in the root menu. - popup->addMenu(menu); +void DolphinContextMenu::addVersionControlActions(KMenu* menu) +{ + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + const QList versionControlActions = view->versionControlActions(m_selectedItems); + if (!versionControlActions.isEmpty()) { + foreach (QAction* action, versionControlActions) { + menu->addAction(action); } - actionsMenu->deleteLater(); - actionsMenu = 0; + menu->addSeparator(); } - else { - popup->addMenu(actionsMenu); - } - - return serviceActions; } -bool DolphinContextMenu::containsEntry(const KMenu* menu, - const QString& entryName) const +void DolphinContextMenu::addCustomActions(KMenu* menu) { - assert(menu != 0); - - 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; - } + foreach (QAction* action, m_customActions) { + menu->addAction(action); } - - return false; } + +#include "dolphincontextmenu.moc"