Skip to content

Commit

Permalink
Merge remote-tracking branch 'mixxx/2.3' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@ronso0
ronso0 committed Feb 19, 2021
2 parents f37de0e + 2b0db2a commit 5cb823e
Show file tree
Hide file tree
Showing 31 changed files with 931 additions and 907 deletions.
1 change: 1 addition & 0 deletions res/skins/Deere (64 Samplers)/skin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<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>
<attribute persist="true" config_key="[Skin],large_vu">0</attribute>
<!-- Effects -->
<attribute persist="true" config_key="[EffectRack1],show">1</attribute>
<attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere/library.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

<Library>
<ShowButtonText>false</ShowButtonText>
<TrackTableBackgroundColorOpacity>0.125</TrackTableBackgroundColorOpacity>
<TrackTableBackgroundColorOpacity>0.175</TrackTableBackgroundColorOpacity>
</Library>

</Children>
Expand Down
9 changes: 8 additions & 1 deletion res/skins/Deere/mixer_column_master_vu_2decks.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@
<Children>

<!-- 2 Decks: Spacer sized like channel Gain knob -->
<WidgetGroup><Size>0min,28f</Size></WidgetGroup>
<WidgetGroup>
<Size>0min,28f</Size>
<Connection>
<ConfigKey>[Skin],large_vu</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup>
<Layout>horizontal</Layout>
Expand Down
188 changes: 111 additions & 77 deletions res/skins/Deere/mixer_column_master_vu_4decks.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,86 +8,61 @@
<Template src="skin:vumeter_master.xml"/>
</Children>
</SingletonDefinition>

<WidgetGroup>
<ObjectName>MixerStrip_4Decks</ObjectName>
<Layout>vertical</Layout>
<Children>

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

<!-- Gain knob spacer -->
<WidgetGroup><Size>0me,34f</Size></WidgetGroup>

<!-- EQ knobs spacer -->
<WidgetGroup>
<ObjectName>MixerStrip_4Decks_large</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,max</SizePolicy>
<Connection>
<ConfigKey>[Skin],large_vu</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Children>
<!-- 3 EQ knobs, 34px each -->
<WidgetGroup><Size>0min,102f</Size></WidgetGroup>
<!-- QuickEffect knob, 34px optional -->
<WidgetGroup><Size>0me,0min</Size></WidgetGroup>
<WidgetGroup>
<Size>0min,34f</Size>
<Connection>
<ConfigKey>[QuickEffectRack1_[Channel1]_Effect1],loaded</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,300</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>StereoVUMeterMaster</ObjectName>
</SingletonContainer>
</Children>
</WidgetGroup>
<WidgetGroup><Size>0me,25f</Size></WidgetGroup>
</Children>
<Connection>
<ConfigKey>[Skin],show_eq_knobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<!-- Same size as deck VU meters -->
<WidgetGroup>
<ObjectName>MixerStrip_4Decks_small</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<Connection>
<ConfigKey>[Skin],large_vu</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
<Children>

<!-- Pfl button -->
<WidgetGroup><Size>0me,25f</Size></WidgetGroup>
<Template src="skin:mixer_spacer_topbottom.xml" />

<!-- EQs -->
<!-- Gain knob spacer -->
<WidgetGroup><Size>0me,34f</Size></WidgetGroup>

<!-- EQ knobs spacer -->
<WidgetGroup>
<GroupName>VolFader_VUMeter_4Decks</GroupName>
<Layout>horizontal</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,-1</MaximumSize>
<Layout>vertical</Layout>
<SizePolicy>me,max</SizePolicy>
<Children>
<!-- Faders
Vol fader next to mono VU meter
when EQs are shown -->
<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,180</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>StereoVUMeterMaster</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Skin],show_faders</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<!-- no Faders
stereo VU meter -->
<!-- 3 EQ knobs, 34px each -->
<WidgetGroup><Size>0min,102f</Size></WidgetGroup>
<!-- QuickEffect knob, 34px optional -->
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,210</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>StereoVUMeterMaster</ObjectName>
</SingletonContainer>
</Children>
<Size>0min,34f</Size>
<Connection>
<ConfigKey>[Skin],show_faders</ConfigKey>
<Transform><Not/></Transform>
<ConfigKey>[QuickEffectRack1_[Channel1]_Effect1],loaded</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
Expand All @@ -98,46 +73,105 @@
</Connection>
</WidgetGroup>

<!-- no EQs -->
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<Children>

<!-- Pfl button -->
<WidgetGroup><Size>0me,25f</Size></WidgetGroup>

<!-- EQs -->
<WidgetGroup>
<Layout>vertical</Layout>
<GroupName>VolFader_VUMeter_4Decks</GroupName>
<Layout>horizontal</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,210</MaximumSize>
<MaximumSize>60,-1</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>StereoVUMeterMaster</ObjectName>
</SingletonContainer>
<!-- Faders
Vol fader next to mono VU meter
when EQs are shown -->
<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,180</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>StereoVUMeterMaster</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Skin],show_faders</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<!-- no Faders
stereo VU meter -->
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,210</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>StereoVUMeterMaster</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Skin],show_faders</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey>[Skin],show_eq_knobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>


<!-- no EQs -->
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,180</MaximumSize>
<Children>
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,180</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>StereoVUMeterMaster</ObjectName>
</SingletonContainer>
</Children>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,180</MaximumSize>
<Connection>
<ConfigKey>[Skin],show_faders</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey>[Skin],show_faders</ConfigKey>
<ConfigKey>[Skin],show_eq_knobs</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><Size>0me,25f</Size></WidgetGroup>

</Children>
<Connection>
<ConfigKey>[Skin],show_eq_knobs</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><Size>0me,25f</Size></WidgetGroup>
<Template src="skin:mixer_spacer_topbottom.xml" />

</Children>
</WidgetGroup>

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

</Children>
</WidgetGroup>
</Template>
18 changes: 9 additions & 9 deletions res/skins/Deere/mixer_controls_4decks_left.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<!--
Description:
A 4-deck mixer channel strip.
Structure:
⎡ Spacer that centers the level meter
| vertically when neither EQs
⎣ nor Vol fader are shown
[ Gain knob]
[ EQs + QuickEffect, optional ]
[ Pfl button ]
⎡ with EQs ⎤
| ⎡ with faders:
| | mono + Vol
Expand All @@ -36,7 +36,7 @@
⎡ Spacer that centers the level meter
| vertically when neither EQs
⎣ nor Vol fader are shown
-->
<Template>
<SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
Expand Down Expand Up @@ -141,7 +141,7 @@
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,-1</MaximumSize>
<Children>
<!-- Faders
<!-- Faders
Vol fader next to mono VU meter
when EQs are shown -->
<WidgetGroup>
Expand Down Expand Up @@ -180,12 +180,12 @@
</Connection>
</WidgetGroup>

<!-- no Faders
<!-- no Faders
stereo VU meter -->
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>60,210</MaximumSize>
<MaximumSize>60,180</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>StereoVUMeter<Variable name="i"/></ObjectName>
Expand Down Expand Up @@ -220,7 +220,7 @@
</SingletonContainer>
</Children>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
Expand Down
Loading

0 comments on commit 5cb823e

Please sign in to comment.