kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

As Aaron suggested: use the global setting for "Show Delete command" instead of using a custom Dolphin setting. I hope I used the reworked KConfig classes in a correct manner (setGroup() has been marked as deprecated, Konqueror still uses those deprecated methods).

Browse Source 
svn path=/trunk/KDE/kdebase/apps/; revision=637272
This commit is contained in:
Peter Penz 2007-02-25 22:42:47 +00:00
parent d9c3648d5a
commit 6c4e3aee2a
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dolphin_generalsettings.kcfg
View File

@ -23,10 +23,6 @@
<label>Should the view properties used for all directories</label>
<default>false</default>
</entry>
<entry name="ShowDeleteCommand" type="Bool">
<label>Should the command 'Delete' be shown in the context menu</label>
<default>false</default>
</entry>
<entry name="ViewPropsTimestamp" type="DateTime" >
<label>Timestamp since when the view properties are valid</label>
</entry>

6
src/dolphincontextmenu.cpp
View File

@ -25,8 +25,6 @@
#include "dolphinview.h"
#include "editbookmarkdialog.h"
#include "dolphin_generalsettings.h"
#include <assert.h>
#include <kactioncollection.h>
@ -154,7 +152,9 @@ void DolphinContextMenu::openItemContextMenu()
popup->addAction(renameAction);
// insert 'Move to Trash' and (optionally) 'Delete'
bool showDeleteCommand = DolphinSettings::instance().generalSettings()->showDeleteCommand();
const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
const KConfigGroup kdeConfig(globalConfig, "KDE");
bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
const KUrl& url = dolphin->activeView()->url();
if (url.isLocalFile()) {
QAction* moveToTrashAction = dolphin->actionCollection()->action("move_to_trash");

11
src/generalsettingspage.cpp
View File

@ -95,8 +95,9 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* par
startBoxLayout->addWidget(m_startEditable);
m_showDeleteCommand = new QCheckBox(i18n("Show the command 'Delete' in context menu"), vBox);
// TODO: use global config like in Konqueror or is this a custom setting for Dolphin?
m_showDeleteCommand->setChecked(settings->showDeleteCommand());
const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
const KConfigGroup kdeConfig(globalConfig, "KDE");
m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false));
// Add a dummy widget with no restriction regarding
// a vertical resizing. This assures that the dialog layout
@ -123,7 +124,11 @@ void GeneralSettingsPage::applySettings()
settings->setSplitView(m_startSplit->isChecked());
settings->setEditableUrl(m_startEditable->isChecked());
settings->setShowDeleteCommand(m_showDeleteCommand->isChecked());
KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
KConfigGroup kdeConfig(globalConfig, "KDE");
kdeConfig.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
kdeConfig.sync();
}
void GeneralSettingsPage::selectHomeUrl()