Skip to content

Commit ac0b070

Browse files
rryanrryan
committed
Merge pull request #1 from esbrandt/master
Formatting
2 parents 632ed84 + 987bffe commit ac0b070

12 files changed

+685
-692
lines changed

‎DeereSkeleton4Deck1280x800-WXGA/beatloop.xml

+200-206
Large diffs are not rendered by default.

‎DeereSkeleton4Deck1280x800-WXGA/deck_controls_row.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@
2424
<Handle>handle-horizontal.svg</Handle>
2525
<Horizontal>true</Horizontal>
2626
<Connection>
27-
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
28-
<EmitOnDownPress>false</EmitOnDownPress>
29-
</Connection>
27+
<ConfigKey>
28+
<Variable name="group"/>,volume</ConfigKey>
29+
<EmitOnDownPress>false</EmitOnDownPress>
30+
</Connection>
3031
</SliderComposed>
3132
<!--<Template src="skin:vumeter.xml"/>-->
3233
</Children>

‎DeereSkeleton4Deck1280x800-WXGA/deck_mixer_controls.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
<Handle>handle-vertical.svg</Handle>
7676
<Horizontal>false</Horizontal>
7777
<Connection>
78-
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
79-
<EmitOnDownPress>false</EmitOnDownPress>
80-
</Connection>
78+
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
79+
<EmitOnDownPress>false</EmitOnDownPress>
80+
</Connection>
8181
</SliderComposed>
8282

8383
</Children>

‎DeereSkeleton4Deck1280x800-WXGA/deck_overview_row.xml

