Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-09 03:18:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enabled to display Plugin Version, on Plugin Item

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5424 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-08-15 12:33:46 +00:00
parent 26109d88c4
commit c992cb6aea
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/settings/PluginItem.cpp
View File

@ -21,7 +21,7 @@
#include "PluginItem.h" #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) :QWidget(NULL)
{ {
setupUi(this) ; setupUi(this) ;
@ -33,7 +33,7 @@ PluginItem::PluginItem(int id, const QString& pluginTitle,const QString& pluginD
_pluginIcon->setIcon(icon) ; _pluginIcon->setIcon(icon) ;
_pluginIcon->setText(QString()) ; _pluginIcon->setText(QString()) ;
msgLabel->setText(pluginDescription) ; msgLabel->setText(pluginDescription) ;
subjectLabel->setText(pluginTitle) ; subjectLabel->setText(pluginTitle + " "+ pluginVersion) ;
QObject::connect(_enabled_CB,SIGNAL(toggled(bool)),this,SLOT(togglePlugin(bool))) ; QObject::connect(_enabled_CB,SIGNAL(toggled(bool)),this,SLOT(togglePlugin(bool))) ;
QObject::connect(_configure_PB,SIGNAL(clicked()),this,SLOT(configurePlugin())) ; QObject::connect(_configure_PB,SIGNAL(clicked()),this,SLOT(configurePlugin())) ;

2
retroshare-gui/src/gui/settings/PluginItem.h
View File

@ -28,7 +28,7 @@ class PluginItem: public QWidget, public Ui::PluginItem
Q_OBJECT Q_OBJECT
public: 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: protected slots:
void togglePlugin(bool) ; void togglePlugin(bool) ;

2
retroshare-gui/src/gui/settings/PluginItem.ui
View File

@ -86,7 +86,7 @@ border-radius: 0px}</string>
<item> <item>
<widget class="QLabel" name="subjectLabel"> <widget class="QLabel" name="subjectLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>

19
retroshare-gui/src/gui/settings/PluginsPage.cpp
View File

@ -72,17 +72,24 @@ PluginsPage::PluginsPage(QWidget * parent, Qt::WFlags flags)
RsPlugin *plugin = rsPlugins->plugin(i) ; RsPlugin *plugin = rsPlugins->plugin(i) ;
QString pluginTitle = tr("Title unavailable") ; QString pluginTitle = tr("Title unavailable") ;
QString pluginDescription = tr("Description unavailable") ; QString pluginDescription = tr("Description unavailable") ;
QString pluginVersion = tr("Unknown version");
if(plugin!=NULL) if(plugin!=NULL)
{ {
if(plugin->qt_icon() != NULL) if(plugin->qt_icon() != NULL)
plugin_icon = *plugin->qt_icon() ; plugin_icon = *plugin->qt_icon() ;
pluginTitle = QString::fromUtf8(plugin->getPluginName().c_str()) ; pluginTitle = QString::fromUtf8(plugin->getPluginName().c_str()) ;
pluginDescription = QString::fromUtf8(plugin->getShortPluginDescription().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_name),
QString::fromStdString(file_hash),QString::fromStdString(error_string), QString::fromStdString(file_hash),QString::fromStdString(error_string),
plugin_icon) ; plugin_icon) ;