Skip to content

Skins: minimize Fx link invert button, put it next to link button #2339

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
Be-ing merged 2 commits into from
Nov 12, 2019
Merged

Skins: minimize Fx link invert button, put it next to link button #2339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1119d1f
Skins: minimize Fx link invert button, put it next to link button
ronso0 Nov 4, 2019
19bdc46
LateNight: increase Fx link invert / Fx link button spacing
ronso0 Nov 6, 2019
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
0 res/skins/Deere/effect_button_parameter.xml → res/skins/Deere/effect_parameter_button.xml
View file
Open in desktop
File renamed without changes.
53 changes: 16 additions & 37 deletions res/skins/Deere/effect_parameter_knob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Template>
<WidgetGroup>
<Layout>vertical</Layout>
<MinimumSize>34,42</MinimumSize>
<MinimumSize>34,</MinimumSize>
<MaximumSize>58,42</MaximumSize>
<SizePolicy>me,f</SizePolicy>
<Children>
Expand Down Expand Up @@ -45,51 +45,30 @@
<Elide>right</Elide>
</EffectParameterName>

<Template src="skin:left_5state_button.xml">
<!-- Button has no text/images, qss only -->
<SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
<SetVariable name="ObjectName">EffectSlotParameterLinkTypeButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SmallHorizontalStretchLinkButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SmallHorizontalStretchLinkButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SmallHorizontalStretchLinkButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text"></SetVariable>
<SetVariable name="state_0_pressed"></SetVariable>
<SetVariable name="state_0_unpressed"></SetVariable>
<SetVariable name="state_1_text"></SetVariable>
<SetVariable name="state_1_pressed"></SetVariable>
<SetVariable name="state_1_unpressed"></SetVariable>
<SetVariable name="state_2_text"></SetVariable>
<SetVariable name="state_2_pressed"></SetVariable>
<SetVariable name="state_2_unpressed"></SetVariable>
<SetVariable name="state_3_text"></SetVariable>
<SetVariable name="state_3_pressed"></SetVariable>
<SetVariable name="state_3_unpressed"></SetVariable>
<SetVariable name="state_4_text"></SetVariable>
<SetVariable name="state_4_pressed"></SetVariable>
<SetVariable name="state_4_unpressed"></SetVariable>
<SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/>_link_type</SetVariable>
</Template>

<WidgetGroup>
<ObjectName>EffectSlotParameterLinkInversionButtonContainer</ObjectName>
<Layout>vertical</Layout>
<ObjectName>EffectSlotParameterLinkButtonsContainer</ObjectName>
<Layout>horizontal</Layout>
<Size>-1,6f</Size>
<Children>
<Template src="skin:left_2state_button.xml">
<!-- Button has no text/images, qss only -->
<SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
<SetVariable name="ObjectName">EffectSlotParameterLinkInversionButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SmallHorizontalStretchLinkButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SmallHorizontalStretchLinkButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SmallHorizontalStretchLinkButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text"></SetVariable>
<SetVariable name="state_0_pressed"></SetVariable>
<SetVariable name="state_0_unpressed"></SetVariable>
<SetVariable name="state_1_text"></SetVariable>
<SetVariable name="state_1_pressed"></SetVariable>
<SetVariable name="state_1_unpressed"></SetVariable>
<SetVariable name="MinimumSize">6,4</SetVariable>
<SetVariable name="MaximumSize">10,4</SetVariable>
<SetVariable name="SizePolicy">me,f</SetVariable>
<SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/>_link_inverse</SetVariable>
</Template>

<Template src="skin:left_5state_button.xml">
<!-- Button has no text/images, qss only -->
<SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
<SetVariable name="ObjectName">EffectSlotParameterLinkTypeButton</SetVariable>
<SetVariable name="MinimumSize">30,4</SetVariable>
<SetVariable name="MaximumSize">46,4</SetVariable>
<SetVariable name="SizePolicy">me,f</SetVariable>
<SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/>_link_type</SetVariable>
</Template>
</Children>
</WidgetGroup>

Expand Down
16 changes: 8 additions & 8 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 @@ -73,28 +73,28 @@ Variables:
<SetVariable name="EffectParameter">8</SetVariable>
</Template>

