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

Major rewrite of New Cache Interface from the GUI side:

Browse source 
- Basics of Wiki, Photo, Id are working with Local Test interface.
	- Duplicated existing Forum : ForumV2Dialog + forumv2/*
	- Modified ForumV2Dialog to use Request / Response Data retrieval.
	- Switched Id to use TokenQueue request system.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5220 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-06-14 00:36:25 +00:00
parent 4ba7130884
commit a8676302ce
31 changed files with 6222 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

29
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp
View file

@ -43,7 +43,7 @@ void WikiEditDialog::setGroup(RsWikiGroup &group)
{
mWikiGroup = group;
ui.lineEdit_Group->setText(QString::fromStdString(mWikiGroup.mName));
ui.lineEdit_Group->setText(QString::fromStdString(mWikiGroup.mMeta.mGroupName));
}
@ -52,8 +52,8 @@ void WikiEditDialog::setPreviousPage(RsWikiPage &page)
mNewPage = false;
mWikiPage = page;
ui.lineEdit_Page->setText(QString::fromStdString(mWikiPage.mName));
ui.lineEdit_PrevVersion->setText(QString::fromStdString(mWikiPage.mPageId));
ui.lineEdit_Page->setText(QString::fromStdString(mWikiPage.mMeta.mMsgName));
ui.lineEdit_PrevVersion->setText(QString::fromStdString(mWikiPage.mMeta.mMsgId));
ui.textEdit->setPlainText(QString::fromStdString(mWikiPage.mPage));
}
@ -90,18 +90,18 @@ void WikiEditDialog::submitEdit()
{
if (mNewPage)
{
mWikiPage.mGroupId = mWikiGroup.mGroupId;
mWikiPage.mOrigPageId = "";
mWikiPage.mPageId = "";
mWikiPage.mMeta.mGroupId = mWikiGroup.mMeta.mGroupId;
mWikiPage.mMeta.mOrigMsgId = "";
mWikiPage.mMeta.mMsgId = "";
mWikiPage.mPrevId = "";
}
else
{
mWikiPage.mPrevId = mWikiPage.mPageId;
mWikiPage.mPageId = "";
mWikiPage.mPrevId = mWikiPage.mMeta.mMsgId;
mWikiPage.mMeta.mMsgId = "";
}
mWikiPage.mName = ui.lineEdit_Page->text().toStdString();
mWikiPage.mMeta.mMsgName = ui.lineEdit_Page->text().toStdString();
mWikiPage.mPage = ui.textEdit->toPlainText().toStdString();
rsWiki->createPage(mWikiPage);
@ -133,7 +133,8 @@ void WikiEditDialog::requestGroup(const std::string &groupId)
ids.push_back(groupId);
RsTokReqOptions opts;
mWikiQueue->genericRequest(TOKENREQ_GROUPDATA, opts, ids, 0);
uint32_t token;
mWikiQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, ids, 0);
}
void WikiEditDialog::loadGroup(const uint32_t &token)
@ -156,7 +157,9 @@ void WikiEditDialog::requestPage(const std::string &msgId)
std::list<std::string> ids;
ids.push_back(msgId);
RsTokReqOptions opts;
mWikiQueue->genericRequest(TOKENREQ_MSGDATA, opts, ids, 0);
uint32_t token;
mWikiQueue->requestMsgRelatedInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, ids, 0);
}
void WikiEditDialog::loadPage(const uint32_t &token)
@ -181,10 +184,10 @@ void WikiEditDialog::loadRequest(const TokenQueue *queue, const TokenRequest &re
/* now switch on req */
switch(req.mType)
{
case TOKENREQ_GROUPDATA:
case TOKENREQ_GROUPINFO:
loadGroup(req.mToken);
break;
case TOKENREQ_MSGDATA:
case TOKENREQ_MSGRELATEDINFO:
loadPage(req.mToken);
break;
default: