X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d3eee9120f68343a2f30d4368f57737d90b1f74b..2dcc433ab2c353a40e3c65f3df46e8a1eac697cc:/src/dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index ebda8b5a6..0aa82b206 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -26,32 +26,34 @@
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
-#include <kactioncollection.h>
-#include <kdesktopfile.h>
+#include <KActionCollection>
+#include <KDesktopFile>
 #include <kfileitemactionplugin.h>
-#include <kfileitemactions.h>
-#include <kfileitemlistproperties.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kmimetypetrader.h>
-#include <kmodifierkeyinfo.h>
-#include <knewfilemenu.h>
+#include <kabstractfileitemactionplugin.h>
+#include <KFileItemActions>
+#include <KFileItemListProperties>
+#include <KFilePlacesModel>
+#include <KGlobal>
+#include <KIconLoader>
+#include <KIO/NetAccess>
+#include <KMenu>
+#include <KMenuBar>
+#include <KMessageBox>
+#include <KMimeTypeTrader>
+#include <KModifierKeyInfo>
+#include <KNewFileMenu>
 #include <konqmimedata.h>
 #include <konq_operations.h>
-#include <kservice.h>
-#include <klocale.h>
-#include <kpropertiesdialog.h>
-#include <kstandardaction.h>
-#include <kstandarddirs.h>
+#include <KService>
+#include <KLocale>
+#include <KPropertiesDialog>
+#include <KStandardAction>
+#include <KStandardDirs>
+#include <KToolBar>
 
-#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 +82,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;
         }
@@ -165,8 +167,6 @@ void DolphinContextMenu::openTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
 
-    addShowMenubarAction();
-
     QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), m_popup);
     KConfig trashConfig("trashrc", KConfig::SimpleConfig);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
@@ -185,6 +185,8 @@ void DolphinContextMenu::openTrashContextMenu()
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     m_popup->addAction(propertiesAction);
 
+    addShowMenuBarAction();
+
     QAction *action = m_popup->exec(QCursor::pos());
     if (action == emptyTrashAction) {
         const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will be deleted."));
@@ -239,12 +241,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 +309,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()) {
@@ -322,8 +326,6 @@ void DolphinContextMenu::openItemContextMenu()
 
 void DolphinContextMenu::openViewportContextMenu()
 {
-    addShowMenubarAction();
-
     // setup 'Create New' menu
     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
@@ -365,6 +367,9 @@ void DolphinContextMenu::openViewportContextMenu()
 
     QAction* propertiesAction = m_popup->addAction(i18nc("@action:inmenu", "Properties"));
     propertiesAction->setIcon(KIcon("document-properties"));
+
+    addShowMenuBarAction();
+
     QAction* action = m_popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
@@ -372,7 +377,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);
@@ -405,12 +410,13 @@ void DolphinContextMenu::insertDefaultItemActions()
     }
 }
 
-void DolphinContextMenu::addShowMenubarAction()
+void DolphinContextMenu::addShowMenuBarAction()
 {
-    KAction* showMenuBar = m_mainWindow->showMenuBarAction();
-    if (!m_mainWindow->menuBar()->isVisible()) {
-        m_popup->addAction(showMenuBar);
+    const KActionCollection* ac = m_mainWindow->actionCollection();
+    QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar));
+    if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) {
         m_popup->addSeparator();
+        m_popup->addAction(showMenuBar);
     }
 }
 
@@ -457,7 +463,7 @@ QAction* DolphinContextMenu::createPasteAction()
 
 KFileItemListProperties& DolphinContextMenu::selectedItemsProperties()
 {
-    if (m_selectedItemsProperties == 0) {
+    if (!m_selectedItemsProperties) {
         m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);
     }
     return *m_selectedItemsProperties;
@@ -465,7 +471,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;
@@ -510,15 +516,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));
         }
     }
 }