Treeview fixes (backport):

[dolphin.git] / src / treeviewcontextmenu.cpp

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index ec6d322008b5e98e66f14e2f86e6fd16111cfdb4..40c5e9cd8f4fd8844685e3de72898314751650c0 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -20,6 +20,7 @@
 
 #include "treeviewcontextmenu.h"
 
 
 #include "treeviewcontextmenu.h"
 

+#include <kfileitem.h>

 #include <kiconloader.h>
 #include <kio/deletejob.h>
 #include <kmenu.h>
 #include <kiconloader.h>
 #include <kio/deletejob.h>
 #include <kmenu.h>


@@ -34,7 +35,7 @@
 #include <QtGui/QClipboard>
 
 TreeViewContextMenu::TreeViewContextMenu(QWidget* parent,
 #include <QtGui/QClipboard>
 
 TreeViewContextMenu::TreeViewContextMenu(QWidget* parent,

-                                         KFileItem* fileInfo) :
+                                         const KFileItem& fileInfo) :

     m_parent(parent),
     m_fileInfo(fileInfo)
 {
     m_parent(parent),
     m_fileInfo(fileInfo)
 {


@@ -46,18 +47,18 @@ TreeViewContextMenu::~TreeViewContextMenu()
 
 void TreeViewContextMenu::open()
 {
 
 void TreeViewContextMenu::open()
 {

-    Q_ASSERT(m_fileInfo != 0);
+    Q_ASSERT(!m_fileInfo.isNull());

 
     KMenu* popup = new KMenu(m_parent);
 
     // insert 'Cut', 'Copy' and 'Paste'
 
     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()));
 
     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()));
 
     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());
     const QMimeData* mimeData = QApplication::clipboard()->mimeData();
     const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData);
     pasteAction->setEnabled(!pasteData.isEmpty());


@@ -69,17 +70,17 @@ void TreeViewContextMenu::open()
     popup->addSeparator();
 
     // insert 'Rename'
     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);
 
     // insert 'Move to Trash' and (optionally) 'Delete'
     connect(renameAction, SIGNAL(triggered()), this, SLOT(rename()));
     popup->addAction(renameAction);
 
     // insert 'Move to Trash' and (optionally) 'Delete'

-    const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
-    const KConfigGroup kdeConfig(globalConfig, "KDE");
+    KConfigGroup kdeConfig(KGlobal::config(), "KDE");

     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);

-    const KUrl& url = m_fileInfo->url();
+    const KUrl& url = m_fileInfo.url();

     if (url.isLocalFile()) {
     if (url.isLocalFile()) {

-        QAction* moveToTrashAction = new QAction(KIcon("edit-trash"), i18n("Move To Trash"), this);
+        QAction* moveToTrashAction = new QAction(KIcon("user-trash"),
+                                                 i18nc("@action:inmenu", "Move To Trash"), this);

         connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
         popup->addAction(moveToTrashAction);
     } else {
         connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
         popup->addAction(moveToTrashAction);
     } else {


@@ -87,7 +88,7 @@ void TreeViewContextMenu::open()
     }
 
     if (showDeleteCommand) {
     }
 
     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);
     }
         connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItem()));
         popup->addAction(deleteAction);
     }


@@ -95,7 +96,7 @@ void TreeViewContextMenu::open()
     popup->addSeparator();
 
     // insert 'Properties' entry
     popup->addSeparator();
 
     // insert 'Properties' entry

-    QAction* propertiesAction = new QAction(i18n("Properties"), this);
+    QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);

     connect(propertiesAction, SIGNAL(triggered()), this, SLOT(showProperties()));
     popup->addAction(propertiesAction);
 
     connect(propertiesAction, SIGNAL(triggered()), this, SLOT(showProperties()));
     popup->addAction(propertiesAction);
 


