X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3396d0dbee4e609fa5f7608912b4ac5badd36f72..546384562ae872614cd0c8fa568bd65ae41885da:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 7cf7f6b09..f40b47878 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -20,38 +20,35 @@ #include "dolphincontextmenu.h" +#include "dolphinmainwindow.h" +#include "dolphinsettings.h" +#include "dolphinview.h" +#include "editbookmarkdialog.h" + +#include + #include #include #include -#include -#include -#include -#include -//Added by qt3to4: -#include +#include #include -#include #include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include +#include -#include "dolphinmainwindow.h" -#include "dolphinview.h" -#include "editbookmarkdialog.h" -#include "dolphinsettings.h" - +#include DolphinContextMenu::DolphinContextMenu(DolphinView* parent, - KFileItem* fileInfo, - const QPoint& pos) : + KFileItem* fileInfo) : m_dolphinView(parent), - m_fileInfo(fileInfo), - m_pos(pos) + m_fileInfo(fileInfo) { } @@ -71,59 +68,22 @@ DolphinContextMenu::~DolphinContextMenu() void DolphinContextMenu::openViewportContextMenu() { - // 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 ) - assert(m_fileInfo == 0); - + DolphinMainWindow* dolphin = m_dolphinView->mainWindow(); KMenu* popup = new KMenu(m_dolphinView); - DolphinMainWindow *dolphin = m_dolphinView->mainWindow(); // setup 'Create New' menu - KMenu* createNewMenu = new KMenu(); - - QAction* createFolderAction = dolphin->actionCollection()->action("create_folder"); - if (createFolderAction != 0) { - createNewMenu->addAction(createFolderAction); - } - - createNewMenu->insertSeparator(); - - QLinkedListIterator fileGrouptIt(dolphin->fileGroupActions()); - while (fileGrouptIt.hasNext()) { - createNewMenu->addAction(fileGrouptIt.next()); - } - - // TODO: not used yet. See documentation of Dolphin::linkGroupActions() - // and Dolphin::linkToDeviceActions() in the header file for details. - // - //createNewMenu->insertSeparator(); - // - //QPtrListIterator linkGroupIt(dolphin->linkGroupActions()); - //while ((action = linkGroupIt.current()) != 0) { - // action->plug(createNewMenu); - // ++linkGroupIt; - //} - // - //KMenu* linkToDeviceMenu = new KMenu(); - //QPtrListIterator linkToDeviceIt(dolphin->linkToDeviceActions()); - //while ((action = linkToDeviceIt.current()) != 0) { - // action->plug(linkToDeviceMenu); - // ++linkToDeviceIt; - //} - // - //createNewMenu->insertItem(i18n("Link to Device"), linkToDeviceMenu); - - popup->insertItem(SmallIcon("filenew"), i18n("Create New"), createNewMenu); - popup->insertSeparator(); + KNewMenu* newMenu = dolphin->newMenu(); + newMenu->slotCheckUpToDate(); + newMenu->setPopupFiles(m_dolphinView->url()); + popup->addMenu(newMenu->menu()); + popup->addSeparator(); QAction* pasteAction = dolphin->actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); popup->addAction(pasteAction); // setup 'View Mode' menu - KMenu* viewModeMenu = new KMenu(); + KMenu* viewModeMenu = new KMenu(i18n("View Mode")); QAction* iconsMode = dolphin->actionCollection()->action("icons"); viewModeMenu->addAction(iconsMode); @@ -134,15 +94,15 @@ void DolphinContextMenu::openViewportContextMenu() QAction* previewsMode = dolphin->actionCollection()->action("previews"); viewModeMenu->addAction(previewsMode); - popup->insertItem(i18n("View Mode"), viewModeMenu); - popup->insertSeparator(); + popup->addMenu(viewModeMenu); + popup->addSeparator(); - QAction *bookmarkAction = popup->addAction(i18n("Bookmark this folder")); - popup->insertSeparator(); + QAction* bookmarkAction = popup->addAction(i18n("Bookmark this folder")); + popup->addSeparator(); - QAction *propertiesAction = popup->addAction(i18n("Properties...")); + QAction* propertiesAction = popup->addAction(i18n("Properties...")); - QAction *activatedAction = popup->exec(m_pos); + QAction* activatedAction = popup->exec(QCursor::pos()); if (activatedAction == propertiesAction) { new KPropertiesDialog(dolphin->activeView()->url()); } @@ -165,11 +125,6 @@ void DolphinContextMenu::openViewportContextMenu() void DolphinContextMenu::openItemContextMenu() { - // 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 ) - assert(m_fileInfo != 0); KMenu* popup = new KMenu(m_dolphinView); @@ -177,14 +132,20 @@ void DolphinContextMenu::openItemContextMenu() const KUrl::List urls = m_dolphinView->selectedUrls(); // insert 'Cut', 'Copy' and 'Paste' - const KStandardAction::StandardAction actionNames[] = { KStandardAction::Cut, KStandardAction::Copy, KStandardAction::Paste }; + const KStandardAction::StandardAction actionNames[] = { + KStandardAction::Cut, + KStandardAction::Copy, + KStandardAction::Paste + }; + 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) + if (action != 0) { popup->addAction(action); + } } - popup->insertSeparator(); + popup->addSeparator(); // insert 'Rename' QAction* renameAction = dolphin->actionCollection()->action("rename"); @@ -204,29 +165,27 @@ void DolphinContextMenu::openItemContextMenu() // 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; + QAction* bookmarkAction = 0; if (m_fileInfo->isDir() && (urls.count() == 1)) { bookmarkAction = popup->addAction(i18n("Bookmark this folder")); } - popup->insertSeparator(); - // Insert 'Open With...' sub menu - Q3ValueVector openWithVector; + QVector openWithVector; const QList openWithActions = insertOpenWithItems(popup, openWithVector); // Insert 'Actions' sub menu - Q3ValueVector actionsVector; + QVector actionsVector; const QList serviceActions = insertActionItems(popup, actionsVector); + popup->addSeparator(); // insert 'Properties...' entry - popup->insertSeparator(); QAction* propertiesAction = dolphin->actionCollection()->action("properties"); popup->addAction(propertiesAction); - QAction *activatedAction = popup->exec(m_pos); + QAction* activatedAction = popup->exec(QCursor::pos()); - if (bookmarkAction!=0 && activatedAction == bookmarkAction) { + if ((bookmarkAction!= 0) && (activatedAction == bookmarkAction)) { const KUrl selectedUrl(m_fileInfo->url()); KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), selectedUrl.fileName(), @@ -246,7 +205,7 @@ void DolphinContextMenu::openItemContextMenu() } else if (openWithActions.contains(activatedAction)) { // one of the 'Open With' items has been selected - if (openWithActions.last()==activatedAction) { + if (openWithActions.last() == activatedAction) { // the item 'Other...' has been selected KRun::displayOpenWithDialog(urls, m_dolphinView); } @@ -263,8 +222,13 @@ void DolphinContextMenu::openItemContextMenu() } QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, - Q3ValueVector& openWithVector) + QVector& openWithVector) { + // 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 @@ -273,6 +237,7 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, bool insertOpenWithItems = true; const QString contextMimeType(m_fileInfo->mimetype()); + QListIterator mimeIt(list); while (insertOpenWithItems && mimeIt.hasNext()) { KFileItem* item = mimeIt.next(); @@ -280,7 +245,6 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, } QList openWithActions; - if (insertOpenWithItems) { // fill the 'Open with' sub menu with application types const KMimeType::Ptr mimePtr = KMimeType::findByUrl(m_fileInfo->url()); @@ -289,7 +253,7 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, "Type == 'Application'"); if (offers.count() > 0) { KService::List::Iterator it; - KMenu* openWithMenu = new KMenu(); + 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 @@ -297,30 +261,33 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, // will be skipped here. const QString appName((*it)->name()); if (!containsEntry(openWithMenu, appName)) { - QAction *action = openWithMenu->addAction((*it)->pixmap(K3Icon::Small), - appName); + const KIcon icon((*it)->icon()); + QAction *action = openWithMenu->addAction(icon, appName); openWithVector.append(*it); openWithActions << action; } } - openWithMenu->insertSeparator(); - QAction *action = openWithMenu->addAction(i18n("&Other...")); + openWithMenu->addSeparator(); + QAction* action = openWithMenu->addAction(i18n("&Other...")); + openWithActions << action; - popup->insertItem(i18n("Open With"), openWithMenu); + 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...")); + 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. - QAction *action = popup->addAction(i18n("Open With...")); + popup->addSeparator(); + QAction* action = popup->addAction(i18n("Open With...")); action->setEnabled(false); } @@ -328,9 +295,14 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, } QList DolphinContextMenu::insertActionItems(KMenu* popup, - Q3ValueVector& actionsVector) + QVector& actionsVector) { - KMenu* actionsMenu = new KMenu(); + // 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; @@ -339,13 +311,18 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, KMenu* menu = 0; for (QStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { QDir dir(*dirIt); - QStringList entries = dir.entryList("*.desktop", QDir::Files); + QStringList filters; + filters << "*.desktop"; + dir.setNameFilters(filters); + QStringList entries = dir.entryList(QDir::Files); for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { KSimpleConfig cfg(*dirIt + *entryIt, true); cfg.setDesktopGroup(); if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) { - const QStringList types = cfg.readListEntry("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 @@ -388,8 +365,8 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); if (!submenuName.isEmpty()) { - menu = new KMenu(); - actionsMenu->insertItem(submenuName, menu, submenuID); + menu = new KMenu(submenuName); + actionsMenu->addMenu(menu); } Q3ValueList userServices = @@ -399,7 +376,7 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, 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), + QAction* action = menu->addAction(SmallIcon(service.m_strIcon), service.m_strName); serviceActions << action; } @@ -415,7 +392,7 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, } } - const int itemsCount = actionsMenu->count(); + const int itemsCount = actionsMenu->actions().count(); if (itemsCount == 0) { // no actions are available at all, hence show the "Actions" // submenu disabled @@ -427,29 +404,31 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, // 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 int id = actionsMenu->idAt(0); - const QString text(actionsMenu->text(id)); - QIcon iconSet = actionsMenu->iconSet(id); - if (iconSet.isNull()) { - QAction *action = popup->addAction(text); + 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(iconSet, text); + 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->insertItem(actionsMenu->text(submenuID), menu); + popup->addMenu(menu); } actionsMenu->deleteLater(); actionsMenu = 0; } else { - popup->insertItem(i18n("Actions"), actionsMenu); + popup->addMenu(actionsMenu); } return serviceActions; @@ -460,10 +439,11 @@ bool DolphinContextMenu::containsEntry(const KMenu* menu, { assert(menu != 0); - const uint count = menu->count(); + const QList list = menu->actions(); + const uint count = list.count(); for (uint i = 0; i < count; ++i) { - const int id = menu->idAt(i); - if (menu->text(id) == entryName) { + const QAction* action = list.at(i); + if (action->text() == entryName) { return true; } }