From 9a30fcc7c534147c89ff48af9d0b1b197664a616 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Wed, 29 Nov 2017 17:29:21 +0100 Subject: [PATCH 01/12] knobs redesign Improved visibility for various big knobs (EQ, effect Dry/Wet, Meta knobs etc.) by applying the color coding to the knob ring rather than its pointer. Increased contrast for small effect parameter knob. --- res/skins/Deere/effect_meta_knob.xml | 2 +- res/skins/Deere/effect_unit_no_parameters.xml | 4 +- .../Deere/effect_unit_with_parameters.xml | 4 +- .../Deere/equalizer_rack_parameter_left.xml | 4 +- .../Deere/equalizer_rack_parameter_right.xml | 4 +- res/skins/Deere/knob.xml | 4 +- res/skins/Deere/knob_bg.svg | 101 ------------ res/skins/Deere/knob_bg_blue.svg | 148 ++++++++++++++++++ res/skins/Deere/knob_bg_red.svg | 144 +++++++++++++++++ .../{knob_red.svg => knob_bg_yellow.svg} | 77 ++++++--- res/skins/Deere/knob_blue.svg | 120 -------------- res/skins/Deere/knob_toolbar.xml | 4 +- .../Deere/{knob_yellow.svg => knob_white.svg} | 79 +++++----- 13 files changed, 403 insertions(+), 292 deletions(-) delete mode 100644 res/skins/Deere/knob_bg.svg create mode 100644 res/skins/Deere/knob_bg_blue.svg create mode 100644 res/skins/Deere/knob_bg_red.svg rename res/skins/Deere/{knob_red.svg => knob_bg_yellow.svg} (56%) delete mode 100644 res/skins/Deere/knob_blue.svg rename res/skins/Deere/{knob_yellow.svg => knob_white.svg} (65%) diff --git a/res/skins/Deere/effect_meta_knob.xml b/res/skins/Deere/effect_meta_knob.xml index 14bd0b3ed110..58a2732fb04e 100644 --- a/res/skins/Deere/effect_meta_knob.xml +++ b/res/skins/Deere/effect_meta_knob.xml @@ -17,7 +17,7 @@ EffectSlot_metaknob [EffectRack_EffectUnit_Effect] meta - yellow + blue diff --git a/res/skins/Deere/effect_unit_no_parameters.xml b/res/skins/Deere/effect_unit_no_parameters.xml index eb9d8d58ea93..f3df638951b4 100644 --- a/res/skins/Deere/effect_unit_no_parameters.xml +++ b/res/skins/Deere/effect_unit_no_parameters.xml @@ -62,7 +62,7 @@ Variables: EffectUnit_super1 super1 Super - yellow + blue @@ -71,7 +71,7 @@ Variables: EffectUnit_mix mix Mix - blue + red diff --git a/res/skins/Deere/effect_unit_with_parameters.xml b/res/skins/Deere/effect_unit_with_parameters.xml index 2ecccfdcc239..694819c46880 100644 --- a/res/skins/Deere/effect_unit_with_parameters.xml +++ b/res/skins/Deere/effect_unit_with_parameters.xml @@ -50,7 +50,7 @@ Variables: EffectUnit_mix mix Mix - blue + red @@ -64,7 +64,7 @@ Variables: EffectUnit_super1 super1 Super - yellow + blue diff --git a/res/skins/Deere/equalizer_rack_parameter_left.xml b/res/skins/Deere/equalizer_rack_parameter_left.xml index 591b84b4cde8..ff3255887539 100644 --- a/res/skins/Deere/equalizer_rack_parameter_left.xml +++ b/res/skins/Deere/equalizer_rack_parameter_left.xml @@ -64,8 +64,8 @@ 40f,34f - knob_.svg - knob_bg.svg + knob_white.svg + knob_bg_.svg -135 135 1.602 diff --git a/res/skins/Deere/equalizer_rack_parameter_right.xml b/res/skins/Deere/equalizer_rack_parameter_right.xml index ea402ef265a2..d2b2dd226613 100644 --- a/res/skins/Deere/equalizer_rack_parameter_right.xml +++ b/res/skins/Deere/equalizer_rack_parameter_right.xml @@ -27,8 +27,8 @@ 40f,34f - knob_.svg - knob_bg.svg + knob_white.svg + knob_bg_.svg -135 135 1.602 diff --git a/res/skins/Deere/knob.xml b/res/skins/Deere/knob.xml index 27637baf259e..afb4ff0e2588 100644 --- a/res/skins/Deere/knob.xml +++ b/res/skins/Deere/knob.xml @@ -10,8 +10,8 @@ 40f,34f - knob_.svg - knob_bg.svg + knob_white.svg + knob_bg_.svg -135 135 1.602 diff --git a/res/skins/Deere/knob_bg.svg b/res/skins/Deere/knob_bg.svg deleted file mode 100644 index f51ec1e16d01..000000000000 --- a/res/skins/Deere/knob_bg.svg +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - diff --git a/res/skins/Deere/knob_bg_blue.svg b/res/skins/Deere/knob_bg_blue.svg new file mode 100644 index 000000000000..9b34056f841c --- /dev/null +++ b/res/skins/Deere/knob_bg_blue.svg @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/res/skins/Deere/knob_bg_red.svg b/res/skins/Deere/knob_bg_red.svg new file mode 100644 index 000000000000..fe2cac6fd03b --- /dev/null +++ b/res/skins/Deere/knob_bg_red.svg @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/skins/Deere/knob_red.svg b/res/skins/Deere/knob_bg_yellow.svg similarity index 56% rename from res/skins/Deere/knob_red.svg rename to res/skins/Deere/knob_bg_yellow.svg index a40cedddf56a..0421459d8248 100644 --- a/res/skins/Deere/knob_red.svg +++ b/res/skins/Deere/knob_bg_yellow.svg @@ -12,8 +12,8 @@ id="svg2" height="34" width="40" - inkscape:version="0.91 r13725" - sodipodi:docname="knob_red.svg"> + inkscape:version="0.48.4 r9939" + sodipodi:docname="knob_bg_yellow.svg"> + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true" + inkscape:object-nodes="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-object-midpoints="true" + inkscape:snap-intersection-paths="false" + inkscape:snap-nodes="true"> + + + + image/svg+xml - + @@ -101,16 +123,27 @@ rx="2.5876327" ry="2.4899862" /> - + sodipodi:type="arc" + style="color:#000000;fill:none;stroke:#fc9d00;stroke-width:1.85000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path2995" + sodipodi:cx="20" + sodipodi:cy="18.627001" + sodipodi:rx="15.375" + sodipodi:ry="15.375" + d="M 9.5142753,29.871564 A 15.375,15.375 0 0 1 18.392874,3.3362267" + sodipodi:start="2.3212879" + sodipodi:end="4.6076692" + sodipodi:open="true" /> + diff --git a/res/skins/Deere/knob_blue.svg b/res/skins/Deere/knob_blue.svg deleted file mode 100644 index 71439a042137..000000000000 --- a/res/skins/Deere/knob_blue.svg +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/res/skins/Deere/knob_toolbar.xml b/res/skins/Deere/knob_toolbar.xml index 495c4cac4be8..48377a29ab9f 100644 --- a/res/skins/Deere/knob_toolbar.xml +++ b/res/skins/Deere/knob_toolbar.xml @@ -12,8 +12,8 @@ 34f,28f - knob_.svg - knob_bg.svg + knob_white.svg + knob_bg_.svg -135 135 1.32 diff --git a/res/skins/Deere/knob_yellow.svg b/res/skins/Deere/knob_white.svg similarity index 65% rename from res/skins/Deere/knob_yellow.svg rename to res/skins/Deere/knob_white.svg index eea3dc517ebe..dd594dd9b1db 100644 --- a/res/skins/Deere/knob_yellow.svg +++ b/res/skins/Deere/knob_white.svg @@ -1,4 +1,6 @@ + + + sodipodi:docname="knob_white.svg"> + style="stop-color:#060606;stop-opacity:1" + offset="0" /> + style="stop-color:#343434;stop-opacity:1" + offset="1" /> - + + xlink:href="#linearGradient4937" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.257316,0,0,1,-234.59421,-615.28453)" /> + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + offset="0.25399527" /> + style="stop-color:#afafaf;stop-opacity:1" + offset="1" /> image/svg+xml - + + + y="3.102" + id="rect4263-2" + style="fill:#ffffff;fill-opacity:0.94117647;stroke:none" /> From 377f32a280a3643a6f9d8208527c3e5ddd55e1a7 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Wed, 29 Nov 2017 17:32:55 +0100 Subject: [PATCH 02/12] fader handle redesign --- res/skins/Deere/handle-crossfader.svg | 68 ++++++++++++--------------- res/skins/Deere/handle-vertical.svg | 58 +++++++++++------------ 2 files changed, 59 insertions(+), 67 deletions(-) diff --git a/res/skins/Deere/handle-crossfader.svg b/res/skins/Deere/handle-crossfader.svg index 72ca1b2acf1b..3d2ecb400e9e 100644 --- a/res/skins/Deere/handle-crossfader.svg +++ b/res/skins/Deere/handle-crossfader.svg @@ -8,11 +8,11 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" - width="100" + width="80" height="200" id="svg2" - inkscape:version="0.91 r13725" - sodipodi:docname="handle-horizontal.svg"> + inkscape:version="0.48.4 r9939" + sodipodi:docname="handle-crossfader.svg"> @@ -21,6 +21,7 @@ image/svg+xml + @@ -36,44 +37,37 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1366" - inkscape:window-height="702" + inkscape:window-height="746" id="namedview8" showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="-25.02564" - inkscape:cy="120.70049" + inkscape:zoom="2.8284271" + inkscape:cx="58.26931" + inkscape:cy="104.06668" inkscape:window-x="0" - inkscape:window-y="27" + inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="svg2" /> + inkscape:current-layer="svg2" + inkscape:snap-page="true" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" /> - - - - - + width="70" + height="190" + x="-75" + y="-195" + rx="10" + ry="10" + transform="scale(-1,-1)" /> + diff --git a/res/skins/Deere/handle-vertical.svg b/res/skins/Deere/handle-vertical.svg index 31b3debb3cf8..e29893af2547 100644 --- a/res/skins/Deere/handle-vertical.svg +++ b/res/skins/Deere/handle-vertical.svg @@ -9,9 +9,9 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="200" - height="100" + height="80" id="svg2" - inkscape:version="0.91 r13725" + inkscape:version="0.48.4 r9939" sodipodi:docname="handle-vertical.svg"> @@ -21,7 +21,7 @@ image/svg+xml - + @@ -37,38 +37,36 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1366" - inkscape:window-height="702" + inkscape:window-height="746" id="namedview8" showgrid="false" inkscape:zoom="2.8284271" - inkscape:cx="66.479601" - inkscape:cy="63.686138" + inkscape:cx="106.38546" + inkscape:cy="58.920323" inkscape:window-x="0" - inkscape:window-y="27" + inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="svg2" /> + inkscape:current-layer="svg2" + inkscape:snap-page="true" + inkscape:snap-bbox="true" /> - + style="fill:#333333;fill-opacity:1;stroke:#e0e0e0;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="rect4138" + width="70" + height="190" + x="-75" + y="5" + rx="10" + ry="10" + transform="matrix(0,-1,1,0,0,0)" /> - + style="fill:#2f8dff;fill-opacity:1;stroke:none" + id="rect4151-3" + width="155.73222" + height="34.525127" + x="-177.86612" + y="-57.262566" + transform="scale(-1,-1)" + rx="2" + ry="2" /> From f7d80a23f6ae1fd7885b1818d2ab38c59730769e Mon Sep 17 00:00:00 2001 From: ronso0 Date: Wed, 29 Nov 2017 21:21:42 +0100 Subject: [PATCH 03/12] darker FX parameter knob --- res/skins/Deere/knob_small.svg | 47 +++++++++++----------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/res/skins/Deere/knob_small.svg b/res/skins/Deere/knob_small.svg index 5a41c2923135..2f0b185789f0 100644 --- a/res/skins/Deere/knob_small.svg +++ b/res/skins/Deere/knob_small.svg @@ -1,18 +1,16 @@ + + + id="svg2"> @@ -21,42 +19,27 @@ image/svg+xml + - + d="M 18.109374,5.9257818 C 16.614352,2.9810298 13.38846,1.0005767 10.085938,1 7.7297434,0.99999987 5.3880579,1.9699577 3.7219766,3.6360388 2.0558954,5.3021199 1.0859375,7.6438054 1.0859375,10 c 0,2.356195 0.9699579,4.69788 2.6360391,6.363961 C 5.3880579,18.030042 7.7297434,19 10.085938,19 c 3.298215,-0.0045 6.517931,-1.983276 8.011717,-4.923828" + id="path4176-3" + style="fill:none;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> + + transform="matrix(0,1,-1,0,0,0)" + id="rect4168" + style="fill:#ffffff;fill-opacity:1;stroke:none" /> From 1679cbb9014b3cbff3a2512a2db43d6e44368a02 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Wed, 29 Nov 2017 21:22:36 +0100 Subject: [PATCH 04/12] shorten big knobs' pointer --- res/skins/Deere/knob_white.svg | 44 ++++++---------------------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/res/skins/Deere/knob_white.svg b/res/skins/Deere/knob_white.svg index dd594dd9b1db..627a3586b772 100644 --- a/res/skins/Deere/knob_white.svg +++ b/res/skins/Deere/knob_white.svg @@ -8,34 +8,10 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="40" height="34" - id="svg2" - inkscape:version="0.48.4 r9939" - sodipodi:docname="knob_white.svg"> - + id="svg2"> + style="fill:#797979;fill-opacity:1;stroke:#000000;stroke-width:0.60000002;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - + From a1b07b85d96d3c4b1e0d82d73450dd7bbd80f41c Mon Sep 17 00:00:00 2001 From: ronso0 Date: Wed, 29 Nov 2017 21:24:12 +0100 Subject: [PATCH 05/12] flatten vertical sliders' handle --- res/skins/Deere/handle-vertical.svg | 56 +++++++++-------------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/res/skins/Deere/handle-vertical.svg b/res/skins/Deere/handle-vertical.svg index e29893af2547..d0791ead57f8 100644 --- a/res/skins/Deere/handle-vertical.svg +++ b/res/skins/Deere/handle-vertical.svg @@ -1,18 +1,16 @@ + + + height="75" + id="svg2"> @@ -27,46 +25,24 @@ - + x="-70" + y="5" + transform="matrix(0,-1,1,0,0,0)" + id="rect4138" + style="fill:#333333;fill-opacity:1;stroke:#e0e0e0;stroke-width:9.99999905;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + id="rect4151-3" + style="fill:#2f8dff;fill-opacity:1;stroke:none" /> From 0f5b796dc24c0ec1d3a8b1eced3de8e0e842bd63 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Wed, 29 Nov 2017 21:25:10 +0100 Subject: [PATCH 06/12] test: increase slider bg contrast for bright situations --- res/skins/Deere/slider-crossfader.svg | 77 ++++++++------------------- res/skins/Deere/slider-vertical.svg | 51 ++++-------------- 2 files changed, 32 insertions(+), 96 deletions(-) diff --git a/res/skins/Deere/slider-crossfader.svg b/res/skins/Deere/slider-crossfader.svg index 11f1c9d43752..f8e676010bff 100644 --- a/res/skins/Deere/slider-crossfader.svg +++ b/res/skins/Deere/slider-crossfader.svg @@ -1,18 +1,34 @@ + + + id="svg2"> + + + + @@ -21,59 +37,10 @@ image/svg+xml + - - - - - - - - - - - diff --git a/res/skins/Deere/slider-vertical.svg b/res/skins/Deere/slider-vertical.svg index db055b0073e9..6c22a9dc10bc 100644 --- a/res/skins/Deere/slider-vertical.svg +++ b/res/skins/Deere/slider-vertical.svg @@ -1,18 +1,16 @@ + + + id="svg2"> @@ -27,47 +25,18 @@ - - - - - - - + id="rect4167" + style="fill:none;stroke:#4d4d4d;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#222222;fill-opacity:1;stroke:#222222;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> From 7f5da30974901051d97d2ef0a76d56d0a2d6348a Mon Sep 17 00:00:00 2001 From: ronso0 Date: Mon, 4 Dec 2017 16:45:16 +0100 Subject: [PATCH 07/12] widen knob ring's center mark --- res/skins/Deere/handle-crossfader.svg | 14 +- res/skins/Deere/knob_bg_blue.svg | 78 +---------- res/skins/Deere/knob_bg_red.svg | 65 +-------- res/skins/Deere/knob_bg_yellow.svg | 124 +++++------------- .../Deere/quick_effect_superknob_left.xml | 2 +- .../Deere/quick_effect_superknob_right.xml | 2 +- res/skins/Deere/style.qss | 2 +- 7 files changed, 53 insertions(+), 234 deletions(-) diff --git a/res/skins/Deere/handle-crossfader.svg b/res/skins/Deere/handle-crossfader.svg index 3d2ecb400e9e..0276a6a61b9a 100644 --- a/res/skins/Deere/handle-crossfader.svg +++ b/res/skins/Deere/handle-crossfader.svg @@ -21,7 +21,7 @@ image/svg+xml - + @@ -37,14 +37,14 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1366" - inkscape:window-height="746" + inkscape:window-height="747" id="namedview8" showgrid="false" - inkscape:zoom="2.8284271" - inkscape:cx="58.26931" - inkscape:cy="104.06668" + inkscape:zoom="5.6568542" + inkscape:cx="25.339899" + inkscape:cy="109.14752" inkscape:window-x="0" - inkscape:window-y="0" + inkscape:window-y="21" inkscape:window-maximized="1" inkscape:current-layer="svg2" inkscape:snap-page="true" @@ -61,7 +61,7 @@ ry="10" transform="scale(-1,-1)" /> - - - - - + id="svg2"> + style="color:#000000;fill:none;stroke:#489aff;stroke-width:2.11722732;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:none;stroke:#489aff;stroke-width:2.11722732;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/res/skins/Deere/knob_bg_red.svg b/res/skins/Deere/knob_bg_red.svg index fe2cac6fd03b..280441ddc82b 100644 --- a/res/skins/Deere/knob_bg_red.svg +++ b/res/skins/Deere/knob_bg_red.svg @@ -8,49 +8,10 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="40" height="34" - id="svg2" - inkscape:version="0.48.4 r9939" - sodipodi:docname="knob_bg_red.svg"> - - - - - + id="svg2"> + style="color:#000000;fill:none;stroke:#ff0505;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:none;stroke:#ff0505;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/res/skins/Deere/knob_bg_yellow.svg b/res/skins/Deere/knob_bg_yellow.svg index 0421459d8248..3c855a306180 100644 --- a/res/skins/Deere/knob_bg_yellow.svg +++ b/res/skins/Deere/knob_bg_yellow.svg @@ -6,101 +6,55 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" - id="svg2" - height="34" width="40" - inkscape:version="0.48.4 r9939" - sodipodi:docname="knob_bg_yellow.svg"> - - - - - + height="34" + id="svg2"> + style="stop-color:#060606;stop-opacity:1" + offset="0" /> + style="stop-color:#343434;stop-opacity:1" + offset="1" /> - + + xlink:href="#linearGradient4937" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.257316,0,0,1,-241.05158,-602.90563)" /> + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + offset="0.25399527" /> + style="stop-color:#afafaf;stop-opacity:1" + offset="1" /> + ry="2.4899862" + id="path4202" + style="opacity:0;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:none;stroke:#fc9d00;stroke-width:1.85000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:none;stroke:#fc9d00;stroke-width:1.85000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/res/skins/Deere/quick_effect_superknob_left.xml b/res/skins/Deere/quick_effect_superknob_left.xml index 6684976abe93..09fb0794a883 100644 --- a/res/skins/Deere/quick_effect_superknob_left.xml +++ b/res/skins/Deere/quick_effect_superknob_left.xml @@ -5,7 +5,7 @@ Variables: QuickEffect: the quick effect rack group: the group - color: the notch color. red, green, yellow, blue or light_blue + color: the knob ring color. red, yellow or light_blue --> diff --git a/res/skins/Deere/handle-crossfader.svg b/res/skins/Deere/handle-crossfader-blue.svg similarity index 50% rename from res/skins/Deere/handle-crossfader.svg rename to res/skins/Deere/handle-crossfader-blue.svg index 0276a6a61b9a..f504efbbb023 100644 --- a/res/skins/Deere/handle-crossfader.svg +++ b/res/skins/Deere/handle-crossfader-blue.svg @@ -1,18 +1,16 @@ + + + id="svg2"> @@ -21,53 +19,30 @@ image/svg+xml - + - + x="-75" + y="-195" + transform="scale(-1,-1)" + id="rect4138" + style="fill:#333333;fill-opacity:1;stroke:#e0e0e0;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + id="rect4151-3" + style="fill:#c5d11f;fill-opacity:1;stroke:none" /> diff --git a/res/skins/Deere/handle-crossfader-grey.svg b/res/skins/Deere/handle-crossfader-grey.svg new file mode 100644 index 000000000000..dc0e8ece86bc --- /dev/null +++ b/res/skins/Deere/handle-crossfader-grey.svg @@ -0,0 +1,48 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/skins/Deere/handle-crossfader-lime.svg b/res/skins/Deere/handle-crossfader-lime.svg new file mode 100644 index 000000000000..f504efbbb023 --- /dev/null +++ b/res/skins/Deere/handle-crossfader-lime.svg @@ -0,0 +1,48 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/skins/Deere/handle-vertical-blue.svg b/res/skins/Deere/handle-vertical-blue.svg new file mode 100644 index 000000000000..3c2b0076e8e3 --- /dev/null +++ b/res/skins/Deere/handle-vertical-blue.svg @@ -0,0 +1,48 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/skins/Deere/handle-volume.svg b/res/skins/Deere/handle-vertical-carmine.svg similarity index 100% rename from res/skins/Deere/handle-volume.svg rename to res/skins/Deere/handle-vertical-carmine.svg diff --git a/res/skins/Deere/handle-tempo.svg b/res/skins/Deere/handle-vertical-grey.svg similarity index 100% rename from res/skins/Deere/handle-tempo.svg rename to res/skins/Deere/handle-vertical-grey.svg diff --git a/res/skins/Deere/handle-vertical-lime.svg b/res/skins/Deere/handle-vertical-lime.svg new file mode 100644 index 000000000000..5cac1bb35d3d --- /dev/null +++ b/res/skins/Deere/handle-vertical-lime.svg @@ -0,0 +1,48 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/skins/Deere/handle-vertical-purple.svg b/res/skins/Deere/handle-vertical-purple.svg new file mode 100644 index 000000000000..f37ab7b29442 --- /dev/null +++ b/res/skins/Deere/handle-vertical-purple.svg @@ -0,0 +1,48 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/skins/Deere/knob_bg_red.svg b/res/skins/Deere/knob_bg_carmine.svg similarity index 95% rename from res/skins/Deere/knob_bg_red.svg rename to res/skins/Deere/knob_bg_carmine.svg index 280441ddc82b..99fe7b00fa01 100644 --- a/res/skins/Deere/knob_bg_red.svg +++ b/res/skins/Deere/knob_bg_carmine.svg @@ -81,9 +81,9 @@ + style="color:#000000;fill:none;stroke:#ea0000;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:none;stroke:#ea0000;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/res/skins/Deere/knob_white.svg b/res/skins/Deere/knob_bg_grey.svg similarity index 59% rename from res/skins/Deere/knob_white.svg rename to res/skins/Deere/knob_bg_grey.svg index 627a3586b772..e2d6aaca570f 100644 --- a/res/skins/Deere/knob_white.svg +++ b/res/skins/Deere/knob_bg_grey.svg @@ -42,7 +42,7 @@ id="linearGradient4945" xlink:href="#linearGradient4937" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.257316,0,0,1,-234.59421,-615.28453)" /> + gradientTransform="matrix(1.257316,0,0,1,-241.05158,-602.90563)" /> + d="M 22.106891,3.6356876 A 15.138641,15.138641 0 0 1 30.516184,29.516828" + transform="matrix(1.0154791,0,0,1.0154791,-0.30959245,-0.28832938)" + id="path4981" + style="color:#000000;fill:none;stroke:#939393;stroke-width:2.11722732;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - + d="M 9.483816,29.516828 A 15.138641,15.138641 0 0 1 17.893108,3.6356878" + transform="matrix(1.0154791,0,0,1.0154791,-0.30959245,-0.28832938)" + id="path4981-5" + style="color:#000000;fill:none;stroke:#939393;stroke-width:2.11722732;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/res/skins/Deere/knob_bg_lime.svg b/res/skins/Deere/knob_bg_lime.svg new file mode 100644 index 000000000000..588c733583ba --- /dev/null +++ b/res/skins/Deere/knob_bg_lime.svg @@ -0,0 +1,43 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/skins/Deere/knob_bg_yellow.svg b/res/skins/Deere/knob_bg_orange.svg similarity index 100% rename from res/skins/Deere/knob_bg_yellow.svg rename to res/skins/Deere/knob_bg_orange.svg diff --git a/res/skins/Deere/knob_bg_purple.svg b/res/skins/Deere/knob_bg_purple.svg new file mode 100644 index 000000000000..877480b0dbe8 --- /dev/null +++ b/res/skins/Deere/knob_bg_purple.svg @@ -0,0 +1,42 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml index 47444ffa302b..3a440aaa0971 100644 --- a/res/skins/Deere/mixer.xml +++ b/res/skins/Deere/mixer.xml @@ -217,7 +217,7 @@ crossfader 1me,40f slider-crossfader.svg - handle-crossfader.svg + handle-crossfader-grey.svg true [Master],crossfader diff --git a/res/skins/Deere/mixer_column_eq_left.xml b/res/skins/Deere/mixer_column_eq_left.xml index 949829a2e2c2..4e09ff912dfa 100644 --- a/res/skins/Deere/mixer_column_eq_left.xml +++ b/res/skins/Deere/mixer_column_eq_left.xml @@ -25,7 +25,7 @@ @@ -48,7 +48,7 @@ @@ -105,28 +105,28 @@ From 0651a3c286e1e84edee4f0887075cecc83f35e35 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Wed, 13 Dec 2017 19:31:11 +0100 Subject: [PATCH 12/12] orange balance knob...whoopsy --- res/skins/Deere/tool_bar.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml index d94df71ed86b..efd19830c7c5 100644 --- a/res/skins/Deere/tool_bar.xml +++ b/res/skins/Deere/tool_bar.xml @@ -92,7 +92,7 @@ balance [Master] balance - blue + orange Balance