use "Sort by" instead of "Sort By"

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 620520057bdd2eadd229c7e1e2abc7643b2d96a8..4b46455d79b0d579d811f22c0c99ff325735841e 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -23,11 +23,10 @@
 #include "dolphinmainwindow.h"
 #include "dolphinsettings.h"
 #include "dolphinview.h"
 #include "dolphinmainwindow.h"
 #include "dolphinsettings.h"
 #include "dolphinview.h"

-#include "editbookmarkdialog.h"
+#include "dolphinviewcontainer.h"

 
 #include <kactioncollection.h>
 
 #include <kactioncollection.h>

-#include <kbookmarkmanager.h>
-#include <kbookmark.h>
+#include <kfileplacesmodel.h>

 #include <kdesktopfile.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kdesktopfile.h>
 #include <kglobal.h>
 #include <kiconloader.h>


@@ -44,13 +43,13 @@
 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 
 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 

-#include <QApplication>
-#include <QClipboard>
-#include <QDir>
-#include <Q3ValueList>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QDir>
+#include <Qt3Support/Q3ValueList>

 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,

-                                       KFileItem* fileInfo,
+                                       const KFileItem& fileInfo,

                                        const KUrl& baseUrl) :
     m_mainWindow(parent),
     m_fileInfo(fileInfo),
                                        const KUrl& baseUrl) :
     m_mainWindow(parent),
     m_fileInfo(fileInfo),


@@ -59,7 +58,7 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.
 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.

-    DolphinView* view = m_mainWindow->activeView();
+    DolphinView* view = m_mainWindow->activeViewContainer()->view();

     m_selectedUrls = view->selectedUrls();
     m_selectedItems = view->selectedItems();
 }
     m_selectedUrls = view->selectedUrls();
     m_selectedItems = view->selectedItems();
 }


@@ -75,24 +74,21 @@ void DolphinContextMenu::open()
         m_context |= TrashContext;
     }
 
         m_context |= TrashContext;
     }
 

-    if (m_fileInfo != 0) {
+    if (!m_fileInfo.isNull()) {

         m_context |= ItemContext;
         // TODO: handle other use cases like devices + desktop files
         m_context |= ItemContext;
         // TODO: handle other use cases like devices + desktop files

-   }
+    }

 
     // open the corresponding popup for the context
     if (m_context & TrashContext) {
         if (m_context & ItemContext) {
             openTrashItemContextMenu();
 
     // open the corresponding popup for the context
     if (m_context & TrashContext) {
         if (m_context & ItemContext) {
             openTrashItemContextMenu();

-        }
-        else {
+        } else {

             openTrashContextMenu();
         }
             openTrashContextMenu();
         }

-    }
-    else if (m_context & ItemContext) {
+    } else if (m_context & ItemContext) {

         openItemContextMenu();
         openItemContextMenu();

-    }
-    else {
+    } else {

         Q_ASSERT(m_context == NoContext);
         openViewportContextMenu();
     }
         Q_ASSERT(m_context == NoContext);
         openViewportContextMenu();
     }


@@ -105,7 +101,7 @@ void DolphinContextMenu::openTrashContextMenu()
 
     KMenu* popup = new KMenu(m_mainWindow);
 
 
     KMenu* popup = new KMenu(m_mainWindow);
 

-    QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18n("Emtpy Trash"), popup);
+    QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18nc("@action:inmenu", "Empty Trash"), popup);

     KConfig trashConfig("trashrc", KConfig::OnlyLocal);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     popup->addAction(emptyTrashAction);
     KConfig trashConfig("trashrc", KConfig::OnlyLocal);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     popup->addAction(emptyTrashAction);


