From e9700363173914f19614dfd0b861745668f5c39a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nino=20Mi=C5=A1ki=C4=87-Pletenac?= Date: Fri, 8 Oct 2021 01:20:00 +0200 Subject: [PATCH 1/3] WTrackProperty: Warn about non-existing Track properties --- src/widget/wtrackproperty.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/widget/wtrackproperty.cpp b/src/widget/wtrackproperty.cpp index c4705610a38..d3f497de26a 100644 --- a/src/widget/wtrackproperty.cpp +++ b/src/widget/wtrackproperty.cpp @@ -44,6 +44,11 @@ void WTrackProperty::setup(const QDomNode& node, const SkinContext& context) { WLabel::setup(node, context); m_property = context.selectString(node, "Property"); + + // 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; + } } void WTrackProperty::slotTrackLoaded(TrackPointer pTrack) { From 0d5f9ac1fa6cb43d3ea9171cf3afcdbf5abf154c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nino=20Mi=C5=A1ki=C4=87-Pletenac?= Date: Fri, 8 Oct 2021 02:00:00 +0200 Subject: [PATCH 2/3] Track: Rename property for consistency Rename durationText to durationTextSeconds. --- src/track/track.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/track/track.h b/src/track/track.h index c737a0d9970..a1ff1a9ccc1 100644 --- a/src/track/track.h +++ b/src/track/track.h @@ -67,7 +67,8 @@ class Track : public QObject { Q_PROPERTY(QString bpmText READ getBpmText STORED false NOTIFY bpmChanged) Q_PROPERTY(QString keyText READ getKeyText WRITE setKeyText NOTIFY keyChanged) Q_PROPERTY(double duration READ getDuration NOTIFY durationChanged) - Q_PROPERTY(QString durationText READ getDurationTextSeconds STORED false NOTIFY durationChanged) + Q_PROPERTY(QString durationTextSeconds READ getDurationTextSeconds + STORED false NOTIFY durationChanged) Q_PROPERTY(QString durationTextCentiseconds READ getDurationTextCentiseconds STORED false NOTIFY durationChanged) Q_PROPERTY(QString durationTextMilliseconds READ getDurationTextMilliseconds From c7fb7578d6e1ca38612bfed1d6f8d49cc599cc17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nino=20Mi=C5=A1ki=C4=87-Pletenac?= Date: Fri, 8 Oct 2021 02:20:00 +0200 Subject: [PATCH 3/3] Fix use of non-existing track property in LateNight and Tango skins --- res/skins/LateNight/decks/row_2_3_TitleArtistTime.xml | 2 +- res/skins/LateNight/decks/row_2_3_TitleArtistTime_compact.xml | 2 +- res/skins/Tango/decks/row_text_left.xml | 2 +- res/skins/Tango/decks/row_text_right.xml | 2 +- res/skins/Tango/mic_aux_sampler/sampler.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/res/skins/LateNight/decks/row_2_3_TitleArtistTime.xml b/res/skins/LateNight/decks/row_2_3_TitleArtistTime.xml index 992f62ef0c7..fca3595e588 100644 --- a/res/skins/LateNight/decks/row_2_3_TitleArtistTime.xml +++ b/res/skins/LateNight/decks/row_2_3_TitleArtistTime.xml @@ -106,7 +106,7 @@ track_duration 0min,25f right - durationFormatted + durationTextSeconds diff --git a/res/skins/LateNight/decks/row_2_3_TitleArtistTime_compact.xml b/res/skins/LateNight/decks/row_2_3_TitleArtistTime_compact.xml index a400f56e5c3..0e6939b10bd 100644 --- a/res/skins/LateNight/decks/row_2_3_TitleArtistTime_compact.xml +++ b/res/skins/LateNight/decks/row_2_3_TitleArtistTime_compact.xml @@ -107,7 +107,7 @@ DurationText track_duration 0min,22f - durationFormatted + durationTextSeconds diff --git a/res/skins/Tango/decks/row_text_left.xml b/res/skins/Tango/decks/row_text_left.xml index 428a5d3708e..867fdb05c91 100644 --- a/res/skins/Tango/decks/row_text_left.xml +++ b/res/skins/Tango/decks/row_text_left.xml @@ -88,7 +88,7 @@ Variables: Duration 60min,21f track_duration - durationFormatted + durationTextSeconds right diff --git a/res/skins/Tango/decks/row_text_right.xml b/res/skins/Tango/decks/row_text_right.xml index 9da4c9ad70b..f696da5995c 100644 --- a/res/skins/Tango/decks/row_text_right.xml +++ b/res/skins/Tango/decks/row_text_right.xml @@ -83,7 +83,7 @@ Variables: Duration 80me,21f track_duration - durationFormatted + durationTextSeconds left diff --git a/res/skins/Tango/mic_aux_sampler/sampler.xml b/res/skins/Tango/mic_aux_sampler/sampler.xml index 315cda6dccf..216e1451b59 100644 --- a/res/skins/Tango/mic_aux_sampler/sampler.xml +++ b/res/skins/Tango/mic_aux_sampler/sampler.xml @@ -109,7 +109,7 @@ Variables: text 1me,1min - durationFormatted + durationTextSeconds