<Template src="skin:effect_button_parameter.xml">
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="EffectButtonParameter">1</SetVariable>
</Template>
<Template src="skin:effect_button_parameter.xml">
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="EffectButtonParameter">2</SetVariable>
</Template>
<Template src="skin:effect_button_parameter.xml">
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="EffectButtonParameter">3</SetVariable>
</Template>
<Template src="skin:effect_button_parameter.xml">
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="EffectButtonParameter">4</SetVariable>
</Template>
<Template src="skin:effect_button_parameter.xml">
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="EffectButtonParameter">5</SetVariable>
</Template>
<Template src="skin:effect_button_parameter.xml">
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="EffectButtonParameter">6</SetVariable>
</Template>
<Template src="skin:effect_button_parameter.xml">
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="EffectButtonParameter">7</SetVariable>
</Template>
<Template src="skin:effect_button_parameter.xml">
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="EffectButtonParameter">8</SetVariable>
</Template>
</Children>
Expand Down
11 changes: 5 additions & 6 deletions res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,8 +1812,11 @@ do not highlight either state. */
standard button definitions.
Note: EQ Gain effects cannot be used in split mode (= can be 0 or 1 only)
*/
#EffectSlotParameterLinkTypeButton {
margin: 0 4px 0 4px;
#EffectSlotParameterLinkButtonsContainer {
margin: 1px 4px;
qproperty-layoutSpacing: 1;
border-radius: 2px;
background-color: #282828;
}

#EffectSlotParameterLinkTypeButton[value="2"] {
Expand Down Expand Up @@ -1896,10 +1899,6 @@ do not highlight either state. */
border: 0px solid #0080BE;
}

#EffectSlotParameterLinkInversionButton {
margin: 0px 4px 0px 4px;
}

#EffectSlotParameterLinkInversionButton[value="1"] {
background-color: #b90505;
}
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/fx_parameter_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<WidgetGroup>
<ObjectName>FxButton</ObjectName>
<Layout>horizontal</Layout>
<Size>40me,25f</Size>
<Size>40me,18f</Size>
<Children>
<Template src="skin:fx_button.xml">
<SetVariable name="icon">fx_parameter</SetVariable>
Expand Down
41 changes: 25 additions & 16 deletions res/skins/LateNight/fx_parameter_knob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<WidgetGroup>
<ObjectName>FxKnobContainer</ObjectName>
<Layout>vertical</Layout>
<MinimumSize>55,35</MinimumSize>
<MinimumSize>40,35</MinimumSize>
<MaximumSize>60,</MaximumSize>
<SizePolicy>me,me</SizePolicy>
<Children>
Expand Down Expand Up @@ -61,23 +61,32 @@

<WidgetGroup><Size>1min,1f</Size></WidgetGroup>

<!-- Meta knob link button -->
<Template src="skin:button_5state.xml">
<SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
<SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
<SetVariable name="Size">55me,5f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_type</SetVariable>
</Template>
<WidgetGroup>
<ObjectName>AlignHCenter</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<WidgetGroup><Size>0min,0min</Size></WidgetGroup>
<!-- Meta knob link invert button -->
<Template src="skin:button_2state.xml">
<SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
<SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
<SetVariable name="Size">9f,5f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
</Template>

<WidgetGroup><Size>1min,1f</Size></WidgetGroup>
<!-- Meta knob link button -->
<Template src="skin:button_5state.xml">
<SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
<SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
<SetVariable name="Size">33,5f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_type</SetVariable>
</Template>
<WidgetGroup><Size>0min,0min</Size></WidgetGroup>
</Children>
</WidgetGroup>

<!-- Meta knob link invert button -->
<Template src="skin:button_2state.xml">
<SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
<SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
<SetVariable name="Size">55me,7f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
</Template>
<WidgetGroup><Size>1min,2f</Size></WidgetGroup>

</Children>
<Connection>
Expand Down
25 changes: 12 additions & 13 deletions res/skins/LateNight/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,7 +1465,6 @@ WBeatSpinBox,

#FxButton {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
padding-top: 4px;
}

#FxUnitKnob {
Expand Down Expand Up @@ -1550,10 +1549,10 @@ WEffectSelector {
border-radius: 1px;
}
#FxSuperLinkButton {
margin: 0px 5px 0px 5px;
}
margin: 0px 2px 0px 2px;
}
#FxSuperLinkInvertButton {
margin: 0px 5px 2px 5px;
margin: 0px;
}

#FxSuperLinkButton[value="0"],
Expand All @@ -1572,16 +1571,16 @@ WEffectSelector {
}

