X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/91a6cb80fdf03471fc975a031707bdeebf692483..792ebd6691026d817442fe4a32a822a0ef68e767:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 8bd67111b..648928e0f 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -32,11 +32,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -46,7 +48,6 @@ #include #include #include -#include DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, const KFileItem& fileInfo, @@ -74,7 +75,7 @@ void DolphinContextMenu::open() m_context |= TrashContext; } - if (!m_fileInfo.isNull()) { + if (!m_fileInfo.isNull() && (m_selectedItems.count() > 0)) { m_context |= ItemContext; // TODO: handle other use cases like devices + desktop files } @@ -101,15 +102,21 @@ void DolphinContextMenu::openTrashContextMenu() KMenu* popup = new KMenu(m_mainWindow); - QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18nc("@action:inmenu", "Empty Trash"), popup); - KConfig trashConfig("trashrc", KConfig::OnlyLocal); + 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")); + QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); popup->addAction(propertiesAction); - if (popup->exec(QCursor::pos()) == emptyTrashAction) { + 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, @@ -120,6 +127,11 @@ void DolphinContextMenu::openTrashContextMenu() 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); + } } popup->deleteLater(); @@ -132,6 +144,8 @@ void DolphinContextMenu::openTrashItemContextMenu() KMenu* popup = new KMenu(m_mainWindow); + addShowMenubarAction(popup); + QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow); popup->addAction(restoreAction); @@ -153,15 +167,16 @@ 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* bookmarkAction = 0; + QAction* addToPlacesAction = 0; if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) { - bookmarkAction = popup->addAction(KIcon("bookmark-folder"), - i18nc("@action:inmenu", "Bookmark Folder...")); + addToPlacesAction = popup->addAction(KIcon("bookmark-new"), + i18nc("@action:inmenu Add selected folder to places", "Add to Places")); } // Insert 'Open With...' sub menu @@ -169,9 +184,10 @@ void DolphinContextMenu::openItemContextMenu() const QList openWithActions = insertOpenWithItems(popup, openWithVector); // Insert 'Actions' sub menu - QVector actionsVector; - const QList serviceActions = insertActionItems(popup, actionsVector); - popup->addSeparator(); + KonqMenuActions menuActions; + menuActions.setItems(m_selectedItems); + if (menuActions.addActionsTo(popup)) + popup->addSeparator(); // insert 'Properties...' entry QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); @@ -179,16 +195,12 @@ void DolphinContextMenu::openItemContextMenu() QAction* activatedAction = popup->exec(QCursor::pos()); - if ((bookmarkAction != 0) && (activatedAction == bookmarkAction)) { + if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) { const KUrl selectedUrl(m_fileInfo.url()); if (selectedUrl.isValid()) { DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(), selectedUrl); } - } else if (serviceActions.contains(activatedAction)) { - // one of the 'Actions' items has been selected - int id = serviceActions.indexOf(activatedAction); - KDesktopFileActions::executeService(m_selectedUrls, actionsVector[id]); } else if (openWithActions.contains(activatedAction)) { // one of the 'Open With' items has been selected if (openWithActions.last() == activatedAction) { @@ -202,15 +214,15 @@ void DolphinContextMenu::openItemContextMenu() } openWithVector.clear(); - actionsVector.clear(); popup->deleteLater(); } void DolphinContextMenu::openViewportContextMenu() { - Q_ASSERT(m_fileInfo.isNull()); KMenu* popup = new KMenu(m_mainWindow); + addShowMenubarAction(popup); + // setup 'Create New' menu KNewMenu* newMenu = m_mainWindow->newMenu(); newMenu->slotCheckUpToDate(); @@ -240,8 +252,8 @@ void DolphinContextMenu::openViewportContextMenu() popup->addSeparator(); - QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), - i18nc("@action:inmenu", "Bookmark This Folder...")); + QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"), + i18nc("@action:inmenu Add current folder to places", "Add to Places")); popup->addSeparator(); QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties")); @@ -251,7 +263,7 @@ void DolphinContextMenu::openViewportContextMenu() const KUrl& url = m_mainWindow->activeViewContainer()->url(); KPropertiesDialog dialog(url); dialog.exec(); - } else if (action == bookmarkAction) { + } else if (action == addToPlacesAction) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isValid()) { DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url); @@ -281,8 +293,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) popup->addAction(renameAction); // insert 'Move to Trash' and (optionally) 'Delete' - const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); - const KConfigGroup kdeConfig(globalConfig, "KDE"); + KConfigGroup kdeConfig(KGlobal::config(), "KDE"); bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false); const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isLocalFile()) { @@ -365,137 +376,6 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, return openWithActions; } -QList DolphinContextMenu::insertActionItems(KMenu* popup, - QVector& actionsVector) -{ - // 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(i18nc("@title:menu", "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... - QListIterator mimeIt(m_selectedItems); - 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. - QListIterator mimeIt(m_selectedItems); - 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 = - KDesktopFileActions::userDefinedServices(*dirIt + *entryIt, true); - - Q3ValueList::Iterator serviceIt; - for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) { - KDesktopFileActions::Service service = (*serviceIt); - if (!service.m_strIcon.isEmpty()) { - QAction* action = menu->addAction(KIcon(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 (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(); - Q_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); - } - actionsMenu->deleteLater(); - actionsMenu = 0; - } else { - popup->addMenu(actionsMenu); - } - - return serviceActions; -} - bool DolphinContextMenu::containsEntry(const KMenu* menu, const QString& entryName) const { @@ -513,4 +393,17 @@ bool DolphinContextMenu::containsEntry(const KMenu* menu, return false; } +void DolphinContextMenu::addShowMenubarAction(KMenu* menu) +{ + 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(); + } +} + #include "dolphincontextmenu.moc"