KDE/kdebase/apps/plasma/applets/folderview

[Alex Merry]

SVN commit 843808 by alexmerry:

The "Show Delete" option is no longer stored in dolphinrc, but in kdeglobals.  This is inherited by KGlobal::config(), so we just use that (rather than re-reading config files).

Incidentally, this means that power users can have a different setting for dolphin than folderview if they really want.

CCMAIL: plasma-devel at kde.org
Should I backport this? (The whole getting the global Show Delete Command option, that is).



 M  +2 -4      folderview.cpp  


--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderview.cpp #843807:843808
@@ -1281,10 +1281,8 @@
     QList<QAction*> editActions;
     editActions.append(m_actionCollection.action("rename"));
 
-    KSharedConfig::Ptr dolphinConfig =
-        KSharedConfig::openConfig("dolphinrc", KConfig::IncludeGlobals);
-    const KConfigGroup dolphinKdeConfig(dolphinConfig, "KDE");
-    bool showDeleteCommand = dolphinKdeConfig.readEntry("ShowDeleteCommand", false);
+    KConfigGroup configGroup(KGlobal::config(), "KDE");
+    bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
     if (!hasRemoteFiles) {
         editActions.append(m_actionCollection.action("trash"));
     } else {