Rename the "Filter Panel" to "Search Panel"

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index dacdc9c83b5011fe7cd8a5520c6754f3a4ff9f52..d73f62bea22f85a5e31ca5af6dab3c8d6f47aaa5 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -29,6 +29,7 @@
 #include <KActionCollection>
 #include <KDesktopFile>
 #include <kfileitemactionplugin.h>
+#include <kabstractfileitemactionplugin.h>
 #include <KFileItemActions>
 #include <KFileItemListProperties>
 #include <KFilePlacesModel>
@@ -40,7 +41,7 @@
 #include <KMessageBox>
 #include <KMimeTypeTrader>
 #include <KModifierKeyInfo>
-#include <knewfilemenu.h>
+#include <KNewFileMenu>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <KService>
@@ -49,9 +50,9 @@
 #include <KStandardAction>
 #include <KStandardDirs>
 
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QDir>
+#include <QApplication>
+#include <QClipboard>
+#include <QDir>
 
 #include "views/dolphinview.h"
 #include "views/viewmodecontroller.h"
@@ -80,7 +81,7 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     m_selectedItems = view->selectedItems();
 
-    if (m_keyInfo != 0) {
+    if (m_keyInfo) {
         if (m_keyInfo->isKeyPressed(Qt::Key_Shift) || m_keyInfo->isKeyLatched(Qt::Key_Shift)) {
             m_shiftPressed = true;
         }
@@ -239,12 +240,14 @@ void DolphinContextMenu::openItemContextMenu()
     if (m_selectedItems.count() == 1) {
         if (m_fileInfo.isDir()) {
             // setup 'Create New' menu
-            DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_popup, m_mainWindow);
+            DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow);
             const DolphinView* view = m_mainWindow->activeViewContainer()->view();
             newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
             newFileMenu->checkUpToDate();
             newFileMenu->setPopupFiles(m_fileInfo.url());
             newFileMenu->setEnabled(selectedItemsProperties().supportsWriting());
+            connect(newFileMenu, SIGNAL(fileCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
+            connect(newFileMenu, SIGNAL(directoryCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
 
             KMenu* menu = newFileMenu->menu();
             menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
@@ -305,7 +308,7 @@ void DolphinContextMenu::openItemContextMenu()
     m_popup->addAction(propertiesAction);
 
     QAction* activatedAction = m_popup->exec(QCursor::pos());
-    if (activatedAction != 0) {
+    if (activatedAction) {
         if (activatedAction == addToPlacesAction) {
             const KUrl selectedUrl(m_fileInfo.url());
             if (selectedUrl.isValid()) {
@@ -373,7 +376,7 @@ void DolphinContextMenu::openViewportContextMenu()
         KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
-    } else if ((addToPlacesAction != 0) && (action == addToPlacesAction)) {
+    } else if (addToPlacesAction && (action == addToPlacesAction)) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
@@ -458,7 +461,7 @@ QAction* DolphinContextMenu::createPasteAction()
 
 KFileItemListProperties& DolphinContextMenu::selectedItemsProperties()
 {
-    if (m_selectedItemsProperties == 0) {
+    if (!m_selectedItemsProperties) {
         m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);
     }
     return *m_selectedItemsProperties;
@@ -466,7 +469,7 @@ KFileItemListProperties& DolphinContextMenu::selectedItemsProperties()
 
 KFileItem DolphinContextMenu::baseFileItem()
 {
-    if (m_baseFileItem == 0) {
+    if (!m_baseFileItem) {
         m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
     }
     return *m_baseFileItem;
@@ -511,15 +514,17 @@ void DolphinContextMenu::addFileItemPluginActions()
             continue;
         }
 
+        // Old API (kdelibs-4.6.0 only)
         KFileItemActionPlugin* plugin = service->createInstance<KFileItemActionPlugin>();
-        if (plugin == 0) {
-            continue;
+        if (plugin) {
+            plugin->setParent(m_popup);
+            m_popup->addActions(plugin->actions(props, m_mainWindow));
         }
-
-        plugin->setParent(m_popup);
-        const QList<QAction*> actions = plugin->actions(props, m_mainWindow);
-        foreach (QAction* action, actions) {
-            m_popup->addAction(action);
+        // New API (kdelibs >= 4.6.1)
+        KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance<KAbstractFileItemActionPlugin>();
+        if (abstractPlugin) {
+            abstractPlugin->setParent(m_popup);
+            m_popup->addActions(abstractPlugin->actions(props, m_mainWindow));
         }
     }
 }