Skip to content

Commit

Permalink
Merge pull request #12 from ronso0/Deere-2.1-update2
Browse files Browse the repository at this point in the history 
fix positions of mixer controls, rearrange vinyl controls
  • Loading branch information
@Be-ing
Be-ing authored Oct 21, 2017
2 parents 6cd5373 + f8bc651 commit 3ec4652
Show file tree
Hide file tree
Showing 47 changed files with 1,745 additions and 1,322 deletions.
74 changes: 41 additions & 33 deletions res/skins/Deere/beatjump.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,49 +7,57 @@
-->
<Template>
<WidgetGroup>
<ObjectName>BeatJumpContainer</ObjectName>
<Layout>horizontal</Layout>
<Layout>vertical</Layout>
<Children>

<Template src="skin:left_right_1state_button.xml">
<SetVariable name="TooltipId">beatjump_backward</SetVariable>
<SetVariable name="ObjectName">BeatJumpButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
<SetVariable name="state_0_text"><Variable name="text_length"/></SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,beatjump_backward</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,beatjump_1_backward</SetVariable>
</Template>

<Template src="skin:spacer_hx.xml">
<SetVariable name="width">2</SetVariable>
</Template>

<BeatSpinBox>
<ObjectName>BeatjumpSizeSpinBox</ObjectName>
<TooltipId>beatjump_size</TooltipId>
<Value><Variable name="group"/>,beatjump_size</Value>
</BeatSpinBox>

<Template src="skin:spacer_hx.xml">
<SetVariable name="width">2</SetVariable>
<!-- Workaround for layout spacing -->
<Template src="skin:spacer_vx.xml">
<SetVariable name="height">,2f</SetVariable>
</Template>

<Template src="skin:left_right_1state_button.xml">
<SetVariable name="TooltipId">beatjump_forward</SetVariable>
<SetVariable name="ObjectName">BeatJumpButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
<SetVariable name="state_0_text"><Variable name="text_length"/></SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,beatjump_forward</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,beatjump_1_forward</SetVariable>
</Template>
<WidgetGroup><!-- backward + forward -->
<Layout>horizontal</Layout>
<Children>

<Template src="skin:left_right_1state_button.xml">
<SetVariable name="TooltipId">beatjump_backward</SetVariable>
<SetVariable name="ObjectName">BeatJumpButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
<SetVariable name="state_0_text"><Variable name="text_length"/></SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,beatjump_backward</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,beatjump_1_backward</SetVariable>
</Template>

<!-- Workaround for layout spacing -->
<Template src="skin:spacer_hx.xml">
<SetVariable name="width">2f,</SetVariable>
</Template>

<Template src="skin:left_right_1state_button.xml">
<SetVariable name="TooltipId">beatjump_forward</SetVariable>
<SetVariable name="ObjectName">BeatJumpButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
<SetVariable name="state_0_text"><Variable name="text_length"/></SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,beatjump_forward</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,beatjump_1_forward</SetVariable>
</Template>

</Children>
</WidgetGroup><!-- backward + forward -->

</Children>
</WidgetGroup>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere/deck.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:deck_inner_column.xml"/>
<Template src="skin:deck_tempo_column.xml"/>
</Children>
</WidgetGroup>
</Children>
Expand Down
47 changes: 45 additions & 2 deletions res/skins/Deere/deck_controls_row.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,62 @@
<WidgetGroup>
<ObjectName>ControlsRow</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<SizePolicy>me,min</SizePolicy>
<Children>
<WidgetGroup>
<ObjectName>FullControlsRow</ObjectName>
<Layout>horizontal</Layout>
<Size>-1,-1me</Size>
<SizePolicy>me,min</SizePolicy>
<Children>
<Template src="skin:hotcue.xml"/>
<!-- Expanding spacers in between control contexts -->
<WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
<Template src="skin:loop.xml"/>
<WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
<Template src="skin:beatjump.xml"/>
<WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<MinimumSize>40,42</MinimumSize>
<MaximumSize>60, -1</MaximumSize>
<SizePolicy>me,me</SizePolicy>
<Children>

<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
<SetVariable name="ObjectName">DeckCue</SetVariable>
<SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
<SetVariable name="LeftClickIsPushButton">true</SetVariable>
<SetVariable name="RightClickIsPushButton">true</SetVariable>
<SetVariable name="state_0_text">CUE</SetVariable>
<SetVariable name="state_1_text">CUE</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,cue_default</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
</Template>

