]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/dolphincontextmenu.cpp
projects / dolphin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...
[dolphin.git] / src / dolphincontextmenu.cpp
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index bea01afc44dc516212770693f71265b45d495500..f40b4787881d79e87aa903584be60774e25f2112 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -15,42 +15,40 @@
  *   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.,                                       *
  *   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"
 
  ***************************************************************************/
 
 #include "dolphincontextmenu.h"
 
+#include "dolphinmainwindow.h"
+#include "dolphinsettings.h"
+#include "dolphinview.h"
+#include "editbookmarkdialog.h"
+
+#include <assert.h>
+
 #include <kactioncollection.h>
 #include <kbookmarkmanager.h>
 #include <kbookmark.h>
 #include <kactioncollection.h>
 #include <kbookmarkmanager.h>
 #include <kbookmark.h>
-#include <ktrader.h>
-#include <klocale.h>
-#include <krun.h>
-#include <qdir.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <kdesktopfile.h>
 #include <kglobal.h>
 #include <kglobal.h>
-#include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kiconloader.h>
-#include <kaction.h>
-#include <kpropertiesdialog.h>
-#include <kdesktopfile.h>
-#include <assert.h>
-#include <ksortablevaluelist.h>
 #include <kio/netaccess.h>
 #include <kio/netaccess.h>
+#include <kmenu.h>
+#include <kmimetypetrader.h>
+#include <knewmenu.h>
+#include <klocale.h>
+#include <kpropertiesdialog.h>
+#include <krun.h>
+#include <kstandardaction.h>
+#include <kstandarddirs.h>
 
 
-#include "dolphin.h"
-#include "dolphinview.h"
-#include "editbookmarkdialog.h"
-#include "dolphinsettings.h"
-
+#include <QDir>
 
 DolphinContextMenu::DolphinContextMenu(DolphinView* parent,
 
 DolphinContextMenu::DolphinContextMenu(DolphinView* parent,
-                                       KFileItem* fileInfo,
-                                       const QPoint& pos) :
+                                       KFileItem* fileInfo) :
    m_dolphinView(parent),
    m_dolphinView(parent),
-   m_fileInfo(fileInfo),
-   m_pos(pos)
+   m_fileInfo(fileInfo)
 {
 }
 
 {
 }
 
@@ -70,90 +68,48 @@ DolphinContextMenu::~DolphinContextMenu()
 
 void DolphinContextMenu::openViewportContextMenu()
 {
 
 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 <faure@kde.org>)
-
     assert(m_fileInfo == 0);
     assert(m_fileInfo == 0);
-    const int propertiesID = 100;
-       const int bookmarkID = 101;
-
+    DolphinMainWindow* dolphin = m_dolphinView->mainWindow();
     KMenu* popup = new KMenu(m_dolphinView);
     KMenu* popup = new KMenu(m_dolphinView);
-    Dolphin& dolphin = Dolphin::mainWin();
 
     // setup 'Create New' menu
 
     // setup 'Create New' menu
-    KMenu* createNewMenu = new KMenu();
+    KNewMenu* newMenu = dolphin->newMenu();
+    newMenu->slotCheckUpToDate();
+    newMenu->setPopupFiles(m_dolphinView->url());
+    popup->addMenu(newMenu->menu());
+    popup->addSeparator();
 
 
-    KAction* createFolderAction = dolphin.actionCollection()->action("create_folder");
-    if (createFolderAction != 0) {
-        createFolderAction->plug(createNewMenu);
-    }
-
-    createNewMenu->insertSeparator();
-
-    KAction* action = 0;
-
-    Q3PtrListIterator<KAction> fileGrouptIt(dolphin.fileGroupActions());
-    while ((action = fileGrouptIt.current()) != 0) {
-        action->plug(createNewMenu);
-        ++fileGrouptIt;
-    }
-
-    // TODO: not used yet. See documentation of Dolphin::linkGroupActions()
-    // and Dolphin::linkToDeviceActions() in the header file for details.
-    //
-    //createNewMenu->insertSeparator();
-    //
-    //QPtrListIterator<KAction> linkGroupIt(dolphin.linkGroupActions());
-    //while ((action = linkGroupIt.current()) != 0) {
-    //    action->plug(createNewMenu);
-    //    ++linkGroupIt;
-    //}
-    //
-    //KPopupMenu* linkToDeviceMenu = new KPopupMenu();
-    //QPtrListIterator<KAction> 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();
-
-    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
 
     // setup 'View Mode' menu
-    KMenu* viewModeMenu = new KMenu();
+    KMenu* viewModeMenu = new KMenu(i18n("View Mode"));
 
 
-    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->addMenu(viewModeMenu);
+    popup->addSeparator();
 
 
-    popup->insertItem(i18n("Bookmark this folder"), bookmarkID);
-    popup->insertSeparator();
+    QAction* bookmarkAction = popup->addAction(i18n("Bookmark this folder"));
+    popup->addSeparator();
 
 
-    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(QCursor::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"),
         KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),
