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

Revert "Hide context menu plugins unless enabled by default or by the user"

Browse source 
This reverts commit b1aebb44d6.

As agreed with Frank on k-c-d.
This commit is contained in:
Sune Vuorela 2013-06-21 10:37:52 +02:00
parent af24c1326a
commit 8927b09282
3 changed files with 11 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dolphin/src/dolphincontextmenu.cpp
View file

@ -476,25 +476,20 @@ void DolphinContextMenu::addFileItemPluginActions()
const KConfigGroup showGroup = config.group("Show");
foreach (const KSharedPtr<KService>& service, pluginServices) {
if (!showGroup.readEntry(service->desktopEntryName(), true)) {
// The plugin has been disabled
continue;
}
// Old API (kdelibs-4.6.0 only)
KFileItemActionPlugin* plugin = service->createInstance<KFileItemActionPlugin>();
if (plugin) {
if (!showGroup.readEntry(service->desktopEntryName(), true)) {
// The plugin has been disabled
continue;
}
plugin->setParent(this);
addActions(plugin->actions(props, m_mainWindow));
}
// New API (kdelibs >= 4.6.1)
KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance<KAbstractFileItemActionPlugin>();
if (abstractPlugin) {
if (!showGroup.readEntry(service->desktopEntryName(), abstractPlugin->enabledByDefault())) {
// The plugin has been disabled
continue;
}
abstractPlugin->setParent(this);
addActions(abstractPlugin->actions(props, m_mainWindow));
}

11
dolphin/src/settings/services/servicessettingspage.cpp
View file

@ -22,7 +22,6 @@
#include "dolphin_generalsettings.h"
#include "dolphin_versioncontrolsettings.h"
#include <kabstractfileitemactionplugin.h>
#include <KConfig>
#include <KConfigGroup>
#include <KDesktopFile>
@ -224,15 +223,7 @@ void ServicesSettingsPage::loadServices()
foreach (const KSharedPtr<KService>& service, pluginServices) {
const QString desktopEntryName = service->desktopEntryName();
if (!isInServicesList(desktopEntryName)) {
bool checked;
KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance<KAbstractFileItemActionPlugin>();
if (abstractPlugin) {
checked = showGroup.readEntry(desktopEntryName, abstractPlugin->enabledByDefault());
} else {
checked = showGroup.readEntry(desktopEntryName, true);
}
const bool checked = showGroup.readEntry(desktopEntryName, true);
addRow(service->icon(), service->name(), desktopEntryName, checked);
}
}

15
lib/konq/konq_popupmenu.cpp
View file

@ -587,25 +587,20 @@ void KonqPopupMenuPrivate::addPlugins()
const KConfigGroup showGroup = config.group("Show");
foreach (const KSharedPtr<KService>& service, fileItemPlugins) {
if (!showGroup.readEntry(service->desktopEntryName(), true)) {
// The plugin has been disabled
continue;
}
// Old API (kdelibs-4.6.0 only)
KFileItemActionPlugin* plugin = service->createInstance<KFileItemActionPlugin>();
if (plugin) {
if (!showGroup.readEntry(service->desktopEntryName(), true)) {
// The plugin has been disabled
continue;
}
plugin->setParent(q);
q->addActions(plugin->actions(m_popupItemProperties, m_parentWidget));
}
// New API (kdelibs >= 4.6.1)
KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance<KAbstractFileItemActionPlugin>();
if (abstractPlugin) {
if (!showGroup.readEntry(service->desktopEntryName(), abstractPlugin->enabledByDefault())) {
// The plugin has been disabled
continue;
}
abstractPlugin->setParent(q);
q->addActions(abstractPlugin->actions(m_popupItemProperties, m_parentWidget));
}