From 1f253f6bfa7f33052e6a13920cbfac4a01ef74dc Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 20 Sep 2020 21:46:31 +0200
Subject: [PATCH] using a simple comments tree in tab in order to avoid layout
 problems

---
 .../src/gui/Posted/BoardPostDisplayWidget.cpp |  29 +----
 .../src/gui/Posted/BoardPostDisplayWidget.h   |   1 -
 .../src/gui/Posted/BoardPostDisplayWidget.ui  |   2 +-
 .../gui/Posted/PostedListWidgetWithModel.cpp  |   9 +-
 .../src/gui/gxs/GxsCommentDialog.cpp          |   4 +-
 .../src/gui/gxs/GxsCommentDialog.ui           | 100 +++++++-----------
 .../GxsChannelPostsWidgetWithModel.ui         |  18 ++--
 retroshare-gui/src/retroshare-gui.pro         |   2 +-
 8 files changed, 60 insertions(+), 105 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
index ca84a8d25..ca8ea4850 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
@@ -55,11 +55,7 @@ BoardPostDisplayWidget::BoardPostDisplayWidget(const RsPostedPost& post, Display
     ui->setupUi(this);
     setup();
 
-    if(mode != DISPLAY_MODE_COMMENTS)
-        ui->verticalLayout->addStretch();
-    else
-        ui->commentsWidget->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::MinimumExpanding);
-
+    ui->verticalLayout->addStretch();
     ui->verticalLayout->setAlignment(Qt::AlignTop);
     ui->topLayout->setAlignment(Qt::AlignTop);
     ui->arrowsLayout->addStretch();
@@ -184,24 +180,6 @@ void BoardPostDisplayWidget::setup()
         ui->siteLabel->hide();
     }
         break;
