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

Deere :: compact FX units #1909

Merged
merged 11 commits into from
Dec 26, 2018
Merged

Deere :: compact FX units #1909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4821f0a
Deere: make FX units more compact
ronso0 Nov 15, 2018
1a91fc7
Deere: fix FX controls layout, move expand toggle to the right
ronso0 Nov 20, 2018
58516b2
Deere: remove Master FX buttons from FX unit
ronso0 Nov 22, 2018
d5dc074
merge FX unit controls, prevent horizontal stretching if opposing uni…
ronso0 Nov 23, 2018
c98c1e1
add master FX buttons to top bar, reorder mixer knobs
ronso0 Nov 22, 2018
c04285b
let parameter row expand if Super knob is visible
ronso0 Nov 23, 2018
5f9e245
fix Master FX button labels
ronso0 Nov 23, 2018
5429786
Merge branch 'master' into deere-compact-fx
ronso0 Nov 24, 2018
7ccbb49
merge FX label & expand toggle
ronso0 Nov 24, 2018
2f85851
move Library & samplers expand toggle to the right, fix TreeView marg…
ronso0 Nov 26, 2018
f555f6e
keep FX units' height when showing focus buttons
ronso0 Nov 27, 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
18 changes: 8 additions & 10 deletions res/skins/Deere/effect_single_no_parameters.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,30 @@ Variables:
<WidgetGroup>
<ObjectName>FocusableEffect</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>max,max</SizePolicy>
<SizePolicy>me,max</SizePolicy>
<Children>

<WidgetGroup>
<ObjectName>EffectHighlightable</ObjectName>
<Layout>vertical</Layout>
<Size>-1max,70f</Size>
<Size>-1max,65f</Size>
<Children>

<WidgetGroup>
<Layout>horizontal</Layout>
<Children>

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

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

</Children>
</WidgetGroup>

<EffectSelector>
<EffectRack><Variable name="EffectRack"/></EffectRack>
<EffectUnit><Variable name="EffectUnit"/></EffectUnit>
<Effect><Variable name="Effect"/></Effect>
<Size>120f,-1</Size>
<MinimumSize>90,20</MinimumSize>
<MaximumSize>120,-1</MaximumSize>
<SizePolicy>me,min</SizePolicy>
</EffectSelector>

</Children>
Expand Down Expand Up @@ -70,19 +69,18 @@ Variables:
<WidgetGroup>
<Layout>horizontal</Layout>
<Children>

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

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

</Children>
</WidgetGroup>

<EffectSelector>
<EffectRack><Variable name="EffectRack"/></EffectRack>
<EffectUnit><Variable name="EffectUnit"/></EffectUnit>
<Effect><Variable name="Effect"/></Effect>
<Size>120f,-1</Size>
<MinimumSize>90,20</MinimumSize>
<MaximumSize>120,-1</MaximumSize>
<SizePolicy>me,min</SizePolicy>
</EffectSelector>

</Children>
Expand Down
31 changes: 5 additions & 26 deletions res/skins/Deere/effect_single_with_parameters_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,20 @@ Variables:
<WidgetGroup>
<ObjectName>EffectUnitControlRow</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,min</SizePolicy>
<SizePolicy>me,me</SizePolicy>
<Children>
<WidgetGroup>
<ObjectName>EffectUnitParameters</ObjectName>
<SizePolicy>me,max</SizePolicy>
<SizePolicy>me,min</SizePolicy>
<Layout>horizontal</Layout>
<Children>

<WidgetGroup>
<ObjectName>EffectSingleControls</ObjectName>
<ObjectName>EffectButtonContainer</ObjectName>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup>
<ObjectName>EffectButtonContainer</ObjectName>
<Layout>horizontal</Layout>
<Children>

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

<WidgetGroup>
<Layout>vertical</Layout>
<Children>
<Template src="skin:effect_meta_knob.xml"/>

<Label>
<Size>40f,11f</Size>
<ObjectName>KnobLabel</ObjectName>
<Text>Meta</Text>
</Label>
</Children>
</WidgetGroup>

</Children>
</WidgetGroup>

<Template src="skin:effect_buttons.xml"/>
<Template src="skin:effect_meta_knob.xml"/>
</Children>
</WidgetGroup>

Expand Down
82 changes: 12 additions & 70 deletions res/skins/Deere/effect_unit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,97 +11,39 @@
<WidgetGroup>
<ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Size>502min,me</Size>
<Children>
<WidgetGroup>
<ObjectName>EffectUnitGroupControls</ObjectName>
<SizePolicy>me,max</SizePolicy>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup>
<ObjectName>EffectUnitGroupControlsLeft</ObjectName>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:hide_show_button.xml">
<SetVariable name="object_name">EffectUnitToggle</SetVariable>
<SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
<SetVariable name="control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_parameters</SetVariable>
</Template>
</Children>
</WidgetGroup>

<Template src="skin:spacer_h.xml"/>
<Label>
<ObjectName>EffectUnitLabel</ObjectName>
<Text>FX<Variable name="EffectUnit"/></Text>
</Label>
<Template src="skin:spacer_h.xml"/>

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

<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">EffectUnit_headphones_enabled</SetVariable>
<SetVariable name="ObjectName">FxAssignmentButton</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_headphones_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</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">[EffectRack1_EffectUnit<Variable name="EffectUnit"/>],group_[Headphone]_enable</SetVariable>
</Template>

<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">EffectUnit_master_enabled</SetVariable>
<SetVariable name="ObjectName">FxAssignmentButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SmallWideButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SmallWideButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SmallWideButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text">Master</SetVariable>
<SetVariable name="state_1_text">Master</SetVariable>
<SetVariable name="left_connection_control">[EffectRack1_EffectUnit<Variable name="EffectUnit"/>],group_[Master]_enable</SetVariable>
</Template>

</Children>
</WidgetGroup>

</Children>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
<SizePolicy>min,max</SizePolicy>
<Children>
<Template src="skin:effect_unit_no_parameters.xml"/>
<WidgetGroup>
<ObjectName>EffectUnitFiller</ObjectName>
<SizePolicy>me,me</SizePolicy>
</WidgetGroup>
<Template src="skin:effect_unit_controls.xml"/>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
</Transform>
<Transform><Not/></Transform>
</Connection>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:effect_unit_with_parameters.xml"/>
<Template src="skin:effect_unit_controls.xml"/>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup>
<ObjectName>EffectUnitFiller</ObjectName>
<SizePolicy>min,me</SizePolicy>
</WidgetGroup>
</Children>
</WidgetGroup>
</Template>
Loading