Merge pull request #12004 from ronso0/wtracktext-subclass

remove WTrackText class, use WTrackProperty or WLabel
mixxxdj · Dec 27, 2023 · d96d929 · d96d929
2 parents faa0a3a + c4b6161
commit d96d929
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 74 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1233,7 +1233,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/widget/wtrackproperty.cpp
   src/widget/wtracktableview.cpp
   src/widget/wtracktableviewheader.cpp
-  src/widget/wtracktext.cpp
   src/widget/wtrackwidgetgroup.cpp
   src/widget/wwidget.cpp
   src/widget/wwidgetgroup.cpp

diff --git a/res/skins/Deere/deck_overview.xml b/res/skins/Deere/deck_overview.xml
@@ -59,7 +59,6 @@
     <Mark>
       <Control>intro_start_position</Control>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <Text></Text>
       <Align>top|right</Align>
       <Color>#0000FF</Color>
       <TextColor>#FFFFFF</TextColor>
@@ -93,7 +92,6 @@
     <Mark>
       <Control>outro_end_position</Control>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <Text></Text>
       <Align>top|left</Align>
       <Color>#0000FF</Color>
       <TextColor>#FFFFFF</TextColor>

diff --git a/res/skins/Deere/effect_focus_button.xml b/res/skins/Deere/effect_focus_button.xml
@@ -21,13 +21,11 @@ Variables:
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
-          <Text></Text>
           <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
           <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Text></Text>
           <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
           <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
         </State>

diff --git a/res/skins/Deere/hide_show_button.xml b/res/skins/Deere/hide_show_button.xml
@@ -13,13 +13,11 @@
     <NumberStates>2</NumberStates>
     <State>
       <Number>0</Number>
-      <Text></Text>
       <Pressed scalemode="STRETCH_ASPECT">icon/ic_unfold_more_48px.svg</Pressed>
       <Unpressed scalemode="STRETCH_ASPECT">icon/ic_unfold_more_48px.svg</Unpressed>
     </State>
     <State>
       <Number>1</Number>
-      <Text></Text>
       <Pressed scalemode="STRETCH_ASPECT">icon/ic_unfold_less_48px.svg</Pressed>
       <Unpressed scalemode="STRETCH_ASPECT">icon/ic_unfold_less_48px.svg</Unpressed>
     </State>

diff --git a/res/skins/Deere/knob_with_button.xml b/res/skins/Deere/knob_with_button.xml
@@ -22,13 +22,11 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text></Text>
               <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
               <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
             </State>
             <State>
               <Number>1</Number>
-              <Text></Text>
               <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
               <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
             </State>

diff --git a/res/skins/Deere/knob_with_button_left.xml b/res/skins/Deere/knob_with_button_left.xml
@@ -20,13 +20,11 @@
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
-          <Text></Text>
           <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
           <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Text></Text>
           <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
           <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
         </State>

diff --git a/res/skins/Deere/knob_with_button_right.xml b/res/skins/Deere/knob_with_button_right.xml
@@ -22,13 +22,11 @@
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
-          <Text></Text>
           <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
           <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Text></Text>
           <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
           <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
         </State>

diff --git a/res/skins/Deere/preview_deck.xml b/res/skins/Deere/preview_deck.xml
@@ -29,12 +29,12 @@
                 <ObjectName>PreviewDeckTextRow</ObjectName>
                 <Layout>horizontal</Layout>
                 <Children>
-                  <Text>
+                  <TrackProperty>
                     <TooltipId>text</TooltipId>
                     <SizePolicy>me,min</SizePolicy>
                     <Group><Variable name="group"/></Group>
                     <Elide>right</Elide>
-                  </Text>
+                  </TrackProperty>
 
                   <Template src="skin:left_1state_button.xml">
                     <SetVariable name="TooltipId">eject</SetVariable>

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
@@ -828,7 +828,6 @@ WNumber, WNumberPos,
 WPushButton,
 WKey,
 WTime,
-WTrackText,
 WTrackProperty,
 WRecordingDuration,
 QSpinBox,

diff --git a/res/skins/LateNight/decks/overview.xml b/res/skins/LateNight/decks/overview.xml
@@ -78,7 +78,6 @@
     <Mark>
       <Control>intro_start_position</Control>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <Text></Text>
       <Align>top|right</Align>
       <Color><Variable name="IntroOutroColor"/></Color>
       <TextColor>#FFFFFF</TextColor>
@@ -112,7 +111,6 @@
     <Mark>
       <Control>outro_end_position</Control>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <Text></Text>
       <Align>top|left</Align>
       <Color><Variable name="IntroOutroColor"/></Color>
       <TextColor>#FFFFFF</TextColor>

diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
@@ -104,7 +104,6 @@ Description:
                     </State>
                     <State>
                       <Number>1</Number>
-                      <Text></Text>
                       <Alignment>left</Alignment>
                     </State>
                     <Connection>

diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
@@ -9,7 +9,6 @@ WNumber, WNumberPos,
 WPushButton,
 WKey,
 WTime,
