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

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 9b6512aa2..0aa82b206 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -26,33 +26,34 @@
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
-#include <kactioncollection.h>
-#include <kdesktopfile.h>
+#include <KActionCollection>
+#include <KDesktopFile>
 #include <kfileitemactionplugin.h>
 #include <kabstractfileitemactionplugin.h>
-#include <kfileitemactions.h>
-#include <kfileitemlistproperties.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
+#include <KFileItemActions>
+#include <KFileItemListProperties>
+#include <KFilePlacesModel>
+#include <KGlobal>
 #include <KIconLoader>
-#include <kio/netaccess.h>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kmimetypetrader.h>
-#include <kmodifierkeyinfo.h>
+#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 <KService>
 #include <KLocale>
-#include <kpropertiesdialog.h>
-#include <kstandardaction.h>
-#include <kstandarddirs.h>
+#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"
@@ -184,7 +185,7 @@ void DolphinContextMenu::openTrashContextMenu()
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     m_popup->addAction(propertiesAction);
 
-    addShowMenubarAction();
+    addShowMenuBarAction();
 
     QAction *action = m_popup->exec(QCursor::pos());
     if (action == emptyTrashAction) {
@@ -240,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"));
@@ -365,7 +368,7 @@ void DolphinContextMenu::openViewportContextMenu()
     QAction* propertiesAction = m_popup->addAction(i18nc("@action:inmenu", "Properties"));
     propertiesAction->setIcon(KIcon("document-properties"));
 
-    addShowMenubarAction();
+    addShowMenuBarAction();
 
     QAction* action = m_popup->exec(QCursor::pos());
     if (action == propertiesAction) {
@@ -407,10 +410,11 @@ void DolphinContextMenu::insertDefaultItemActions()
     }
 }
 
-void DolphinContextMenu::addShowMenubarAction()
+void DolphinContextMenu::addShowMenuBarAction()
 {
-    KAction* showMenuBar = m_mainWindow->showMenuBarAction();
-    if (!m_mainWindow->menuBar()->isVisible()) {
+    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);
     }