X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/be9746e87bb6a42e641dbf36c528a60fb564420a..26a15eb88e209322ef3910a80c056502400c9bf5:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index ce14c37ef..e7f4bceaa 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,10 +48,9 @@ #include #include #include -#include DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, - KFileItem* fileInfo, + const KFileItem& fileInfo, const KUrl& baseUrl) : m_mainWindow(parent), m_fileInfo(fileInfo), @@ -64,7 +65,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, } DolphinContextMenu::~DolphinContextMenu() -{} +{ +} void DolphinContextMenu::open() { @@ -73,7 +75,7 @@ void DolphinContextMenu::open() m_context |= TrashContext; } - if (m_fileInfo != 0) { + if (!m_fileInfo.isNull() && (m_selectedItems.count() > 0)) { m_context |= ItemContext; // TODO: handle other use cases like devices + desktop files } @@ -100,24 +102,36 @@ void DolphinContextMenu::openTrashContextMenu() KMenu* popup = new KMenu(m_mainWindow); - QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18n("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("folder-bookmarks"), + 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) { - const QString text(i18n("Do you really want to empty the Trash? All items will get deleted.")); + 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(i18n("Empty Trash"), KIcon("user-trash")) + 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); + } } popup->deleteLater(); @@ -130,7 +144,9 @@ void DolphinContextMenu::openTrashItemContextMenu() KMenu* popup = new KMenu(m_mainWindow); - QAction* restoreAction = new QAction(i18n("Restore"), m_mainWindow); + addShowMenubarAction(popup); + + QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow); popup->addAction(restoreAction); QAction* deleteAction = m_mainWindow->actionCollection()->action("delete"); @@ -148,17 +164,19 @@ void DolphinContextMenu::openTrashItemContextMenu() void DolphinContextMenu::openItemContextMenu() { - Q_ASSERT(m_fileInfo != 0); + 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; - if (m_fileInfo->isDir() && (m_selectedUrls.count() == 1)) { - bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark Folder...")); + QAction* addToPlacesAction = 0; + if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) { + addToPlacesAction = popup->addAction(KIcon("folder-bookmarks"), + i18nc("@action:inmenu Add selected folder to places", "Add to Places")); } // Insert 'Open With...' sub menu @@ -166,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"); @@ -176,16 +195,12 @@ void DolphinContextMenu::openItemContextMenu() QAction* activatedAction = popup->exec(QCursor::pos()); - if ((bookmarkAction != 0) && (activatedAction == bookmarkAction)) { - const KUrl selectedUrl(m_fileInfo->url()); + if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) { + const KUrl selectedUrl(m_fileInfo.url()); if (selectedUrl.isValid()) { DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(), - selectedUrl); + 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) { @@ -199,15 +214,15 @@ void DolphinContextMenu::openItemContextMenu() } openWithVector.clear(); - actionsVector.clear(); popup->deleteLater(); } void DolphinContextMenu::openViewportContextMenu() { - Q_ASSERT(m_fileInfo == 0); KMenu* popup = new KMenu(m_mainWindow); + addShowMenubarAction(popup); + // setup 'Create New' menu KNewMenu* newMenu = m_mainWindow->newMenu(); newMenu->slotCheckUpToDate(); @@ -219,7 +234,7 @@ void DolphinContextMenu::openViewportContextMenu() popup->addAction(pasteAction); // setup 'View Mode' menu - KMenu* viewModeMenu = new KMenu(i18n("View Mode")); + KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode")); QAction* iconsMode = m_mainWindow->actionCollection()->action("icons"); viewModeMenu->addAction(iconsMode); @@ -234,19 +249,21 @@ void DolphinContextMenu::openViewportContextMenu() viewModeMenu->addAction(previewsMode); popup->addMenu(viewModeMenu); + popup->addSeparator(); - QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark This Folder...")); + QAction* addToPlacesAction = popup->addAction(KIcon("folder-bookmarks"), + i18nc("@action:inmenu Add current folder to places", "Add to Places")); popup->addSeparator(); - QAction* propertiesAction = popup->addAction(i18n("Properties")); + QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties")); - QAction* activatedAction = popup->exec(QCursor::pos()); - if (activatedAction == propertiesAction) { + QAction* action = popup->exec(QCursor::pos()); + if (action == propertiesAction) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); KPropertiesDialog dialog(url); dialog.exec(); - } else if (activatedAction == bookmarkAction) { + } else if (action == addToPlacesAction) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isValid()) { DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url); @@ -276,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()) { @@ -306,24 +322,24 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, // 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()); + const QString contextMimeType(m_fileInfo.mimetype()); - QListIterator mimeIt(m_selectedItems); + QListIterator mimeIt(m_selectedItems); while (insertOpenWithItems && mimeIt.hasNext()) { - KFileItem* item = mimeIt.next(); - insertOpenWithItems = (contextMimeType == item->mimetype()); + 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()); + 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")); + 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 @@ -339,7 +355,7 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, } openWithMenu->addSeparator(); - QAction* action = openWithMenu->addAction(i18n("&Other...")); + QAction* action = openWithMenu->addAction(i18nc("@action:inmenu Open With", "&Other...")); openWithActions << action; popup->addMenu(openWithMenu); @@ -347,150 +363,19 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, // 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...")); + QAction* action = popup->addAction(i18nc("@title:menu", "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. - QAction* action = popup->addAction(i18n("Open With...")); + QAction* action = popup->addAction(i18nc("@title:menu", "Open With...")); action->setEnabled(false); } 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(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... - 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 { @@ -508,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"