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

Changes to WikiDialog GUI to convert to Request / Response data model.

Browse source 
Also:
	- modified TokenQueue to include MSGRELATEDLIST & new Request Options.
	- updated PhotoDialog to include new Options for requests.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5205 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-06-08 22:06:23 +00:00
parent a27cecc522
commit de8f4f283c
7 changed files with 590 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
View file

@ -335,7 +335,8 @@ void PhotoDialog::requestAlbumList()
{ {
std::list<std::string> ids; std::list<std::string> ids;
mPhotoQueue->genericRequest(TOKENREQ_GROUPLIST, ids, 0); RsTokReqOptions opts;
mPhotoQueue->genericRequest(TOKENREQ_GROUPLIST, opts, ids, 0);
} }
@ -345,7 +346,7 @@ void PhotoDialog::loadAlbumList(const uint32_t &token)
std::cerr << std::endl; std::cerr << std::endl;
std::list<std::string> albumIds; std::list<std::string> albumIds;
rsPhoto->getAlbumList(token, albumIds); rsPhoto->getGroupList(token, albumIds);
requestAlbumData(albumIds); requestAlbumData(albumIds);
@ -362,7 +363,8 @@ void PhotoDialog::loadAlbumList(const uint32_t &token)
void PhotoDialog::requestAlbumData(const std::list<std::string> &ids) void PhotoDialog::requestAlbumData(const std::list<std::string> &ids)
{ {
mPhotoQueue->genericRequest(TOKENREQ_GROUPDATA, ids, 0); RsTokReqOptions opts;
mPhotoQueue->genericRequest(TOKENREQ_GROUPDATA, opts, ids, 0);
} }
@ -400,7 +402,8 @@ void PhotoDialog::requestPhotoList(const std::string &albumId)
std::list<std::string> ids; std::list<std::string> ids;
ids.push_back(albumId); ids.push_back(albumId);
mPhotoQueue->genericRequest(TOKENREQ_MSGLIST, ids, 0); RsTokReqOptions opts;
mPhotoQueue->genericRequest(TOKENREQ_MSGLIST, opts, ids, 0);
} }
@ -414,14 +417,15 @@ void PhotoDialog::loadPhotoList(const uint32_t &token)
std::list<std::string> photoIds; std::list<std::string> photoIds;
rsPhoto->getPhotoList(token, photoIds); rsPhoto->getMsgList(token, photoIds);
requestPhotoData(photoIds); requestPhotoData(photoIds);
} }
void PhotoDialog::requestPhotoData(const std::list<std::string> &photoIds) void PhotoDialog::requestPhotoData(const std::list<std::string> &photoIds)
{ {
mPhotoQueue->genericRequest(TOKENREQ_MSGDATA, photoIds, 0); RsTokReqOptions opts;
mPhotoQueue->genericRequest(TOKENREQ_MSGDATA, opts, photoIds, 0);
} }

453
retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
View file

