X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5252c12db4929886dbe502013e0a1fee6500f568..de4ffa3322c8d919ebdb0cdb51115bace8aa8d11:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 51ce6bb60..6c4dda80a 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "dolphincontextmenu.h" @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -36,10 +36,11 @@ #include #include #include -#include #include +#include +#include -#include "dolphin.h" +#include "dolphinmainwindow.h" #include "dolphinview.h" #include "editbookmarkdialog.h" #include "dolphinsettings.h" @@ -76,28 +77,23 @@ void DolphinContextMenu::openViewportContextMenu() // (Copyright (C) 2000 David Faure ) assert(m_fileInfo == 0); - const int propertiesID = 100; - const int bookmarkID = 101; - KPopupMenu* popup = new KPopupMenu(m_dolphinView); - Dolphin& dolphin = Dolphin::mainWin(); + KMenu* popup = new KMenu(m_dolphinView); + DolphinMainWindow *dolphin = m_dolphinView->mainWindow(); // setup 'Create New' menu - KPopupMenu* createNewMenu = new KPopupMenu(); + KMenu* createNewMenu = new KMenu(); - KAction* createFolderAction = dolphin.actionCollection()->action("create_folder"); + QAction* createFolderAction = dolphin->actionCollection()->action("create_folder"); if (createFolderAction != 0) { - createFolderAction->plug(createNewMenu); + createNewMenu->addAction(createFolderAction); } createNewMenu->insertSeparator(); - KAction* action = 0; - - Q3PtrListIterator fileGrouptIt(dolphin.fileGroupActions()); - while ((action = fileGrouptIt.current()) != 0) { - action->plug(createNewMenu); - ++fileGrouptIt; + QLinkedListIterator fileGrouptIt(dolphin->fileGroupActions()); + while (fileGrouptIt.hasNext()) { + createNewMenu->addAction(fileGrouptIt.next()); } // TODO: not used yet. See documentation of Dolphin::linkGroupActions() @@ -105,14 +101,14 @@ void DolphinContextMenu::openViewportContextMenu() // //createNewMenu->insertSeparator(); // - //QPtrListIterator linkGroupIt(dolphin.linkGroupActions()); + //QPtrListIterator linkGroupIt(dolphin->linkGroupActions()); //while ((action = linkGroupIt.current()) != 0) { // action->plug(createNewMenu); // ++linkGroupIt; //} // - //KPopupMenu* linkToDeviceMenu = new KPopupMenu(); - //QPtrListIterator linkToDeviceIt(dolphin.linkToDeviceActions()); + //KMenu* linkToDeviceMenu = new KMenu(); + //QPtrListIterator linkToDeviceIt(dolphin->linkToDeviceActions()); //while ((action = linkToDeviceIt.current()) != 0) { // action->plug(linkToDeviceMenu); // ++linkToDeviceIt; @@ -123,37 +119,37 @@ void DolphinContextMenu::openViewportContextMenu() popup->insertItem(SmallIcon("filenew"), i18n("Create New"), createNewMenu); popup->insertSeparator(); - KAction* pasteAction = dolphin.actionCollection()->action(KStdAction::stdName(KStdAction::Paste)); - pasteAction->plug(popup); + QAction* pasteAction = dolphin->actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); + popup->addAction(pasteAction); // setup 'View Mode' menu - KPopupMenu* viewModeMenu = new KPopupMenu(); + KMenu* viewModeMenu = new KMenu(); - KAction* iconsMode = dolphin.actionCollection()->action("icons"); - iconsMode->plug(viewModeMenu); + QAction* iconsMode = dolphin->actionCollection()->action("icons"); + viewModeMenu->addAction(iconsMode); - KAction* detailsMode = dolphin.actionCollection()->action("details"); - detailsMode->plug(viewModeMenu); + QAction* detailsMode = dolphin->actionCollection()->action("details"); + viewModeMenu->addAction(detailsMode); - KAction* previewsMode = dolphin.actionCollection()->action("previews"); - previewsMode->plug(viewModeMenu); + QAction* previewsMode = dolphin->actionCollection()->action("previews"); + viewModeMenu->addAction(previewsMode); popup->insertItem(i18n("View Mode"), viewModeMenu); popup->insertSeparator(); - popup->insertItem(i18n("Bookmark this folder"), bookmarkID); + QAction *bookmarkAction = popup->addAction(i18n("Bookmark this folder")); popup->insertSeparator(); - popup->insertItem(i18n("Properties..."), propertiesID); + QAction *propertiesAction = popup->addAction(i18n("Properties...")); - int id = popup->exec(m_pos); - if (id == propertiesID) { - new KPropertiesDialog(dolphin.activeView()->url()); + QAction *activatedAction = popup->exec(m_pos); + if (activatedAction == propertiesAction) { + new KPropertiesDialog(dolphin->activeView()->url()); } - else if (id == bookmarkID) { - const KURL& url = dolphin.activeView()->url(); + else if (activatedAction == bookmarkAction) { + const KUrl& url = dolphin->activeView()->url(); KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), - url.filename(), + url.fileName(), url, "bookmark"); if (!bookmark.isNull()) { @@ -176,65 +172,66 @@ void DolphinContextMenu::openItemContextMenu() assert(m_fileInfo != 0); - KPopupMenu* popup = new KPopupMenu(m_dolphinView); - Dolphin& dolphin = Dolphin::mainWin(); - const KURL::List urls = m_dolphinView->selectedURLs(); + KMenu* popup = new KMenu(m_dolphinView); + DolphinMainWindow* dolphin = m_dolphinView->mainWindow(); + const KUrl::List urls = m_dolphinView->selectedUrls(); // insert 'Cut', 'Copy' and 'Paste' - const KStdAction::StdAction actionNames[] = { KStdAction::Cut, KStdAction::Copy, KStdAction::Paste }; - const int count = sizeof(actionNames) / sizeof(KStdAction::StdAction); + 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) { - KAction* action = dolphin.actionCollection()->action(KStdAction::stdName(actionNames[i])); + QAction* action = dolphin->actionCollection()->action(KStandardAction::stdName(actionNames[i])); if (action != 0) { - action->plug(popup); + popup->addAction(action); } } popup->insertSeparator(); // insert 'Rename' - KAction* renameAction = dolphin.actionCollection()->action("rename"); - renameAction->plug(popup); + QAction* renameAction = dolphin->actionCollection()->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' for local Urls, otherwise insert 'Delete' + const KUrl& url = dolphin->activeView()->url(); if (url.isLocalFile()) { - KAction* moveToTrashAction = dolphin.actionCollection()->action("move_to_trash"); - moveToTrashAction->plug(popup); + QAction* moveToTrashAction = dolphin->actionCollection()->action("move_to_trash"); + popup->addAction(moveToTrashAction); } else { - KAction* deleteAction = dolphin.actionCollection()->action("delete"); - deleteAction->plug(popup); + QAction* deleteAction = dolphin->actionCollection()->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)) { - popup->insertItem(i18n("Bookmark this folder"), bookmarkID); + bookmarkAction = popup->addAction(i18n("Bookmark this folder")); } popup->insertSeparator(); // Insert 'Open With...' sub menu Q3ValueVector openWithVector; - const int openWithID = insertOpenWithItems(popup, openWithVector); + const QList openWithActions = insertOpenWithItems(popup, openWithVector); // Insert 'Actions' sub menu Q3ValueVector actionsVector; - insertActionItems(popup, actionsVector); + const QList serviceActions = insertActionItems(popup, actionsVector); // insert 'Properties...' entry popup->insertSeparator(); - KAction* propertiesAction = dolphin.actionCollection()->action("properties"); - propertiesAction->plug(popup); + QAction* propertiesAction = dolphin->actionCollection()->action("properties"); + popup->addAction(propertiesAction); - int id = popup->exec(m_pos); + QAction *activatedAction = popup->exec(m_pos); - if (id == bookmarkID) { - const KURL selectedURL(m_fileInfo->url()); + if (bookmarkAction!=0 && activatedAction == bookmarkAction) { + const KUrl selectedUrl(m_fileInfo->url()); KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), - selectedURL.filename(), - selectedURL, + selectedUrl.fileName(), + selectedUrl, "bookmark"); if (!bookmark.isNull()) { KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); @@ -243,19 +240,21 @@ void DolphinContextMenu::openItemContextMenu() manager->emitChanged(root); } } - else if (id >= actionsIDStart) { + else if (serviceActions.contains(activatedAction)) { // one of the 'Actions' items has been selected - KDEDesktopMimeType::executeService(urls, actionsVector[id - actionsIDStart]); + int id = serviceActions.indexOf(activatedAction); + KDEDesktopMimeType::executeService(urls, actionsVector[id]); } - else if (id >= openWithIDStart) { + else if (openWithActions.contains(activatedAction)) { // one of the 'Open With' items has been selected - if (id == openWithID) { + if (openWithActions.last()==activatedAction) { // the item 'Other...' has been selected - KRun::displayOpenWithDialog(urls); + KRun::displayOpenWithDialog(urls, m_dolphinView); } else { - KService::Ptr servicePtr = openWithVector[id - openWithIDStart]; - KRun::run(*servicePtr, urls); + int id = openWithActions.indexOf(activatedAction); + KService::Ptr servicePtr = openWithVector[id]; + KRun::run(*servicePtr, urls, m_dolphinView); } } @@ -264,36 +263,34 @@ void DolphinContextMenu::openItemContextMenu() popup->deleteLater(); } -int DolphinContextMenu::insertOpenWithItems(KPopupMenu* popup, - Q3ValueVector& openWithVector) +QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, + Q3ValueVector& openWithVector) { // 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(); - assert(list != 0); + const KFileItemList list = m_dolphinView->selectedItems(); bool insertOpenWithItems = true; const QString contextMimeType(m_fileInfo->mimetype()); - KFileItemListIterator mimeIt(*list); - KFileItem* item = 0; - while (insertOpenWithItems && ((item = mimeIt.current()) != 0)) { + QListIterator mimeIt(list); + while (insertOpenWithItems && mimeIt.hasNext()) { + KFileItem* item = mimeIt.next(); insertOpenWithItems = (contextMimeType == item->mimetype()); - ++mimeIt; } - int openWithID = -1; + QList openWithActions; if (insertOpenWithItems) { // fill the 'Open with' sub menu with application types - const KMimeType::Ptr mimePtr = KMimeType::findByURL(m_fileInfo->url()); - KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(), - "Type == 'Application'"); - int index = openWithIDStart; + const KMimeType::Ptr mimePtr = KMimeType::findByUrl(m_fileInfo->url()); + KService::List offers = KMimeTypeTrader::self()->query(mimePtr->name(), + "Application", + "Type == 'Application'"); if (offers.count() > 0) { - KTrader::OfferList::Iterator it; - KPopupMenu* openWithMenu = new KPopupMenu(); + KService::List::Iterator it; + KMenu* openWithMenu = new KMenu(); 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 @@ -301,47 +298,46 @@ int DolphinContextMenu::insertOpenWithItems(KPopupMenu* popup, // will be skipped here. const QString appName((*it)->name()); if (!containsEntry(openWithMenu, appName)) { - openWithMenu->insertItem((*it)->pixmap(KIcon::Small), - appName, index); + const KIcon icon((*it)->icon()); + QAction *action = openWithMenu->addAction(icon, appName); openWithVector.append(*it); - ++index; + openWithActions << action; } } openWithMenu->insertSeparator(); - openWithMenu->insertItem(i18n("&Other..."), index); + QAction *action = openWithMenu->addAction(i18n("&Other...")); + openWithActions << action; popup->insertItem(i18n("Open With"), openWithMenu); } else { // No applications are registered, hence just offer // a "Open With..." item instead of a sub menu containing // only one entry. - popup->insertItem(i18n("Open With..."), openWithIDStart); + QAction *action = popup->addAction(i18n("Open With...")); + openWithActions << action; } - openWithID = index; } else { // At least one of the selected items has a different MIME type. In this case // just show a disabled "Open With..." entry. - popup->insertItem(i18n("Open With..."), openWithIDStart); - popup->setItemEnabled(openWithIDStart, false); + QAction *action = popup->addAction(i18n("Open With...")); + action->setEnabled(false); } - popup->setItemEnabled(openWithID, insertOpenWithItems); - - return openWithID; + return openWithActions; } -void DolphinContextMenu::insertActionItems(KPopupMenu* popup, - Q3ValueVector& actionsVector) +QList DolphinContextMenu::insertActionItems(KMenu* popup, + Q3ValueVector& actionsVector) { - KPopupMenu* actionsMenu = new KPopupMenu(); + KMenu* actionsMenu = new KMenu(); - int actionsIndex = 0; + QList serviceActions; QStringList dirs = KGlobal::dirs()->findDirs("data", "dolphin/servicemenus/"); - KPopupMenu* menu = 0; + KMenu* menu = 0; for (QStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { QDir dir(*dirIt); QStringList entries = dir.entryList("*.desktop", QDir::Files); @@ -359,15 +355,13 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup, 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(); - assert(list != 0); + const KFileItemList list = m_dolphinView->selectedItems(); - KFileItemListIterator mimeIt(*list); - KFileItem* item = 0; + QListIterator mimeIt(list); insert = true; - while (insert && ((item = mimeIt.current()) != 0)) { + while (insert && mimeIt.hasNext()) { + KFileItem* item = mimeIt.next(); insert = !item->isDir(); - ++mimeIt; } } @@ -375,20 +369,18 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup, // 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(); - assert(list != 0); + const KFileItemList list = m_dolphinView->selectedItems(); - KFileItemListIterator mimeIt(*list); - KFileItem* item = 0; + QListIterator mimeIt(list); insert = true; - while (insert && ((item = mimeIt.current()) != 0)) { - const QString mimeType((*mimeIt)->mimetype()); - const QString mimeGroup(mimeType.left(mimeType.find('/'))); + 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).find('/')) == mimeGroup); - ++mimeIt; + ((*it).left((*it).indexOf('/')) == mimeGroup); } } @@ -397,7 +389,7 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup, const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); if (!submenuName.isEmpty()) { - menu = new KPopupMenu(); + menu = new KMenu(); actionsMenu->insertItem(submenuName, menu, submenuID); } @@ -408,16 +400,15 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup, for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) { KDEDesktopMimeType::Service service = (*serviceIt); if (!service.m_strIcon.isEmpty()) { - menu->insertItem(SmallIcon(service.m_strIcon), - service.m_strName, - actionsIDStart + actionsIndex); + QAction *action = menu->addAction(SmallIcon(service.m_strIcon), + service.m_strName); + serviceActions << action; } else { - menu->insertItem(service.m_strName, - actionsIDStart + actionsIndex); + QAction *action = menu->addAction(service.m_strName); + serviceActions << action; } actionsVector.append(service); - ++actionsIndex; } } } @@ -439,12 +430,16 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup, // 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)); - const QIcon* iconSet = actionsMenu->iconSet(id); - if (iconSet == 0) { - popup->insertItem(text, id); + QIcon iconSet = actionsMenu->iconSet(id); + if (iconSet.isNull()) { + QAction *action = popup->addAction(text); + serviceActions.clear(); + serviceActions << action; } else { - popup->insertItem(*iconSet, text, id); + QAction *action = popup->addAction(iconSet, text); + serviceActions.clear(); + serviceActions << action; } } else { @@ -457,9 +452,11 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup, else { popup->insertItem(i18n("Actions"), actionsMenu); } + + return serviceActions; } -bool DolphinContextMenu::containsEntry(const KPopupMenu* menu, +bool DolphinContextMenu::containsEntry(const KMenu* menu, const QString& entryName) const { assert(menu != 0);