merge of branch v0.6-idclean 7180

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions

View file

@ -47,7 +47,8 @@ PluginsPage::PluginsPage(QWidget * parent, Qt::WindowFlags flags)
{
std::cerr << " Adding new page." << std::endl;
std::string file_name, file_hash, error_string ;
std::string file_name, error_string ;
RsFileHash file_hash ;
uint32_t status ;
uint32_t svn_revision ;
@ -104,7 +105,7 @@ PluginsPage::PluginsPage(QWidget * parent, Qt::WindowFlags flags)
PluginItem *item = new PluginItem(pluginVersion, i,pluginTitle,pluginDescription,status_string,
QString::fromStdString(file_name),
QString::fromStdString(file_hash),QString::fromStdString(error_string),
QString::fromStdString(file_hash.toStdString()),QString::fromStdString(error_string),
plugin_icon) ;
ui._pluginsLayout->insertWidget(0,item) ;
@ -179,17 +180,17 @@ void PluginsPage::configurePlugin(int i)
}
void PluginsPage::enablePlugin(const QString& hash)
{
std::cerr << "Switching status of plugin " << hash.toStdString() << " to enable" << std::endl;
{
std::cerr << "Switching status of plugin " << hash.toStdString() << " to enable" << std::endl;
rsPlugins->enablePlugin(hash.toStdString()) ;
rsPlugins->enablePlugin(RsFileHash(hash.toStdString()) );
}
void PluginsPage::disablePlugin(const QString& hash)
{
std::cerr << "Switching status of plugin " << hash.toStdString() << " to disable " << std::endl;
{
std::cerr << "Switching status of plugin " << hash.toStdString() << " to disable " << std::endl;
rsPlugins->disablePlugin(hash.toStdString()) ;
rsPlugins->disablePlugin(RsFileHash(hash.toStdString())) ;
}