@@ -107,7 +108,7 @@ void TreeViewContextMenu::cut()
 {
     QMimeData* mimeData = new QMimeData();
     KUrl::List kdeUrls;
 {
     QMimeData* mimeData = new QMimeData();
     KUrl::List kdeUrls;

-    kdeUrls.append(m_fileInfo->url());
+    kdeUrls.append(m_fileInfo.url());

     KonqMimeData::populateMimeData(mimeData, kdeUrls, KUrl::List(), true);
     QApplication::clipboard()->setMimeData(mimeData);
 }
     KonqMimeData::populateMimeData(mimeData, kdeUrls, KUrl::List(), true);
     QApplication::clipboard()->setMimeData(mimeData);
 }


@@ -116,7 +117,7 @@ void TreeViewContextMenu::copy()
 {
     QMimeData* mimeData = new QMimeData();
     KUrl::List kdeUrls;
 {
     QMimeData* mimeData = new QMimeData();
     KUrl::List kdeUrls;

-    kdeUrls.append(m_fileInfo->url());
+    kdeUrls.append(m_fileInfo.url());

     KonqMimeData::populateMimeData(mimeData, kdeUrls, KUrl::List(), false);
     QApplication::clipboard()->setMimeData(mimeData);
 }
     KonqMimeData::populateMimeData(mimeData, kdeUrls, KUrl::List(), false);
     QApplication::clipboard()->setMimeData(mimeData);
 }


@@ -127,7 +128,7 @@ void TreeViewContextMenu::paste()
     const QMimeData* mimeData = clipboard->mimeData();
 
     const KUrl::List source = KUrl::List::fromMimeData(mimeData);
     const QMimeData* mimeData = clipboard->mimeData();
 
     const KUrl::List source = KUrl::List::fromMimeData(mimeData);

-    const KUrl& dest = m_fileInfo->url();
+    const KUrl& dest = m_fileInfo.url();

     if (KonqMimeData::decodeIsCutSelection(mimeData)) {
         KonqOperations::copy(m_parent, KonqOperations::MOVE, source, dest);
         clipboard->clear();
     if (KonqMimeData::decodeIsCutSelection(mimeData)) {
         KonqOperations::copy(m_parent, KonqOperations::MOVE, source, dest);
         clipboard->clear();


@@ -138,31 +139,32 @@ void TreeViewContextMenu::paste()
 
 void TreeViewContextMenu::rename()
 {
 
 void TreeViewContextMenu::rename()
 {

-    const KUrl& oldUrl = m_fileInfo->url();
-    RenameDialog dialog(oldUrl);
+    KFileItemList item;
+    item.append(m_fileInfo);
+    RenameDialog dialog(m_parent, item);

     if (dialog.exec() == QDialog::Accepted) {
         const QString& newName = dialog.newName();
         if (!newName.isEmpty()) {
     if (dialog.exec() == QDialog::Accepted) {
         const QString& newName = dialog.newName();
         if (!newName.isEmpty()) {

-            KUrl newUrl = oldUrl;
+            KUrl newUrl = m_fileInfo.url();

             newUrl.setFileName(newName);
             newUrl.setFileName(newName);

-            KonqOperations::rename(m_parent, oldUrl, newUrl);
+            KonqOperations::rename(m_parent, m_fileInfo.url(), newUrl);

         }
     }
 }
 
 void TreeViewContextMenu::moveToTrash()
 {
         }
     }
 }
 
 void TreeViewContextMenu::moveToTrash()
 {

-    KonqOperations::del(m_parent, KonqOperations::TRASH, m_fileInfo->url());
+    KonqOperations::del(m_parent, KonqOperations::TRASH, m_fileInfo.url());

 }
 
 void TreeViewContextMenu::deleteItem()
 {
 }
 
 void TreeViewContextMenu::deleteItem()
 {

-    KonqOperations::del(m_parent, KonqOperations::DEL, m_fileInfo->url());
+    KonqOperations::del(m_parent, KonqOperations::DEL, m_fileInfo.url());

 }
 
 void TreeViewContextMenu::showProperties()
 {
 }
 
 void TreeViewContextMenu::showProperties()
 {

-    KPropertiesDialog dialog(m_fileInfo->url());
+    KPropertiesDialog dialog(m_fileInfo.url(), m_parent);

     dialog.exec();
 }
 
     dialog.exec();
 }