From 95042476f62370fc3dde8f53869da23ebe8d079d Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 13 Oct 2007 22:00:56 +0000 Subject: [PATCH] Fixed issue that the "Show 'Delete' command in context menu" setting is not remembered anymore. CCMAIL: ereslibre@kde.org BUG: 150783 svn path=/trunk/KDE/kdebase/apps/; revision=724942 --- src/dolphincontextmenu.cpp | 2 +- src/generalsettingspage.cpp | 7 +++---- src/treeviewcontextmenu.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index ce315eb573..cbc1893c98 100644 --- 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 270dbfb2c4..4aa762b889 100644 --- 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 24bf7faa68..b53241b18e 100644 --- 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();