From 4ceb65da057dd4e0403419d69be74949c9879699 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Thu, 11 Mar 2021 20:45:13 +0100 Subject: LateNight: Add tempo range display --- res/skins/LateNight/decks/rate_controls.xml | 120 +++++++++++++----- .../LateNight/decks/rate_controls_compact.xml | 139 +++++++++++++++++---- res/skins/LateNight/style.qss | 7 ++ res/skins/LateNight/style_palemoon.qss | 9 +- 4 files changed, 212 insertions(+), 63 deletions(-) (limited to 'res') diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml index bb577d4fea..fa295ecdb9 100644 --- a/res/skins/LateNight/decks/rate_controls.xml +++ b/res/skins/LateNight/decks/rate_controls.xml @@ -90,43 +90,97 @@ RateControls - min,min horizontal + min,min - - - 45f,119f + + + stacked + max,me - - - RateSlider - 40f,119f - 5,0 - rate - skin://sliders/knob_pitch_deck.svg - skin://sliders/slider_pitch_deck.svg - false - - - - true - 20.0 - false - - ,rate - - + + + + RateSliderBox + 53f,121f + + + + RateSlider + 40f,113f + 5,2 + rate + skin://sliders/knob_pitch_deck.svg + skin://sliders/slider_pitch_deck.svg + false + + + + true + 20.0 + false + + ,rate + + + + + + + + min,me + + + + rate_range_display + RateDisplayTop + + Top + prefix + 7f,16f + 3,0 + + + rate_range_display + RateDisplayTop + + Top + range + 17f,16f + 35,1 + + + + rate_range_display + RateDisplayBottom + + Bottom + prefix + 7f,16f + 3,99 + + + rate_range_display + RateDisplayBottom + + Bottom + range + 17f,16f + 35,99 + + + - + RateButtons diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml index 5129d881c8..3590adbe24 100644 --- a/res/skins/LateNight/decks/rate_controls_compact.xml +++ b/res/skins/LateNight/decks/rate_controls_compact.xml @@ -78,16 +78,11 @@ min,min horizontal - + - - [LateNight],show_sync_button_compact - visible - min,min vertical - SyncBoxCompact horizontal @@ -105,19 +100,18 @@ - - AlignCenter - min,min - vertical + + stacked + max,me + - - 50f,79f + 53f,81f + + + + min,me + + + + rate_range_display + RateDisplayTop + + Top + prefix + 7f,16f + 3,0 + + + rate_range_display + RateDisplayTop + + Top + range + 17f,16f + 35,1 + + + + rate_range_display + RateDisplayBottom + + Bottom + prefix + 7f,16f + 3,65 + + + rate_range_display + RateDisplayBottom + + Bottom + range + 17f,16f + 35,65 + + + - + - - - - AlignCenter [LateNight],show_sync_button_compact - visible - min,min - horizontal + + + + max,min + stacked - 50f,95f + 53f,97f + + + + min,me + + + + rate_range_display + RateDisplayTop + + Top + prefix + 7f,16f + 3,0 + + + rate_range_display + RateDisplayTop + + Top + range + 17f,16f + 35,1 + + + + rate_range_display + RateDisplayBottom + + Bottom + prefix + 7f,16f + 3,81 + + + rate_range_display + RateDisplayBottom + + Bottom + range + 17f,16f + 35,81 + + + - + + [LateNight],show_sync_button_compact + + visible + + diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index 1420cae170..95bf7a7910 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -329,6 +329,13 @@ WSpinny { /* background: none;*/ } +#RateDisplayTop, #RateDisplayBottom { + qproperty-alignment: 'AlignRight'; + color: #888; + font-size: 12px; + line-height: 10px; +} + #BpmText, #RateText { qproperty-alignment: 'AlignCenter'; diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss index 71ae27b7b9..22805fd4e9 100644 --- a/res/skins/LateNight/style_palemoon.qss +++ b/res/skins/LateNight/style_palemoon.qss @@ -639,11 +639,12 @@ WSearchLineEdit { } #RateControls { - margin: 0px 2px; - } - #RateButtons { - margin-right: 2px; + margin: 0px 1px 0px 2px; + /*background-color: #000;*/ } + #RateSlider { + /*background-color: rgba(255,0,0,80);*/ + } /********************** Loop Controls / AutoDJ spinbox ************************/ -- cgit v1.2.3 From 63c2c4b6cab8b73c2bf0ef527568ac6cbfd490ae Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Thu, 11 Mar 2021 23:49:40 +0100 Subject: LateNight: Increase WRateRange width to make "100" fit --- res/skins/LateNight/decks/rate_controls.xml | 6 +++--- res/skins/LateNight/decks/rate_controls_compact.xml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'res') diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml index fa295ecdb9..81e161549e 100644 --- a/res/skins/LateNight/decks/rate_controls.xml +++ b/res/skins/LateNight/decks/rate_controls.xml @@ -102,7 +102,7 @@ RateSliderBox - 53f,121f + 56f,121f diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml index 3590adbe24..c49814e141 100644 --- a/res/skins/LateNight/decks/rate_controls_compact.xml +++ b/res/skins/LateNight/decks/rate_controls_compact.xml @@ -106,7 +106,7 @@ - 53f,81f + 56f,81f @@ -198,7 +198,7 @@ - 53f,97f + 56f,97f -- cgit v1.2.3 From 60616e9cc819d7fc1824752695bdee93af15c950 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 12 Mar 2021 00:02:01 +0100 Subject: LateNight: Decrease RateRange size (and font size) --- res/skins/LateNight/decks/rate_controls.xml | 6 +++--- res/skins/LateNight/decks/rate_controls_compact.xml | 12 ++++++------ res/skins/LateNight/style.qss | 5 ++--- 3 files changed, 11 insertions(+), 12 deletions(-) (limited to 'res') diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml index 81e161549e..db6a3ce8e3 100644 --- a/res/skins/LateNight/decks/rate_controls.xml +++ b/res/skins/LateNight/decks/rate_controls.xml @@ -102,7 +102,7 @@ RateSliderBox - 56f,121f + 54f,121f diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml index c49814e141..fb70171d5d 100644 --- a/res/skins/LateNight/decks/rate_controls_compact.xml +++ b/res/skins/LateNight/decks/rate_controls_compact.xml @@ -106,7 +106,7 @@ - 56f,81f + 54f,81f @@ -198,7 +198,7 @@ - 56f,97f + 54f,97f diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index 95bf7a7910..9938015c6e 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -330,10 +330,9 @@ WSpinny { /* } #RateDisplayTop, #RateDisplayBottom { - qproperty-alignment: 'AlignRight'; + qproperty-alignment: 'AlignCenter'; color: #888; - font-size: 12px; - line-height: 10px; + font-size: 10px; } #BpmText, -- cgit v1.2.3 From 289ec2770627ffa0532f52b3cd22e8c235a55066 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 12 Mar 2021 01:05:40 +0100 Subject: Deere: Add rate range display --- res/skins/Deere/deck_tempo_column.xml | 87 ++++++++++++++++++++++++++++++----- res/skins/Deere/style.qss | 18 ++++++++ 2 files changed, 93 insertions(+), 12 deletions(-) (limited to 'res') diff --git a/res/skins/Deere/deck_tempo_column.xml b/res/skins/Deere/deck_tempo_column.xml index 01c8aea62a..8c27847e5e 100644 --- a/res/skins/Deere/deck_tempo_column.xml +++ b/res/skins/Deere/deck_tempo_column.xml @@ -81,19 +81,82 @@ - - horizontal + + stacked + max,me - - rate - 40f,-1me - 40,200 - slider-vertical.svg - handle-vertical-blue.svg - - ,rate - - + + horizontal + + + rate + 50f,-1me + 40,200 + slider-vertical.svg + handle-vertical-blue.svg + + ,rate + + + + + + + + me,me + vertical + 50f,-1me + + + me,me + horizontal + + + + rate_range_display + RateDisplayTopPrefix + + Top + prefix + me,me + + + rate_range_display + RateDisplayTopRate + + Top + range + me,me + + + + + + me,me + horizontal + + + + rate_range_display + RateDisplayBottomPrefix + + Bottom + Bottom + prefix + me,me + + + rate_range_display + RateDisplayBottomRate + + Bottom + range + me,me + + + + + diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss index 6ba7ce445f..75e811d8b4 100644 --- a/res/skins/Deere/style.qss +++ b/res/skins/Deere/style.qss @@ -2221,3 +2221,21 @@ WEffectSelector { #CueDeleteButton:hover { background-color: #4B4B4B; } + +WRateRange { + font-size: 10px; +} + +#RateDisplayTopPrefix { + qproperty-alignment: 'AlignLeft | AlignTop'; +} +#RateDisplayTopRate { + qproperty-alignment: 'AlignRight | AlignTop'; +} + +#RateDisplayBottomPrefix { + qproperty-alignment: 'AlignLeft | AlignBottom'; +} +#RateDisplayBottomRate { + qproperty-alignment: 'AlignRight | AlignBottom'; +} -- cgit v1.2.3 From c2550a27f19977932f621f72ef2a7fa32c227e1e Mon Sep 17 00:00:00 2001 From: ronso0 Date: Fri, 12 Mar 2021 03:39:49 +0100 Subject: LateNight: restore pitch slider size (unblur), adjust rate range size & color --- res/skins/LateNight/decks/rate_controls.xml | 8 ++++---- res/skins/LateNight/style.qss | 12 +++++------- res/skins/LateNight/style_classic.qss | 5 +---- res/skins/LateNight/style_palemoon.qss | 3 ++- 4 files changed, 12 insertions(+), 16 deletions(-) (limited to 'res') diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml index db6a3ce8e3..3c618d92ab 100644 --- a/res/skins/LateNight/decks/rate_controls.xml +++ b/res/skins/LateNight/decks/rate_controls.xml @@ -107,7 +107,7 @@ RateSlider - 40f,113f + 40f,119f 5,2 rate skin://sliders/knob_pitch_deck.svg @@ -124,8 +124,8 @@ false - - true + + true 20.0 false diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index 9938015c6e..44f06197b6 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -107,6 +107,7 @@ QLabel#labelRecStatistics { #KnobLabel, #FxKnobLabel, #FxButtonLabel, +#RateRangeText, #LatencyLabel { font-size: 10px; text-align: center; @@ -119,6 +120,7 @@ WPushButton, font-size: 11px; } +#RateRangePrefix, #RecDuration[highlight="2"], #SamplerTitleMini, #EQKillButton, @@ -329,14 +331,10 @@ WSpinny { /* background: none;*/ } -#RateDisplayTop, #RateDisplayBottom { - qproperty-alignment: 'AlignCenter'; - color: #888; - font-size: 10px; -} - #BpmText, -#RateText { +#RateText, +#RateRangePrefix, +#RateRangeText { qproperty-alignment: 'AlignCenter'; } diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss index b8d4790856..b35c8d1f2a 100644 --- a/res/skins/LateNight/style_classic.qss +++ b/res/skins/LateNight/style_classic.qss @@ -1089,10 +1089,7 @@ WTrackMenu QMenu QCheckBox, color: #0795b5; } -/* Grey. default for all deck labels */ -#PlayPositionText, #PlayPositionTextSmall, -#DurationText, #RateText, -#KeyText, #KeyTextSmall, +/* Grey */ #PreviewLabel, WEffectSelector, WEffectSelector QAbstractScrollArea, #fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea, diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss index 22805fd4e9..e90370d4f9 100644 --- a/res/skins/LateNight/style_palemoon.qss +++ b/res/skins/LateNight/style_palemoon.qss @@ -1329,7 +1329,8 @@ WEffectSelector, /* Grey. default for all deck labels */ #PlayPositionText, #PlayPositionTextSmall, -#DurationText, #RateText, +#DurationText, +#RateText, #RateRangePrefix, #RateRangeText, #MixerMasterHeadphone #FxAssignButtons WPushButton[displayValue="0"], #PreviewLabel, WEffectSelector QAbstractScrollArea, -- cgit v1.2.3 From fb3902b50fe90f6555c13d154a86a0c45d217f76 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Fri, 12 Mar 2021 03:44:05 +0100 Subject: LateNight: move rate range displays into Singleton --- res/skins/LateNight/decks/deck_singletons.xml | 63 ++++++++++++- res/skins/LateNight/decks/rate_controls.xml | 51 ++--------- .../LateNight/decks/rate_controls_compact.xml | 102 ++++----------------- 3 files changed, 89 insertions(+), 127 deletions(-) (limited to 'res') diff --git a/res/skins/LateNight/decks/deck_singletons.xml b/res/skins/LateNight/decks/deck_singletons.xml index 453811903a..28a7824eef 100644 --- a/res/skins/LateNight/decks/deck_singletons.xml +++ b/res/skins/LateNight/decks/deck_singletons.xml @@ -9,8 +9,7 @@ - + DeckOverview @@ -20,7 +19,6 @@ - DeckSettings @@ -28,7 +26,6 @@ - KeyControls @@ -36,6 +33,64 @@ + + + RateRangeDisplayTop + + + 53f,17f + + + rate_range_display + RateRangePrefix + + Top + prefix + 7f,16f + 3,0 + + + rate_range_display + RateRangeText + + Top + range + 18f,16f + 35,1 + + + + + + + RateRangeDisplayBottom + + + 53f,16f + + + rate_range_display + RateRangePrefix + + Bottom + prefix + 7f,16f + 3,0 + + + rate_range_display + RateRangeText + + Bottom + range + 18f,16f + 35,0 + + + + + + diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml index 3c618d92ab..342db91725 100644 --- a/res/skins/LateNight/decks/rate_controls.xml +++ b/res/skins/LateNight/decks/rate_controls.xml @@ -135,50 +135,19 @@ - - + min,me + vertical - - - rate_range_display - RateDisplayTop - - Top - prefix - 7f,16f - 3,0 - - - rate_range_display - RateDisplayTop - - Top - range - 18f,16f - 35,1 - - - - rate_range_display - RateDisplayBottom - - Bottom - prefix - 7f,16f - 3,99 - - - rate_range_display - RateDisplayBottom - - Bottom - range - 18f,16f - 35,99 - + + RateRangeDisplayTop + + 0min,0me + + RateRangeDisplayBottom + - + diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml index fb70171d5d..e89e6af9cd 100644 --- a/res/skins/LateNight/decks/rate_controls_compact.xml +++ b/res/skins/LateNight/decks/rate_controls_compact.xml @@ -139,50 +139,19 @@ - - + min,me + vertical - - - rate_range_display - RateDisplayTop - - Top - prefix - 7f,16f - 3,0 - - - rate_range_display - RateDisplayTop - - Top - range - 18f,16f - 35,1 - - - - rate_range_display - RateDisplayBottom - - Bottom - prefix - 7f,16f - 3,65 - - - rate_range_display - RateDisplayBottom - - Bottom - range - 18f,16f - 35,65 - + + RateRangeDisplayTop + + 0min,0me + + RateRangeDisplayBottom + - + @@ -232,50 +201,19 @@ - - + min,me + vertical - - - rate_range_display - RateDisplayTop - - Top - prefix - 7f,16f - 3,0 - - - rate_range_display - RateDisplayTop - - Top - range - 18f,16f - 35,1 - - - - rate_range_display - RateDisplayBottom - - Bottom - prefix - 7f,16f - 3,81 - - - rate_range_display - RateDisplayBottom - - Bottom - range - 18f,16f - 35,81 - + + RateRangeDisplayTop + + 0min,0me + + RateRangeDisplayBottom + - + [LateNight],show_sync_button_compact -- cgit v1.2.3 From f0a04278d2198936e0f3f3eb5bd6144f00b701ea Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 12 Mar 2021 12:53:24 +0100 Subject: Shade: Add rate range display to tempo slider --- res/skins/Shade/deck.xml | 43 +++++++++++++++++++++++++++++++++++++++++-- res/skins/Shade/style.qss | 5 +++++ 2 files changed, 46 insertions(+), 2 deletions(-) (limited to 'res') diff --git a/res/skins/Shade/deck.xml b/res/skins/Shade/deck.xml index ee40bcb84a..8484886045 100644 --- a/res/skins/Shade/deck.xml +++ b/res/skins/Shade/deck.xml @@ -516,6 +516,45 @@ + + + rate_range_display + RateDisplayTopPrefix + + Top + prefix + 20f,-1me + 0,62 + + + rate_range_display + RateDisplayTopRate + + Top + range + 20f,-1me + 32,62 + + + rate_range_display + RateDisplayBottomPrefix + + Bottom + Bottom + prefix + 20f,-1me + 0,148 + + + rate_range_display + RateDisplayBottomRate + + Bottom + range + 20f,-1me + 32,148 + + rate knob_pitch.png @@ -536,7 +575,7 @@ 0 ► - 36,148 + 36,138 ,rate_temp_up true @@ -557,7 +596,7 @@ 0 ◄ - 7,148 + 7,138 ,rate_temp_down true diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss index 6b4bce8eca..fb1783e51e 100644 --- a/res/skins/Shade/style.qss +++ b/res/skins/Shade/style.qss @@ -915,3 +915,8 @@ QPushButton#pushButtonRepeatPlaylist { #HotcueButton { background-color: #aab2b7; } + +WRateRange { + font-size: 10px; + qproperty-alignment: 'AlignCenter'; +} -- cgit v1.2.3 From deb0cb2e75b40a949720c71f2347963c3650ecc1 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 12 Mar 2021 13:26:03 +0100 Subject: Tango: Add rate range to pitch slider --- res/skins/Tango/rate_pitch_key.xml | 89 ++++++++++++++++++++++++++++++++------ res/skins/Tango/style.qss | 16 ++++++- 2 files changed, 91 insertions(+), 14 deletions(-) (limited to 'res') diff --git a/res/skins/Tango/rate_pitch_key.xml b/res/skins/Tango/rate_pitch_key.xml index faee2b07fc..fc2e2be342 100644 --- a/res/skins/Tango/rate_pitch_key.xml +++ b/res/skins/Tango/rate_pitch_key.xml @@ -163,20 +163,83 @@ Variables: - - PitchSlider - 50,75 - 50,136 - f,me - rate - knobs_sliders/pitch_handle.svg - knobs_sliders/pitch_scale.svg - false - - ,rate - - + + stacked + max,me + PitchSliderGroup + + + PitchSlider + 50,75 + 50,136 + f,me + rate + knobs_sliders/pitch_handle.svg + knobs_sliders/pitch_scale.svg + false + + ,rate + + + + + + me,me + vertical + 50f,-1me + + + me,me + horizontal + + + + rate_range_display + RateDisplayTopPrefix + + Top + prefix + me,me + + + rate_range_display + RateDisplayTopRate + + Top + range + me,me + + + + + me,me + horizontal + + + + rate_range_display + RateDisplayBottomPrefix + + Bottom + Bottom + prefix + me,me + + + rate_range_display + RateDisplayBottomRate + + Bottom + range + me,me + + + + + + + diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss index 5c6cad9f9f..93102844aa 100644 --- a/res/skins/Tango/style.qss +++ b/res/skins/Tango/style.qss @@ -1193,7 +1193,7 @@ WBeatSpinBox, #Bpm, #KeyDisplayMatch, #RateUp, #RateDown, #KeyUp, #KeyDown, -#PitchSlider { +#PitchSliderGroup { background-color: #252525; border-radius: 3px; } @@ -2974,3 +2974,17 @@ WOverview { color: #eeeeee; font-size is considered, color not. } */ + +WRateRange { + font-size: 11px; +} + +#RateDisplayTopPrefix, +#RateDisplayTopRate { + qproperty-alignment: 'AlignHCenter | AlignTop'; +} + +#RateDisplayBottomPrefix, +#RateDisplayBottomRate { + qproperty-alignment: 'AlignHCenter | AlignBottom'; +} -- cgit v1.2.3 From fd9a04a0b3e3b53ca31c1eb4da01c68ab759f25c Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 12 Mar 2021 22:32:19 +0100 Subject: Shade: Change color of rate range text to dark gray --- res/skins/Shade/style.qss | 1 + 1 file changed, 1 insertion(+) (limited to 'res') diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss index fb1783e51e..82d9d0f117 100644 --- a/res/skins/Shade/style.qss +++ b/res/skins/Shade/style.qss @@ -917,6 +917,7 @@ QPushButton#pushButtonRepeatPlaylist { } WRateRange { + color: #4B515F; font-size: 10px; qproperty-alignment: 'AlignCenter'; } -- cgit v1.2.3 From 7de1dee070f922937afdd0ded5e52a736b039c31 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Fri, 12 Mar 2021 22:49:26 +0100 Subject: LateNight: wider pitch slider scale --- .../palemoon/sliders/slider_pitch_deck.svg | 215 ++++--------------- .../palemoon/sliders/slider_pitch_deck_compact.svg | 215 ++++--------------- .../sliders/slider_pitch_deck_compact_sync.svg | 228 +++++---------------- 3 files changed, 135 insertions(+), 523 deletions(-) (limited to 'res') diff --git a/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg b/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg index 694a5773a5..95b7329eea 100644 --- a/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg +++ b/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg @@ -1,174 +1,43 @@ - - - - - - image/svg+xml - - - - - - - - - - - - -