Skip to content

fix positions of mixer controls, rearrange vinyl controls #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Be-ing merged 21 commits into from
Oct 21, 2017
Merged

fix positions of mixer controls, rearrange vinyl controls #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c74bbd2
always keep decks/mixer at minimum size
Oct 16, 2017
97b8222
re-order VinylControls, rename HOTCUE to HOT so it fits
Oct 16, 2017
54b85fd
symmetric Mute buttons in 4-deck mixer
Oct 16, 2017
a33f9ad
fix position of mixer elements for all configurations
Oct 17, 2017
fd1245f
left click focus button to unfocus
Oct 18, 2017
9d8ca33
always show Recording and Shoutcast button
Oct 18, 2017
9d11639
make BPM/Key controls more discoverable
Oct 18, 2017
d44caaa
show/hide vinyl controls from within deck overview row
Oct 18, 2017
c60ce99
resize Rec, Shoutcast & Vinyl icon to fit buttons
Oct 18, 2017
9afb959
stop Crossfader overlapping mixer container
Oct 18, 2017
b64f333
widen Crossfader background
Oct 18, 2017
96e2d63
equalize padding of vinyl controls and FX assing buttons
Oct 18, 2017
be6430d
fill Spinny background in expanded stacked waveforms
Oct 18, 2017
7e6edc0
fix Master VU position for all configurations
Oct 20, 2017
969cea4
brighter border for BPM/Key edit triggers
Oct 20, 2017
3f50761
move Play/Cue to deck controls row, compress loop & beatjump
Oct 20, 2017
908fba1
fix play button: centered icon, 40-60px wide
Oct 21, 2017
7264a88
align loop_activate with reloop
Oct 21, 2017
1ceadc6
increase crossfade margin
Oct 21, 2017
8004154
improve Rec & ShoutCast icons
Oct 21, 2017
f8bc651
improve xFader highlight with AutoDJ enabled, sort toolbar indicators
Oct 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 41 additions & 33 deletions res/skins/Deere/beatjump.xml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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