From a14269489649c9d62f60a574305d63bcc06d6222 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 18 Sep 2020 21:59:57 +0200
Subject: [PATCH] preserve sorting strategy when updating posts

---
 .../gui/Posted/PostedListWidgetWithModel.cpp  |  7 ++++---
 .../gui/Posted/PostedListWidgetWithModel.ui   | 20 +++++++++----------
 .../src/gui/Posted/PostedPostsModel.cpp       |  5 ++++-
 .../src/gui/Posted/PostedPostsModel.h         |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index 1e2c648b6..08295926d 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -260,6 +260,7 @@ PostedListWidgetWithModel::PostedListWidgetWithModel(const RsGxsGroupId& postedI
 
     mPostedPostsDelegate->setDisplayMode(BoardPostDisplayWidget::DISPLAY_MODE_CARD_VIEW);
     switchDisplayMode();	// makes everything consistent and chooses classic view as default
+    updateSorting(ui->sortStrategy_CB->currentIndex());
 
 	mEventHandlerId = 0;
 	// Needs to be asynced because this function is called by another thread!
@@ -293,9 +294,9 @@ void PostedListWidgetWithModel::updateSorting(int s)
     switch(s)
     {
     default:
-    case 0:   mPostedPostsModel->setSortingStrategy(RsPostedPostsModel::SORT_HOT_SCORE); break;
-    case 1:   mPostedPostsModel->setSortingStrategy(RsPostedPostsModel::SORT_NEW_SCORE); break;
-    case 2:   mPostedPostsModel->setSortingStrategy(RsPostedPostsModel::SORT_TOP_SCORE); break;
+    case 0:   mPostedPostsModel->setSortingStrategy(RsPostedPostsModel::SORT_NEW_SCORE); break;
+    case 1:   mPostedPostsModel->setSortingStrategy(RsPostedPostsModel::SORT_TOP_SCORE); break;
+    case 2:   mPostedPostsModel->setSortingStrategy(RsPostedPostsModel::SORT_HOT_SCORE); break;
     }
 }
 
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
index 12601ee74..2c866ac4b 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
@@ -351,7 +351,7 @@ p, li { white-space: pre-wrap; }
              <string notr="true"/>
             </property>
             <property name="currentIndex">
-             <number>1</number>
+             <number>0</number>
             </property>
             <property name="iconSize">
              <size>
@@ -359,15 +359,6 @@ p, li { white-space: pre-wrap; }
               <height>24</height>
              </size>
             </property>
-            <item>
-             <property name="text">
-              <string>Hot</string>
-             </property>
-             <property name="icon">
-              <iconset resource="../icons.qrc">
-               <normaloff>:/icons/png/flame.png</normaloff>:/icons/png/flame.png</iconset>
-             </property>
-            </item>
             <item>
              <property name="text">
               <string>New</string>
@@ -386,6 +377,15 @@ p, li { white-space: pre-wrap; }
                <normaloff>:/icons/png/top.png</normaloff>:/icons/png/top.png</iconset>
              </property>
             </item>
+            <item>
+             <property name="text">
+              <string>Hot</string>
+             </property>
+             <property name="icon">
+              <iconset resource="../icons.qrc">
+               <normaloff>:/icons/png/flame.png</normaloff>:/icons/png/flame.png</iconset>
+             </property>
+            </item>
            </widget>
           </item>
           <item>
diff --git a/retroshare-gui/src/gui/Posted/PostedPostsModel.cpp b/retroshare-gui/src/gui/Posted/PostedPostsModel.cpp
index 94eea0ae1..43f87e6ab 100644
--- a/retroshare-gui/src/gui/Posted/PostedPostsModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedPostsModel.cpp
@@ -48,6 +48,8 @@ RsPostedPostsModel::RsPostedPostsModel(QObject *parent)
 	initEmptyHierarchy();
 
 	mEventHandlerId = 0;
+    mSortingStrategy = SORT_NEW_SCORE;
+
 	// Needs to be asynced because this function is called by another thread!
 
 	rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
@@ -473,6 +475,7 @@ void RsPostedPostsModel::setSortingStrategy(RsPostedPostsModel::SortingStrategy
 {
     preMods();
 
+    mSortingStrategy = s;
     std::sort(mPosts.begin(),mPosts.end(), PostSorter(s));
 
 	postMods();
@@ -517,7 +520,7 @@ void RsPostedPostsModel::setPosts(const RsPostedGroup& group, std::vector<RsPost
 
     createPostsArray(posts);
 
-    std::sort(mPosts.begin(),mPosts.end(), PostSorter(SORT_NEW_SCORE));
+    std::sort(mPosts.begin(),mPosts.end(), PostSorter(mSortingStrategy));
 
     uint32_t tmpval;
     setFilter(QStringList(),tmpval);
diff --git a/retroshare-gui/src/gui/Posted/PostedPostsModel.h b/retroshare-gui/src/gui/Posted/PostedPostsModel.h
index c4233a689..13c2757b8 100644
--- a/retroshare-gui/src/gui/Posted/PostedPostsModel.h
+++ b/retroshare-gui/src/gui/Posted/PostedPostsModel.h
@@ -245,7 +245,7 @@ private:
     std::vector<int> mFilteredPosts;
     uint32_t mDisplayedStartIndex;
     uint32_t mDisplayedNbPosts;
-
+    SortingStrategy mSortingStrategy;
 
 	RsEventsHandlerId_t mEventHandlerId ;
 };