Skip to content

Commit

Permalink
Merge pull request #1 from esbrandt/master
Browse files Browse the repository at this point in the history 
Formatting
  • Loading branch information
@rryan
rryan committed Jan 15, 2014
2 parents 632ed84 + 987bffe commit ac0b070
Show file tree
Hide file tree
Showing 12 changed files with 685 additions and 692 deletions.
406 changes: 200 additions & 206 deletions DeereSkeleton4Deck1280x800-WXGA/beatloop.xml
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions DeereSkeleton4Deck1280x800-WXGA/deck_controls_row.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
<Handle>handle-horizontal.svg</Handle>
<Horizontal>true</Horizontal>
<Connection>
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
<EmitOnDownPress>false</EmitOnDownPress>
</Connection>
<ConfigKey>
<Variable name="group"/>,volume</ConfigKey>
<EmitOnDownPress>false</EmitOnDownPress>
</Connection>
</SliderComposed>
<!--<Template src="skin:vumeter.xml"/>-->
</Children>
Expand Down
6 changes: 3 additions & 3 deletions DeereSkeleton4Deck1280x800-WXGA/deck_mixer_controls.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
<Handle>handle-vertical.svg</Handle>
<Horizontal>false</Horizontal>
<Connection>
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
<EmitOnDownPress>false</EmitOnDownPress>
</Connection>
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
<EmitOnDownPress>false</EmitOnDownPress>
</Connection>
</SliderComposed>

</Children>
Expand Down
191 changes: 94 additions & 97 deletions DeereSkeleton4Deck1280x800-WXGA/deck_overview_row.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
<MaximumSize>-1,60</MaximumSize>
<Children>
<Overview>
<TooltipId>waveform_overview</TooltipId>
<Group><Variable name="group"/></Group>
<TooltipId>waveform_overview</TooltipId>
<Group><Variable name="group"/></Group>
<SizePolicy>me,me</SizePolicy>
<BgColor></BgColor>
<SignalHighColor></SignalHighColor>
<SignalMidColor></SignalMidColor>
<SignalLowColor></SignalLowColor>
<SignalColor>#3087BF</SignalColor>
<PlayPosColor>#00FF00</PlayPosColor>
<DefaultMark>
<Align>bottom</Align>
<Color>#00FF00</Color>
<TextColor>#FFFFFF</TextColor>
<Text> %1 </Text>
</DefaultMark>
<Connection>
<ConfigKey><Variable name="group"/>,playposition</ConfigKey>
<EmitOnDownPress>false</EmitOnDownPress>
</Connection>
<BgColor></BgColor>
<SignalHighColor></SignalHighColor>
<SignalMidColor></SignalMidColor>
<SignalLowColor></SignalLowColor>
<SignalColor>#3087BF</SignalColor>
<PlayPosColor>#00FF00</PlayPosColor>
<DefaultMark>
<Align>bottom</Align>
<Color>#00FF00</Color>
<TextColor>#FFFFFF</TextColor>
<Text> %1 </Text>
</DefaultMark>
<Connection>
<ConfigKey>
<Variable name="group"/>,playposition</ConfigKey>
<EmitOnDownPress>false</EmitOnDownPress>
</Connection>
</Overview>

<WidgetGroup>
<ObjectName>OptionGrid</ObjectName>
<Layout>vertical</Layout>
Expand All @@ -49,60 +49,56 @@
<MinimumSize>60,20</MinimumSize>
<MaximumSize>90,30</MaximumSize>
<Children>

<PushButton>
<ObjectName>ShowSpinny</ObjectName>
<MinimumSize>20,20</MinimumSize>
<MaximumSize>30,30</MaximumSize>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>S</Text>
</State>
<State>
<Number>1</Number>
</State>
<State>
<Number>1</Number>
<Text>S</Text>
</State>
<Connection>
<ConfigKey><Variable name="control_show_spinny"/></ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>

<PushButton>
</State>
<Connection>
<ConfigKey><Variable name="control_show_spinny"/></ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
<PushButton>
<MinimumSize>20,20</MinimumSize>
<MaximumSize>30,30</MaximumSize>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>R</Text>
</State>
<State>
<Number>1</Number>
</State>
<State>
<Number>1</Number>
<Text>R</Text>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,repeat</ConfigKey>
</Connection>
</PushButton>

