merge -c764347 by Peter, needed for dolphinpart bugfixing

svn path=/branches/KDE/4.0/kdebase/apps/; revision=764379

1 files changed, 17 insertions, 1 deletions

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index ddb7185f0..4a1fbb927 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -61,7 +61,8 @@ DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
                          KDirLister* dirLister,
                          DolphinModel* dolphinModel,
-                         DolphinSortFilterProxyModel* proxyModel) :
+                         DolphinSortFilterProxyModel* proxyModel,
+                         KActionCollection* actionCollection) :
     QWidget(parent),
     m_active(true),
     m_showPreview(false),
@@ -127,6 +128,16 @@ DolphinView::DolphinView(QWidget* parent,
 
     applyViewProperties(url);
     m_topLayout->addWidget(itemView());
+
+    Q_ASSERT(actionCollection != 0);
+    if (actionCollection->action("create_dir") == 0) {
+        // This action doesn't appear in the GUI, it's for the shortcut only.
+        // KNewMenu takes care of the GUI stuff.
+        KAction* newDirAction = actionCollection->addAction("create_dir");
+        newDirAction->setText(i18n("Create Folder..."));
+        connect(newDirAction, SIGNAL(triggered()), SLOT(createDir()));
+        newDirAction->setShortcut(Qt::Key_F10);
+    }
 }
 
 DolphinView::~DolphinView()
@@ -1138,6 +1149,11 @@ void DolphinView::slotPreviewJobFinished(KJob* job)
     m_previewJob = 0;
 }
 
+void DolphinView::createDir()
+{
+    KonqOperations::newDir(this, url());
+}
+
 void DolphinView::cutSelectedItems()
 {
     QMimeData* mimeData = new QMimeData();