@@ -114,12 +110,13 @@ void DolphinContextMenu::openTrashContextMenu()
     popup->addAction(propertiesAction);
 
     if (popup->exec(QCursor::pos()) == emptyTrashAction) {
     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."));
+        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(),
         const bool del = KMessageBox::warningContinueCancel(m_mainWindow,
                                                             text,
                                                             QString(),

-                                                            KGuiItem(i18n("Empty Trash"), KIcon("user-trash"))
-                                                            ) == KMessageBox::Continue;
+                                                            KGuiItem(i18nc("@action:button", "Empty Trash"),
+                                                                     KIcon("user-trash"))
+                                                           ) == KMessageBox::Continue;

         if (del) {
             KonqOperations::emptyTrash(m_mainWindow);
         }
         if (del) {
             KonqOperations::emptyTrash(m_mainWindow);
         }


@@ -135,7 +132,7 @@ void DolphinContextMenu::openTrashItemContextMenu()
 
     KMenu* popup = new KMenu(m_mainWindow);
 
 
     KMenu* popup = new KMenu(m_mainWindow);
 

-    QAction* restoreAction = new QAction(i18n("Restore"), m_mainWindow);
+    QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);

     popup->addAction(restoreAction);
 
     QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");
     popup->addAction(restoreAction);
 
     QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");


@@ -153,17 +150,18 @@ void DolphinContextMenu::openTrashItemContextMenu()
 
 void DolphinContextMenu::openItemContextMenu()
 {
 
 void DolphinContextMenu::openItemContextMenu()
 {

-    Q_ASSERT(m_fileInfo != 0);
+    Q_ASSERT(!m_fileInfo.isNull());

 
     KMenu* popup = new KMenu(m_mainWindow);
     insertDefaultItemActions(popup);
 
     popup->addSeparator();
 
 
     KMenu* popup = new KMenu(m_mainWindow);
     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"));
+    // insert 'Bookmark This Folder' entry if exactly one item is selected
+    QAction* addToPlacesAction = 0;
+    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
+        addToPlacesAction = popup->addAction(KIcon("bookmark-folder"),
+                                             i18nc("@action:inmenu Add selected folder to places", "Add to Places"));

     }
 
     // Insert 'Open With...' sub menu
     }
 
     // Insert 'Open With...' sub menu


@@ -181,31 +179,22 @@ void DolphinContextMenu::openItemContextMenu()
 
     QAction* activatedAction = popup->exec(QCursor::pos());
 
 
     QAction* activatedAction = popup->exec(QCursor::pos());
 

