From 17dca27e615fa63ac6b8d7bf3aabfdbd9d71e0f5 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Thu, 7 Aug 2008 21:44:35 +0000 Subject: use the global setting for the "Show Delete" command CCMAIL: kde@randomguy3.me.uk svn path=/trunk/KDE/kdebase/apps/; revision=843787 --- src/generalsettingspage.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/generalsettingspage.cpp') diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index dc891a074..5dc66cbdc 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -106,9 +106,10 @@ void GeneralSettingsPage::applySettings() confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked()); confirmationGroup.sync(); - KConfigGroup kdeConfig(KGlobal::config(), "KDE"); - kdeConfig.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked()); - kdeConfig.sync(); + KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); + KConfigGroup configGroup(globalConfig, "KDE"); + configGroup.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked()); + configGroup.sync(); settings->setShowCopyMoveMenu(m_showCopyMoveMenu->isChecked()); settings->setBrowseThroughArchives(m_browseThroughArchives->isChecked()); @@ -132,9 +133,10 @@ void GeneralSettingsPage::loadSettings() m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", false)); m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", true)); - const KConfigGroup kdeConfig(KGlobal::config(), "KDE"); - m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false)); - + KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals); + KConfigGroup configGroup(globalConfig, "KDE"); + m_showDeleteCommand->setChecked(configGroup.readEntry("ShowDeleteCommand", false)); + GeneralSettings* settings = DolphinSettings::instance().generalSettings(); m_showCopyMoveMenu->setChecked(settings->showCopyMoveMenu()); m_browseThroughArchives->setChecked(settings->browseThroughArchives()); -- cgit v1.3