Respect Shift- and Control-key for the rubberband selection

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

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 30484551c1eb5517227bb9a86d633d977657dc2c..5db3e2c2a7aa862aa3b859250cfef582b4ae5aaa 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -34,7 +34,6 @@
 
 #include <QApplication>
 #include <QClipboard>
-#include <QPointer>
 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
@@ -118,7 +117,7 @@ void TreeViewContextMenu::open()
 
     QAction* showHiddenFilesAction = new QAction(i18nc("@action:inmenu", "Show Hidden Files"), this);
     showHiddenFilesAction->setCheckable(true);
-    showHiddenFilesAction->setChecked(m_parent->showHiddenFiles());
+    showHiddenFilesAction->setChecked(m_parent->hiddenFilesShown());
     popup->addAction(showHiddenFilesAction);
     connect(showHiddenFilesAction, SIGNAL(toggled(bool)), this, SLOT(setShowHiddenFiles(bool)));
 
@@ -193,14 +192,14 @@ void TreeViewContextMenu::deleteItem()
 
 void TreeViewContextMenu::showProperties()
 {
-    QPointer<KPropertiesDialog> dialog = new KPropertiesDialog(m_fileInfo.url(), m_parent);
-    dialog->exec();
-    delete dialog;
+    KPropertiesDialog* dialog = new KPropertiesDialog(m_fileInfo.url(), m_parent);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
 }
 
 void TreeViewContextMenu::setShowHiddenFiles(bool show)
 {
-    m_parent->setShowHiddenFiles(show);
+    m_parent->setHiddenFilesShown(show);
 }
 
 void TreeViewContextMenu::setAutoScrolling(bool enable)