From 17d8d0957c741ff2d4498f66411422242be68d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= <fc86@outlook.fr>
Date: Tue, 31 Jul 2018 16:32:03 +0200
Subject: [PATCH] changed sortOrder style + resized splitter sizes

---
 resources/OpenBoard.qrc               |   2 +
 resources/forms/documents.ui          | 100 ++++++++++++++++++++------
 resources/images/asc.png              | Bin 0 -> 309 bytes
 resources/images/desc.png             | Bin 0 -> 301 bytes
 src/document/UBDocumentController.cpp |  42 ++++-------
 src/document/UBDocumentController.h   |   5 +-
 6 files changed, 96 insertions(+), 53 deletions(-)
 create mode 100644 resources/images/asc.png
 create mode 100644 resources/images/desc.png

diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc
index d67ff3d5..3e41418a 100644
--- a/resources/OpenBoard.qrc
+++ b/resources/OpenBoard.qrc
@@ -362,5 +362,7 @@
         <file>images/backgroundPalette/resetDefaultGridSize.svg</file>
         <file>images/collapse-all.png</file>
         <file>images/expand-all.png</file>
+        <file>images/asc.png</file>
+        <file>images/desc.png</file>
     </qresource>
 </RCC>
diff --git a/resources/forms/documents.ui b/resources/forms/documents.ui
index a81ddaba..efec7a6a 100644
--- a/resources/forms/documents.ui
+++ b/resources/forms/documents.ui
@@ -62,34 +62,32 @@
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <item>
-             <widget class="QComboBox" name="sortOrder">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>2</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <item>
-               <property name="text">
-                <string>Ascending order</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Descending order</string>
-               </property>
-              </item>
-             </widget>
-            </item>
+            <property name="sizeConstraint">
+             <enum>QLayout::SetMinimumSize</enum>
+            </property>
             <item>
              <widget class="QComboBox" name="sortKind">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                 <horstretch>4</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="maximumSize">
+               <size>
+                <width>200</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="styleSheet">
+               <string notr="true"/>
+              </property>
+              <property name="sizeAdjustPolicy">
+               <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+              </property>
+              <property name="minimumContentsLength">
+               <number>0</number>
+              </property>
               <item>
                <property name="text">
                 <string>Creation date</string>
@@ -107,6 +105,62 @@
               </item>
              </widget>
             </item>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>10</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QToolButton" name="sortOrder">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="toolTip">
+               <string>Sort Order</string>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">QToolButton { border-style:none; border-width: 0px;margin-left:2px;margin-right:2px}</string>
+              </property>
+              <property name="text">
+               <string notr="true"/>
+              </property>
+              <property name="icon">
+               <iconset resource="../OpenBoard.qrc">
+                <normaloff>:/images/asc.png</normaloff>
+                <normalon>:/images/desc.png</normalon>:/images/asc.png</iconset>
+              </property>
+              <property name="checkable">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
           </item>
           <item>
