Drag & drop fixes for all views: assure that a consistent pixmap for the drag object...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index c38cc5ea3b8f58b964dc7a444d0423d572687305..ddabf21a4ff7d37a3b90fbeb64ba3e9ad45fdf36 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -52,10 +52,10 @@
 #include <kicon.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
-#include <kio/deletejob.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmenu.h>
+#include <kmenubar.h>
 #include <kmessagebox.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
@@ -77,6 +77,7 @@
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
     m_newMenu(0),
+    m_showMenuBar(0),
     m_splitter(0),
     m_activeViewContainer(0),
     m_id(id)
@@ -488,28 +489,20 @@ void DolphinMainWindow::rename()
 void DolphinMainWindow::moveToTrash()
 {
     clearStatusBar();
-    const KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls();
-    KonqOperations::del(this, KonqOperations::TRASH, selectedUrls);
-    m_undoCommandTypes.append(KonqFileUndoManager::TRASH);
+
+    DolphinView* view = m_activeViewContainer->view();
+
+    if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
+        view->deleteSelectedItems();
+    } else {
+        view->trashSelectedItems();
+    }
 }
 
 void DolphinMainWindow::deleteItems()
 {
     clearStatusBar();
-
-    const KUrl::List list = m_activeViewContainer->view()->selectedUrls();
-    const bool del = KonqOperations::askDeleteConfirmation(list,
-                     KonqOperations::DEL,
-                     KonqOperations::DEFAULT_CONFIRMATION,
-                     this);
-
-    if (del) {
-        KIO::Job* job = KIO::del(list);
-        connect(job, SIGNAL(result(KJob*)),
-                this, SLOT(slotHandleJobError(KJob*)));
-        connect(job, SIGNAL(result(KJob*)),
-                this, SLOT(slotDeleteFileFinished(KJob*)));
-    }
+    m_activeViewContainer->view()->deleteSelectedItems();
 }
 
 void DolphinMainWindow::properties()
@@ -533,24 +526,6 @@ void DolphinMainWindow::slotHandlePlacesError(const QString &message)
     }
 }
 
-void DolphinMainWindow::slotHandleJobError(KJob* job)
-{
-    if (job->error() != 0) {
-        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
-        statusBar->setMessage(job->errorString(),
-                              DolphinStatusBar::Error);
-    }
-}
-
-void DolphinMainWindow::slotDeleteFileFinished(KJob* job)
-{
-    if (job->error() == 0) {
-        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
-        statusBar->setMessage(i18nc("@info:status", "Delete operation completed."),
-                              DolphinStatusBar::OperationCompleted);
-    }
-}
-
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {
     QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo));
@@ -943,6 +918,12 @@ void DolphinMainWindow::compareFiles()
 
 }
 
+void DolphinMainWindow::toggleShowMenuBar()
+{
+    const bool visible = menuBar()->isVisible();
+    menuBar()->setVisible(!visible);
+}
+
 void DolphinMainWindow::editSettings()
 {
     DolphinSettingsDialog dialog(this);
@@ -1047,21 +1028,13 @@ void DolphinMainWindow::setupActions()
     newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 
-    KAction* rename = actionCollection()->addAction("rename");
-    rename->setText(i18nc("@action:inmenu File", "Rename..."));
-    rename->setShortcut(Qt::Key_F2);
+    KAction* rename = DolphinView::createRenameAction(actionCollection());
     connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
 
-    KAction* moveToTrash = actionCollection()->addAction("move_to_trash");
-    moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash"));
-    moveToTrash->setIcon(KIcon("user-trash"));
-    moveToTrash->setShortcut(QKeySequence::Delete);
+    KAction* moveToTrash = DolphinView::createMoveToTrashAction(actionCollection());
     connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));
 
-    KAction* deleteAction = actionCollection()->addAction("delete");
-    deleteAction->setText(i18nc("@action:inmenu File", "Delete"));
-    deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);
-    deleteAction->setIcon(KIcon("edit-delete"));
+    KAction* deleteAction = DolphinView::createDeleteAction(actionCollection());
     connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));
 
     KAction* properties = actionCollection()->addAction("properties");
@@ -1278,6 +1251,7 @@ void DolphinMainWindow::setupActions()
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
     // setup 'Settings' menu
+    m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 }