Skip to content

new Deere effects units with meta knobs #1063

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
rryan merged 22 commits into from
Feb 3, 2017
Merged

new Deere effects units with meta knobs #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
efbf0fb
initial commit of new effects racks for Deere with meta knobs
Be-ing Dec 5, 2016
9a49dc9
Deere effects UI refinement
Be-ing Dec 5, 2016
9e3be5a
Deere: add superknob link inversion buttons for expanded effects units
Be-ing Dec 5, 2016
31e99d2
Deere: increase font size of effect group enable buttons
Be-ing Dec 5, 2016
d46cf09
add tooltip for new meta/superknob link inversion button
Be-ing Dec 5, 2016
55c55b1
Deere: label meta knobs
Be-ing Dec 5, 2016
7420500
Deere: implement new effect interface
Be-ing Dec 23, 2016
435279a
Deere: change effect highlight border to grayish
Be-ing Dec 24, 2016
fd749f1
Deere: make effect focus button right clickable only when focused
Be-ing Dec 24, 2016
cfdf4c4
Deere: revert last commit that made effects flicker when shifting focus
Be-ing Dec 24, 2016
54c3d51
Deere: effects layout adjustments
Be-ing Dec 30, 2016
404e393
Deere: more padding for highlighted effects
Be-ing Jan 8, 2017
78cff2e
Deere: remove effect chain enable button
Be-ing Jan 8, 2017
7bec54b
Deere: change color of effect highlight border to blue
Be-ing Jan 28, 2017
791e8a5
Deere: make effect focus button a circle
Be-ing Jan 28, 2017
1c0e291
Deere: use WEffectSelector
Be-ing Jan 28, 2017
6ec2023
Deere: style WEffectSelector
Be-ing Jan 28, 2017
e4e3a2b
Deere: WEffectSelector styling fixes
Be-ing Feb 1, 2017
06212d0
Deere: fix effect unit spacing with show_focus = 1
Be-ing Feb 1, 2017
a3c1d80
Deere: fix WEffectSelector white lines on Mac OS X
Be-ing Feb 2, 2017
aad246b
Deere: fix down arrow shifting position on hover
Be-ing Feb 2, 2017
f5be316
Deere: fix text getting cut off on Mac
Be-ing Feb 2, 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
4 changes: 2 additions & 2 deletions res/skins/Deere/effect_button_parameter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Layout>vertical</Layout>
<Children>
<EffectPushButton>
<Size>40f,15f</Size>
<Size>55f,15f</Size>
<ObjectName>EffectButton</ObjectName>
<TooltipId>EffectSlot_button_parameter</TooltipId>
<EffectRack><Variable name="EffectRack"/></EffectRack>
Expand All @@ -40,7 +40,7 @@
</EffectPushButton>

<EffectButtonParameterName>
<Size>40f,15f</Size>
<Size>55f,15f</Size>
<ObjectName>EffectButtonLabel</ObjectName>
<EffectRack><Variable name="EffectRack"/></EffectRack>
<EffectUnit><Variable name="EffectUnit"/></EffectUnit>
Expand Down
34 changes: 34 additions & 0 deletions res/skins/Deere/effect_buttons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!DOCTYPE template>
<!--
Buttons for a single effect

Variables:
EffectRack: the rack
EffectUnit: the chain
Effect: the effect
-->
<Template>
<WidgetGroup>
<ObjectName>EffectButtonControls</ObjectName>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:effect_focus_button.xml"/>

<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
<SetVariable name="ObjectName"></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_power_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_power_48px.svg</SetVariable>
<SetVariable name="state_1_text"></SetVariable>
<SetVariable name="state_1_pressed">icon/ic_power_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_power_48px.svg</SetVariable>
<SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],enabled</SetVariable>
</Template>

</Children>
</WidgetGroup>
</Template>
562 changes: 0 additions & 562 deletions res/skins/Deere/effect_chain.xml
View file
Open in desktop

This file was deleted.

273 changes: 0 additions & 273 deletions res/skins/Deere/effect_chain_simple.xml
View file
Open in desktop

This file was deleted.

55 changes: 55 additions & 0 deletions res/skins/Deere/effect_focus_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<!--
Effect focus button

Variables:
EffectRack: the rack
EffectUnit: the chain
Effect: the effect
-->
<Template>
<WidgetGroup>
<ObjectName>EffectFocusButtonContainer</ObjectName>
<Layout>horizontal</Layout>
<Children>
<PushButton>
<TooltipId><Variable name="button_TooltipId"/></TooltipId>
<ObjectName>CircleButton</ObjectName>
<Size>15f,15f</Size>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
</State>
<Connection>
<ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
<ButtonState>LeftButton</ButtonState>
<EmitOnPressAndRelease>false</EmitOnPressAndRelease>
<Transform>
<IsEqual><Variable name="Effect"/></IsEqual>
</Transform>
</Connection>
<Connection>
<ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
<ButtonState>RightButton</ButtonState>
<EmitOnPressAndRelease>false</EmitOnPressAndRelease>
<Transform>
<IsEqual><Variable name="Effect"/></IsEqual>
<Not/>
</Transform>
</Connection>
</PushButton>
</Children>
<Connection>
<ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_focus</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Template>
Loading