Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 00:19:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a number of Wiki GUI bugs.

Browse Source 
- clear GxsIdChooser - so they don't accumulate.
 - Enable / Disable the New Page / Republish buttons.
 - Allow No Signatures for New Page / Republished pages.
 - clear Parent and Thread Id for new Page Submission.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6163 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-02-27 23:52:27 +00:00
parent ea8d71ee71
commit 2d74a3012a
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
View File

@ -596,6 +596,10 @@ void WikiDialog::wikiGroupChanged(const QString &groupId)
groupIds.push_back(mGroupId); groupIds.push_back(mGroupId);
requestPages(groupIds); requestPages(groupIds);
int subscribeFlags = ui.groupTreeWidget->subscribeFlags(QString::fromStdString(mGroupId));
ui.toolButton_NewPage->setEnabled(IS_GROUP_ADMIN(subscribeFlags));
ui.toolButton_Republish->setEnabled(IS_GROUP_ADMIN(subscribeFlags));
} }

6
retroshare-gui/src/gui/WikiPoos/WikiDialog.ui
View File

@ -127,17 +127,17 @@
<widget class="QTreeWidget" name="treeWidget_Pages"> <widget class="QTreeWidget" name="treeWidget_Pages">
<column> <column>
<property name="text"> <property name="text">
<string>Wiki Group</string> <string>Page Name</string>
</property> </property>
</column> </column>
<column> <column>
<property name="text"> <property name="text">
<string>Page</string> <string>Page Id</string>
</property> </property>
</column> </column>
<column> <column>
<property name="text"> <property name="text">
<string>Id</string> <string>Orig Id</string>
</property> </property>
</column> </column>
</widget> </widget>

12
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp
View File

@ -421,8 +421,8 @@ void WikiEditDialog::setNewPage()
ui.headerFrame->setHeaderText(tr("Create New Wiki Page")); ui.headerFrame->setHeaderText(tr("Create New Wiki Page"));
setWindowTitle(tr("Create New Wiki Page")); setWindowTitle(tr("Create New Wiki Page"));
/* fill in the available OwnIds for signing */ /* no need for for REQUIRED ID */
ui.comboBox_IdChooser->loadIds(IDCHOOSER_ID_REQUIRED, ""); ui.comboBox_IdChooser->loadIds(0, "");
textReset(); textReset();
} }
@ -433,6 +433,8 @@ void WikiEditDialog::setRepublishMode(RsGxsMessageId &origMsgId)
mRepublishMode = true; mRepublishMode = true;
mRepublishOrigId = origMsgId; mRepublishOrigId = origMsgId;
ui.pushButton_Submit->setText(tr("Republish")); ui.pushButton_Submit->setText(tr("Republish"));
/* no need for for REQUIRED ID */
ui.comboBox_IdChooser->loadIds(0, "");
} }
@ -469,9 +471,9 @@ void WikiEditDialog::submitEdit()
mWikiSnapshot.mMeta.mGroupId = mWikiCollection.mMeta.mGroupId; mWikiSnapshot.mMeta.mGroupId = mWikiCollection.mMeta.mGroupId;
mWikiSnapshot.mMeta.mOrigMsgId = ""; mWikiSnapshot.mMeta.mOrigMsgId = "";
mWikiSnapshot.mMeta.mMsgId = ""; mWikiSnapshot.mMeta.mMsgId = "";
#if 0 mWikiSnapshot.mMeta.mParentId = "";
mWikiSnapshot.mPrevId = ""; mWikiSnapshot.mMeta.mThreadId = "";
#endif
std::cerr << "WikiEditDialog::submitEdit() Is New Page"; std::cerr << "WikiEditDialog::submitEdit() Is New Page";
std::cerr << std::endl; std::cerr << std::endl;
} }

1
retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
View File

@ -38,6 +38,7 @@ void GxsIdChooser::loadIds(uint32_t chooserFlags, RsGxsId defId)
{ {
mFlags = chooserFlags; mFlags = chooserFlags;
mDefaultId = defId; mDefaultId = defId;
clear();
loadPrivateIds(); loadPrivateIds();
} }