mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 08:21:22 +00:00
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
This commit is contained in:
parent
c31b5f3be0
commit
95042476f6
|
@ -277,7 +277,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
|
||||||
popup->addAction(renameAction);
|
popup->addAction(renameAction);
|
||||||
|
|
||||||
// insert 'Move to Trash' and (optionally) 'Delete'
|
// 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");
|
const KConfigGroup kdeConfig(globalConfig, "KDE");
|
||||||
bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
|
bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
|
||||||
const KUrl& url = m_mainWindow->activeViewContainer()->url();
|
const KUrl& url = m_mainWindow->activeViewContainer()->url();
|
||||||
|
|
|
@ -137,7 +137,7 @@ void GeneralSettingsPage::applySettings()
|
||||||
settings->setEditableUrl(m_editableUrl->isChecked());
|
settings->setEditableUrl(m_editableUrl->isChecked());
|
||||||
settings->setFilterBar(m_filterBar->isChecked());
|
settings->setFilterBar(m_filterBar->isChecked());
|
||||||
|
|
||||||
KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
|
KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals");
|
||||||
|
|
||||||
KConfigGroup trashConfig(globalConfig, "Trash");
|
KConfigGroup trashConfig(globalConfig, "Trash");
|
||||||
trashConfig.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
|
trashConfig.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
|
||||||
|
@ -155,9 +155,8 @@ void GeneralSettingsPage::restoreDefaults()
|
||||||
settings->setDefaults();
|
settings->setDefaults();
|
||||||
|
|
||||||
// TODO: reset default settings for trash and show delete command...
|
// 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");
|
//KConfigGroup trashConfig(konqConfig, "Trash");
|
||||||
//KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
|
|
||||||
//KConfigGroup kdeConfig(globalConfig, "KDE");
|
//KConfigGroup kdeConfig(globalConfig, "KDE");
|
||||||
|
|
||||||
loadSettings();
|
loadSettings();
|
||||||
|
@ -191,7 +190,7 @@ void GeneralSettingsPage::loadSettings()
|
||||||
m_editableUrl->setChecked(settings->editableUrl());
|
m_editableUrl->setChecked(settings->editableUrl());
|
||||||
m_filterBar->setChecked(settings->filterBar());
|
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");
|
const KConfigGroup trashConfig(globalConfig, "Trash");
|
||||||
m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));
|
m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));
|
||||||
|
|
|
@ -75,7 +75,7 @@ void TreeViewContextMenu::open()
|
||||||
popup->addAction(renameAction);
|
popup->addAction(renameAction);
|
||||||
|
|
||||||
// insert 'Move to Trash' and (optionally) 'Delete'
|
// 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");
|
const KConfigGroup kdeConfig(globalConfig, "KDE");
|
||||||
bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
|
bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
|
||||||
const KUrl& url = m_fileInfo.url();
|
const KUrl& url = m_fileInfo.url();
|
||||||
|
|
Loading…
Reference in a new issue