@@ -302,6 +356,8 @@
    <header>document/UBDocumentController.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../OpenBoard.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/resources/images/asc.png b/resources/images/asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b61cce9920ee565e7162b89574734ad5d241eb7
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^hCpn}!3HE>@G^rWI14-?iy0WWg+Q3`(%rg0K*8sp
zE{-7?jc;de<UM2{;QC*Y%ggNqTR@;OfA9v`DUywXLCYMhQYJDz>~PsOwPx}ECE0pi
zwfYl9<8$8i$((t^^k9nViP@`n+b?<})8yjEka5_6_0gQD<I4^R$H;naP~a3(IoPBU
zaYJmyW3kjrFM{&V+_N@ZU<wkOz`{LgLE@V9zdaWYh`(AG{MarmJlFP{-l>{}aQTG9
zy#BlV8%-AOdwylkWZP{sO&MmrI8;>f?%uyyzV=*TGZGwybZ!*z)vkzC+S6G(Wi8KI
nsHH#)>Nmf&2>W}L?E_Q6rt4pGYQvrYz0Bb0>gTe~DWM4fmKS-#

literal 0
HcmV?d00001

diff --git a/resources/images/desc.png b/resources/images/desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..622f2f89f5e2a52924f8ae9503cea1f9634d12f8
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^hCpn}!3HE>@G^rWI14-?iy0WWg+Q3`(%rg0K*9T-
zE{-7?jc;dc<UM2{;Cf$?%gZc*k?RPHWEZ1EtLKW90?IACL6;;WFSr^pG1avHUy|*&
z?Tz~FO|^_U4XR%+rFM!%gy<YxGJU0h_lg8gQJsZNsv$F&suN;29##$V+MAR6!v`XM
zC_`_zlHf%K-<4<EGlRW$KN9%4Nt<=U*|T*L%P;*Yf++)P|Iwd*d~a6WyVU*1KVJ0s
zm%JKg?gp0aPKOkgE-`#8GEC~2I^(NR{IT1ftWb*&X{g-$m+XFoYX-l;^q52M=e=W%
aVJw_mvtZWy?a4r|GI+ZBxvX<aXaWFfCv$=T

literal 0
HcmV?d00001

diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp
index 72544dac..19088c6b 100644
--- a/src/document/UBDocumentController.cpp
+++ b/src/document/UBDocumentController.cpp
@@ -1643,8 +1643,6 @@ UBDocumentController::UBDocumentController(UBMainWindow* mainWindow)
     setupToolbar();
     connect(this, SIGNAL(exportDone()), mMainWindow, SLOT(onExportDone()));
     connect(this, SIGNAL(documentThumbnailsUpdated(UBDocumentContainer*)), this, SLOT(refreshDocumentThumbnailsView(UBDocumentContainer*)));
-
-    mUserHasChangedSortOrder = false;
 }
 
 UBDocumentController::~UBDocumentController()
@@ -1980,13 +1978,16 @@ void UBDocumentController::setupViews()
 
         mSortFilterProxyModel->setSourceModel(model);
 
+        // sort documents according to preferences
         int sortKind  = UBSettings::settings()->documentSortKind->get().toInt();
-        int sortOrder = UBSettings::settings()->documentSortOrder->get().toInt();
-        mUserHasChangedSortOrder = true;
+        int sortOrder = UBSettings::settings()->documentSortOrder->get().toInt();        
+
         sortDocuments(sortKind, sortOrder);
 
+        // update icon and button
         mDocumentUI->sortKind->setCurrentIndex(sortKind);
-        mDocumentUI->sortOrder->setCurrentIndex(sortOrder);
+        if (sortOrder == UBDocumentController::DESC)
+            mDocumentUI->sortOrder->setChecked(true);
 
         mDocumentUI->documentTreeView->setModel(mSortFilterProxyModel);
 
@@ -2002,15 +2003,15 @@ void UBDocumentController::setupViews()
 
         //set sizes (left and right sides of the splitter) for the splitter here because it cannot be done in the form editor.
         const int leftSplitterSize = 100;
-        const int rightSplitterSize = 900;
+        const int rightSplitterSize = 1200;
         QList<int> splitterSizes = { leftSplitterSize, rightSplitterSize };
         mDocumentUI->splitter->setSizes(splitterSizes);
 
-        mDocumentUI->documentTreeView->hideColumn(1);
+        //mDocumentUI->documentTreeView->hideColumn(1);
         mDocumentUI->documentTreeView->hideColumn(2);
 
         connect(mDocumentUI->sortKind, SIGNAL(activated(int)), this, SLOT(onSortKindChanged(int)));
-        connect(mDocumentUI->sortOrder, SIGNAL(activated(int)), this, SLOT(onSortOrderChanged(int)));
+        connect(mDocumentUI->sortOrder, SIGNAL(toggled(bool)), this, SLOT(onSortOrderChanged(bool)));
 
         connect(mDocumentUI->documentTreeView->itemDelegate(), SIGNAL(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint) ), mDocumentUI->documentTreeView, SLOT(adjustSize()));
         connect(mDocumentUI->documentTreeView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(TreeViewSelectionChanged(QItemSelection,QItemSelection)));
@@ -2046,20 +2047,8 @@ void UBDocumentController::setupViews()
 void UBDocumentController::sortDocuments(int kind, int order)
 {
     Qt::SortOrder sortOrder = Qt::AscendingOrder;
-
-    //if the user hasn't change the sort
-    //set order to its default value according to
-    //the kind of sort
-    if(!mUserHasChangedSortOrder){
-        if(kind == UBDocumentController::CreationDate || kind == UBDocumentController::UpdateDate){
-            sortOrder = Qt::DescendingOrder;
-            mDocumentUI->sortOrder->setCurrentIndex(1);
-        }else{
-            mDocumentUI->sortOrder->setCurrentIndex(0);
-        }
-    }else if(order == UBDocumentController::DESC){
+    if(order == UBDocumentController::DESC)
         sortOrder = Qt::DescendingOrder;
-    }
 
     if(kind == UBDocumentController::CreationDate){
         mSortFilterProxyModel->setSortRole(UBDocumentTreeModel::CreationDate);
@@ -2073,22 +2062,21 @@ void UBDocumentController::sortDocuments(int kind, int order)
     }
 }
 
-void UBDocumentController::onSortOrderChanged(int index)
+
+void UBDocumentController::onSortOrderChanged(bool order)
 {
     int kindIndex = mDocumentUI->sortKind->currentIndex();
+    int orderIndex = order ? UBDocumentController::DESC : UBDocumentController::ASC;
 
-    mUserHasChangedSortOrder = true;
-
-    sortDocuments(kindIndex, index);
+    sortDocuments(kindIndex, orderIndex);
 }
 
 void UBDocumentController::onSortKindChanged(int index)
 {
-    int orderIndex = mDocumentUI->sortOrder->currentIndex();
+    int orderIndex = mDocumentUI->sortOrder->isChecked() ? UBDocumentController::DESC : UBDocumentController::ASC;
 
     sortDocuments(index, orderIndex);
 }
-//N/C - NNE - 20140403 : END
 
 QWidget* UBDocumentController::controlView()
 {
diff --git a/src/document/UBDocumentController.h b/src/document/UBDocumentController.h
index dea703bc..4ac86c0e 100644
--- a/src/document/UBDocumentController.h
+++ b/src/document/UBDocumentController.h
@@ -445,7 +445,7 @@ class UBDocumentController : public UBDocumentContainer
 
         //N/C - NNE - 20140403
         void onSortKindChanged(int index);
-        void onSortOrderChanged(int index);
+        void onSortOrderChanged(bool order);
         void collapseAll();
         void expandAll();
 
@@ -488,9 +488,6 @@ protected:
 
         UBSortFilterProxyModel *mSortFilterProxyModel;
 
-        //N/C - NNE - 20140407
-        bool mUserHasChangedSortOrder;
-
     public slots:
         void TreeViewSelectionChanged(const QModelIndex &current, const QModelIndex &previous);
         void TreeViewSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);