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

Improvements to Wiki.

Browse source 
- Enabled Selection of Snapshots in WikiEditDialog
 - Added CheckBoxes for Merge selection. (TODO).
 - Fixed up bugs related to text reload.
 - Removed Edits from main Wiki Page.
 - Added a Search Bar (TODO).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5937 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-12-04 00:47:34 +00:00
parent bcf9f443b4
commit c1702fc13a
6 changed files with 179 additions and 525 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,6 @@ WikiDialog::WikiDialog(QWidget *parent)
connect( ui.toolButton_Delete, SIGNAL(clicked()), this, SLOT(insertWikiGroups())); connect( ui.toolButton_Delete, SIGNAL(clicked()), this, SLOT(insertWikiGroups()));
connect( ui.treeWidget_Pages, SIGNAL(itemSelectionChanged()), this, SLOT(groupTreeChanged())); connect( ui.treeWidget_Pages, SIGNAL(itemSelectionChanged()), this, SLOT(groupTreeChanged()));
connect( ui.treeWidget_Mods, SIGNAL(itemSelectionChanged()), this, SLOT(modTreeChanged()));
QTimer *timer = new QTimer(this); QTimer *timer = new QTimer(this);
timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate()));
@ -123,17 +122,6 @@ 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
RsWikiCollection group;
if (!rsWiki->getGroup(groupId, group))
{
std::cerr << "WikiDialog::OpenOrShowAddPageDialog() Failed to Get Group";
std::cerr << std::endl;
}
mEditDialog->setGroup(group);
#endif
mEditDialog->setupData(groupId, ""); mEditDialog->setupData(groupId, "");
mEditDialog->setNewPage(); mEditDialog->setNewPage();
@ -144,18 +132,6 @@ void WikiDialog::OpenOrShowAddPageDialog()
void WikiDialog::OpenOrShowAddGroupDialog() void WikiDialog::OpenOrShowAddGroupDialog()
{ {
#if 0
if (mAddGroupDialog)
{
mAddGroupDialog->show();
}
else
{
mAddGroupDialog = new WikiAddDialog(NULL);
mAddGroupDialog->show();
}
#endif
newGroup(); newGroup();
} }
@ -166,8 +142,7 @@ void WikiDialog::OpenOrShowAddGroupDialog()
void WikiDialog::newGroup() void WikiDialog::newGroup()
{ {
WikiGroupDialog cf(mWikiQueue, this); WikiGroupDialog cf(mWikiQueue, this);
//cf.newGroup(); cf.wikitype();
cf.wikitype();
cf.exec (); cf.exec ();
} }
@ -181,11 +156,6 @@ void WikiDialog::showGroupDetails()
std::cerr << std::endl; std::cerr << std::endl;
return; return;
} }
//RsWikiCollection collection;
//WikiGroupDialog cf (collection, this);
//cf.exec ();
} }
void WikiDialog::editGroupDetails() void WikiDialog::editGroupDetails()
@ -223,25 +193,12 @@ void WikiDialog::OpenOrShowEditDialog()
std::cerr << "WikiDialog::OpenOrShowAddPageDialog()"; std::cerr << "WikiDialog::OpenOrShowAddPageDialog()";
std::cerr << std::endl; std::cerr << std::endl;
std::string modId = getSelectedMod();
std::string realPageId;
if (modId == "")
{
realPageId = pageId;
}
else
{
realPageId = modId;
}
if (!mEditDialog) if (!mEditDialog)
{ {
mEditDialog = new WikiEditDialog(NULL); mEditDialog = new WikiEditDialog(NULL);
} }
mEditDialog->setupData(groupId, realPageId); mEditDialog->setupData(groupId, pageId);
mEditDialog->show(); mEditDialog->show();
} }
@ -285,43 +242,14 @@ void WikiDialog::groupTreeChanged()
{ {
/* clear Mods */ /* clear Mods */
clearGroupTree(); clearGroupTree();
clearModsTree();
return; return;
} }
clearModsTree();
RsGxsGrpMsgIdPair origPagePair = std::make_pair(groupId, origPageId); RsGxsGrpMsgIdPair origPagePair = std::make_pair(groupId, origPageId);
RsGxsGrpMsgIdPair pagepair = std::make_pair(groupId, pageId); RsGxsGrpMsgIdPair pagepair = std::make_pair(groupId, pageId);
insertModsForPage(origPagePair);
requestWikiPage(pagepair); requestWikiPage(pagepair);
} }
void WikiDialog::modTreeChanged()
{
/* */
std::string groupId = getSelectedGroup();
std::string pageId = getSelectedMod();
if (pageId == mModSelected)
{
return; /* nothing changed */
}
if ((pageId == "") || (groupId == ""))
{
clearWikiPage();
return;
}
RsGxsGrpMsgIdPair pagepair = std::make_pair(groupId, pageId);
requestWikiPage(pagepair);
}
void WikiDialog::updateWikiPage(const RsWikiSnapshot &page) void WikiDialog::updateWikiPage(const RsWikiSnapshot &page)
{ {
#ifdef USE_PEGMMD_RENDERER #ifdef USE_PEGMMD_RENDERER
@ -354,12 +282,6 @@ void WikiDialog::clearGroupTree()
ui.treeWidget_Pages->clear(); ui.treeWidget_Pages->clear();
} }
void WikiDialog::clearModsTree()
{
ui.treeWidget_Mods->clear();
}
#define WIKI_GROUP_COL_GROUPNAME 0 #define WIKI_GROUP_COL_GROUPNAME 0
#define WIKI_GROUP_COL_GROUPID 1 #define WIKI_GROUP_COL_GROUPID 1
@ -448,37 +370,6 @@ std::string WikiDialog::getSelectedGroup()
return groupId; return groupId;
} }
#define WIKI_MODS_COL_ORIGPAGEID 0
#define WIKI_MODS_COL_PAGEID 1
#define WIKI_MODS_COL_PARENTID 2
std::string WikiDialog::getSelectedMod()
{
std::string pageId;
#ifdef WIKI_DEBUG
std::cerr << "WikiDialog::getSelectedMod()" << std::endl;
#endif
/* get current item */
QTreeWidgetItem *item = ui.treeWidget_Mods->currentItem();
if (!item)
{
/* leave current list */
#ifdef WIKI_DEBUG
std::cerr << "WikiDialog::getSelectedMod() Nothing selected" << std::endl;
#endif
return pageId;
}
pageId = item->text(WIKI_MODS_COL_PAGEID).toStdString();
#ifdef WIKI_DEBUG
std::cerr << "WikiDialog::getSelectedMod() PageId: " << pageId << std::endl;
#endif
return pageId;
}
/************************** Request / Response *************************/ /************************** Request / Response *************************/
/*** Loading Main Index ***/ /*** Loading Main Index ***/
@ -615,223 +506,8 @@ void WikiDialog::loadPages(const uint32_t &token)
} }
} }
/***** Mods *****/
void WikiDialog::insertModsForPage(const RsGxsGrpMsgIdPair &origPageId)
{
requestModPages(origPageId);
}
void WikiDialog::requestModPages(const RsGxsGrpMsgIdPair &origMsgId)
{
RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_MSG_RELATED_DATA;
opts.mOptions = RS_TOKREQOPT_MSG_VERSIONS;
std::vector<RsGxsGrpMsgIdPair> msgIds;
msgIds.push_back(origMsgId);
uint32_t token;
mWikiQueue->requestMsgRelatedInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, WIKIDIALOG_MOD_PAGES);
}
void WikiDialog::loadModPages(const uint32_t &token)
{
std::cerr << "WikiDialog::loadModPages()";
std::cerr << std::endl;
std::vector<RsWikiSnapshot> snapshots;
std::vector<RsWikiSnapshot>::iterator vit;
if (!rsWiki->getRelatedSnapshots(token, snapshots))
{
// ERROR
std::cerr << "WikiDialog::loadModPages() ERROR";
std::cerr << std::endl;
return;
}
for(vit = snapshots.begin(); vit != snapshots.end(); vit++)
{
RsWikiSnapshot &page = *vit;
std::cerr << "WikiDialog::loadModPages() TopLevel Result: PageTitle: " << page.mMeta.mMsgName;
std::cerr << " GroupId: " << page.mMeta.mGroupId;
std::cerr << std::endl;
std::cerr << "\tOrigMsgId: " << page.mMeta.mOrigMsgId;
std::cerr << " MsgId: " << page.mMeta.mMsgId;
std::cerr << std::endl;
std::cerr << "\tThreadId: " << page.mMeta.mThreadId;
std::cerr << " ParentId: " << page.mMeta.mParentId;
std::cerr << std::endl;
QTreeWidgetItem *modItem = new QTreeWidgetItem();
modItem->setText(WIKI_MODS_COL_ORIGPAGEID, QString::fromStdString(page.mMeta.mOrigMsgId));
modItem->setText(WIKI_MODS_COL_PAGEID, QString::fromStdString(page.mMeta.mMsgId));
modItem->setText(WIKI_MODS_COL_PARENTID, QString::fromStdString(page.mMeta.mParentId));
ui.treeWidget_Mods->addTopLevelItem(modItem);
}
/* then we need to request all pages from this thread */
requestEditTreeData();
}
void WikiDialog::requestEditTreeData() //const RsGxsGroupId &groupId)
{
std::string groupId = getSelectedGroup();
// SWITCH THIS TO A THREAD REQUEST - WHEN WE CAN!
RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA;
opts.mOptions = RS_TOKREQOPT_MSG_LATEST;
std::list<RsGxsGroupId> groupIds;
groupIds.push_back(groupId);
uint32_t token;
mWikiQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, WIKIDIALOG_EDITTREE_DATA);
}
void WikiDialog::loadEditTreeData(const uint32_t &token)
{
std::cerr << "WikiDialog::loadEditTreeData()";
std::cerr << std::endl;
std::vector<RsWikiSnapshot> snapshots;
std::vector<RsWikiSnapshot>::iterator vit;
if (!rsWiki->getSnapshots(token, snapshots))
{
// ERROR
std::cerr << "WikiDialog::loadEditTreeData() ERROR";
std::cerr << std::endl;
return;
}
std::string groupId;
std::string pageId;
std::string origPageId;
if (!getSelectedPage(groupId, pageId, origPageId))
{
// ERROR
std::cerr << "WikiDialog::loadEditTreeData() ERROR 2";
std::cerr << std::endl;
return;
}
std::cerr << "WikiDialog::loadEditTreeData() Loaded " << snapshots.size();
std::cerr << std::endl;
std::cerr << "WikiDialog::loadEditTreeData() Using ThreadId: " << origPageId;
std::cerr << std::endl;
std::map<RsGxsMessageId, QTreeWidgetItem *> items;
std::map<RsGxsMessageId, QTreeWidgetItem *>::iterator iit;
std::list<QTreeWidgetItem *> unparented;
std::list<QTreeWidgetItem *>::iterator uit;
// Grab the existing TopLevelItems, and insert into map.
int itemCount = ui.treeWidget_Mods->topLevelItemCount();
for (int nIndex = 0; nIndex < itemCount; nIndex++)
{
QTreeWidgetItem *item = ui.treeWidget_Mods->topLevelItem(nIndex);
/* index by MsgId --> ONLY For Wiki Thread Head Items... SPECIAL HACK FOR HERE! */
std::string msgId = item->text(WIKI_MODS_COL_PAGEID).toStdString();
items[msgId] = item;
}
for(vit = snapshots.begin(); vit != snapshots.end(); vit++)
{
RsWikiSnapshot &snapshot = *vit;
std::cerr << "Result: PageTitle: " << snapshot.mMeta.mMsgName;
std::cerr << " GroupId: " << snapshot.mMeta.mGroupId;
std::cerr << std::endl;
std::cerr << "\tOrigMsgId: " << snapshot.mMeta.mOrigMsgId;
std::cerr << " MsgId: " << snapshot.mMeta.mMsgId;
std::cerr << std::endl;
std::cerr << "\tThreadId: " << snapshot.mMeta.mThreadId;
std::cerr << " ParentId: " << snapshot.mMeta.mParentId;
std::cerr << std::endl;
if (snapshot.mMeta.mParentId == "")
{
/* Ignore! */
std::cerr << "Ignoring ThreadHead Item";
std::cerr << std::endl;
continue;
}
if (snapshot.mMeta.mThreadId != origPageId)
{
/* Ignore! */
std::cerr << "Ignoring Different Thread Item";
std::cerr << std::endl;
continue;
}
/* create an Entry */
QTreeWidgetItem *modItem = new QTreeWidgetItem();
modItem->setText(WIKI_MODS_COL_ORIGPAGEID, QString::fromStdString(snapshot.mMeta.mOrigMsgId));
modItem->setText(WIKI_MODS_COL_PAGEID, QString::fromStdString(snapshot.mMeta.mMsgId));
modItem->setText(WIKI_MODS_COL_PARENTID, QString::fromStdString(snapshot.mMeta.mParentId));
#if 0
/* if no parentId */
if (snapshot.mMeta.mParentId == "")
{
/* we've found one the missing ones */
ui.treeWidget_Mods->addTopLevelItem(modItem);
/* index by MsgId --> SPECIAL HACK FOR HERE! */
items[snapshot.mMeta.mMsgId] = modItem;
continue;
}
#endif
/* find the parent */
iit = items.find(snapshot.mMeta.mParentId);
if (iit != items.end())
{
(iit->second)->addChild(modItem);
}
else
{
unparented.push_back(modItem);
}
items[snapshot.mMeta.mOrigMsgId] = modItem;
}
for(uit = unparented.begin(); uit != unparented.end(); uit++)
{
std::string parentId = (*uit)->text(WIKI_MODS_COL_PARENTID).toStdString();
iit = items.find(parentId);
if (iit != items.end())
{
(iit->second)->addChild(*uit);
}
else
{
/* ERROR */
std::cerr << "Unparented!!!";
std::cerr << std::endl;
}
}
}
/***** Wiki *****/ /***** Wiki *****/
void WikiDialog::requestWikiPage(const RsGxsGrpMsgIdPair &msgId) void WikiDialog::requestWikiPage(const RsGxsGrpMsgIdPair &msgId)
{ {
std::cerr << "WikiDialog::requestWikiPage(" << msgId.first << "," << msgId.second << ")"; std::cerr << "WikiDialog::requestWikiPage(" << msgId.first << "," << msgId.second << ")";
@ -907,17 +583,10 @@ void WikiDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
loadPages(req.mToken); loadPages(req.mToken);
break; break;
case WIKIDIALOG_MOD_PAGES:
loadModPages(req.mToken);
break;
case WIKIDIALOG_EDITTREE_DATA:
loadEditTreeData(req.mToken);
break;
case WIKIDIALOG_WIKI_PAGE: case WIKIDIALOG_WIKI_PAGE:
loadWikiPage(req.mToken); loadWikiPage(req.mToken);
break; break;
#define GXSGROUP_NEWGROUPID 1 #define GXSGROUP_NEWGROUPID 1
case GXSGROUP_NEWGROUPID: case GXSGROUP_NEWGROUPID:
insertWikiGroups(); insertWikiGroups();

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

@ -54,7 +54,6 @@ private slots:
void OpenOrShowRepublishDialog(); void OpenOrShowRepublishDialog();
void groupTreeChanged(); void groupTreeChanged();
void modTreeChanged();
void newGroup(); void newGroup();
void showGroupDetails(); void showGroupDetails();
@ -66,20 +65,12 @@ private:
void clearWikiPage(); void clearWikiPage();
void clearGroupTree(); void clearGroupTree();
void clearModsTree();
void insertModsForPage(const std::string &origPageId);
void insertModsForPage(const RsGxsGrpMsgIdPair &origPageId);
void updateWikiPage(const RsWikiSnapshot &page); void updateWikiPage(const RsWikiSnapshot &page);
bool getSelectedPage(std::string &groupId, std::string &pageId, std::string &origPageId); bool getSelectedPage(std::string &groupId, std::string &pageId, std::string &origPageId);
std::string getSelectedPage(); std::string getSelectedPage();
std::string getSelectedGroup(); std::string getSelectedGroup();
std::string getSelectedMod();
void requestGroupList(); void requestGroupList();
void loadGroupData(const uint32_t &token); void loadGroupData(const uint32_t &token);
@ -87,12 +78,6 @@ void loadGroupData(const uint32_t &token);
void requestPages(const std::list<RsGxsGroupId> &groupIds); void requestPages(const std::list<RsGxsGroupId> &groupIds);
void loadPages(const uint32_t &token); void loadPages(const uint32_t &token);
void requestModPages(const RsGxsGrpMsgIdPair &origMsgId);
void loadModPages(const uint32_t &token);
void requestEditTreeData();
void loadEditTreeData(const uint32_t &token);
void requestWikiPage(const RsGxsGrpMsgIdPair &msgId); void requestWikiPage(const RsGxsGrpMsgIdPair &msgId);
void loadWikiPage(const uint32_t &token); void loadWikiPage(const uint32_t &token);

213
retroshare-gui/src/gui/WikiPoos/WikiDialog.ui
View file

@ -6,24 +6,21 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>918</width> <width>764</width>
<height>669</height> <height>514</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item row="0" column="0"> <item>
<widget class="QSplitter" name="splitter_2"> <widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="">
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<item> <item>
<widget class="QFrame" name="titleBarFrame"> <widget class="QFrame" name="titleBarFrame">
<property name="frameShape"> <property name="frameShape">
@ -96,88 +93,40 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QSplitter" name="splitter"> <widget class="QScrollArea" name="scrollArea_2">
<property name="orientation"> <property name="widgetResizable">
<enum>Qt::Vertical</enum> <bool>true</bool>
</property> </property>
<widget class="QScrollArea" name="scrollArea_2"> <widget class="QWidget" name="scrollAreaWidgetContents_2">
<property name="widgetResizable"> <property name="geometry">
<bool>true</bool> <rect>
<x>0</x>
<y>0</y>
<width>241</width>
<height>448</height>
</rect>
</property> </property>
<widget class="QWidget" name="scrollAreaWidgetContents_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="geometry"> <item>
<rect> <widget class="QTreeWidget" name="treeWidget_Pages">
<x>0</x> <column>
<y>0</y> <property name="text">
<width>241</width> <string>Wiki Group</string>
<height>307</height> </property>
</rect> </column>
</property> <column>
<layout class="QVBoxLayout" name="verticalLayout"> <property name="text">
<property name="leftMargin"> <string>Page</string>
<number>0</number> </property>
</property> </column>
<property name="topMargin"> <column>
<number>0</number> <property name="text">
</property> <string>Id</string>
<property name="rightMargin"> </property>
<number>0</number> </column>
</property> </widget>
<item> </item>
<widget class="QTreeWidget" name="treeWidget_Pages"> </layout>
<column>
<property name="text">
<string>Wiki Group</string>
</property>
</column>
<column>
<property name="text">
<string>Page</string>
</property>
</column>
<column>
<property name="text">
<string>Id</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</widget>
<widget class="QScrollArea" name="scrollArea_3">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents_4">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>241</width>
<height>294</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QTreeWidget" name="treeWidget_Mods">
<column>
<property name="text">
<string>Page Modification</string>
</property>
</column>
<column>
<property name="text">
<string>By</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</widget> </widget>
</item> </item>
@ -253,32 +202,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QToolButton" name="toolButton_PrevMod">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Mod</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/arrow-left.png</normaloff>:/images/arrow-left.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="toolButton_Republish"> <widget class="QToolButton" name="toolButton_Republish">
<property name="text"> <property name="text">
@ -325,32 +248,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QToolButton" name="toolButton_NextMod">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Mod</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/arrow-right.png</normaloff>:/images/arrow-right.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="Line" name="line_3"> <widget class="Line" name="line_3">
<property name="orientation"> <property name="orientation">
@ -436,27 +333,37 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>645</width> <width>491</width>
<height>609</height> <height>454</height>
</rect> </rect>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QWidget#scrollAreaWidgetContents{border: none;}</string> <string notr="true">QWidget#scrollAreaWidgetContents{border: none;}</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<widget class="QTextBrowser" name="textBrowser"/> <widget class="QLabel" name="label_3">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Search</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit"/>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QTextBrowser" name="textBrowser"/>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

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

@ -69,6 +69,8 @@ WikiEditDialog::WikiEditDialog(QWidget *parent)
connect(ui.toolButton_Hide, SIGNAL( clicked( void ) ), this, SLOT( detailsToggle( void ) ) ); connect(ui.toolButton_Hide, SIGNAL( clicked( void ) ), this, SLOT( detailsToggle( void ) ) );
connect(ui.textEdit, SIGNAL( textChanged( void ) ), this, SLOT( textChanged( void ) ) ); connect(ui.textEdit, SIGNAL( textChanged( void ) ), this, SLOT( textChanged( void ) ) );
connect(ui.checkBox_OldHistory, SIGNAL( clicked( void ) ), this, SLOT( oldHistoryChanged( void ) ) ); connect(ui.checkBox_OldHistory, SIGNAL( clicked( void ) ), this, SLOT( oldHistoryChanged( void ) ) );
connect(ui.checkBox_Merge, SIGNAL( clicked( void ) ), this, SLOT( mergeModeToggle( void ) ) );
connect(ui.pushButton_Merge, SIGNAL( clicked( void ) ), this, SLOT( generateMerge( void ) ) );
connect(ui.treeWidget_History, SIGNAL( itemSelectionChanged( void ) ), this, SLOT( historySelected( void ) ) ); connect(ui.treeWidget_History, SIGNAL( itemSelectionChanged( void ) ), this, SLOT( historySelected( void ) ) );
mWikiQueue = new TokenQueue(rsWiki->getTokenService(), this); mWikiQueue = new TokenQueue(rsWiki->getTokenService(), this);
@ -79,9 +81,14 @@ WikiEditDialog::WikiEditDialog(QWidget *parent)
mRepublishMode = false; mRepublishMode = false;
mPreviewMode = false; mPreviewMode = false;
mPageLoading = false; mPageLoading = false;
mIgnoreTextChange = false;
mTextChanged = false; mTextChanged = false;
mCurrentText = ""; mCurrentText = "";
mHistoryLoaded = false;
mHistoryMergeMode = false;
ui.checkBox_OldHistory->setChecked(false); ui.checkBox_OldHistory->setChecked(false);
mOldHistoryEnabled = false; mOldHistoryEnabled = false;
ui.groupBox_History->hide(); ui.groupBox_History->hide();
@ -93,8 +100,25 @@ WikiEditDialog::~WikiEditDialog()
delete (mThreadCompareRole); delete (mThreadCompareRole);
} }
void WikiEditDialog::mergeModeToggle()
{
mHistoryMergeMode = ui.checkBox_Merge->isChecked();
updateHistoryStatus();
}
void WikiEditDialog::generateMerge()
{
std::cerr << "WikiEditDialog::generateMerge() TODO" << std::endl;
}
void WikiEditDialog::textChanged() void WikiEditDialog::textChanged()
{ {
if (mIgnoreTextChange)
{
std::cerr << "WikiEditDialog::textChanged() Ignored" << std::endl;
return;
}
std::cerr << "WikiEditDialog::textChanged()" << std::endl; std::cerr << "WikiEditDialog::textChanged()" << std::endl;
mTextChanged = true; mTextChanged = true;
@ -127,6 +151,23 @@ void WikiEditDialog::textReset()
void WikiEditDialog::historySelected() void WikiEditDialog::historySelected()
{ {
std::cerr << "WikiEditDialog::historySelected()" << std::endl; std::cerr << "WikiEditDialog::historySelected()" << std::endl;
QList<QTreeWidgetItem *> selected = ui.treeWidget_History->selectedItems();
if (selected.empty())
{
std::cerr << "WikiEditDialog::historySelected() ERROR Nothing selected" << std::endl;
return;
}
QTreeWidgetItem *item = *(selected.begin());
RsGxsGrpMsgIdPair newSnapshot = mThreadMsgIdPair;
std::string pageId = item->data(WET_DATA_COLUMN, WET_ROLE_PAGEID).toString().toStdString();
newSnapshot.second = pageId;
std::cerr << "WikiEditDialog::historySelected() New PageId: " << pageId;
std::cerr << std::endl;
requestPage(newSnapshot);
} }
@ -139,6 +180,9 @@ void WikiEditDialog::oldHistoryChanged()
void WikiEditDialog::updateHistoryStatus() void WikiEditDialog::updateHistoryStatus()
{ {
std::cerr << "WikiEditDialog::updateHistoryStatus()";
std::cerr << std::endl;
/* iterate through every History Item */ /* iterate through every History Item */
int count = ui.treeWidget_History->topLevelItemCount(); int count = ui.treeWidget_History->topLevelItemCount();
for(int i = 0; i < count; i++) for(int i = 0; i < count; i++)
@ -180,12 +224,35 @@ void WikiEditDialog::updateHistoryItem(QTreeWidgetItem *item, bool isLatest)
if (isSelectable) if (isSelectable)
{ {
std::cerr << "WikiEditDialog::updateHistoryItem() isSelectable";
std::cerr << std::endl;
item->setFlags(Qt::ItemIsSelectable | item->setFlags(Qt::ItemIsSelectable |
Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
if (mHistoryMergeMode)
{
QVariant qvar = item->data(WET_COL_PAGEID, Qt::CheckStateRole);
std::cerr << "WikiEditDialog::CheckStateRole:: VariantType: " << (int) qvar.type();
std::cerr << std::endl;
if (!qvar.isValid())
{
item->setData(WET_COL_PAGEID, Qt::CheckStateRole, Qt::Unchecked);
}
}
else
{
item->setData(WET_COL_PAGEID, Qt::CheckStateRole, QVariant());
}
} }
else else
{ {
item->setFlags(0); std::cerr << "WikiEditDialog::updateHistoryItem() NOT isSelectable";
std::cerr << std::endl;
item->setData(WET_COL_PAGEID, Qt::CheckStateRole, QVariant());
item->setFlags(Qt::ItemIsUserCheckable);
} }
} }
@ -241,8 +308,6 @@ void WikiEditDialog::previewToggle()
std::cerr << "WikiEditDialog::previewToggle()"; std::cerr << "WikiEditDialog::previewToggle()";
std::cerr << std::endl; std::cerr << std::endl;
bool prevTextChanged = mTextChanged;
if (mPreviewMode) if (mPreviewMode)
{ {
mPreviewMode = false; mPreviewMode = false;
@ -255,16 +320,11 @@ void WikiEditDialog::previewToggle()
mPreviewMode = true; mPreviewMode = true;
ui.pushButton_Preview->setText(tr("Edit Page")); ui.pushButton_Preview->setText(tr("Edit Page"));
} }
if (!mPageLoading)
{
redrawPage();
}
/* fix textChanged signal - if we have caused it to change */
if (!prevTextChanged) mIgnoreTextChange = true;
{ redrawPage();
textReset(); mIgnoreTextChange = false;
}
std::cerr << "WikiEditDialog::previewToggle() END"; std::cerr << "WikiEditDialog::previewToggle() END";
std::cerr << std::endl; std::cerr << std::endl;
@ -334,7 +394,11 @@ void WikiEditDialog::setPreviousPage(RsWikiSnapshot &page)
ui.lineEdit_Page->setText(QString::fromStdString(mWikiSnapshot.mMeta.mMsgName)); ui.lineEdit_Page->setText(QString::fromStdString(mWikiSnapshot.mMeta.mMsgName));
ui.lineEdit_PrevVersion->setText(QString::fromStdString(mWikiSnapshot.mMeta.mMsgId)); ui.lineEdit_PrevVersion->setText(QString::fromStdString(mWikiSnapshot.mMeta.mMsgId));
mCurrentText = QString::fromUtf8(mWikiSnapshot.mPage.c_str()); mCurrentText = QString::fromUtf8(mWikiSnapshot.mPage.c_str());
redrawPage();
mIgnoreTextChange = true;
redrawPage();
mIgnoreTextChange = false;
textReset(); textReset();
} }
@ -343,6 +407,7 @@ void WikiEditDialog::setNewPage()
{ {
mNewPage = true; mNewPage = true;
mRepublishMode = false; mRepublishMode = false;
mHistoryLoaded = false;
ui.lineEdit_Page->setText(""); ui.lineEdit_Page->setText("");
ui.lineEdit_PrevVersion->setText(""); ui.lineEdit_PrevVersion->setText("");
@ -364,6 +429,7 @@ void WikiEditDialog::setRepublishMode(RsGxsMessageId &origMsgId)
{ {
mRepublishMode = true; mRepublishMode = true;
mRepublishOrigId = origMsgId; mRepublishOrigId = origMsgId;
ui.pushButton_Submit->setText(tr("Republish"));
} }
@ -486,6 +552,7 @@ void WikiEditDialog::submitEdit()
void WikiEditDialog::setupData(const std::string &groupId, const std::string &pageId) void WikiEditDialog::setupData(const std::string &groupId, const std::string &pageId)
{ {
mRepublishMode = false; mRepublishMode = false;
mHistoryLoaded = false;
if (groupId != "") if (groupId != "")
{ {
requestGroup(groupId); requestGroup(groupId);
@ -495,12 +562,11 @@ void WikiEditDialog::setupData(const std::string &groupId, const std::string &pa
{ {
RsGxsGrpMsgIdPair msgId = std::make_pair(groupId, pageId); RsGxsGrpMsgIdPair msgId = std::make_pair(groupId, pageId);
requestPage(msgId); requestPage(msgId);
} }
ui.headerFrame->setHeaderImage(QPixmap(":/images/story-editor_48.png"));
ui.headerFrame->setHeaderImage(QPixmap(":/images/story-editor_48.png")); ui.headerFrame->setHeaderText(tr("Edit Wiki Page"));
ui.headerFrame->setHeaderText(tr("Edit Wiki Page")); setWindowTitle(tr("Edit Wiki Page"));
setWindowTitle(tr("Edit Wiki Page"));
} }
@ -584,7 +650,10 @@ void WikiEditDialog::loadPage(const uint32_t &token)
{ {
mThreadMsgIdPair.second = page.mMeta.mThreadId; mThreadMsgIdPair.second = page.mMeta.mThreadId;
} }
requestBaseHistory(mThreadMsgIdPair); if (!mHistoryLoaded)
{
requestBaseHistory(mThreadMsgIdPair);
}
} }
mPageLoading = false; mPageLoading = false;
} }
@ -801,6 +870,7 @@ void WikiEditDialog::loadEditTreeData(const uint32_t &token)
} }
// Enable / Disable Items. // Enable / Disable Items.
mHistoryLoaded = true;
updateHistoryStatus(); updateHistoryStatus();
} }

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