<!-- Workaround for layout spacing -->
<Template src="skin:spacer_vx.xml">
<SetVariable name="height">2</SetVariable>
</Template>

<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">play_cue_set</SetVariable>
<SetVariable name="ObjectName">PlayToggle</SetVariable>
<SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
<SetVariable name="LeftClickIsPushButton">false</SetVariable>
<SetVariable name="RightClickIsPushButton">false</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
</Template>
</Children>
</WidgetGroup>
</Children>
</WidgetGroup>
</Children>
Expand Down
36 changes: 17 additions & 19 deletions res/skins/Deere/deck_overview_row.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<MinimumSize>-1,40</MinimumSize>
<MaximumSize>-1,65</MaximumSize>
<MaximumSize>-1,80</MaximumSize>
<Children>
<WidgetGroup>
<ObjectName>ButtonGrid</ObjectName>
<Layout>vertical</Layout>
<Children>
<WidgetGroup>
Expand Down Expand Up @@ -52,19 +51,17 @@
<SetVariable name="left_connection_control"><Variable name="group"/>,repeat</SetVariable>
</Template>

<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">eject</SetVariable>
<SetVariable name="ObjectName">EjectButton</SetVariable>
<Template src="skin:left_right_1state_button.xml">
<SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
<SetVariable name="ObjectName">BeatsTranslateCurposButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text"></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_eject_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_eject_48px.svg</SetVariable>
<SetVariable name="state_1_text"></SetVariable>
<SetVariable name="state_1_pressed">icon/ic_eject_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_eject_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,eject</SetVariable>
<SetVariable name="state_0_pressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_curpos</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
</Template>

</Children>
Expand All @@ -74,17 +71,19 @@
<ObjectName>ButtonGrid</ObjectName>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:left_right_1state_button.xml">
<SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
<SetVariable name="ObjectName">BeatsTranslateCurposButton</SetVariable>
<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">eject</SetVariable>
<SetVariable name="ObjectName">EjectButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text"></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_curpos</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
<SetVariable name="state_0_pressed">icon/ic_eject_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_eject_48px.svg</SetVariable>
<SetVariable name="state_1_text"></SetVariable>
<SetVariable name="state_1_pressed">icon/ic_eject_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_eject_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,eject</SetVariable>
</Template>

<Template src="skin:left_2state_button.xml">
Expand Down Expand Up @@ -193,7 +192,6 @@
</WidgetGroup>

<WidgetGroup>
<ObjectName>ButtonGrid</ObjectName>
<Layout>vertical</Layout>
<Connection>
<ConfigKey>[Master],show_4effectunits</ConfigKey>
Expand Down
53 changes: 0 additions & 53 deletions res/skins/Deere/deck_inner_column.xml → res/skins/Deere/deck_tempo_column.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,59 +96,6 @@
</Children>
</WidgetGroup>

<Template src="skin:spacer_vx.xml">
<SetVariable name="height">2</SetVariable>
</Template>

<WidgetGroup>
<Layout>vertical</Layout>
<Children>

<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
<SetVariable name="ObjectName">DeckCue</SetVariable>
<SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
<SetVariable name="LeftClickIsPushButton">true</SetVariable>
<SetVariable name="RightClickIsPushButton">true</SetVariable>
<SetVariable name="state_0_text">CUE</SetVariable>
<SetVariable name="state_0_pressed"></SetVariable>
<SetVariable name="state_0_unpressed"></SetVariable>
<SetVariable name="state_1_text">CUE</SetVariable>
<SetVariable name="state_1_pressed"></SetVariable>
<SetVariable name="state_1_unpressed"></SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,cue_default</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
</Template>

<!-- Workaround for layout spacing -->
<Template src="skin:spacer_vx.xml">
<SetVariable name="height">2</SetVariable>
</Template>

<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">play_cue_set</SetVariable>
<SetVariable name="ObjectName">PlayToggle</SetVariable>
<SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
<SetVariable name="LeftClickIsPushButton">false</SetVariable>
<SetVariable name="RightClickIsPushButton">false</SetVariable>
<SetVariable name="state_0_text"></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_1_text"></SetVariable>
<SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
</Template>
</Children>
</WidgetGroup>

</Children>
</WidgetGroup>
</Template>
Loading

0 comments on commit 3ec4652

Please sign in to comment.