-                                                             url.filename(),
+                                                             url.fileName(),
                                                              url,
                                                              "bookmark");
         if (!bookmark.isNull()) {
                                                              url,
                                                              "bookmark");
         if (!bookmark.isNull()) {
@@ -169,72 +125,71 @@ void DolphinContextMenu::openViewportContextMenu()
 
 void DolphinContextMenu::openItemContextMenu()
 {
 
 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 <faure@kde.org>)
-
     assert(m_fileInfo != 0);
 
     KMenu* popup = new KMenu(m_dolphinView);
     assert(m_fileInfo != 0);
 
     KMenu* popup = new KMenu(m_dolphinView);
-    Dolphin& dolphin = Dolphin::mainWin();
-    const KURL::List urls = m_dolphinView->selectedURLs();
+    DolphinMainWindow* dolphin = m_dolphinView->mainWindow();
+    const KUrl::List urls = m_dolphinView->selectedUrls();
 
     // insert 'Cut', 'Copy' and 'Paste'
 
     // 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) {
     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) {
         if (action != 0) {
-            action->plug(popup);
+            popup->addAction(action);
         }
     }
         }
     }
-    popup->insertSeparator();
+    popup->addSeparator();
 
     // insert 'Rename'
 
     // 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()) {
     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 {
     }
     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
     }
 
     // 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)) {
     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
     // Insert 'Open With...' sub menu
-    Q3ValueVector<KService::Ptr> openWithVector;
-    const int openWithID = insertOpenWithItems(popup, openWithVector);
+    QVector<KService::Ptr> openWithVector;
+    const QList<QAction*> openWithActions = insertOpenWithItems(popup, openWithVector);
 
     // Insert 'Actions' sub menu
 
     // Insert 'Actions' sub menu
-    Q3ValueVector<KDEDesktopMimeType::Service> actionsVector;
-    insertActionItems(popup, actionsVector);
+    QVector<KDEDesktopMimeType::Service> actionsVector;
+    const QList<QAction*> serviceActions = insertActionItems(popup, actionsVector);
+    popup->addSeparator();
 
     // insert 'Properties...' entry
 
     // 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(QCursor::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"),
         KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),
-                                                             selectedURL.filename(),
-                                                             selectedURL,
+                                                             selectedUrl.fileName(),
+                                                             selectedUrl,
                                                              "bookmark");
         if (!bookmark.isNull()) {
             KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager();
                                                              "bookmark");
         if (!bookmark.isNull()) {
             KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager();
@@ -243,19 +198,21 @@ void DolphinContextMenu::openItemContextMenu()
             manager->emitChanged(root);
         }
     }
             manager->emitChanged(root);
         }
     }
-    else if (id >= actionsIDStart) {
+    else if (serviceActions.contains(activatedAction)) {
         // one of the 'Actions' items has been selected
         // 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
         // one of the 'Open With' items has been selected
-        if (id == openWithID) {
+        if (openWithActions.last() == activatedAction) {
             // the item 'Other...' has been selected
             // the item 'Other...' has been selected
-            KRun::displayOpenWithDialog(urls);
+            KRun::displayOpenWithDialog(urls, m_dolphinView);
         }
         else {
         }
         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 +221,39 @@ void DolphinContextMenu::openItemContextMenu()
     popup->deleteLater();
 }
 
     popup->deleteLater();
 }
 
-int DolphinContextMenu::insertOpenWithItems(KMenu* popup,
-                                            Q3ValueVector<KService::Ptr>& openWithVector)
+QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
+                                                        QVector<KService::Ptr>& 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 <faure@kde.org>)
+
     // 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.
     // 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());
 
     bool insertOpenWithItems = true;
     const QString contextMimeType(m_fileInfo->mimetype());
-    KFileItemListIterator mimeIt(*list);
-    KFileItem* item = 0;
-    while (insertOpenWithItems && ((item = mimeIt.current()) != 0)) {
+
+    QListIterator<KFileItem*> mimeIt(list);
+    while (insertOpenWithItems && mimeIt.hasNext()) {
+        KFileItem* item = mimeIt.next();
         insertOpenWithItems = (contextMimeType == item->mimetype());
         insertOpenWithItems = (contextMimeType == item->mimetype());
-        ++mimeIt;
     }
 
     }
 
-    int openWithID = -1;
-
+    QList<QAction*> openWithActions;
     if (insertOpenWithItems) {
         // fill the 'Open with' sub menu with application types
     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) {
         if (offers.count() > 0) {
-            KTrader::OfferList::Iterator it;
-            KMenu* openWithMenu = new KMenu();
+            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
             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,56 +261,68 @@ int DolphinContextMenu::insertOpenWithItems(KMenu* popup,
                 // will be skipped here.
                 const QString appName((*it)->name());
                 if (!containsEntry(openWithMenu, appName)) {
                 // 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);
                     openWithVector.append(*it);
-                    ++index;
+                    openWithActions << action;
                 }
             }
 
                 }
             }
 