@ -41,6 +41,15 @@
#define WIKI_DEBUG 1 #define WIKI_DEBUG 1
#define WIKIDIALOG_LISTING_GROUPLIST 1
#define WIKIDIALOG_LISTING_GROUPDATA 2
#define WIKIDIALOG_LISTING_ORIGINALPAGES 3
#define WIKIDIALOG_LISTING_LATESTPAGES 4
#define WIKIDIALOG_LISTING_PAGES 5
#define WIKIDIALOG_MOD_LIST 6
#define WIKIDIALOG_MOD_PAGES 7
#define WIKIDIALOG_WIKI_PAGE 8
/** Constructor */ /** Constructor */
WikiDialog::WikiDialog(QWidget *parent) WikiDialog::WikiDialog(QWidget *parent)
@ -64,6 +73,8 @@ WikiDialog::WikiDialog(QWidget *parent)
timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate()));
timer->start(1000); timer->start(1000);
/* setup TokenQueue */
mWikiQueue = new TokenQueue(rsWiki, this);
} }
@ -100,6 +111,7 @@ void WikiDialog::OpenOrShowAddPageDialog()
std::cerr << "WikiDialog::OpenOrShowAddPageDialog() GroupId: " << groupId; std::cerr << "WikiDialog::OpenOrShowAddPageDialog() GroupId: " << groupId;
std::cerr << std::endl; std::cerr << std::endl;
#if 0
RsWikiGroup group; RsWikiGroup group;
if (!rsWiki->getGroup(groupId, group)) if (!rsWiki->getGroup(groupId, group))
{ {
@ -107,8 +119,10 @@ void WikiDialog::OpenOrShowAddPageDialog()
std::cerr << std::endl; std::cerr << std::endl;
} }
mEditDialog->setGroup(group); mEditDialog->setGroup(group);
#endif
mEditDialog->setupData(groupId, "");
mEditDialog->setNewPage(); mEditDialog->setNewPage();
mEditDialog->show(); mEditDialog->show();
@ -139,10 +153,13 @@ void WikiDialog::OpenOrShowEditDialog()
return; return;
} }
std::string pageId = getSelectedPage();
std::string modId = getSelectedMod(); std::string modId = getSelectedMod();
std::string realPageId; std::string realPageId;
if (pageId == "")
std::string pageId;
std::string origPageId;
if (!getSelectedPage(pageId, origPageId))
{ {
std::cerr << "WikiDialog::OpenOrShowAddPageDialog() No PageId selected"; std::cerr << "WikiDialog::OpenOrShowAddPageDialog() No PageId selected";
std::cerr << std::endl; std::cerr << std::endl;
@ -164,6 +181,7 @@ void WikiDialog::OpenOrShowEditDialog()
mEditDialog = new WikiEditDialog(NULL); mEditDialog = new WikiEditDialog(NULL);
} }
#if 0
RsWikiGroup group; RsWikiGroup group;
rsWiki->getGroup(groupId, group); rsWiki->getGroup(groupId, group);
mEditDialog->setGroup(group); mEditDialog->setGroup(group);
@ -171,6 +189,8 @@ void WikiDialog::OpenOrShowEditDialog()
RsWikiPage page; RsWikiPage page;
rsWiki->getPage(realPageId, page); rsWiki->getPage(realPageId, page);
mEditDialog->setPreviousPage(page); mEditDialog->setPreviousPage(page);
#endif
mEditDialog->setupData(groupId, realPageId);
mEditDialog->show(); mEditDialog->show();
} }
@ -180,7 +200,10 @@ void WikiDialog::OpenOrShowEditDialog()
void WikiDialog::groupTreeChanged() void WikiDialog::groupTreeChanged()
{ {
/* */ /* */
std::string pageId = getSelectedPage(); std::string pageId;
std::string origPageId;
getSelectedPage(pageId, origPageId);
if (pageId == mPageSelected) if (pageId == mPageSelected)
{ {
return; /* nothing changed */ return; /* nothing changed */
@ -195,14 +218,11 @@ void WikiDialog::groupTreeChanged()
return; return;
} }
clearModsTree();
RsWikiPage page;
if (rsWiki->getPage(pageId, page)) clearModsTree();
{
insertModsForPage(page.mOrigPageId); insertModsForPage(origPageId);
updateWikiPage(page); requestWikiPage(pageId);
}
} }
void WikiDialog::modTreeChanged() void WikiDialog::modTreeChanged()
@ -220,11 +240,7 @@ void WikiDialog::modTreeChanged()
return; return;
} }
RsWikiPage page; requestWikiPage(pageId);
if (rsWiki->getPage(pageId, page))
{
updateWikiPage(page);
}
} }
@ -260,6 +276,8 @@ void WikiDialog::clearModsTree()
#define WIKI_GROUP_COL_ORIGPAGEID 2 #define WIKI_GROUP_COL_ORIGPAGEID 2
#if 0
#########################################################
void WikiDialog::insertWikiGroups() void WikiDialog::insertWikiGroups()
{ {
@ -332,11 +350,12 @@ void WikiDialog::insertWikiGroups()
} }
} }
} }
#########################################################
#endif
std::string WikiDialog::getSelectedPage() bool WikiDialog::getSelectedPage(std::string &pageId, std::string &origPageId)
{ {
std::string pageId;
#ifdef WIKI_DEBUG #ifdef WIKI_DEBUG
std::cerr << "WikiDialog::getSelectedPage()" << std::endl; std::cerr << "WikiDialog::getSelectedPage()" << std::endl;
#endif #endif
@ -350,7 +369,7 @@ std::string WikiDialog::getSelectedPage()
#ifdef WIKI_DEBUG #ifdef WIKI_DEBUG
std::cerr << "WikiDialog::getSelectedPage() Nothing selected" << std::endl; std::cerr << "WikiDialog::getSelectedPage() Nothing selected" << std::endl;
#endif #endif
return pageId; return false;
} }
QTreeWidgetItem *parent = item->parent(); QTreeWidgetItem *parent = item->parent();
@ -360,16 +379,18 @@ std::string WikiDialog::getSelectedPage()
#ifdef WIKI_DEBUG #ifdef WIKI_DEBUG
std::cerr << "WikiDialog::getSelectedPage() No Parent -> Group Selected" << std::endl; std::cerr << "WikiDialog::getSelectedPage() No Parent -> Group Selected" << std::endl;
#endif #endif
return pageId; return false;
} }
/* check if it has changed */ /* check if it has changed */
pageId = item->text(WIKI_GROUP_COL_PAGEID).toStdString(); pageId = item->text(WIKI_GROUP_COL_PAGEID).toStdString();
origPageId = item->text(WIKI_GROUP_COL_ORIGPAGEID).toStdString();
#ifdef WIKI_DEBUG #ifdef WIKI_DEBUG
std::cerr << "WikiDialog::getSelectedPage() PageId: " << pageId << std::endl; std::cerr << "WikiDialog::getSelectedPage() PageId: " << pageId << std::endl;
#endif #endif
return pageId; return true;
} }
@ -414,6 +435,8 @@ std::string WikiDialog::getSelectedGroup()
#define WIKI_MODS_COL_ORIGPAGEID 0 #define WIKI_MODS_COL_ORIGPAGEID 0
#define WIKI_MODS_COL_PAGEID 1 #define WIKI_MODS_COL_PAGEID 1
#if 0
#########################################################
void WikiDialog::insertModsForPage(std::string &origPageId) void WikiDialog::insertModsForPage(std::string &origPageId)
{ {
/* clear it all */ /* clear it all */
@ -439,6 +462,8 @@ void WikiDialog::insertModsForPage(std::string &origPageId)
ui.treeWidget_Mods->addTopLevelItem(modItem); ui.treeWidget_Mods->addTopLevelItem(modItem);
} }
} }
#########################################################
#endif
@ -468,4 +493,390 @@ std::string WikiDialog::getSelectedMod()
return pageId; return pageId;
} }
/************************** Request / Response *************************/
/*** Loading Main Index ***/
void WikiDialog::insertWikiGroups()
{
requestGroupList();
}
void WikiDialog::requestGroupList()
{
std::cerr << "WikiDialog::requestGroupList()";
std::cerr << std::endl;
std::list<std::string> ids;
RsTokReqOptions opts;
mWikiQueue->genericRequest(TOKENREQ_GROUPLIST, opts, ids, WIKIDIALOG_LISTING_GROUPLIST);
}
void WikiDialog::loadGroupList(const uint32_t &token)
{
std::cerr << "WikiDialog::loadGroupList()";
std::cerr << std::endl;
std::list<std::string> groupIds;
rsWiki->getGroupList(token, groupIds);
if (groupIds.size() > 0)
{
requestGroupData(groupIds);
}
else
{
std::cerr << "WikiDialog::loadGroupList() ERROR No Groups...";
std::cerr << std::endl;
}
}
void WikiDialog::requestGroupData(const std::list<std::string> &groupIds)
{
RsTokReqOptions opts;
mWikiQueue->genericRequest(TOKENREQ_GROUPDATA, opts, groupIds, WIKIDIALOG_LISTING_GROUPDATA);
}
void WikiDialog::loadGroupData(const uint32_t &token)
{
std::cerr << "WikiDialog::loadGroupData()";
std::cerr << std::endl;
clearGroupTree();
bool moreData = true;
while(moreData)
{
RsWikiGroup group;
if (rsWiki->getGroupData(token, group))
{
/* Add Widget, and request Pages */
std::cerr << "WikiDialog::addGroup() GroupId: " << group.mGroupId;
std::cerr << " Group: " << group.mName;
std::cerr << std::endl;
QTreeWidgetItem *groupItem = new QTreeWidgetItem(NULL);
groupItem->setText(WIKI_GROUP_COL_GROUPNAME, QString::fromStdString(group.mName));
groupItem->setText(WIKI_GROUP_COL_GROUPID, QString::fromStdString(group.mGroupId));
ui.treeWidget_Pages->addTopLevelItem(groupItem);
/* request pages */
std::list<std::string> groupIds;
groupIds.push_back(group.mGroupId);
requestOriginalPages(groupIds);
}
else
{
moreData = false;
}
}
//return true;
}
void WikiDialog::requestOriginalPages(const std::list<std::string> &groupIds)
{
RsTokReqOptions opts;
opts.mOptions = RS_TOKREQOPT_MSG_ORIGMSG;
mWikiQueue->genericRequest(TOKENREQ_MSGLIST, opts, groupIds, WIKIDIALOG_LISTING_ORIGINALPAGES);
}
void WikiDialog::loadOriginalPages(const uint32_t &token)
{
std::cerr << "WikiDialog::loadOriginalPages()";
std::cerr << std::endl;
/* translate into latest pages */
std::list<std::string> msgIds;
if (rsWiki->getMsgList(token, msgIds))
{
std::cerr << "WikiDialog::loadOriginalPages() Loaded " << msgIds.size();
std::cerr << std::endl;
}
else
{
std::cerr << "WikiDialog::loadOriginalPages() ERROR No Data";
std::cerr << std::endl;
return;
}
requestLatestPages(msgIds);
}
void WikiDialog::requestLatestPages(const std::list<std::string> &msgIds)
{
RsTokReqOptions opts;
opts.mOptions = RS_TOKREQOPT_MSG_LATEST;
mWikiQueue->genericRequest(TOKENREQ_MSGRELATEDLIST, opts, msgIds, WIKIDIALOG_LISTING_LATESTPAGES);
}
void WikiDialog::loadLatestPages(const uint32_t &token)
{
std::cerr << "WikiDialog::loadLatestPages()";
std::cerr << std::endl;
std::list<std::string> msgIds;
if (rsWiki->getMsgList(token, msgIds))
{
std::cerr << "WikiDialog::loadLatestPages() Loaded " << msgIds.size();
std::cerr << std::endl;
}
else
{
std::cerr << "WikiDialog::loadLatestPages() ERROR No Data";
std::cerr << std::endl;
return;
}
/* request actual data */
requestPages(msgIds);
}
void WikiDialog::requestPages(const std::list<std::string> &msgIds)
{
RsTokReqOptions opts;
mWikiQueue->genericRequest(TOKENREQ_MSGDATA, opts, msgIds, WIKIDIALOG_LISTING_PAGES);
}
void WikiDialog::loadPages(const uint32_t &token)
{
std::cerr << "WikiDialog::loadLatestPages()";
std::cerr << std::endl;
/* find parent in GUI Tree - stick children */
QTreeWidgetItem *groupItem = NULL;
bool moreData = true;
while(moreData)
{
RsWikiPage page;
if (rsWiki->getMsgData(token, page))
{
if (!groupItem)
{
/* find the entry */
int itemCount = ui.treeWidget_Pages->topLevelItemCount();
for (int nIndex = 0; nIndex < itemCount;)
{
QTreeWidgetItem *tmpItem = ui.treeWidget_Pages->topLevelItem(nIndex);
std::string tmpid = tmpItem->data(WIKI_GROUP_COL_GROUPID,
Qt::DisplayRole).toString().toStdString();
if (tmpid == page.mGroupId)
{
groupItem = tmpItem;
break;
}
}
if (!groupItem)
{
/* error */
std::cerr << "WikiDialog::loadPages() ERROR Unable to find group";
std::cerr << std::endl;
return;
}
}
std::cerr << "WikiDialog::loadPages() PageId: " << page.mPageId;
std::cerr << " Page: " << page.mName;
std::cerr << std::endl;
QTreeWidgetItem *pageItem = new QTreeWidgetItem(NULL);
pageItem->setText(WIKI_GROUP_COL_PAGENAME, QString::fromStdString(page.mName));
pageItem->setText(WIKI_GROUP_COL_PAGEID, QString::fromStdString(page.mPageId));
pageItem->setText(WIKI_GROUP_COL_ORIGPAGEID, QString::fromStdString(page.mOrigPageId));
groupItem->addChild(pageItem);
}
else
{
moreData = false;
}
}
//return true;
}
/***** Mods *****/
void WikiDialog::insertModsForPage(const std::string &origPageId)
{
requestModPageList(origPageId);
}
void WikiDialog::requestModPageList(const std::string &origMsgId)
{
RsTokReqOptions opts;
opts.mOptions = RS_TOKREQOPT_MSG_VERSIONS;
std::list<std::string> msgIds;
msgIds.push_back(origMsgId);
mWikiQueue->genericRequest(TOKENREQ_MSGRELATEDLIST, opts, msgIds, WIKIDIALOG_MOD_LIST);
}
void WikiDialog::loadModPageList(const uint32_t &token)
{
std::cerr << "WikiDialog::loadModPages()";
std::cerr << std::endl;
/* translate into latest pages */
std::list<std::string> msgIds;
if (rsWiki->getMsgList(token, msgIds))
{
std::cerr << "WikiDialog::loadModPageList() Loaded " << msgIds.size();
std::cerr << std::endl;
}
else
{
std::cerr << "WikiDialog::loadModPageList() ERROR No Data";
std::cerr << std::endl;
return;
}
requestModPages(msgIds);
}
void WikiDialog::requestModPages(const std::list<std::string> &msgIds)
{
RsTokReqOptions opts;
opts.mOptions = RS_TOKREQOPT_MSG_LATEST;
mWikiQueue->genericRequest(TOKENREQ_MSGDATA, opts, msgIds, WIKIDIALOG_MOD_PAGES);
}
void WikiDialog::loadModPages(const uint32_t &token)
{
std::cerr << "WikiDialog::loadModPages()";
std::cerr << std::endl;
bool moreData = true;
while(moreData)
{
RsWikiPage page;
if (rsWiki->getMsgData(token, page))
{
std::cerr << "WikiDialog::loadModPages() PageId: " << page.mPageId;
std::cerr << " Page: " << page.mName;
std::cerr << std::endl;
QTreeWidgetItem *modItem = new QTreeWidgetItem(NULL);
modItem->setText(WIKI_MODS_COL_ORIGPAGEID, QString::fromStdString(page.mOrigPageId));
modItem->setText(WIKI_MODS_COL_PAGEID, QString::fromStdString(page.mPageId));
ui.treeWidget_Mods->addTopLevelItem(modItem);
}
else
{
moreData = false;
}
}
}
/***** Wiki *****/
void WikiDialog::requestWikiPage(const std::string &msgId)
{
RsTokReqOptions opts;
std::list<std::string> msgIds;
msgIds.push_back(msgId);
mWikiQueue->genericRequest(TOKENREQ_MSGDATA, opts, msgIds, WIKIDIALOG_WIKI_PAGE);
}
void WikiDialog::loadWikiPage(const uint32_t &token)
{
std::cerr << "WikiDialog::loadModPages()";
std::cerr << std::endl;
// Should only have one WikiPage....
bool moreData = true;
while(moreData)
{
RsWikiPage page;
if (rsWiki->getMsgData(token, page))
{
std::cerr << "WikiDialog::loadModPages() PageId: " << page.mPageId;
std::cerr << " Page: " << page.mName;
std::cerr << std::endl;
updateWikiPage(page);
}
else
{
moreData = false;
}
}
}
void WikiDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
{
std::cerr << "WikiDialog::loadRequest() UserType: " << req.mUserType;
std::cerr << std::endl;
if (queue == mWikiQueue)
{
/* now switch on req */
switch(req.mUserType)
{
case WIKIDIALOG_LISTING_GROUPLIST:
loadGroupList(req.mToken);
break;
case WIKIDIALOG_LISTING_GROUPDATA:
loadGroupData(req.mToken);
break;
case WIKIDIALOG_LISTING_ORIGINALPAGES:
loadOriginalPages(req.mToken);
break;
case WIKIDIALOG_LISTING_LATESTPAGES:
loadLatestPages(req.mToken);
break;
case WIKIDIALOG_LISTING_PAGES:
loadPages(req.mToken);
break;
case WIKIDIALOG_MOD_LIST:
loadModPageList(req.mToken);
break;
case WIKIDIALOG_MOD_PAGES:
loadModPages(req.mToken);
break;
case WIKIDIALOG_WIKI_PAGE:
loadWikiPage(req.mToken);
break;
default:
std::cerr << "PhotoDialog::loadRequest() ERROR: INVALID TYPE";
std::cerr << std::endl;
break;
}
}
}