-WTrackText,
 WTrackProperty,
 WRecordingDuration,
 QSpinBox,

diff --git a/res/skins/Shade/deck_overview.xml b/res/skins/Shade/deck_overview.xml
@@ -50,7 +50,6 @@
     <Mark>
       <Control>intro_start_position</Control>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <Text></Text>
       <Align>top|right</Align>
       <Color>#0000FF</Color>
       <TextColor>#FFFFFF</TextColor>
@@ -84,7 +83,6 @@
     <Mark>
       <Control>outro_end_position</Control>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <Text></Text>
       <Align>top|left</Align>
       <Color>#0000FF</Color>
       <TextColor>#FFFFFF</TextColor>

diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml
@@ -40,7 +40,7 @@
                         <Size>0e,18f</Size>
                         <Layout>horizontal</Layout>
                         <Children>
-                          <Text>
+                          <TrackProperty>
                             <TooltipId>text</TooltipId>
                             <Style> QLabel {
                               font-size: 12px;
@@ -55,7 +55,7 @@
                             <Group>[PreviewDeck1]</Group>
                             <SizePolicy>me,min</SizePolicy>
                             <Elide>right</Elide>
-                          </Text>
+                          </TrackProperty>
                         </Children>
                       </WidgetGroup>
                       <WidgetGroup>

diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml
@@ -20,7 +20,7 @@
             <BackPath>style/style_bg_sampler_top.png</BackPath>
             <Layout>horizontal</Layout>
             <Children>
-              <Text>
+              <TrackProperty>
                 <TooltipId>text</TooltipId>
                 <Style>QLabel {
                     font-size: 12px;
@@ -35,7 +35,7 @@
                 <Group><Variable name="group"/></Group>
                 <SizePolicy>me,max</SizePolicy>
                 <Elide>right</Elide>
-              </Text>
+              </TrackProperty>
               <!-- Alternative "TITLE ONLY" display
               <TrackProperty>
                 <TooltipId>track_title</TooltipId>

diff --git a/res/skins/Shade/samplersmall.xml b/res/skins/Shade/samplersmall.xml
@@ -52,7 +52,7 @@
                 <Pos>0,2</Pos>
                 <Layout>vertical</Layout>
                 <Children>
-                <Text>
+                <TrackProperty>
                   <Size>0e,40f</Size>
                   <TooltipId>text</TooltipId>
                   <Style>QLabel {
@@ -66,7 +66,7 @@
                   </Style>
                   <Group>[Sampler<Variable name="samplernum"/>]</Group>
                   <Elide>right</Elide>
-                </Text>
+                </TrackProperty>
                 <!-- Alternative "TITLE ONLY" display
                 <TrackProperty>
                   <TooltipId>track_title</TooltipId>

diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
@@ -24,7 +24,6 @@ WPushButton,
 #LibraryFeatureControls QRadioButton,
 WRecordingDuration,
 WTime,
-WTrackText,
 WTrackProperty,
 QSpinBox,
 WBeatSpinBox,

diff --git a/res/skins/Tango/decks/overview.xml b/res/skins/Tango/decks/overview.xml
@@ -80,7 +80,6 @@ Variables:
     <Mark>
       <Control>intro_start_position</Control>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <Text></Text>
       <Align>top|right</Align>
       <Color>#0000FF</Color>
       <TextColor>#FFFFFF</TextColor>
@@ -114,7 +113,6 @@ Variables:
     <Mark>
       <Control>outro_end_position</Control>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <Text></Text>
       <Align>top|left</Align>
       <Color>#0000FF</Color>
       <TextColor>#FFFFFF</TextColor>

diff --git a/res/skins/Tango/decks/preview_deck.xml b/res/skins/Tango/decks/preview_deck.xml
@@ -57,12 +57,12 @@ Variables:
                 <Size>1me,18f</Size>
                 <ObjectName>PreviewTitle</ObjectName>
                 <Children>
-                  <Text>
+                  <TrackProperty>
                     <TooltipId>text</TooltipId>
                     <Size>1me,17f</Size>
                     <Group><Variable name="group"/></Group>
                     <Elide>right</Elide>
-                  </Text>
+                  </TrackProperty>
                 </Children>
               </WidgetGroup>
 

diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
@@ -20,7 +20,6 @@ WNumber, WNumberPos,
 WPushButton,
 WKey,
 WTime,
-WTrackText,
 WTrackProperty,
 WRecordingDuration,
 QSpinBox,

diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
@@ -81,7 +81,6 @@
 #include "widget/wstatuslight.h"
 #include "widget/wtime.h"
 #include "widget/wtrackproperty.h"
-#include "widget/wtracktext.h"
 #include "widget/wtrackwidgetgroup.h"
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include "widget/wvumeter.h"
@@ -1073,32 +1072,13 @@ QWidget* LegacySkinParser::parseVisual(const QDomElement& node) {
 
 QWidget* LegacySkinParser::parseText(const QDomElement& node) {
     QString group = lookupNodeGroup(node);
-    BaseTrackPlayer* pPlayer = m_pPlayerManager->getPlayer(group);
-    if (!pPlayer) {
-        SKIN_WARNING(node, *m_pContext, QStringLiteral("No player found for group:").arg(group));
-        return nullptr;
-    }
-
-    WTrackText* pTrackText = new WTrackText(m_pParent,
-            m_pConfig,
-            m_pLibrary,
-            group);
-    setupLabelWidget(node, pTrackText);
-
-    connect(pPlayer, &BaseTrackPlayer::newTrackLoaded, pTrackText, &WTrackText::slotTrackLoaded);
-    connect(pPlayer, &BaseTrackPlayer::loadingTrack, pTrackText, &WTrackText::slotLoadingTrack);
-    connect(pTrackText,
-            &WTrackText::trackDropped,
-            m_pPlayerManager,
-            &PlayerManager::slotLoadLocationToPlayerMaybePlay);
-    connect(pTrackText, &WTrackText::cloneDeck, m_pPlayerManager, &PlayerManager::slotCloneDeck);
-
-    TrackPointer pTrack = pPlayer->getLoadedTrack();
-    if (pTrack) {
-        pTrackText->slotTrackLoaded(pTrack);
+    if (group.isEmpty()) {
+        // use WLabel, try to parse 'Text' node
+        return parseLabelWidget<WLabel>(node);
+    } else {
+        // use WTrackProperty to show a track tag / file name
+        return parseTrackProperty(node);
     }
-
-    return pTrackText;
 }
 
 QWidget* LegacySkinParser::parseTrackProperty(const QDomElement& node) {

diff --git a/src/widget/wtrackproperty.cpp b/src/widget/wtrackproperty.cpp
@@ -45,12 +45,17 @@ WTrackProperty::~WTrackProperty() {
 void WTrackProperty::setup(const QDomNode& node, const SkinContext& context) {
     WLabel::setup(node, context);
 
-    m_property = context.selectString(node, "Property");
+    QString property = context.selectString(node, "Property");
+    if (property.isEmpty()) {
+        return;
+    }
 
     // Check if property with that name exists in Track class
-    if (Track::staticMetaObject.indexOfProperty(m_property.toUtf8().constData()) == -1) {
-        qWarning() << "WTrackProperty: Unknown track property:" << m_property;
+    if (Track::staticMetaObject.indexOfProperty(property.toUtf8().constData()) == -1) {
+        qWarning() << "WTrackProperty: Unknown track property:" << property;
+        return;
     }
+    m_property = property;
 }
 
 void WTrackProperty::slotTrackLoaded(TrackPointer pTrack) {
@@ -82,7 +87,11 @@ void WTrackProperty::slotTrackChanged(TrackId trackId) {
 
 void WTrackProperty::updateLabel() {
     if (m_pCurrentTrack) {
-        QVariant property = m_pCurrentTrack->property(m_property.toUtf8().constData());
+        if (m_property.isEmpty()) {
+            return;
+        }
+        QVariant property =
+                m_pCurrentTrack->property(m_property.toUtf8().constData());
         if (property.isValid() && property.canConvert<QString>()) {
             setText(property.toString());
             return;
@@ -99,11 +108,12 @@ void WTrackProperty::mouseMoveEvent(QMouseEvent* event) {
 
 void WTrackProperty::mouseDoubleClickEvent(QMouseEvent* event) {
     Q_UNUSED(event);
-    if (m_pCurrentTrack) {
-        ensureTrackMenuIsCreated();
-        m_pTrackMenu->loadTrack(m_pCurrentTrack, m_group);
-        m_pTrackMenu->showDlgTrackInfo(m_property);
+    if (!m_pCurrentTrack) {
+        return;
     }
+    ensureTrackMenuIsCreated();
+    m_pTrackMenu->loadTrack(m_pCurrentTrack, m_group);
+    m_pTrackMenu->showDlgTrackInfo(m_property);
 }
 
 void WTrackProperty::dragEnterEvent(QDragEnterEvent* event) {

diff --git a/src/widget/wtrackproperty.h b/src/widget/wtrackproperty.h
@@ -32,17 +32,12 @@ class WTrackProperty : public WLabel, public TrackDropTarget {
 
   protected:
     void contextMenuEvent(QContextMenuEvent* event) override;
-
-  private slots:
-    void slotTrackChanged(TrackId);
-
-  private:
     void dragEnterEvent(QDragEnterEvent* event) override;
     void dropEvent(QDropEvent* event) override;
     void mouseMoveEvent(QMouseEvent* event) override;
     void mouseDoubleClickEvent(QMouseEvent* event) override;
 
-    void updateLabel();
+    virtual void updateLabel();
 
     void ensureTrackMenuIsCreated();
 
@@ -53,4 +48,7 @@ class WTrackProperty : public WLabel, public TrackDropTarget {
     QString m_property;
 
     parented_ptr<WTrackMenu> m_pTrackMenu;
+
+  private slots:
+    void slotTrackChanged(TrackId);
 };