</State>
<Connection>
<ConfigKey><Variable name="group"/>,repeat</ConfigKey>
</Connection>
</PushButton>
<PushButton>
<NumberStates>1</NumberStates>
<NumberStates>1</NumberStates>
<MinimumSize>20,20</MinimumSize>
<MaximumSize>30,30</MaximumSize>
<State>
<Number>0</Number>
<State>
<Number>0</Number>
<Text>⏏</Text>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,eject</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
<ConnectValueToWidget>false</ConnectValueToWidget>
</Connection>
</PushButton>

</State>
<Connection>
<ConfigKey><Variable name="group"/>,eject</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
<ConnectValueToWidget>false</ConnectValueToWidget>
</Connection>
</PushButton>
</Children>
</WidgetGroup>

Expand All @@ -113,58 +109,59 @@
<MinimumSize>60,20</MinimumSize>
<MaximumSize>90,30</MaximumSize>
<Children>

<PushButton>
<MinimumSize>20,20</MinimumSize>
<MaximumSize>30,30</MaximumSize>
<NumberStates>1</NumberStates>
<State>
<Number>0</Number>
<NumberStates>1</NumberStates>
<State>
<Number>0</Number>
<Text>T</Text>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,beats_translate_curpos</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
</State>
<Connection>
<ConfigKey>
<Variable name="group"/>,beats_translate_curpos</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>

<PushButton>
<NumberStates>2</NumberStates>
<PushButton>
<NumberStates>2</NumberStates>
<MinimumSize>20,20</MinimumSize>
<MaximumSize>30,30</MaximumSize>
<State>
<Number>0</Number>
<State>
<Number>0</Number>
<Text>Q</Text>
</State>
<State>
<Number>1</Number>
</State>
<State>
<Number>1</Number>
<Text>Q</Text>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,quantize</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
</State>
<Connection>
<ConfigKey>
<Variable name="group"/>,quantize</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>

<PushButton>
<NumberStates>2</NumberStates>
<PushButton>
<NumberStates>2</NumberStates>
<MinimumSize>20,20</MinimumSize>
<MaximumSize>30,30</MaximumSize>
<State>
<Number>0</Number>
<State>
<Number>0</Number>
<Text>K</Text>
</State>
<State>
<Number>1</Number>
</State>
<State>
<Number>1</Number>
<Text>K</Text>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,keylock</ConfigKey>
</Connection>
</PushButton>

</State>
<Connection>
<ConfigKey>
<Variable name="group"/>,keylock</ConfigKey>
</Connection>
</PushButton>
</Children>
</WidgetGroup>
</Children>
Expand Down
18 changes: 9 additions & 9 deletions DeereSkeleton4Deck1280x800-WXGA/deck_text_row.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<SizePolicy>me,max</SizePolicy>
<Children>
<TrackProperty>
<TooltipId>track_title</TooltipId>
<Property>title</Property>
<Group><Variable name="group"/></Group>
<TooltipId>track_title</TooltipId>
<Property>title</Property>
<Group><Variable name="group"/></Group>
<MinimumSize>-1,20</MinimumSize>
</TrackProperty>
</Children>
Expand All @@ -38,15 +38,15 @@
<Group><Variable name="group"/></Group>
<MinimumSize>40,20</MinimumSize>
<Connection>
<ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
</Connection>
<ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
</Connection>
</Key>
<NumberBpm>
<Group><Variable name="group"/></Group>
<MinimumSize>40,20</MinimumSize>
<Connection>
<ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
</Connection>
<ConfigKey> <Variable name="group"/>,visual_bpm</ConfigKey>
</Connection>
</NumberBpm>
</Children>
</WidgetGroup>
Expand All @@ -63,8 +63,8 @@
<SizePolicy>me,max</SizePolicy>
<Children>
<TrackProperty>
<TooltipId>track_artist</TooltipId>
<Property>artist</Property>
<TooltipId>track_artist</TooltipId>
<Property>artist</Property>
<Group><Variable name="group"/></Group>
<MinimumSize>-1,15</MinimumSize>
</TrackProperty>
Expand Down
Loading

0 comments on commit ac0b070

Please sign in to comment.