diff --git a/retroshare-gui/src/gui/settings/PluginItem.cpp b/retroshare-gui/src/gui/settings/PluginItem.cpp index 285c548ce..85b795ed7 100644 --- a/retroshare-gui/src/gui/settings/PluginItem.cpp +++ b/retroshare-gui/src/gui/settings/PluginItem.cpp @@ -21,7 +21,7 @@ #include "PluginItem.h" -PluginItem::PluginItem(int id, const QString& pluginTitle,const QString& pluginDescription,const QString& status, const QString& file_name, const QString& file_hash, const QString& /*error_string*/, const QIcon& icon) +PluginItem::PluginItem(const QString& pluginVersion, int id, const QString& pluginTitle,const QString& pluginDescription,const QString& status, const QString& file_name, const QString& file_hash, const QString& /*error_string*/, const QIcon& icon) :QWidget(NULL) { setupUi(this) ; @@ -33,7 +33,7 @@ PluginItem::PluginItem(int id, const QString& pluginTitle,const QString& pluginD _pluginIcon->setIcon(icon) ; _pluginIcon->setText(QString()) ; msgLabel->setText(pluginDescription) ; - subjectLabel->setText(pluginTitle) ; + subjectLabel->setText(pluginTitle + " "+ pluginVersion) ; QObject::connect(_enabled_CB,SIGNAL(toggled(bool)),this,SLOT(togglePlugin(bool))) ; QObject::connect(_configure_PB,SIGNAL(clicked()),this,SLOT(configurePlugin())) ; diff --git a/retroshare-gui/src/gui/settings/PluginItem.h b/retroshare-gui/src/gui/settings/PluginItem.h index 0092cabd0..5f8c0d9f9 100644 --- a/retroshare-gui/src/gui/settings/PluginItem.h +++ b/retroshare-gui/src/gui/settings/PluginItem.h @@ -28,7 +28,7 @@ class PluginItem: public QWidget, public Ui::PluginItem Q_OBJECT public: - PluginItem(int id,const QString& pluginTitle,const QString& pluginDescription,const QString& status, const QString& file_name, const QString& file_hash, const QString& error_string, const QIcon& icon) ; + PluginItem(const QString& pluginVersion, int id,const QString& pluginTitle,const QString& pluginDescription,const QString& status, const QString& file_name, const QString& file_hash, const QString& error_string, const QIcon& icon) ; protected slots: void togglePlugin(bool) ; diff --git a/retroshare-gui/src/gui/settings/PluginItem.ui b/retroshare-gui/src/gui/settings/PluginItem.ui index 6eb3a2080..1d1ab9e68 100644 --- a/retroshare-gui/src/gui/settings/PluginItem.ui +++ b/retroshare-gui/src/gui/settings/PluginItem.ui @@ -86,7 +86,7 @@ border-radius: 0px} - + 0 0 diff --git a/retroshare-gui/src/gui/settings/PluginsPage.cpp b/retroshare-gui/src/gui/settings/PluginsPage.cpp index 80b5306d4..008c81830 100644 --- a/retroshare-gui/src/gui/settings/PluginsPage.cpp +++ b/retroshare-gui/src/gui/settings/PluginsPage.cpp @@ -72,17 +72,24 @@ PluginsPage::PluginsPage(QWidget * parent, Qt::WFlags flags) RsPlugin *plugin = rsPlugins->plugin(i) ; QString pluginTitle = tr("Title unavailable") ; QString pluginDescription = tr("Description unavailable") ; + QString pluginVersion = tr("Unknown version"); if(plugin!=NULL) { - if(plugin->qt_icon() != NULL) - plugin_icon = *plugin->qt_icon() ; + if(plugin->qt_icon() != NULL) + plugin_icon = *plugin->qt_icon() ; - pluginTitle = QString::fromUtf8(plugin->getPluginName().c_str()) ; - pluginDescription = QString::fromUtf8(plugin->getShortPluginDescription().c_str()) ; - } + pluginTitle = QString::fromUtf8(plugin->getPluginName().c_str()) ; + pluginDescription = QString::fromUtf8(plugin->getShortPluginDescription().c_str()) ; - PluginItem *item = new PluginItem(i,pluginTitle,pluginDescription,status_string, + int major = 0; + int minor = 0; + int svn_rev = 0; + plugin->getPluginVersion(major, minor, svn_rev); + pluginVersion = QString("%1.%2.%3").arg(major).arg(minor).arg(svn_rev); + } + + PluginItem *item = new PluginItem(pluginVersion, i,pluginTitle,pluginDescription,status_string, QString::fromStdString(file_name), QString::fromStdString(file_hash),QString::fromStdString(error_string), plugin_icon) ;