diff --git a/DeereSkeleton4Deck1280x800-WXGA/beatloop.xml b/DeereSkeleton4Deck1280x800-WXGA/beatloop.xml index d5969f83504..aff796cd5c0 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/beatloop.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/beatloop.xml @@ -14,16 +14,16 @@ LoopHalve - 1 - - 0 + 1 + + 0 ◀ - + - ,loop_halve - true - LeftButton - + ,loop_halve + true + LeftButton + @@ -33,127 +33,124 @@ BeatLoopUpperRow horizontal - BeatLoopButton - 2 - true - true - - 0 + 2 + true + true + + 0 1/8 - - - 1 + + + 1 1/8 - - - ,beatloop_0.125_toggle - true - LeftButton - - - ,beatlooproll_0.125_activate - true - RightButton - - - ,beatloop_0.125_enabled - false - + + + ,beatloop_0.125_toggle + true + LeftButton + + + ,beatlooproll_0.125_activate + true + RightButton + + + ,beatloop_0.125_enabled + false + BeatLoopButton - 2 - true - true - - 0 + 2 + true + true + + 0 1/4 - - - 1 + + + 1 1/4 - - - ,beatloop_0.25_toggle - true - LeftButton - - - ,beatlooproll_0.25_activate - true - RightButton - - - ,beatloop_0.25_enabled - false - + + + ,beatloop_0.25_toggle + true + LeftButton + + + ,beatlooproll_0.25_activate + true + RightButton + + ,beatloop_0.25_enabled + false + BeatLoopButton - 2 - true - true - - 0 + 2 + true + true + + 0 1/2 - - - 1 + + + 1 1/2 - - - ,beatloop_0.5_toggle - true - LeftButton - - - ,beatlooproll_0.5_activate - true - RightButton - - - ,beatloop_0.5_enabled - false - + + + ,beatloop_0.5_toggle + true + LeftButton + + + ,beatlooproll_0.5_activate + true + RightButton + + + ,beatloop_0.5_enabled + false + BeatLoopButton - 2 - true - true - - 0 + 2 + true + true + + 0 1 - - - 1 + + + 1 1 - - - ,beatloop_1_toggle - true - LeftButton - - - ,beatlooproll_1_activate - true - RightButton - - - ,beatloop_1_enabled - false - + + + ,beatloop_1_toggle + true + LeftButton + + + ,beatlooproll_1_activate + true + RightButton + + + ,beatloop_1_enabled + false + - @@ -161,147 +158,144 @@ BeatLoopLowerRow horizontal - BeatLoopButton - 2 - true - true - - 0 + 2 + true + true + + 0 2 - - - 1 + + + 1 2 - - - ,beatloop_2_toggle - true - LeftButton - - - ,beatlooproll_2_activate - true - RightButton - - - ,beatloop_2_enabled - false - + + + ,beatloop_2_toggle + true + LeftButton + + + ,beatlooproll_2_activate + true + RightButton + + + ,beatloop_2_enabled + false + BeatLoopButton - 2 - true - true - - 0 + 2 + true + true + + 0 4 - - - 1 + + + 1 4 - - - ,beatloop_4_toggle - true - LeftButton - - - ,beatlooproll_4_activate - true - RightButton - - - ,beatloop_4_enabled - false - + + + ,beatloop_4_toggle + true + LeftButton + + + ,beatlooproll_4_activate + true + RightButton + + + + ,beatloop_4_enabled + false + BeatLoopButton - 2 - true - true - - 0 + 2 + true + true + + 0 8 - - - 1 + + + 1 8 - - - ,beatloop_8_toggle - true - LeftButton - - - ,beatlooproll_8_activate - true - RightButton - - - ,beatloop_8_enabled - false - + + + ,beatloop_8_toggle + true + LeftButton + + + ,beatlooproll_8_activate + true + RightButton + + + ,beatloop_8_enabled + false + BeatLoopButton - 2 - true - true - - 0 + 2 + true + true + + 0 16 - - - 1 + + + 1 16 - - - ,beatloop_16_toggle - true - LeftButton - - - ,beatlooproll_16_activate - true - RightButton - - - ,beatloop_16_enabled - false - + + + ,beatloop_16_toggle + true + LeftButton + + + ,beatlooproll_16_activate + true + RightButton + + + ,beatloop_16_enabled + false + - - - LoopDouble - 1 - - 0 + 1 + + 0 ▶ - + - ,loop_double - true - LeftButton - + ,loop_double + true + LeftButton + diff --git a/DeereSkeleton4Deck1280x800-WXGA/deck_controls_row.xml b/DeereSkeleton4Deck1280x800-WXGA/deck_controls_row.xml index d6cf6b1c238..700c7084a89 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/deck_controls_row.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/deck_controls_row.xml @@ -24,9 +24,10 @@ handle-horizontal.svg true - ,volume - false - + + ,volume + false + diff --git a/DeereSkeleton4Deck1280x800-WXGA/deck_mixer_controls.xml b/DeereSkeleton4Deck1280x800-WXGA/deck_mixer_controls.xml index 345a5f45c6d..06902b65508 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/deck_mixer_controls.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/deck_mixer_controls.xml @@ -75,9 +75,9 @@ handle-vertical.svg false - ,volume - false - + ,volume + false + diff --git a/DeereSkeleton4Deck1280x800-WXGA/deck_overview_row.xml b/DeereSkeleton4Deck1280x800-WXGA/deck_overview_row.xml index d2bf876884d..6bc0e0afa0c 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/deck_overview_row.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/deck_overview_row.xml @@ -14,27 +14,27 @@ -1,60 - waveform_overview - + waveform_overview + me,me - - - - - #3087BF - #00FF00 - - bottom - #00FF00 - #FFFFFF - %1 - - - ,playposition - false - + + + + + #3087BF + #00FF00 + + bottom + #00FF00 + #FFFFFF + %1 + + + + ,playposition + false + - OptionGrid vertical @@ -49,60 +49,56 @@ 60,20 90,30 - ShowSpinny 20,20 30,30 - 2 - - 0 + 2 + + 0 S - - - 1 + + + 1 S - - - - true - LeftButton - - - - + + + + true + LeftButton + + + 20,20 30,30 - 2 - - 0 + 2 + + 0 R - - - 1 + + + 1 R - - - ,repeat - - - + + + ,repeat + + - 1 + 1 20,20 30,30 - - 0 + + 0 ⏏ - - - ,eject - true - LeftButton - false - - - + + + ,eject + true + LeftButton + false + + @@ -113,58 +109,59 @@ 60,20 90,30 - 20,20 30,30 - 1 - - 0 + 1 + + 0 T - - - ,beats_translate_curpos - true - LeftButton - - + + + + ,beats_translate_curpos + true + LeftButton + + - - 2 + + 2 20,20 30,30 - - 0 + + 0 Q - - - 1 + + + 1 Q - - - ,quantize - true - LeftButton - - + + + + ,quantize + true + LeftButton + + - - 2 + + 2 20,20 30,30 - - 0 + + 0 K - - - 1 + + + 1 K - - - ,keylock - - - + + + + ,keylock + + diff --git a/DeereSkeleton4Deck1280x800-WXGA/deck_text_row.xml b/DeereSkeleton4Deck1280x800-WXGA/deck_text_row.xml index 430b62a0409..c84cb98eea7 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/deck_text_row.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/deck_text_row.xml @@ -22,9 +22,9 @@ me,max - track_title - title - + track_title + title + -1,20 @@ -38,15 +38,15 @@ 40,20 - ,visual_key - + ,visual_key + 40,20 - ,visual_bpm - + ,visual_bpm + @@ -63,8 +63,8 @@ me,max - track_artist - artist + track_artist + artist -1,15 diff --git a/DeereSkeleton4Deck1280x800-WXGA/deck_visual_row.xml b/DeereSkeleton4Deck1280x800-WXGA/deck_visual_row.xml index 213bbdb1b78..35c30a94d9a 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/deck_visual_row.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/deck_visual_row.xml @@ -18,89 +18,90 @@ #1C1C1C - - - #0099FF - #ffffff - #00FF00 - #EA0000 - - - - top - #00FF00 - #000000 - %1 - - - loop_start_position - loop_end_position - loop_enabled - #00FF00 - #FFFFFF - - - loop_start_position - marker_loop_in1.png - IN - bottom - #00FF00 - #FFFFFF - - - loop_end_position - marker_loop_out1.png - OUT - bottom - #00FF00 - #FFFFFF - - - - hotcue_1_position - marker_hotcue1_1.png - 1 - bottom - #00FF00 - #FFFFFF - - - hotcue_2_position - marker_hotcue1_2.png - 2 - bottom - #00FF00 - #FFFFFF - - - hotcue_3_position - marker_hotcue1_3.png - 3 - bottom - #00FF00 - #FFFFFF - - - hotcue_4_position - marker_hotcue1_4.png - 4 - bottom - #00FF00 - #FFFFFF - - - cue_point - marker_cue1.png - CUE - bottom - #FF001C - #FFFFFF - + + + #0099FF + #ffffff + #00FF00 + #EA0000 + + + + top + #00FF00 + #000000 + %1 + + + loop_start_position + loop_end_position + loop_enabled + #00FF00 + #FFFFFF + + + loop_start_position + marker_loop_in1.png + IN + bottom + #00FF00 + #FFFFFF + + + loop_end_position + marker_loop_out1.png + OUT + bottom + #00FF00 + #FFFFFF + + + + hotcue_1_position + marker_hotcue1_1.png + 1 + bottom + #00FF00 + #FFFFFF + + + hotcue_2_position + marker_hotcue1_2.png + 2 + bottom + #00FF00 + #FFFFFF + + + hotcue_3_position + marker_hotcue1_3.png + 3 + bottom + #00FF00 + #FFFFFF + + + hotcue_4_position + marker_hotcue1_4.png + 4 + bottom + #00FF00 + #FFFFFF + + + cue_point + marker_cue1.png + CUE + bottom + #FF001C + #FFFFFF + + SpinnyHolder horizontal @@ -109,14 +110,14 @@ vinyl_spinny1_background.png - vinyl_spinny1_foreground.png - vinyl_spinny1_foreground_ghost.png + vinyl_spinny1_foreground.png + vinyl_spinny1_foreground_ghost.png - - visible - + + visible + diff --git a/DeereSkeleton4Deck1280x800-WXGA/effect_chain.xml b/DeereSkeleton4Deck1280x800-WXGA/effect_chain.xml index 04bc02b04d6..bcbdcef1fc4 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/effect_chain.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/effect_chain.xml @@ -13,7 +13,6 @@ me,f 200,100 - EffectChainNameRow horizontal @@ -30,6 +29,7 @@ + EffectChainNextPrevContainer horizontal @@ -39,40 +39,42 @@ 20f,20f 1 - 0 + 0 ⏏ - - + + true - ,clear - - + ,clear + + + 20f,20f 1 - - 0 + + 0 ◀ - - - ,prev_chain + + + ,prev_chain true - LeftButton - - + LeftButton + + + 20f,20f 1 - - 0 + + 0 ▶ - - - ,next_chain + + + ,next_chain true - LeftButton - - + LeftButton + + @@ -83,7 +85,6 @@ horizontal min,min - EffectChainParameters me,max @@ -93,12 +94,10 @@ 1 1 - - + - - - - EffectChainGroupControls me,min @@ -135,98 +131,101 @@ 40f,20f - 2 + 2 - 0 + 0 Head - - - 1 + + + 1 Head - - - ,channel_[Headphone] - - + + + ,channel_[Headphone] + + + 40f,20f - 2 + 2 - 0 + 0 Master - - - 1 + + + 1 Master - - - ,channel_[Master] - - + + + ,channel_[Master] + + + 40f,20f - 2 + 2 - 0 + 0 CH1 - - - 1 + + + 1 CH1 - - - ,channel_[Channel1] - - + + + ,channel_[Channel1] + + + 40f,20f - 2 + 2 - 0 + 0 CH2 - - - 1 + + + 1 CH2 - - - ,channel_[Channel2] - - + + + ,channel_[Channel2] + + + 40f,20f - 2 + 2 - 0 + 0 CH3 - - - 1 + + + 1 CH3 - - - ,channel_[Channel3] - - + + + ,channel_[Channel3] + + + 40f,20f - 2 + 2 - 0 + 0 CH4 - - - 1 + + + 1 CH4 - - - ,channel_[Channel4] - - + + + ,channel_[Channel4] + + - - diff --git a/DeereSkeleton4Deck1280x800-WXGA/hotcue.xml b/DeereSkeleton4Deck1280x800-WXGA/hotcue.xml index add1e4c297b..84c57f72026 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/hotcue.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/hotcue.xml @@ -17,136 +17,135 @@ HotcueButton - 2 + 2 true - true - - 0 + true + + 0 1 - - - 1 + + + 1 1 - + - ,hotcue_1_activate - true - LeftButton + ,hotcue_1_activate + true + LeftButton false - + - ,hotcue_1_clear - true - RightButton - false - - - ,hotcue_1_enabled - false - - + ,hotcue_1_clear + true + RightButton + false + + + ,hotcue_1_enabled + false + + HotcueButton - 2 + 2 true - true - - 0 + true + + 0 2 - - - 1 + + + 1 2 - + - ,hotcue_2_activate - true - LeftButton + ,hotcue_2_activate + true + LeftButton false - + - ,hotcue_2_clear - true - RightButton - false - - - ,hotcue_2_enabled - false - - - + ,hotcue_2_clear + true + RightButton + false + + + ,hotcue_2_enabled + false + + + horizontal - HotcueButton - 2 + 2 true - true - - 0 + true + + 0 3 - - - 1 + + + 1 3 - + + + ,hotcue_3_activate + true + LeftButton + false + - ,hotcue_3_activate - true - LeftButton + ,hotcue_3_clear + true + RightButton false - + - ,hotcue_3_clear - true - RightButton - false - - - ,hotcue_3_enabled - false - - + ,hotcue_3_enabled + false + + HotcueButton - 2 + 2 true - true - - 0 + true + + 0 4 - - - 1 + + + 1 4 - + + + ,hotcue_4_activate + true + LeftButton + false + - ,hotcue_4_activate - true - LeftButton + ,hotcue_4_clear + true + RightButton false - + - ,hotcue_4_clear - true - RightButton - false - - - ,hotcue_4_enabled - false - - + ,hotcue_4_enabled + false + + diff --git a/DeereSkeleton4Deck1280x800-WXGA/library.xml b/DeereSkeleton4Deck1280x800-WXGA/library.xml index e03f7b38f87..fe42670d5fd 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/library.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/library.xml @@ -7,7 +7,7 @@ LibraryContainer + to nothing. --> me,i 0,0 @@ -16,7 +16,7 @@ LibraryExpanded vertical + shrink to nothing. --> me,f 0,0 diff --git a/DeereSkeleton4Deck1280x800-WXGA/loop.xml b/DeereSkeleton4Deck1280x800-WXGA/loop.xml index 9ac5d0a2655..068a5103e31 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/loop.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/loop.xml @@ -17,32 +17,34 @@ LoopIn - 1 - - 0 + 1 + + 0 IN - + - ,loop_in - true - LeftButton - - + + ,loop_in + true + LeftButton + + LoopOut - 1 - - 0 + 1 + + 0 OUT - + - ,loop_out - true - LeftButton - - + + ,loop_out + true + LeftButton + + @@ -52,22 +54,24 @@ ReloopExit - 1 - - 0 + 1 + + 0 RELOOP - + - ,reloop_exit - true - LeftButton - false - - - ,loop_enabled - false - - + + ,reloop_exit + true + LeftButton + false + + + + ,loop_enabled + false + + diff --git a/DeereSkeleton4Deck1280x800-WXGA/mixer.xml b/DeereSkeleton4Deck1280x800-WXGA/mixer.xml index 096330e82f7..db1a3702347 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/mixer.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/mixer.xml @@ -73,9 +73,9 @@ handle-horizontal.svg true - [Master],crossfader - false - + [Master],crossfader + false + diff --git a/DeereSkeleton4Deck1280x800-WXGA/transport.xml b/DeereSkeleton4Deck1280x800-WXGA/transport.xml index e1fc0213b68..a276f381147 100644 --- a/DeereSkeleton4Deck1280x800-WXGA/transport.xml +++ b/DeereSkeleton4Deck1280x800-WXGA/transport.xml @@ -17,100 +17,98 @@ FastBack 20f,20f - 1 - - 0 + 1 + + 0 << - - - ,back - true - LeftButton - - - ,start - true - RightButton - - + + + ,back + true + LeftButton + + + ,start + true + RightButton + + FastFwd 20f,20f - 1 - - 0 + 1 + + 0 >> - - - ,fwd - true - LeftButton - - - ,end - true - RightButton - - - + + + ,fwd + true + LeftButton + + + ,end + true + RightButton + + horizontal - ReverseButton 20f,20f - 2 + 2 true - true - - 0 + true + + 0 ◀ - - - 1 + + + 1 ◀ - + - ,reverse - true - LeftButton - - - ,reverseroll - true - RightButton - - + ,reverse + true + LeftButton + + + ,reverseroll + true + RightButton + + PlayToggle 20f,20f - 2 - true - - 0 + 2 + true + + 0 ▶ - - - 1 + + + 1 ▶ - + + + ,play + true + LeftButton + - ,play - true - LeftButton - - - ,cue_set - true - RightButton - - + ,cue_set + true + RightButton + +