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

* Added IdChooser to WikiEditDialog

Browse source 
* removed generateDummyData() from gui.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5962 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-12-10 19:26:33 +00:00
parent 5be03af4cd
commit 664d1e02c5
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,6 @@ WikiDialog::WikiDialog(QWidget *parent)
timer->start(1000); timer->start(1000);
/* setup TokenQueue */ /* setup TokenQueue */
rsWiki->generateDummyData();
mWikiQueue = new TokenQueue(rsWiki->getTokenService(), this); mWikiQueue = new TokenQueue(rsWiki->getTokenService(), this);
} }

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

@ -421,6 +421,9 @@ 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 */
ui.comboBox_IdChooser->loadIds(IDCHOOSER_ID_REQUIRED, "");
textReset(); textReset();
} }
@ -529,6 +532,19 @@ void WikiEditDialog::submitEdit()
mWikiSnapshot.mPage = std::string(byte_array.data()); mWikiSnapshot.mPage = std::string(byte_array.data());
} }
RsGxsId authorId;
if (ui.comboBox_IdChooser->getChosenId(authorId))
{
mWikiSnapshot.mMeta.mAuthorId = authorId;
std::cerr << "CreateGxsForumMsg::createMsg() AuthorId: " << authorId;
std::cerr << std::endl;
}
else
{
std::cerr << "CreateGxsForumMsg::createMsg() ERROR GETTING AuthorId!";
std::cerr << std::endl;
}
std::cerr << "WikiEditDialog::submitEdit() PageTitle: " << mWikiSnapshot.mMeta.mMsgName; std::cerr << "WikiEditDialog::submitEdit() PageTitle: " << mWikiSnapshot.mMeta.mMsgName;
std::cerr << std::endl; std::cerr << std::endl;
std::cerr << "WikiEditDialog::submitEdit() GroupId: " << mWikiSnapshot.mMeta.mGroupId; std::cerr << "WikiEditDialog::submitEdit() GroupId: " << mWikiSnapshot.mMeta.mGroupId;
@ -540,6 +556,7 @@ void WikiEditDialog::submitEdit()
std::cerr << "WikiEditDialog::submitEdit() ThreadId: " << mWikiSnapshot.mMeta.mThreadId; std::cerr << "WikiEditDialog::submitEdit() ThreadId: " << mWikiSnapshot.mMeta.mThreadId;
std::cerr << std::endl; std::cerr << std::endl;
std::cerr << "WikiEditDialog::submitEdit() ParentId: " << mWikiSnapshot.mMeta.mParentId; std::cerr << "WikiEditDialog::submitEdit() ParentId: " << mWikiSnapshot.mMeta.mParentId;
std::cerr << "WikiEditDialog::submitEdit() AuthorId: " << mWikiSnapshot.mMeta.mAuthorId;
std::cerr << std::endl; std::cerr << std::endl;
uint32_t token; uint32_t token;
@ -567,6 +584,10 @@ void WikiEditDialog::setupData(const std::string &groupId, const std::string &pa
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"));
/* fill in the available OwnIds for signing */
ui.comboBox_IdChooser->loadIds(IDCHOOSER_ID_REQUIRED, "");
} }

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

@ -28,7 +28,6 @@
<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">
@ -264,6 +263,9 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="GxsIdChooser" name="comboBox_IdChooser"/>
</item>
<item> <item>
<widget class="QLabel" name="label_Status"> <widget class="QLabel" name="label_Status">
<property name="text"> <property name="text">
@ -337,6 +339,11 @@
<header>gui/common/HeaderFrame.h</header> <header>gui/common/HeaderFrame.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>GxsIdChooser</class>
<extends>QComboBox</extends>
<header>gui/gxs/GxsIdChooser.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="Wiki_images.qrc"/> <include location="Wiki_images.qrc"/>