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

Jump to bottom

Skins: add effect chain menu button to Deere, polish in Tango #12735

Merged
merged 3 commits into from
Feb 6, 2024
Merged

Skins: add effect chain menu button to Deere, polish in Tango #12735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
823a6dc
Tango: make effect chain menu button more discoverable, unsqueeze unit
ronso0 Feb 5, 2024
a6f2d39
Deere: add effect chain menu button
ronso0 Feb 5, 2024
3fd3d1b
Deere: fix icon paths & skin menu hide in Deere64
ronso0 Feb 6, 2024
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
13 changes: 12 additions & 1 deletion res/skins/Deere (64 Samplers)/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,17 @@

</Children>
</WidgetGroup>
<Template src="skins:Deere/skin_settings.xml"/>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<Connection>
<ConfigKey>[Skin],show_settings</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Children>
<Template src="skins:Deere/skin_settings.xml"/>
</Children>
</WidgetGroup>
</Children>
</skin>
99 changes: 65 additions & 34 deletions res/skins/Deere/effect_unit_controls.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,41 @@
<!-- Super/Mix knobs when parameters are hidden -->
<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<SizePolicy>min,me</SizePolicy>
<Children>

<WidgetGroup><Size>2f,0min</Size></WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<Connection>
<ConfigKey>[Skin],show_superknobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Children>
<Template src="skin:knob.xml">
<SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
<SetVariable name="control">super1</SetVariable>
<SetVariable name="color">blue_gapless</SetVariable>
</Template>

<!-- Spacer to vertically align with mix knob because of the mix mode button.-->
<WidgetGroup><Size>-1,20f</Size></WidgetGroup>
<WidgetGroup>
<Layout>vertical</Layout>
<Connection>
<ConfigKey>[Skin],show_superknobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Children>
<Template src="skin:knob.xml">
<SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
<SetVariable name="control">super1</SetVariable>
<SetVariable name="color">blue_gapless</SetVariable>
</Template>
</Children>
</WidgetGroup>

<WidgetGroup>
<ObjectName>AlignCenterCenter</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<EffectChainPresetButton>
<EffectUnit><Variable name="EffectUnit"/></EffectUnit>
<Size>22f,22f</Size>
<ObjectName>EffectChainSelector</ObjectName>
</EffectChainPresetButton>
</Children>
</WidgetGroup>
</Children>
</WidgetGroup>

Expand Down Expand Up @@ -101,21 +115,16 @@

<WidgetGroup><Size>0min,2me</Size></WidgetGroup>

<!-- Super/Mix knobs when parameters are visible -->
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<SizePolicy>me,me</SizePolicy>
<Children>

<WidgetGroup>
<Layout>vertical</Layout>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:knob.xml">
<SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
<SetVariable name="control">mix</SetVariable>
<SetVariable name="color">purple_gapless</SetVariable>
</Template>

<Template src="skin:left_2state_button.xml">
<SetVariable name="ObjectName">EffectUnitMixModeButton</SetVariable>
<SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
Expand All @@ -127,24 +136,46 @@
<SetVariable name="state_1_pressed">icon/ic_fx_mixmode_d+w.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,mix_mode</SetVariable>
</Template>

<Template src="skin:knob.xml">
<SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
<SetVariable name="control">mix</SetVariable>
<SetVariable name="color">purple_gapless</SetVariable>
</Template>
</Children>
</WidgetGroup>


<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Connection>
<ConfigKey>[Skin],show_superknobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<Children>
<WidgetGroup><Size>0min,2f</Size></WidgetGroup>
<Template src="skin:knob.xml">
<SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
<SetVariable name="control">super1</SetVariable>
<SetVariable name="color">blue_gapless</SetVariable>
</Template>
<WidgetGroup><Size>0min,2f</Size></WidgetGroup>
<WidgetGroup><Size>0me,0me</Size></WidgetGroup>
<EffectChainPresetButton>
<EffectUnit><Variable name="EffectUnit"/></EffectUnit>
<Size>24f,24f</Size>
</EffectChainPresetButton>

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

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Connection>
<ConfigKey>[Skin],show_superknobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Children>
<WidgetGroup><Size>0min,2f</Size></WidgetGroup>
<Template src="skin:knob.xml">
<SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
<SetVariable name="control">super1</SetVariable>
<SetVariable name="color">blue_gapless</SetVariable>
</Template>
<WidgetGroup><Size>0min,2f</Size></WidgetGroup>
</Children>
</WidgetGroup>

