From 664d1e02c5463f17ac91904f1d42d58142dc6a7f Mon Sep 17 00:00:00 2001
From: drbob <retroshare.project@gmail.com>
Date: Mon, 10 Dec 2012 19:26:33 +0000
Subject: [PATCH]  * Added IdChooser to WikiEditDialog  * 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
---
 .../src/gui/WikiPoos/WikiDialog.cpp           |  1 -
 .../src/gui/WikiPoos/WikiEditDialog.cpp       | 21 +++++++++++++++++++
 .../src/gui/WikiPoos/WikiEditDialog.ui        |  9 +++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
index 76b493259..bf11fcd91 100644
--- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
+++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
@@ -84,7 +84,6 @@ WikiDialog::WikiDialog(QWidget *parent)
 	timer->start(1000);
 
 	/* setup TokenQueue */
-        rsWiki->generateDummyData();
         mWikiQueue = new TokenQueue(rsWiki->getTokenService(), this);
 
 }
diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp
index d57e243bc..478ae1039 100644
--- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp
+++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp
@@ -421,6 +421,9 @@ void WikiEditDialog::setNewPage()
 	ui.headerFrame->setHeaderText(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();
 }
 
@@ -529,6 +532,19 @@ void WikiEditDialog::submitEdit()
 		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 << std::endl;
 	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 << std::endl;
 	std::cerr << "WikiEditDialog::submitEdit() ParentId: " << mWikiSnapshot.mMeta.mParentId;
+	std::cerr << "WikiEditDialog::submitEdit() AuthorId: " << mWikiSnapshot.mMeta.mAuthorId;
 	std::cerr << std::endl;
 
 	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->setHeaderText(tr("Edit Wiki Page"));
 	setWindowTitle(tr("Edit Wiki Page"));
+
+        /* fill in the available OwnIds for signing */
+        ui.comboBox_IdChooser->loadIds(IDCHOOSER_ID_REQUIRED, "");
+
 }
 
 
diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui
index 9ec209d8c..698ff4ee3 100644
--- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui
+++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui
@@ -28,7 +28,6 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <zorder>splitter_History</zorder>
     </widget>
    </item>
    <item row="1" column="0">
@@ -264,6 +263,9 @@
               </property>
              </spacer>
             </item>
+            <item>
+             <widget class="GxsIdChooser" name="comboBox_IdChooser"/>
+            </item>
             <item>
              <widget class="QLabel" name="label_Status">
               <property name="text">
@@ -337,6 +339,11 @@
    <header>gui/common/HeaderFrame.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>GxsIdChooser</class>
+   <extends>QComboBox</extends>
+   <header>gui/gxs/GxsIdChooser.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="Wiki_images.qrc"/>