There we go. Fix this bug :)

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index df967fe72d879764960be0fa21fefa4899efa09c..714d4b09f5d46aa2b85fb95d60d864416d20be70 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -22,6 +22,8 @@
 #include "dolphinview.h"
 #include "dolphinmodel.h"
 
+#include <konq_operations.h>
+
 #include <kactioncollection.h>
 #include <kdirlister.h>
 #include <kmessagebox.h>
@@ -100,12 +102,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
     // TODO sort_by_* actions
     // TODO show_*_info actions
 
-    // TODO connect to urlsDropped
-
     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)
-
-    // TODO MMB-click should do something like KonqDirPart::mmbClicked
 }
 
 DolphinPart::~DolphinPart()
@@ -130,11 +128,18 @@ void DolphinPart::createActions()
 
     KAction* deleteAction = DolphinView::createDeleteAction(actionCollection());
     connect(deleteAction, SIGNAL(triggered()), m_view, SLOT(deleteSelectedItems()));
+
+    // 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(slotNewDir()));
+    newDirAction->setShortcut(Qt::Key_F10);
+    widget()->addAction(newDirAction);
 }
 
 void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
 {
-    // Yes, DolphinMainWindow has very similar code :/
     const bool hasSelection = !selection.isEmpty();
     if (!hasSelection) {
         stateChanged("has_no_selection");
@@ -174,7 +179,7 @@ void DolphinPart::updateViewActions()
 
 KAboutData* DolphinPart::createAboutData()
 {
-    return new KAboutData("dolphinpart", 0, ki18nc("@title", "Dolphin Part"), "0.1");
+    return new KAboutData("dolphinpart", "dolphin", ki18nc("@title", "Dolphin Part"), "0.1");
 }
 
 bool DolphinPart::openUrl(const KUrl& url)
@@ -187,10 +192,10 @@ bool DolphinPart::openUrl(const KUrl& url)
     const QString prettyUrl = url.pathOrUrl();
     emit setWindowCaption(prettyUrl);
     emit m_extension->setLocationBarUrl(prettyUrl);
+    emit started(0); // get the wheel to spin
     m_view->setUrl(url);
     if (reload)
         m_view->reload();
-    emit started(0); // get the wheel to spin
     return true;
 }
 
@@ -222,20 +227,23 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item)
 
 void DolphinPart::slotItemTriggered(const KFileItem& item)
 {
-    qDebug() << QApplication::mouseButtons();
+    // MMB click support.
+    // TODO: this doesn't work, mouseButtons() is always 0.
+    // Issue N176832 for the missing QAIV signal; task 177399
+    kDebug() << QApplication::mouseButtons();
     if (QApplication::mouseButtons() & Qt::MidButton) {
-        qDebug() << "MMB!!" << item.mimetype();
+        kDebug() << "MMB!!" << item.mimetype();
         if (item.mimeTypePtr()->is("inode/directory")) {
             KParts::OpenUrlArguments args;
             args.setMimeType( item.mimetype() );
             emit m_extension->createNewWindow( item.url(), args );
         } else {
-            qDebug() << "run()";
+            kDebug() << "run()";
             item.run();
         }
     } else {
         // Left button. [Right button goes to slotOpenContextMenu before triggered can be emitted]
-        qDebug() << "LMB";
+        kDebug() << "LMB";
         emit m_extension->openUrlRequest(item.url());
     }
 }
@@ -346,4 +354,9 @@ void DolphinPart::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers mod
         m_view->trashSelectedItems();
 }
 
+void DolphinPart::slotNewDir()
+{
+    KonqOperations::newDir(widget(), url());
+}
+
 #include "dolphinpart.moc"