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

fixup GUI with changes to libretroshare serialisers.

Browse Source 
added back in the other gxs services.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7222 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-04-02 11:28:06 +00:00
parent 0dbe55bd05
commit 46fd60f1e4
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -434,7 +434,7 @@ void IdDialog::insertIdDetails(uint32_t token)
ui.lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str())); ui.lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()));
ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId.toStdString())); ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId.toStdString()));
ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash)); ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash.toStdString()));
ui.lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId.toStdString())); ui.lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId.toStdString()));
if (data.mPgpKnown) if (data.mPgpKnown)

2
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View File

@ -208,7 +208,7 @@ void IdEditDialog::loadExistingId(uint32_t token)
if (realid) if (realid)
{ {
ui.lineEdit_GpgHash->setText(QString::fromStdString(mEditGroup.mPgpIdHash)); ui.lineEdit_GpgHash->setText(QString::fromStdString(mEditGroup.mPgpIdHash.toStdString()));
if (mEditGroup.mPgpKnown) if (mEditGroup.mPgpKnown)
{ {

28
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View File

@ -112,23 +112,23 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
createPageAction(QIcon(IMAGE_PHOTO), tr("Photos"), grp)); createPageAction(QIcon(IMAGE_PHOTO), tr("Photos"), grp));
#endif #endif
// PostedDialog *postedDialog = NULL; PostedDialog *postedDialog = NULL;
// ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages), ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages),
// createPageAction(QIcon(IMAGE_POSTED), tr("Posted Links"), grp)); createPageAction(QIcon(IMAGE_POSTED), tr("Posted Links"), grp));
// postedDialog->setup(); postedDialog->setup();
//
// WikiDialog *wikiDialog = NULL; WikiDialog *wikiDialog = NULL;
// ui.stackPages->add(wikiDialog = new WikiDialog(ui.stackPages), ui.stackPages->add(wikiDialog = new WikiDialog(ui.stackPages),
// createPageAction(QIcon(IMAGE_WIKI), tr("Wiki Pages"), grp)); createPageAction(QIcon(IMAGE_WIKI), tr("Wiki Pages"), grp));
//
GxsForumsDialog *gxsforumsDialog = NULL; GxsForumsDialog *gxsforumsDialog = NULL;
ui.stackPages->add(gxsforumsDialog = new GxsForumsDialog(ui.stackPages), ui.stackPages->add(gxsforumsDialog = new GxsForumsDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_GXSFORUMS), tr("GxsForums"), grp)); createPageAction(QIcon(IMAGE_GXSFORUMS), tr("GxsForums"), grp));
//
// ChannelDialog *gxschannelDialog = NULL; ChannelDialog *gxschannelDialog = NULL;
// ui.stackPages->add(gxschannelDialog = new ChannelDialog(ui.stackPages), ui.stackPages->add(gxschannelDialog = new ChannelDialog(ui.stackPages),
// createPageAction(QIcon(IMAGE_GXSCHANNELS), tr("GxsChannels"), grp)); createPageAction(QIcon(IMAGE_GXSCHANNELS), tr("GxsChannels"), grp));
// gxschannelDialog->setup(); gxschannelDialog->setup();
// THESE HAVE TO BE CONVERTED TO VEG FORMAT // THESE HAVE TO BE CONVERTED TO VEG FORMAT
#if USE_VEG_SERVICE #if USE_VEG_SERVICE