retroshare-gui now handle JsonApiServer too

This commit is contained in:
Gioacchino Mazzurco 2018-09-21 01:58:38 +02:00
parent 1c7f02655e
commit ccabf82e60
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
10 changed files with 461 additions and 26 deletions

View file

@ -50,6 +50,10 @@
# include "WebuiPage.h"
#endif
#ifdef RS_JSONAPI
# include "JsonApiPage.h"
#endif
#define IMAGE_GENERAL ":/images/kcmsystem24.png"
#define ITEM_SPACING 2
@ -165,8 +169,12 @@ SettingsPage::initStackedWidget()
#ifdef ENABLE_WEBUI
addPage(new WebuiPage() );
#endif // ENABLE_WEBUI
// add widgets from plugins
#ifdef RS_JSONAPI
addPage(new JsonApiPage());
#endif
// add widgets from plugins
for(int i=0;i<rsPlugins->nbPlugins();++i)
{
RsPlugin *pl = rsPlugins->plugin(i) ;