Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Network
Konqueror
Commits
fc80773b
Commit
fc80773b
authored
Jul 15, 2022
by
Stefano Crocco
Browse files
Improve name of action file entry
parent
e0cf5a1b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/konqfactory.cpp
View file @
fc80773b
...
...
@@ -195,11 +195,7 @@ void KonqFactory::getOffers(const QString &serviceType, PluginMetaDataVector *pa
uniqueOffers
.
append
(
md
);
}
}
*
partServiceOffers
=
uniqueOffers
;
for
(
auto
md
:
*
partServiceOffers
)
{
qDebug
()
<<
md
.
pluginId
();
}
}
if
(
appServiceOffers
)
{
*
appServiceOffers
=
KApplicationTrader
::
queryByMimeType
(
serviceType
,
[](
const
KService
::
Ptr
&
s
){
return
!
s
->
desktopEntryName
().
startsWith
(
"kfmclient"
);});
...
...
src/konqmainwindow.cpp
View file @
fc80773b
...
...
@@ -4697,8 +4697,6 @@ void KonqMainWindow::updateViewModeActions()
return
;
}
//TODO port away from query: find out how to replace all of this, since I don't think that KPluginMetaData provides
//something like KService::actions
m_viewModeMenu
=
new
KActionMenu
(
i18nc
(
"@action:inmenu View"
,
"&View Mode"
),
this
);
actionCollection
()
->
addAction
(
"viewModeMenu"
,
m_viewModeMenu
);
...
...
@@ -4708,10 +4706,9 @@ void KonqMainWindow::updateViewModeActions()
//TODO port away from query: assume that the "actionsFile" entry in the KPluginMetaData contains the path of a .desktop file
//containing the actions specification, as the old part .desktop file did
QString
actionDesktopFile
=
md
.
value
(
"
a
ctionsFile"
,
QString
());
QString
actionDesktopFile
=
md
.
value
(
"
X-Konqueror-A
ctions
-
File"
,
QString
());
if
(
!
actionDesktopFile
.
isEmpty
())
{
//TODO port away from query: decide how to find the desktop file
KDesktopFile
df
(
QStandardPaths
::
DataLocation
,
actionDesktopFile
);
QStringList
actionNames
=
df
.
readActions
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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