Skip to content

Commit

Permalink
Merge pull request #13 from ronso0/deere_2.1_update_MicAux
Browse files Browse the repository at this point in the history 
improve Mic/Aux rack, equalize layout spacing
  • Loading branch information
@Be-ing
Be-ing authored Oct 26, 2017
2 parents 3ec4652 + baa8d8b commit 15dc432
Showing 9 changed files with 364 additions and 358 deletions.
50 changes: 29 additions & 21 deletions res/skins/Deere/auxiliary.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
95 changes: 41 additions & 54 deletions res/skins/Deere/effect_rack.xml
View file
Original file line number Diff line number Diff line change
@@ -14,74 +14,61 @@ Container for all the effect units
minimum size of the current stack widget. -->
<SizePolicy>me,f</SizePolicy>
<Children>
<WidgetStack>
<WidgetGroup>
<ObjectName>EffectRackContainer</ObjectName>
<SizePolicy>me,min</SizePolicy>
<Layout>vertical</Layout>
<Children>

<!-- Use another WidgetGroup wrapper so the WidgetStack does not interfere with showing
the second row. -->
<WidgetGroup>
<Layout>vertical</Layout>
<ObjectName>EffectUnitsRow</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<Children>
<Template src="skin:effect_unit.xml">
<SetVariable name="EffectRack">1</SetVariable>
<SetVariable name="EffectUnit">1</SetVariable>
</Template>

<WidgetGroup>
<ObjectName>EffectUnitsRow1</ObjectName>
<Layout>horizontal</Layout>
<MinimumSize>-1,50</MinimumSize>
<MaximumSize>-1,195</MaximumSize>
<SizePolicy>me,me</SizePolicy>
<Children>
<Template src="skin:effect_unit.xml">
<SetVariable name="EffectRack">1</SetVariable>
<SetVariable name="EffectUnit">1</SetVariable>
</Template>
<Template src="skin:spacer_hx.xml">
<SetVariable name="width">4</SetVariable>
<SetVariable name="color">22</SetVariable>
</Template>

<Template src="skin:spacer_hx.xml">
<SetVariable name="width">4</SetVariable>
<SetVariable name="color">22</SetVariable>
</Template>

<Template src="skin:effect_unit.xml">
<SetVariable name="EffectRack">1</SetVariable>
<SetVariable name="EffectUnit">2</SetVariable>
</Template>
</Children>
</WidgetGroup>

<WidgetGroup>
<ObjectName>EffectUnitsRow2</ObjectName>
<Layout>horizontal</Layout>
<MinimumSize>-1,50</MinimumSize>
<MaximumSize>-1,195</MaximumSize>
<SizePolicy>me,me</SizePolicy>
<Children>
<Template src="skin:effect_unit.xml">
<SetVariable name="EffectRack">1</SetVariable>
<SetVariable name="EffectUnit">3</SetVariable>
</Template>
<Template src="skin:effect_unit.xml">
<SetVariable name="EffectRack">1</SetVariable>
<SetVariable name="EffectUnit">2</SetVariable>
</Template>
</Children>
</WidgetGroup>

<Template src="skin:spacer_hx.xml">
<SetVariable name="width">4</SetVariable>
<SetVariable name="color">22</SetVariable>
</Template>
<WidgetGroup>
<ObjectName>EffectUnitsRow</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<Children>
<Template src="skin:effect_unit.xml">
<SetVariable name="EffectRack">1</SetVariable>
<SetVariable name="EffectUnit">3</SetVariable>
</Template>

<Template src="skin:effect_unit.xml">
<SetVariable name="EffectRack">1</SetVariable>
<SetVariable name="EffectUnit">4</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey>[Master],show_4effectunits</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<Template src="skin:spacer_hx.xml">
<SetVariable name="width">4</SetVariable>
<SetVariable name="color">22</SetVariable>
</Template>

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

</Children>
</WidgetStack>
</WidgetGroup>
</Children>
</WidgetGroup>
</Template>
14 changes: 7 additions & 7 deletions res/skins/Deere/effect_unit.xml
View file
Original file line number Diff line number Diff line change
@@ -12,12 +12,9 @@
<ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<MinimumSize>-1,65</MinimumSize>
<MaximumSize>-1,195</MaximumSize>
<Children>
<WidgetGroup>
<ObjectName>EffectUnitGroupControls</ObjectName>
<Size>-1,20</Size>
<SizePolicy>me,max</SizePolicy>
<Layout>horizontal</Layout>
<Children>
@@ -77,9 +74,13 @@

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>
<Template src="skin:effect_unit_no_parameters.xml">
</Template>
<Template src="skin:effect_unit_no_parameters.xml"/>
<WidgetGroup>
<ObjectName>EffectUnitFiller</ObjectName>
<SizePolicy>me,me</SizePolicy>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
@@ -93,8 +94,7 @@
<WidgetGroup>
<Layout>vertical</Layout>
<Children>
<Template src="skin:effect_unit_with_parameters.xml">
</Template>
<Template src="skin:effect_unit_with_parameters.xml"/>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
24 changes: 0 additions & 24 deletions res/skins/Deere/effect_unit_group_control_button.xml
View file

This file was deleted.

Loading

0 comments on commit 15dc432

Please sign in to comment.