#FxSuperLinkButton[value="1"] {
background-color: #A5A5A5;
background-color: #5b9601;
}
#FxSuperLinkButton[value="1"]:hover {
background-color: #CDCDCD;
}
#FxSuperLinkButton[value="2"] { /*
a simple way to achieve a partitioning in thirds */
background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
stop: 0 #A5A5A5,
stop: 0.33 #A5A5A5,
stop: 0 #5b9601,
stop: 0.33 #5b9601,
stop: 0.34 #4b4b4b,
stop: 1 #4b4b4b);
}
Expand All @@ -1596,8 +1595,8 @@ WEffectSelector {
background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
stop: 0 #4b4b4b,
stop: 0.66 #4b4b4b,
stop: 0.67 #A5A5A5,
stop: 1 #A5A5A5);
stop: 0.67 #5b9601,
stop: 1 #5b9601);
}
#FxSuperLinkButton[value="3"]:hover {
background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
Expand All @@ -1608,12 +1607,12 @@ WEffectSelector {
}
#FxSuperLinkButton[value="4"] {
background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
stop: 0 #A5A5A5,
stop: 0.330000 #A5A5A5,
stop: 0 #5b9601,
stop: 0.330000 #5b9601,
stop: 0.340000 #4b4b4b,
stop: 0.660000 #4b4b4b,
stop: 0.670000 #A5A5A5,
stop: 1 #A5A5A5);
stop: 0.670000 #5b9601,
stop: 1 #5b9601);
}
#FxSuperLinkButton[value="4"]:hover {
background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
Expand Down
Binary file added res/skins/Shade/btn_link_type/btn_link_inversion_off.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/Shade/btn_link_type/btn_link_inversion_on.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/skins/Shade/btn_link_type/btn_link_type_inverted.png
View file
Open in desktop
Binary file not shown.
Binary file modified res/skins/Shade/btn_link_type/btn_link_type_left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/skins/Shade/btn_link_type/btn_link_type_left_right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/skins/Shade/btn_link_type/btn_link_type_linked.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/skins/Shade/btn_link_type/btn_link_type_none.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/skins/Shade/btn_link_type/btn_link_type_right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
109 changes: 58 additions & 51 deletions res/skins/Shade/effect_parameter_knob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,58 +49,65 @@
</EffectParameterKnob>
</Children>
</WidgetGroup>
<PushButton>
<TooltipId>EffectSlot_parameter_link_type</TooltipId>
<NumberStates>5</NumberStates>
<State>
<Number>0</Number>
<Pressed>skin:/btn/btn_link_type/btn_link_type_none.png</Pressed>
<Unpressed>skin:/btn/btn_link_type/btn_link_type_none.png</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>skin:/btn/btn_link_type/btn_link_type_linked.png</Pressed>
<Unpressed>skin:/btn/btn_link_type/btn_link_type_linked.png</Unpressed>
</State>
<State>
<Number>2</Number>
<Pressed>skin:/btn/btn_link_type/btn_link_type_left.png</Pressed>
<Unpressed>skin:/btn/btn_link_type/btn_link_type_left.png</Unpressed>
</State>
<State>
<Number>3</Number>
<Pressed>skin:/btn/btn_link_type/btn_link_type_right.png</Pressed>
<Unpressed>skin:/btn/btn_link_type/btn_link_type_right.png</Unpressed>
</State>
<State>
<Number>4</Number>
<Pressed>skin:/btn/btn_link_type/btn_link_type_left_right.png</Pressed>
<Unpressed>skin:/btn/btn_link_type/btn_link_type_left_right.png</Unpressed>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_link_type</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>

<PushButton>
<TooltipId>EffectSlot_parameter_inversion</TooltipId>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Pressed>skin:/btn/btn_link_type/btn_link_type_none.png</Pressed>
<Unpressed>skin:/btn/btn_link_type/btn_link_type_none.png</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>skin:/btn/btn_link_type/btn_link_type_inverted.png</Pressed>
<Unpressed>skin:/btn/btn_link_type/btn_link_type_inverted.png</Unpressed>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_link_inverse</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup><Size>0min,0min</Size></WidgetGroup>
<PushButton>
<TooltipId>EffectSlot_parameter_inversion</TooltipId>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Pressed>skin:/btn_link_type/btn_link_inversion_off.png</Pressed>
<Unpressed>skin:/btn_link_type/btn_link_inversion_off.png</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>skin:/btn_link_type/btn_link_inversion_on.png</Pressed>
<Unpressed>skin:/btn_link_type/btn_link_inversion_on.png</Unpressed>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_link_inverse</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
<PushButton>
<TooltipId>EffectSlot_parameter_link_type</TooltipId>
<NumberStates>5</NumberStates>
<State>
<Number>0</Number>
<Pressed>skin:/btn_link_type/btn_link_type_none.png</Pressed>
<Unpressed>skin:/btn_link_type/btn_link_type_none.png</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>skin:/btn_link_type/btn_link_type_linked.png</Pressed>
<Unpressed>skin:/btn_link_type/btn_link_type_linked.png</Unpressed>
</State>
<State>
<Number>2</Number>
<Pressed>skin:/btn_link_type/btn_link_type_left.png</Pressed>
<Unpressed>skin:/btn_link_type/btn_link_type_left.png</Unpressed>
</State>
<State>
<Number>3</Number>
<Pressed>skin:/btn_link_type/btn_link_type_right.png</Pressed>
<Unpressed>skin:/btn_link_type/btn_link_type_right.png</Unpressed>
</State>
<State>
<Number>4</Number>
<Pressed>skin:/btn_link_type/btn_link_type_left_right.png</Pressed>
<Unpressed>skin:/btn_link_type/btn_link_type_left_right.png</Unpressed>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_link_type</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
<WidgetGroup><Size>0min,0min</Size></WidgetGroup>
</Children>
</WidgetGroup>
</Children>
</WidgetGroup>

Expand Down
Loading