-    if ((bookmarkAction!= 0) && (activatedAction == bookmarkAction)) {
-        const KUrl selectedUrl(m_fileInfo->url());
-        KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),
-                                                             selectedUrl.fileName(),
-                                                             selectedUrl,
-                                                             "bookmark");
-        if (!bookmark.isNull()) {
-            KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager();
-            KBookmarkGroup root = manager->root();
-            root.addBookmark(manager, bookmark);
-            manager->emitChanged(root);
+    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)) {
+    } else if (serviceActions.contains(activatedAction)) {

         // one of the 'Actions' items has been selected
         int id = serviceActions.indexOf(activatedAction);
         KDesktopFileActions::executeService(m_selectedUrls, actionsVector[id]);
         // one of the 'Actions' items has been selected
         int id = serviceActions.indexOf(activatedAction);
         KDesktopFileActions::executeService(m_selectedUrls, actionsVector[id]);

-    }
-    else if (openWithActions.contains(activatedAction)) {
+    } else if (openWithActions.contains(activatedAction)) {

         // one of the 'Open With' items has been selected
         if (openWithActions.last() == activatedAction) {
             // the item 'Other...' has been selected
             KRun::displayOpenWithDialog(m_selectedUrls, m_mainWindow);
         // one of the 'Open With' items has been selected
         if (openWithActions.last() == activatedAction) {
             // the item 'Other...' has been selected
             KRun::displayOpenWithDialog(m_selectedUrls, m_mainWindow);

-        }
-        else {
+        } else {

             int id = openWithActions.indexOf(activatedAction);
             KService::Ptr servicePtr = openWithVector[id];
             KRun::run(*servicePtr, m_selectedUrls, m_mainWindow);
             int id = openWithActions.indexOf(activatedAction);
             KService::Ptr servicePtr = openWithVector[id];
             KRun::run(*servicePtr, m_selectedUrls, m_mainWindow);


@@ -219,7 +208,7 @@ void DolphinContextMenu::openItemContextMenu()
 
 void DolphinContextMenu::openViewportContextMenu()
 {
 
 void DolphinContextMenu::openViewportContextMenu()
 {

-    Q_ASSERT(m_fileInfo == 0);
+    Q_ASSERT(m_fileInfo.isNull());

     KMenu* popup = new KMenu(m_mainWindow);
 
     // setup 'Create New' menu
     KMenu* popup = new KMenu(m_mainWindow);
 
     // setup 'Create New' menu


@@ -233,7 +222,7 @@ void DolphinContextMenu::openViewportContextMenu()
     popup->addAction(pasteAction);
 
     // setup 'View Mode' menu
     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);
 
     QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
     viewModeMenu->addAction(iconsMode);


@@ -241,32 +230,31 @@ void DolphinContextMenu::openViewportContextMenu()
     QAction* detailsMode = m_mainWindow->actionCollection()->action("details");
     viewModeMenu->addAction(detailsMode);
 
     QAction* detailsMode = m_mainWindow->actionCollection()->action("details");
     viewModeMenu->addAction(detailsMode);
 

+    QAction* columnsMode = m_mainWindow->actionCollection()->action("columns");
+    viewModeMenu->addAction(columnsMode);
+

     QAction* previewsMode = m_mainWindow->actionCollection()->action("previews");
     viewModeMenu->addAction(previewsMode);
 
     popup->addMenu(viewModeMenu);
     QAction* previewsMode = m_mainWindow->actionCollection()->action("previews");
     viewModeMenu->addAction(previewsMode);
 
     popup->addMenu(viewModeMenu);

-    popup->addSeparator();

 
 

-    QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark this folder"));

     popup->addSeparator();
 
     popup->addSeparator();
 

-    QAction* propertiesAction = popup->addAction(i18n("Properties..."));
+    QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-folder"),
+                                                  i18nc("@action:inmenu Add current folder to places", "Add to Places"));
+    popup->addSeparator();

 
 

-    QAction* activatedAction = popup->exec(QCursor::pos());
-    if (activatedAction == propertiesAction) {
-        new KPropertiesDialog(m_mainWindow->activeView()->url());
-    }
-    else if (activatedAction == bookmarkAction) {
-        const KUrl& url = m_mainWindow->activeView()->url();
-        KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),
-                                                             url.fileName(),
-                                                             url,
-                                                             "bookmark");
-        if (!bookmark.isNull()) {
-            KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager();
-            KBookmarkGroup root = manager->root();
-            root.addBookmark(manager, bookmark);
-            manager->emitChanged(root);
+    QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
+
+    QAction* action = popup->exec(QCursor::pos());
+    if (action == propertiesAction) {
+        const KUrl& url = m_mainWindow->activeViewContainer()->url();
+        KPropertiesDialog dialog(url);
+        dialog.exec();
+    } else if (action == addToPlacesAction) {
+        const KUrl& url = m_mainWindow->activeViewContainer()->url();
+        if (url.isValid()) {
+            DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url);

         }
     }
 
         }
     }
 


@@ -296,12 +284,11 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
     const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
     const KConfigGroup kdeConfig(globalConfig, "KDE");
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
     const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
     const KConfigGroup kdeConfig(globalConfig, "KDE");
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);

