GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / dolphinnewfilemenu.cpp

diff --git a/src/dolphinnewfilemenu.cpp b/src/dolphinnewfilemenu.cpp
index f83beccdafb5c6e882b4730515108925a939b6bf..2ccd7dd694927ee339b7323e0a7073b2ca85ad46 100644 (file)
--- a/src/dolphinnewfilemenu.cpp
+++ b/src/dolphinnewfilemenu.cpp
@@ -8,12 +8,15 @@
 
 #include "views/dolphinnewfilemenuobserver.h"
 
-#include <KActionCollection>
-#include <KIO/Job>
+#include <KIO/Global>
 
-DolphinNewFileMenu::DolphinNewFileMenu(KActionCollection* collection, QObject* parent) :
-    KNewFileMenu(collection, QStringLiteral("new_menu"), parent)
+#include <QAction>
+
+DolphinNewFileMenu::DolphinNewFileMenu(QAction *createDirAction, QAction *createFileAction, QObject *parent)
+    : KNewFileMenu(parent)
 {
+    setNewFolderShortcutAction(createDirAction);
+    setNewFileShortcutAction(createFileAction);
     DolphinNewFileMenuObserver::instance().attach(this);
 }
 
@@ -22,12 +25,13 @@ DolphinNewFileMenu::~DolphinNewFileMenu()
     DolphinNewFileMenuObserver::instance().detach(this);
 }
 
-void DolphinNewFileMenu::slotResult(KJob* job)
+void DolphinNewFileMenu::slotResult(KJob *job)
 {
-    if (job->error()) {
+    if (job->error() && job->error() != KIO::ERR_USER_CANCELED) {
         Q_EMIT errorMessage(job->errorString());
     } else {
         KNewFileMenu::slotResult(job);
     }
 }
 
+#include "moc_dolphinnewfilemenu.cpp"