From d86e5856c6f47d5e93adf2118429ef5b31ca9a6a Mon Sep 17 00:00:00 2001 From: ronso0 Date: Thu, 31 Oct 2019 20:44:02 +0100 Subject: [PATCH 001/110] LateNight: fix big Cover/Spinny layout --- res/skins/LateNight/deck.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/res/skins/LateNight/deck.xml b/res/skins/LateNight/deck.xml index f45c1ebf1a91..9d6108316da3 100644 --- a/res/skins/LateNight/deck.xml +++ b/res/skins/LateNight/deck.xml @@ -19,17 +19,18 @@ horizontal - min,min - 102, + i,min + 107, horizontal + AlignLeft min,min - 103, + 107, horizontal From 00b93a0b01a6fcc867f12ed06c10b87d57aa801a Mon Sep 17 00:00:00 2001 From: ronso0 Date: Thu, 31 Oct 2019 20:44:54 +0100 Subject: [PATCH 002/110] LateNight: clean slider graphics --- res/skins/LateNight/deck_rate_controls.xml | 7 +- res/skins/LateNight/eq_knob_left.xml | 4 - res/skins/LateNight/eq_knob_right.xml | 4 - .../knobs_sliders/knob_crossfader.svg | 63 +- .../knobs_sliders/knob_pitch_deck.svg | 2 +- .../knobs_sliders/knob_pitch_sampler.svg | 59 +- .../knobs_sliders/knob_volume_deck.svg | 2 +- .../knobs_sliders/slider_crossfader.svg | 238 +----- .../knobs_sliders/slider_crossfader.svg.png | Bin 432 -> 0 bytes .../knobs_sliders/slider_crossfader_small.svg | 2 +- .../knobs_sliders/slider_pitch_deck.svg | 2 +- .../knobs_sliders/slider_pitch_sampler.svg | 806 +----------------- .../knobs_sliders/slider_volume_deck.svg | 97 +-- res/skins/LateNight/mixer.xml | 77 +- res/skins/LateNight/mixer_channel_4decks.xml | 19 +- res/skins/LateNight/mixer_channel_left.xml | 37 +- res/skins/LateNight/mixer_channel_right.xml | 31 +- .../LateNight/quick_effect_knob_4decks.xml | 4 +- .../LateNight/quick_effect_knob_left.xml | 8 +- .../LateNight/quick_effect_knob_right.xml | 8 +- res/skins/LateNight/style.qss | 18 +- 21 files changed, 130 insertions(+), 1358 deletions(-) delete mode 100644 res/skins/LateNight/knobs_sliders/slider_crossfader.svg.png diff --git a/res/skins/LateNight/deck_rate_controls.xml b/res/skins/LateNight/deck_rate_controls.xml index 4021d9069cac..06368ac8be3c 100644 --- a/res/skins/LateNight/deck_rate_controls.xml +++ b/res/skins/LateNight/deck_rate_controls.xml @@ -62,9 +62,10 @@ RateSlider + 40f,113f rate - skin:/knobs_sliders/knob_pitch_deck.svg - skin:/knobs_sliders/slider_pitch_deck.svg + skin:/knobs_sliders/knob_pitch_deck.svg + skin:/knobs_sliders/slider_pitch_deck.svg false ,rate @@ -76,7 +77,7 @@ vertical min,min - 0min,2f + 0min,3f vertical min,min diff --git a/res/skins/LateNight/eq_knob_left.xml b/res/skins/LateNight/eq_knob_left.xml index b7dd6c16a849..96bfa0586a46 100644 --- a/res/skins/LateNight/eq_knob_left.xml +++ b/res/skins/LateNight/eq_knob_left.xml @@ -58,9 +58,5 @@ - - [Skin],show_eq_knobs - visible - diff --git a/res/skins/LateNight/eq_knob_right.xml b/res/skins/LateNight/eq_knob_right.xml index 194a5c2e9d9d..add35a2b0928 100644 --- a/res/skins/LateNight/eq_knob_right.xml +++ b/res/skins/LateNight/eq_knob_right.xml @@ -56,9 +56,5 @@ - - [Skin],show_eq_knobs - visible - diff --git a/res/skins/LateNight/knobs_sliders/knob_crossfader.svg b/res/skins/LateNight/knobs_sliders/knob_crossfader.svg index 31b617c8318a..ab2b7f1ac404 100644 --- a/res/skins/LateNight/knobs_sliders/knob_crossfader.svg +++ b/res/skins/LateNight/knobs_sliders/knob_crossfader.svg @@ -1,62 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - + diff --git a/res/skins/LateNight/knobs_sliders/knob_pitch_deck.svg b/res/skins/LateNight/knobs_sliders/knob_pitch_deck.svg index 6abf65d31edf..db639a6dccaf 100644 --- a/res/skins/LateNight/knobs_sliders/knob_pitch_deck.svg +++ b/res/skins/LateNight/knobs_sliders/knob_pitch_deck.svg @@ -1 +1 @@ - + diff --git a/res/skins/LateNight/knobs_sliders/knob_pitch_sampler.svg b/res/skins/LateNight/knobs_sliders/knob_pitch_sampler.svg index 609507e13f88..9f5531988ed3 100644 --- a/res/skins/LateNight/knobs_sliders/knob_pitch_sampler.svg +++ b/res/skins/LateNight/knobs_sliders/knob_pitch_sampler.svg @@ -1,58 +1 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - + diff --git a/res/skins/LateNight/knobs_sliders/knob_volume_deck.svg b/res/skins/LateNight/knobs_sliders/knob_volume_deck.svg index cee3acdf4170..c659eaff3bed 100644 --- a/res/skins/LateNight/knobs_sliders/knob_volume_deck.svg +++ b/res/skins/LateNight/knobs_sliders/knob_volume_deck.svg @@ -1 +1 @@ - + diff --git a/res/skins/LateNight/knobs_sliders/slider_crossfader.svg b/res/skins/LateNight/knobs_sliders/slider_crossfader.svg index dce2136e1d0f..e946d7a9dc53 100644 --- a/res/skins/LateNight/knobs_sliders/slider_crossfader.svg +++ b/res/skins/LateNight/knobs_sliders/slider_crossfader.svg @@ -1,237 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/res/skins/LateNight/knobs_sliders/slider_crossfader.svg.png b/res/skins/LateNight/knobs_sliders/slider_crossfader.svg.png deleted file mode 100644 index 95a414a71d22906a6ade3338a39a755a0a8bef98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^^MF{7gAGXD^k2XSq*#ibJVQ8upoSx*1IXtr@Q5sC zVBk9f!i-b3`J{n@k|nMYCBgY=CFO}lsSM@i<$9TU*~Q6;1*v-ZMd`EO*+?-kFzR}` zIEGZrd3$?f?x6sYwu|mc7pt1h8?JwJitL!@d&ihz?&~E=T|GTQ9zXuhDW0Vr7(3Jd z{0*VqQLn2T)vG=A5ByiLQEG8-`OqOCCwNHNsltV$pW~sRqK(qJL(*-E8`-6|UYRTm z61wP9QO9)W+O4mdYBt+kE6TIpwnWZ8`aw^;Ot(0<`sVZW>a&&~J1XApdiVA + diff --git a/res/skins/LateNight/knobs_sliders/slider_pitch_deck.svg b/res/skins/LateNight/knobs_sliders/slider_pitch_deck.svg index b5c9580ef23c..ae5428754a3d 100644 --- a/res/skins/LateNight/knobs_sliders/slider_pitch_deck.svg +++ b/res/skins/LateNight/knobs_sliders/slider_pitch_deck.svg @@ -1 +1 @@ - + diff --git a/res/skins/LateNight/knobs_sliders/slider_pitch_sampler.svg b/res/skins/LateNight/knobs_sliders/slider_pitch_sampler.svg index 3dc4b26508dd..44128a75ec59 100644 --- a/res/skins/LateNight/knobs_sliders/slider_pitch_sampler.svg +++ b/res/skins/LateNight/knobs_sliders/slider_pitch_sampler.svg @@ -1,805 +1 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/res/skins/LateNight/knobs_sliders/slider_volume_deck.svg b/res/skins/LateNight/knobs_sliders/slider_volume_deck.svg index 4e0f2cbfc099..2fc5b6fd348e 100644 --- a/res/skins/LateNight/knobs_sliders/slider_volume_deck.svg +++ b/res/skins/LateNight/knobs_sliders/slider_volume_deck.svg @@ -1,96 +1 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - + diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml index 69abbcfc0087..c6fbd1c08d66 100644 --- a/res/skins/LateNight/mixer.xml +++ b/res/skins/LateNight/mixer.xml @@ -5,8 +5,9 @@ crossfader + 141f,46f skin:/knobs_sliders/knob_crossfader.svg - skin:/knobs_sliders/slider_crossfader.svg + skin:/knobs_sliders/slider_crossfader.svg true [Master],crossfader @@ -139,12 +140,7 @@ vertical max,me - - - vertical - 1min,0me - - + 1min,43f VuMeterMaster2Decks @@ -157,12 +153,7 @@ - - - vertical - 1min,5f - - + 1min,0me [Skin],show_4decks @@ -202,14 +193,13 @@ CrossfaderAndSwitches2Decks horizontal + me,min - + vertical - me,min + min,min - min,2f