Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
System
Dolphin
Commits
d48b7334
Commit
d48b7334
authored
Jun 08, 2016
by
Elvis Angelaccio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Load KFileItemAction plugins with json metadata
REVIEW: 128088
parent
29f12d91
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
0 deletions
+40
-0
src/dolphincontextmenu.cpp
src/dolphincontextmenu.cpp
+26
-0
src/settings/services/servicessettingspage.cpp
src/settings/services/servicessettingspage.cpp
+14
-0
No files found.
src/dolphincontextmenu.cpp
View file @
d48b7334
...
...
@@ -37,6 +37,7 @@
#include <KJobWidgets>
#include <KMimeTypeTrader>
#include <KNewFileMenu>
#include <KPluginMetaData>
#include <KService>
#include <KLocalizedString>
#include <KStandardAction>
...
...
@@ -503,6 +504,7 @@ void DolphinContextMenu::addFileItemPluginActions()
const
KConfig
config
(
QStringLiteral
(
"kservicemenurc"
),
KConfig
::
NoGlobals
);
const
KConfigGroup
showGroup
=
config
.
group
(
"Show"
);
QSet
<
QString
>
addedPlugins
;
foreach
(
const
KService
::
Ptr
&
service
,
pluginServices
)
{
if
(
!
showGroup
.
readEntry
(
service
->
desktopEntryName
(),
true
))
{
// The plugin has been disabled
...
...
@@ -510,6 +512,30 @@ void DolphinContextMenu::addFileItemPluginActions()
}
KAbstractFileItemActionPlugin
*
abstractPlugin
=
service
->
createInstance
<
KAbstractFileItemActionPlugin
>
();
if
(
abstractPlugin
)
{
abstractPlugin
->
setParent
(
this
);
addActions
(
abstractPlugin
->
actions
(
props
,
m_mainWindow
));
addedPlugins
<<
service
->
desktopEntryName
();
}
}
const
auto
jsonPlugins
=
KPluginLoader
::
findPlugins
(
QString
(),
[](
const
KPluginMetaData
&
metaData
)
{
return
metaData
.
serviceTypes
().
contains
(
QStringLiteral
(
"KFileItemAction/Plugin"
));
});
foreach
(
const
auto
&
jsonMetadata
,
jsonPlugins
)
{
// The plugin has been disabled
if
(
!
showGroup
.
readEntry
(
jsonMetadata
.
pluginId
(),
true
))
{
continue
;
}
// The plugin also has a .desktop file and has already been added.
if
(
addedPlugins
.
contains
(
jsonMetadata
.
pluginId
()))
{
continue
;
}
KPluginFactory
*
factory
=
KPluginLoader
(
jsonMetadata
.
fileName
()).
factory
();
KAbstractFileItemActionPlugin
*
abstractPlugin
=
factory
->
create
<
KAbstractFileItemActionPlugin
>
();
if
(
abstractPlugin
)
{
abstractPlugin
->
setParent
(
this
);
addActions
(
abstractPlugin
->
actions
(
props
,
m_mainWindow
));
...
...
src/settings/services/servicessettingspage.cpp
View file @
d48b7334
...
...
@@ -30,6 +30,7 @@
#include <KLocalizedString>
#include <KMessageBox>
#include <KNS3/Button>
#include <KPluginMetaData>
#include <KService>
#include <KServiceTypeTrader>
#include <QStandardPaths>
...
...
@@ -228,6 +229,19 @@ void ServicesSettingsPage::loadServices()
}
}
// Load JSON-based plugins that implement the KFileItemActionPlugin interface
const
auto
jsonPlugins
=
KPluginLoader
::
findPlugins
(
QString
(),
[](
const
KPluginMetaData
&
metaData
)
{
return
metaData
.
serviceTypes
().
contains
(
QStringLiteral
(
"KFileItemAction/Plugin"
));
});
foreach
(
const
auto
&
jsonMetadata
,
jsonPlugins
)
{
const
QString
desktopEntryName
=
jsonMetadata
.
pluginId
();
if
(
!
isInServicesList
(
desktopEntryName
))
{
const
bool
checked
=
showGroup
.
readEntry
(
desktopEntryName
,
true
);
addRow
(
jsonMetadata
.
iconName
(),
jsonMetadata
.
name
(),
desktopEntryName
,
checked
);
}
}
m_sortModel
->
sort
(
Qt
::
DisplayRole
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment