X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/acc54fc38bb32d8774af44366246f92cd75b0b22..88705d0c34911fee2464bab8a050159f68d84d98:/src/treeviewcontextmenu.cpp

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index 561435ca2..e9963073f 100644
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -21,6 +21,7 @@
 #include "treeviewcontextmenu.h"
 
 #include <kiconloader.h>
+#include <kio/deletejob.h>
 #include <kmenu.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
@@ -29,8 +30,8 @@
 
 #include "renamedialog.h"
 
-#include <QApplication>
-#include <QClipboard>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
 
 TreeViewContextMenu::TreeViewContextMenu(QWidget* parent,
                                          KFileItem* fileInfo) :
@@ -50,13 +51,13 @@ void TreeViewContextMenu::open()
     KMenu* popup = new KMenu(m_parent);
 
     // insert 'Cut', 'Copy' and 'Paste'
-    QAction* cutAction   = new QAction(KIcon("edit-cut"), i18n("Cut"), this);
+    QAction* cutAction   = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this);
     connect(cutAction, SIGNAL(triggered()), this, SLOT(cut()));
 
-    QAction* copyAction  = new QAction(KIcon("edit-copy"), i18n("Copy"), this);
+    QAction* copyAction  = new QAction(KIcon("edit-copy"), i18nc("@action:inmenu", "Copy"), this);
     connect(copyAction, SIGNAL(triggered()), this, SLOT(copy()));
 
-    QAction* pasteAction = new QAction(KIcon("edit-paste"), i18n("Paste"), this);
+    QAction* pasteAction = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste"), this);
     const QMimeData* mimeData = QApplication::clipboard()->mimeData();
     const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData);
     pasteAction->setEnabled(!pasteData.isEmpty());
@@ -68,7 +69,7 @@ void TreeViewContextMenu::open()
     popup->addSeparator();
 
     // insert 'Rename'
-    QAction* renameAction = new QAction(i18n("Rename"), this);
+    QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
     connect(renameAction, SIGNAL(triggered()), this, SLOT(rename()));
     popup->addAction(renameAction);
 
@@ -78,25 +79,25 @@ void TreeViewContextMenu::open()
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
     const KUrl& url = m_fileInfo->url();
     if (url.isLocalFile()) {
-        QAction* moveToTrashAction = new QAction(KIcon("edit-trash"), i18n("Move To Trash"), this);
+        QAction* moveToTrashAction = new QAction(KIcon("edit-trash"),
+                                                 i18nc("@action:inmenu", "Move To Trash"), this);
         connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
         popup->addAction(moveToTrashAction);
-    }
-    else {
+    } else {
         showDeleteCommand = true;
     }
 
     if (showDeleteCommand) {
-        QAction* deleteAction = new QAction(KIcon("edit-delete"), i18n("Delete"), this);
+        QAction* deleteAction = new QAction(KIcon("edit-delete"), i18nc("@action:inmenu", "Delete"), this);
         connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItem()));
         popup->addAction(deleteAction);
     }
 
     popup->addSeparator();
 
-    // insert 'Properties...' entry
-    QAction* propertiesAction = new QAction(i18n("Properties..."), this);
-    connect(this, SIGNAL(triggered()), this, SLOT(showProperties()));
+    // insert 'Properties' entry
+    QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);
+    connect(propertiesAction, SIGNAL(triggered()), this, SLOT(showProperties()));
     popup->addAction(propertiesAction);
 
     popup->exec(QCursor::pos());
@@ -131,8 +132,7 @@ void TreeViewContextMenu::paste()
     if (KonqMimeData::decodeIsCutSelection(mimeData)) {
         KonqOperations::copy(m_parent, KonqOperations::MOVE, source, dest);
         clipboard->clear();
-    }
-    else {
+    } else {
         KonqOperations::copy(m_parent, KonqOperations::COPY, source, dest);
     }
 }
@@ -144,8 +144,8 @@ void TreeViewContextMenu::rename()
     if (dialog.exec() == QDialog::Accepted) {
         const QString& newName = dialog.newName();
         if (!newName.isEmpty()) {
-            KUrl newUrl = oldUrl.upUrl();
-            newUrl.addPath(newName);
+            KUrl newUrl = oldUrl;
+            newUrl.setFileName(newName);
             KonqOperations::rename(m_parent, oldUrl, newUrl);
         }
     }
@@ -158,15 +158,13 @@ void TreeViewContextMenu::moveToTrash()
 
 void TreeViewContextMenu::deleteItem()
 {
-    KonqOperations::askDeleteConfirmation(m_fileInfo->url(),
-                                          KonqOperations::DEL,
-                                          KonqOperations::FORCE_CONFIRMATION,
-                                          m_parent);
+    KonqOperations::del(m_parent, KonqOperations::DEL, m_fileInfo->url());
 }
 
 void TreeViewContextMenu::showProperties()
 {
-    new KPropertiesDialog(m_fileInfo->url());
+    KPropertiesDialog dialog(m_fileInfo->url());
+    dialog.exec();
 }
 
 #include "treeviewcontextmenu.moc"