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

Skins: polish fx chain controls #12805

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Skins: polish fx chain controls #12805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 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 @@ -113,7 +113,7 @@
</Connection>
</PushButton>

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

<!-- Super/Mix knobs when parameters are visible -->
<WidgetGroup>
Expand All @@ -123,7 +123,7 @@

<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<SizePolicy>min,max</SizePolicy>
<Children>
<Template src="skin:left_2state_button.xml">
<SetVariable name="ObjectName">EffectUnitMixModeButton</SetVariable>
Expand All @@ -145,10 +145,11 @@
</Children>
</WidgetGroup>

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

<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<Size>0me,34f</Size>
<Children>
<WidgetGroup><Size>0me,0me</Size></WidgetGroup>
<EffectChainPresetButton>
Expand Down Expand Up @@ -178,6 +179,7 @@

</Children>
</WidgetGroup>

</Children>
<Connection>
<ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/fx/unit_parameters_visible.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<ObjectName>FxUnit<Variable name="FxUnit"/>_MixmodePfl</ObjectName>
</SingletonContainer>

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

<SingletonContainer>
<ObjectName>FxUnit<Variable name="FxUnit"/>_PresetButton</ObjectName>
Expand Down
5 changes: 4 additions & 1 deletion res/skins/Tango/buttons/btn_fx_mixmode_d+w.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: 4 additions & 1 deletion res/skins/Tango/buttons/btn_fx_mixmode_d-w.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.
51 changes: 28 additions & 23 deletions res/skins/Tango/fx/unit_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ Variables:
<WidgetGroup>
<ObjectName>FxUnitMixerLeft</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<SizePolicy>max,me</SizePolicy>
<Children>
<WidgetGroup>
<Layout>horizontal</Layout>
Expand All @@ -221,7 +221,7 @@ Variables:
<Template src="skins:Tango/controls/button_2state_persist.xml">
<SetVariable name="ObjectName">MixModeButton</SetVariable>
<SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
<SetVariable name="Size">30f,18f</SetVariable>
<SetVariable name="Size">24f,18f</SetVariable>
<SetVariable name="state_0_icon">fx_mixmode_d-w.svg</SetVariable>
<SetVariable name="state_1_icon">fx_mixmode_d+w.svg</SetVariable>
<SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],mix_mode</SetVariable>
Expand All @@ -238,38 +238,44 @@ Variables:
</Children>
</WidgetGroup>

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

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

<WidgetGroup><!-- Super Knob, if enabled -->
<SizePolicy>min,min</SizePolicy>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup><Size>1min,2min</Size></WidgetGroup>
<Template src="skins:Tango/controls/knob_textless.xml">
<SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
<SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
<SetVariable name="Size">30f,26f</SetVariable>
<SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
<SetVariable name="ConfigKey">super1</SetVariable>
<SetVariable name="Color">blue</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_superknobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<WidgetGroup><Size>1f,0me</Size></WidgetGroup>

<WidgetGroup><!-- Super Knob, if enabled -->
<SizePolicy>min,min</SizePolicy>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup><Size>1min,2min</Size></WidgetGroup>
<Template src="skins:Tango/controls/knob_textless.xml">
<SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
<SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
<SetVariable name="Size">30f,26f</SetVariable>
<SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
<SetVariable name="ConfigKey">super1</SetVariable>
<SetVariable name="Color">blue</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_superknobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

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

<WidgetGroup><!-- Pfl button -->
<ObjectName>AlignCenter</ObjectName>
<SizePolicy>min,max</SizePolicy>
Expand All @@ -281,7 +287,6 @@ Variables:
<Children>
<!-- Greyed out if no headphone device is configured -->
<Template src="skins:Tango/helpers/pfl_cover.xml"/>

<Template src="skins:Tango/controls/button_2state.xml">
<SetVariable name="ObjectName">PflButton</SetVariable>
<SetVariable name="TooltipId">EffectUnit_headphones_enabled</SetVariable>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Tango/fx/unit_left_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,15 @@ Variables:
<EffectChainPresetButton>
<ObjectName>EffectChainPresetButtonLeft</ObjectName>
<EffectUnit><Variable name="FxUnit"/></EffectUnit>
<Size>18f,18f</Size>
<Size>20f,20f</Size>
</EffectChainPresetButton>
</Children>
</WidgetGroup>