@ -59,6 +59,8 @@ void textReset();
void historySelected(); void historySelected();
void oldHistoryChanged(); void oldHistoryChanged();
void mergeModeToggle();
void generateMerge();
private: private:
@ -87,9 +89,12 @@ void loadEditTreeData(const uint32_t &token);
bool mPreviewMode; bool mPreviewMode;
bool mPageLoading; bool mPageLoading;
bool mHistoryLoaded;
bool mHistoryMergeMode;
bool mOldHistoryEnabled; bool mOldHistoryEnabled;
bool mRepublishMode; bool mRepublishMode;
bool mIgnoreTextChange; // when we do it programmatically.
bool mTextChanged; bool mTextChanged;
QString mCurrentText; QString mCurrentText;

24
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>731</width> <width>946</width>
<height>701</height> <height>568</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -28,6 +28,7 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<zorder>splitter_History</zorder>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@ -54,7 +55,7 @@
<property name="title"> <property name="title">
<string>Page Edit History</string> <string>Page Edit History</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,0"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QCheckBox" name="checkBox_OldHistory"> <widget class="QCheckBox" name="checkBox_OldHistory">
<property name="text"> <property name="text">
@ -62,6 +63,23 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="checkBox_Merge">
<property name="text">
<string>Chose for Merge</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_Merge">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Merge for Republish (TODO)</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QTreeWidget" name="treeWidget_History"> <widget class="QTreeWidget" name="treeWidget_History">
<column> <column>