summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Richardson <arichardson.kde@gmail.com>2015-11-28 19:24:41 (GMT)
committerAlex Richardson <arichardson.kde@gmail.com>2016-01-04 14:59:07 (GMT)
commit2f9246ae42ce6276002641ac02d9c6b880bcf7a3 (patch)
tree1ba7e9315d9d5d139dbf28470ecad7ea6c26ccd3
parent71950016aaaadf1a5f296b25e589400b71f4e9ff (diff)
Port to new JSON plugin loading system
This means Okular can now work without ksycoca and KDELibs4Support. REVIEW: 126193
-rw-r--r--CMakeLists.txt4
-rw-r--r--core/document.cpp239
-rw-r--r--core/document.h6
-rw-r--r--core/document_p.h23
-rw-r--r--core/generator.h6
-rw-r--r--generators/CMakeLists.txt12
-rw-r--r--generators/chm/CMakeLists.txt7
-rw-r--r--generators/chm/generator_chm.cpp17
-rw-r--r--generators/chm/libokularGenerator_chmlib.desktop127
-rw-r--r--generators/chm/libokularGenerator_chmlib.json28
-rw-r--r--generators/chm/okularChm.desktop66
-rw-r--r--generators/comicbook/CMakeLists.txt9
-rw-r--r--generators/comicbook/generator_comicbook.cpp17
-rw-r--r--generators/comicbook/libokularGenerator_comicbook.desktop127
-rw-r--r--generators/comicbook/libokularGenerator_comicbook.json27
-rw-r--r--generators/comicbook/okularComicbook.desktop66
-rw-r--r--generators/djvu/CMakeLists.txt6
-rw-r--r--generators/djvu/generator_djvu.cpp15
-rw-r--r--generators/djvu/libokularGenerator_djvu.desktop128
-rw-r--r--generators/djvu/libokularGenerator_djvu.json24
-rw-r--r--generators/djvu/okularDjvu.desktop66
-rw-r--r--generators/dvi/CMakeLists.txt5
-rw-r--r--generators/dvi/generator_dvi.cpp15
-rw-r--r--generators/dvi/libokularGenerator_dvi.desktop128
-rw-r--r--generators/dvi/libokularGenerator_dvi.json24
-rw-r--r--generators/dvi/okularDvi.desktop66
-rw-r--r--generators/epub/CMakeLists.txt6
-rw-r--r--generators/epub/generator_epub.cpp18
-rw-r--r--generators/epub/libokularGenerator_epub.desktop123
-rw-r--r--generators/epub/libokularGenerator_epub.json24
-rw-r--r--generators/epub/okularEPub.desktop66
-rw-r--r--generators/fax/CMakeLists.txt6
-rw-r--r--generators/fax/generator_fax.cpp17
-rw-r--r--generators/fax/libokularGenerator_fax.desktop123
-rw-r--r--generators/fax/libokularGenerator_fax.json25
-rw-r--r--generators/fax/okularFax.desktop66
-rw-r--r--generators/fictionbook/CMakeLists.txt6
-rw-r--r--generators/fictionbook/generator_fb.cpp17
-rw-r--r--generators/fictionbook/libokularGenerator_fb.desktop126
-rw-r--r--generators/fictionbook/libokularGenerator_fb.json24
-rw-r--r--generators/fictionbook/okularFb.desktop66
-rw-r--r--generators/kimgio/CMakeLists.txt1
-rw-r--r--generators/kimgio/generator_kimgio.cpp18
-rw-r--r--generators/kimgio/libokularGenerator_kimgio.desktop128
-rw-r--r--generators/kimgio/libokularGenerator_kimgio.json51
-rw-r--r--generators/kimgio/okularKimgio.desktop66
-rw-r--r--generators/mobipocket/CMakeLists.txt5
-rw-r--r--generators/mobipocket/generator_mobi.cpp18
-rw-r--r--generators/mobipocket/libokularGenerator_mobi.desktop110
-rw-r--r--generators/mobipocket/libokularGenerator_mobi.json24
-rw-r--r--generators/mobipocket/okularMobi.desktop66
-rw-r--r--generators/ooo/CMakeLists.txt6
-rw-r--r--generators/ooo/generator_ooo.cpp17
-rw-r--r--generators/ooo/libokularGenerator_ooo.desktop127
-rw-r--r--generators/ooo/libokularGenerator_ooo.json24
-rw-r--r--generators/ooo/okularOoo.desktop66
-rw-r--r--generators/plucker/CMakeLists.txt8
-rw-r--r--generators/plucker/generator_plucker.cpp17
-rw-r--r--generators/plucker/libokularGenerator_plucker.desktop127
-rw-r--r--generators/plucker/libokularGenerator_plucker.json24
-rw-r--r--generators/plucker/okularPlucker.desktop66
-rw-r--r--generators/poppler/CMakeLists.txt6
-rw-r--r--generators/poppler/generator_pdf.cpp15
-rw-r--r--generators/poppler/libokularGenerator_poppler.desktop127
-rw-r--r--generators/poppler/libokularGenerator_poppler.json26
-rw-r--r--generators/poppler/okularPoppler.desktop66
-rw-r--r--generators/spectre/CMakeLists.txt6
-rw-r--r--generators/spectre/generator_ghostview.cpp17
-rw-r--r--generators/spectre/libokularGenerator_ghostview.desktop127
-rw-r--r--generators/spectre/libokularGenerator_ghostview.json25
-rw-r--r--generators/spectre/okularGhostview.desktop67
-rw-r--r--generators/tiff/CMakeLists.txt5
-rw-r--r--generators/tiff/generator_tiff.cpp17
-rw-r--r--generators/tiff/libokularGenerator_tiff.desktop123
-rw-r--r--generators/tiff/libokularGenerator_tiff.json24
-rw-r--r--generators/tiff/okularTiff.desktop66
-rw-r--r--generators/txt/CMakeLists.txt5
-rw-r--r--generators/txt/generator_txt.cpp16
-rw-r--r--generators/txt/libokularGenerator_txt.desktop97
-rw-r--r--generators/txt/libokularGenerator_txt.json25
-rw-r--r--generators/txt/okularTxt.desktop66
-rw-r--r--generators/xps/CMakeLists.txt7
-rw-r--r--generators/xps/generator_xps.cpp20
-rw-r--r--generators/xps/libokularGenerator_xps.desktop123
-rw-r--r--generators/xps/libokularGenerator_xps.json31
-rw-r--r--generators/xps/okularXps.desktop66
-rw-r--r--part.cpp5
-rw-r--r--ui/fileprinterpreview.cpp1
88 files changed, 621 insertions, 3498 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51866a4..492de00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,10 +205,12 @@ PRIVATE
KF5::Archive
KF5::JS
KF5::JSApi
- KF5::KDELibs4Support
KF5::KIOCore
+ KF5::KIOWidgets
+ KF5::I18n
KF5::ThreadWeaver
KF5::Wallet
+ KF5::Bookmarks
Phonon::phonon4qt5
${MATH_LIB}
${ZLIB_LIBRARIES}
diff --git a/core/document.cpp b/core/document.cpp
index 04a29fd..145d84c 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -42,12 +42,8 @@
#include <QPageSize>
#include <QStandardPaths>
-#include <k4aboutdata.h>
#include <kauthorized.h>
#include <kconfigdialog.h>
-#include <QtCore/QLoggingCategory>
-#include <klibloader.h>
-#include <KLocalizedString>
#include <kmacroexpander.h>
#include <kmessagebox.h>
#include <kmimetypetrader.h>
@@ -57,7 +53,8 @@
#include <kzip.h>
#include <KIO/Global>
#include <KFormat>
-
+#include <KLocalizedString>
+#include <KPluginMetaData>
// local includes
#include "action.h"
@@ -816,23 +813,20 @@ bool DocumentPrivate::openRelativeFile( const QString & fileName )
return true;
}
-Generator * DocumentPrivate::loadGeneratorLibrary( const KService::Ptr &service )
+Generator * DocumentPrivate::loadGeneratorLibrary( const KPluginMetaData &service )
{
- KPluginLoader loader( service->library() );
+ KPluginLoader loader( service.fileName() );
KPluginFactory *factory = loader.factory();
if ( !factory )
{
- qCWarning(OkularCoreDebug).nospace() << "Invalid plugin factory for " << service->library() << ":" << loader.errorString();
+ qCWarning(OkularCoreDebug).nospace() << "Invalid plugin factory for " << service.fileName() << ":" << loader.errorString();
return 0;
}
- Generator * plugin = service->createInstance<Okular::Generator>();
+ Generator * plugin = factory->create<Okular::Generator>();
-// GeneratorInfo info( factory->componentData() );
- KComponentData data = KComponentData::mainComponent();
- GeneratorInfo info( data );
- info.generator = plugin;
- m_loadedGenerators.insert( service->name(), info );
+ GeneratorInfo info( plugin, service );
+ m_loadedGenerators.insert( service.pluginId(), info );
return plugin;
}
@@ -841,14 +835,12 @@ void DocumentPrivate::loadAllGeneratorLibraries()
if ( m_generatorsLoaded )
return;
- m_generatorsLoaded = true;
+ loadServiceList( availableGenerators() );
- QString constraint(QStringLiteral("([X-KDE-Priority] > 0) and (exist Library)")) ;
- KService::List offers = KServiceTypeTrader::self()->query( QStringLiteral("okular/Generator"), constraint );
- loadServiceList( offers );
+ m_generatorsLoaded = true;
}
-void DocumentPrivate::loadServiceList( const KService::List& offers )
+void DocumentPrivate::loadServiceList( const QVector<KPluginMetaData>& offers )
{
int count = offers.count();
if ( count <= 0 )
@@ -856,9 +848,9 @@ void DocumentPrivate::loadServiceList( const KService::List& offers )
for ( int i = 0; i < count; ++i )
{
- QString propName = offers.at(i)->name();
+ QString id = offers.at(i).pluginId();
// don't load already loaded generators
- QHash< QString, GeneratorInfo >::const_iterator genIt = m_loadedGenerators.constFind( propName );
+ QHash< QString, GeneratorInfo >::const_iterator genIt = m_loadedGenerators.constFind( id );
if ( !m_loadedGenerators.isEmpty() && genIt != m_loadedGenerators.constEnd() )
continue;
@@ -909,9 +901,9 @@ SaveInterface* DocumentPrivate::generatorSave( GeneratorInfo& info )
return info.save;
}
-Document::OpenResult DocumentPrivate::openDocumentInternal( const KService::Ptr& offer, bool isstdin, const QString& docFile, const QByteArray& filedata, const QString& password )
+Document::OpenResult DocumentPrivate::openDocumentInternal( const KPluginMetaData& offer, bool isstdin, const QString& docFile, const QByteArray& filedata, const QString& password )
{
- QString propName = offer->name();
+ QString propName = offer.pluginId();
QHash< QString, GeneratorInfo >::const_iterator genIt = m_loadedGenerators.constFind( propName );
QString catalogName;
m_walletGenerator = 0;
@@ -2219,23 +2211,6 @@ Document::~Document()
delete d;
}
-class kMimeTypeMoreThan {
-public:
- kMimeTypeMoreThan( const QMimeType &mime ) : _mime( mime ) {}
- bool operator()( const KService::Ptr &s1, const KService::Ptr &s2 )
- {
- const QString mimeName = _mime.name();
- if (s1->mimeTypes().contains( mimeName ) && !s2->mimeTypes().contains( mimeName ))
- return true;
- else if (s2->mimeTypes().contains( mimeName ) && !s1->mimeTypes().contains( mimeName ))
- return false;
- return s1->property( QStringLiteral("X-KDE-Priority") ).toInt() > s2->property( QStringLiteral("X-KDE-Priority") ).toInt();
- }
-
-private:
- const QMimeType &_mime;
-};
-
QString DocumentPrivate::docDataFileName(const QUrl &url, qint64 document_size)
{
QString fn = url.fileName();
@@ -2256,7 +2231,66 @@ QString DocumentPrivate::docDataFileName(const QUrl &url, qint64 document_size)
return newokularfile;
}
+QVector<KPluginMetaData> DocumentPrivate::availableGenerators()
+{
+ static QVector<KPluginMetaData> result;
+ if (result.isEmpty())
+ {
+ result = KPluginLoader::findPlugins("okular/generators");
+ }
+ return result;
+}
+KPluginMetaData DocumentPrivate::generatorForMimeType(const QMimeType& type, QWidget* widget)
+{
+ const QVector<KPluginMetaData> available = availableGenerators();
+ QVector<KPluginMetaData> offers;
+
+ for (const KPluginMetaData& md : available)
+ {
+ foreach (const QString& supported, md.mimeTypes())
+ {
+ if (type.inherits(supported))
+ {
+ offers << md;
+ }
+ }
+ }
+ if (offers.isEmpty())
+ {
+ return KPluginMetaData();
+ }
+ int hRank=0;
+ // best ranked offer search
+ int offercount = offers.size();
+ if (offercount > 1)
+ {
+ // sort the offers: the offers with an higher priority come before
+ auto cmp = [](const KPluginMetaData& s1, const KPluginMetaData& s2)
+ {
+ const QString property = QStringLiteral("X-KDE-Priority");
+ return s1.rawData()[property].toInt() > s2.rawData()[property].toInt();
+ };
+ std::stable_sort(offers.begin(), offers.end(), cmp);
+
+ if (SettingsCore::chooseGenerators())
+ {
+ QStringList list;
+ for (int i = 0; i < offercount; ++i)
+ {
+ list << offers.at(i).pluginId();
+ }
+ ChooseEngineDialog choose(list, type, widget);
+
+ if (choose.exec() == QDialog::Rejected)
+ return KPluginMetaData();
+
+ hRank = choose.selectedGenerator();
+ }
+ }
+ Q_ASSERT(hRank < offers.size());
+ return offers.at(hRank);
+}
Document::OpenResult Document::openDocument(const QString & docFile, const QUrl &url, const QMimeType &_mime, const QString & password )
{
@@ -2301,77 +2335,50 @@ Document::OpenResult Document::openDocument(const QString & docFile, const QUrl
// 0. load Generator
// request only valid non-disabled plugins suitable for the mimetype
- QString constraint(QStringLiteral("([X-KDE-Priority] > 0) and (exist Library)")) ;
- KService::List offers = KMimeTypeTrader::self()->query(mime.name(),QStringLiteral("okular/Generator"),constraint);
- if ( offers.isEmpty() && !triedMimeFromFileContent )
+ KPluginMetaData offer = DocumentPrivate::generatorForMimeType(mime, d->m_widget);
+ if ( !offer.isValid() && !triedMimeFromFileContent )
{
QMimeType newmime = db.mimeTypeForFile(docFile, QMimeDatabase::MatchExtension);
triedMimeFromFileContent = true;
- if ( newmime.name() != mime.name() )
+ if ( newmime != mime )
{
mime = newmime;
- offers = KMimeTypeTrader::self()->query( mime.name(), QStringLiteral("okular/Generator"), constraint );
+ offer = DocumentPrivate::generatorForMimeType(mime, d->m_widget);
}
- if ( offers.isEmpty() )
+ if ( !offer.isValid() )
{
// There's still no offers, do a final mime search based on the filename
// We need this because sometimes (e.g. when downloading from a webserver) the mimetype we
// use is the one fed by the server, that may be wrong
-
#pragma message("Fix generator loading")
- // newmime = db.mimeTypeForUrl( docFile );
- if ( newmime.name() != mime.name() )
+ newmime = db.mimeTypeForUrl( url );
+
+ if ( !newmime.isDefault() && newmime != mime )
{
mime = newmime;
- offers = KMimeTypeTrader::self()->query( mime.name(), QStringLiteral("okular/Generator"), constraint );
+ offer = DocumentPrivate::generatorForMimeType(mime, d->m_widget);
}
}
}
- if (offers.isEmpty())
+ if (!offer.isValid())
{
emit error( i18n( "Can not find a plugin which is able to handle the document being passed." ), -1 );
qCWarning(OkularCoreDebug).nospace() << "No plugin for mimetype '" << mime.name() << "'.";
return OpenError;
}
- int hRank=0;
- // best ranked offer search
- int offercount = offers.count();
- if ( offercount > 1 )
- {
- // sort the offers: the offers with an higher priority come before
- qStableSort( offers.begin(), offers.end(), kMimeTypeMoreThan( mime ) );
-
- if ( SettingsCore::chooseGenerators() )
- {
- QStringList list;
- for ( int i = 0; i < offercount; ++i )
- {
- list << offers.at(i)->name();
- }
-
- ChooseEngineDialog choose( list, mime, d->m_widget );
-
- if ( choose.exec() == QDialog::Rejected )
- return OpenError;
-
- hRank = choose.selectedGenerator();
- }
- }
- KService::Ptr offer = offers.at( hRank );
// 1. load Document
OpenResult openResult = d->openDocumentInternal( offer, isstdin, docFile, filedata, password );
if ( openResult == OpenError && !triedMimeFromFileContent )
{
QMimeType newmime = db.mimeTypeForFile(docFile, QMimeDatabase::MatchExtension);
triedMimeFromFileContent = true;
- if ( newmime.name() != mime.name() )
+ if ( newmime != mime )
{
mime = newmime;
- offers = KMimeTypeTrader::self()->query( mime.name(), QStringLiteral("okular/Generator"), constraint );
- if ( !offers.isEmpty() )
+ offer = DocumentPrivate::generatorForMimeType(mime, d->m_widget);
+ if ( offer.isValid() )
{
- offer = offers.first();
openResult = d->openDocumentInternal( offer, isstdin, docFile, filedata, password );
}
}
@@ -2389,7 +2396,7 @@ Document::OpenResult Document::openDocument(const QString & docFile, const QUrl
d->loadSyncFile(docFile);
}
- d->m_generatorName = offer->name();
+ d->m_generatorName = offer.pluginId();
d->m_pageController = new PageController();
connect( d->m_pageController, SIGNAL(rotationFinished(int,Okular::Page*)),
this, SLOT(rotationFinished(int,Okular::Page*)) );
@@ -4193,8 +4200,7 @@ void Document::fillConfigDialog( KConfigDialog * dialog )
return;
// ensure that we have all the generators with settings loaded
- QString constraint( QStringLiteral("([X-KDE-Priority] > 0) and (exist Library) and ([X-KDE-okularHasInternalSettings])") );
- KService::List offers = KServiceTypeTrader::self()->query( QStringLiteral("okular/Generator"), constraint );
+ QVector<KPluginMetaData> offers = DocumentPrivate::configurableGenerators();
d->loadServiceList( offers );
bool pagesAdded = false;
@@ -4216,48 +4222,51 @@ void Document::fillConfigDialog( KConfigDialog * dialog )
}
}
-int Document::configurableGenerators() const
-{
- QString constraint( QStringLiteral("([X-KDE-Priority] > 0) and (exist Library) and ([X-KDE-okularHasInternalSettings])") );
- KService::List offers = KServiceTypeTrader::self()->query( QStringLiteral("okular/Generator"), constraint );
- return offers.count();
-}
-QStringList Document::supportedMimeTypes() const
+QVector<KPluginMetaData> DocumentPrivate::configurableGenerators()
{
- if ( !d->m_supportedMimeTypes.isEmpty() )
- return d->m_supportedMimeTypes;
-
- QString constraint( QStringLiteral("(Library == 'okularpart')") );
- QLatin1String basePartService( "KParts/ReadOnlyPart" );
- KService::List offers = KServiceTypeTrader::self()->query( basePartService, constraint );
- KService::List::ConstIterator it = offers.constBegin(), itEnd = offers.constEnd();
- for ( ; it != itEnd; ++it )
+ const QVector<KPluginMetaData> available = availableGenerators();
+ QVector<KPluginMetaData> result;
+ for (const KPluginMetaData& md : available)
{
- KService::Ptr service = *it;
- QStringList mimeTypes = service->serviceTypes();
- foreach ( const QString& mimeType, mimeTypes )
- if ( mimeType != basePartService )
- d->m_supportedMimeTypes.append( mimeType );
+ if (md.rawData()[QStringLiteral("X-KDE-okularHasInternalSettings")].toBool())
+ {
+ result << md;
+ }
}
-
- return d->m_supportedMimeTypes;
+ return result;
}
-const KComponentData* Document::componentData() const
+KPluginMetaData Document::generatorInfo() const
{
- if ( !d->m_generator )
- return 0;
+ if (!d->m_generator)
+ return KPluginMetaData();
- QHash< QString, GeneratorInfo >::const_iterator genIt = d->m_loadedGenerators.constFind( d->m_generatorName );
- Q_ASSERT( genIt != d->m_loadedGenerators.constEnd() );
- const KComponentData* kcd = &genIt.value().data;
+ auto genIt = d->m_loadedGenerators.constFind(d->m_generatorName);
+ Q_ASSERT(genIt != d->m_loadedGenerators.constEnd());
+ return genIt.value().metadata;
+}
- // empty about data
- if ( kcd->isValid() && kcd->aboutData() && kcd->aboutData()->programName().isEmpty() )
- return 0;
+int Document::configurableGenerators() const
+{
+ return DocumentPrivate::configurableGenerators().size();
+}
- return kcd;
+QStringList Document::supportedMimeTypes() const
+{
+ // TODO: make it a static member of DocumentPrivate?
+ QStringList result = d->m_supportedMimeTypes;
+ if (result.isEmpty())
+ {
+ const QVector<KPluginMetaData> available = DocumentPrivate::availableGenerators();
+ for (const KPluginMetaData& md : available)
+ {
+ // TODO should be uniquify this list?
+ result << md.mimeTypes();
+ }
+ d->m_supportedMimeTypes = result;
+ }
+ return result;
}
bool Document::canSaveChanges() const
diff --git a/core/document.h b/core/document.h
index 1e49b33..bac38f8 100644
--- a/core/document.h
+++ b/core/document.h
@@ -28,7 +28,7 @@
class QPrintDialog;
class KBookmark;
class KConfigDialog;
-class KComponentData;
+class KPluginMetaData;
class KXMLGUIClient;
class DocumentItem;
class QAbstractItemModel;
@@ -719,9 +719,9 @@ class OKULARCORE_EXPORT Document : public QObject
QStringList supportedMimeTypes() const;
/**
- * Returns the component data associated with the generator. May be null.
+ * Returns the metadata associated with the generator. May be invalid.
*/
- const KComponentData* componentData() const;
+ KPluginMetaData generatorInfo() const;
/**
* Saving capabilities. Their availability varies according to the
diff --git a/core/document_p.h b/core/document_p.h
index 73f5797..36e030b 100644
--- a/core/document_p.h
+++ b/core/document_p.h
@@ -22,9 +22,7 @@
#include <QtCore/QMutex>
#include <QtCore/QPointer>
#include <QUrl>
-
-#include <kcomponentdata.h>
-#include <kservicetypetrader.h>
+#include <KPluginMetaData>
// local includes
#include "fontinfo.h"
@@ -35,6 +33,7 @@ class QEventLoop;
class QFile;
class QTimer;
class QTemporaryFile;
+class KPluginMetaData;
struct AllocatedPixmap;
struct ArchiveData;
@@ -50,14 +49,13 @@ class View;
struct GeneratorInfo
{
- GeneratorInfo( const KComponentData &_data )
- : generator( 0 ), data( _data ),
- config( 0 ), save( 0 ),
+ explicit GeneratorInfo( Okular::Generator *g, const KPluginMetaData &data)
+ : generator( g ), metadata( data ), config( nullptr ), save( nullptr ),
configChecked( false ), saveChecked( false )
{}
Okular::Generator * generator;
- KComponentData data;
+ KPluginMetaData metadata;
Okular::ConfigInterface * config;
Okular::SaveInterface * save;
bool configChecked : 1;
@@ -123,15 +121,15 @@ class DocumentPrivate
void saveViewsInfo( View *view, QDomElement &e ) const;
QString giveAbsolutePath( const QString & fileName ) const;
bool openRelativeFile( const QString & fileName );
- Generator * loadGeneratorLibrary( const KService::Ptr &service );
+ Generator * loadGeneratorLibrary( const KPluginMetaData& service );
void loadAllGeneratorLibraries();
- void loadServiceList( const KService::List& offers );
+ void loadServiceList( const QVector<KPluginMetaData>& offers );
void unloadGenerator( const GeneratorInfo& info );
void cacheExportFormats();
void setRotationInternal( int r, bool notify );
ConfigInterface* generatorConfig( GeneratorInfo& info );
SaveInterface* generatorSave( GeneratorInfo& info );
- Document::OpenResult openDocumentInternal( const KService::Ptr& offer, bool isstdin, const QString& docFile, const QByteArray& filedata, const QString& password );
+ Document::OpenResult openDocumentInternal( const KPluginMetaData& offer, bool isstdin, const QString& docFile, const QByteArray& filedata, const QString& password );
bool savePageDocumentInfo( QTemporaryFile *infoFile, int what ) const;
DocumentViewport nextDocumentViewport() const;
void notifyAnnotationChanges( int page );
@@ -280,6 +278,11 @@ class DocumentPrivate
QDomNode m_prevPropsOfAnnotBeingModified;
synctex_scanner_t m_synctex_scanner;
+
+ // generator selection
+ static QVector<KPluginMetaData> availableGenerators();
+ static QVector<KPluginMetaData> configurableGenerators();
+ static KPluginMetaData generatorForMimeType(const QMimeType& type, QWidget* widget);
};
class DocumentInfoPrivate
diff --git a/core/generator.h b/core/generator.h
index b225dc1..79ef99a 100644
--- a/core/generator.h
+++ b/core/generator.h
@@ -29,9 +29,9 @@
#include <QMimeType>
#include <kpluginfactory.h>
-#define OKULAR_EXPORT_PLUGIN( classname, aboutdata ) \
- K_PLUGIN_FACTORY( classname ## Factory, registerPlugin< classname >(); ) \
- K_EXPORT_PLUGIN( classname ## Factory( aboutdata ) )
+#define OKULAR_EXPORT_PLUGIN(classname, json ) \
+ static_assert(json[0] != '\0', "arg2 must be a string literal"); \
+ K_PLUGIN_FACTORY_WITH_JSON(classname ## Factory, json, registerPlugin<classname >();)
class QByteArray;
class QMutex;
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index 0e0d44a..ce1d9bf 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -1,4 +1,11 @@
-set(LIBSPECTRE_MINIMUM_VERSION "0.2")
+
+function(okular_add_generator _target)
+ kcoreaddons_add_plugin(${_target}
+ JSON "lib${_target}.json"
+ INSTALL_NAMESPACE "okular/generators"
+ SOURCES ${ARGN}
+ )
+endfunction()
find_package(Poppler "0.12.1")
set_package_properties("Poppler-Qt5" PROPERTIES
@@ -7,6 +14,7 @@ set_package_properties("Poppler-Qt5" PROPERTIES
TYPE RECOMMENDED
PURPOSE "Support for PDF files in okular.")
+set(LIBSPECTRE_MINIMUM_VERSION "0.2")
find_package(LibSpectre "${LIBSPECTRE_MINIMUM_VERSION}")
set_package_properties("libspectre" PROPERTIES
DESCRIPTION "A PostScript rendering library"
@@ -89,7 +97,7 @@ endif(LIBSPECTRE_FOUND)
if(KF5KExiv2_FOUND)
add_subdirectory( kimgio )
-endif(KF5KExiv2_FOUND)
+endif()
if(CHM_FOUND)
add_subdirectory( chm )
diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
index 471258b..8ccd00b 100644
--- a/generators/chm/CMakeLists.txt
+++ b/generators/chm/CMakeLists.txt
@@ -19,15 +19,10 @@ set(okularGenerator_chmlib_SRCS
generator_chm.cpp
)
-add_library(okularGenerator_chmlib MODULE ${okularGenerator_chmlib_SRCS})
-
+okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} KF5::KHtml)
-install(TARGETS okularGenerator_chmlib DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_chmlib.desktop okularChm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_chm.desktop org.kde.mobile.okular_chm.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/chm/generator_chm.cpp b/generators/chm/generator_chm.cpp
index 5163d5f..6b444ee 100644
--- a/generators/chm/generator_chm.cpp
+++ b/generators/chm/generator_chm.cpp
@@ -29,22 +29,7 @@
#include <core/textpage.h>
#include <core/utils.h>
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_chm"),
- i18n( "CHM Backend" ),
- QStringLiteral("0.1.4"),
- i18n( "A Microsoft Windows help file renderer" ),
- KAboutLicense::GPL,
- i18n( "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid" )
- );
- aboutData.addAuthor( i18n( "Piotr Szymański" ), QString(), QStringLiteral("niedakh@gmail.com") );
- aboutData.addAuthor( i18n( "Albert Astals Cid" ), QString(), QStringLiteral("aacid@kde.org") );
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( CHMGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(CHMGenerator, "libokularGenerator_chmlib.json")
static QString absolutePath( const QString &baseUrl, const QString &path )
{
diff --git a/generators/chm/libokularGenerator_chmlib.desktop b/generators/chm/libokularGenerator_chmlib.desktop
deleted file mode 100644
index dc3ac93..0000000
--- a/generators/chm/libokularGenerator_chmlib.desktop
+++ /dev/null
@@ -1,127 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=chmlib
-Name[ar]=chmlib
-Name[ast]=chmlib
-Name[bg]=chmlib
-Name[bs]=chmlib
-Name[ca]=chmlib
-Name[ca@valencia]=chmlib
-Name[cs]=chmlib
-Name[da]=chmlib
-Name[de]=chmlib
-Name[el]=chmlib
-Name[en_GB]=chmlib
-Name[eo]=chmlib
-Name[es]=chmlib
-Name[et]=chmlib
-Name[eu]=chmlib
-Name[fi]=chmlib
-Name[fr]=chmlib
-Name[ga]=chmlib
-Name[gl]=chmlib
-Name[hi]=सीएचएमलिब
-Name[hne]=सीएचएमलिब
-Name[hr]=chmlib
-Name[hu]=chmlib
-Name[ia]=chmlib
-Name[is]=chmlib
-Name[it]=chmlib
-Name[ja]=chmlib
-Name[kk]=chmlib
-Name[km]=chmlib
-Name[ko]=chmlib
-Name[ku]=chmlib
-Name[lt]=chmlib
-Name[lv]=chmlib
-Name[mr]=chmlib
-Name[nb]=chmlib
-Name[nds]=chmlib
-Name[ne]=chmlib
-Name[nl]=chmlib
-Name[nn]=chmlib
-Name[pa]=chmlib
-Name[pl]=chmlib
-Name[pt]=chmlib
-Name[pt_BR]=chmlib
-Name[ro]=chmlib
-Name[ru]=chmlib
-Name[sk]=chmlib
-Name[sl]=chmlib
-Name[sq]=chmlib
-Name[sr]=винхелп
-Name[sr@ijekavian]=винхелп
-Name[sr@ijekavianlatin]=WinHelp
-Name[sr@latin]=WinHelp
-Name[sv]=chmlib
-Name[th]=ไลบรารี chmlib
-Name[tr]=chmlib
-Name[ug]=chmlib
-Name[uk]=chmlib
-Name[vi]=chmlib
-Name[x-test]=xxchmlibxx
-Name[zh_CN]=chmlib
-Name[zh_TW]=chmlib
-Comment=Windows HTMLHelp backend for Okular
-Comment[ar]=المنتهى الخلفي Windows HTMLHelp لأوكلار
-Comment[ast]=Motor de ficheros d'ayuda en HTML de Windows pa Okular
-Comment[bg]=Ядро на Okular за помощни файлове на Windows
-Comment[bs]=Pozadina WinHelp prozora za Okular
-Comment[ca]=Dorsal del HTMLHelp de Windows per a l'Okular
-Comment[ca@valencia]=Dorsal del HTMLHelp de Windows per a l'Okular
-Comment[cs]=Implementace HTML nápovědy Windows pro Okular
-Comment[da]=Windows HTML Help-motor til Okular
-Comment[de]=Anzeigemodul für Windows-Hilfe-Dateien in Okular
-Comment[el]=Σύστημα υποστήριξης βοήθειας Windows σε HTML για το Okular
-Comment[en_GB]=Windows HTMLHelp backend for Okular
-Comment[es]=Motor de archivos de ayuda en HTML de Windows para Okular
-Comment[et]=Okulari Windowsi HTMLHelp-failide taustaprogramm
-Comment[eu]=Okular-en Windows HTMLHelp motorra
-Comment[fi]=Windows HTMLHelp -taustaosa Okularille
-Comment[fr]=Moteur « HTMLHelp » de fichiers Windows pour Okular
-Comment[ga]=Inneall HTMLHelp Windows le haghaidh Okular
-Comment[gl]=Infraestrutura de ficheiros Windows HTMLHelp para Okular
-Comment[hne]=ओकुलर बर विंडोज एचटीएमएलहेल्प बैकएन्ड
-Comment[hr]=Podrška za Windows HTMLHelp za Okular
-Comment[hu]=Windows HTML-súgókezelő az Okularhoz
-Comment[ia]=Retroadministration de Windows HTMLHelp pro Okular
-Comment[is]=Windows HTMLHelp stuðningur fyrir Okular
-Comment[it]=Backend guida di Windows in HTML per Okular
-Comment[ja]=Okular の Windows HTML ヘルプ用バックエンド
-Comment[kk]=Okular-дың Windows HTMLHelp тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ​ HTMLHelp របស់​វីនដូ​សម្រាប់ Okular
-Comment[ko]=Okular의 Windows HTMLHelp 백엔드
-Comment[ku]=Binesazî ya Windows HTMLHelp ji bo Okular
-Comment[lt]=Windows HTML pagalbos failų programinė sąsaja, skirta Okular
-Comment[lv]=Windows HTMLHelp Okular aizmugure
-Comment[mr]=ओक्युलर करिता विंडोज HTMLHelp बॅकएन्ड
-Comment[nb]=Windows HTMLHelp-motor for Okular
-Comment[nds]=En Okular-Hülpprogramm för HTML-Hülpdateien vun Windows
-Comment[nl]=Windows HTMLHelp-backend voor Okular
-Comment[nn]=Windows HTMLHelp-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਵਿੰਡੋਜ਼ HTMLHelp ਬੈਕਐਂਡ
-Comment[pl]=Obsługa Windows HTMLHelp dla Okulara
-Comment[pt]=Infra-estrutura de HTMLHelp do Windows para o Okular
-Comment[pt_BR]=Infraestrutura do Windows HTMLHelp para o Okular
-Comment[ro]=Platformă HTMLHelp din Windows pentru Okular
-Comment[ru]=Модуль поддержки формата Windows HTMLHelp для Okular
-Comment[sk]=Backend Windows HTMLHelp pre Okular
-Comment[sl]=Zaledje za pomoč za Windows v obliki HTML za Okular
-Comment[sq]=Një mbështetës për Windows HTMLHelp për Okular
-Comment[sr]=Позадина винхелпа за Окулар
-Comment[sr@ijekavian]=Позадина винхелпа за Окулар
-Comment[sr@ijekavianlatin]=Pozadina WinHelpa za Okular
-Comment[sr@latin]=Pozadina WinHelpa za Okular
-Comment[sv]=Windows HTMLHelp-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์แฟ้มช่วยเหลือแบบ HTML ของวินโดวส์ สำหรับ Okular
-Comment[tr]=Okular için Windows HTMLHelp arka ucu
-Comment[uk]=Додаток Windows HTMLHelp для okular
-Comment[x-test]=xxWindows HTMLHelp backend for Okularxx
-Comment[zh_CN]=Okular 的 Windows HTMLHelp 格式后端
-Comment[zh_TW]=Okular 的 Windows HTMLHelp 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/x-chm;
-X-KDE-Library=okularGenerator_chmlib
-X-KDE-Priority=2
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=false
diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json
new file mode 100644
index 0000000..136973d
--- /dev/null
+++ b/generators/chm/libokularGenerator_chmlib.json
@@ -0,0 +1,28 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "niedakh@gmail.com",
+ "Name": "Piotr Szymański"
+ },
+ {
+ "Email": "aacid@kde.org",
+ "Name": "Albert Astals Cid"
+ }
+ ],
+ "Description": "A Microsoft Windows help file renderer",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/x-chm"
+ ],
+ "Name": "CHM Backend",
+ "Id": "okular_chm",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.1.4"
+ },
+ "X-KDE-Priority": 2,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": false
+}
diff --git a/generators/chm/okularChm.desktop b/generators/chm/okularChm.desktop
deleted file mode 100644
index ed42bc2..0000000
--- a/generators/chm/okularChm.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/x-chm;
diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
index 684613b..132f6ab 100644
--- a/generators/comicbook/CMakeLists.txt
+++ b/generators/comicbook/CMakeLists.txt
@@ -14,19 +14,14 @@ set( okularGenerator_comicbook_PART_SRCS
)
-add_library(okularGenerator_comicbook MODULE ${okularGenerator_comicbook_PART_SRCS})
-
-target_link_libraries(okularGenerator_comicbook okularcore KF5::KIOCore KF5::I18n KF5::Archive KF5::KDELibs4Support)
+okular_add_generator(okularGenerator_comicbook ${okularGenerator_comicbook_PART_SRCS})
+target_link_libraries(okularGenerator_comicbook okularcore KF5::KIOCore KF5::I18n KF5::Archive KF5::KDELibs4Support)
if (UNIX)
find_package(KF5 REQUIRED Pty)
target_link_libraries(okularGenerator_comicbook KF5::Pty)
endif (UNIX)
-install(TARGETS okularGenerator_comicbook DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_comicbook.desktop okularComicbook.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_comicbook.desktop org.kde.mobile.okular_comicbook.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/comicbook/generator_comicbook.cpp b/generators/comicbook/generator_comicbook.cpp
index dd5b0ff..4ac005d 100644
--- a/generators/comicbook/generator_comicbook.cpp
+++ b/generators/comicbook/generator_comicbook.cpp
@@ -21,22 +21,7 @@
#include "debug_comicbook.h"
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_comicbook"),
- i18n( "ComicBook Backend" ),
- QStringLiteral("0.4"),
- i18n( "A renderer for various comic book formats" ),
- KAboutLicense::GPL,
- i18n( "© 2007-2008 Tobias Koenig" )
- );
- aboutData.addAuthor( QStringLiteral("Tobias Koenig" ), QString(), QStringLiteral("tokoe@kde.org") );
-
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( ComicBookGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(ComicBookGenerator, "libokularGenerator_comicbook.json")
ComicBookGenerator::ComicBookGenerator( QObject *parent, const QVariantList &args )
: Generator( parent, args )
diff --git a/generators/comicbook/libokularGenerator_comicbook.desktop b/generators/comicbook/libokularGenerator_comicbook.desktop
deleted file mode 100644
index 5a91a5f..0000000
--- a/generators/comicbook/libokularGenerator_comicbook.desktop
+++ /dev/null
@@ -1,127 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Comic Book
-Name[ar]=كوميك بوك
-Name[ast]=Comic Book
-Name[bg]=Комикс
-Name[bs]=Strip
-Name[ca]=Comic Book
-Name[ca@valencia]=Comic Book
-Name[cs]=Kniha komiksů
-Name[da]=Comic Book
-Name[de]=Comic-Book
-Name[el]=Βιβλίο κόμικ
-Name[en_GB]=Comic Book
-Name[eo]=ComicBook
-Name[es]=Comic Book
-Name[et]=Koomiks
-Name[eu]=Komikia
-Name[fi]=Comic Book
-Name[fr]= Comic Book
-Name[ga]=Comic Book
-Name[gl]=Libro de banda deseñada
-Name[hi]=कॉमिक पुस्तिका
-Name[hne]=कामिक पुस्तिका
-Name[hr]=Strip
-Name[hu]=Képregénynézegető
-Name[ia]=Comic Book
-Name[is]=Comic Book
-Name[it]=Comic Book
-Name[ja]=Comic Book
-Name[kk]=Комикс кітабі
-Name[km]=សៀវភៅ​កំប្លែង
-Name[ko]=만화책
-Name[ku]=Pirtûkên Qerfî
-Name[lt]=Comic Book
-Name[lv]=Comic Book
-Name[mr]=कॉमिक पुस्तक
-Name[nb]=Tegneserie
-Name[nds]=Comicbook
-Name[ne]=कस्मिक किताब
-Name[nl]=Comic Book
-Name[nn]=Teikneserie
-Name[pa]=ਕਾਮਿਕਸ ਕਿਤਾਬ
-Name[pl]=Komiks
-Name[pt]=Banda Desenhada
-Name[pt_BR]=Comic Book
-Name[ro]=Benzi desenate
-Name[ru]=Comic Book
-Name[sk]=Kniha komiksov
-Name[sl]=Strip
-Name[sq]=Libër Komik
-Name[sr]=комикбук
-Name[sr@ijekavian]=комикбук
-Name[sr@ijekavianlatin]=ComicBook
-Name[sr@latin]=ComicBook
-Name[sv]=Seriebok
-Name[th]=หนังสือการ์ตูน
-Name[tr]=Comic Book
-Name[ug]=ھەجۋىي كىتاب
-Name[uk]=Комікс
-Name[vi]=Truyện Tranh
-Name[x-test]=xxComic Bookxx
-Name[zh_CN]=Comic Book
-Name[zh_TW]=Comic Book
-Comment=Comic book backend for Okular
-Comment[ar]=المنتهى الخلفي Comic book لأوكلار
-Comment[ast]=Motor de llibros de Comic pa Okular
-Comment[bg]=Ядро на Okular за комикси
-Comment[bs]=Pozadina stripa za Okular
-Comment[ca]=Dorsal de Comic book per a l'Okular
-Comment[ca@valencia]=Dorsal de Comic book per a l'Okular
-Comment[cs]=Implementace Knihy komiksů pro Okular
-Comment[da]=Comic book-motor til Okular
-Comment[de]=Anzeigemodul für Comic-Book in Okular
-Comment[el]=Σύστημα υποστήριξης βιβλίων κόμικ για το Okular
-Comment[en_GB]=Comic book backend for Okular
-Comment[es]=Motor de libros de Comic para Okular
-Comment[et]=Okulari koomiksite taustaprogramm
-Comment[eu]=Okular-en komiki motorra
-Comment[fi]=Comic book -taustaosa Okularille
-Comment[fr]=Moteur « Comic book » pour Okular
-Comment[ga]=Inneall Comic Book le haghaidh Okular
-Comment[gl]=Infraestruturas de banda deseñada para Okular
-Comment[hne]=ओकुलर बर कामिक बुक बैकएन्ड
-Comment[hr]=Podrška za stripove za Okular
-Comment[hu]=Képregényolvasó bővítmény az Okularhoz
-Comment[ia]=Retro-administration per Comic Book pro Okular
-Comment[is]=ComicBook stuðningur fyrir Okular
-Comment[it]=Backend Comic book per Okular
-Comment[ja]=Okular の Comic Book 用バックエンド
-Comment[kk]=Okular-дың комикс тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ​សៀវភៅ​កំប្លែង​សម្រាប់ Okular
-Comment[ko]=Okular의 만화책 백엔드
-Comment[ku]=Binesazî ya pirtûkên qerfî ji bo Okular
-Comment[lt]=Comic book programinė sąsaja, skirta Okular
-Comment[lv]=Comic book Okular aizmugure
-Comment[mr]=ओक्युलर करिता कॉमिक पुस्तक बॅकएन्ड
-Comment[nb]=Tegneseriemotor for Okular
-Comment[nds]=Comicbook-Hülpprogramm för Okular
-Comment[nl]=Comic-book-backend voor Okular
-Comment[nn]=Teikneseriemotor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਕਾਮਿਕਸ ਕਿਤਾਬ ਬੈਕਐਂਡ
-Comment[pl]=Silnik komiksu dla Okulara
-Comment[pt]=Infra-estrutura de banda desenhada para o Okular
-Comment[pt_BR]=Infraestrutura Comic book para o Okular
-Comment[ro]=Platformă de benzi desenate pentru Okular
-Comment[ru]=Модуль поддержки формата Comic Book для Okular
-Comment[sk]=Backend knihy komiksov pre Okular
-Comment[sl]=Zaledje za stripe za Okular
-Comment[sq]=Mbështetje për librat komikë për Okular
-Comment[sr]=Позадина комикбука за Окулар
-Comment[sr@ijekavian]=Позадина комикбука за Окулар
-Comment[sr@ijekavianlatin]=Pozadina ComicBooka za Okular
-Comment[sr@latin]=Pozadina ComicBooka za Okular
-Comment[sv]=Seriebokgränssnitt för Okular
-Comment[th]=แบ็กเอนด์หนังสือการ์ตูนสำหรับโอกูลาร์
-Comment[tr]=Okular için Comic book arka ucu
-Comment[uk]=Додаток коміксів для Okular
-Comment[x-test]=xxComic book backend for Okularxx
-Comment[zh_CN]=Okular 的 Comic book 格式后端
-Comment[zh_TW]=Okular 的 Comic book 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/x-cbz;application/x-cbr;application/x-cbt;inode/directory;
-X-KDE-Library=okularGenerator_comicbook
-X-KDE-Priority=1
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=false
diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json
new file mode 100644
index 0000000..715a338
--- /dev/null
+++ b/generators/comicbook/libokularGenerator_comicbook.json
@@ -0,0 +1,27 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "tokoe@kde.org",
+ "Name": "Tobias Koenig"
+ }
+ ],
+ "Description": "A renderer for various comic book formats",
+ "Id": "okular_comicbook",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/x-cbz",
+ "application/x-cbr",
+ "application/x-cbt",
+ "inode/directory"
+ ],
+ "Name": "ComicBook Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.4"
+ },
+ "X-KDE-Priority": 1,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": false
+}
diff --git a/generators/comicbook/okularComicbook.desktop b/generators/comicbook/okularComicbook.desktop
deleted file mode 100644
index 1dded78..0000000
--- a/generators/comicbook/okularComicbook.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/x-cbz;application/x-cbr;application/x-cbt;
diff --git a/generators/djvu/CMakeLists.txt b/generators/djvu/CMakeLists.txt
index 34dc1a1..0a1553d 100644
--- a/generators/djvu/CMakeLists.txt
+++ b/generators/djvu/CMakeLists.txt
@@ -13,16 +13,12 @@ set(okularGenerator_djvu_SRCS
)
-add_library(okularGenerator_djvu MODULE ${okularGenerator_djvu_SRCS})
+okular_add_generator(okularGenerator_djvu ${okularGenerator_djvu_SRCS})
target_link_libraries(okularGenerator_djvu okularcore ${DJVULIBRE_LIBRARY} KF5::KDELibs4Support)
-install(TARGETS okularGenerator_djvu DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_djvu.desktop okularDjvu.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_djvu.desktop org.kde.mobile.okular_djvu.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/djvu/generator_djvu.cpp b/generators/djvu/generator_djvu.cpp
index 740e38c..f2d0008 100644
--- a/generators/djvu/generator_djvu.cpp
+++ b/generators/djvu/generator_djvu.cpp
@@ -68,20 +68,7 @@ static void recurseCreateTOC( QDomDocument &maindoc, const QDomNode &parent, QDo
}
}
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_djvu"),
- i18n( "DjVu Backend" ),
- QStringLiteral("0.2.3"),
- i18n( "DjVu backend based on DjVuLibre." ),
- KAboutLicense::GPL,
- i18n( "© 2006-2008 Pino Toscano" ));
- aboutData.addAuthor( i18n( "Pino Toscano" ), QString(), QStringLiteral("pino@kde.org") );
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( DjVuGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(DjVuGenerator, "libokularGenerator_djvu.json")
DjVuGenerator::DjVuGenerator( QObject *parent, const QVariantList &args )
: Okular::Generator( parent, args ), m_docSyn( 0 )
diff --git a/generators/djvu/libokularGenerator_djvu.desktop b/generators/djvu/libokularGenerator_djvu.desktop
deleted file mode 100644
index 8873779..0000000
--- a/generators/djvu/libokularGenerator_djvu.desktop
+++ /dev/null
@@ -1,128 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=djvu
-Name[ar]=djvu
-Name[ast]=djvu
-Name[bg]=djvu
-Name[bs]=djvu
-Name[ca]=djvu
-Name[ca@valencia]=djvu
-Name[cs]=djvu
-Name[da]=djvu
-Name[de]=djvu
-Name[el]=djvu
-Name[en_GB]=djvu
-Name[eo]=djvu
-Name[es]=djvu
-Name[et]=djvu
-Name[eu]=djvu
-Name[fi]=djvu
-Name[fr]=DjVu
-Name[ga]=djvu
-Name[gl]=djvu
-Name[hi]=डीजेवीयू
-Name[hne]=डीजेवीयू
-Name[hr]=djvu
-Name[hu]=DjVu
-Name[ia]=djvu
-Name[is]=djvu
-Name[it]=djvu
-Name[ja]=djvu
-Name[kk]=djvu
-Name[km]=djvu
-Name[ko]=djvu
-Name[ku]=djvu
-Name[lt]=djvu
-Name[lv]=djvu
-Name[mr]=djvu
-Name[nb]=djvu
-Name[nds]=djvu
-Name[ne]=djvu
-Name[nl]=djvu
-Name[nn]=djvu
-Name[pa]=djvu
-Name[pl]=djvu
-Name[pt]=djvu
-Name[pt_BR]=djvu
-Name[ro]=djvu
-Name[ru]=djvu
-Name[si]=djvu
-Name[sk]=djvu
-Name[sl]=djvu
-Name[sq]=djvu
-Name[sr]=ДјВу
-Name[sr@ijekavian]=ДјВу
-Name[sr@ijekavianlatin]=DjVu
-Name[sr@latin]=DjVu
-Name[sv]=djvu
-Name[th]=เอกสาร djvu
-Name[tr]=djvu
-Name[ug]=djvu
-Name[uk]=djvu
-Name[vi]=djvu
-Name[x-test]=xxdjvuxx
-Name[zh_CN]=djvu
-Name[zh_TW]=djvu
-Comment=DjVu backend for Okular
-Comment[ar]=المنتهى الخلفي DjVu لأوكلار
-Comment[ast]=Motor DjVu pa Okular
-Comment[bg]=Ядро на Okular за DjVu
-Comment[bs]=Pozadina DјVu-a za Okular
-Comment[ca]=Dorsal de DjVu per a l'Okular
-Comment[ca@valencia]=Dorsal de DjVu per a l'Okular
-Comment[cs]=Implementace DjVU pro Okular
-Comment[da]=DjVu-motor til Okular
-Comment[de]=Anzeigemodul für DjVu in Okular
-Comment[el]=Σύστημα υποστήριξης DjVu για το Okular
-Comment[en_GB]=DjVu backend for Okular
-Comment[es]=Motor DjVu para Okular
-Comment[et]=Okulari DjVu taustaprogramm
-Comment[eu]=Okular-en DjVu motorra
-Comment[fi]=DjVu-taustaosa Okularille
-Comment[fr]=Moteur « DjVu » pour Okular
-Comment[ga]=Inneall DjVu le haghaidh Okular
-Comment[gl]=Infraestrutura de DjVu para Okular
-Comment[hne]=ओकुलर बर डीजेवीयू बैकएन्ड
-Comment[hr]=Podrška za DjVu za Okular
-Comment[hu]=DjVu-bővítmény az Okularhoz
-Comment[ia]=Retro-administration per DjVu pro Okular
-Comment[is]=DjVu stuðningur fyrir Okular
-Comment[it]=Backend DjVu per Okular
-Comment[ja]=Okular の DjVu バックエンド
-Comment[kk]=Okular-дың DjVu тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ DjVu សម្រាប់ Okular
-Comment[ko]=Okular의 DjVu 백엔드
-Comment[ku]=Binesazî ya DjVu ji bo Okular
-Comment[lt]=DjVu programinė sąsaja, skirta Okular
-Comment[lv]=DjVu Okular aizmugure
-Comment[mr]=ओक्युलर करिता DjVu बॅकएन्ड
-Comment[nb]=DjVu-motor for Okular
-Comment[nds]=DjVu-Hülpprogramm för Okular
-Comment[nl]=DjVu-backend voor Okular
-Comment[nn]=DjVu-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ DjVu ਬੈਕਐਂਡ
-Comment[pl]=Obsługa DjVu dla Okulara
-Comment[pt]=Infra-estrutura do DjVu para o Okular
-Comment[pt_BR]=Infraestrutura DjVu para o Okular
-Comment[ro]=Platformă DjVu pentru Okular
-Comment[ru]=Модуль поддержки формата DjVu для Okular
-Comment[sk]=Backend DjVu pre Okular
-Comment[sl]=Zaledje DjVu za Okular
-Comment[sq]=Mbështetje për DjVu në Okular
-Comment[sr]=Позадина ДјВуа за Окулар
-Comment[sr@ijekavian]=Позадина ДјВуа за Окулар
-Comment[sr@ijekavianlatin]=Pozadina DjVua za Okular
-Comment[sr@latin]=Pozadina DjVua za Okular
-Comment[sv]=DjVu-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์เอกสาร DjVu สำหรับโอกูลาร์
-Comment[tr]=Okular için DjVu arka ucu
-Comment[uk]=Додаток DjVu для Okular
-Comment[x-test]=xxDjVu backend for Okularxx
-Comment[zh_CN]=Okular 的 Djvu 格式后端
-Comment[zh_TW]=Okular 的 DjVu 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=image/vnd.djvu;
-X-KDE-Library=okularGenerator_djvu
-X-KDE-Priority=2
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=false
diff --git a/generators/djvu/libokularGenerator_djvu.json b/generators/djvu/libokularGenerator_djvu.json
new file mode 100644
index 0000000..6b0c611
--- /dev/null
+++ b/generators/djvu/libokularGenerator_djvu.json
@@ -0,0 +1,24 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "pino@kde.org",
+ "Name": "Pino Toscano"
+ }
+ ],
+ "Description": "DjVu backend based on DjVuLibre",
+ "Id": "okular_djvu",
+ "License": "GPL",
+ "MimeTypes": [
+ "image/vnd.djvu"
+ ],
+ "Name": "DjVu Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.2.3"
+ },
+ "X-KDE-Priority": 2,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": false
+}
diff --git a/generators/djvu/okularDjvu.desktop b/generators/djvu/okularDjvu.desktop
deleted file mode 100644
index 1c2fd43..0000000
--- a/generators/djvu/okularDjvu.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=image/vnd.djvu;
diff --git a/generators/dvi/CMakeLists.txt b/generators/dvi/CMakeLists.txt
index 38f321a..23bc627 100644
--- a/generators/dvi/CMakeLists.txt
+++ b/generators/dvi/CMakeLists.txt
@@ -46,18 +46,15 @@ set(okularGenerator_dvi_SRCS
)
-add_library(okularGenerator_dvi MODULE ${okularGenerator_dvi_SRCS})
+okular_add_generator(okularGenerator_dvi ${okularGenerator_dvi_SRCS})
target_link_libraries(okularGenerator_dvi okularcore KF5::I18n KF5::KDELibs4Support)
if (FREETYPE_FOUND)
target_link_libraries(okularGenerator_dvi ${FREETYPE_LIBRARIES})
endif (FREETYPE_FOUND)
-install(TARGETS okularGenerator_dvi DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
########### install files ###############
-install( FILES libokularGenerator_dvi.desktop okularDvi.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_dvi.desktop org.kde.mobile.okular_dvi.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/dvi/generator_dvi.cpp b/generators/dvi/generator_dvi.cpp
index 2db4bc4..7a63fc0 100644
--- a/generators/dvi/generator_dvi.cpp
+++ b/generators/dvi/generator_dvi.cpp
@@ -40,20 +40,7 @@
#include <QThread>
#endif
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_dvi"),
- i18n( "DVI Backend" ),
- QStringLiteral("0.3.7"),
- i18n( "A DVI file renderer" ),
- KAboutLicense::GPL,
- i18n( "© 2006 Luigi Toscano" )
- );
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( DviGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(DviGenerator, "libokularGenerator_dvi.json")
DviGenerator::DviGenerator( QObject *parent, const QVariantList &args ) : Okular::Generator( parent, args ),
m_fontExtracted( false ), m_docSynopsis( 0 ), m_dviRenderer( 0 )
diff --git a/generators/dvi/libokularGenerator_dvi.desktop b/generators/dvi/libokularGenerator_dvi.desktop
deleted file mode 100644
index 39edcfa..0000000
--- a/generators/dvi/libokularGenerator_dvi.desktop
+++ /dev/null
@@ -1,128 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=dvi
-Name[ar]=dvi
-Name[ast]=dvi
-Name[bg]=dvi
-Name[bs]=dvi
-Name[ca]=dvi
-Name[ca@valencia]=dvi
-Name[cs]=dvi
-Name[da]=dvi
-Name[de]=dvi
-Name[el]=dvi
-Name[en_GB]=dvi
-Name[eo]=dvi
-Name[es]=dvi
-Name[et]=dvi
-Name[eu]=dvi
-Name[fi]=dvi
-Name[fr]=DVI
-Name[ga]=dvi
-Name[gl]=dvi
-Name[hi]=डीवीआई
-Name[hne]=डीवीआई
-Name[hr]=dvi
-Name[hu]=dvi
-Name[ia]=dvi
-Name[is]=dvi
-Name[it]=dvi
-Name[ja]=dvi
-Name[kk]=dvi
-Name[km]=dvi
-Name[ko]=dvi
-Name[ku]=dvi
-Name[lt]=dvi
-Name[lv]=dvi
-Name[mr]=dvi
-Name[nb]=dvi
-Name[nds]=dvi
-Name[ne]=dvi
-Name[nl]=dvi
-Name[nn]=dvi
-Name[pa]=dvi
-Name[pl]=dvi
-Name[pt]=dvi
-Name[pt_BR]=dvi
-Name[ro]=dvi
-Name[ru]=dvi
-Name[si]=dvi
-Name[sk]=dvi
-Name[sl]=dvi
-Name[sq]=dvi
-Name[sr]=ДВИ
-Name[sr@ijekavian]=ДВИ
-Name[sr@ijekavianlatin]=DVI
-Name[sr@latin]=DVI
-Name[sv]=dvi
-Name[th]=เอกสาร dvi
-Name[tr]=dvi
-Name[ug]=dvi
-Name[uk]=dvi
-Name[vi]=dvi
-Name[x-test]=xxdvixx
-Name[zh_CN]=dvi
-Name[zh_TW]=dvi
-Comment=DVI backend for Okular
-Comment[ar]=المنتهى الخلفي DVI لأوكلار
-Comment[ast]=Motor DVI pa Okular
-Comment[bg]=Ядро на Okular за DVI
-Comment[bs]=Pozadina DVI-a za Okular
-Comment[ca]=Dorsal de DVI per a l'Okular
-Comment[ca@valencia]=Dorsal de DVI per a l'Okular
-Comment[cs]=Implementace DVI pro Okular
-Comment[da]=DVI-motor til Okular
-Comment[de]=Anzeigemodul für DVI in Okular
-Comment[el]=Σύστημα υποστήριξης DVI για το Okular
-Comment[en_GB]=DVI backend for Okular
-Comment[es]=Motor DVI para Okular
-Comment[et]=Okulari DVI taustaprogramm
-Comment[eu]=Okular-en DVI motorra
-Comment[fi]=DVI-taustaosa Okularille
-Comment[fr]=Moteur DVI pour Okular
-Comment[ga]=Inneall DVI le haghaidh Okular
-Comment[gl]=Infraestrutura de DVI para Okular
-Comment[hne]=ओकुलर बर डीवीआई बैकएन्ड
-Comment[hr]=Podrška za DVI za Okular
-Comment[hu]=DVI-kezelő bővítmény az Okularhoz
-Comment[ia]=Retro-administration per DVI pro Okular
-Comment[is]=DVI stuðningur fyrir Okular
-Comment[it]=Backend DVI per Okular
-Comment[ja]=Okular の DVI バックエンド
-Comment[kk]=Okular-дың DVI тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ​ DVI សម្រាប់ Okular
-Comment[ko]=Okular의 DVI 백엔드
-Comment[ku]=Binesazî ya DVI ji bo Okular
-Comment[lt]=DVI programinė sąsaja, skirta Okular
-Comment[lv]=DVI Okular aizmugure
-Comment[mr]=ओक्युलर करिता DVI बॅकएन्ड
-Comment[nb]=DVI-motor for Okular
-Comment[nds]=DVI-Hülpprogramm för Okular
-Comment[nl]=DVI-backend voor Okular
-Comment[nn]=DVI-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ DVI ਬੈਕਐਂਡ
-Comment[pl]=Obsługa DVI dla Okulara
-Comment[pt]=Infra-estrutura de DVI para o Okular
-Comment[pt_BR]=Infraestrutura DVI para o Okular
-Comment[ro]=Platformă DVI pentru Okular
-Comment[ru]=Модуль поддержки формата DVI для Okular
-Comment[sk]=Backend DVI pre Okular
-Comment[sl]=Zaledje DVI za Okular
-Comment[sq]=Mbështetje për DVI në Okular
-Comment[sr]=Позадина ДВИ‑ја за Окулар
-Comment[sr@ijekavian]=Позадина ДВИ‑ја за Окулар
-Comment[sr@ijekavianlatin]=Pozadina DVI‑ja za Okular
-Comment[sr@latin]=Pozadina DVI‑ja za Okular
-Comment[sv]=DVI-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์เอกสาร DVI สำหรับโอกูลาร์
-Comment[tr]=Okular için DVI arka ucu
-Comment[uk]=Додаток DVI для Okular
-Comment[x-test]=xxDVI backend for Okularxx
-Comment[zh_CN]=Okular 的 DVI 格式后端
-Comment[zh_TW]=Okular 的 DVI 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/x-dvi;
-X-KDE-Library=okularGenerator_dvi
-X-KDE-Priority=2
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=false
diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json
new file mode 100644
index 0000000..3f68ac3
--- /dev/null
+++ b/generators/dvi/libokularGenerator_dvi.json
@@ -0,0 +1,24 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "luigi.toscano@tiscali.it",
+ "Name": "Luigi Toscano"
+ }
+ ],
+ "Description": "A DVI file renderer",
+ "Id": "okular_dvi",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/x-dvi"
+ ],
+ "Name": "DVI Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.3.7"
+ },
+ "X-KDE-Priority": 2,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": false
+}
diff --git a/generators/dvi/okularDvi.desktop b/generators/dvi/okularDvi.desktop
deleted file mode 100644
index 5c7d3a9..0000000
--- a/generators/dvi/okularDvi.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/x-dvi;application/x-gzdvi;application/x-bzdvi;
diff --git a/generators/epub/CMakeLists.txt b/generators/epub/CMakeLists.txt
index 41ecd23..154b50a 100644
--- a/generators/epub/CMakeLists.txt
+++ b/generators/epub/CMakeLists.txt
@@ -14,14 +14,10 @@ set(okularGenerator_epub_PART_SRCS
generator_epub.cpp
)
-add_library(okularGenerator_epub MODULE ${okularGenerator_epub_PART_SRCS})
+okular_add_generator(okularGenerator_epub ${okularGenerator_epub_PART_SRCS})
target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} KF5::KDELibs4Support Qt5::Widgets Qt5::Xml)
-install(TARGETS okularGenerator_epub DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_epub.desktop okularEPub.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_epub.desktop org.kde.mobile.okular_epub.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/epub/generator_epub.cpp b/generators/epub/generator_epub.cpp
index d8d8b07..f79420c 100644
--- a/generators/epub/generator_epub.cpp
+++ b/generators/epub/generator_epub.cpp
@@ -15,23 +15,7 @@
#include <kconfigdialog.h>
#include <KLocalizedString>
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_epub"),
- i18n("EPub Backend"),
- QStringLiteral("0.2.3"),
- i18n("An EPub backend"),
- KAboutLicense::GPL,
- i18n("© 2008 Ely Levy")
- );
- aboutData.addAuthor(i18n("Ely Levy"), QString(),
- QStringLiteral("elylevy@cs.huji.ac.il"));
-
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( EPubGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(EPubGenerator, "libokularGenerator_epub.json")
EPubGenerator::EPubGenerator( QObject *parent, const QVariantList &args )
: Okular::TextDocumentGenerator(new Epub::Converter, QStringLiteral("okular_epub_generator_settings"), parent, args)
diff --git a/generators/epub/libokularGenerator_epub.desktop b/generators/epub/libokularGenerator_epub.desktop
deleted file mode 100644
index 14d6415..0000000
--- a/generators/epub/libokularGenerator_epub.desktop
+++ /dev/null
@@ -1,123 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=EPub document
-Name[ar]=مستند إيباب
-Name[ast]=Documentu EPub
-Name[bg]=Документ EPub
-Name[bs]=EPub dokument
-Name[ca]=Document EPub
-Name[ca@valencia]=Document EPub
-Name[cs]=EPub dokument
-Name[da]=EPub-dokument
-Name[de]=EPUB-Dokument
-Name[el]=Έγγραφο EPub
-Name[en_GB]=EPub document
-Name[es]=Documento EPub
-Name[et]=EPubi dokument
-Name[eu]=EPub dokumentua
-Name[fi]=EPub-tiedosto
-Name[fr]=Document « EPub »
-Name[ga]=Cáipéis EPub
-Name[gl]=Documento EPub
-Name[hne]=ईपब कागद
-Name[hr]=Dokument oblika EPub
-Name[hu]=EPub-dokumentum
-Name[ia]=Documento EPub
-Name[is]=EPub skjal
-Name[it]=Documento EPub
-Name[ja]=EPub 文書
-Name[kk]=EPub құжаты
-Name[km]=ឯកសារ EPub
-Name[ko]=EPub 문서
-Name[ku]=Belgeya EPub
-Name[lt]=EPub dokumentas
-Name[lv]=EPub dokuments
-Name[mr]=EPub दस्तऐवज
-Name[nb]=EPub-dokument
-Name[nds]=EPub-Dokment
-Name[nl]=EPub-document
-Name[nn]=EPub-dokument
-Name[pa]=EPub ਡੌਕੂਮੈਂਟ
-Name[pl]=Dokument EPub
-Name[pt]=Documento do EPub
-Name[pt_BR]=Documento EPub
-Name[ro]=Document EPub
-Name[ru]=Документ EPub
-Name[sk]=EPub dokument
-Name[sl]=Dokument EPub
-Name[sq]=EPub dokument
-Name[sr]=ЕПУБ
-Name[sr@ijekavian]=ЕПУБ
-Name[sr@ijekavianlatin]=EPUB
-Name[sr@latin]=EPUB
-Name[sv]=Epub-dokument
-Name[th]=เอกสาร EPub
-Name[tr]=EPub belgesi
-Name[ug]=EPub پۈتۈكى
-Name[uk]=Документ EPub
-Name[x-test]=xxEPub documentxx
-Name[zh_CN]=EPub 文档
-Name[zh_TW]=EPub 文件
-Comment=EPub backend for Okular
-Comment[ar]=المنتهى الخلفي EPub لأوكلار
-Comment[ast]=Motor EPub pa Okular
-Comment[bg]=Ядро на Okular за EPub
-Comment[bs]=Pozadina EPub-a za Okular
-Comment[ca]=Dorsal d'EPub per a l'Okular
-Comment[ca@valencia]=Dorsal d'EPub per a l'Okular
-Comment[cs]=Implementace Epub pro Okular
-Comment[da]=EPub-motor til Okular
-Comment[de]=Anzeigemodul für EPUB in Okular
-Comment[el]=Σύστημα υποστήριξης EPub για το Okular
-Comment[en_GB]=EPub backend for Okular
-Comment[es]=Motor EPub para Okular
-Comment[et]=Okulari EPubi taustaprogramm
-Comment[eu]=Okular-en EPub motorra
-Comment[fi]=EPub-taustaosa Okularille
-Comment[fr]=Moteur EPub pour Okular
-Comment[ga]=Inneall EPub le haghaidh Okular
-Comment[gl]=Infraestrutura de EPub para Okular
-Comment[hne]=ओकुलर बर ईपब बैकएन्ड
-Comment[hr]=Podrška za EPub za Okular
-Comment[hu]=EPub-kezelő bővítmény az Okularhoz
-Comment[ia]=Retro-administration per EPub pro Okular
-Comment[is]=EPub stuðningur fyrir Okular
-Comment[it]=Backend EPub per Okular
-Comment[ja]=Okular の EPub バックエンド
-Comment[kk]=Okular-дың EPub тетігі
-Comment[km]=កម្មវិធី​ខាងក្រោយ EPub សម្រាប់ Okular
-Comment[ko]=Okular의 EPub 백엔드
-Comment[ku]=Binesazî ya EPub ji bo Okular
-Comment[lt]=EPub programinė sąsaja, skirta Okular
-Comment[lv]=EPub Okular aizmugure
-Comment[mr]=ओक्युलर करिता EPub बॅकएन्ड
-Comment[nb]=EPub-motor for Okular
-Comment[nds]=EPub-Hülpprogramm för Okular
-Comment[nl]=EPub-backend voor Okular
-Comment[nn]=EPub-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ EPub ਬੈਕਐਂਡ
-Comment[pl]=Obsługa EPub dla Okulara
-Comment[pt]=Infra-estrutura do EPub para o Okular
-Comment[pt_BR]=Infraestrutura EPub para o Okular
-Comment[ro]=Platformă EPub pentru Okular
-Comment[ru]=Модуль поддержки формата EPub для Okular
-Comment[sk]=Backend EPub pre Okular
-Comment[sl]=Zaledje EPub za Okular
-Comment[sq]=Mbështetje për EPub në Okular
-Comment[sr]=Позадина ЕПУБ‑а за Окулар
-Comment[sr@ijekavian]=Позадина ЕПУБ‑а за Окулар
-Comment[sr@ijekavianlatin]=Pozadina EPUB‑a za Okular
-Comment[sr@latin]=Pozadina EPUB‑a za Okular
-Comment[sv]=Epub-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์เอกสาร EPub สำหรับโอกูลาร์
-Comment[tr]=Okular için EPub arka ucu
-Comment[uk]=Додаток EPub для Okular
-Comment[x-test]=xxEPub backend for Okularxx
-Comment[zh_CN]=Okular 的 EPub 格式后端
-Comment[zh_TW]=Okular 的 EPub 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/epub+zip;
-X-KDE-Library=okularGenerator_epub
-X-KDE-Priority=1
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=true
diff --git a/generators/epub/libokularGenerator_epub.json b/generators/epub/libokularGenerator_epub.json
new file mode 100644
index 0000000..a4f3cc6
--- /dev/null
+++ b/generators/epub/libokularGenerator_epub.json
@@ -0,0 +1,24 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "elylevy@cs.huji.ac.il",
+ "Name": "Ely Levy"
+ }
+ ],
+ "Description": "An EPub backend",
+ "Id": "okular_epub",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/epub+zip"
+ ],
+ "Name": "EPub Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.2.3"
+ },
+ "X-KDE-Priority": 1,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": true
+}
diff --git a/generators/epub/okularEPub.desktop b/generators/epub/okularEPub.desktop
deleted file mode 100644
index 2da8c90..0000000
--- a/generators/epub/okularEPub.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/epub+zip;
diff --git a/generators/fax/CMakeLists.txt b/generators/fax/CMakeLists.txt
index 22b595e..058f1c9 100644
--- a/generators/fax/CMakeLists.txt
+++ b/generators/fax/CMakeLists.txt
@@ -7,14 +7,10 @@ include_directories(
set(okularGenerator_fax_PART_SRCS generator_fax.cpp faxdocument.cpp faxexpand.cpp faxinit.cpp fax_debug.cpp)
-add_library(okularGenerator_fax MODULE ${okularGenerator_fax_PART_SRCS})
+okular_add_generator(okularGenerator_fax ${okularGenerator_fax_PART_SRCS})
target_link_libraries(okularGenerator_fax okularcore KF5::I18n Qt5::Xml)
-install(TARGETS okularGenerator_fax DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_fax.desktop okularFax.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_fax.desktop org.kde.mobile.okular_fax.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/fax/generator_fax.cpp b/generators/fax/generator_fax.cpp
index 823db27..5bbbbd3 100644
--- a/generators/fax/generator_fax.cpp
+++ b/generators/fax/generator_fax.cpp
@@ -18,22 +18,7 @@
#include <core/document.h>
#include <core/page.h>
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_fax"),
- i18n( "Fax Backend" ),
- QStringLiteral("0.1.1"),
- i18n( "A G3/G4 fax document backend" ),
- KAboutLicense::GPL,
- i18n( "© 2008 Tobias Koenig" )
- );
- aboutData.addAuthor( QStringLiteral( "Tobias Koenig" ), QString(), QStringLiteral("tokoe@kde.org") );
-
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( FaxGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(FaxGenerator, "libokularGenerator_fax.json")
FaxGenerator::FaxGenerator( QObject *parent, const QVariantList &args )
: Generator( parent, args )
diff --git a/generators/fax/libokularGenerator_fax.desktop b/generators/fax/libokularGenerator_fax.desktop
deleted file mode 100644
index fcffa70..0000000
--- a/generators/fax/libokularGenerator_fax.desktop
+++ /dev/null
@@ -1,123 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Fax documents
-Name[ar]=مستندات الفاكس
-Name[ast]=Documentos de fax
-Name[bg]=Факс
-Name[bs]=Faksovi
-Name[ca]=Documents de fax
-Name[ca@valencia]=Documents de fax
-Name[cs]=Faxové dokumenty
-Name[da]=Fax-dokumenter
-Name[de]=Fax-Dokumente
-Name[el]=Έγγραφα φαξ
-Name[en_GB]=Fax documents
-Name[es]=Documentos de fax
-Name[et]=Faksidokumendid
-Name[eu]=Fax-dokumentuak
-Name[fi]=Faksitiedosto
-Name[fr]=Documents pour fax
-Name[ga]=Facsáil cáipéisí
-Name[gl]=Documentos de fax
-Name[hne]=फैक्स कागद
-Name[hr]=Dokumenti za faks
-Name[hu]=Faxdokumentumok
-Name[ia]=Documentos de Fax
-Name[is]=Fax skjöl
-Name[it]=Documenti Fax
-Name[ja]=ファクス文書
-Name[kk]=Факс құжаты
-Name[km]=ឯកសារ​ទូរសារ
-Name[ko]=팩스 문서
-Name[ku]=Belgeyên Fax
-Name[lt]=Fakso dokumentai
-Name[lv]=Faksa dokumenti
-Name[mr]=फॅक्स दस्तऐवज
-Name[nb]=Faksdokumenter
-Name[nds]=Fax-Dokmenten
-Name[nl]=Fax-documenten
-Name[nn]=Faksdokument
-Name[pa]=ਫੈਕਸ ਡੌਕੂਮੈਂਟ
-Name[pl]=Dokumenty faksowe
-Name[pt]=Documentos de fax
-Name[pt_BR]=Documentos de fax
-Name[ro]=Documente fax
-Name[ru]=Факс
-Name[sk]=Faxové dokumenty
-Name[sl]=Faksi
-Name[sq]=Dokumentet Faks
-Name[sr]=Факсови
-Name[sr@ijekavian]=Факсови
-Name[sr@ijekavianlatin]=Faksovi
-Name[sr@latin]=Faksovi
-Name[sv]=Telefax-dokument
-Name[th]=เอกสารโทรสาร
-Name[tr]=Faks belgeleri
-Name[ug]=فاكىس پۈتۈكى
-Name[uk]=Документи факсів
-Name[x-test]=xxFax documentsxx
-Name[zh_CN]=Fax 文档
-Name[zh_TW]=傳真文件
-Comment=G3/G4 Fax backend for Okular
-Comment[ar]=المنتهى الخلفي G3/G4 Fax لأوكلار
-Comment[ast]=Motor de fax G3/G4 pa Okular
-Comment[bg]=Ядро на Okular за факс G3/G4
-Comment[bs]=Pozadina G3/G4 faksova za Okular
-Comment[ca]=Dorsal de fax G3/G4 per a l'Okular
-Comment[ca@valencia]=Dorsal de fax G3/G4 per a l'Okular
-Comment[cs]=Implementace G3/G4 Fax pro Okular
-Comment[da]=G3/G4 fax-motor til Okular
-Comment[de]=Anzeigemodul für G3/G4 Faxe in Okular
-Comment[el]=Σύστημα υποστήριξης φαξ G3/G4 για το Okular
-Comment[en_GB]=G3/G4 Fax backend for Okular
-Comment[es]=Motor de fax G3/G4 para Okular
-Comment[et]=Okulari G3/G4 faksi taustaprogramm
-Comment[eu]=Okular-en G3/G4 faxaren motorra
-Comment[fi]=G3/G4-faksitaustaosa Okularille
-Comment[fr]=Moteur « Fax G3 / G4 » pour Okular
-Comment[ga]=Inneall facsála G3/G4 le haghaidh Okular
-Comment[gl]=Infraestrutura de fax G3/G4 para Okular
-Comment[hne]=ओकुलर बर जी३/जी४ बैकएन्ड
-Comment[hr]=Podrška za G3/G4 za faks za Okular
-Comment[hu]=Bővítmény G3/G4 formátumú faxok kezeléséhez az Okularhoz
-Comment[ia]=Retro-administration per Fax G3/G4 pro Okular
-Comment[is]=G3/G4 fax-bakendi fyrir Okular
-Comment[it]=Backend G3/G4 per Okular
-Comment[ja]=Okular の G3/G4 ファクス用バックエンド
-Comment[kk]=Okular-дың G3/G4 факс тетігі
-Comment[km]=កម្មវិធី​ខាង​ក្រោយ​ទូរសារ​ G3/G4 សម្រាប់ Okular
-Comment[ko]=Okular의 G3/G4 팩스 백엔드
-Comment[ku]=Binesazî ya G3/G4 Fax ji bo Okular
-Comment[lt]=G3/G4 faksų programinė sąsaja, skirta Okular
-Comment[lv]=G3/G4 Faksa Okular aizmugure
-Comment[mr]=ओक्युलर करिता G3/G4 फॅक्स बॅकएन्ड
-Comment[nb]=G3/G4-faksmotor for Okular
-Comment[nds]=G3-/G4-Fax-Hülpprogramm för Okular
-Comment[nl]=G3/G4 Fax-backend voor Okular
-Comment[nn]=G3/G4-faksmotor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ G3/G4 ਫੈਕਸ ਬੈਕਐਂਡ
-Comment[pl]=Obsługa faksu G3/G4 w Okularze
-Comment[pt]=Infra-estrutura de Fax G3/G4 para o Okular
-Comment[pt_BR]=Infraestrutura de fax G3/G4 para o Okular
-Comment[ro]=Platformă fax G3/G4 pentru Okular
-Comment[ru]=Модуль поддержки формата G3/G4 Fax для Okular
-Comment[sk]=Backend faxu G3/G4 pre Okular
-Comment[sl]=Zaledje za fakse G3/G4 za Okular
-Comment[sq]=G3/G4 Faks mbështetje për Okular
-Comment[sr]=Позадина Г3/Г4 факсова за Окулар
-Comment[sr@ijekavian]=Позадина Г3/Г4 факсова за Окулар
-Comment[sr@ijekavianlatin]=Pozadina G3/G4 faksova za Okular
-Comment[sr@latin]=Pozadina G3/G4 faksova za Okular
-Comment[sv]=G3/G4 telefax-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์โทรสาร G3/G4 สำหรับโอกูลาร์
-Comment[tr]=Okular için G3/G4 Faks arka ucu
-Comment[uk]=Додаток факсів G3/G4 для Okular
-Comment[x-test]=xxG3/G4 Fax backend for Okularxx
-Comment[zh_CN]=Okular 的 G3/G4 Fax 格式后端
-Comment[zh_TW]=Okular G3/G4 傳真後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=image/fax-g3;image/g3fax;
-X-KDE-Library=okularGenerator_fax
-X-KDE-Priority=1
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=false
diff --git a/generators/fax/libokularGenerator_fax.json b/generators/fax/libokularGenerator_fax.json
new file mode 100644
index 0000000..686a077
--- /dev/null
+++ b/generators/fax/libokularGenerator_fax.json
@@ -0,0 +1,25 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "tokoe@kde.org",
+ "Name": "Tobias Koenig"
+ }
+ ],
+ "Description": "A G3/G4 fax document backend",
+ "Id": "okular_fax",
+ "License": "GPL",
+ "MimeTypes": [
+ "image/fax-g3",
+ "image/g3fax"
+ ],
+ "Name": "Fax Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.1.1"
+ },
+ "X-KDE-Priority": 1,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": false
+}
diff --git a/generators/fax/okularFax.desktop b/generators/fax/okularFax.desktop
deleted file mode 100644
index 8b86b91..0000000
--- a/generators/fax/okularFax.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=image/fax-g3;image/g3fax;
diff --git a/generators/fictionbook/CMakeLists.txt b/generators/fictionbook/CMakeLists.txt
index 1ab5289..453530a 100644
--- a/generators/fictionbook/CMakeLists.txt
+++ b/generators/fictionbook/CMakeLists.txt
@@ -13,16 +13,12 @@ set(okularGenerator_fb_PART_SRCS
)
-add_library(okularGenerator_fb MODULE ${okularGenerator_fb_PART_SRCS})
+okular_add_generator(okularGenerator_fb ${okularGenerator_fb_PART_SRCS})
target_link_libraries(okularGenerator_fb okularcore KF5::Archive KF5::I18n KF5::KIOCore Qt5::Xml)
-install(TARGETS okularGenerator_fb DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_fb.desktop okularFb.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_fb.desktop org.kde.mobile.okular_fb.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
ecm_install_icons(ICONS 16-apps-okular-fb2.png 32-apps-okular-fb2.png 48-apps-okular-fb2.png DESTINATION ${KDE_INSTALL_DATADIR}/okular/icons THEME hicolor)
diff --git a/generators/fictionbook/generator_fb.cpp b/generators/fictionbook/generator_fb.cpp
index c5d5ddd..c613fa3 100644
--- a/generators/fictionbook/generator_fb.cpp
+++ b/generators/fictionbook/generator_fb.cpp
@@ -15,22 +15,7 @@
#include <KLocalizedString>
#include <kconfigdialog.h>
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_fictionbook"),
- i18n( "Fiction Book Backend" ),
- QStringLiteral("0.1.5"),
- i18n( "A renderer for FictionBook eBooks" ),
- KAboutLicense::GPL,
- i18n( "© 2007-2008 Tobias Koenig" )
- );
- aboutData.addAuthor( QStringLiteral( "Tobias Koenig" ), QString(), QStringLiteral("tokoe@kde.org") );
-
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( FictionBookGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(FictionBookGenerator, "libokularGenerator_fb.json")
FictionBookGenerator::FictionBookGenerator( QObject *parent, const QVariantList &args )
: Okular::TextDocumentGenerator( new FictionBook::Converter, QStringLiteral("okular_fictionbook_generator_settings"), parent, args )
diff --git a/generators/fictionbook/libokularGenerator_fb.desktop b/generators/fictionbook/libokularGenerator_fb.desktop
deleted file mode 100644
index ee51e8f..0000000
--- a/generators/fictionbook/libokularGenerator_fb.desktop
+++ /dev/null
@@ -1,126 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=FictionBook document
-Name[ar]=مستند فيكشن بوك
-Name[ast]=Documentu FictionBook
-Name[bg]=Документ FictionBook
-Name[bs]=FictionBook dokument
-Name[ca]=Document FictionBook
-Name[ca@valencia]=Document FictionBook
-Name[cs]=FictionBook dokument
-Name[da]=FictionBook-dokument
-Name[de]=FictionBook-Dokument
-Name[el]=Έγγραφο FictionBook
-Name[en_GB]=FictionBook document
-Name[eo]=FictionBook dokumento
-Name[es]=Documento FictionBook
-Name[et]=FictionBooki dokument
-Name[eu]=Fikzio-liburu dokumentua
-Name[fi]=FictionBook-tiedosto
-Name[fr]=Document « FictionBook »
-Name[ga]=Cáipéis FictionBook
-Name[gl]=Documento FictionBook
-Name[hi]=फ़िक्शनबुक दस्तावेज़
-Name[hne]=फिक्सनबुक कागद
-Name[hr]=Dokument oblika FictionBook
-Name[hu]=FictionBook-dokumentum
-Name[ia]=Documento FictionBook
-Name[is]=FictionBook skjal
-Name[it]=Documento FictionBook
-Name[ja]=FictionBook 文書
-Name[kk]=FictionBook құжаты
-Name[km]=ឯកសារ FictionBook
-Name[ko]=FictionBook 문서
-Name[ku]=Belgeya FictionBook
-Name[lt]=FictionBook dokumentas
-Name[lv]=FictionBook dokuments
-Name[mr]=FictionBook दस्तऐवज
-Name[nb]=FictionBook-dokument
-Name[nds]=FictionBook-Dokment
-Name[ne]=फिक्सनबुक कागजात
-Name[nl]=FictionBook-document
-Name[nn]=FictionBook-dokument
-Name[pa]=FictionBook ਡੌਕੂਮੈਂਟ
-Name[pl]=Dokument FictionBook
-Name[pt]=Documento FictionBook
-Name[pt_BR]=Documento FictionBook
-Name[ro]=Document FictionBook
-Name[ru]=Документ FictionBook
-Name[sk]=FictionBook dokument
-Name[sl]=Dokument FictionBook
-Name[sq]=FictionBook dokument
-Name[sr]=фикшнбук
-Name[sr@ijekavian]=фикшнбук
-Name[sr@ijekavianlatin]=FictionBook
-Name[sr@latin]=FictionBook
-Name[sv]=FictionBook-dokument
-Name[th]=เอกสาร FictionBook
-Name[tr]=FictionBook belgesi
-Name[uk]=Документ FictionBook
-Name[vi]=Tập tin FictionBook
-Name[x-test]=xxFictionBook documentxx
-Name[zh_CN]=FictionBook 文档
-Name[zh_TW]=FictionBook 文件
-Comment=FictionBook backend for Okular
-Comment[ar]=المنتهى الخلفي FictionBook لأوكلار
-Comment[ast]=Motor FictionBook pa Okular
-Comment[bg]=Ядро на Okular за FictionBook
-Comment[bs]=Pozadina FictionBook-a za Okular
-Comment[ca]=Dorsal de FictionBook per a l'Okular
-Comment[ca@valencia]=Dorsal de FictionBook per a l'Okular
-Comment[cs]=Implementace FictionBook pro Okular
-Comment[da]=FictionBook-motor til Okular
-Comment[de]=Anzeigemodul für FictionBook in Okular
-Comment[el]=Σύστημα υποστήριξης FictionBook για το Okular
-Comment[en_GB]=FictionBook backend for Okular
-Comment[es]=Motor FictionBook para Okular
-Comment[et]=Okulari FictionBooki taustaprogramm
-Comment[eu]=Okular-en fikzio-libururen motorra
-Comment[fi]=FictionBook-taustaosa Okularille
-Comment[fr]=Moteur FictionBook pour Okular
-Comment[ga]=Inneall FictionBook le haghaidh Okular
-Comment[gl]=Infraestrutura de FictionBook para Okular
-Comment[hne]=ओकुलर बर फिक्सनबुक बैकएन्ड
-Comment[hr]=Podrška za FictionBook za Okular
-Comment[hu]=FictionBook-kezelő bővítmény az Okularhoz
-Comment[ia]=Retro-administration per FictionBook pro Okular
-Comment[is]=FictionBook stuðningur fyrir Okular
-Comment[it]=Backend FictionBook per Okular
-Comment[ja]=Okular の FictionBook バックエンド
-Comment[kk]=Okular-дың FictionBook тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ​ FictionBook សម្រាប់ Okular
-Comment[ko]=Okular의 FictoniBook 백엔드
-Comment[ku]=Binesazî ya FictionBook ji bo Okular
-Comment[lt]=FictionBook programinė sąsaja, skirta Okular
-Comment[lv]=FictionBook Okular aizmugure
-Comment[mr]=ओक्युलर करिता FictionBook बॅकएन्ड
-Comment[nb]=FictionBook-motor for Okular
-Comment[nds]=FictionBook-Hülpprogramm för Okular
-Comment[nl]=FictionBook-backend voor Okular
-Comment[nn]=FictionBook-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ FictionBook ਬੈਕਐਂਡ
-Comment[pl]=Silnik dokumentu FictionBook Okulara
-Comment[pt]=Infra-estrutura de FictionBook para o Okular
-Comment[pt_BR]=Infraestrutura FictionBook para o Okular
-Comment[ro]=Platformă FictionBook pentru Okular
-Comment[ru]=Модуль поддержки формата FictionBook для Okular
-Comment[sk]=Backend FictionBook pre Okular
-Comment[sl]=Zaledje FictionBook za Okular
-Comment[sq]=FictionBook mbështetje për Okular
-Comment[sr]=Позадина фикшнбука за Окулар
-Comment[sr@ijekavian]=Позадина фикшнбука за Окулар
-Comment[sr@ijekavianlatin]=Pozadina FictionBooka za Okular
-Comment[sr@latin]=Pozadina FictionBooka za Okular
-Comment[sv]=FictionBook-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์เอกสาร FictionBook สำหรับโอกูลาร์
-Comment[tr]=Okular için FictionBook arka ucu
-Comment[uk]=Додаток FictionBook для Okular
-Comment[x-test]=xxFictionBook backend for Okularxx
-Comment[zh_CN]=Okular 的 FictionBook 格式后端
-Comment[zh_TW]=Okular FictionBook 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/x-fictionbook+xml;
-X-KDE-Library=okularGenerator_fb
-X-KDE-Priority=1
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=true
diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json
new file mode 100644
index 0000000..72caf68
--- /dev/null
+++ b/generators/fictionbook/libokularGenerator_fb.json
@@ -0,0 +1,24 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "tokoe@kde.org",
+ "Name": "Tobias Koenig"
+ }
+ ],
+ "Description": "A renderer for FictionBook eBooks",
+ "Id": "okular_fax",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/x-fictionbook+xml"
+ ],
+ "Name": "Fiction Book Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.1.5"
+ },
+ "X-KDE-Priority": 1,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": true
+}
diff --git a/generators/fictionbook/okularFb.desktop b/generators/fictionbook/okularFb.desktop
deleted file mode 100644
index 998b224..0000000
--- a/generators/fictionbook/okularFb.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/x-fictionbook+xml;
diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
index 5d9011b..612d09b 100644
--- a/generators/kimgio/CMakeLists.txt
+++ b/generators/kimgio/CMakeLists.txt
@@ -19,5 +19,4 @@ target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:ok
########### install files ###############
-install( FILES libokularGenerator_kimgio.desktop okularKimgio.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/kimgio/generator_kimgio.cpp b/generators/kimgio/generator_kimgio.cpp
index 84c155b..0a89a7c 100644
--- a/generators/kimgio/generator_kimgio.cpp
+++ b/generators/kimgio/generator_kimgio.cpp
@@ -30,23 +30,7 @@
#include <core/page.h>
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- "okular_kimgio",
- i18n( "Image Backend" ),
- "0.1.2",
- i18n( "A simple image backend" ),
- KAboutLicense::GPL,
- i18n( "© 2005, 2009 Albert Astals Cid\n© 2006-2007 Pino Toscano\n© 2006-2007 Tobias Koenig" )
- );
- aboutData.addAuthor( i18n( "Albert Astals Cid" ), QString(), "aacid@kde.org" );
- aboutData.addAuthor( i18n( "Pino Toscano" ), QString(), "pino@kde.org" );
- aboutData.addAuthor( i18n( "Tobias Koenig" ), QString(), "tokoe@kde.org" );
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( KIMGIOGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(KIMGIOGenerator, "libokularGenerator_kimgio.json")
KIMGIOGenerator::KIMGIOGenerator( QObject *parent, const QVariantList &args )
: Generator( parent, args )
diff --git a/generators/kimgio/libokularGenerator_kimgio.desktop b/generators/kimgio/libokularGenerator_kimgio.desktop
deleted file mode 100644
index ea48342..0000000
--- a/generators/kimgio/libokularGenerator_kimgio.desktop
+++ /dev/null
@@ -1,128 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=KDE Image libraries
-Name[ar]=مكتبات الصورة لكدي
-Name[ast]=Biblioteques d'imáxenes de KDE
-Name[bg]=Библиотеки на KDE за изображения
-Name[bs]=KDE slikovne biblioteke
-Name[ca]=Biblioteques d'imatges del KDE
-Name[ca@valencia]=Biblioteques d'imatges del KDE
-Name[cs]=Knihovny obrázků KDE
-Name[da]=KDE's billedbiblioteker
-Name[de]=KDE-Bilder-Bibliotheken
-Name[el]=Βιβλιοθήκες εικόνων του KDE
-Name[en_GB]=KDE Image libraries
-Name[eo]=KDE bildaj bibliotekoj
-Name[es]=Bibliotecas de imágenes de KDE
-Name[et]=KDE pilditeegid
-Name[eu]=KDEren irudi-liburutegiak
-Name[fa]=کتابخانه‌های تصویر KDE
-Name[fi]=KDE:n kuvakirjastot
-Name[fr]=Bibliothèques d'images de KDE
-Name[ga]=Leabharlanna íomhánna KDE
-Name[gl]=Bibliotecas de KDE para imaxes
-Name[hi]=केडीई छवि लाइब्रेरीज
-Name[hne]=केडीई फोटू लाइब्रेरीज
-Name[hr]=Biblioteka u KDE-u za slike
-Name[hu]=KDE képbeolvasó programkönyvtárak
-Name[ia]=Bibliothecas de imagine de KDE
-Name[is]=Myndmeðhöndlunarforrit KDE
-Name[it]=Librerie KDE per la visione di immagini
-Name[ja]=KDE 画像ライブラリ
-Name[kk]=KDE кескіні жиын файлдары
-Name[km]=បណ្ណាល័យ​រូបភាព​របស់ KDE
-Name[ko]=KDE 이미지 라이브러리
-Name[ku]=KDE Pirtûkxaneyên Wêneyan
-Name[lt]=KDE paveikslėlių bibliotekos
-Name[lv]=KDE attēlu bibliotēkas
-Name[mr]=केडीई प्रतिमा लायब्ररीज
-Name[nb]=KDE-bildebiblioteker
-Name[nds]=Bildkieker-Bibliotheken för KDE
-Name[ne]=केडीई छवि लाइब्रेरी
-Name[nl]=KDE Afbeeldingsbibliotheken
-Name[nn]=Biletvisardel for KDE
-Name[pa]=KDE ਚਿੱਤਰ ਲਾਇਬਰੇਰੀਆਂ
-Name[pl]=Biblioteki KDE do obsługi obrazków
-Name[pt]=Bibliotecas de imagens do KDE
-Name[pt_BR]=Biblioteca de imagens do KDE
-Name[ro]=Biblioteci de imagine KDE
-Name[ru]=Библиотеки поддержки форматов изображений для KDE
-Name[sk]=Knižnice obrázkov KDE
-Name[sl]=KDE-jeve knjižnice za slike
-Name[sq]=Libraritë e Imazheve KDE
-Name[sr]=КДЕ‑ове сликовне библиотеке
-Name[sr@ijekavian]=КДЕ‑ове сликовне библиотеке
-Name[sr@ijekavianlatin]=KDE‑ove slikovne biblioteke
-Name[sr@latin]=KDE‑ove slikovne biblioteke
-Name[sv]=KDE-bildbibliotek
-Name[th]=ไลบรารีจัดการภาพสำหรับ KDE
-Name[tr]=KDE Resim kitaplıkları
-Name[ug]=KDE سۈرەت ئامبىرى
-Name[uk]=Бібліотеки зображень KDE
-Name[vi]=Các thư viện ảnh của KDE
-Name[x-test]=xxKDE Image librariesxx
-Name[zh_CN]=KDE 图像库
-Name[zh_TW]=KDE 影像函式庫
-Comment=Image backend for Okular
-Comment[ar]=المنتهى الخلفي للصورة لأوكلار
-Comment[ast]=Motor d'imáxenes pa Okular
-Comment[bg]=Ядро на Okular за изображения
-Comment[bs]=Pozadina slike za Okular
-Comment[ca]=Dorsal d'imatges per a l'Okular
-Comment[ca@valencia]=Dorsal d'imatges per a l'Okular
-Comment[cs]=Implementace obrázků pro Okular
-Comment[da]=Billedmotor til Okular
-Comment[de]=Anzeigemodul für Bilder in Okular
-Comment[el]=Σύστημα υποστήριξης εικόνων για το Okular
-Comment[en_GB]=Image backend for Okular
-Comment[es]=Motor de imágenes para Okular
-Comment[et]=Okulari piltide taustaprogramm
-Comment[eu]=Okular-en irudi motorra
-Comment[fi]=Kuvataustaosta Okularille
-Comment[fr]=Moteur d'images pour Okular
-Comment[ga]=Inneall íomhánna le haghaidh Okular
-Comment[gl]=Infraestrutura de imaxes para Okular
-Comment[hne]=ओकुलर बर फोटू बैकएन्ड
-Comment[hr]=Podrška za slike za Okular
-Comment[hu]=Képkezelő bővítmény az Okularhoz
-Comment[ia]=Retro-administration per Imagine pro Okular
-Comment[is]=Myndmeðhöndlunarstuðningur fyrir Okular
-Comment[it]=Backend immagini per Okular
-Comment[ja]=Okular の画像用バックエンド
-Comment[kk]=Okular-дың кескіндер тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ​សម្រាប់ Okular
-Comment[ko]=Okular의 이미지 백엔드
-Comment[ku]=Binesazî ya Wêneyan ji bo Okular
-Comment[lt]=Paveikslėlių programinė sąsaja, skirta Okular
-Comment[lv]=Attēlu Okular aizmugure
-Comment[mr]=ओक्युलर करिता प्रतिमा बॅकएन्ड
-Comment[nb]=Bildemotor for okular
-Comment[nds]=Bild-Hülpprogramm för Okular
-Comment[nl]=Afbeeldingsbackend voor Okular
-Comment[nn]=Biletmotor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਚਿੱਤਰ ਬੈਕਐਂਡ
-Comment[pl]=Obsługa obrazków dla Okulara
-Comment[pt]=Infra-estrutura de imagens para o Okular
-Comment[pt_BR]=Infraestrutura de imagens para o Okular
-Comment[ro]=Platformă de imagini pentru Okular
-Comment[ru]=Модуль поддержки форматов изображений для Okular
-Comment[sk]=Backend obrázkov pre Okular
-Comment[sl]=Zaledje za slike za Okular
-Comment[sq]=Mbështetje imazhesh për Okular
-Comment[sr]=Позадина слика за Окулар
-Comment[sr@ijekavian]=Позадина слика за Окулар
-Comment[sr@ijekavianlatin]=Pozadina slika za Okular
-Comment[sr@latin]=Pozadina slika za Okular
-Comment[sv]=Bildgränssnitt för Okular
-Comment[th]=แบ็กเอนด์จัดการภาพสำหรับโอกูลาร์
-Comment[tr]=Okular için resim arka ucu
-Comment[uk]=Додаток зображень для Okular
-Comment[x-test]=xxImage backend for Okularxx
-Comment[zh_CN]=Okular 的图像格式后端
-Comment[zh_TW]=Okular 影像後端
-X-KDE-ServiceTypes=okular/Generator
-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;
-X-KDE-Library=okularGenerator_kimgio
-X-KDE-Priority=1
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=false
diff --git a/generators/kimgio/libokularGenerator_kimgio.json b/generators/kimgio/libokularGenerator_kimgio.json
new file mode 100644
index 0000000..40c02fd
--- /dev/null
+++ b/generators/kimgio/libokularGenerator_kimgio.json
@@ -0,0 +1,51 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "aacid@kde.org",
+ "Name": "Albert Astals Cid"
+ }, {
+ "Email": "pino@kde.org",
+ "Name": "Pino Toscano"
+ }, {
+ "Email": "tokoe@kde.org",
+ "Name": "Tobias Koenig"
+ }
+ ],
+ "Description": "A simple image backend",
+ "Id": "okular_kimgio",
+ "License": "GPL",
+ "MimeTypes": [
+ "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"
+ ],
+ "Name": "Image Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.1.2"
+ },
+ "X-KDE-Priority": 1,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": false
+}
diff --git a/generators/kimgio/okularKimgio.desktop b/generators/kimgio/okularKimgio.desktop
deleted file mode 100644
index 983c300..0000000
--- a/generators/kimgio/okularKimgio.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=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/mobipocket/CMakeLists.txt b/generators/mobipocket/CMakeLists.txt
index e826c13..87995e3 100644
--- a/generators/mobipocket/CMakeLists.txt
+++ b/generators/mobipocket/CMakeLists.txt
@@ -8,13 +8,10 @@ set(okularGenerator_mobi_PART_SRCS
converter.cpp
)
-add_library(okularGenerator_mobi MODULE ${okularGenerator_mobi_PART_SRCS})
+okular_add_generator(okularGenerator_mobi ${okularGenerator_mobi_PART_SRCS})
target_link_libraries(okularGenerator_mobi okularcore KF5::KDELibs4Support Qt5::Gui ${QMOBIPOCKET_LIBRARIES})
-install(TARGETS okularGenerator_mobi DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
########### install files ###############
-install( FILES libokularGenerator_mobi.desktop okularMobi.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_mobi.desktop org.kde.mobile.okular_mobi.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/mobipocket/generator_mobi.cpp b/generators/mobipocket/generator_mobi.cpp
index a11d2c5..7cbad6c 100644
--- a/generators/mobipocket/generator_mobi.cpp
+++ b/generators/mobipocket/generator_mobi.cpp
@@ -14,23 +14,7 @@
#include <kconfigdialog.h>
#include <KLocalizedString>
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_mobi"),
- i18n("Mobipocket Backend"),
- QStringLiteral("0.1.1"),
- i18n("A mobipocket backend"),
- KAboutLicense::GPL,
- i18n("© 2008-2009 Jakub Stachowski")
- );
- aboutData.addAuthor(i18n("Jakub Stachowski"), QString(), QLatin1String("qbast@go2.pl"));
-
- return aboutData;
-}
-
-
-OKULAR_EXPORT_PLUGIN( MobiGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(MobiGenerator, "libokularGenerator_mobi.json")
MobiGenerator::MobiGenerator( QObject *parent, const QVariantList &args )
: Okular::TextDocumentGenerator( new Mobi::Converter, "okular_mobi_generator_settings", parent, args )
diff --git a/generators/mobipocket/libokularGenerator_mobi.desktop b/generators/mobipocket/libokularGenerator_mobi.desktop
deleted file mode 100644
index 13a1360..0000000
--- a/generators/mobipocket/libokularGenerator_mobi.desktop
+++ /dev/null
@@ -1,110 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Mobipocket document
-Name[ar]=مستند Mobipocket
-Name[ast]=Documentu Mobipocket
-Name[bg]=Документ Mobipocket
-Name[bs]=Mobipocket dokument
-Name[ca]=Document Mobipocket
-Name[ca@valencia]=Document Mobipocket
-Name[cs]=Dokument Mobipocket
-Name[da]=Mobipocket-dokument
-Name[de]=Mobipocket-Dokument
-Name[el]=Έγγραφο Mobipocket
-Name[en_GB]=Mobipocket document
-Name[es]=Documento Mobipocket
-Name[et]=Mobipocketi dokument
-Name[eu]=Mobipocket dokumentua
-Name[fi]=Mobipocket-tiedosto
-Name[fr]=Document « Mobipocket »
-Name[ga]=Cáipéis Mobipocket
-Name[gl]=Documento mobipocket
-Name[hu]=Mobipocket-dokumentum
-Name[ia]=Documento De Mobipocket
-Name[is]=Mobipocket skjal
-Name[it]=Documento Mobipocket
-Name[ja]=Mobipocket 文書
-Name[kk]=Mobipocket құжаты
-Name[ko]=Mobipocket 문서
-Name[lt]=Mobipocket dokumentas
-Name[lv]=Mobipocket dokuments
-Name[nb]=Mobipocket-dokument
-Name[nds]=Mobipocket-Dokment
-Name[nl]=Mobipocket-document
-Name[nn]=Mobipocket-dokument
-Name[pa]=ਮੋਬੀਪਾਕਟ ਡੌਕੂਮੈਂਟ
-Name[pl]=Dokument Mobipocket
-Name[pt]=Documento do Mobipocket
-Name[pt_BR]=Documento Mobipocket
-Name[ru]=Документ Mobipocket
-Name[sk]=Mobipocket dokument
-Name[sl]=Dokument Mobipocket
-Name[sq]=Dokument Mobipocket
-Name[sr]=Мобипокет
-Name[sr@ijekavian]=Мобипокет
-Name[sr@ijekavianlatin]=Mobipocket
-Name[sr@latin]=Mobipocket
-Name[sv]=Mobipocket-dokument
-Name[th]=เอกสาร Mobipocket
-Name[tr]=Mobipocket belgesi
-Name[uk]=Документ Mobipocket
-Name[x-test]=xxMobipocket documentxx
-Name[zh_CN]=Mobipocket 文档
-Name[zh_TW]=Mobipocket 文件
-Comment=Mobipocket backend for Okular
-Comment[ar]=خلفية Mobipocket لأوكلار
-Comment[ast]=Motor Mobipocket pa Okular
-Comment[bg]=Ядро на Okular за Mobipocket
-Comment[bs]=Pozadina Mobipocket-a za Okular
-Comment[ca]=Dorsal del Mobipocket per l'Okular
-Comment[ca@valencia]=Dorsal del Mobipocket per l'Okular
-Comment[cs]= Implementace Mobipocket pro Okular
-Comment[da]=Mobipocket-motor til Okular
-Comment[de]=Ein Anzeigemodul für Mobipocket-Dateien in Okular
-Comment[el]=Σύστημα υποστήριξης Mobipocket για το Okular
-Comment[en_GB]=Mobipocket backend for Okular
-Comment[es]=Motor Mobipocket para Okular
-Comment[et]=Okulari Mobipocketi taustaprogramm
-Comment[eu]=Okular-en Mobipocket motorra
-Comment[fi]=Mobipocket-taustaosa Okular-lukijalle
-Comment[fr]=Moteur « Mobipocket » pour Okular
-Comment[ga]=Inneall Mobipocket le haghaidh Okular
-Comment[gl]=Infraestrutura de mobipocket para Okular
-Comment[hu]=Mobipocket-bővítmény az Okularhoz
-Comment[ia]=Retro-administration per Mobipocket pro Okular
-Comment[is]=Mobipocket stuðningur fyrir Okular
-Comment[it]=Backend Mobipocket per Okular
-Comment[ja]=Okular の Mobipocket バックエンド
-Comment[kk]=Okular-дың Mobipocket тетігі
-Comment[ko]=Okular의 Mobipocket 백엔드
-Comment[lt]=Mobipocket programinė sąsaja, skirta Okular
-Comment[lv]=Mobipocket Okular aizmugure
-Comment[nb]=Mobipocket-motor for Okular
-Comment[nds]=Mobipocket-Hülpprogramm för Okular
-Comment[nl]=Mobipocket-backend voor Okular
-Comment[nn]=Mobipocket-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਮੋਬੀਪਾਕਟ ਬੈਕਐਂਡ
-Comment[pl]=Obsługa formatu Mobipocket dla Okulara
-Comment[pt]=Infra-estrutura do Mobipocket para o Okular
-Comment[pt_BR]=Infraestrutura Mobipocket para o Okular
-Comment[ru]=Модуль поддержки формата Mobipocket для Okular
-Comment[sk]=Backend Mobipocket pre Okular
-Comment[sl]=Hrbtenica za Mobipocket Okular
-Comment[sq]=Mbështetje Mobipocket për Okular
-Comment[sr]=Позадина Мобипокета за Окулар
-Comment[sr@ijekavian]=Позадина Мобипокета за Окулар
-Comment[sr@ijekavianlatin]=Pozadina Mobipocketa za Okular
-Comment[sr@latin]=Pozadina Mobipocketa za Okular
-Comment[sv]=Mobipocket-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์แฟ้มแบบ Mobipocket สำหรับโอกูลาร์
-Comment[tr]=Okular için Mobipocket arka ucu
-Comment[uk]=Додаток Mobipocket для Okular
-Comment[x-test]=xxMobipocket backend for Okularxx
-Comment[zh_CN]=Okular 的 Mobipocket 格式后端
-Comment[zh_TW]=Okular 的 Mobipocket 後端介面
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/x-mobipocket-ebook;
-X-KDE-Library=okularGenerator_mobi
-X-KDE-Priority=1
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=true
diff --git a/generators/mobipocket/libokularGenerator_mobi.json b/generators/mobipocket/libokularGenerator_mobi.json
new file mode 100644
index 0000000..c323015
--- /dev/null
+++ b/generators/mobipocket/libokularGenerator_mobi.json
@@ -0,0 +1,24 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "qbast@go2.pl",
+ "Name": "Jakub Stachowski"
+ }
+ ],
+ "Description": "A mobipocket backend",
+ "Id": "okular_mobi",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/x-mobipocket-ebook"
+ ],
+ "Name": "Mobipocket Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.1.1"
+ },
+ "X-KDE-Priority": 1,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": true
+}
diff --git a/generators/mobipocket/okularMobi.desktop b/generators/mobipocket/okularMobi.desktop
deleted file mode 100644
index 5a50a33..0000000
--- a/generators/mobipocket/okularMobi.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/x-mobipocket-ebook;
diff --git a/generators/ooo/CMakeLists.txt b/generators/ooo/CMakeLists.txt
index eb6f63c..a402dfa 100644
--- a/generators/ooo/CMakeLists.txt
+++ b/generators/ooo/CMakeLists.txt
@@ -25,18 +25,14 @@ set(okularGenerator_ooo_PART_SRCS
)
-add_library(okularGenerator_ooo MODULE ${okularGenerator_ooo_PART_SRCS})
+okular_add_generator(okularGenerator_ooo ${okularGenerator_ooo_PART_SRCS})
target_link_libraries(okularGenerator_ooo okularcore KF5::KIOCore KF5::Archive KF5::I18n KF5::Wallet KF5::KDELibs4Support ${MATH_LIB} Qt5::Xml)
if (Qca-qt5_FOUND)
target_link_libraries(okularGenerator_ooo okularcore qca-qt5)
endif ()
-install(TARGETS okularGenerator_ooo DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_ooo.desktop okularOoo.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_ooo.desktop org.kde.mobile.okular_ooo.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/ooo/generator_ooo.cpp b/generators/ooo/generator_ooo.cpp
index 23708c8..b4f493f 100644
--- a/generators/ooo/generator_ooo.cpp
+++ b/generators/ooo/generator_ooo.cpp
@@ -16,22 +16,7 @@
#include <kconfigdialog.h>
#include <kwallet.h>
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_ooo"),
- i18n( "OpenDocument Text Backend" ),
- QStringLiteral("0.2.4"),
- i18n( "A renderer for OpenDocument Text documents" ),
- KAboutLicense::GPL,
- i18n( "© 2006-2008 Tobias Koenig" )
- );
- aboutData.addAuthor( QStringLiteral( "Tobias Koenig" ), QString(), QStringLiteral("tokoe@kde.org") );
-
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( KOOOGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(KOOOGenerator, "libokularGenerator_ooo.json")
KOOOGenerator::KOOOGenerator( QObject *parent, const QVariantList &args )
: Okular::TextDocumentGenerator( new OOO::Converter, QStringLiteral("okular_ooo_generator_settings"), parent, args )
diff --git a/generators/ooo/libokularGenerator_ooo.desktop b/generators/ooo/libokularGenerator_ooo.desktop
deleted file mode 100644
index d769da3..0000000
--- a/generators/ooo/libokularGenerator_ooo.desktop
+++ /dev/null
@@ -1,127 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=OpenDocument format
-Name[ar]=نسق OpenDocument
-Name[ast]=Formatu OpenDocument
-Name[bg]=Формат OpenDocument
-Name[bs]=ODF
-Name[ca]=Format OpenDocument
-Name[ca@valencia]=Format OpenDocument
-Name[cs]=OpenDocument formát
-Name[da]=OpenDocument-format
-Name[de]=OpenDocument-Format
-Name[el]=Μορφή OpenDocument
-Name[en_GB]=OpenDocument format
-Name[eo]=OpenDocument formato
-Name[es]=Formato OpenDocument
-Name[et]=OpenDocumenti vorming
-Name[eu]=OpenDocument formatua
-Name[fi]=OpenDocument-muoto
-Name[fr]=Format « OpenDocument »
-Name[ga]=Formáid OpenDocument
-Name[gl]=Formato OpenDocument
-Name[hi]=ओपनडाक्यूमेंट फ़ॉर्मेट
-Name[hne]=ओपनडाक्यूमेंट फारमेट
-Name[hr]=Oblik OpenDocument
-Name[hu]=OpenDocument-beolvasó
-Name[ia]=Formato OpenDocument
-Name[is]=OpenDocument snið
-Name[it]=Formato OpenDocument
-Name[ja]=OpenDocument フォーマット
-Name[kk]=OpenDocument пішімі
-Name[km]=ទ្រង់ទ្រាយ OpenDocument
-Name[ko]=OpenDocument 형식
-Name[ku]=Teşeya OpenDocument
-Name[lt]=OpenDocument formatas
-Name[lv]=OpenDocument formāts
-Name[mr]=ओपनडोक्युमेंट फॉर्मेट
-Name[nb]=OpenDocument-format
-Name[nds]=OpenDocument-Formaat
-Name[ne]=खुला कागजात ढाँचा
-Name[nl]=OpenDocument-formaat
-Name[nn]=OpenDocument-format
-Name[pa]=OpenDocument ਫਾਰਮੈਟ
-Name[pl]=Format OpenDocument
-Name[pt]=Formato OpenDocument
-Name[pt_BR]=Formato OpenDocument
-Name[ro]=Format OpenDocument
-Name[ru]=Формат OpenDocument
-Name[sk]=OpenDocument formát
-Name[sl]=Oblika OpenDocument
-Name[sq]=OpenDocument format
-Name[sr]=ОДФ
-Name[sr@ijekavian]=ОДФ
-Name[sr@ijekavianlatin]=ODF
-Name[sr@latin]=ODF
-Name[sv]=OpenDocument-format
-Name[th]=แฟ้มแบบ OpenDocument
-Name[tr]=OpenDocument biçimi
-Name[ug]=OpenDocument پىچىمى
-Name[uk]=Формат OpenDocument
-Name[vi]=Tập tin OpenDocument
-Name[x-test]=xxOpenDocument formatxx
-Name[zh_CN]=开放文档格式
-Name[zh_TW]=OpenDocument 格式
-Comment=OpenDocument backend for Okular
-Comment[ar]=المنتهى الخلفي OpenDocument لأوكلار
-Comment[ast]=Motor OpenDocument pa Okular
-Comment[bg]=Ядро на Okular за OpenDocument
-Comment[bs]=Pozadina ODF-a za Okular
-Comment[ca]=Dorsal d'OpenDocument per a l'Okular
-Comment[ca@valencia]=Dorsal d'OpenDocument per a l'Okular
-Comment[cs]=Implementace OpenDocument pro Okular
-Comment[da]=OpenDocument-motor til Okular
-Comment[de]=Anzeigemodul für OpenDocument in Okular
-Comment[el]=Σύστημα υποστήριξης OpenDocument για το Okular
-Comment[en_GB]=OpenDocument backend for Okular
-Comment[es]=Motor OpenDocument para Okular
-Comment[et]=Okulari OpenDocumenti taustaprogramm
-Comment[eu]=Okular-en OpenDocument motorra
-Comment[fi]=OpenDocument-taustaosa Okularille
-Comment[fr]=Moteur « OpenDocument » pour Okular
-Comment[ga]=Inneall OpenDocument le haghaidh Okular
-Comment[gl]=Infraestrutura de OpenDocument para Okular
-Comment[hne]=ओकुलर बर ओपनडाक्यूमेंट बैकएन्ड
-Comment[hr]=Podrška za OpenDocument za Okular
-Comment[hu]=OpenDocument-bővítmény az Okularhoz
-Comment[ia]=Retro-administration per OpenDocument pro Okular
-Comment[is]=OpenDocument stuðningur fyrir Okular
-Comment[it]=Backend OpenDocument per Okular
-Comment[ja]=Okular の OpenDocument バックエンド
-Comment[kk]=Okular-дың OpenDocument тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ​របស់ OpenDocument សម្រាប់ Okular
-Comment[ko]=Okular의 OpenDocument 백엔드
-Comment[ku]=Binesazî ya OpenDocument ji bo Okular
-Comment[lt]=OpenDocument programinė sąsaja, skirta Okular
-Comment[lv]=OpenDocument Okular aizmugure
-Comment[mr]=ओक्युलर करिता ओपनडोक्युमेंट बॅकएन्ड
-Comment[nb]=OpenDocument-motor for Okular
-Comment[nds]=OpenDocument-Hülpprogramm för Okular
-Comment[nl]=OpenDocument-backend voor Okular
-Comment[nn]=OpenDocument-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ OpenDocument ਬੈਕਐਂਡ
-Comment[pl]=Obsługa formatu OpenDocument dla Okulara
-Comment[pt]=Infra-estrutura de OpenDocument para o Okular
-Comment[pt_BR]=Infraestrutura OpenDocument para o Okular
-Comment[ro]=Platformă OpenDocument pentru Okular
-Comment[ru]=Модуль поддержки формата OpenDocument для Okular
-Comment[sk]=Backend OpenDocument pre Okular
-Comment[sl]=Zaledje OpenDocument za Okular
-Comment[sq]=Mbështetje OpenDocument për Okular
-Comment[sr]=Позадина ОДФ‑а за Окулар
-Comment[sr@ijekavian]=Позадина ОДФ‑а за Окулар
-Comment[sr@ijekavianlatin]=Pozadina ODF‑a za Okular
-Comment[sr@latin]=Pozadina ODF‑a za Okular
-Comment[sv]=OpenDocument-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์แฟ้มแบบ OpenDocument สำหรับโอกูลาร์
-Comment[tr]=Okular için OpenDocument arka ucu
-Comment[uk]=Додаток OpenDocument для Okular
-Comment[x-test]=xxOpenDocument backend for Okularxx
-Comment[zh_CN]=Okular 的开放文档格式后端
-Comment[zh_TW]=Okular 的 OpenDocument 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/vnd.oasis.opendocument.text;
-X-KDE-Library=okularGenerator_ooo
-X-KDE-Priority=1
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=true
diff --git a/generators/ooo/libokularGenerator_ooo.json b/generators/ooo/libokularGenerator_ooo.json
new file mode 100644
index 0000000..41a2860
--- /dev/null
+++ b/generators/ooo/libokularGenerator_ooo.json
@@ -0,0 +1,24 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "tokoe@kde.org",
+ "Name": "Tobias Koenig"
+ }
+ ],
+ "Description": "A renderer for OpenDocument Text documents",
+ "Id": "okular_ooo",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/vnd.oasis.opendocument.text"
+ ],
+ "Name": "OpenDocument Text Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.2.4"
+ },
+ "X-KDE-Priority": 1,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": true
+}
diff --git a/generators/ooo/okularOoo.desktop b/generators/ooo/okularOoo.desktop
deleted file mode 100644
index f319c8c..0000000
--- a/generators/ooo/okularOoo.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/vnd.oasis.opendocument.text;
diff --git a/generators/plucker/CMakeLists.txt b/generators/plucker/CMakeLists.txt
index 9f1f61a..b87146b 100644
--- a/generators/plucker/CMakeLists.txt
+++ b/generators/plucker/CMakeLists.txt
@@ -20,16 +20,10 @@ set(okularGenerator_plucker_SRCS
generator_plucker.cpp
)
-
-add_library(okularGenerator_plucker MODULE ${okularGenerator_plucker_SRCS} ${qunpluck_SRCS})
+okular_add_generator(okularGenerator_plucker ${okularGenerator_plucker_SRCS} ${qunpluck_SRCS})
target_link_libraries(okularGenerator_plucker okularcore KF5::KIOCore KF5::I18n ${MATH_LIB} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
-install(TARGETS okularGenerator_plucker DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_plucker.desktop okularPlucker.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_plucker.desktop org.kde.mobile.okular_plucker.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-
diff --git a/generators/plucker/generator_plucker.cpp b/generators/plucker/generator_plucker.cpp
index 6850036..5d44593 100644
--- a/generators/plucker/generator_plucker.cpp
+++ b/generators/plucker/generator_plucker.cpp
@@ -20,22 +20,7 @@
#include <core/page.h>
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_plucker"),
- i18n( "Plucker Document Backend" ),
- QStringLiteral("0.1.1"),
- i18n( "A renderer for Plucker eBooks" ),
- KAboutLicense::GPL,
- i18n( "© 2007-2008 Tobias Koenig" )
- );
- aboutData.addAuthor( QStringLiteral("Tobias Koenig" ), QString(), QStringLiteral("tokoe@kde.org") );
-
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( PluckerGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(PluckerGenerator, "libokularGenerator_plucker.json")
static void calculateBoundingRect( QTextDocument *document, int startPosition, int endPosition,
QRectF &rect )
diff --git a/generators/plucker/libokularGenerator_plucker.desktop b/generators/plucker/libokularGenerator_plucker.desktop
deleted file mode 100644
index 24756b3..0000000
--- a/generators/plucker/libokularGenerator_plucker.desktop
+++ /dev/null
@@ -1,127 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Plucker document
-Name[ar]=مستند Plucker
-Name[ast]=Documentu Plucker
-Name[bg]=Докумет Plucker
-Name[bs]=Plucker dokument
-Name[ca]=Document Plucker
-Name[ca@valencia]=Document Plucker
-Name[cs]=Plucker dokument
-Name[da]=Plucker-dokument
-Name[de]=Plucker-Dokument
-Name[el]=Έγγραφο Plucker
-Name[en_GB]=Plucker document
-Name[eo]=Plucker dokumento
-Name[es]=Documento Plucker
-Name[et]=Pluckeri dokument
-Name[eu]=Plucker dokumentua
-Name[fi]=Plucker-tiedosto
-Name[fr]=Document « Plucker »
-Name[ga]=Cáipéis Plucker
-Name[gl]=Documento Plucker
-Name[hi]=प्लकर दस्तावेज़
-Name[hne]=प्लकर कागद
-Name[hr]=Dokument oblika Plucker
-Name[hu]=Plucker-dokumentum
-Name[ia]=Documento Plucker
-Name[is]=Plucker skjal
-Name[it]=Documento Plucker
-Name[ja]=Plucker 文書
-Name[kk]=Plucker құжаты
-Name[km]=ឯកសារ​ Plucker
-Name[ko]=Plucker 문서
-Name[ku]=Belgeya Plucker
-Name[lt]=Plucker dokumentas
-Name[lv]=Plucker dokuments
-Name[mr]=प्लकर दस्तऐवज
-Name[nb]=Plucker-dokument
-Name[nds]=Plucker-Dokment
-Name[ne]=प्लकर कागजात
-Name[nl]=Plucker-document
-Name[nn]=Plucker-dokument
-Name[pa]=ਪਲੱਕਰ ਡੌਕੂਮੈਂਟ
-Name[pl]=Dokument Pluckera
-Name[pt]=Documento do Plucker
-Name[pt_BR]=Documento Plucker
-Name[ro]=Document Plucker
-Name[ru]=Документ Plucker
-Name[sk]=Plucker dokument
-Name[sl]=Dokument Plucker
-Name[sq]=Plucker dokument
-Name[sr]=Плакер
-Name[sr@ijekavian]=Плакер
-Name[sr@ijekavianlatin]=Plucker
-Name[sr@latin]=Plucker
-Name[sv]=Plucker-dokument
-Name[th]=เอกสาร Plucker
-Name[tr]=Plucker belgesi
-Name[ug]=Plucker پۈتۈكى
-Name[uk]=Документ Plucker
-Name[vi]=Tập tin Plucker
-Name[x-test]=xxPlucker documentxx
-Name[zh_CN]=Plucker 文档
-Name[zh_TW]=Plucker 文件
-Comment=Plucker backend for Okular
-Comment[ar]=المنتهى الخلفي Plucker لأوكلار
-Comment[ast]=Motor Plucker pa Okular
-Comment[bg]=Ядро на Okular за Plucker
-Comment[bs]=Pozadina Plucker-a za Okular
-Comment[ca]=Dorsal de Plucker per a l'Okular
-Comment[ca@valencia]=Dorsal de Plucker per a l'Okular
-Comment[cs]=Implementace Plucker pro Okular
-Comment[da]=Plucker-motor til Okular
-Comment[de]=Anzeigemodul für Plucker in Okular
-Comment[el]=Σύστημα υποστήριξης Plucker για το Okular
-Comment[en_GB]=Plucker backend for Okular
-Comment[es]=Motor Plucker para Okular
-Comment[et]=Okulari Pluckeri taustaprogramm
-Comment[eu]=Okular-en Plucker motorra
-Comment[fi]=Plucker-taustaosa Okularille
-Comment[fr]=Moteur « Plucker » pour Okular
-Comment[ga]=Inneall Plucker le haghaidh Okular
-Comment[gl]=Infraestrutura de Plucker para Okular
-Comment[hne]=ओकुलर बर प्लकर बैकएन्ड
-Comment[hr]=Podrška za Plucker za Okular
-Comment[hu]=Plucker-bővítmény az Okularhoz
-Comment[ia]=Retro-administration per Plucker pro Okular
-Comment[is]=Plucker stuðningur fyrir Okular
-Comment[it]=Backend Plucker per Okular
-Comment[ja]=Okular の Plucker バックエンド
-Comment[kk]=Okular-дың Plucker тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ​​ Plucker សម្រាប់ Okular
-Comment[ko]=Okular의 Plucker 백엔드
-Comment[ku]=Binesazî ya Plucker ji bo Okular
-Comment[lt]=Plucker programinė sąsaja, skirta Okular
-Comment[lv]=Plucker Okular aizmugure
-Comment[mr]=ओक्युलर करिता प्लकर बॅकएन्ड
-Comment[nb]=Plucker-motor for Okular
-Comment[nds]=Plucker-Hülpprogramm för Okular
-Comment[nl]=Plucker-backend voor Okular
-Comment[nn]=Plucker-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਪਲੱਕਰ ਬੈਕਐਂਡ
-Comment[pl]=Obsługa formatu Plucker dla Okulara
-Comment[pt]=Infra-estrutura do Plucker para o Okular
-Comment[pt_BR]=Infraestrutura Plucker para o Okular
-Comment[ro]=Platformă Plucker pentru Okular
-Comment[ru]=Модуль поддержки формата Plucker для Okular
-Comment[sk]=Backend Plucker pre Okular
-Comment[sl]=Zaledje Plucker za Okular
-Comment[sq]=Mbështetje për Plucker në Okular
-Comment[sr]=Позадина Плакера за Окулар
-Comment[sr@ijekavian]=Позадина Плакера за Окулар
-Comment[sr@ijekavianlatin]=Pozadina Pluckera za Okular
-Comment[sr@latin]=Pozadina Pluckera za Okular
-Comment[sv]=Plucker-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์เอกสาร Plucker สำหรับโอกูลาร์
-Comment[tr]=Okular için Plucker arka ucu
-Comment[uk]=Додаток Plucker для Okular
-Comment[x-test]=xxPlucker backend for Okularxx
-Comment[zh_CN]=Okular 的 Plucker 格式后端
-Comment[zh_TW]=Okular 的 Plucker 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/prs.plucker;
-X-KDE-Library=okularGenerator_plucker
-X-KDE-Priority=1
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=false
diff --git a/generators/plucker/libokularGenerator_plucker.json b/generators/plucker/libokularGenerator_plucker.json
new file mode 100644
index 0000000..5a61181
--- /dev/null
+++ b/generators/plucker/libokularGenerator_plucker.json
@@ -0,0 +1,24 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "tokoe@kde.org",
+ "Name": "Tobias Koenig"
+ }
+ ],
+ "Description": "A renderer for Plucker eBooks",
+ "Id": "okular_plucker",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/prs.plucker"
+ ],
+ "Name": "Plucker Document Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.1.1"
+ },
+ "X-KDE-Priority": 1,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": false
+}
diff --git a/generators/plucker/okularPlucker.desktop b/generators/plucker/okularPlucker.desktop
deleted file mode 100644
index 17c5704..0000000
--- a/generators/plucker/okularPlucker.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/prs.plucker;
diff --git a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt
index a696ffb..740b6fd 100644
--- a/generators/poppler/CMakeLists.txt
+++ b/generators/poppler/CMakeLists.txt
@@ -33,15 +33,11 @@ ki18n_wrap_ui(okularGenerator_poppler_PART_SRCS
kconfig_add_kcfg_files(okularGenerator_poppler_PART_SRCS conf/pdfsettings.kcfgc )
-add_library(okularGenerator_poppler MODULE ${okularGenerator_poppler_PART_SRCS})
+okular_add_generator(okularGenerator_poppler ${okularGenerator_poppler_PART_SRCS})
target_link_libraries(okularGenerator_poppler ${POPPLER_LIBRARY} okularcore KF5::I18n KF5::KDELibs4Support Qt5::Xml)
-install(TARGETS okularGenerator_poppler DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_poppler.desktop okularPoppler.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_pdf.desktop org.kde.mobile.okular_pdf.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
index 90db80a..bce7a56 100644
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@@ -479,20 +479,7 @@ static QLinkedList<Okular::ObjectRect*> generateLinks( const QList<Poppler::Link
* in async thread and 2) doing the 'heavy' print operation.
*/
-static KAboutData createAboutData()
-{
- KAboutData aboutData( QStringLiteral("okular_poppler"),
- i18n( "PDF Backend" ),
- QStringLiteral("0.6.5"),
- i18n( "A PDF file renderer" ),
- KAboutLicense::GPL,
- i18n( "© 2005-2008 Albert Astals Cid" )
- );
- aboutData.addAuthor( i18n( "Albert Astals Cid" ), QString(), QStringLiteral("aacid@kde.org") );
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN(PDFGenerator, createAboutData())
+OKULAR_EXPORT_PLUGIN(PDFGenerator, "libokularGenerator_poppler.json")
static void PDFGeneratorPopplerDebugFunction(const QString &message, const QVariant &closure)
{
diff --git a/generators/poppler/libokularGenerator_poppler.desktop b/generators/poppler/libokularGenerator_poppler.desktop
deleted file mode 100644
index 7b7c778..0000000
--- a/generators/poppler/libokularGenerator_poppler.desktop
+++ /dev/null
@@ -1,127 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Poppler
-Name[ar]=بوبلِر
-Name[ast]=Poppler
-Name[bg]=Poppler
-Name[bs]=Poppler
-Name[ca]=Poppler
-Name[ca@valencia]=Poppler
-Name[cs]=Poppler
-Name[da]=Poppler
-Name[de]=Poppler
-Name[el]=Poppler
-Name[en_GB]=Poppler
-Name[eo]=Poppler
-Name[es]=Poppler
-Name[et]=Poppler
-Name[eu]=Poppler
-Name[fi]=Poppler
-Name[fr]=Poppler
-Name[ga]=Poppler
-Name[gl]=Poppler
-Name[hi]=पॉपलर
-Name[hne]=पापलर
-Name[hr]=Poppler
-Name[hu]=Poppler-beolvasó
-Name[ia]=Poppler
-Name[is]=Poppler
-Name[it]=Poppler
-Name[ja]=Poppler
-Name[kk]=Poppler
-Name[km]=Poppler
-Name[ko]=Poppler
-Name[ku]=Poppler
-Name[lt]=Poppler
-Name[lv]=Poppler
-Name[mr]=Poppler
-Name[nb]=Poppler
-Name[nds]=Poppler
-Name[ne]=पप्प्लर
-Name[nl]=Poppler
-Name[nn]=Poppler
-Name[pa]=ਪੋਪੱਲਰ
-Name[pl]=Poppler
-Name[pt]=Poppler
-Name[pt_BR]=Poppler
-Name[ro]=Poppler
-Name[ru]=Poppler
-Name[sk]=Poppler
-Name[sl]=Poppler
-Name[sq]=Poppler
-Name[sr]=Поплер
-Name[sr@ijekavian]=Поплер
-Name[sr@ijekavianlatin]=Poppler
-Name[sr@latin]=Poppler
-Name[sv]=Poppler
-Name[th]=Poppler
-Name[tr]=Poppler
-Name[ug]=Poppler
-Name[uk]=Poppler
-Name[vi]=Poppler
-Name[x-test]=xxPopplerxx
-Name[zh_CN]=Poppler
-Name[zh_TW]=Poppler
-Comment=PDF backend for Okular using poppler
-Comment[ar]=المنتهى الخلفي PDF لأوكلار
-Comment[ast]=Motor PDF pa Okular qu'usa Poppler
-Comment[bg]=Ядро на Okular за PDF, използващо poppler
-Comment[bs]=Pozadina PDF-a za Okular koristeći Poppler
-Comment[ca]=Dorsal de PDF per a l'Okular que empra el «poppler»
-Comment[ca@valencia]=Dorsal de PDF per a l'Okular emprant el poppler
-Comment[cs]=Implementace PDF pro Okular používající poppler
-Comment[da]=PDF-motor til Okular som bruger poppler
-Comment[de]=Anzeigemodul für PDF (mittels Poppler) in Okular
-Comment[el]=Σύστημα υποστήριξης PDF για το Okular με χρήση του poppler
-Comment[en_GB]=PDF backend for Okular using poppler
-Comment[es]=Motor PDF para Okular que usa Poppler
-Comment[et]=Okulari PDF-i taustaprogramm poppleri vahendusel
-Comment[eu]=Okular-en PDF motorra poppler erabiliz
-Comment[fi]=Poppler-kirjastoa käyttävä PDF-taustaosa Okularille
-Comment[fr]=Moteur PDF pour Okular, utilisant « poppler »
-Comment[ga]=Inneall PDF a úsáideann poppler le haghaidh Okular
-Comment[gl]=Infraestrutura de PDF mediante poppler para Okular
-Comment[hne]=ओकुलर बर पापलर के परयोग करत पीडीएफ बैकएन्ड
-Comment[hr]=Podrška za PDF kroz poppler za Okular
-Comment[hu]=Poppler-alapú PDF-kezelő bővítmény az Okularhoz
-Comment[ia]=Retro-administration per PDF pro Okular usante poppler
-Comment[is]=PDF stuðningur fyrir Okular í gegnum Poppler
-Comment[it]=Backend PDF per Okular che utilizza poppler
-Comment[ja]=Okular の PDF バックエンド (poppler を使用)
-Comment[kk]=Okular-дың poppler-ді қолданатын PDF тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ​របស់ PDF សម្រាប់ Okular ដោយ​ប្រើ poppler
-Comment[ko]=poppler를 사용하는 Okular PDF 백엔드
-Comment[ku]=Binesazî ya PDF ji bo Okular bi bikaranîna poppler
-Comment[lt]=PDF programinė sąsaja, skirta Okular, naudojanti „poppler“
-Comment[lv]=PDF Okular aizmugure, lietojot poppler
-Comment[mr]=ओक्युलर करिता poppler वापरणारे PDF बॅकएन्ड
-Comment[nb]=PDF-motor (som bruker poppler) for Okular
-Comment[nds]=PDF-Hülpprogramm för Okular, bruukt Poppler
-Comment[nl]=PDF-backend voor Okular, gebruik makend van Poppler
-Comment[nn]=PDF-motor (som brukar poppler) for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਪੋਪਲਰ ਦੀ ਵਰਤੋਂ ਕਰਕੇ PDF ਬੈਕਐਂਡ
-Comment[pl]=Obsługa PDF dla Okulara przy użyciu poppler
-Comment[pt]=Infra-estrutura de PDF para o Okular, usando o poppler
-Comment[pt_BR]=Infraestrutura PDF para o Okular usando o poppler
-Comment[ro]=Platformă PDF pentru Okular utilizînd poppler
-Comment[ru]=Модуль поддержки формата PDF для Okular посредством poppler
-Comment[sk]=Backend PDF pre Okular použitím poppler
-Comment[sl]=Zaledje PDF za Okular (uporablja Poppler)
-Comment[sq]=Mbështetje për PDF në Okular duke përdorur poppler
-Comment[sr]=Позадина ПДФ‑а за Окулар, кроз Поплер
-Comment[sr@ijekavian]=Позадина ПДФ‑а за Окулар, кроз Поплер
-Comment[sr@ijekavianlatin]=Pozadina PDF‑a za Okular, kroz Poppler
-Comment[sr@latin]=Pozadina PDF‑a za Okular, kroz Poppler
-Comment[sv]=PDF-gränssnitt för Okular som använder Poppler
-Comment[th]=แบ็กเอนด์เอกสาร PDF สำหรับโอกูลาร์ โดยใช้ Poppler
-Comment[tr]=Okular için poppler kullanan PDF arka ucu
-Comment[uk]=Додаток PDF для Okular з використанням poppler
-Comment[x-test]=xxPDF backend for Okular using popplerxx
-Comment[zh_CN]=使用 poppler 的 Okular PDF 格式后端
-Comment[zh_TW]=Okular 使用 poppler 的 PDF 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/x-pdf;application/pdf;application/x-wwf;
-X-KDE-Library=okularGenerator_poppler
-X-KDE-Priority=1
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=true
diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json
new file mode 100644
index 0000000..53d7dc3
--- /dev/null
+++ b/generators/poppler/libokularGenerator_poppler.json
@@ -0,0 +1,26 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "aacid@kde.org",
+ "Name": "Albert Astals Cid"
+ }
+ ],
+ "Description": "A PDF file renderer",
+ "Id": "okular_poppler",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/x-pdf",
+ "application/pdf",
+ "application/x-wwf"
+ ],
+ "Name": "PDF Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.6.5"
+ },
+ "X-KDE-Priority": 1,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": true
+}
diff --git a/generators/poppler/okularPoppler.desktop b/generators/poppler/okularPoppler.desktop
deleted file mode 100644
index a1ef1d8..0000000
--- a/generators/poppler/okularPoppler.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/x-pdf;application/pdf;application/x-gzpdf;application/x-bzpdf;application/x-wwf;
diff --git a/generators/spectre/CMakeLists.txt b/generators/spectre/CMakeLists.txt
index d7eb0e2..25883a8 100644
--- a/generators/spectre/CMakeLists.txt
+++ b/generators/spectre/CMakeLists.txt
@@ -21,16 +21,12 @@ ki18n_wrap_ui(okularGenerator_ghostview_SRCS
kconfig_add_kcfg_files(okularGenerator_ghostview_SRCS conf/gssettings.kcfgc )
-add_library(okularGenerator_ghostview MODULE ${okularGenerator_ghostview_SRCS})
+okular_add_generator(okularGenerator_ghostview MODULE ${okularGenerator_ghostview_SRCS})
target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} KF5::KDELibs4Support Qt5::Xml)
-install(TARGETS okularGenerator_ghostview DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_ghostview.desktop okularGhostview.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_ghostview.desktop org.kde.mobile.okular_ghostview.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
ecm_install_icons(ICONS 16-apps-okular-gv.png 32-apps-okular-gv.png DESTINATION ${KDE_INSTALL_DATADIR}/okular/icons)
diff --git a/generators/spectre/generator_ghostview.cpp b/generators/spectre/generator_ghostview.cpp
index e2275af..248aee0 100644
--- a/generators/spectre/generator_ghostview.cpp
+++ b/generators/spectre/generator_ghostview.cpp
@@ -37,22 +37,7 @@
#include "spectre_debug.h"
#include "rendererthread.h"
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_ghostview"),
- i18n( "PS Backend" ),
- QStringLiteral("0.1.7"),
- i18n( "A PostScript file renderer." ),
- KAboutLicense::GPL,
- i18n( "© 2007-2008 Albert Astals Cid" ),
- i18n( "Based on the Spectre library." )
- );
- aboutData.addAuthor( i18n( "Albert Astals Cid" ), QString(), QStringLiteral("aacid@kde.org") );
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN(GSGenerator, createAboutData())
+OKULAR_EXPORT_PLUGIN(GSGenerator, "libokularGenerator_ghostview.json")
GSGenerator::GSGenerator( QObject *parent, const QVariantList &args ) :
Okular::Generator( parent, args ),
diff --git a/generators/spectre/libokularGenerator_ghostview.desktop b/generators/spectre/libokularGenerator_ghostview.desktop
deleted file mode 100644
index 552459d..0000000
--- a/generators/spectre/libokularGenerator_ghostview.desktop
+++ /dev/null
@@ -1,127 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Ghostscript
-Name[ar]=غوست سكريبت
-Name[ast]=Ghostscript
-Name[bg]=Ghostscript
-Name[bs]=Ghostscript
-Name[ca]=Ghostscript
-Name[ca@valencia]=Ghostscript
-Name[cs]=Ghostscript
-Name[da]=Ghostscript
-Name[de]=Ghostscript
-Name[el]=Ghostscript
-Name[en_GB]=Ghostscript
-Name[eo]=Ghostscript
-Name[es]=Ghostscript
-Name[et]=Ghostscript
-Name[eu]=Ghostscript
-Name[fi]=Ghostscript
-Name[fr]=Ghostscript
-Name[ga]=Ghostscript
-Name[gl]=Ghostscript
-Name[hi]=घोस्ट-स्क्रिप्ट
-Name[hne]=घोस्ट-स्क्रिप्ट
-Name[hr]=Ghostscript
-Name[hu]=Ghostscript
-Name[ia]=Ghostscript
-Name[is]=Ghostscript
-Name[it]=Ghostscript
-Name[ja]=Ghostscript
-Name[kk]=Ghostscript
-Name[km]=Ghostscript
-Name[ko]=Ghostscript
-Name[ku]=Ghostscript
-Name[lt]=Ghostscript
-Name[lv]=Ghostscript
-Name[mr]=Ghostscript
-Name[nb]=Ghostscript
-Name[nds]=Ghostscript
-Name[ne]=घोस्टस्क्रिप्ट
-Name[nl]=Ghostscript
-Name[nn]=Ghostscript
-Name[pa]=ਗੋਸਟ-ਸਕ੍ਰਿਪਟ
-Name[pl]=Ghostscript
-Name[pt]=GhostScript
-Name[pt_BR]=Ghostscript
-Name[ro]=Ghostscript
-Name[ru]=Ghostscript
-Name[sk]=Ghostscript
-Name[sl]=Ghostscript
-Name[sq]=Ghostscript
-Name[sr]=Гостскрипт
-Name[sr@ijekavian]=Гостскрипт
-Name[sr@ijekavianlatin]=GhostScript
-Name[sr@latin]=GhostScript
-Name[sv]=Ghostscript
-Name[th]=เอกสาร Ghostscript
-Name[tr]=Ghostscript
-Name[ug]=Ghostscript
-Name[uk]=Ghostscript
-Name[vi]=Ghostscript
-Name[x-test]=xxGhostscriptxx
-Name[zh_CN]=GhostScript 信息
-Name[zh_TW]=Ghostscript
-Comment=Ghostscript PS/PDF backend for Okular
-Comment[ar]=المنتهى الخلفي Ghostscript PS/PDF لأوكلار
-Comment[ast]=Motor PS/PDF de Ghostscript pa Okular
-Comment[bg]=Ядро на Okular за Ghostscript PS/PDF
-Comment[bs]=Ghostscript PS-a/PDF-a pozadina za Okular
-Comment[ca]=Dorsal de Ghostscript PS/PDF per a l'Okular
-Comment[ca@valencia]=Dorsal de Ghostscript PS/PDF per a l'Okular
-Comment[cs]=Implementace Ghostscript PS/PDF pro Okular
-Comment[da]=Ghostscript PS/PDF-motor til Okular
-Comment[de]=Anzeigemodul für Ghostscript PS/PDF in Okular
-Comment[el]=Σύστημα υποστήριξης Ghostscript PS/PDF για το Okular
-Comment[en_GB]=Ghostscript PS/PDF backend for Okular
-Comment[es]=Motor PS/PDF de Ghostscript para Okular
-Comment[et]=Okulari Ghostscript PS/PDF-i taustaprogramm
-Comment[eu]=Okular-en Ghostscript PS/PDF motorra
-Comment[fi]=Ghostscript-pohjainen PS/PDF-taustaosa Okularille
-Comment[fr]=Moteur « Ghostscript PS / PDF » pour Okular
-Comment[ga]=Inneall PS/PDF Ghostscript le haghaidh Okular
-Comment[gl]=Infraestrutura de Ghostscript PS/PDF para Okular
-Comment[hne]=ओकुलर बर घोस्टस्क्रिप्ट पीएस/पीडीएफ बैकएन्ड
-Comment[hr]=Podrška za Ghostscript-PS/PDF za Okular
-Comment[hu]=Ghostscript PS/PDF-bővítmény az Okularhoz
-Comment[ia]=Retro-administration per PS/PDF con Ghostscript pro Okular
-Comment[is]=Ghostscript PS/PDF stuðningur fyrir Okular
-Comment[it]=Backend Ghostscript PS/PDF per Okular
-Comment[ja]=Okular の Ghostscript PS/PDF バックエンド
-Comment[kk]=Okular-дың Ghostscript PS/PDF тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ Ghostscript PS/PDF សម្រាប់ Okular
-Comment[ko]=Okular의 Ghostscript PS/PDF 백엔드
-Comment[ku]=Binesazî ya Ghostscript PS/PDF ji bo Okular
-Comment[lt]=Ghostscript PS/PDF programinė sąsaja, skirta Okular
-Comment[lv]=Ghostscript PS/PDF Okular aizmugure
-Comment[mr]=ओक्युलर करिता Ghostscript PS/PDF बॅकएन्ड
-Comment[nb]=Ghostscript PS- og PDF-motor for Okular
-Comment[nds]=PostScript/PDF-Hülpprogramm Ghostview för Okular
-Comment[nl]=GhostScript PS/PDF-backend voor Okular
-Comment[nn]=Ghostscript PS- og PDF-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਗੋਸਟ-ਸਕ੍ਰਿਪਟ PS/PDF ਬੈਕਐਂਡ
-Comment[pl]=Obsługa Ghostscript PS/PDF dla Okulara
-Comment[pt]=Infra-estrutura de PS/PDF do Ghostscript para o Okular
-Comment[pt_BR]=Infraestrutura Ghostscript PS/PDF para o Okular
-Comment[ro]=Platformă PS/PDF Ghostscript pentru Okular
-Comment[ru]=Модуль поддержки форматов PS/PDF для Okular посредством Ghostscript
-Comment[sk]=Backend Ghostscript PS/PDF pre Okular
-Comment[sl]=Zaledje Ghostscript za PS in PDF za Okular
-Comment[sq]=Ghostscript PS/PDF mbështetje për Okular
-Comment[sr]=Позадина ПС‑а и ПДФ‑а за Окулар, кроз Гостскрипт
-Comment[sr@ijekavian]=Позадина ПС‑а и ПДФ‑а за Окулар, кроз Гостскрипт
-Comment[sr@ijekavianlatin]=Pozadina PS‑a i PDF‑a za Okular, kroz GhostScript
-Comment[sr@latin]=Pozadina PS‑a i PDF‑a za Okular, kroz GhostScript
-Comment[sv]=Ghostscript PS/PDF-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์เอกสาร Ghostscript PS/PDF สำหรับโอกูลาร์
-Comment[tr]=Okular için Ghostscript PS/PDF arka ucu
-Comment[uk]=Додаток Ghostscript PS/PDF для Okular
-Comment[x-test]=xxGhostscript PS/PDF backend for Okularxx
-Comment[zh_CN]=Okular 的 Ghostscript PS/PDF 格式后端
-Comment[zh_TW]=Okular 的 Ghostscript PS/PDF 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/postscript;image/x-eps;
-X-KDE-Library=okularGenerator_ghostview
-X-KDE-Priority=2
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=true
diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json
new file mode 100644
index 0000000..2a44001
--- /dev/null
+++ b/generators/spectre/libokularGenerator_ghostview.json
@@ -0,0 +1,25 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "aacid@kde.org",
+ "Name": "Albert Astals Cid"
+ }
+ ],
+ "Description": "A PostScript file renderer based on the Spectre library",
+ "Id": "okular_ghostview",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/postscript",
+ "image/x-eps"
+ ],
+ "Name": "PS Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.1.7"
+ },
+ "X-KDE-Priority": 2,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": true
+}
diff --git a/generators/spectre/okularGhostview.desktop b/generators/spectre/okularGhostview.desktop
deleted file mode 100644
index d5bd725..0000000
--- a/generators/spectre/okularGhostview.desktop
+++ /dev/null
@@ -1,67 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=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/CMakeLists.txt b/generators/tiff/CMakeLists.txt
index 8960308..b451803 100644
--- a/generators/tiff/CMakeLists.txt
+++ b/generators/tiff/CMakeLists.txt
@@ -10,12 +10,9 @@ set(okularGenerator_tiff_SRCS
generator_tiff.cpp
)
-add_library(okularGenerator_tiff MODULE ${okularGenerator_tiff_SRCS})
+okular_add_generator(okularGenerator_tiff ${okularGenerator_tiff_SRCS})
target_link_libraries(okularGenerator_tiff okularcore ${TIFF_LIBRARIES} KF5::KDELibs4Support)
-install(TARGETS okularGenerator_tiff DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
########### install files ###############
-install( FILES libokularGenerator_tiff.desktop okularTiff.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_tiff.desktop org.kde.mobile.okular_tiff.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/tiff/generator_tiff.cpp b/generators/tiff/generator_tiff.cpp
index cf4f276..3835cd3 100644
--- a/generators/tiff/generator_tiff.cpp
+++ b/generators/tiff/generator_tiff.cpp
@@ -158,22 +158,7 @@ static Okular::Rotation readTiffRotation( TIFF *tiff )
return ret;
}
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_tiff"),
- i18n( "TIFF Backend" ),
- QStringLiteral("0.2.4"),
- i18n( "A TIFF backend" ),
- KAboutLicense::GPL,
- i18n( "© 2006-2008 Pino Toscano" ),
- i18nc( "This represents the libtiff version, as string with copyrights as well; can be left as-is.", "%1" ).arg( TIFFGetVersion() )
- );
- aboutData.addAuthor( QStringLiteral( "Pino Toscano" ), QString(), QStringLiteral("pino@kde.org") );
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( TIFFGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(TIFFGenerator, "libokularGenerator_tiff.json")
TIFFGenerator::TIFFGenerator( QObject *parent, const QVariantList &args )
: Okular::Generator( parent, args ),
diff --git a/generators/tiff/libokularGenerator_tiff.desktop b/generators/tiff/libokularGenerator_tiff.desktop
deleted file mode 100644
index 8ca968f..0000000
--- a/generators/tiff/libokularGenerator_tiff.desktop
+++ /dev/null
@@ -1,123 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Okular TIFF Library
-Name[ar]=مكتبة TIFF لأوكلار
-Name[ast]=Biblioteca TIFF d'Okular
-Name[bg]=Библиотека на Okular за TIFF
-Name[bs]=Okular TIFF biblioteka
-Name[ca]=Biblioteca TIFF de l'Okular
-Name[ca@valencia]=Biblioteca TIFF de l'Okular
-Name[cs]=Knihovna TIFF pro Okular
-Name[da]=TIFF-bibliotek til Okular
-Name[de]=TIFF-Bibliothek für Okular
-Name[el]=Βιβλιοθήκη TIFF του Okular
-Name[en_GB]=Okular TIFF Library
-Name[es]=Biblioteca TIFF de Okular
-Name[et]=Okulari TIFF-i teek
-Name[eu]=Okular TIFF liburutegia
-Name[fi]=TIFF-kirjasto Okularille
-Name[fr]=Librairie « TIFF » pour Okular
-Name[ga]=Leabharlann TIFF Okular
-Name[gl]=Biblioteca TIFF de Okular
-Name[hne]=ओकुलर टिफ लाइब्रेरी
-Name[hr]=Biblioteka u Okularu za TIFF
-Name[hu]=Okular TIFF-kezelő programkönyvtár
-Name[ia]=Bibliotheca de TIFF de Okular
-Name[is]=Okular TIFF skráasafn
-Name[it]=Libreria TIFF di Okular
-Name[ja]=Okular TIFF ライブラリ
-Name[kk]=Okular TIFF жиын файлы
-Name[km]=បណ្ណាល័យ Okular TIFF
-Name[ko]=Okular TIFF 라이브러리
-Name[ku]=Pirtûkxaneya Okular TIFF
-Name[lt]=Okular TIFF biblioteka
-Name[lv]=Okular TIFF bibliotēka
-Name[mr]=ओक्युलर TIFF लायब्ररी
-Name[nb]=Okular TIFF-bibliotek
-Name[nds]=TIFF-Bibliotheek för Okular
-Name[nl]=Okular TIFF-bibliotheek
-Name[nn]=Okular TIFF-bibliotek
-Name[pa]=ਓਕੁਲਾਰ TIFF ਲਾਇਬਰੇਰੀ
-Name[pl]=Biblioteka TIFF Okulara
-Name[pt]=Biblioteca de TIFF do Okular
-Name[pt_BR]=Biblioteca TIFF para o Okular
-Name[ro]=Bibliotecă TIFF pentru Okular
-Name[ru]=Библиотека TIFF для Okular
-Name[sk]=Knižnica TIFF pre Okular
-Name[sl]=Okularjeva knjižnica za TIFF
-Name[sq]=Okular TIFF Librari
-Name[sr]=Окуларова ТИФФ библиотека
-Name[sr@ijekavian]=Окуларова ТИФФ библиотека
-Name[sr@ijekavianlatin]=Okularova TIFF biblioteka
-Name[sr@latin]=Okularova TIFF biblioteka
-Name[sv]=Okular TIFF-bibliotek
-Name[th]=ไลบรารีจัดการแฟ้ม TIFF สำหรับโอกูลาร์
-Name[tr]=Okular için TIFF Kitaplığı
-Name[ug]=Okular TIFF ئامبىرى
-Name[uk]=Бібліотека TIFF для Okular
-Name[x-test]=xxOkular TIFF Libraryxx
-Name[zh_CN]=Okular TIFF 库
-Name[zh_TW]=Okular TIFF 函式庫
-Comment=TIFF backend for Okular
-Comment[ar]=المنتهى الخلفي TIFF لأوكلار
-Comment[ast]=Motor TIFF pa Okular
-Comment[bg]=Ядро на Okular за TIFF
-Comment[bs]=Pozadina TIFF-a za Okular
-Comment[ca]=Dorsal de TIFF per a l'Okular
-Comment[ca@valencia]=Dorsal de TIFF per a l'Okular
-Comment[cs]= Implementace TIFF pro Okular
-Comment[da]=TIFF-motor til Okular
-Comment[de]=Anzeigemodul für TIFF in Okular
-Comment[el]=Σύστημα υποστήριξης TIFF για το Okular
-Comment[en_GB]=TIFF backend for Okular
-Comment[es]=Motor TIFF para Okular
-Comment[et]=Okulari TIFF-i taustaprogramm
-Comment[eu]=Okular-en TIFF motorra
-Comment[fi]=TIFF-taustaosa Okularille
-Comment[fr]=Moteur « TIFF » pour Okular
-Comment[ga]=Inneall TIFF le haghaidh Okular
-Comment[gl]=Infraestrutura de TIFF para Okular
-Comment[hne]=ओकुलर बर टिफ बैकएन्ड
-Comment[hr]=Podrška za TIFF za Okular
-Comment[hu]=TIFF-bővítmény az Okularhoz
-Comment[ia]=Retro-administration per TIFF pro Okular
-Comment[is]=TIFF stuðningur fyrir Okular
-Comment[it]=Backend TIFF per Okular
-Comment[ja]=Okular の TIFF バックエンド
-Comment[kk]=Okular-дың TIFF тетігі
-Comment[km]=ផ្នែក​ខាង​ក្រោយ​ TIFF សម្រាប់ Okular
-Comment[ko]=Okular의 TIFF 백엔드
-Comment[ku]=Binesazî ya TIFF ji bo Okular
-Comment[lt]=TIFF programinė sąsaja, skirta Okular
-Comment[lv]=TIFF Okular aizmugure
-Comment[mr]=ओक्युलर करिता TIFF बॅकएन्ड
-Comment[nb]=TIFF-motor for Okular
-Comment[nds]=TIFF-Hülpprogramm för Okular
-Comment[nl]=TIFF-backend voor Okular
-Comment[nn]=TIFF-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ TIFF ਬੈਕਐਂਡ
-Comment[pl]=Obsługa TIFF dla Okulara
-Comment[pt]=Infra-estrutura de TIFF para o Okular
-Comment[pt_BR]=Infraestrutura TIFF para o Okular
-Comment[ro]=Platformă TIFF pentru Okular
-Comment[ru]=Модуль поддержки формата TIFF для Okular
-Comment[sk]=Backend TIFF pre Okular
-Comment[sl]=Zaledje za TIFF za Okular
-Comment[sq]=Mbështetje TIFF për Okular
-Comment[sr]=Позадина ТИФФ‑а за Окулар
-Comment[sr@ijekavian]=Позадина ТИФФ‑а за Окулар
-Comment[sr@ijekavianlatin]=Pozadina TIFF‑a za Okular
-Comment[sr@latin]=Pozadina TIFF‑a za Okular
-Comment[sv]=TIFF-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์จัดการแฟ้ม TIFF สำหรับโอกูลาร์
-Comment[tr]=Okular için TIFF arka ucu
-Comment[uk]=Додаток TIFF для Okular
-Comment[x-test]=xxTIFF backend for Okularxx
-Comment[zh_CN]=Okular 的 TIFF 格式后端
-Comment[zh_TW]=Okular TIFF 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=image/tiff;
-X-KDE-Library=okularGenerator_tiff
-X-KDE-Priority=4
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=false
diff --git a/generators/tiff/libokularGenerator_tiff.json b/generators/tiff/libokularGenerator_tiff.json
new file mode 100644
index 0000000..7d869d6
--- /dev/null
+++ b/generators/tiff/libokularGenerator_tiff.json
@@ -0,0 +1,24 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "pino@kde.org",
+ "Name": "Pino Toscano"
+ }
+ ],
+ "Description": "A TIFF backend",
+ "Id": "okular_tiff",
+ "License": "GPL",
+ "MimeTypes": [
+ "image/tiff"
+ ],
+ "Name": "TIFF Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.2.4"
+ },
+ "X-KDE-Priority": 4,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": false
+}
diff --git a/generators/tiff/okularTiff.desktop b/generators/tiff/okularTiff.desktop
deleted file mode 100644
index cfc2b39..0000000
--- a/generators/tiff/okularTiff.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=image/tiff;
diff --git a/generators/txt/CMakeLists.txt b/generators/txt/CMakeLists.txt
index b095f29..ad79abe 100644
--- a/generators/txt/CMakeLists.txt
+++ b/generators/txt/CMakeLists.txt
@@ -12,13 +12,10 @@ set(okularGenerator_txt_SRCS
)
-add_library(okularGenerator_txt MODULE ${okularGenerator_txt_SRCS})
+okular_add_generator(okularGenerator_txt ${okularGenerator_txt_SRCS})
target_link_libraries(okularGenerator_txt okularcore Qt5::Core KF5::I18n)
-install(TARGETS okularGenerator_txt DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
########### install files ###############
-install( FILES libokularGenerator_txt.desktop okularTxt.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_txt.desktop org.kde.mobile.okular_txt.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/txt/generator_txt.cpp b/generators/txt/generator_txt.cpp
index cffe847..a3b8db6 100644
--- a/generators/txt/generator_txt.cpp
+++ b/generators/txt/generator_txt.cpp
@@ -15,21 +15,7 @@
#include <klocalizedstring.h>
#include <KConfigDialog>
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_txt"),
- i18n( "Txt Backend" ),
- QStringLiteral("0.1"),
- i18n( "Txt backend." ),
- KAboutLicense::GPL,
- i18n( "© 2013 Azat Khuzhin" )
- );
- aboutData.addAuthor( QStringLiteral( "Azat Khuzhin" ), QString(), QStringLiteral("a3at.mail@gmail.com") );
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN(TxtGenerator, createAboutData())
+OKULAR_EXPORT_PLUGIN(TxtGenerator, "libokularGenerator_txt.json")
TxtGenerator::TxtGenerator(QObject *parent, const QVariantList &args)
: Okular::TextDocumentGenerator(new Txt::Converter, QStringLiteral("okular_txt_generator_settings") , parent, args)
diff --git a/generators/txt/libokularGenerator_txt.desktop b/generators/txt/libokularGenerator_txt.desktop
deleted file mode 100644
index df6b062..0000000
--- a/generators/txt/libokularGenerator_txt.desktop
+++ /dev/null
@@ -1,97 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=txt
-Name[bg]=txt
-Name[bs]=txt
-Name[ca]=txt
-Name[ca@valencia]=txt
-Name[cs]=txt
-Name[da]=txt
-Name[de]=Text
-Name[el]=txt
-Name[en_GB]=txt
-Name[es]=txt
-Name[et]=txt
-Name[fi]=txt
-Name[fr]=txt
-Name[gl]=txt
-Name[hu]=txt
-Name[ia]=txt
-Name[is]=txt
-Name[it]=testo
-Name[ja]=txt
-Name[kk]=txt
-Name[ko]=txt
-Name[lt]=txt
-Name[mr]=txt
-Name[nb]=tekst
-Name[nds]=TXT
-Name[nl]=tekst
-Name[pa]=txt
-Name[pl]=txt
-Name[pt]=txt
-Name[pt_BR]=txt
-Name[ru]=txt
-Name[sk]=txt
-Name[sl]=txt
-Name[sr]=обични текст
-Name[sr@ijekavian]=обични текст
-Name[sr@ijekavianlatin]=obični tekst
-Name[sr@latin]=obični tekst
-Name[sv]=txt
-Name[tr]=txt
-Name[ug]=txt
-Name[uk]=txt
-Name[x-test]=xxtxtxx
-Name[zh_CN]=txt
-Name[zh_TW]=txt
-Comment=Txt backend for Okular
-Comment[bg]=Текстово ядро за Okular
-Comment[bs]=Pozadina txt-a za Okular
-Comment[ca]=Dorsal de txt per a l'Okular
-Comment[ca@valencia]=Dorsal de txt per a l'Okular
-Comment[cs]= Implementace Txt pro Okular
-Comment[da]=Txt-motor til Okular
-Comment[de]=Anzeigemodul für Text in Okular
-Comment[el]=Σύστημα υποστήριξης txt για το Okular
-Comment[en_GB]=Txt backend for Okular
-Comment[es]=Motor Txt para Okular
-Comment[et]=Okulari txt-i taustaprogramm
-Comment[fi]=TXT-taustaosa Okularille
-Comment[fr]=Moteur Txt pour Okular
-Comment[gl]=Infraestrutura de Txt para Okular
-Comment[hu]=Txt-bővítmény az Okularhoz
-Comment[ia]=Retro-administration per Txt pro Okular
-Comment[is]=TXT stuðningur fyrir Okular
-Comment[it]=Backend di testo semplice per Okular
-Comment[ja]=Okular の Txt バックエンド
-Comment[kk]=Okular-дың Txt тетігі
-Comment[ko]=Okular의 TXT 백엔드
-Comment[lt]=Txt programinė sąsaja, skirta Okular
-Comment[mr]=ओक्युलर करिता Txt बॅकएन्ड
-Comment[nb]=Txt-motor for Okular
-Comment[nds]=TXT-Hülpprogramm för Okular
-Comment[nl]=Tekst-backend voor Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ Txt ਬੈਕਐਂਡ
-Comment[pl]=Obsługa Txt dla Okulara
-Comment[pt]=Infra-estrutura de TXT para o Okular
-Comment[pt_BR]=Infraestrutura Txt para o Okular
-Comment[ru]=Модуль поддержки формата Txt для Okular
-Comment[sk]=Txt backend pre Okular
-Comment[sl]=Zaledje za txt za Okular
-Comment[sr]=Позадина обичног текста за Окулар
-Comment[sr@ijekavian]=Позадина обичног текста за Окулар
-Comment[sr@ijekavianlatin]=Pozadina običnog teksta za Okular
-Comment[sr@latin]=Pozadina običnog teksta za Okular
-Comment[sv]=Txt-gränssnitt för Okular
-Comment[tr]=Okular için txt arka ucu
-Comment[uk]=Додаток текстових файлів для Okular
-Comment[x-test]=xxTxt backend for Okularxx
-Comment[zh_CN]=Okular 的 Txt 格式后端
-Comment[zh_TW]=Okular txt 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=text/plain;
-X-KDE-Library=okularGenerator_txt
-X-KDE-Priority=2
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=true
diff --git a/generators/txt/libokularGenerator_txt.json b/generators/txt/libokularGenerator_txt.json
new file mode 100644
index 0000000..2e3579e
--- /dev/null
+++ b/generators/txt/libokularGenerator_txt.json
@@ -0,0 +1,25 @@
+{
+ "KPlugin": {
+
+ "Authors": [
+ {
+ "Email": "a3at.mail@gmail.com",
+ "Name": "Azat Khuzhin"
+ }
+ ],
+ "Description": "Txt backend",
+ "Id": "okular_txt",
+ "License": "GPL",
+ "MimeTypes": [
+ "text/plain"
+ ],
+ "Name": "Txt Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.1"
+ },
+ "X-KDE-Priority": 2,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": true
+}
diff --git a/generators/txt/okularTxt.desktop b/generators/txt/okularTxt.desktop
deleted file mode 100644
index e9dda9f..0000000
--- a/generators/txt/okularTxt.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=text/plain;
diff --git a/generators/xps/CMakeLists.txt b/generators/xps/CMakeLists.txt
index 1430bda..0b0f36c 100644
--- a/generators/xps/CMakeLists.txt
+++ b/generators/xps/CMakeLists.txt
@@ -9,16 +9,11 @@ set(okularGenerator_xps_SRCS
generator_xps.cpp
)
-
-add_library(okularGenerator_xps MODULE ${okularGenerator_xps_SRCS})
+okular_add_generator(okularGenerator_xps ${okularGenerator_xps_SRCS})
target_link_libraries(okularGenerator_xps okularcore KF5::Archive KF5::I18n KF5::KIOCore Qt5::PrintSupport Qt5::Xml)
-install(TARGETS okularGenerator_xps DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-
########### install files ###############
-install( FILES libokularGenerator_xps.desktop okularXps.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( PROGRAMS okularApplication_xps.desktop org.kde.mobile.okular_xps.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/xps/generator_xps.cpp b/generators/xps/generator_xps.cpp
index 58bf0f6..7d25c4a 100644
--- a/generators/xps/generator_xps.cpp
+++ b/generators/xps/generator_xps.cpp
@@ -36,25 +36,7 @@
#include <core/area.h>
#include <core/fileprinter.h>
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- QStringLiteral("okular_xps"),
- i18n( "XPS Backend" ),
- QStringLiteral("0.3.3"),
- i18n( "An XPS backend" ),
- KAboutLicense::GPL,
- i18n( "© 2006-2007 Brad Hards\n"
- "© 2007 Jiri Klement\n"
- "© 2008 Pino Toscano" )
- );
- aboutData.addAuthor( QStringLiteral( "Brad Hards" ), QString(), QStringLiteral("bradh@frogmouth.net") );
- aboutData.addAuthor( QStringLiteral( "Jiri Klement" ), QString(), QStringLiteral("jiri.klement@gmail.com") );
- aboutData.addAuthor( QStringLiteral( "Pino Toscano" ), QString(), QStringLiteral("pino@kde.org") );
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( XpsGenerator, createAboutData() )
+OKULAR_EXPORT_PLUGIN(XpsGenerator, "libokularGenerator_xps.json")
Q_DECLARE_METATYPE( QGradient* )
Q_DECLARE_METATYPE( XpsPathFigure* )
diff --git a/generators/xps/libokularGenerator_xps.desktop b/generators/xps/libokularGenerator_xps.desktop
deleted file mode 100644
index 173ba72..0000000
--- a/generators/xps/libokularGenerator_xps.desktop
+++ /dev/null
@@ -1,123 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Okular XPS Plugin
-Name[ar]=ملحق XPS لأوكلار
-Name[ast]=Complementu XPS d'Okular
-Name[bg]=Приставка на Okular за XPS
-Name[bs]=Okular priključak za XPS
-Name[ca]=Connector XPS per a l'Okular
-Name[ca@valencia]=Connector XPS per a l'Okular
-Name[cs]=Modul XPS pro Okular
-Name[da]=XPS-plugin til Okular
-Name[de]=XPS-Modul für Okular
-Name[el]=Πρόσθετο XPS του Okular
-Name[en_GB]=Okular XPS Plugin
-Name[es]=Complemento XPS de Okular
-Name[et]=Okulari XPS-i plugin
-Name[eu]=Okular-en XPS plugina
-Name[fi]=XPS-liitännäinen Okularille
-Name[fr]=Module externe « XPS » pour Okular
-Name[ga]=Breiseán XPS Okular
-Name[gl]=Extensión XPS para Okular
-Name[hne]=ओकुलर एक्सपीएस प्लगइन
-Name[hr]=XPS-priključak za Okular
-Name[hu]=XPS-bővítmény az Okularhoz
-Name[ia]=Plugin XPS de Okular
-Name[is]=Okular XPS íforritið
-Name[it]=Estensione XPS per Okular
-Name[ja]=Okular XPS プラグイン
-Name[kk]=Okular XPS плагині
-Name[km]=កម្មវិធី​ជំនួយ Okular XPS
-Name[ko]=Okular XPS 플러그인
-Name[ku]=Pêveka Okular XPS
-Name[lt]=Okular XPS priedas
-Name[lv]=Okular XPS spraudnis
-Name[mr]=ओक्युलर XPS प्लगइन
-Name[nb]=Okular XPS-tillegg
-Name[nds]=XPS-Moduul för Okular
-Name[nl]=Okular XPS-plugin
-Name[nn]=Okular XPS-tillegg
-Name[pa]=ਓਕੁਲਾਰ XPS ਪਲੱਗਇਨ
-Name[pl]=Wtyczka XPS dla Okulara
-Name[pt]='Plugin' de XPS do Okular
-Name[pt_BR]=Plugin XPS para o Okular
-Name[ro]=Modul XPS pentru Okular
-Name[ru]=Модуль поддержки формата XPS для Okular
-Name[sk]=Modul XPS pre Okular
-Name[sl]=Vstavek XPS za Okular
-Name[sq]=Okular XPS Plugin
-Name[sr]=Окуларов прикључак за ИксПС
-Name[sr@ijekavian]=Окуларов прикључак за ИксПС
-Name[sr@ijekavianlatin]=Okularov priključak za XPS
-Name[sr@latin]=Okularov priključak za XPS
-Name[sv]=Okular XPS-gränssnitt
-Name[th]=ส่วนเสริมจัดการแฟ้ม XPS สำหรับโอกูลาร์
-Name[tr]=Okular XPS Eklentisi
-Name[ug]=Okular XPS قىستۇرمىسى
-Name[uk]=Додаток XPS для Okular
-Name[x-test]=xxOkular XPS Pluginxx
-Name[zh_CN]=Okular XPS 插件
-Name[zh_TW]=Okular XPS 外掛程式
-Comment=XPS backend for Okular
-Comment[ar]=المنتهى الخلفي XPS لأوكلار
-Comment[ast]=Motor XPS pa Okular
-Comment[bg]=Ядро на Okular за XPS
-Comment[bs]=Pozadina XPS-a za Okular
-Comment[ca]=Dorsal d'XPS per a l'Okular
-Comment[ca@valencia]=Dorsal d'XPS per a l'Okular
-Comment[cs]=Implementace XPS pro Okular
-Comment[da]=XPS-motor til Okular
-Comment[de]=Anzeigemodul für XPS in Okular
-Comment[el]=Σύστημα υποστήριξης XPS για το Okular
-Comment[en_GB]=XPS backend for Okular
-Comment[es]=Motor XPS para Okular
-Comment[et]=Okulari XPS-i taustaprogramm
-Comment[eu]=Okular-en XPS motorra
-Comment[fi]=XPS-taustaosa Okularille
-Comment[fr]=Moteur XPS pour Okular
-Comment[ga]=Inneall XPS le haghaidh Okular
-Comment[gl]=Infraestrutura de XPS para Okular
-Comment[hne]=ओकुलर बर एक्सपीएस बैकएन्ड
-Comment[hr]=Podrška za XPS za Okular
-Comment[hu]=XPS-bővítmény az Okularhoz
-Comment[ia]=Retro-administration per XPS pro Okular
-Comment[is]=XPS stuðningur fyrir Okular
-Comment[it]=Backend XPS per Okular
-Comment[ja]=Okular の XPS バックエンド
-Comment[kk]=Okular-дың XPS тетігі
-Comment[km]=ផ្នែក​ខា​ងក្រោយ XPS សម្រាប់ Okular
-Comment[ko]=Okular의 XPS 백엔드
-Comment[ku]=Binesazî ya XPS ji bo Okular
-Comment[lt]=XPS programinė sąsaja, skirta Okular
-Comment[lv]=XPS Okular aizmugure
-Comment[mr]=ओक्युलर करिता XPS बॅकएन्ड
-Comment[nb]=XPS-motor for Okular
-Comment[nds]=XPS-Hülpprogramm för Okular
-Comment[nl]=XPS-backend voor Okular
-Comment[nn]=XPS-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ XPS ਬੈਕਐਂਡ
-Comment[pl]=Obsługa XPS dla Okulara
-Comment[pt]=Infra-estrutura de XPS para o Okular
-Comment[pt_BR]=Infraestrutura XPS para o Okular
-Comment[ro]=Platformă XPS pentru Okular
-Comment[ru]=Модуль поддержки формата XPS для Okular
-Comment[sk]=Backend XPS pre Okular
-Comment[sl]=Zaledje XPS za Okular
-Comment[sq]=Mbështetje XPS për Okular
-Comment[sr]=Позадина ИксПС‑а за Окулар
-Comment[sr@ijekavian]=Позадина ИксПС‑а за Окулар
-Comment[sr@ijekavianlatin]=Pozadina XPS‑a za Okular
-Comment[sr@latin]=Pozadina XPS‑a za Okular
-Comment[sv]=XPS-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์แฟ้ม XPS สำหรับโอกูลาร์
-Comment[tr]=Okular için XPS arka ucu
-Comment[uk]=Додаток XPS для Okular
-Comment[x-test]=xxXPS backend for Okularxx
-Comment[zh_CN]=Okular 的 XPS 格式后端
-Comment[zh_TW]=Okular 的 XPS 後端
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/oxps;application/vnd.ms-xpsdocument;
-X-KDE-Library=okularGenerator_xps
-X-KDE-Priority=4
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=false
diff --git a/generators/xps/libokularGenerator_xps.json b/generators/xps/libokularGenerator_xps.json
new file mode 100644
index 0000000..76a23da
--- /dev/null
+++ b/generators/xps/libokularGenerator_xps.json
@@ -0,0 +1,31 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "bradh@frogmouth.net",
+ "Name": "Brad Hards"
+ }, {
+ "Email": "jiri.klement@gmail.com",
+ "Name": "Jiri Klement"
+ }, {
+ "Email": "pino@kde.org",
+ "Name": "Pino Toscano"
+ }
+ ],
+ "Description": "An XPS backend",
+ "Id": "okular_xps",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/oxps",
+ "application/vnd.ms-xpsdocument"
+ ],
+ "Name": "XPS Backend",
+ "ServiceTypes": [
+ "okular/Generator"
+ ],
+ "Version": "0.3.3"
+ },
+ "X-KDE-Priority": 4,
+ "X-KDE-okularAPIVersion": 1,
+ "X-KDE-okularHasInternalSettings": false
+}
diff --git a/generators/xps/okularXps.desktop b/generators/xps/okularXps.desktop
deleted file mode 100644
index 2e5a2c4..0000000
--- a/generators/xps/okularXps.desktop
+++ /dev/null
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=文件檢視_Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/oxps;application/vnd.ms-xpsdocument;
diff --git a/part.cpp b/part.cpp
index ab11a25..3fa1170 100644
--- a/part.cpp
+++ b/part.cpp
@@ -50,7 +50,6 @@
#include <kmenu.h>
#include <kxmlguiclient.h>
#include <kxmlguifactory.h>
-#include <kservicetypetrader.h>
#include <kstandarddirs.h>
#include <kstandardshortcut.h>
#include <ktoggleaction.h>
@@ -2973,7 +2972,9 @@ void Part::rebuildBookmarkMenu( bool unplugActions )
void Part::updateAboutBackendAction()
{
- const KComponentData *data = m_document->componentData();
+#warning "FIXME!! Component data"
+ void* data = nullptr;
+ // const KComponentData *data = m_document->componentData();
if ( data )
{
m_aboutBackend->setEnabled( true );
diff --git a/ui/fileprinterpreview.cpp b/ui/fileprinterpreview.cpp
index 70fd941..6aed5ea 100644
--- a/ui/fileprinterpreview.cpp
+++ b/ui/fileprinterpreview.cpp
@@ -24,7 +24,6 @@
#include <kparts/readonlypart.h>
#include <kpluginfactory.h>
#include <kpluginloader.h>
-#include <kservice.h>
#include <ksharedconfig.h>
#include <QtCore/qloggingcategory.h>