+94-97
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,27 @@
1414
<MaximumSize>-1,60</MaximumSize>
1515
<Children>
1616
<Overview>
17-
<TooltipId>waveform_overview</TooltipId>
18-
<Group><Variable name="group"/></Group>
17+
<TooltipId>waveform_overview</TooltipId>
18+
<Group><Variable name="group"/></Group>
1919
<SizePolicy>me,me</SizePolicy>
20-
<BgColor></BgColor>
21-
<SignalHighColor></SignalHighColor>
22-
<SignalMidColor></SignalMidColor>
23-
<SignalLowColor></SignalLowColor>
24-
<SignalColor>#3087BF</SignalColor>
25-
<PlayPosColor>#00FF00</PlayPosColor>
26-
<DefaultMark>
27-
<Align>bottom</Align>
28-
<Color>#00FF00</Color>
29-
<TextColor>#FFFFFF</TextColor>
30-
<Text> %1 </Text>
31-
</DefaultMark>
32-
<Connection>
33-
<ConfigKey><Variable name="group"/>,playposition</ConfigKey>
34-
<EmitOnDownPress>false</EmitOnDownPress>
35-
</Connection>
20+
<BgColor></BgColor>
21+
<SignalHighColor></SignalHighColor>
22+
<SignalMidColor></SignalMidColor>
23+
<SignalLowColor></SignalLowColor>
24+
<SignalColor>#3087BF</SignalColor>
25+
<PlayPosColor>#00FF00</PlayPosColor>
26+
<DefaultMark>
27+
<Align>bottom</Align>
28+
<Color>#00FF00</Color>
29+
<TextColor>#FFFFFF</TextColor>
30+
<Text> %1 </Text>
31+
</DefaultMark>
32+
<Connection>
33+
<ConfigKey>
34+
<Variable name="group"/>,playposition</ConfigKey>
35+
<EmitOnDownPress>false</EmitOnDownPress>
36+
</Connection>
3637
</Overview>
37-
3838
<WidgetGroup>
3939
<ObjectName>OptionGrid</ObjectName>
4040
<Layout>vertical</Layout>
@@ -49,60 +49,56 @@
4949
<MinimumSize>60,20</MinimumSize>
5050
<MaximumSize>90,30</MaximumSize>
5151
<Children>
52-
5352
<PushButton>
5453
<ObjectName>ShowSpinny</ObjectName>
5554
<MinimumSize>20,20</MinimumSize>
5655
<MaximumSize>30,30</MaximumSize>
57-
<NumberStates>2</NumberStates>
58-
<State>
59-
<Number>0</Number>
56+
<NumberStates>2</NumberStates>
57+
<State>
58+
<Number>0</Number>
6059
<Text>S</Text>
61-
</State>
62-
<State>
63-
<Number>1</Number>
60+
</State>
61+
<State>
62+
<Number>1</Number>
6463
<Text>S</Text>
65-
</State>
66-
<Connection>
67-
<ConfigKey><Variable name="control_show_spinny"/></ConfigKey>
68-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
69-
<ButtonState>LeftButton</ButtonState>
70-
</Connection>
71-
</PushButton>
72-
73-
<PushButton>
64+
</State>
65+
<Connection>
66+
<ConfigKey><Variable name="control_show_spinny"/></ConfigKey>
67+
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
68+
<ButtonState>LeftButton</ButtonState>
69+
</Connection>
70+
</PushButton>
71+
<PushButton>
7472
<MinimumSize>20,20</MinimumSize>
7573
<MaximumSize>30,30</MaximumSize>
76-
<NumberStates>2</NumberStates>
77-
<State>
78-
<Number>0</Number>
74+
<NumberStates>2</NumberStates>
75+
<State>
76+
<Number>0</Number>
7977
<Text>R</Text>
80-
</State>
81-
<State>
82-
<Number>1</Number>
78+
</State>
79+
<State>
80+
<Number>1</Number>
8381
<Text>R</Text>
84-
</State>
85-
<Connection>
86-
<ConfigKey><Variable name="group"/>,repeat</ConfigKey>
87-
</Connection>
88-
</PushButton>
89-
82+
</State>
83+
<Connection>
84+
<ConfigKey><Variable name="group"/>,repeat</ConfigKey>
85+
</Connection>
86+
</PushButton>
9087
<PushButton>
91-
<NumberStates>1</NumberStates>
88+
<NumberStates>1</NumberStates>
9289
<MinimumSize>20,20</MinimumSize>
9390
<MaximumSize>30,30</MaximumSize>
94-
<State>
95-
<Number>0</Number>
91+
<State>
92+
<Number>0</Number>
9693
<Text>⏏</Text>
97-
</State>
98-
<Connection>
99-
<ConfigKey><Variable name="group"/>,eject</ConfigKey>
100-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
101-
<ButtonState>LeftButton</ButtonState>
102-
<ConnectValueToWidget>false</ConnectValueToWidget>
103-
</Connection>
104-
</PushButton>
105-
94+
</State>
95+
<Connection>
96+
<ConfigKey><Variable name="group"/>,eject</ConfigKey>
97+
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
98+
<ButtonState>LeftButton</ButtonState>
99+
<ConnectValueToWidget>false</ConnectValueToWidget>
100+
</Connection>
101+
</PushButton>
106102
</Children>
107103
</WidgetGroup>
108104

@@ -113,58 +109,59 @@
113109
<MinimumSize>60,20</MinimumSize>
114110
<MaximumSize>90,30</MaximumSize>
115111
<Children>
116-
117112
<PushButton>
118113
<MinimumSize>20,20</MinimumSize>
119114
<MaximumSize>30,30</MaximumSize>
120-
<NumberStates>1</NumberStates>
121-
<State>
122-
<Number>0</Number>
115+
<NumberStates>1</NumberStates>
116+
<State>
117+
<Number>0</Number>
123118
<Text>T</Text>
124-
</State>
125-
<Connection>
126-
<ConfigKey><Variable name="group"/>,beats_translate_curpos</ConfigKey>
127-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
128-
<ButtonState>LeftButton</ButtonState>
129-
</Connection>
130-
</PushButton>
119+
</State>
120+
<Connection>
121+
<ConfigKey>
122+
<Variable name="group"/>,beats_translate_curpos</ConfigKey>
123+
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
124+
<ButtonState>LeftButton</ButtonState>
125+
</Connection>
126+
</PushButton>
131127