</Children>
</WidgetGroup>
</Children>
Expand Down
3 changes: 3 additions & 0 deletions res/skins/Deere/icon/ic_settings_22px.svg
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.
1 change: 1 addition & 0 deletions res/skins/Deere/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@

</Children>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
Expand Down
1 change: 0 additions & 1 deletion res/skins/Deere/skin_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
</State>
<Connection>
<ConfigKey>[Skin],show_settings</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
</Children>
Expand Down
33 changes: 27 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 @@ -167,6 +167,10 @@
qproperty-layoutAlignment: 'AlignTop | AlignHCenter';
}

#AlignCenterCenter {
qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
}

#AlignTop {
qproperty-layoutAlignment: 'AlignTop | AlignHCenter';
}
Expand Down Expand Up @@ -1211,11 +1215,26 @@ WBeatSpinBox,
}

#EffectUnitToggle[value="0"] {
image: url(skin:icon/ic_unfold_more_48px.svg) no-repeat top right;
image: url(skin:/../Deere/icon/ic_unfold_more_48px.svg) no-repeat top right;
}

#EffectUnitToggle[value="1"] {
image: url(skin:icon/ic_unfold_less_48px.svg) no-repeat top right;
image: url(skin:/../Deere/icon/ic_unfold_less_48px.svg) no-repeat top right;
}

WEffectChainPresetButton {
padding: 0px;
border: none;
border-radius: 2px;
image: url(skin:/../Deere/icon/ic_settings_22px.svg) no-repeat center center;
}
WEffectChainPresetButton::menu-indicator {
subcontrol-position: center center;
subcontrol-origin: margin;
padding: 0px;
border: 0px;
outline: none;
image: url(skin:/../Deere/icon/ic_settings_22px.svg) no-repeat center center;
}

#EffectUnitFiller {
Expand Down Expand Up @@ -1254,7 +1273,7 @@ WBeatSpinBox,
border: 1px solid #222222;
border-width: 0px 0px 0px 1px;
qproperty-layoutSpacing: 2;
padding: 0px 0px 3px 0px;
padding: 0px 0px 1px 0px;
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
background-color: #333; /*
background-color: #664971; */
Expand Down Expand Up @@ -1329,7 +1348,7 @@ WBeatSpinBox,
}

#Crossfader[highlight="1"] {
border-image: url(skin:slider-crossfader-AutoDJ.svg) 0 0 0 0 stretch stretch;
border-image: url(skin:/../Deere/slider-crossfader-AutoDJ.svg) 0 0 0 0 stretch stretch;
}

#MainControls {
Expand Down Expand Up @@ -1601,7 +1620,8 @@ WWidgetGroup {
** Buttons *******************************************************************
*******************************************************************************/

WPushButton {
WPushButton,
WEffectChainPresetButton {
color: #D2D2D2;
background-color: #4B4B4B;
border: 1px solid #4B4B4B;
Expand All @@ -1610,7 +1630,8 @@ WPushButton {
}

WPushButton:hover,
#PlayToggle:hover {
#PlayToggle:hover,
WEffectChainPresetButton:hover {
color: #D2D2D2;
background-color: #5F5F5F;
border: 1px solid #5F5F5F;
Expand Down
1 change: 0 additions & 1 deletion res/skins/Deere/tool_bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,6 @@
</State>
<Connection>
<ConfigKey>[Skin],show_settings</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
</Children>
Expand Down
5 changes: 3 additions & 2 deletions res/skins/Tango/buttons/btn_skinsettings_off.svg
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.
5 changes: 3 additions & 2 deletions res/skins/Tango/buttons/btn_skinsettings_on.svg
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.
Loading
Loading