diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -453,7 +453,9 @@ if (Qt5TextToSpeech_FOUND) target_link_libraries(okularpart Qt5::TextToSpeech) endif() -install(TARGETS okularpart DESTINATION ${KDE_INSTALL_PLUGINDIR}) +kcoreaddons_desktop_to_json(okularpart okular_part.desktop) + +install(TARGETS okularpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts) ########### install files ############### diff --git a/generators/chm/okularChm.desktop b/generators/chm/okularChm.desktop --- a/generators/chm/okularChm.desktop +++ b/generators/chm/okularChm.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/x-chm; diff --git a/generators/comicbook/okularComicbook.desktop b/generators/comicbook/okularComicbook.desktop --- a/generators/comicbook/okularComicbook.desktop +++ b/generators/comicbook/okularComicbook.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/x-cbz;application/x-cbr;application/x-cbt;application/x-cb7; diff --git a/generators/djvu/okularDjvu.desktop b/generators/djvu/okularDjvu.desktop --- a/generators/djvu/okularDjvu.desktop +++ b/generators/djvu/okularDjvu.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=image/vnd.djvu; diff --git a/generators/dvi/okularDvi.desktop b/generators/dvi/okularDvi.desktop --- a/generators/dvi/okularDvi.desktop +++ b/generators/dvi/okularDvi.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/x-dvi;application/x-gzdvi;application/x-bzdvi; diff --git a/generators/epub/okularEPub.desktop b/generators/epub/okularEPub.desktop --- a/generators/epub/okularEPub.desktop +++ b/generators/epub/okularEPub.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/epub+zip; diff --git a/generators/fax/okularFax.desktop b/generators/fax/okularFax.desktop --- a/generators/fax/okularFax.desktop +++ b/generators/fax/okularFax.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=image/fax-g3;image/g3fax; diff --git a/generators/fictionbook/okularFb.desktop b/generators/fictionbook/okularFb.desktop --- a/generators/fictionbook/okularFb.desktop +++ b/generators/fictionbook/okularFb.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/x-fictionbook+xml; diff --git a/generators/kimgio/okularKimgio.desktop b/generators/kimgio/okularKimgio.desktop --- a/generators/kimgio/okularKimgio.desktop +++ b/generators/kimgio/okularKimgio.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jp2;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap;image/x-gzeps;image/x-bzeps; diff --git a/generators/markdown/okularMd.desktop b/generators/markdown/okularMd.desktop --- a/generators/markdown/okularMd.desktop +++ b/generators/markdown/okularMd.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=text/markdown; diff --git a/generators/mobipocket/okularMobi.desktop b/generators/mobipocket/okularMobi.desktop --- a/generators/mobipocket/okularMobi.desktop +++ b/generators/mobipocket/okularMobi.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/x-mobipocket-ebook; diff --git a/generators/ooo/okularOoo.desktop b/generators/ooo/okularOoo.desktop --- a/generators/ooo/okularOoo.desktop +++ b/generators/ooo/okularOoo.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/vnd.oasis.opendocument.text; diff --git a/generators/plucker/okularPlucker.desktop b/generators/plucker/okularPlucker.desktop --- a/generators/plucker/okularPlucker.desktop +++ b/generators/plucker/okularPlucker.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/prs.plucker; diff --git a/generators/poppler/okularPoppler.desktop b/generators/poppler/okularPoppler.desktop --- a/generators/poppler/okularPoppler.desktop +++ b/generators/poppler/okularPoppler.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/x-pdf;application/pdf;application/x-gzpdf;application/x-bzpdf;application/x-wwf; diff --git a/generators/spectre/okularGhostview.desktop b/generators/spectre/okularGhostview.desktop --- a/generators/spectre/okularGhostview.desktop +++ b/generators/spectre/okularGhostview.desktop @@ -60,7 +60,7 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart InitialPreference=6 Type=Service MimeType=application/postscript;image/x-eps;application/x-gzpostscript;application/x-bzpostscript;image/x-gzeps;image/x-bzeps; diff --git a/generators/tiff/okularTiff.desktop b/generators/tiff/okularTiff.desktop --- a/generators/tiff/okularTiff.desktop +++ b/generators/tiff/okularTiff.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=image/tiff; diff --git a/generators/txt/okularTxt.desktop b/generators/txt/okularTxt.desktop --- a/generators/txt/okularTxt.desktop +++ b/generators/txt/okularTxt.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=text/plain; diff --git a/generators/xps/okularXps.desktop b/generators/xps/okularXps.desktop --- a/generators/xps/okularXps.desktop +++ b/generators/xps/okularXps.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/oxps;application/vnd.ms-xpsdocument; diff --git a/mobile/components/okularsingleton.cpp b/mobile/components/okularsingleton.cpp --- a/mobile/components/okularsingleton.cpp +++ b/mobile/components/okularsingleton.cpp @@ -29,7 +29,7 @@ { QStringList supportedPatterns; - QString constraint( QStringLiteral("(Library == 'okularpart')") ); + QString constraint( QStringLiteral("(Library == 'kf5/parts/okularpart')") ); QLatin1String basePartService( "KParts/ReadOnlyPart" ); KService::List offers = KServiceTypeTrader::self()->query( basePartService, constraint ); KService::List::ConstIterator it = offers.constBegin(), itEnd = offers.constEnd(); diff --git a/okular_part.desktop b/okular_part.desktop --- a/okular_part.desktop +++ b/okular_part.desktop @@ -60,6 +60,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart -X-KDE-Library=okularpart +X-KDE-Library=kf5/parts/okularpart Type=Service MimeType=application/vnd.kde.okular-archive; diff --git a/part.cpp b/part.cpp --- a/part.cpp +++ b/part.cpp @@ -178,7 +178,7 @@ }; #endif -K_PLUGIN_FACTORY(OkularPartFactory, registerPlugin();) +K_PLUGIN_FACTORY_WITH_JSON(OkularPartFactory, "okular_part.json", registerPlugin();) static QAction* actionForExportFormat( const Okular::ExportFormat& format, QObject *parent = Q_NULLPTR ) { diff --git a/shell/shell.cpp b/shell/shell.cpp --- a/shell/shell.cpp +++ b/shell/shell.cpp @@ -82,7 +82,7 @@ // this routine will find and load our Part. it finds the Part by // name which is a bad idea usually.. but it's alright in this // case since our Part is made for this Shell - KPluginLoader loader(QStringLiteral("okularpart")); + KPluginLoader loader(QStringLiteral("kf5/parts/okularpart")); m_partFactory = loader.factory(); if (!m_partFactory) { @@ -400,7 +400,7 @@ { QStringList supportedPatterns; - QString constraint( QStringLiteral("(Library == 'okularpart')") ); + QString constraint( QStringLiteral("(Library == 'kf5/parts/okularpart')") ); QLatin1String basePartService( "KParts/ReadOnlyPart" ); KService::List offers = KServiceTypeTrader::self()->query( basePartService, constraint ); KService::List::ConstIterator it = offers.constBegin(), itEnd = offers.constEnd();