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 c63772a389e4603fab7d0183a59bdfd3ae816e2d..32e92e05c2e8fcb874580c9d7536cff0960d291c 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -27,15 +27,16 @@
 #include <kio/deletejob.h>
 #include <kmenu.h>
 #include <konqmimedata.h>
 #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 "folderspanel.h"
 
 #include <konq_operations.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 
 #include "folderspanel.h"
 

-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
+#include <QApplication>
+#include <QClipboard>
+#include <QPointer>

 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :


@@ -54,7 +55,7 @@ void TreeViewContextMenu::open()
     KMenu* popup = new KMenu(m_parent);
 
     if (!m_fileInfo.isNull()) {
     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);
 
         // 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"),
         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()));
             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()
 {
 
 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)
 }
 
 void TreeViewContextMenu::setShowHiddenFiles(bool show)