From f8886b48c5905df80a88d0f3ba9b5a6cc3c7fca5 Mon Sep 17 00:00:00 2001 From: Mathieu Pellerin Date: Tue, 23 Apr 2024 10:38:46 +0700 Subject: [PATCH] Add plugin/author homepage metadata --- src/core/pluginmanager.cpp | 13 ++++++++++++- src/core/pluginmanager.h | 6 +++++- src/qml/PluginManagerSettings.qml | 7 +++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/core/pluginmanager.cpp b/src/core/pluginmanager.cpp index 14baf1c40c..b68a122a9a 100644 --- a/src/core/pluginmanager.cpp +++ b/src/core/pluginmanager.cpp @@ -228,6 +228,7 @@ void PluginManager::refreshAppPlugins() QString name = candidate.fileName(); QString description; QString author; + QString homepage; QString icon; QString version; @@ -238,13 +239,23 @@ void PluginManager::refreshAppPlugins() name = metadata.value( "name", candidate.fileName() ).toString(); description = metadata.value( "description" ).toString(); author = metadata.value( "author" ).toString(); + homepage = metadata.value( "homepage" ).toString(); + if ( !homepage.isEmpty() ) + { + // Only tolerate http(s) URLs + const QUrl url( homepage ); + if ( !url.scheme().startsWith( QStringLiteral( "http" ) ) ) + { + homepage.clear(); + } + } if ( !metadata.value( "icon" ).toString().isEmpty() ) { icon = QStringLiteral( "%1/%2" ).arg( candidate.absoluteFilePath(), metadata.value( "icon" ).toString() ); } version = metadata.value( "version" ).toString(); } - mAvailableAppPlugins.insert( candidate.fileName(), PluginInformation( candidate.fileName(), name, description, author, icon, version, path ) ); + mAvailableAppPlugins.insert( candidate.fileName(), PluginInformation( candidate.fileName(), name, description, author, homepage, icon, version, path ) ); } } } diff --git a/src/core/pluginmanager.h b/src/core/pluginmanager.h index 06c9053195..7be7e30b0d 100644 --- a/src/core/pluginmanager.h +++ b/src/core/pluginmanager.h @@ -28,15 +28,17 @@ class PluginInformation Q_PROPERTY( QString name READ name ) Q_PROPERTY( QString description READ description ) Q_PROPERTY( QString author READ author ) + Q_PROPERTY( QString homepage READ homepage ) Q_PROPERTY( QString icon READ icon ) Q_PROPERTY( QString version READ version ) public: - PluginInformation( const QString &uuid = QString(), const QString &name = QString(), const QString &description = QString(), const QString &author = QString(), const QString &icon = QString(), const QString &version = QString(), const QString &path = QString() ) + PluginInformation( const QString &uuid = QString(), const QString &name = QString(), const QString &description = QString(), const QString &author = QString(), const QString &homepage = QString(), const QString &icon = QString(), const QString &version = QString(), const QString &path = QString() ) : mUuid( uuid ) , mName( name ) , mDescription( description ) , mAuthor( author ) + , mHomepage( homepage ) , mIcon( icon ) , mVersion( version ) , mPath( path ) @@ -47,6 +49,7 @@ class PluginInformation QString name() const { return mName; } QString description() const { return mDescription; } QString author() const { return mAuthor; } + QString homepage() const { return mHomepage; } QString icon() const { return mIcon; } QString version() const { return mVersion; } QString path() const { return mPath; } @@ -56,6 +59,7 @@ class PluginInformation QString mName; QString mDescription; QString mAuthor; + QString mHomepage; QString mIcon; QString mVersion; QString mPath; diff --git a/src/qml/PluginManagerSettings.qml b/src/qml/PluginManagerSettings.qml index 3400608e1c..ba86826b3e 100644 --- a/src/qml/PluginManagerSettings.qml +++ b/src/qml/PluginManagerSettings.qml @@ -131,10 +131,13 @@ Popup { Label { Layout.fillWidth: true - text: qsTr('Authored by %1').arg(Author) + (Version != "" ? ' (' + Version + ')' : '') + text: (Homepage != '' + ? qsTr('Authored by %1%2%3').arg('').arg(Author).arg('') + : qsTr('Authored by %1').arg(Author)) + (Version != "" ? ' (' + Version + ')' : '') font: Theme.tipFont color: Theme.secondaryTextColor wrapMode: Text.WordWrap + onLinkActivated: Qt.openUrlExternally(link) } Label { @@ -319,7 +322,7 @@ Popup { pluginsList.model.clear() for (const plugin of pluginManager.availableAppPlugins) { - pluginsList.model.append({"Uuid":plugin.uuid, "Enabled":pluginManager.isAppPluginEnabled(plugin.uuid), "Name":plugin.name, "Description":plugin.description, "Author":plugin.author, "Icon": plugin.icon, "Version": plugin.version}) + pluginsList.model.append({"Uuid":plugin.uuid, "Enabled":pluginManager.isAppPluginEnabled(plugin.uuid), "Name":plugin.name, "Description":plugin.description, "Author":plugin.author, "Homepage":plugin.homepage, "Icon": plugin.icon, "Version": plugin.version}) } }