X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8559b78d7d4061bb70e6fe6ac2b787692282e69d..5070666ad2cd5fe3e559adca00a52aed5d137153:/src/panels/folders/treeviewcontextmenu.cpp

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index aa111c6ba..5db3e2c2a 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2006-2010 by Peter Penz <peter.penz19@gmail.com>        *
- *   Copyright (C) 2006 by Cvetoslav Ludmiloff                             *
+ *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -20,21 +20,20 @@
 
 #include "treeviewcontextmenu.h"
 
-#include <kfileitem.h>
-#include <kiconloader.h>
-#include <kio/deletejob.h>
-#include <kmenu.h>
+#include <KFileItem>
+#include <KIconLoader>
+#include <KIO/DeleteJob>
+#include <KMenu>
 #include <konqmimedata.h>
-#include <kfileitemlistproperties.h>
+#include <KFileItemListProperties>
 #include <konq_operations.h>
-#include <klocale.h>
-#include <kpropertiesdialog.h>
+#include <KLocale>
+#include <KPropertiesDialog>
 
 #include "folderspanel.h"
 
 #include <QApplication>
 #include <QClipboard>
-#include <QPointer>
 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
@@ -77,6 +76,7 @@ void TreeViewContextMenu::open()
         // insert 'Rename'
         QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
         renameAction->setEnabled(capabilities.supportsMoving());
+        renameAction->setIcon(KIcon("edit-rename"));
         connect(renameAction, SIGNAL(triggered()), this, SLOT(rename()));
         popup->addAction(renameAction);
 
@@ -108,6 +108,7 @@ void TreeViewContextMenu::open()
 
         // insert 'Properties' entry
         QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);
+        propertiesAction->setIcon(KIcon("document-properties"));
         connect(propertiesAction, SIGNAL(triggered()), this, SLOT(showProperties()));
         popup->addAction(propertiesAction);
 
@@ -116,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)));
 
@@ -126,6 +127,10 @@ void TreeViewContextMenu::open()
     popup->addAction(autoScrollingAction);
     connect(autoScrollingAction, SIGNAL(toggled(bool)), this, SLOT(setAutoScrolling(bool)));
 
+    popup->addSeparator();
+    foreach (QAction* action, m_parent->customContextMenuActions()) {
+        popup->addAction(action);
+    }
 
     popup->exec(QCursor::pos());
     popup->deleteLater();
@@ -187,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)