37
retroshare-gui/src/gui/WikiPoos/WikiDialog.h
View file

@ -29,18 +29,22 @@
#include <retroshare/rswiki.h> #include <retroshare/rswiki.h>
#include "util/TokenQueue.h"
#include <map> #include <map>
class WikiAddDialog; class WikiAddDialog;
class WikiEditDialog; class WikiEditDialog;
class WikiDialog : public MainPage class WikiDialog : public MainPage, public TokenResponse
{ {
Q_OBJECT Q_OBJECT
public: public:
WikiDialog(QWidget *parent = 0); WikiDialog(QWidget *parent = 0);
void loadRequest(const TokenQueue *queue, const TokenRequest &req);
private slots: private slots:
void checkUpdate(); void checkUpdate();
@ -58,14 +62,41 @@ void clearGroupTree();
void clearModsTree(); void clearModsTree();
void insertWikiGroups(); void insertWikiGroups();
void insertModsForPage(std::string &origPageId); void insertModsForPage(const std::string &origPageId);
void updateWikiPage(const RsWikiPage &page); void updateWikiPage(const RsWikiPage &page);
bool getSelectedPage(std::string &pageId, std::string &origPageId);
std::string getSelectedPage(); std::string getSelectedPage();
std::string getSelectedGroup(); std::string getSelectedGroup();
std::string getSelectedMod(); std::string getSelectedMod();
void requestGroupList();
void loadGroupList(const uint32_t &token);
void requestGroupData(const std::list<std::string> &groupIds);
void loadGroupData(const uint32_t &token);
void requestOriginalPages(const std::list<std::string> &groupIds);
void loadOriginalPages(const uint32_t &token);
void requestLatestPages(const std::list<std::string> &msgIds);
void loadLatestPages(const uint32_t &token);
void requestPages(const std::list<std::string> &msgIds);
void loadPages(const uint32_t &token);
void requestModPageList(const std::string &origMsgId);
void loadModPageList(const uint32_t &token);
void requestModPages(const std::list<std::string> &msgIds);
void loadModPages(const uint32_t &token);
void requestWikiPage(const std::string &msgId);
void loadWikiPage(const uint32_t &token);
TokenQueue *mWikiQueue;
WikiAddDialog *mAddPageDialog; WikiAddDialog *mAddPageDialog;
WikiAddDialog *mAddGroupDialog; WikiAddDialog *mAddGroupDialog;
WikiEditDialog *mEditDialog; WikiEditDialog *mEditDialog;

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

@ -36,6 +36,7 @@ WikiEditDialog::WikiEditDialog(QWidget *parent)
connect(ui.pushButton_Revert, SIGNAL( clicked( void ) ), this, SLOT( revertEdit( void ) ) ); connect(ui.pushButton_Revert, SIGNAL( clicked( void ) ), this, SLOT( revertEdit( void ) ) );
connect(ui.pushButton_Submit, SIGNAL( clicked( void ) ), this, SLOT( submitEdit( void ) ) ); connect(ui.pushButton_Submit, SIGNAL( clicked( void ) ), this, SLOT( submitEdit( void ) ) );
mWikiQueue = new TokenQueue(rsWiki, this);
} }
void WikiEditDialog::setGroup(RsWikiGroup &group) void WikiEditDialog::setGroup(RsWikiGroup &group)
@ -107,4 +108,93 @@ void WikiEditDialog::submitEdit()
hide(); hide();
} }
void WikiEditDialog::setupData(const std::string &groupId, const std::string &pageId)
{
if (groupId != "")
{
requestGroup(groupId);
}
if (pageId != "")
{
requestPage(pageId);
}
}
/***** Request / Response for Data **********/
void WikiEditDialog::requestGroup(const std::string &groupId)
{
std::cerr << "WikiEditDialog::requestGroup()";
std::cerr << std::endl;
std::list<std::string> ids;
ids.push_back(groupId);
RsTokReqOptions opts;
mWikiQueue->genericRequest(TOKENREQ_GROUPDATA, opts, ids, 0);
}
void WikiEditDialog::loadGroup(const uint32_t &token)
{
std::cerr << "WikiEditDialog::loadGroup()";
std::cerr << std::endl;
RsWikiGroup group;
if (rsWiki->getGroupData(token, group))
{
setGroup(group);
}
}
void WikiEditDialog::requestPage(const std::string &msgId)
{
std::cerr << "WikiEditDialog::requestGroup()";
std::cerr << std::endl;
std::list<std::string> ids;
ids.push_back(msgId);
RsTokReqOptions opts;
mWikiQueue->genericRequest(TOKENREQ_MSGDATA, opts, ids, 0);
}
void WikiEditDialog::loadPage(const uint32_t &token)
{
std::cerr << "WikiEditDialog::loadPage()";
std::cerr << std::endl;
RsWikiPage page;
if (rsWiki->getMsgData(token, page))
{
setPreviousPage(page);
}
}
void WikiEditDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
{
std::cerr << "WikiEditDialog::loadRequest()";
std::cerr << std::endl;
if (queue == mWikiQueue)
{
/* now switch on req */
switch(req.mType)
{
case TOKENREQ_GROUPDATA:
loadGroup(req.mToken);
break;
case TOKENREQ_MSGDATA:
loadPage(req.mToken);
break;
default:
std::cerr << "WikiEditDialog::loadRequest() ERROR: INVALID TYPE";
std::cerr << std::endl;
break;
}
}
}