132-
<PushButton>
133-
<NumberStates>2</NumberStates>
128+
<PushButton>
129+
<NumberStates>2</NumberStates>
134130
<MinimumSize>20,20</MinimumSize>
135131
<MaximumSize>30,30</MaximumSize>
136-
<State>
137-
<Number>0</Number>
132+
<State>
133+
<Number>0</Number>
138134
<Text>Q</Text>
139-
</State>
140-
<State>
141-
<Number>1</Number>
135+
</State>
136+
<State>
137+
<Number>1</Number>
142138
<Text>Q</Text>
143-
</State>
144-
<Connection>
145-
<ConfigKey><Variable name="group"/>,quantize</ConfigKey>
146-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
147-
<ButtonState>LeftButton</ButtonState>
148-
</Connection>
149-
</PushButton>
139+
</State>
140+
<Connection>
141+
<ConfigKey>
142+
<Variable name="group"/>,quantize</ConfigKey>
143+
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
144+
<ButtonState>LeftButton</ButtonState>
145+
</Connection>
146+
</PushButton>
150147

151-
<PushButton>
152-
<NumberStates>2</NumberStates>
148+
<PushButton>
149+
<NumberStates>2</NumberStates>
153150
<MinimumSize>20,20</MinimumSize>
154151
<MaximumSize>30,30</MaximumSize>
155-
<State>
156-
<Number>0</Number>
152+
<State>
153+
<Number>0</Number>
157154
<Text>K</Text>
158-
</State>
159-
<State>
160-
<Number>1</Number>
155+
</State>
156+
<State>
157+
<Number>1</Number>
161158
<Text>K</Text>
162-
</State>
163-
<Connection>
164-
<ConfigKey><Variable name="group"/>,keylock</ConfigKey>
165-
</Connection>
166-
</PushButton>
167-
159+
</State>
160+
<Connection>
161+
<ConfigKey>
162+
<Variable name="group"/>,keylock</ConfigKey>
163+
</Connection>
164+
</PushButton>
168165
</Children>
169166
</WidgetGroup>
170167
</Children>

‎DeereSkeleton4Deck1280x800-WXGA/deck_text_row.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<SizePolicy>me,max</SizePolicy>
2323
<Children>
2424
<TrackProperty>
25-
<TooltipId>track_title</TooltipId>
26-
<Property>title</Property>
27-
<Group><Variable name="group"/></Group>
25+
<TooltipId>track_title</TooltipId>
26+
<Property>title</Property>
27+
<Group><Variable name="group"/></Group>
2828
<MinimumSize>-1,20</MinimumSize>
2929
</TrackProperty>
3030
</Children>
@@ -38,15 +38,15 @@
3838
<Group><Variable name="group"/></Group>
3939
<MinimumSize>40,20</MinimumSize>
4040
<Connection>
41-
<ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
42-
</Connection>
41+
<ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
42+
</Connection>
4343
</Key>
4444
<NumberBpm>
4545
<Group><Variable name="group"/></Group>
4646
<MinimumSize>40,20</MinimumSize>
4747
<Connection>
48-
<ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
49-
</Connection>
48+
<ConfigKey> <Variable name="group"/>,visual_bpm</ConfigKey>
49+
</Connection>
5050
</NumberBpm>
5151
</Children>
5252
</WidgetGroup>
@@ -63,8 +63,8 @@
6363
<SizePolicy>me,max</SizePolicy>
6464
<Children>
6565
<TrackProperty>
66-
<TooltipId>track_artist</TooltipId>
67-
<Property>artist</Property>
66+
<TooltipId>track_artist</TooltipId>
67+
<Property>artist</Property>
6868
<Group><Variable name="group"/></Group>
6969
<MinimumSize>-1,15</MinimumSize>
7070
</TrackProperty>

0 commit comments

Comments
 (0)