From f14df8aace8e692ce4df34affedccd7169a5de94 Mon Sep 17 00:00:00 2001 From: Mathieu Pellerin Date: Tue, 23 Apr 2024 10:25:22 +0700 Subject: [PATCH] Add plugin version metadata to help users and authors communicate with each other on issues --- src/core/pluginmanager.cpp | 4 +++- src/core/pluginmanager.h | 6 +++++- src/qml/PluginManagerSettings.qml | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/core/pluginmanager.cpp b/src/core/pluginmanager.cpp index 61c6368f9e..14baf1c40c 100644 --- a/src/core/pluginmanager.cpp +++ b/src/core/pluginmanager.cpp @@ -229,6 +229,7 @@ void PluginManager::refreshAppPlugins() QString description; QString author; QString icon; + QString version; const QString metadataPath = QStringLiteral( "%1/metadata.txt" ).arg( candidate.absoluteFilePath() ); if ( QFileInfo::exists( metadataPath ) ) @@ -241,8 +242,9 @@ void PluginManager::refreshAppPlugins() { 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, path ) ); + mAvailableAppPlugins.insert( candidate.fileName(), PluginInformation( candidate.fileName(), name, description, author, icon, version, path ) ); } } } diff --git a/src/core/pluginmanager.h b/src/core/pluginmanager.h index 1c2183b7bd..06c9053195 100644 --- a/src/core/pluginmanager.h +++ b/src/core/pluginmanager.h @@ -29,14 +29,16 @@ class PluginInformation Q_PROPERTY( QString description READ description ) Q_PROPERTY( QString author READ author ) 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 &path = QString() ) + 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() ) : mUuid( uuid ) , mName( name ) , mDescription( description ) , mAuthor( author ) , mIcon( icon ) + , mVersion( version ) , mPath( path ) {} ~PluginInformation() = default; @@ -46,6 +48,7 @@ class PluginInformation QString description() const { return mDescription; } QString author() const { return mAuthor; } QString icon() const { return mIcon; } + QString version() const { return mVersion; } QString path() const { return mPath; } private: @@ -54,6 +57,7 @@ class PluginInformation QString mDescription; QString mAuthor; QString mIcon; + QString mVersion; QString mPath; }; diff --git a/src/qml/PluginManagerSettings.qml b/src/qml/PluginManagerSettings.qml index a622285d69..3400608e1c 100644 --- a/src/qml/PluginManagerSettings.qml +++ b/src/qml/PluginManagerSettings.qml @@ -131,7 +131,7 @@ Popup { Label { Layout.fillWidth: true - text: qsTr('Authored by %1').arg(Author) + text: qsTr('Authored by %1').arg(Author) + (Version != "" ? ' (' + Version + ')' : '') font: Theme.tipFont color: Theme.secondaryTextColor wrapMode: Text.WordWrap @@ -147,7 +147,7 @@ Popup { Label { Layout.fillWidth: true - text: "" + qsTr("Uninstall") + "" + text: "" + qsTr("Uninstall this plugin") + "" font: Theme.tipFont color: Theme.secondaryTextColor wrapMode: Text.WordWrap @@ -319,7 +319,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}) + 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}) } }