17
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.h
View file

@ -27,18 +27,20 @@
#include "ui_WikiEditDialog.h" #include "ui_WikiEditDialog.h"
#include <retroshare/rswiki.h> #include <retroshare/rswiki.h>
#include "util/TokenQueue.h"
class WikiEditDialog : public QWidget class WikiEditDialog : public QWidget, public TokenResponse
{ {
Q_OBJECT Q_OBJECT
public: public:
WikiEditDialog(QWidget *parent = 0); WikiEditDialog(QWidget *parent = 0);
void setGroup(RsWikiGroup &group);
void setPreviousPage(RsWikiPage &page);
void setNewPage(); void setNewPage();
void setupData(const std::string &groupId, const std::string &pageId);
void loadRequest(const TokenQueue *queue, const TokenRequest &req);
private slots: private slots:
void cancelEdit(); void cancelEdit();
@ -47,12 +49,21 @@ void submitEdit();
private: private:
void setGroup(RsWikiGroup &group);
void setPreviousPage(RsWikiPage &page);
void requestPage(const std::string &msgId);
void loadPage(const uint32_t &token);
void requestGroup(const std::string &groupId);
void loadGroup(const uint32_t &token);
bool mNewPage; bool mNewPage;
RsWikiGroup mWikiGroup; RsWikiGroup mWikiGroup;
RsWikiPage mWikiPage; RsWikiPage mWikiPage;
Ui::WikiEditDialog ui; Ui::WikiEditDialog ui;
TokenQueue *mWikiQueue;
}; };
#endif #endif

