Merge remote-tracking branch 'upstream/2.3' into main

mixxxdj · Jun 28, 2021 · 8fabcaa · 8fabcaa
2 parents 0244af2 + d1dca47
commit 8fabcaa
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@
 * Add Random Track Control to AutoDJ [#3076](https://github.com/mixxxdj/mixxx/pull/3076)
 * Add support for saving loops as hotcues [#2194](https://github.com/mixxxdj/mixxx/pull/2194) [lp:1367159](https://bugs.launchpad.net/mixxx/+bug/1367159)
 
-## [2.3.0](https://launchpad.net/mixxx/+milestone/2.3.0) (Unreleased)
+## [2.3.0](https://launchpad.net/mixxx/+milestone/2.3.0)
 ### Hotcues ###
 * Add hotcue colors and custom labels by right clicking hotcue buttons or right clicking hotcues on overview waveforms [#2016](https://github.com/mixxxdj/mixxx/pull/2016) [#2520](https://github.com/mixxxdj/mixxx/pull/2520) [#2238](https://github.com/mixxxdj/mixxx/pull/2238) [#2560](https://github.com/mixxxdj/mixxx/pull/2560) [#2557](https://github.com/mixxxdj/mixxx/pull/2557) [#2362](https://github.com/mixxxdj/mixxx/pull/2362)
 * Mouse hover cues on overview waveform to show time remaining until the cue [#2238](https://github.com/mixxxdj/mixxx/pull/2238)
@@ -123,10 +123,10 @@
 * Add macOS codesigning and notarization to fix startup warnings [#3281](https://github.com/mixxxdj/mixxx/pull/3281)
 * Don't trash user configuration if an error occurs when writing [#3192](https://github.com/mixxxdj/mixxx/pull/3192)
 * Enable CUE sheet recording by default [#3374](https://github.com/mixxxdj/mixxx/pull/3374)
-* And countless other small fixes and improvements (too many to list them all!)
 * Fix crash when double clicking GLSL waveforms with right mouse button [#3904](https://github.com/mixxxdj/mixxx/pull/3904)
 * Derive Mixxx version from `git describe` [#3824](https://github.com/mixxxdj/mixxx/pull/3824) [#3841](https://github.com/mixxxdj/mixxx/pull/3841) [#3848](https://github.com/mixxxdj/mixxx/pull/3848)
 * Improve tapping the bpm of a deck [#3790](https://github.com/mixxxdj/mixxx/pull/3790) [lp:1882776](https://bugs.launchpad.net/mixxx/+bug/1882776)
+* And countless other small fixes and improvements (too many to list them all!)
 
 ## [2.2.4](https://launchpad.net/mixxx/+milestone/2.2.4) (2020-06-27)
 

diff --git a/src/library/dlgtagfetcher.cpp b/src/library/dlgtagfetcher.cpp
@@ -18,12 +18,12 @@ QStringList trackColumnValues(
     QStringList columnValues;
     columnValues.reserve(6);
     columnValues
-            << trackMetadata.getTrackInfo().getYear()
+            << trackMetadata.getTrackInfo().getTitle()
+            << trackMetadata.getTrackInfo().getArtist()
             << trackMetadata.getAlbumInfo().getTitle()
-            << trackMetadata.getAlbumInfo().getArtist()
+            << trackMetadata.getTrackInfo().getYear()
             << trackNumberAndTotal
-            << trackMetadata.getTrackInfo().getTitle()
-            << trackMetadata.getTrackInfo().getArtist();
+            << trackMetadata.getAlbumInfo().getArtist();
     return columnValues;
 }
 
@@ -35,12 +35,12 @@ QStringList trackReleaseColumnValues(
     QStringList columnValues;
     columnValues.reserve(6);
     columnValues
-            << trackRelease.date
+            << trackRelease.title
+            << trackRelease.artist
             << trackRelease.albumTitle
-            << trackRelease.albumArtist
+            << trackRelease.date
             << trackNumberAndTotal
-            << trackRelease.title
-            << trackRelease.artist;
+            << trackRelease.albumArtist;
     return columnValues;
 }
 
@@ -50,7 +50,7 @@ void addTrack(
         QTreeWidget* parent) {
     QTreeWidgetItem* item = new QTreeWidgetItem(parent, trackRow);
     item->setData(0, Qt::UserRole, resultIndex);
-    item->setData(0, Qt::TextAlignmentRole, Qt::AlignRight);
+    item->setData(0, Qt::TextAlignmentRole, Qt::AlignLeft);
 }
 
 } // anonymous namespace
@@ -83,14 +83,6 @@ void DlgTagFetcher::init() {
     connect(&m_tagFetcher, &TagFetcher::resultAvailable, this, &DlgTagFetcher::fetchTagFinished);
     connect(&m_tagFetcher, &TagFetcher::fetchProgress, this, &DlgTagFetcher::fetchTagProgress);
     connect(&m_tagFetcher, &TagFetcher::networkError, this, &DlgTagFetcher::slotNetworkResult);
-
-    // Resize columns, this can't be set in the ui file
-    results->setColumnWidth(0, 50);  // Year column
-    results->setColumnWidth(1, 160); // Album column
-    results->setColumnWidth(2, 160); // Album artist column
-    results->setColumnWidth(3, 50);  // Track (numbers) column
-    results->setColumnWidth(4, 160); // Title column
-    results->setColumnWidth(5, 160); // Artist column
 }
 
 void DlgTagFetcher::slotNext() {
@@ -305,6 +297,12 @@ void DlgTagFetcher::updateStack() {
         }
     }
 
+    for (int i = 0; i < results->model()->columnCount(); i++) {
+        results->resizeColumnToContents(i);
+        int sectionSize = (results->columnWidth(i) + 10);
+        results->header()->resizeSection(i, sectionSize);
+    }
+
     // Find the item that was selected last time
     for (int i = 0; i < results->model()->rowCount(); ++i) {
         const QModelIndex index = results->model()->index(i, 0);

diff --git a/src/library/dlgtagfetcher.ui b/src/library/dlgtagfetcher.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QStackedWidget" name="stack">
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="results_page">
       <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -45,34 +45,37 @@
          <attribute name="headerMinimumSectionSize">
           <number>50</number>
          </attribute>
+         <attribute name="headerStretchLastSection">
+          <bool>true</bool>
+         </attribute>
          <column>
           <property name="text">
-           <string>Year</string>
+           <string>Title</string>
           </property>
          </column>
          <column>
           <property name="text">
-           <string>Album</string>
+           <string>Artist</string>
           </property>
          </column>
          <column>
           <property name="text">
-           <string>Album Artist</string>
+           <string>Album</string>
           </property>
          </column>
          <column>
           <property name="text">
-           <string>Track</string>
+           <string>Year</string>
           </property>
          </column>
          <column>
           <property name="text">
-           <string>Title</string>
+           <string>Track</string>
           </property>
          </column>
          <column>
           <property name="text">
-           <string>Artist</string>
+           <string>Album Artist</string>
           </property>
          </column>
         </widget>