The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / panels / folders / treeviewcontextmenu.cpp

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 9e86380028d451f252aca121c636fb529d86d6ab..32e92e05c2e8fcb874580c9d7536cff0960d291c 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -27,17 +27,18 @@
 #include <kio/deletejob.h>
 #include <kmenu.h>
 #include <konqmimedata.h>
-#include <konq_fileitemcapabilities.h>
+#include <kfileitemlistproperties.h>
 #include <konq_operations.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 
-#include "treeviewsidebarpage.h"
+#include "folderspanel.h"
 
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
+#include <QApplication>
+#include <QClipboard>
+#include <QPointer>
 
-TreeViewContextMenu::TreeViewContextMenu(TreeViewSidebarPage* parent,
+TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
     QObject(parent),
     m_parent(parent),
@@ -54,7 +55,7 @@ void TreeViewContextMenu::open()
     KMenu* popup = new KMenu(m_parent);
 
     if (!m_fileInfo.isNull()) {
-        KonqFileItemCapabilities capabilities(KFileItemList() << m_fileInfo);
+        KFileItemListProperties capabilities(KFileItemList() << m_fileInfo);
 
         // insert 'Cut', 'Copy' and 'Paste'
         QAction* cutAction = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this);
@@ -89,7 +90,7 @@ void TreeViewContextMenu::open()
         const KUrl& url = m_fileInfo.url();
         if (url.isLocalFile()) {
             QAction* moveToTrashAction = new QAction(KIcon("user-trash"),
-                                                    i18nc("@action:inmenu", "Move To Trash"), this);
+                                                    i18nc("@action:inmenu", "Move to Trash"), this);
             const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
             moveToTrashAction->setEnabled(enableMoveToTrash);
             connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
@@ -182,8 +183,9 @@ void TreeViewContextMenu::deleteItem()
 
 void TreeViewContextMenu::showProperties()
 {
-    KPropertiesDialog dialog(m_fileInfo.url(), m_parent);
-    dialog.exec();
+    QPointer<KPropertiesDialog> dialog = new KPropertiesDialog(m_fileInfo.url(), m_parent);
+    dialog->exec();
+    delete dialog;
 }
 
 void TreeViewContextMenu::setShowHiddenFiles(bool show)