Add ControlObjects for track table sorting

src/library/librarycontrol.cpp

@@ -106,6 +106,12 @@ LibraryControl::LibraryControl(Library* pLibrary)
     connect(m_pAutoDjAddBottom.get(), SIGNAL(valueChanged(double)),
             this, SLOT(slotAutoDjAddBottom(double)));
 
+    // Sort controls
+    m_pSortColumn = std::make_unique<ControlPushButton>(ConfigKey("[Library]", "sort_column"));
+    m_pSortColumn->setButtonMode(ControlPushButton::TOGGLE);
+    m_pSortOrder = std::make_unique<ControlPushButton>(ConfigKey("[Library]", "sort_order"));
+    m_pSortOrder->setButtonMode(ControlPushButton::TOGGLE);
+
     // Font sizes
     m_pFontSizeKnob = std::make_unique<ControlObject>(
             ConfigKey("[Library]", "font_size_knob"), false);

src/library/librarycontrol.h

@@ -117,6 +117,10 @@ class LibraryControl : public QObject {
     std::unique_ptr<ControlObject> m_pAutoDjAddTop;
     std::unique_ptr<ControlObject> m_pAutoDjAddBottom;
 
+    // Controls to sort the track view
+    std::unique_ptr<ControlPushButton> m_pSortColumn;
+    std::unique_ptr<ControlPushButton> m_pSortOrder;
+
     // Font sizes
     std::unique_ptr<ControlPushButton> m_pFontSizeIncrement;
     std::unique_ptr<ControlPushButton> m_pFontSizeDecrement;

src/widget/wtracktableview.cpp

@@ -127,6 +127,10 @@ WTrackTableView::WTrackTableView(QWidget * parent,
     m_pKeyNotation = new ControlProxy("[Library]", "key_notation", this);
     m_pKeyNotation->connectValueChanged(this, &WTrackTableView::keyNotationChanged);
 
+    m_pSortColumn = new ControlProxy("[Library]", "sort_column", this);
+    m_pSortColumn->connectValueChanged(this, &WTrackTableView::sortColumnChanged);
+    m_pSortOrder = new ControlProxy("[Library]", "sort_order", this);
+    m_pSortOrder->connectValueChanged(this, &WTrackTableView::sortOrderChanged);
 
     connect(this, SIGNAL(scrollValueChanged(int)),
             this, SLOT(slotScrollValueChanged(int)));
@@ -361,31 +365,36 @@ void WTrackTableView::loadTrackModel(QAbstractItemModel *model) {
     if (m_sorting) {
         // NOTE: Should be a UniqueConnection but that requires Qt 4.6
         connect(horizontalHeader(), SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)),
-                this, SLOT(doSortByColumn(int)), Qt::AutoConnection);
+                this, SLOT(slotSortingChanged(int, Qt::SortOrder)), Qt::AutoConnection);
+
+        int sortColumn;
+        Qt::SortOrder sortOrder;
 
         // Stupid hack that assumes column 0 is never visible, but this is a weak
         // proxy for "there was a saved column sort order"
         if (horizontalHeader()->sortIndicatorSection() > 0) {
             // Sort by the saved sort section and order.
-            horizontalHeader()->setSortIndicator(horizontalHeader()->sortIndicatorSection(),
-                                                 horizontalHeader()->sortIndicatorOrder());
-            // in Qt5, we need to call it manually, which triggers finally the select()
-            doSortByColumn(horizontalHeader()->sortIndicatorSection());
+            sortColumn = horizontalHeader()->sortIndicatorSection();
+            sortOrder = horizontalHeader()->sortIndicatorOrder();
         } else {
             // No saved order is present. Use the TrackModel's default sort order.
-            int sortColumn = trackModel->defaultSortColumn();
-            Qt::SortOrder sortOrder = trackModel->defaultSortOrder();
+            sortColumn = trackModel->defaultSortColumn();
+            sortOrder = trackModel->defaultSortOrder();
 
             // If the TrackModel has an invalid or internal column as its default
             // sort, find the first non-internal column and sort by that.
             while (sortColumn < 0 || trackModel->isColumnInternal(sortColumn)) {
                 sortColumn++;
             }
-            // This line sorts the TrackModel
-            horizontalHeader()->setSortIndicator(sortColumn, sortOrder);
-            // in Qt5, we need to call it manually, which triggers finally the select()
-            doSortByColumn(sortColumn);
         }
+
+        // This line sorts the TrackModel
+        horizontalHeader()->setSortIndicator(sortColumn, sortOrder);
+        // in Qt5, we need to call it manually, which triggers finally the select()
+        doSortByColumn(sortColumn);
+
+        m_pSortColumn->set(sortColumn);
+        m_pSortOrder->set(sortOrder);
     }
 
     // Set up drag and drop behavior according to whether or not the track
@@ -1975,6 +1984,18 @@ void WTrackTableView::slotReloadCoverArt() {
     }
 }
 
+void WTrackTableView::slotSortingChanged(int headerSection, Qt::SortOrder order) {
+    double sortOrder = (order == Qt::AscendingOrder) ? 0.0 : 1.0;
+    if (headerSection != (int)m_pSortColumn->get()) {
+        m_pSortColumn->set(headerSection);
+        sortColumnChanged(headerSection);
+    }
+    if (sortOrder != m_pSortOrder->get()) {
+        m_pSortOrder->set(sortOrder);
+        sortOrderChanged(sortOrder);
+    }
+}
+
 bool WTrackTableView::hasFocus() const {
     return QWidget::hasFocus();
 }
@@ -1994,3 +2015,18 @@ void WTrackTableView::keyNotationChanged()
     QWidget::update();
 }
 
+void WTrackTableView::sortColumnChanged(double v)
+{
+    int sortColumn = (int)v;
+    Qt::SortOrder sortOrder = m_pSortColumn->get() ? Qt::DescendingOrder : Qt::AscendingOrder;
+    horizontalHeader()->setSortIndicator(sortColumn, sortOrder);
+    doSortByColumn(sortColumn);
+}
+
+void WTrackTableView::sortOrderChanged(double v)
+{
+    int sortColumn = (int)m_pSortColumn->get();
+    Qt::SortOrder sortOrder = v ? Qt::DescendingOrder : Qt::AscendingOrder;
+    horizontalHeader()->setSortIndicator(sortColumn, sortOrder);
+    doSortByColumn(sortColumn);
+}

src/widget/wtracktableview.h

@@ -93,7 +93,10 @@ class WTrackTableView : public WLibraryTableView {
 
     void slotTrackInfoClosed();
     void slotTagFetcherClosed();
+    void slotSortingChanged(int headerSection, Qt::SortOrder order);
     void keyNotationChanged();
+    void sortColumnChanged(double v);
+    void sortOrderChanged(double v);
 
   private:
 
@@ -217,6 +220,8 @@ class WTrackTableView : public WLibraryTableView {
     bool m_bCrateMenuLoaded;
     ControlProxy* m_pCOTGuiTick;
     ControlProxy* m_pKeyNotation;
+    ControlProxy* m_pSortColumn;
+    ControlProxy* m_pSortOrder;
 };
 
 #endif