-    case DISPLAY_MODE_COMMENTS:
-    {
-        ui->pictureLabel_compact->show();
-        ui->expandButton->hide();
-        ui->pictureLabel->hide();
-        ui->notes->hide();
-        ui->scoreLabel->hide();
-        ui->voteDownButton->hide();
-        ui->voteUpButton->hide();
-        ui->siteLabel->hide();
-        ui->newLabel->hide();
-        ui->commentButton->hide();
-        ui->expandButton->hide();
-        ui->shareButton->hide();
-        ui->readButton->hide();
-        ui->newLabel->hide();
-    }
-        break;
     case DISPLAY_MODE_CARD_VIEW:
     {
         ui->frame_picture->hide();
@@ -341,7 +319,7 @@ void BoardPostDisplayWidget::setup()
 
         ui->siteLabel->setText(sitestr);
 
-        if(dmode == DISPLAY_MODE_COMPACT || dmode == DISPLAY_MODE_COMMENTS)
+        if(dmode == DISPLAY_MODE_COMPACT)
         {
             if(mPost.mImage.mData != NULL)
             {
@@ -403,8 +381,7 @@ void BoardPostDisplayWidget::setup()
 
     // feed.
     //frame_comment->show();
-    if(dmode != DISPLAY_MODE_COMMENTS)
-        ui->commentButton->show();
+    ui->commentButton->show();
 
     if (mPost.mComments)
     {
diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
index d8ce2d568..e36e1a56a 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
@@ -40,7 +40,6 @@ public:
         DISPLAY_MODE_UNKNOWN   = 0x00,
         DISPLAY_MODE_CARD_VIEW = 0x01,
         DISPLAY_MODE_COMPACT   = 0x02,
-        DISPLAY_MODE_COMMENTS  = 0x03,
     };
 
     enum DisplayFlags: uint8_t {
diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.ui b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.ui
index 7fde763f4..ae8bd01de 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.ui
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.ui
@@ -134,7 +134,7 @@
           <item>
            <widget class="ClickableLabel" name="pictureLabel_compact">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index d6f5dbe4a..805e75747 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -29,6 +29,7 @@
 #include "ui_PostedListWidgetWithModel.h"
 #include "gui/feeds/GxsChannelPostItem.h"
 #include "gui/gxs/GxsIdDetails.h"
+#include "gui/gxs/GxsCommentDialog.h"
 #include "util/misc.h"
 #include "gui/Posted/PostedCreatePostDialog.h"
 #include "gui/common/UIStateHelper.h"
@@ -653,14 +654,16 @@ void PostedListWidgetWithModel::openComments(const RsGxsMessageId& msgId)
         return;
 
     RsPostedPost post = index.data(Qt::UserRole).value<RsPostedPost>() ;
-    BoardPostDisplayWidget *w = new BoardPostDisplayWidget(post,BoardPostDisplayWidget::DISPLAY_MODE_COMMENTS,BoardPostDisplayWidget::SHOW_COMMENTS);
+    auto *commentDialog = new GxsCommentDialog(this,rsPosted->getTokenService(),rsPosted);
+
+    std::set<RsGxsMessageId> msg_versions({post.mMeta.mMsgId});
+    commentDialog->commentLoad(post.mMeta.mGroupId, msg_versions, post.mMeta.mMsgId);
 
     QString title = QString::fromUtf8(post.mMeta.mMsgName.c_str());
     if(title.length() > 30)
         title = title.left(27) + "...";
 
-    ui->tabWidget->addTab(w,title);
-    ui->tabWidget->layout();
+    ui->tabWidget->addTab(commentDialog,title);
 }
 
 void PostedListWidgetWithModel::tabCloseRequested(int index)
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
index 01455e6a3..7797b39f1 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
@@ -152,10 +152,10 @@ void GxsCommentDialog::setCommentHeader(QWidget *header)
 	//header->setParent(ui->postFrame);
 	//ui->postFrame->setVisible(true);
 
-	QLayout *alayout = ui->postFrame->layout();
+#if 0
+    QLayout *alayout = ui->postFrame->layout();
 	alayout->addWidget(header);
 
-#if 0
 	ui->postFrame->setVisible(true);
 
 	QDateTime qtime;
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.ui b/retroshare-gui/src/gui/gxs/GxsCommentDialog.ui
index 0328eef9f..e23a16b44 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.ui
+++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.ui
@@ -20,31 +20,55 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="GxsCommentDialogGLayout">
-   <item row="0" column="0">
-    <widget class="QFrame" name="postFrame">
+   <item row="1" column="0">
+    <widget class="GxsCommentTreeWidget" name="treeWidget">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+      <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <layout class="QVBoxLayout" name="postFrameVLayout">
-      <property name="leftMargin">
-       <number>1</number>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <column>
+      <property name="text">
+       <string>Comment</string>
       </property>
-      <property name="topMargin">
-       <number>1</number>
+     </column>
+     <column>
+      <property name="text">
+       <string>Author</string>
       </property>
-      <property name="rightMargin">
-       <number>1</number>
+     </column>
+     <column>
+      <property name="text">
+       <string>Date</string>
       </property>
-      <property name="bottomMargin">
-       <number>1</number>
+     </column>
+     <column>
+      <property name="text">
+       <string>Score</string>
       </property>
-     </layout>
+     </column>
+     <column>
+      <property name="text">
+       <string>UpVotes</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>DownVotes</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>OwnVote</string>
+      </property>
+     </column>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="0" column="0">
     <layout class="QHBoxLayout" name="toolBarHLayout">
      <item>
       <widget class="QToolButton" name="commentButton">
@@ -147,54 +171,6 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <widget class="GxsCommentTreeWidget" name="treeWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="sortingEnabled">
-      <bool>true</bool>
-     </property>
-     <column>
-      <property name="text">
-       <string>Comment</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Author</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Date</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Score</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>UpVotes</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>DownVotes</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>OwnVote</string>
-      </property>
-     </column>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
index d6b45252f..61045dd7f 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
@@ -428,7 +428,7 @@ p, li { white-space: pre-wrap; }
            </font>
           </property>
           <property name="currentIndex">
-           <number>1</number>
+           <number>2</number>
           </property>
           <widget class="QWidget" name="tab">
            <attribute name="title">
@@ -593,16 +593,16 @@ p, li { white-space: pre-wrap; }
    <extends>QToolButton</extends>
    <header>gui/common/SubscribeToolButton.h</header>
   </customwidget>
-  <customwidget>
-   <class>StyledElidedLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/common/StyledElidedLabel.h</header>
-  </customwidget>
   <customwidget>
    <class>RSTreeView</class>
    <extends>QTreeView</extends>
    <header>gui/common/RSTreeView.h</header>
   </customwidget>
+  <customwidget>
+   <class>LineEditClear</class>
+   <extends>QLineEdit</extends>
+   <header>gui/common/LineEditClear.h</header>
+  </customwidget>
   <customwidget>
    <class>GxsCommentDialog</class>
    <extends>QWidget</extends>
@@ -610,9 +610,9 @@ p, li { white-space: pre-wrap; }
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>LineEditClear</class>
-   <extends>QLineEdit</extends>
-   <header>gui/common/LineEditClear.h</header>
+   <class>StyledElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/StyledElidedLabel.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index ab02f16a1..80035a460 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -1409,7 +1409,7 @@ posted {
 		gui/Posted/PostedItem.ui \
 		gui/Posted/PostedCardView.ui \
 		gui/Posted/PostedCreatePostDialog.ui \
-		gui/Posted/PhotoView.ui 
+		gui/Posted/PhotoView.ui \
 		#gui/Posted/PostedDialog.ui \
 		#gui/Posted/PostedComments.ui \
 		#gui/Posted/PostedCreateCommentDialog.ui