diff options
author | ronso0 <ronso0@mixxx.org> | 2020-11-04 22:13:57 +0100 |
---|---|---|
committer | ronso0 <ronso0@mixxx.org> | 2020-11-04 22:17:36 +0100 |
commit | be8dfff7a2cd2a483b48e1aaea647b2dfd710a4c (patch) | |
tree | 21110e0efe04cc312d33c120b50d7ce2a83ffc35 /res | |
parent | d3933df38646df07013f2eb4563f1b7a4b007083 (diff) |
Shade: correct knob arcs, add inverted arc, Master>Main, add AutoDJ status to mixer
Diffstat (limited to 'res')
71 files changed, 42 insertions, 20 deletions
diff --git a/res/skins/Shade/deck_effect.xml b/res/skins/Shade/deck_effect.xml index 93dd541c2a..394f6cfa65 100644 --- a/res/skins/Shade/deck_effect.xml +++ b/res/skins/Shade/deck_effect.xml @@ -94,8 +94,8 @@ <Knob> <TooltipId>EffectUnit_mix</TooltipId> - <NumberStates>63</NumberStates> - <Path>knobs/knob_rotary_s%1.png</Path> + <NumberStates>64</NumberStates> + <Path>knobs_no_center/knob_rotary_s%1.png</Path> <Pos>49,21</Pos> <Connection> <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],mix</ConfigKey> @@ -130,8 +130,8 @@ <Knob> <TooltipId>EffectUnit_super1</TooltipId> - <NumberStates>63</NumberStates> - <Path>knobs/knob_rotary_s%1.png</Path> + <NumberStates>64</NumberStates> + <Path>knobs_no_center/knob_rotary_s%1.png</Path> <Pos>77,21</Pos> <Connection> <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],super1</ConfigKey> diff --git a/res/skins/Shade/ducking.xml b/res/skins/Shade/ducking.xml index a6c406be34..c8e7a2f400 100644 --- a/res/skins/Shade/ducking.xml +++ b/res/skins/Shade/ducking.xml @@ -32,7 +32,7 @@ <Knob> <TooltipId></TooltipId> <NumberStates>64</NumberStates> - <Path>knobs/knob_rotary_s%1.png</Path> + <Path>knobs_no_center_inverted/knob_rotary_s%1.png</Path> <Pos>27,22</Pos> <Connection> <ConfigKey>[Master],duckStrength</ConfigKey> diff --git a/res/skins/Shade/effect_parameter_knob.xml b/res/skins/Shade/effect_parameter_knob.xml index 2c5c64c5b4..b68740520b 100644 --- a/res/skins/Shade/effect_parameter_knob.xml +++ b/res/skins/Shade/effect_parameter_knob.xml @@ -42,7 +42,7 @@ <Children> <EffectParameterKnob> <NumberStates>64</NumberStates> - <Path>knobs/knob_rotary_s%1.png</Path> + <Path>knobs_no_center/knob_rotary_s%1.png</Path> <Connection> <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/></ConfigKey> </Connection> diff --git a/res/skins/Shade/effectslotsmall.xml b/res/skins/Shade/effectslotsmall.xml index aeac38fc41..7b3ff8ddfe 100644 --- a/res/skins/Shade/effectslotsmall.xml +++ b/res/skins/Shade/effectslotsmall.xml @@ -58,8 +58,8 @@ <Knob> <Pos>38,3</Pos> <TooltipId>EffectSlot_metaknob</TooltipId> - <NumberStates>63</NumberStates> - <Path>knobs/knob_rotary_s%1.png</Path> + <NumberStates>64</NumberStates> + <Path>knobs_no_center/knob_rotary_s%1.png</Path> <Connection> <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],meta</ConfigKey> </Connection> diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s0.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s0.png Binary files differnew file mode 100644 index 0000000000..1266113748 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s0.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s1.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s1.png Binary files differnew file mode 100644 index 0000000000..199bfc95eb --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s1.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s10.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s10.png Binary files differnew file mode 100644 index 0000000000..b827f680ae --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s10.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s11.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s11.png Binary files differnew file mode 100644 index 0000000000..043d84d170 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s11.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s12.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s12.png Binary files differnew file mode 100644 index 0000000000..e0f7bb8264 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s12.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s13.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s13.png Binary files differnew file mode 100644 index 0000000000..107592746e --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s13.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s14.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s14.png Binary files differnew file mode 100644 index 0000000000..f65271c07b --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s14.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s15.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s15.png Binary files differnew file mode 100644 index 0000000000..67270cf7e3 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s15.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s16.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s16.png Binary files differnew file mode 100644 index 0000000000..236004bae8 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s16.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s17.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s17.png Binary files differnew file mode 100644 index 0000000000..0006636d9d --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s17.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s18.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s18.png Binary files differnew file mode 100644 index 0000000000..f1c7f0eb57 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s18.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s19.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s19.png Binary files differnew file mode 100644 index 0000000000..a2452d636a --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s19.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s2.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s2.png Binary files differnew file mode 100644 index 0000000000..abbb1e290a --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s2.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s20.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s20.png Binary files differnew file mode 100644 index 0000000000..054a5440c8 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s20.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s21.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s21.png Binary files differnew file mode 100644 index 0000000000..edea1d80f2 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s21.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s22.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s22.png Binary files differnew file mode 100644 index 0000000000..270abe982b --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s22.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s23.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s23.png Binary files differnew file mode 100644 index 0000000000..c4f75fadd3 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s23.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s24.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s24.png Binary files differnew file mode 100644 index 0000000000..6d2ffa88b9 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s24.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s25.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s25.png Binary files differnew file mode 100644 index 0000000000..4850e76267 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s25.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s26.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s26.png Binary files differnew file mode 100644 index 0000000000..59371b5b0d --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s26.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s27.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s27.png Binary files differnew file mode 100644 index 0000000000..0633e05ee3 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s27.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s28.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s28.png Binary files differnew file mode 100644 index 0000000000..14fb903341 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s28.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s29.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s29.png Binary files differnew file mode 100644 index 0000000000..052ef387cc --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s29.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s3.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s3.png Binary files differnew file mode 100644 index 0000000000..e894c66329 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s3.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s30.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s30.png Binary files differnew file mode 100644 index 0000000000..c651c2c1c6 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s30.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s31.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s31.png Binary files differnew file mode 100644 index 0000000000..5811a49af2 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s31.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s32.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s32.png Binary files differnew file mode 100644 index 0000000000..910c80d0cb --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s32.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s33.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s33.png Binary files differnew file mode 100644 index 0000000000..069bb40c9c --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s33.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s34.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s34.png Binary files differnew file mode 100644 index 0000000000..1df01dc7e0 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s34.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s35.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s35.png Binary files differnew file mode 100644 index 0000000000..5ca959e7a3 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s35.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s36.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s36.png Binary files differnew file mode 100644 index 0000000000..cf6ed4602e --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s36.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s37.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s37.png Binary files differnew file mode 100644 index 0000000000..062957c863 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s37.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s38.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s38.png Binary files differnew file mode 100644 index 0000000000..d99df90f49 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s38.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s39.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s39.png Binary files differnew file mode 100644 index 0000000000..4f918e8825 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s39.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s4.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s4.png Binary files differnew file mode 100644 index 0000000000..4e0ce9a087 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s4.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s40.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s40.png Binary files differnew file mode 100644 index 0000000000..fd3ef0b172 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s40.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s41.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s41.png Binary files differnew file mode 100644 index 0000000000..8c993a3f80 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s41.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s42.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s42.png Binary files differnew file mode 100644 index 0000000000..f783003f79 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s42.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s43.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s43.png Binary files differnew file mode 100644 index 0000000000..d7d6d671c9 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s43.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s44.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s44.png Binary files differnew file mode 100644 index 0000000000..ac677a4224 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s44.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s45.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s45.png Binary files differnew file mode 100644 index 0000000000..513cc613e0 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s45.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s46.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s46.png Binary files differnew file mode 100644 index 0000000000..6c206d0ece --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s46.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s47.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s47.png Binary files differnew file mode 100644 index 0000000000..ed3c01ce71 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s47.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s48.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s48.png Binary files differnew file mode 100644 index 0000000000..58b00a71ed --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s48.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s49.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s49.png Binary files differnew file mode 100644 index 0000000000..50f9dcd10e --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s49.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s5.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s5.png Binary files differnew file mode 100644 index 0000000000..890da766b1 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s5.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s50.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s50.png Binary files differnew file mode 100644 index 0000000000..5ba60cda82 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s50.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s51.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s51.png Binary files differnew file mode 100644 index 0000000000..ac321f3d37 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s51.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s52.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s52.png Binary files differnew file mode 100644 index 0000000000..b20b0b385b --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s52.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s53.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s53.png Binary files differnew file mode 100644 index 0000000000..85144e0a38 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s53.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s54.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s54.png Binary files differnew file mode 100644 index 0000000000..a2b60bef99 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s54.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s55.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s55.png Binary files differnew file mode 100644 index 0000000000..c6ba9de4ec --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s55.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s56.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s56.png Binary files differnew file mode 100644 index 0000000000..a4bc6a84e7 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s56.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s57.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s57.png Binary files differnew file mode 100644 index 0000000000..88f68b4ce2 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s57.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s58.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s58.png Binary files differnew file mode 100644 index 0000000000..f4c76258d2 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s58.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s59.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s59.png Binary files differnew file mode 100644 index 0000000000..a0ac5e5d6f --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s59.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s6.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s6.png Binary files differnew file mode 100644 index 0000000000..f54e7692c8 --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s6.png diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s60.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s60.png Binary files differnew file mode 100644 index 0000000000..330e8a473a --- /dev/null +++ b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s60.png |