Skip to content

Deere 2.1 #940

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
daschuer merged 158 commits into from
Jun 1, 2017
Merged

Deere 2.1 #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
d74a7f5
Deere: shrink waveforms a little and align center marker with center …
Be-ing May 2, 2016
7f6b850
Deere: remove key knob from mixer
Be-ing May 2, 2016
d3beed5
Deere: rearrange mixer to save vertical space
Be-ing May 2, 2016
9a208df
Deere: add option to hide EQs
Be-ing May 2, 2016
e1cbfeb
Deere: add "Show Minimal Controls" for decks option
Be-ing May 2, 2016
d55f3a9
Deere: move main level meters to center of mixer
Be-ing May 2, 2016
8ecda0e
Deere: make sure EQs show by default
Be-ing May 2, 2016
08ff0ac
Deere: add crossfader assignment button in 4 deck mode
Be-ing May 2, 2016
4f847a1
Deere: rework mixer to save vertical space
Be-ing May 2, 2016
203cec5
Deere: decrease minimum size
Be-ing May 2, 2016
63e0e84
Deere: rearrange toolbar to make Skin Settings button more discoverable
Be-ing May 3, 2016
7180406
Deere: mirror EQ kill buttons and center main level meters in mixer
Be-ing May 3, 2016
cc267cf
Deere: pad buttons for minimal deck controls
Be-ing May 3, 2016
6e82b08
Merge remote-tracking branch 'upstream/master' into deere_stacked_wav…
Be-ing Dec 12, 2016
c22e4e4
Deere: remove vertical padding from slider-vertical.svg
Be-ing Dec 12, 2016
1ac96ad
Deere: mixer layout tweaks
Be-ing Dec 12, 2016
c8d3bbe
Deere: add rate text beneath rate slider
Be-ing Dec 12, 2016
918adeb
Deere: use crossfader orientation icons in 4 deck mixer
Be-ing Dec 12, 2016
106183b
Deere: make samplers hideable
Be-ing Dec 12, 2016
235cbd0
Deere: make effects hideable
Be-ing Dec 12, 2016
7c9451d
Deere: make skin settings persistent across restarts
Be-ing Dec 12, 2016
818a3c5
Deere: don't make headphone button so wide
Be-ing Dec 12, 2016
b3ffd17
Deere: reorganize settings menu
Be-ing Dec 13, 2016
54ce78a
Deere: layout refinement
Be-ing Dec 13, 2016
9340deb
Deere: move vinyl control toggle to Main Decks section of settings
Be-ing Dec 13, 2016
1b7a15f
Deere: add more padding around mixer
Be-ing Dec 13, 2016
7c585b1
Deere: make interface sections user resizable
Be-ing Dec 13, 2016
7bcdee2
Merge remote-tracking branch 'upstream/master' into deere_stacked_wav…
Be-ing Dec 13, 2016
71ab9a6
Deere: simplify Show Cover Art option
Be-ing Dec 14, 2016
bbf3490
Deere: rework EQ knobs
Be-ing Dec 14, 2016
2a6974b
Deere: move samplers, effects, and mics below vertical splitter for d…
Be-ing Dec 29, 2016
3bb9ea7
Deere: move SizeAwareStacks down to knob templates
Be-ing Dec 30, 2016
a017b19
Deere: fix QuickEffect toggle buttons
Be-ing Dec 30, 2016
77ffec0
Deere: add Mixxx logo to toolbar
Be-ing Dec 30, 2016
b0f9607
Deere: use different colors for hotcues and playposition on overview …
Be-ing Dec 30, 2016
390d87d
Deere: shrink Mixxx logo a little
Be-ing Dec 30, 2016
c6a96de
Deere: make toggling different configurations and resizing vertical s…
Be-ing Dec 31, 2016
c80f77c
Deere: used fixed width for skin settings menu
Be-ing Jan 3, 2017
9b38312
Deere: reduce minimum height
Be-ing Jan 3, 2017
6ec6e60
pack Decks & Mixer into Singleton
Jan 15, 2017
f60a7ca
fix button grids (hotcues, sampler bank) and EQ buttons
Jan 15, 2017
511d891
clean up
Jan 15, 2017
5f09b2a
clean up
Jan 15, 2017
293ad76
define Singleton children in skin.xml directly
Jan 15, 2017
e2884e9
delete decks wrapper
Jan 15, 2017
4c029b4
Merge pull request #1 from ronso0/deere_rework_singletons
Be-ing Jan 15, 2017
b1cfc86
Merge pull request #2 from ronso0/deere_rework_styling
Be-ing Jan 15, 2017
62c160c
Deere: put deck_visual_row instances into a singleton
Be-ing Jan 15, 2017
450ac2c
Deere: fix waveforms not appearing in split waveform mode
Be-ing Jan 16, 2017
5db1e81
Deere: resize PFL button
Be-ing Jan 16, 2017
758acc1
Deere: use separate ConfigKeys for stacked and split waveform splitters
Be-ing Jan 16, 2017
a9b2124
Deere: remove unnecessary persist="true" attributes
Be-ing Jan 16, 2017
42ed9f7
Deere: increase text and button sizes
Be-ing Jan 16, 2017
1ab12a0
Deere: increase cover art size
Be-ing Jan 16, 2017
53fd695
Deere: move sync button to other side in minimal controls mode
Be-ing Jan 16, 2017
4756fde
Deere: simplify skin settings menu wording; increase toolbar spacing
Be-ing Jan 16, 2017
ad9e1a7
Deere: use different minimum mixer height in 2 deck mode if QuickEffe…
Be-ing Jan 16, 2017
2cec159
Deere: horizontally center pitch fader
Be-ing Jan 18, 2017
18defcb
Merge remote-tracking branch 'upstream/master' into deere_stacked_wav…
Be-ing Jan 19, 2017
367f68c
re-fix hotcues layout-spacing
Jan 23, 2017
c5740e5
proposal for checked/unchecked skin options
Jan 23, 2017
787b70e
another version for checked/unchecked
Jan 25, 2017
2658161
fix mixer cut-off & knob label cut-off
Jan 26, 2017
6aa20cc
Deere: rename KnobButton to CircleButton
Be-ing Jan 28, 2017
f4cf054
Merge pull request #3 from ronso0/deere_rework_styling
Be-ing Jan 30, 2017
54e6a08
Merge remote-tracking branch 'upstream/master' into deere_stacked_wav…
Be-ing Feb 3, 2017
96c7aa4
Deere: add option to show 4 effect units
Be-ing Feb 3, 2017
1a8da2a
Deere: fix effect unit height when expanded with focus
Be-ing Feb 3, 2017
272412c
Deere: use different splitters for decks/library to set different max…
Be-ing Feb 3, 2017
b4431e4
Deere: height adjustments to make 2 decks split waveforms look better
Be-ing Feb 3, 2017
2f42669
Deere: style all vertical splitter handles
Be-ing Feb 3, 2017
9cfb9de
Deere: increase minimum skin size
Be-ing Feb 3, 2017
82ee7c6
Deere: do not let mixer knobs get squished
Be-ing Feb 5, 2017
9298132
Revert "Deere: remove effect chain enable button"
Be-ing Feb 7, 2017
6212f13
Deere: space out buttons in top row of effect units
Be-ing Feb 7, 2017
6d903de
Deere: do not let SYNC button text get cut off with minimal controls
Be-ing Feb 7, 2017
3ac4a05
Deere: shrink top toolbar height
Be-ing Feb 8, 2017
19cc9ad
Deere: make settings menu fit in minimum skin height
Be-ing Feb 8, 2017
ff5ac8d
Deere: remove vertical padding from OverviewRow
Be-ing Feb 8, 2017
f58aee7
rearrage Pitch section to save v-space for Pitch fader
Feb 9, 2017
57f3b2a
Merge pull request #5 from ronso0/deere-rework-2.1
Be-ing Feb 9, 2017
4b101d5
Deere: deck layout refinements
Be-ing Feb 13, 2017
706ff08
Deere: adjust spacing of effect units without parameters
Be-ing Feb 13, 2017
3e5f84f
Deere: add slip mode button to minimal controls mode
Be-ing Feb 13, 2017
3f99e1d
Deere: replace huge grid of loop buttons with size selection
Be-ing Feb 13, 2017
25f0b23
Deere: new loop controls
Be-ing Feb 27, 2017
0258d9c
Deere: remove rate temp up/down buttons in minimal controls mode
Be-ing Feb 27, 2017
ac7e1e0
Deere: add loop toggle button to minimal controls mode
Be-ing Feb 27, 2017
a52334d
Deere: use new beatjump_size CO
Be-ing Feb 27, 2017
08096f1
Deere: change beatjump and loop move icons
Be-ing Feb 27, 2017
9ca1760
Deere: small adjustment to fit in minimum width
Be-ing Feb 27, 2017
9732d52
Deere: rename WHalveDoubleSpinBox to WBeatSpinBox
Be-ing Feb 27, 2017
3c90b5a
Deere: middle elide QuickEffect superknob labels
Be-ing Mar 5, 2017
68e64ea
Deere: clean up log spam
Be-ing Mar 5, 2017
d5b9a95
Deere: waveform, cover art, and deck option buttons cleanup
Be-ing Mar 6, 2017
d921549
Deere: redesign microphone controls
Be-ing Mar 6, 2017
f1a7fab
Deere: redesign auxiliary input controls
Be-ing Mar 6, 2017
4f6d016
Deere: use new seek_loop_in/out COs for right clicking loop_in/out bu…
Be-ing Mar 8, 2017
4b1571a
Deere: use new loop_move_forward/backward COs
Be-ing Mar 8, 2017
9c1ecf4
Deere: use new reloop_cue CO as right click action of reloop button
Be-ing Mar 8, 2017
7b39021
Deere: use new loop_move_[forward/backward]_beatloop_size COs for rig…
Be-ing Mar 9, 2017
0ac261a
Deere: move beat_translate_curpos and eject buttons back to grid next…
Be-ing Mar 9, 2017
f36ba88
Deere: better names for sections in skin settings menu
Be-ing Mar 9, 2017
ecc77c4
Deere: redesign sampler layout for up to 4 rows of 8 samplers (32 sam…
Be-ing Mar 10, 2017
728c06c
Deere: redesign samplers
Be-ing Mar 10, 2017
7588c00
Deere: add effect unit assignment buttons to expanded samplers
Be-ing Mar 10, 2017
a8977e2
Deere: move mic & aux effect unit assignment buttons into mic & aux s…
Be-ing Mar 10, 2017
20e830e
Deere: move effect unit assignment buttons into decks from effect unit
Be-ing Mar 10, 2017
3e0e2c2
Deere: use headphone icon for effect unit headphone assignment button
Be-ing Mar 10, 2017
563ab22
Deere: rearrange stuff in decks; make decks symmetrical
Be-ing Mar 10, 2017
328208f
Deere: fix layout of FX assignment switches 3 & 4 in decks
Be-ing Mar 10, 2017
b24a119
Deere: fix spacing of sampler row setting in skin settings menu
Be-ing Mar 12, 2017
a4ac940
Deere: add hotcue buttons back to expanded samplers
Be-ing Mar 12, 2017
8604f5b
Deere: support up to 8 rows of samplers (64 samplers)
Be-ing Mar 13, 2017
f8f917c
Deere: use renamed loop_in/out_goto COs
Be-ing Mar 13, 2017
25386ad
Deere: make use of waveform background colors
Be-ing Mar 13, 2017
24da331
Deere: fix mismatched waveform colors
Be-ing Mar 13, 2017
217b54f
Deere: fix effect rows getting squished with show_focus=1
Be-ing Mar 17, 2017
fcf6ecc
Deere: a little padding for focused effects without parameters
Be-ing Mar 17, 2017
5c8fe95
Deere: attempt to fix disappearing level meter bug
Be-ing Mar 17, 2017
da57d54
Deere: move preview deck below search bar
Be-ing Mar 17, 2017
f55a776
Deere: rearrange effect unit assignment switches to match effect unit…
Be-ing Mar 19, 2017
dcc7ffe
Deere: move rate slider to right side of decks
Be-ing Mar 20, 2017
1d2edab
Deere: use new reloop CO
Be-ing Mar 25, 2017
108d430
Deere: add reloop button to minimal controls mode
Be-ing Mar 25, 2017
4b15053
Merge remote-tracking branch 'upstream/master' into deere_stacked_wav…
Be-ing Mar 29, 2017
18349b0
use renamed loop controls
Be-ing Mar 31, 2017
82d5339
Deere: replace loopauto_toggle with beatloop_toggle
Be-ing Apr 7, 2017
80f36e7
Deere: revert to reloop_toggle CO and loop_enabled for reloop button
Be-ing Apr 12, 2017
3c7e0d0
Merge remote-tracking branch 'upstream/master' into deere_stacked_wav…
Be-ing Apr 12, 2017
084852d
Deere: specify spinbox and effect selector font sizes
Be-ing Apr 12, 2017
ba08513
Deere: update tooltips for new loop & beatjump controls
Be-ing Apr 12, 2017
14e0c1a
Deere: add label for effects units
Be-ing Apr 12, 2017
540f6a2
Deere: add option to hide superknobs
Be-ing Apr 12, 2017
e8a5f57
Deere: use new effects tooltips for Mixxx 2.1
Be-ing Apr 13, 2017
766a17f
Deere: bring back cover art option in deck text row
Be-ing Apr 13, 2017
7e41a0e
Deere: sane default splitter sizes for each configuration
Be-ing Apr 13, 2017
3eae178
Deere: hide superknobs by default
Be-ing Apr 30, 2017
558fff8
Deere: re-remove effect chain enable switch
Be-ing Apr 30, 2017
103c085
Deere: remove tooltip from effect button parameters
Be-ing Apr 30, 2017
8892f92
Deere: redesign spinny position indicator
Be-ing May 4, 2017
bbac5ba
Deere: fix headphone assignment button for effects
Be-ing May 4, 2017
b537b89
Merge remote-tracking branch 'upstream/master' into deere_stacked_wav…
Be-ing May 7, 2017
4de3d04
Deere: attempt to fix disappearing level meters bug
Be-ing May 15, 2017
7110c93
Deere: use renamed beatloop_activate ControlObject
Be-ing May 21, 2017
e3bb8fb
Deere: remove beatloop_activate button from minimal controls mode
Be-ing May 21, 2017
e60269f
Deere: remove dedicated loop move buttons
Be-ing May 21, 2017
0e72e2c
Deere: first draft of new beatloop_activate & reloop_toggle icons
Be-ing May 22, 2017
21c0a37
Deere: improve reloop icon
Be-ing May 22, 2017
fc98ffe
Merge remote-tracking branch 'upstream/master' into deere_stacked_wav…
Be-ing May 25, 2017
b7a1b0f
Deere: make expand/collapse button in library toggle maximized view
Be-ing May 26, 2017
9e094a4
Deere: "stacked" waveforms -> "parallel" waveforms
Be-ing May 26, 2017
b132d0a
Deere: attempt to fix level meter bug again
Be-ing May 26, 2017
0981f6e
Deere: add recording duration widget to toolbar
Be-ing May 26, 2017
40e9dae
Deere: move effects, sampler, and mic/aux toggles to toolbar
Be-ing May 26, 2017
95ad79d
Deere: add option to hide faders
Be-ing May 26, 2017
153b3fe
Deere: make toolbar buttons not stand out so much
Be-ing May 26, 2017
d232af3
Deere: fit top toolbar in minimum width
Be-ing May 27, 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
132 changes: 109 additions & 23 deletions res/skins/Deere/auxiliary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,122 @@
<!DOCTYPE template>
<!--
Description:
The auxiliary channel controls.
The auxiliary input controls.
Variables:
i: The auxiliary channel number (1-indexed)
i: The Auxiliary input number (1-indexed)
-->

<Template>
<SetVariable name="group">[Auxiliary<Variable name="i"/>]</SetVariable>
<WidgetGroup>
<ObjectName>AuxiliaryContainer</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Layout>vertical</Layout>
<SizePolicy>max,max</SizePolicy>
<Children>
<Template src="skin:vumeter.xml">
<SetVariable name="group">[Auxiliary<Variable name="i"/>]</SetVariable>
<SetVariable name="TooltipId">channel_VuMeter</SetVariable>
<SetVariable name="control">VuMeter</SetVariable>
</Template>

<Template src="skin:knob_with_button.xml">
<SetVariable name="TooltipId">pregain</SetVariable>
<SetVariable name="group">[Auxiliary<Variable name="i"/>]</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>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>
<ObjectName>AuxiliaryButtonsAndMeter</ObjectName>
<Layout>vertical</Layout>
<Children>

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

<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">pfl</SetVariable>
<SetVariable name="ObjectName">AuxPFLButton</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_headphones_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
<SetVariable name="state_1_text"></SetVariable>
<SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
</Template>

<Template src="skin:crossfader_orientation_button.xml" />

</Children>
</WidgetGroup>

<Template src="skin:vumeter.xml">
<SetVariable name="TooltipId">microphone_VuMeter</SetVariable>
<SetVariable name="control">VuMeter</SetVariable>
</Template>

<WidgetGroup>
<ObjectName>ButtonGrid</ObjectName>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:fx_unit_group_assignment_button.xml">
<SetVariable name="EffectUnit">1</SetVariable>
<SetVariable name="SourceType">auxiliary</SetVariable>
</Template>

<Template src="skin:fx_unit_group_assignment_button.xml">
<SetVariable name="EffectUnit">2</SetVariable>
<SetVariable name="SourceType">auxiliary</SetVariable>
</Template>

<WidgetGroup>
<ObjectName>ButtonGrid</ObjectName>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:fx_unit_group_assignment_button.xml">
<SetVariable name="EffectUnit">3</SetVariable>
<SetVariable name="SourceType">auxiliary</SetVariable>
</Template>

<Template src="skin:fx_unit_group_assignment_button.xml">
<SetVariable name="EffectUnit">4</SetVariable>
<SetVariable name="SourceType">auxiliary</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey>[Master],show_4effectunits</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

</Children>
</WidgetGroup>

</Children>
</WidgetGroup>

</Children>
</WidgetGroup>

</Children>
<Connection>
<ConfigKey>[Auxiliary<Variable name="i"/>],enabled</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Template>
Loading