-    const KUrl& url = m_mainWindow->activeView()->url();
+    const KUrl& url = m_mainWindow->activeViewContainer()->url();

     if (url.isLocalFile()) {
         QAction* moveToTrashAction = collection->action("move_to_trash");
         popup->addAction(moveToTrashAction);
     if (url.isLocalFile()) {
         QAction* moveToTrashAction = collection->action("move_to_trash");
         popup->addAction(moveToTrashAction);

-    }
-    else {
+    } else {

         showDeleteCommand = true;
     }
 
         showDeleteCommand = true;
     }
 


@@ -312,7 +299,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
 }
 
 QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
 }
 
 QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,

-                                                        QVector<KService::Ptr>& openWithVector)
+        QVector<KService::Ptr>& openWithVector)

 {
     // Parts of the following code have been taken
     // from the class KonqOperations located in
 {
     // Parts of the following code have been taken
     // from the class KonqOperations located in


@@ -324,25 +311,25 @@ QList<QAction*> 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;
     // 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<KFileItem*> mimeIt(m_selectedItems);
+    QListIterator<KFileItem> mimeIt(m_selectedItems);

     while (insertOpenWithItems && mimeIt.hasNext()) {
     while (insertOpenWithItems && mimeIt.hasNext()) {

-        KFileItem* item = mimeIt.next();
-        insertOpenWithItems = (contextMimeType == item->mimetype());
+        KFileItem item = mimeIt.next();
+        insertOpenWithItems = (contextMimeType == item.mimetype());

     }
 
     QList<QAction*> openWithActions;
     if (insertOpenWithItems) {
         // fill the 'Open with' sub menu with application types
     }
 
     QList<QAction*> 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(),
         KService::List offers = KMimeTypeTrader::self()->query(mimePtr->name(),

-                                                               "Application",
-                                                               "Type == 'Application'");
+                                "Application",
+                                "Type == 'Application'");

         if (offers.count() > 0) {
             KService::List::Iterator it;
         if (offers.count() > 0) {
             KService::List::Iterator it;

-            KMenu* openWithMenu = new KMenu(i18n("Open With"));
-            for(it = offers.begin(); it != offers.end(); ++it) {
+            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
                 // problem outside the scope of Dolphin, duplicated entries just
                 // The offer list from the KTrader returns duplicate
                 // application entries. Although this seems to be a configuration
                 // problem outside the scope of Dolphin, duplicated entries just


@@ -357,23 +344,21 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
             }
 
             openWithMenu->addSeparator();
             }
 
             openWithMenu->addSeparator();

-            QAction* action = openWithMenu->addAction(i18n("&Other..."));
+            QAction* action = openWithMenu->addAction(i18nc("@action:inmenu Open With", "&Other..."));

 
             openWithActions << action;
             popup->addMenu(openWithMenu);
 
             openWithActions << action;
             popup->addMenu(openWithMenu);

-        }
-        else {
+        } else {

             // No applications are registered, hence just offer
             // a "Open With..." item instead of a sub menu containing
             // only one entry.
             // 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;
         }
             openWithActions << action;
         }

-    }
-    else {
+    } else {

         // At least one of the selected items has a different MIME type. In this case
         // just show a disabled "Open With..." entry.
         // 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);
     }
 
         action->setEnabled(false);
     }
 


@@ -388,7 +373,7 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
     // libqonq/konq_operations.h of Konqueror.
     // (Copyright (C) 2000  David Faure <faure@kde.org>)
 
     // libqonq/konq_operations.h of Konqueror.
     // (Copyright (C) 2000  David Faure <faure@kde.org>)
 

-    KMenu* actionsMenu = new KMenu(i18n("Actions"));
+    KMenu* actionsMenu = new KMenu(i18nc("@title:menu", "Actions"));

 
     QList<QAction*> serviceActions;
 
 
     QList<QAction*> serviceActions;
 


