Fixed issue that the "Show 'Delete' command in context menu" setting is not remembere...

CCMAIL: ereslibre@kde.org
BUG: 150783

svn path=/trunk/KDE/kdebase/apps/; revision=724942

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index ce315eb5735f88c2b2f866eaf806d20d2606be8a..cbc1893c9819ca526164b85db3b51719201f7648 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -277,7 +277,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
     popup->addAction(renameAction);
 
     // insert 'Move to Trash' and (optionally) 'Delete'
-    const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+    const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals");
     const KConfigGroup kdeConfig(globalConfig, "KDE");
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
     const KUrl& url = m_mainWindow->activeViewContainer()->url();

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 270dbfb2c4e82c6a95be01e0cdbdfec67347022d..4aa762b8890cbb30cea2403b423b4668a6257cd5 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -137,7 +137,7 @@ void GeneralSettingsPage::applySettings()
     settings->setEditableUrl(m_editableUrl->isChecked());
     settings->setFilterBar(m_filterBar->isChecked());
 
-    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals");
 
     KConfigGroup trashConfig(globalConfig, "Trash");
     trashConfig.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
@@ -155,9 +155,8 @@ void GeneralSettingsPage::restoreDefaults()
     settings->setDefaults();
 
     // TODO: reset default settings for trash and show delete command...
-    //KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
+    //KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals");
     //KConfigGroup trashConfig(konqConfig, "Trash");
-    //KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
     //KConfigGroup kdeConfig(globalConfig, "KDE");
 
     loadSettings();
@@ -191,7 +190,7 @@ void GeneralSettingsPage::loadSettings()
     m_editableUrl->setChecked(settings->editableUrl());
     m_filterBar->setChecked(settings->filterBar());
 
-    const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+    const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals");
 
     const KConfigGroup trashConfig(globalConfig, "Trash");
     m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index 24bf7faa6812be2ba35aa10593e1eff484112e2f..b53241b18ecebb99599b08e96e1ac0b80512214d 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -75,7 +75,7 @@ void TreeViewContextMenu::open()
     popup->addAction(renameAction);
 
     // insert 'Move to Trash' and (optionally) 'Delete'
-    const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+    const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals");
     const KConfigGroup kdeConfig(globalConfig, "KDE");
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
     const KUrl& url = m_fileInfo.url();