Skip to content

Deere 2.1 knobs & faders redesign #1399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 14 commits into from
Dec 13, 2017
Merged

Deere 2.1 knobs & faders redesign #1399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
684589e
Merge remote-tracking branch 'be/deere_2.1_part_2'
Nov 29, 2017
9a30fcc
knobs redesign
Nov 29, 2017
377f32a
fader handle redesign
Nov 29, 2017
f7d80a2
darker FX parameter knob
Nov 29, 2017
1679cbb
shorten big knobs' pointer
Nov 29, 2017
a1b07b8
flatten vertical sliders' handle
Nov 29, 2017
0f5b796
test: increase slider bg contrast for bright situations
Nov 29, 2017
cf4b94a
Merge remote-tracking branch 'origin/master' into deere_2.1_knobs-fad…
Dec 1, 2017
7f5da30
widen knob ring's center mark
Dec 4, 2017
d4d956e
grey tempo slider, red Vol slider
Dec 4, 2017
563e744
add separate toolbar knob pointer
Dec 5, 2017
be7c612
rename normal knob
Dec 5, 2017
e6f756b
EQ orange * Gain/Vol/Mix grey * FX/tempo blue
Dec 12, 2017
0651a3c
orange balance knob...whoopsy
Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion res/skins/Deere/deck_tempo_column.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<Size>40f,-1me</Size>
<MaximumSize>40,200</MaximumSize>
<Slider scalemode="STRETCH">slider-vertical.svg</Slider>
<Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
<Handle scalemode="STRETCH_ASPECT">handle-vertical-blue.svg</Handle>
<Connection>
<ConfigKey><Variable name="group"/>,rate</ConfigKey>
</Connection>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere/effect_meta_knob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<SetVariable name="TooltipId">EffectSlot_metaknob</SetVariable>
<SetVariable name="group">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>]</SetVariable>
<SetVariable name="control">meta</SetVariable>
<SetVariable name="color">yellow</SetVariable>
<SetVariable name="color">blue</SetVariable>
</Template>
</Children>
</WidgetGroup>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Deere/effect_unit_no_parameters.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Variables:
<SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
<SetVariable name="control">super1</SetVariable>
<SetVariable name="label">Super</SetVariable>
<SetVariable name="color">yellow</SetVariable>
<SetVariable name="color">blue</SetVariable>
</Template>
</Children>
</WidgetGroup>
Expand All @@ -71,7 +71,7 @@ Variables:
<SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
<SetVariable name="control">mix</SetVariable>
<SetVariable name="label">Mix</SetVariable>
<SetVariable name="color">blue</SetVariable>
<SetVariable name="color">orange</SetVariable>
</Template>
</Children>
</WidgetGroup>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Deere/effect_unit_with_parameters.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Variables:
<SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
<SetVariable name="control">mix</SetVariable>
<SetVariable name="label">Mix</SetVariable>
<SetVariable name="color">blue</SetVariable>
<SetVariable name="color">orange</SetVariable>
</Template>

<WidgetGroup>
Expand All @@ -64,7 +64,7 @@ Variables:
<SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
<SetVariable name="control">super1</SetVariable>
<SetVariable name="label">Super</SetVariable>
<SetVariable name="color">yellow</SetVariable>
<SetVariable name="color">blue</SetVariable>
</Template>
</Children>
</WidgetGroup>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Deere/equalizer_rack_parameter_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<Children>
<EffectParameterKnobComposed>
<Size>40f,34f</Size>
<Knob>knob_<Variable name="color"/>.svg</Knob>
<BackPath>knob_bg.svg</BackPath>
<Knob>knob.svg</Knob>
<BackPath>knob_bg_<Variable name="color"/>.svg</BackPath>
<MinAngle>-135</MinAngle>
<MaxAngle>135</MaxAngle>
<KnobCenterYOffset>1.602</KnobCenterYOffset>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Deere/equalizer_rack_parameter_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<Children>
<EffectParameterKnobComposed>
<Size>40f,34f</Size>
<Knob>knob_<Variable name="color"/>.svg</Knob>
<BackPath>knob_bg.svg</BackPath>
<Knob>knob.svg</Knob>
<BackPath>knob_bg_<Variable name="color"/>.svg</BackPath>
<MinAngle>-135</MinAngle>
<MaxAngle>135</MaxAngle>
<KnobCenterYOffset>1.602</KnobCenterYOffset>
Expand Down
48 changes: 48 additions & 0 deletions res/skins/Deere/handle-crossfader-blue.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 48 additions & 0 deletions res/skins/Deere/handle-crossfader-grey.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 48 additions & 0 deletions res/skins/Deere/handle-crossfader-lime.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 0 additions & 79 deletions res/skins/Deere/handle-crossfader.svg
View file
Open in desktop

This file was deleted.

48 changes: 48 additions & 0 deletions res/skins/Deere/handle-vertical-blue.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading