From dfcb66db8cf6e2087a25cba94aa5fee207c903af Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 3 Feb 2017 13:02:53 +0100
Subject: [PATCH] added spinbox to show older versions

---
 .../src/gui/gxsforums/CreateGxsForumMsg.cpp       | 15 ++++++++-------
 .../src/gui/gxsforums/GxsForumThreadWidget.ui     | 13 ++++++++-----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
index 6e8954272..c3098b0ae 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
@@ -212,14 +212,19 @@ void  CreateGxsForumMsg::loadFormInformation()
 
 	//std::cerr << "CreateGxsForumMsg::loadMsgInformation() using signFlags=" << std::hex << mForumMeta.mSignFlags << std::dec << std::endl;
     
-    	if( (mForumMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) || (mForumMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN))
+	if( (mForumMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) || (mForumMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN))
 		ui.idChooser->setFlags(IDCHOOSER_ID_REQUIRED | IDCHOOSER_NON_ANONYMOUS) ;
-        else
+	else
 		ui.idChooser->setFlags(IDCHOOSER_ID_REQUIRED) ;
     	
 	QString name = QString::fromUtf8(mForumMeta.mGroupName.c_str());
 	QString subj;
-        if (!mParentId.isNull())
+
+    if(!mOrigMsgId.isNull())
+    {
+        subj = QString::fromUtf8(mParentMsg.mMeta.mMsgName.c_str());
+    }
+	else if (!mParentId.isNull())
 	{
 		QString title = QString::fromUtf8(mParentMsg.mMeta.mMsgName.c_str());
 		name += " " + tr("In Reply to") + ": ";
@@ -228,13 +233,9 @@ void  CreateGxsForumMsg::loadFormInformation()
 		QString text = title;
 
 		if (text.startsWith("Re:", Qt::CaseInsensitive))
-		{
 			subj = title;
-		}
 		else
-		{
 			subj = "Re: " + title;
-		}
 	}
 
 	ui.forumName->setText(misc::removeNewLine(name));
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index 3a93e9973..8304dd0a9 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -296,7 +296,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="12">
+         <item row="0" column="13">
           <widget class="QPushButton" name="nextUnreadButton">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@@ -332,7 +332,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="14">
+         <item row="0" column="15">
           <widget class="QPushButton" name="expandButton">
            <property name="maximumSize">
             <size>
@@ -372,7 +372,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="11">
+         <item row="0" column="12">
           <spacer name="postHSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -464,20 +464,23 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="10">
+         <item row="0" column="11">
           <widget class="GxsIdLabel" name="by_label">
            <property name="text">
             <string notr="true"/>
            </property>
           </widget>
          </item>
-         <item row="0" column="9">
+         <item row="0" column="10">
           <widget class="QLabel" name="by_text_label">
            <property name="text">
             <string>By </string>
            </property>
           </widget>
          </item>
+         <item row="0" column="9">
+          <widget class="QSpinBox" name="version_SB"/>
+         </item>
         </layout>
        </item>
       </layout>