X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5e22e4efbae47541b5fb712de149ad4653500f83..ac62df5672f67393bd582edefaeccb0eb89537e8:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 300d99d92..5e9948939 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -24,6 +24,7 @@
 #include <assert.h>
 
 #include "dolphinapplication.h"
+#include "dolphinnewmenu.h"
 #include "dolphinsettings.h"
 #include "dolphinsettingsdialog.h"
 #include "dolphinstatusbar.h"
@@ -47,12 +48,12 @@
 #include <kicon.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
+#include <kio/deletejob.h>
 #include <kio/renamedialog.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmenu.h>
 #include <kmessagebox.h>
-#include <knewmenu.h>
 #include <konqmimedata.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
@@ -160,7 +161,7 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
                                               i18n("&Link Here") + "\t" + seq);
 
         popup.addSeparator();
-        popup.addAction(KIcon("stop"), i18n("Cancel"));
+        QAction* cancelAction = popup.addAction(KIcon("stop"), i18n("Cancel"));
 
         QAction* activatedAction = popup.exec(QCursor::pos());
         if (activatedAction == moveAction) {
@@ -172,6 +173,9 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
         else if (activatedAction == linkAction) {
             action = Qt::LinkAction;
         }
+        else if (activatedAction == cancelAction) {
+            return;
+        }
     }
 
     switch (action) {
@@ -321,7 +325,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
     // TODO: I assume there will be a generic way in KDE 4 to store the docks
     // of the main window. In the meantime they are stored manually:
-    QString filename = KStandardDirs::locateLocal("data", KGlobal::instance()->instanceName());
+    QString filename = KStandardDirs::locateLocal("data", KGlobal::mainComponent().componentName());
     filename.append("/panels_layout");
     QFile file(filename);
     if (file.open(QIODevice::WriteOnly)) {
@@ -485,6 +489,12 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text)
     }
 }
 
+void DolphinMainWindow::undo()
+{
+    clearStatusBar();
+    KonqUndoManager::self()->undo();
+}
+
 void DolphinMainWindow::cut()
 {
     QMimeData* mimeData = new QMimeData();
@@ -921,8 +931,7 @@ void DolphinMainWindow::loadSettings()
     // TODO: I assume there will be a generic way in KDE 4 to restore the docks
     // of the main window. In the meantime they are restored manually (see also
     // DolphinMainWindow::closeEvent() for more details):
-    QString filename = KStandardDirs::locateLocal("data", KGlobal::instance()->instanceName());
-    filename.append("/panels_layout");
+    QString filename = KStandardDirs::locateLocal("data", KGlobal::mainComponent().componentName());   filename.append("/panels_layout");
     QFile file(filename);
     if (file.open(QIODevice::ReadOnly)) {
         QByteArray data = file.readAll();
@@ -934,7 +943,7 @@ void DolphinMainWindow::loadSettings()
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
-    m_newMenu = new KNewMenu(actionCollection(), this, "create_new");
+    m_newMenu = new DolphinNewMenu(this);
     KMenu* menu = m_newMenu->menu();
     menu->setTitle(i18n("Create New..."));
     menu->setIcon(SmallIcon("filenew"));
@@ -971,7 +980,7 @@ void DolphinMainWindow::setupActions()
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
     // setup 'Edit' menu
-    KStandardAction::undo(KonqUndoManager::self(),
+    KStandardAction::undo(this,
                           SLOT(undo()),
                           actionCollection());