kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-17 15:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
CCMAIL: ereslibre@kde.org
BUG: 150783

svn path=/trunk/KDE/kdebase/apps/; revision=724942
This commit is contained in:
Peter Penz 2007-10-13 22:00:56 +00:00
parent c31b5f3be0
commit 95042476f6
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dolphincontextmenu.cpp
View file

@ -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();

7
src/generalsettingspage.cpp
View file

@ -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));

2
src/treeviewcontextmenu.cpp
View file

@ -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();