DlgTrackInfoMulti/StarRating: Integrate WStarRating into the tab order

mixxxdj · Oct 31, 2024 · 0f3fefd · 0f3fefd
1 parent 25c005f
commit 0f3fefd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/src/library/dlgtrackinfomulti.cpp b/src/library/dlgtrackinfomulti.cpp
@@ -102,7 +102,6 @@ DlgTrackInfoMulti::DlgTrackInfoMulti(UserSettingsPointer pUserSettings)
           m_pUserSettings(std::move(pUserSettings)),
           m_pWCoverArtMenu(make_parented<WCoverArtMenu>(this)),
           m_pWCoverArtLabel(make_parented<WCoverArtLabel>(this, m_pWCoverArtMenu)),
-          m_pWStarRating(make_parented<WStarRating>(this)),
           m_starRatingModified(false),
           m_newRating(0),
           m_colorChanged(false),
@@ -223,14 +222,7 @@ void DlgTrackInfoMulti::init() {
             this,
             &DlgTrackInfoMulti::slotColorPicked);
 
-    // Insert the star rating widget
-    starsLayout->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-    starsLayout->setSpacing(0);
-    starsLayout->setContentsMargins(0, 0, 0, 0);
-    starsLayout->insertWidget(0, m_pWStarRating.get());
-    // This is necessary to pass on mouseMove events to WStarRating
-    m_pWStarRating->setMouseTracking(true);
-    connect(m_pWStarRating,
+    connect(starRating,
             &WStarRating::ratingChangeRequest,
             this,
             &DlgTrackInfoMulti::slotStarRatingChanged);
@@ -303,8 +295,8 @@ void DlgTrackInfoMulti::updateFromTracks() {
     replaceTrackRecords(trackRecords);
 
     // Collect star ratings and track colors
-    // If track value differs from the current value, add it to the list.
-    // If new and current are identical, keep only one.
+    // Check if all tracks have the same value for the rating (resp. color).
+    // If yes, show that value, if no, show a placeholder value instead.
     int commonRating = m_trackRecords.first().getRating();
     for (const auto& rec : std::as_const(m_trackRecords)) {
         if (commonRating != rec.getRating()) {
@@ -313,7 +305,7 @@ void DlgTrackInfoMulti::updateFromTracks() {
         }
     }
     // Update the star widget
-    m_pWStarRating->slotSetRating(commonRating);
+    starRating->slotSetRating(commonRating);
     m_starRatingModified = false;
 
     // Same procedure for the track color
@@ -887,7 +879,7 @@ void DlgTrackInfoMulti::trackColorDialogSetColorStyleButton(
 void DlgTrackInfoMulti::slotStarRatingChanged(int rating) {
     if (!m_pLoadedTracks.isEmpty() && mixxx::TrackRecord::isValidRating(rating)) {
         m_starRatingModified = true;
-        m_pWStarRating->slotSetRating(rating);
+        starRating->slotSetRating(rating);
         m_newRating = rating;
     }
 }

diff --git a/src/library/dlgtrackinfomulti.h b/src/library/dlgtrackinfomulti.h
@@ -101,7 +101,6 @@ class DlgTrackInfoMulti : public QDialog, public Ui::DlgTrackInfoMulti {
 
     parented_ptr<WCoverArtMenu> m_pWCoverArtMenu;
     parented_ptr<WCoverArtLabel> m_pWCoverArtLabel;
-    parented_ptr<WStarRating> m_pWStarRating;
     bool m_starRatingModified;
     int m_newRating;
     bool m_colorChanged;

diff --git a/src/library/dlgtrackinfomulti.ui b/src/library/dlgtrackinfomulti.ui
@@ -194,21 +194,22 @@
       </item>
 
       <item row="3" column="2" colspan="2">
-       <widget class="QWidget" name="starsWidget" native="true">
+       <widget class="WStarRating" name="starRating">
+        <property name="mouseTracking">
+          <bool>true</bool>
+        </property>
+        <property name="upDownChangesFocus">
+         <bool>true</bool>
+        </property>
+        <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+        </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <layout class="QHBoxLayout" name="starsLayout">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="sizeConstraint">
-          <enum>QLayout::SetDefaultConstraint</enum>
-         </property>
-        </layout>
        </widget>
       </item>
 
@@ -735,6 +736,13 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+  <customwidget>
+   <class>WStarRating</class>
+   <extends>QWidget</extends>
+   <header>widget/wstarrating.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>txtTitle</tabstop>
   <tabstop>txtArtist</tabstop>
@@ -744,6 +752,7 @@
   <tabstop>txtGenre</tabstop>
   <tabstop>txtGrouping</tabstop>
   <tabstop>txtComment</tabstop>
+  <tabstop>starRating</tabstop>
   <tabstop>txtYear</tabstop>
   <tabstop>txtKey</tabstop>
   <tabstop>txtTrackNumber</tabstop>