Skip to content
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

Jump to bottom

Deere 2.1 part 2 #1343

Merged
merged 54 commits into from
Dec 1, 2017
Merged

Deere 2.1 part 2 #1343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
5d9ce2b
Deere: hide headphone controls when no headphones configured
Be-ing Sep 16, 2017
370e054
Deere: add Booth gain knob
Be-ing Sep 16, 2017
47081df
Deere: cleanup skin.xml a little
Be-ing Sep 16, 2017
f05a1a2
Deere: change "GAIN" label to "MASTER" for master gain knob
Be-ing Sep 16, 2017
8af8128
Deere: change "HEAD GAIN" label to just "HEAD"
Be-ing Sep 16, 2017
614128a
Deere: remove bottom splitter and EQ knob labels
Be-ing Sep 16, 2017
e90a524
Deere: mixer fixes
Be-ing Sep 16, 2017
73c6c7d
Deere: fix mixer asymmetry
Be-ing Sep 17, 2017
53c15d2
Deere: adjust some borders
Be-ing Sep 17, 2017
3ef6a10
Deere: simplify some file names
Be-ing Sep 17, 2017
1bcef29
Deere: simplify sampler templates
Be-ing Sep 17, 2017
c7b2bee
Deere: simplify sampler expanded view
Be-ing Sep 17, 2017
bd12631
Deere: remove crossfader orientation button from mics
Be-ing Sep 17, 2017
4cc51e6
Deere: remove minimal deck controls mode
Be-ing Sep 17, 2017
eb4ac32
Deere: remove QuickEffect text labels
Be-ing Sep 17, 2017
ffd0fdb
Deere: make QuickEffect kill switches match EQ kill switches
Be-ing Sep 17, 2017
47c7f16
Deere: add option to hide EQ kill switches
Be-ing Sep 17, 2017
d8fccba
Deere: let mixer shrink vertically
Be-ing Sep 17, 2017
6eee1d4
fix highlighted xfader orientation buttons
Oct 15, 2017
1fbe07d
push fx units 4px apart, fix/improve spacer template
Oct 15, 2017
6cd5373
Merge pull request #11 from ronso0/Deere-2.1-update2
Be-ing Oct 16, 2017
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
3ec4652
Merge pull request #12 from ronso0/Deere-2.1-update2
Be-ing Oct 21, 2017
56f3332
compact Mic/Aux rack
Oct 26, 2017
baa8d8b
equalize major skin elements' spacing
Oct 26, 2017
15dc432
Merge pull request #13 from ronso0/deere_2.1_update_MicAux
Be-ing Oct 26, 2017
888c91a
fix button grid in deck overview row
Nov 1, 2017
483855e
fix some layout issues in deck controls & deck overview
Nov 12, 2017
aab96cd
fix minimum skin size
Nov 12, 2017
3ae6a97
simplify container bg colors
Nov 12, 2017
1aa3f21
fix colors for selected library row
Nov 12, 2017
13d315c
define colors for library Preview button
Nov 12, 2017
7fb87ec
simplify skin.xml to minimize flickering when togling stacked waveforms
Nov 13, 2017
10768df
Merge pull request #15 from ronso0/deere_2.1_layout-fixes
Be-ing Nov 19, 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
54 changes: 32 additions & 22 deletions res/skins/Deere/auxiliary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,42 @@
<SetVariable name="group">[Auxiliary<Variable name="i"/>]</SetVariable>
<WidgetGroup>
<ObjectName>AuxiliaryContainer</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>max,max</SizePolicy>
<Layout>horizontal</Layout>
<SizePolicy>max,min</SizePolicy>
<Children>

<WidgetGroup>
<Layout>horizontal</Layout>
<ObjectName>AuxLabelContainer</ObjectName>
<Children>
<Label>
<ObjectName>AuxLabel</ObjectName>
<Text>Aux <Variable name="i"/></Text>
</Label>
</Children>
</WidgetGroup>

<WidgetGroup>
<ObjectName>AuxiliaryControls</ObjectName>
<Layout>horizontal</Layout>
<Children>

<Template src="skin:knob_with_button.xml">
<SetVariable name="TooltipId">microphone_pregain</SetVariable>
<SetVariable name="control">pregain</SetVariable>
<SetVariable name="color">red</SetVariable>
<SetVariable name="button_TooltipId">mute</SetVariable>
<SetVariable name="button_control">mute</SetVariable>
<SetVariable name="label">Gain</SetVariable>
</Template>
<WidgetGroup>
<Layout>vertical</Layout>
<ObjectName>AuxiliaryControls</ObjectName>
<Children>

<WidgetGroup>
<Layout>horizontal</Layout>
<ObjectName>AuxLabelContainer</ObjectName>
<Children>
<Label>
<ObjectName>AuxLabel</ObjectName>
<Text>Aux <Variable name="i"/></Text>
</Label>
</Children>
</WidgetGroup>


<Template src="skin:knob_with_button.xml">
<SetVariable name="TooltipId">microphone_pregain</SetVariable>
<SetVariable name="control">pregain</SetVariable>
<SetVariable name="color">red</SetVariable>
<SetVariable name="button_TooltipId">mute</SetVariable>
<SetVariable name="button_control">mute</SetVariable>
<SetVariable name="label">Gain</SetVariable>
</Template>
</Children>
</WidgetGroup>

<WidgetGroup>
<ObjectName>AuxiliaryButtonsAndMeter</ObjectName>
Expand All @@ -64,7 +72,9 @@
<SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
</Template>

<Template src="skin:crossfader_orientation_button.xml" />
<Template src="skin:crossfader_orientation_button.xml">
<SetVariable name="Unit">Aux</SetVariable>
</Template>

</Children>
</WidgetGroup>
Expand Down
75 changes: 42 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,58 @@
-->
<Template>
<WidgetGroup>
<ObjectName>BeatJumpContainer</ObjectName>
<Layout>horizontal</Layout>
<Layout>vertical</Layout>
<SizePolicy>f,min</SizePolicy>
<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/crossfader_orientation_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Template>
<Template src="skin:left_3state_button.xml">
<SetVariable name="TooltipId">orientation</SetVariable>
<SetVariable name="ObjectName">OrientationButton</SetVariable>
<SetVariable name="ObjectName">OrientationButton<Variable name="Unit"/></SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
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
Loading