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

Unify Skin controls #1848

Merged
merged 33 commits into from
Nov 24, 2018
Merged

Unify Skin controls #1848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ab0bc26
Deere: remove unused Spinny CO from decks
ronso0 Oct 17, 2018
469b2a2
[Skin],show_4decks
ronso0 Oct 23, 2018
dcdbff1
[Skin],show_4effectunits
ronso0 Oct 23, 2018
9adc15c
[Skin],show_superknobs
ronso0 Oct 23, 2018
0260fe8
[Skin],show_spinnies
ronso0 Oct 23, 2018
2c54485
[Skin],show_coverart
ronso0 Oct 23, 2018
e735b1a
[Skin],show_coverart [Skin],show_big_spinny_coverart
ronso0 Oct 23, 2018
35d86a9
[Skin],show_8_hotcues
ronso0 Oct 23, 2018
d8fc639
[Skin],sampler_row_N_expanded
ronso0 Oct 23, 2018
91935de
[Skin],sampler_rows [Skin],sampler_row_current/..next/..prev
ronso0 Oct 23, 2018
5683b64
[Skin,show_starrating] etc.
ronso0 Oct 23, 2018
da4e483
[Skin],show_rate_controls
ronso0 Oct 23, 2018
8ff0bcf
[Skin],show_eq_kill_buttons
ronso0 Oct 23, 2018
057500d
[Skin],show_eq_knobs
ronso0 Oct 23, 2018
268ef01
[Skin],show_loop_beatjump_controls
ronso0 Oct 23, 2018
96c1eec
Unify attributes section in skin.xml, fix indentations in Shade skin.xml
ronso0 Oct 23, 2018
1d68aa3
[Skin],show_xfader
ronso0 Oct 23, 2018
8fb58c1
restore [Skin],show_library and 64 samplers
ronso0 Oct 26, 2018
fb78500
finalize indentations in Shade/skin.xml
ronso0 Oct 26, 2018
96403eb
unify Splitter size config keys
ronso0 Oct 27, 2018
e3e67a1
[Skin],sampler_row_N_expanded
ronso0 Oct 28, 2018
d7150ff
[Skin],show_faders
ronso0 Oct 28, 2018
1128bf0
restore skin defaults
ronso0 Oct 28, 2018
37fbb09
LateNight: fix [Skin],show_8_hotcues
ronso0 Oct 28, 2018
8d63594
Deere: simplify skinsettings, fix sampler row selection
ronso0 Nov 9, 2018
0879682
Deere: improve tool bar on small screens, add Mixer toggle
ronso0 Oct 31, 2018
90a02b4
resolve conflicts after merging [LateNight, 8 samplers]
ronso0 Nov 3, 2018
e6dc512
Merge branch 'master' into unify-skin-controls
ronso0 Nov 9, 2018
e509a0c
Delete skin_settings___.xml
ronso0 Nov 15, 2018
1955283
move Mic/Aux toggle to match actual order in skin
ronso0 Nov 23, 2018
4f4daf3
fix description in skinsettings_button.xml
ronso0 Nov 24, 2018
32e3cd9
fix description in skinsettings_category_button.xml
ronso0 Nov 24, 2018
b0f1dd9
uncomment debug styles in Deere/style.qss
ronso0 Nov 24, 2018
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
2 changes: 1 addition & 1 deletion res/controllers/Numark-Mixtrack-3-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ NumarkMixtrack3.init = function(id, debug) {
NumarkMixtrack3.id = id; // Store the ID of this device for later use
NumarkMixtrack3.debug = debug;

engine.setValue('[Master]', 'show_superknobs', 1);
engine.setValue('[Skin]', 'show_superknobs', 1);

NumarkMixtrack3.deckGroup = {
'[Channel1]': '[Channel1]',
Expand Down
22 changes: 11 additions & 11 deletions res/skins/Deere (64 Samplers)/sample_decks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,13 @@
Creating the border with fixed-size WidgetGroups solves this.
<WidgetGroup><Size>-1me,2f</Size></WidgetGroup> -->

<WidgetStack currentpage="[Deere],sampler_row_current" persist="true">
<WidgetStack currentpage="[Skin],sampler_row_current" persist="true">
<ObjectName>SampleDecksContainer</ObjectName>
<NextControl>[Deere],sampler_row_next</NextControl>
<PrevControl>[Deere],sampler_row_prev</PrevControl>
<NextControl>[Skin],sampler_row_next</NextControl>
<PrevControl>[Skin],sampler_row_prev</PrevControl>
<Children>

<WidgetGroup trigger="[Deere],sampler_row_1">
<WidgetGroup trigger="[Skin],sampler_row_1">
<ObjectName>SamplerRows</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
Expand All @@ -177,7 +177,7 @@
</Children>
</WidgetGroup>

<WidgetGroup trigger="[Deere],sampler_row_2">
<WidgetGroup trigger="[Skin],sampler_row_2">
<ObjectName>SamplerRows</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
Expand All @@ -194,7 +194,7 @@
</Children>
</WidgetGroup>

<WidgetGroup trigger="[Deere],sampler_row_3">
<WidgetGroup trigger="[Skin],sampler_row_3">
<ObjectName>SamplerRows</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
Expand All @@ -215,7 +215,7 @@
</Children>
</WidgetGroup>

<WidgetGroup trigger="[Deere],sampler_row_4">
<WidgetGroup trigger="[Skin],sampler_row_4">
<ObjectName>SamplerRows</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
Expand All @@ -240,7 +240,7 @@
</Children>
</WidgetGroup>

<WidgetGroup trigger="[Deere],sampler_row_5">
<WidgetGroup trigger="[Skin],sampler_row_5">
<ObjectName>SamplerRows</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
Expand Down Expand Up @@ -269,7 +269,7 @@
</Children>
</WidgetGroup>

<WidgetGroup trigger="[Deere],sampler_row_6">
<WidgetGroup trigger="[Skin],sampler_row_6">
<ObjectName>SamplerRows</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
Expand Down Expand Up @@ -302,7 +302,7 @@
</Children>
</WidgetGroup>

<WidgetGroup trigger="[Deere],sampler_row_7">
<WidgetGroup trigger="[Skin],sampler_row_7">
<ObjectName>SamplerRows</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
Expand Down Expand Up @@ -339,7 +339,7 @@
</Children>
</WidgetGroup>

<WidgetGroup trigger="[Deere],sampler_row_8">
<WidgetGroup trigger="[Skin],sampler_row_8">
<ObjectName>SamplerRows</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
Expand Down
62 changes: 36 additions & 26 deletions res/skins/Deere (64 Samplers)/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,48 @@
<language>en</language>
<license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
<attributes>
<!-- Set skin defaults. -->
<attribute config_key="[Master],num_decks">4</attribute>
<attribute config_key="[Master],num_samplers">64</attribute>
<attribute config_key="[Master],num_preview_decks">1</attribute>
<attribute config_key="[Library],show_library">1</attribute>
ronso0 marked this conversation as resolved.
Show resolved Hide resolved

<!--Skin settings-->
<attribute persist="true" config_key="[Deere],show_parallel_waveforms">1</attribute>
<attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
<attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>

<attribute persist="true" config_key="[Master],show_4decks">0</attribute>
<attribute persist="true" config_key="[Master],show_4effectunits">0</attribute>
<attribute persist="true" config_key="[Master],show_coverart">1</attribute>
<attribute persist="true" config_key="[Master],show_spinnies">0</attribute>
<attribute persist="true" config_key="[Deere],show_starrating">0</attribute>
<!-- Decks -->
<attribute persist="true" config_key="[Skin],show_4decks">0</attribute>
<attribute persist="true" config_key="[Skin],show_8_hotcues">0</attribute>
<attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
<attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
<attribute persist="true" config_key="[Skin],show_starrating">1</attribute>
<attribute persist="true" config_key="[Deere],show_track_info">1</attribute>
<attribute persist="true" config_key="[Deere],show_bpm_info">1</attribute>
<attribute persist="true" config_key="[Deere],show_more_hotcues">0</attribute>

<!-- Mixer -->
<attribute persist="true" config_key="[Master],show_mixer">1</attribute>
<attribute persist="true" config_key="[Deere],show_crossfader">1</attribute>
<attribute persist="true" config_key="[Master],show_eqs">1</attribute>
<attribute persist="true" config_key="[Master],show_killswitches">0</attribute>
<attribute persist="true" config_key="[Master],show_faders">1</attribute>
<attribute persist="true" config_key="[VinylControl],show_vinylcontrol">0</attribute>

<attribute persist="true" config_key="[Samplers],show_samplers">1</attribute>
<attribute persist="true" config_key="[Samplers],show_expanded">0</attribute>

<attribute persist="true" config_key="[Skin],show_faders">1</attribute>
<attribute persist="true" config_key="[Skin],show_eq_knobs">1</attribute>
<attribute persist="true" config_key="[Skin],show_eq_kill_buttons">1</attribute>
<attribute persist="true" config_key="[Skin],show_xfader">1</attribute>
ronso0 marked this conversation as resolved.
Show resolved Hide resolved
<!-- Effects -->
<attribute persist="true" config_key="[EffectRack1],show">1</attribute>
<attribute persist="true" config_key="[Master],show_superknobs">0</attribute>
<attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>
<attribute persist="true" config_key="[Skin],show_superknobs">0</attribute>
<!-- Samplers -->
<attribute persist="true" config_key="[Samplers],show_samplers">1</attribute>
<!-- item index in skin_settings_sampler_rows.xml, '1' enables 2 sampler rows -->
<attribute persist="true" config_key="[Skin],sampler_rows">1</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_1_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_2_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_3_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_4_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_5_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_6_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_7_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_8_expanded">0</attribute>

<attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
<!-- Library -->
<attribute config_key="[Skin],show_library">1</attribute>
<attribute config_key="[Master],maximize_library">0</attribute>
<attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
<attribute persist="true" config_key="[Library],show_coverart">1</attribute>
<!--Disable hidden effect routing Buttons-->
<attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[MasterOutput]_enable">0</attribute>
<attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[BusLeft]_enable">0</attribute>
Expand Down Expand Up @@ -195,7 +205,7 @@
<Splitter><!-- Visible when Library is not maximized -->
<ObjectName>WaveformSplitter</ObjectName>
<Orientation>vertical</Orientation>
<SplitSizesConfigKey>[Deere],StackedWaveformSplitter</SplitSizesConfigKey>
<SplitSizesConfigKey>[Skin],stackedWaveforms_splitSize</SplitSizesConfigKey>
<SplitSizes>90,540</SplitSizes>
<Size>-1me,-1me</Size>
<Connection>
Expand All @@ -217,7 +227,7 @@

<WidgetGroup>
<Connection>
<ConfigKey>[Master],show_4decks</ConfigKey>
<ConfigKey>[Skin],show_4decks</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Layout>vertical</Layout>
Expand All @@ -238,7 +248,7 @@

<WidgetGroup>
<Connection>
<ConfigKey>[Master],show_4decks</ConfigKey>
<ConfigKey>[Skin],show_4decks</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Layout>vertical</Layout>
Expand Down
Loading