@@ -403,7 +388,7 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
         QStringList entries = dir.entryList(QDir::Files);
 
         for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) {
         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" );
+            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;
             if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) {
                 //const QStringList types = cfg.readListEntry("ServiceTypes");
                 QStringList types;


@@ -416,11 +401,11 @@ QList<QAction*> 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...

-                        QListIterator<KFileItem*> mimeIt(m_selectedItems);
+                        QListIterator<KFileItem> mimeIt(m_selectedItems);

                         insert = true;
                         while (insert && mimeIt.hasNext()) {
                         insert = true;
                         while (insert && mimeIt.hasNext()) {

-                            KFileItem* item = mimeIt.next();
-                            insert = !item->isDir();
+                            KFileItem item = mimeIt.next();
+                            insert = !item.isDir();

                         }
                     }
 
                         }
                     }
 


@@ -428,11 +413,11 @@ QList<QAction*> 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.

-                        QListIterator<KFileItem*> mimeIt(m_selectedItems);
+                        QListIterator<KFileItem> mimeIt(m_selectedItems);

                         insert = true;
                         while (insert && mimeIt.hasNext()) {
                         insert = true;
                         while (insert && mimeIt.hasNext()) {

-                            KFileItem* item = mimeIt.next();
-                            const QString mimeType(item->mimetype());
+                            KFileItem item = mimeIt.next();
+                            const QString mimeType(item.mimetype());

                             const QString mimeGroup(mimeType.left(mimeType.indexOf('/')));
 
                             insert  = (*it == mimeType) ||
                             const QString mimeGroup(mimeType.left(mimeType.indexOf('/')));
 
                             insert  = (*it == mimeType) ||


@@ -444,7 +429,7 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                     if (insert) {
                         menu = actionsMenu;
 
                     if (insert) {
                         menu = actionsMenu;
 

-                        const QString submenuName = cfg.readEntry( "X-KDE-Submenu" );
+                        const QString submenuName = cfg.readEntry("X-KDE-Submenu");

                         if (!submenuName.isEmpty()) {
                             menu = new KMenu(submenuName);
                             actionsMenu->addMenu(menu);
                         if (!submenuName.isEmpty()) {
                             menu = new KMenu(submenuName);
                             actionsMenu->addMenu(menu);


@@ -457,11 +442,10 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
                             KDesktopFileActions::Service service = (*serviceIt);
                             if (!service.m_strIcon.isEmpty()) {
                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
                             KDesktopFileActions::Service service = (*serviceIt);
                             if (!service.m_strIcon.isEmpty()) {

-                                QAction* action = menu->addAction(SmallIcon(service.m_strIcon),
+                                QAction* action = menu->addAction(KIcon(service.m_strIcon),

                                                                   service.m_strName);
                                 serviceActions << action;
                                                                   service.m_strName);
                                 serviceActions << action;

-                            }
-                            else {
+                            } else {

                                 QAction *action = menu->addAction(service.m_strName);
                                 serviceActions << action;
                             }
                                 QAction *action = menu->addAction(service.m_strName);
                                 serviceActions << action;
                             }


@@ -494,21 +478,18 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                 QAction* action = popup->addAction(text);
                 serviceActions.clear();
                 serviceActions << action;
                 QAction* action = popup->addAction(text);
                 serviceActions.clear();
                 serviceActions << action;

-            }
-            else {
+            } else {

                 QAction* action = popup->addAction(icon, text);
                 serviceActions.clear();
                 serviceActions << action;
             }
                 QAction* action = popup->addAction(icon, text);
                 serviceActions.clear();
                 serviceActions << action;
             }

-        }
-        else {
+        } else {

             // The item is a sub menu, hence show the sub menu in the root menu.
             popup->addMenu(menu);
         }
         actionsMenu->deleteLater();
         actionsMenu = 0;
             // The item is a sub menu, hence show the sub menu in the root menu.
             popup->addMenu(menu);
         }
         actionsMenu->deleteLater();
         actionsMenu = 0;

-    }
-    else {
+    } else {

         popup->addMenu(actionsMenu);
     }
 
         popup->addMenu(actionsMenu);
     }