<Template src="skins:Tango/controls/button_2state_persist.xml">
<SetVariable name="ObjectName">MixModeButton</SetVariable>
<SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
<SetVariable name="Size">30f,18f</SetVariable>
<SetVariable name="Size">24f,18f</SetVariable>
<SetVariable name="state_0_icon">fx_mixmode_d-w.svg</SetVariable>
<SetVariable name="state_1_icon">fx_mixmode_d+w.svg</SetVariable>
<SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],mix_mode</SetVariable>
Expand Down
50 changes: 28 additions & 22 deletions res/skins/Tango/fx/unit_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,38 +64,20 @@ Variables:
<Template src="skins:Tango/controls/button_2state_persist.xml">
<SetVariable name="ObjectName">MixModeButton</SetVariable>
<SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
<SetVariable name="Size">30f,18f</SetVariable>
<SetVariable name="Size">24f,18f</SetVariable>
<SetVariable name="state_0_icon">fx_mixmode_d-w.svg</SetVariable>
<SetVariable name="state_1_icon">fx_mixmode_d+w.svg</SetVariable>
<SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],mix_mode</SetVariable>
</Template>
</Children>
</WidgetGroup>

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

<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup><!-- Super Knob, if enabled -->
<SizePolicy>min,min</SizePolicy>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup><Size>1min,2min</Size></WidgetGroup>
<Template src="skins:Tango/controls/knob_textless.xml">
<SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
<SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
<SetVariable name="Size">30f,26f</SetVariable>
<SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
<SetVariable name="ConfigKey">super1</SetVariable>
<SetVariable name="Color">blue</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_superknobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<EffectChainPresetButton>
<EffectUnit><Variable name="FxUnit"/></EffectUnit>
<Size>24f,24f</Size>
Expand All @@ -104,6 +86,30 @@ Variables:
</Children>
</WidgetGroup>

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

<WidgetGroup><!-- Super Knob, if enabled -->
<SizePolicy>min,min</SizePolicy>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup><Size>1min,2min</Size></WidgetGroup>
<Template src="skins:Tango/controls/knob_textless.xml">
<SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
<SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
<SetVariable name="Size">30f,26f</SetVariable>
<SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
<SetVariable name="ConfigKey">super1</SetVariable>
<SetVariable name="Color">blue</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_superknobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

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

<WidgetGroup><!-- Pfl button -->
<ObjectName>AlignCenter</ObjectName>
<SizePolicy>min,max</SizePolicy>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Tango/fx/unit_right_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Variables:
<Template src="skins:Tango/controls/button_2state_persist.xml">
<SetVariable name="ObjectName">MixModeButton</SetVariable>
<SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
<SetVariable name="Size">30f,18f</SetVariable>
<SetVariable name="Size">24f,18f</SetVariable>
<SetVariable name="state_0_icon">fx_mixmode_d-w.svg</SetVariable>
<SetVariable name="state_1_icon">fx_mixmode_d+w.svg</SetVariable>
<SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],mix_mode</SetVariable>
Expand All @@ -67,7 +67,7 @@ Variables:
<EffectChainPresetButton>
<ObjectName>EffectChainPresetButtonRight</ObjectName>
<EffectUnit><Variable name="FxUnit"/></EffectUnit>
<Size>18f,18f</Size>
<Size>20f,20f</Size>
</EffectChainPresetButton>
</Children>
</WidgetGroup>
Expand Down
5 changes: 2 additions & 3 deletions res/skins/Tango/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,6 @@ WWidgetGroup {
image: url(skin:/../Tango/buttons/btn_skinsettings_off.svg) no-repeat center center;
}
#SkinSettingsToggler[displayValue="0"]:hover {
background-color: #0f0f0f;
image: url(skin:/../Tango/buttons/btn_skinsettings_on.svg) no-repeat center center;
}

Expand Down Expand Up @@ -1596,7 +1595,8 @@ decks, samplers, mic, aux, fx */
#FxUnitMixerRight,
#FxUnitMixerLeft_mini,
#FxUnitMixerRight_mini {
qproperty-layoutAlignment: 'AlignHCenter';
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
/* qproperty-layoutAlignment: 'AlignHCenter';*/
background-color: #333;
}
#FxUnitMixerLeft,
Expand Down Expand Up @@ -1809,7 +1809,6 @@ decks, samplers, mic, aux, fx */
image: url(skin:/../Tango/buttons/btn_skinsettings_off.svg) no-repeat center center;
}
WEffectChainPresetButton:hover {
background-color: #151515;
image: url(skin:/../Tango/buttons/btn_skinsettings_on.svg) no-repeat center center;
}
WEffectChainPresetButton::menu-indicator {
Expand Down
Loading