-            openWithMenu->insertSeparator();
-            openWithMenu->insertItem(i18n("&Other..."), index);
-            popup->insertItem(i18n("Open With"), openWithMenu);
+            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.
         }
         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.
     }
     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);
+        popup->addSeparator();
+        QAction* action = popup->addAction(i18n("Open With..."));
+        action->setEnabled(false);
     }
 
     }
 
-    popup->setItemEnabled(openWithID, insertOpenWithItems);
-
-    return openWithID;
+    return openWithActions;
 }
 
 }
 
-void DolphinContextMenu::insertActionItems(KMenu* popup,
-                                           Q3ValueVector<KDEDesktopMimeType::Service>& actionsVector)
+QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
+                                                      QVector<KDEDesktopMimeType::Service>& 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 <faure@kde.org>)
+
+    KMenu* actionsMenu = new KMenu(i18n("Actions"));
 
 
-    int actionsIndex = 0;
+    QList<QAction*> 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 dirs = KGlobal::dirs()->findDirs("data", "dolphin/servicemenus/");
 
     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")) {
 
         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
                 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
@@ -359,15 +331,13 @@ void DolphinContextMenu::insertActionItems(KMenu* 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...
                     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<KFileItem*> mimeIt(list);
                         insert = true;
                         insert = true;
-                        while (insert && ((item = mimeIt.current()) != 0)) {
+                        while (insert && mimeIt.hasNext()) {
+                            KFileItem* item = mimeIt.next();
                             insert = !item->isDir();
                             insert = !item->isDir();
-                            ++mimeIt;
                         }
                     }
 
                         }
                     }
 
@@ -375,20 +345,18 @@ void DolphinContextMenu::insertActionItems(KMenu* 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.
                         // 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<KFileItem*> mimeIt(list);
                         insert = true;
                         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) == "*") &&
 
                             insert  = (*it == mimeType) ||
                                       ((*it).right(1) == "*") &&
-                                      ((*it).left((*it).find('/')) == mimeGroup);
-                            ++mimeIt;
+                                      ((*it).left((*it).indexOf('/')) == mimeGroup);
                         }
                     }
 
                         }
                     }
 
@@ -397,8 +365,8 @@ void DolphinContextMenu::insertActionItems(KMenu* popup,
 
                         const QString submenuName = cfg.readEntry( "X-KDE-Submenu" );
                         if (!submenuName.isEmpty()) {
 
                         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<KDEDesktopMimeType::Service> userServices =
                         }
 
                         Q3ValueList<KDEDesktopMimeType::Service> userServices =
@@ -408,16 +376,15 @@ void DolphinContextMenu::insertActionItems(KMenu* popup,
                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
                             KDEDesktopMimeType::Service service = (*serviceIt);
                             if (!service.m_strIcon.isEmpty()) {
                         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 {
                             }
                             else {
-                                menu->insertItem(service.m_strName,
-                                                 actionsIDStart + actionsIndex);
+                                QAction *action = menu->addAction(service.m_strName);
+                                serviceActions << action;
                             }
                             actionsVector.append(service);
                             }
                             actionsVector.append(service);
-                            ++actionsIndex;
                         }
                     }
                 }
                         }
                     }
                 }
@@ -425,7 +392,7 @@ void 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
     if (itemsCount == 0) {
         // no actions are available at all, hence show the "Actions"
         // submenu disabled
@@ -437,26 +404,34 @@ void 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.
         // 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));
-            const QIcon* iconSet = actionsMenu->iconSet(id);
-            if (iconSet == 0) {
-                popup->insertItem(text, id);
+            const QList<QAction*> 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 {
             }
             else {
-                popup->insertItem(*iconSet, text, id);
+                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.
             }
         }
         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 {
         }
         actionsMenu->deleteLater();
         actionsMenu = 0;
     }
     else {
-        popup->insertItem(i18n("Actions"), actionsMenu);
+        popup->addMenu(actionsMenu);
     }
     }
+
+    return serviceActions;
 }
 
 bool DolphinContextMenu::containsEntry(const KMenu* menu,
 }
 
 bool DolphinContextMenu::containsEntry(const KMenu* menu,
@@ -464,10 +439,11 @@ bool DolphinContextMenu::containsEntry(const KMenu* menu,
 {
     assert(menu != 0);
 
 {
     assert(menu != 0);
 
-    const uint count = menu->count();
+    const QList<QAction*> list = menu->actions();
+    const uint count = list.count();
     for (uint i = 0; i < count; ++i) {
     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;
         }
     }
             return true;
         }
     }