10
retroshare-gui/src/util/TokenQueue.cpp
View file

@ -39,13 +39,13 @@ TokenQueue::TokenQueue(RsTokenService *service, TokenResponse *resp)
return; return;
} }
bool TokenQueue::genericRequest(uint32_t basictype, std::list<std::string> ids, uint32_t usertype) bool TokenQueue::genericRequest(uint32_t basictype, const RsTokReqOptions &opts, std::list<std::string> ids, uint32_t usertype)
{ {
uint32_t token; uint32_t token;
switch(basictype) switch(basictype)
{ {
case TOKENREQ_GROUPLIST: case TOKENREQ_GROUPLIST:
mService->requestGroupList(token); mService->requestGroupList(token, opts);
break; break;
case TOKENREQ_GROUPDATA: case TOKENREQ_GROUPDATA:
@ -53,7 +53,11 @@ bool TokenQueue::genericRequest(uint32_t basictype, std::list<std::string> ids,
break; break;
case TOKENREQ_MSGLIST: case TOKENREQ_MSGLIST:
mService->requestMsgList(token, ids); mService->requestMsgList(token, opts, ids);
break;
case TOKENREQ_MSGRELATEDLIST:
mService->requestMsgRelatedList(token, opts, ids);
break; break;
case TOKENREQ_MSGDATA: case TOKENREQ_MSGDATA:

5
retroshare-gui/src/util/TokenQueue.h
View file

@ -39,7 +39,8 @@
#define TOKENREQ_GROUPLIST 1 #define TOKENREQ_GROUPLIST 1
#define TOKENREQ_GROUPDATA 2 #define TOKENREQ_GROUPDATA 2
#define TOKENREQ_MSGLIST 3 #define TOKENREQ_MSGLIST 3
#define TOKENREQ_MSGDATA 4 #define TOKENREQ_MSGRELATEDLIST 4
#define TOKENREQ_MSGDATA 5
class TokenQueue; class TokenQueue;
@ -71,7 +72,7 @@ public:
TokenQueue(RsTokenService *service, TokenResponse *resp); TokenQueue(RsTokenService *service, TokenResponse *resp);
/* generic handling of token / response update behaviour */ /* generic handling of token / response update behaviour */
bool genericRequest(uint32_t basictype, std::list<std::string> ids, uint32_t usertype); bool genericRequest(uint32_t basictype, const RsTokReqOptions &opt, std::list<std::string> ids, uint32_t usertype);
void queueRequest(uint32_t token, uint32_t basictype, uint32_t usertype); void queueRequest(uint32_t token, uint32_t basictype, uint32_t usertype);
bool checkForRequest(uint32_t token); bool checkForRequest(uint32_t token);
void loadRequest(const TokenRequest &req); void loadRequest(const TokenRequest &req);