From 6c4e3aee2a65969d25813d9809bffca23fbe18d3 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sun, 25 Feb 2007 22:42:47 +0000 Subject: As Aaron suggested: use the global setting for "Show Delete command" instead of using a custom Dolphin setting. I hope I used the reworked KConfig classes in a correct manner (setGroup() has been marked as deprecated, Konqueror still uses those deprecated methods). svn path=/trunk/KDE/kdebase/apps/; revision=637272 --- src/dolphincontextmenu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/dolphincontextmenu.cpp') diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 14f71f449..346ee6401 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -25,8 +25,6 @@ #include "dolphinview.h" #include "editbookmarkdialog.h" -#include "dolphin_generalsettings.h" - #include #include @@ -154,7 +152,9 @@ void DolphinContextMenu::openItemContextMenu() popup->addAction(renameAction); // insert 'Move to Trash' and (optionally) 'Delete' - bool showDeleteCommand = DolphinSettings::instance().generalSettings()->showDeleteCommand(); + const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); + const KConfigGroup kdeConfig(globalConfig, "KDE"); + bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false); const KUrl& url = dolphin->activeView()->url(); if (url.isLocalFile()) { QAction* moveToTrashAction = dolphin->actionCollection()->action("move_to_trash"); -- cgit v1.3