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

merge of branch v0.6-idclean 7180

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,8 +143,8 @@ void WikiDialog::checkUpdate()
void WikiDialog::OpenOrShowAddPageDialog()
{
std::string groupId = getSelectedGroup();
if (groupId == "")
RsGxsGroupId groupId = getSelectedGroup();
if (groupId.isNull())
{
std::cerr << "WikiDialog::OpenOrShowAddPageDialog() No Group selected";
std::cerr << std::endl;
@ -159,7 +159,7 @@ void WikiDialog::OpenOrShowAddPageDialog()
std::cerr << "WikiDialog::OpenOrShowAddPageDialog() GroupId: " << groupId;
std::cerr << std::endl;
mEditDialog->setupData(groupId, "");
mEditDialog->setupData(groupId, RsGxsMessageId());
mEditDialog->setNewPage();
mEditDialog->show();
@ -185,8 +185,8 @@ void WikiDialog::newGroup()
void WikiDialog::showGroupDetails()
{
std::string groupId = getSelectedGroup();
if (groupId == "")
RsGxsGroupId groupId = getSelectedGroup();
if (groupId.isNull())
{
std::cerr << "WikiDialog::showGroupDetails() No Group selected";
std::cerr << std::endl;
@ -199,8 +199,8 @@ void WikiDialog::showGroupDetails()
void WikiDialog::editGroupDetails()
{
std::string groupId = getSelectedGroup();
if (groupId == "")
RsGxsGroupId groupId = getSelectedGroup();
if (groupId.isNull())
{
std::cerr << "WikiDialog::editGroupDetails() No Group selected";
std::cerr << std::endl;
@ -215,9 +215,9 @@ void WikiDialog::editGroupDetails()
void WikiDialog::OpenOrShowEditDialog()
{
std::string groupId;
std::string pageId;
std::string origPageId;
RsGxsGroupId groupId;
RsGxsMessageId pageId;
RsGxsMessageId origPageId;
if (!getSelectedPage(groupId, pageId, origPageId))
{
@ -242,9 +242,9 @@ void WikiDialog::OpenOrShowRepublishDialog()
{
OpenOrShowEditDialog();
std::string groupId;
std::string pageId;
std::string origPageId;
RsGxsGroupId groupId;
RsGxsMessageId pageId;
RsGxsMessageId origPageId;
if (!getSelectedPage(groupId, pageId, origPageId))
{
@ -264,9 +264,9 @@ void WikiDialog::OpenOrShowRepublishDialog()
void WikiDialog::groupTreeChanged()
{
/* */
std::string groupId;
std::string pageId;
std::string origPageId;
RsGxsGroupId groupId;
RsGxsMessageId pageId;
RsGxsMessageId origPageId;
getSelectedPage(groupId, pageId, origPageId);
if (pageId == mPageSelected)
@ -274,7 +274,7 @@ void WikiDialog::groupTreeChanged()
return; /* nothing changed */
}
if (pageId == "")
if (pageId.isNull())
{
/* clear Mods */
clearGroupTree();
@ -327,7 +327,7 @@ void WikiDialog::clearGroupTree()
#define WIKI_GROUP_COL_ORIGPAGEID 2
bool WikiDialog::getSelectedPage(std::string &groupId, std::string &pageId, std::string &origPageId)
bool WikiDialog::getSelectedPage(RsGxsGroupId &groupId, RsGxsMessageId &pageId, RsGxsMessageId &origPageId)
{
#ifdef WIKI_DEBUG
std::cerr << "WikiDialog::getSelectedPage()" << std::endl;
@ -347,13 +347,13 @@ bool WikiDialog::getSelectedPage(std::string &groupId, std::string &pageId, std:
/* check if it has changed */
groupId = getSelectedGroup();
if (groupId == "")
if (groupId.isNull())
{
return false;
}
pageId = item->text(WIKI_GROUP_COL_PAGEID).toStdString();
origPageId = item->text(WIKI_GROUP_COL_ORIGPAGEID).toStdString();
origPageId = RsGxsMessageId(item->text(WIKI_GROUP_COL_ORIGPAGEID).toStdString());
#ifdef WIKI_DEBUG
std::cerr << "WikiDialog::getSelectedPage() PageId: " << pageId << std::endl;
@ -362,7 +362,7 @@ bool WikiDialog::getSelectedPage(std::string &groupId, std::string &pageId, std:
}
std::string WikiDialog::getSelectedGroup()
const RsGxsGroupId& WikiDialog::getSelectedGroup()
{
#ifdef WIKI_DEBUG
std::cerr << "WikiDialog::getSelectedGroup(): " << mGroupId << std::endl;
@ -460,8 +460,8 @@ void WikiDialog::loadPages(const uint32_t &token)
QTreeWidgetItem *pageItem = new QTreeWidgetItem();
pageItem->setText(WIKI_GROUP_COL_PAGENAME, QString::fromStdString(page.mMeta.mMsgName));
pageItem->setText(WIKI_GROUP_COL_PAGEID, QString::fromStdString(page.mMeta.mMsgId));
pageItem->setText(WIKI_GROUP_COL_ORIGPAGEID, QString::fromStdString(page.mMeta.mOrigMsgId));
pageItem->setText(WIKI_GROUP_COL_PAGEID, QString::fromStdString(page.mMeta.mMsgId.toStdString()));
pageItem->setText(WIKI_GROUP_COL_ORIGPAGEID, QString::fromStdString(page.mMeta.mOrigMsgId.toStdString()));
ui.treeWidget_Pages->addTopLevelItem(pageItem);
}
@ -577,7 +577,7 @@ void WikiDialog::unsubscribeToGroup()
void WikiDialog::wikiSubscribe(bool subscribe)
{
if (mGroupId.empty()) {
if (mGroupId.isNull()) {
return;
}
@ -590,7 +590,7 @@ void WikiDialog::wikiGroupChanged(const QString &groupId)
{
mGroupId = groupId.toStdString();
if (mGroupId.empty()) {
if (mGroupId.isNull()) {
return;
}
@ -598,7 +598,7 @@ void WikiDialog::wikiGroupChanged(const QString &groupId)
groupIds.push_back(mGroupId);
requestPages(groupIds);
int subscribeFlags = ui.groupTreeWidget->subscribeFlags(QString::fromStdString(mGroupId));
int subscribeFlags = ui.groupTreeWidget->subscribeFlags(QString::fromStdString(mGroupId.toStdString()));
ui.toolButton_NewPage->setEnabled(IS_GROUP_ADMIN(subscribeFlags));
ui.toolButton_Republish->setEnabled(IS_GROUP_ADMIN(subscribeFlags));
@ -608,7 +608,7 @@ void WikiDialog::wikiGroupChanged(const QString &groupId)
void WikiDialog::groupListCustomPopupMenu(QPoint /*point*/)
{
int subscribeFlags = ui.groupTreeWidget->subscribeFlags(QString::fromStdString(mGroupId));
int subscribeFlags = ui.groupTreeWidget->subscribeFlags(QString::fromStdString(mGroupId.toStdString()));
QMenu contextMnu(this);
@ -625,10 +625,10 @@ void WikiDialog::groupListCustomPopupMenu(QPoint /*point*/)
std::cerr << std::endl;
QAction *action = contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Subscribe to Group"), this, SLOT(subscribeToGroup()));
action->setDisabled (mGroupId.empty() || IS_GROUP_SUBSCRIBED(subscribeFlags));
action->setDisabled (mGroupId.isNull() || IS_GROUP_SUBSCRIBED(subscribeFlags));
action = contextMnu.addAction(QIcon(IMAGE_UNSUBSCRIBE), tr("Unsubscribe to Group"), this, SLOT(unsubscribeToGroup()));
action->setEnabled (!mGroupId.empty() && IS_GROUP_SUBSCRIBED(subscribeFlags));
action->setEnabled (!mGroupId.isNull() && IS_GROUP_SUBSCRIBED(subscribeFlags));
contextMnu.addSeparator();
@ -636,7 +636,7 @@ void WikiDialog::groupListCustomPopupMenu(QPoint /*point*/)
action->setEnabled (!mGroupId.empty ());
action = contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Wiki Group"), this, SLOT(editGroupDetails()));
action->setEnabled (!mGroupId.empty() && IS_GROUP_ADMIN(subscribeFlags));
action->setEnabled (!mGroupId.isNull() && IS_GROUP_ADMIN(subscribeFlags));
/************** NOT ENABLED YET *****************/
@ -731,7 +731,7 @@ void WikiDialog::insertGroupsData(const std::list<RsGroupMetaData> &wikiList)
void WikiDialog::GroupMetaDataToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo)
{
groupItemInfo.id = QString::fromStdString(groupInfo.mGroupId);
groupItemInfo.id = QString::fromStdString(groupInfo.mGroupId.toStdString());
groupItemInfo.name = QString::fromUtf8(groupInfo.mGroupName.c_str());
//groupItemInfo.description = QString::fromUtf8(groupInfo.forumDesc);
groupItemInfo.popularity = groupInfo.mPop;