Commit e3afb3f0 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use org.kde.khelpcenter as desktop id (and appstream id)

Most places use "khelpcenter" instead of "Help" to refer to the
appliction, the string "org.kde.Help" is only ever used for the
desktop file.
Also does KDBusService register on D-Bus based on the set application name,
thus org.kde.khelpcenter, not org.kde.Help, which cannot be easily adapted.

There are currently two known consumers which try to find khelpcenter
using KService::serviceByDesktopName("org.kde.help"), though seems
that broke recently due to KService becoming case-sensitive. As both
consumers (KGpg, Konqueror) are part of KDE Gear, they can be adapted
in sync and fixed to directly use the new name.
parent fab99983
Pipeline #135076 passed with stage
in 45 seconds
......@@ -138,12 +138,12 @@ install(TARGETS khelpcenter ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
install( PROGRAMS org.kde.Help.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
install( PROGRAMS org.kde.khelpcenter.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
install( FILES khelpcenter.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
install( FILES khelpcenter.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( FILES khelpcenter.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kde4/services )
install( FILES table-of-contents.xslt glossary.xslt DESTINATION ${KDE_INSTALL_DATADIR}/khelpcenter )
install( FILES org.kde.Help.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
install( FILES org.kde.khelpcenter.metainfo.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
ecm_qt_install_logging_categories(
EXPORT KHELPCENTER
......
......@@ -85,7 +85,6 @@ int main( int argc, char **argv )
aboutData.addAuthor( QStringLiteral("Matthias Elter"), i18n("Original Author"), QStringLiteral("me@kde.org") );
aboutData.addAuthor( QStringLiteral("Wojciech Smigaj"), i18n("Info page support"), QStringLiteral("achu@klub.chip.pl") );
app.setWindowIcon( QIcon::fromTheme(QStringLiteral("help-browser")) );
aboutData.setDesktopFileName ( QStringLiteral("org.kde.Help") );
KAboutData::setApplicationData(aboutData);
QCommandLineParser *cmd = app.cmdParser();
......
......@@ -209,6 +209,5 @@ Keywords[x-test]=xxman;info;documentation;handbook;manual;information;xx
Categories=Qt;KDE;Core;
OnlyShowIn=KDE;
X-DBUS-ServiceName=org.kde.Help
SingleMainWindow=true
MimeType=x-scheme-handler/help;x-scheme-handler/man;x-scheme-handler/info;
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
<id>org.kde.Help.desktop</id>
<id>org.kde.khelpcenter</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>KHelpCenter</name>
......@@ -293,14 +293,14 @@
<image width="1920" height="1044">https://kde.org/images/screenshots/khelpcenter.png</image>
</screenshot>
</screenshots>
<url type="homepage">https://apps.kde.org/help/</url>
<url type="homepage">https://apps.kde.org/khelpcenter</url>
<url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=khelpcenter</url>
<url type="donation">https://www.kde.org/community/donations/?app=khelpcenter&amp;source=appdata</url>
<project_group>KDE</project_group>
<provides>
<binary>khelpcenter</binary>
</provides>
<launchable type="desktop-id">org.kde.Help.desktop</launchable>
<launchable type="desktop-id">org.kde.khelpcenter.desktop</launchable>
<releases>
<release version="5.7.6.21122" date="2022-02-03"/>
<release version="5.7.6.21121" date="2022-01-06"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment