Skip to content

LateNight :: more compact Mic/Aux rack #2212

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
daschuer merged 1 commit into from
Jul 21, 2019
Merged

LateNight :: more compact Mic/Aux rack #2212

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
4 changes: 2 additions & 2 deletions res/skins/LateNight/aux_unit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Template>
<SetVariable name="group">[Auxiliary<Variable name="auxnum"/>]</SetVariable>
<WidgetGroup>
<ObjectName>MicBorder</ObjectName>
<ObjectName>MicAuxUnit</ObjectName>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup>
<ObjectName>MicInterior</ObjectName>
<ObjectName>MicAuxInterior</ObjectName>
<BackPath>style/background_tile.png</BackPath>
<Layout>horizontal</Layout>
<SizePolicy>min,max</SizePolicy>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/buttons/btn_micDuck.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.
2 changes: 1 addition & 1 deletion res/skins/LateNight/buttons/btn_micDuck_over.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.
161 changes: 56 additions & 105 deletions res/skins/LateNight/mic_aux_rack.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,128 +7,79 @@
<WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>

<WidgetGroup>
<ObjectName>MicContainer</ObjectName>
<Layout>vertical</Layout>
<ObjectName>MicRack</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>max,min</SizePolicy>
<Children>
<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Label>
<ObjectName>MicTitle</ObjectName>
<Text>Microphones</Text>
</Label>

<WidgetGroup>
<SizePolicy>me,min</SizePolicy>
</WidgetGroup>

<Label>
<ObjectName>DuckingTitle</ObjectName>
<Size>60f,17f</Size>
<Text>Ducking</Text>
<Alignment>center</Alignment>
</Label>
</Children>
</WidgetGroup>
<Template src="skin:mic_unit.xml">
<SetVariable name="mic1hack">1</SetVariable>
</Template>
<Template src="skin:mic_unit.xml">
<SetVariable name="micnum">2</SetVariable>
</Template>
<Template src="skin:mic_unit.xml">
<SetVariable name="micnum">3</SetVariable>
</Template>
<Template src="skin:mic_unit.xml">
<SetVariable name="micnum">4</SetVariable>
</Template>

<WidgetGroup><!-- Mic units -->
<Layout>horizontal</Layout>
<SizePolicy>max,min</SizePolicy>
<WidgetGroup><!-- Ducking controls -->
<ObjectName>MicDuckingContainer</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:mic_unit.xml">
<SetVariable name="mic1hack">1</SetVariable>
</Template>
<Template src="skin:mic_unit.xml">
<SetVariable name="micnum">2</SetVariable>
</Template>
<Template src="skin:mic_unit.xml">
<SetVariable name="micnum">3</SetVariable>
</Template>
<Template src="skin:mic_unit.xml">
<SetVariable name="micnum">4</SetVariable>

<Template src="skin:button_3state.xml">
<SetVariable name="TooltipId">talkover_duck_mode</SetVariable>
<SetVariable name="ObjectName">MicDuckingButton</SetVariable>
<SetVariable name="Size">72f,29f</SetVariable>
<SetVariable name="state_0">micDuck</SetVariable>
<SetVariable name="state_0_text">DUCK OFF</SetVariable>
<SetVariable name="state_1">micDuck_over</SetVariable>
<SetVariable name="state_1_text">DUCK AUTO</SetVariable>
<SetVariable name="state_2">micDuck_over</SetVariable>
<SetVariable name="state_2_text">DUCK MAN</SetVariable>
<SetVariable name="ConfigKey">[Master],talkoverDucking</SetVariable>
</Template>

<WidgetGroup><!-- Ducking controls -->
<ObjectName>MicDuckingContainer</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<WidgetGroup>
<ObjectName>MicDuckingStrengthKnob</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>
<Template src="skin:button_3state.xml">
<SetVariable name="TooltipId">talkover_duck_mode</SetVariable>
<SetVariable name="ObjectName">MicDuckingButton</SetVariable>
<SetVariable name="Size">62f,28f</SetVariable>
<SetVariable name="state_0">micDuck</SetVariable>
<SetVariable name="state_0_text">OFF</SetVariable>
<SetVariable name="state_1">micDuck_over</SetVariable>
<SetVariable name="state_1_text">AUTO</SetVariable>
<SetVariable name="state_2">micDuck_over</SetVariable>
<SetVariable name="state_2_text">MANUAL</SetVariable>
<SetVariable name="ConfigKey">[Master],talkoverDucking</SetVariable>
<Template src="skin:knob_textless.xml">
<SetVariable name="TooltipId">talkover_duck_strength</SetVariable>
<SetVariable name="Size">40f,34f</SetVariable>
<SetVariable name="Color">red</SetVariable>
<SetVariable name="group">[Master]</SetVariable>
<SetVariable name="control">duckStrength</SetVariable>
</Template>

<WidgetGroup>
<ObjectName>MicDuckingStrengthKnob</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>
<Template src="skin:knob_textless.xml">
<SetVariable name="TooltipId">talkover_duck_strength</SetVariable>
<SetVariable name="Size">40f,34f</SetVariable>
<SetVariable name="Color">red</SetVariable>
<SetVariable name="group">[Master]</SetVariable>
<SetVariable name="control">duckStrength</SetVariable>
</Template>
</Children>
</WidgetGroup>
</Children>
</WidgetGroup><!-- /Ducking controls -->
</WidgetGroup>
</Children>
</WidgetGroup><!-- /Mic units -->

</WidgetGroup><!-- /Ducking controls -->
</Children>
</WidgetGroup><!-- /Mic -->

<WidgetGroup><!-- Aux -->
<ObjectName>AuxContainer</ObjectName>
<Layout>vertical</Layout>
<ObjectName>AuxRack</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>max,min</SizePolicy>
<Children>
<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Label>
<ObjectName>MicTitle</ObjectName>
<Text>Aux Inputs</Text>
</Label>
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
<Children/>
</WidgetGroup>
</Children>
</WidgetGroup>

<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>max,min</SizePolicy>
<Children>
<Template src="skin:aux_unit.xml">
<SetVariable name="auxnum">1</SetVariable>
</Template>
<Template src="skin:aux_unit.xml">
<SetVariable name="auxnum">2</SetVariable>
</Template>
<Template src="skin:aux_unit.xml">
<SetVariable name="auxnum">3</SetVariable>
</Template>
<Template src="skin:aux_unit.xml">
<SetVariable name="auxnum">4</SetVariable>
</Template>
</Children>
</WidgetGroup>
<Template src="skin:aux_unit.xml">
<SetVariable name="auxnum">1</SetVariable>
</Template>
<Template src="skin:aux_unit.xml">
<SetVariable name="auxnum">2</SetVariable>
</Template>
<Template src="skin:aux_unit.xml">
<SetVariable name="auxnum">3</SetVariable>
</Template>
<Template src="skin:aux_unit.xml">
<SetVariable name="auxnum">4</SetVariable>
</Template>
</Children>
</WidgetGroup><!-- Aux -->

Expand Down
7 changes: 5 additions & 2 deletions res/skins/LateNight/mic_unit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Template>
<SetVariable name="group">[Microphone<Variable name="micnum"/>]</SetVariable>
<WidgetGroup>
<ObjectName>MicBorder</ObjectName>
<ObjectName>MicAuxUnit</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,max</SizePolicy>
<Children>
<WidgetGroup>
<ObjectName>MicInterior</ObjectName>
<ObjectName>MicAuxInterior</ObjectName>
<BackPath>style/background_tile.png</BackPath>
<Layout>horizontal</Layout>
<SizePolicy>min,max</SizePolicy>
Expand Down Expand Up @@ -124,6 +124,9 @@
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>

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

<Template src="skin:button_2state.xml">
<SetVariable name="TooltipId">EffectUnit_auxiliary_enabled</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
Expand Down
79 changes: 33 additions & 46 deletions res/skins/LateNight/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,10 +527,10 @@ WEffectButtonParameter*/
}

#VinylButton[displayValue="0"],
#BroadcastButton[displayValue="0"],
#SettingsButton[displayValue="0"],
#FxAssignButton[displayValue="0"],
#GuiToggleButton[displayValue="0"],
#FxAssignButton[displayValue="0"] {
#BroadcastButton[displayValue="0"],
#SettingsButton[displayValue="0"] {
color: #ddd;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #282828,
Expand All @@ -539,11 +539,11 @@ WEffectButtonParameter*/

#VinylButton[displayValue="1"],
#VinylButton[displayValue="2"],
#FxAssignButton[displayValue="1"],
#GuiToggleButton[displayValue="1"],
#GuiToggleButton[displayValue="2"],
#BroadcastButton[displayValue="1"], /* connecting: yellow */
#SettingsButton[displayValue="1"],
#FxAssignButton[displayValue="1"] {
#SettingsButton[displayValue="1"] {
color: #0e0e0e;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #B69700,
Expand Down Expand Up @@ -1094,60 +1094,53 @@ border: 0px;
padding: 2px 0px 0px 2px;
}

#MicContainer, #AuxContainer {
#MicRack, #AuxRack {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
border: 1px solid #585858;
background-color: #1e1e1e;
}

#MicContainer {
margin: 5px 5px 0px 0px;
padding: 1px 6px 3px 6px;
}

#AuxContainer {
margin: 5px 0px 0px 5px;
padding: 1px 0px 3px 6px;
}

#MicTitle {
qproperty-alignment: 'AlignLeft | AlignTop';
text-transform: uppercase;
font-size: 15px/17px;
}
padding: 4px;
qproperty-layoutSpacing: 5;
}
#MicRack {
margin: 5px 5px 0px 0px;
}
#AuxRack {
margin: 5px 0px 0px 5px;
}

#MicBorder {
#MicAuxUnit {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
border: 1px solid #585858;
margin: 1px 6px 1px 0px;
border-top: 1px solid #000;
border-left: 1px solid #000;
border-right: 1px solid #585858;
border-bottom: 1px solid #585858;
}

#MicInterior {
padding: 0px 3px 2px 3px;
#MicAuxInterior {
padding: 0px 2px 3px 2px;
}

#MicSubTitle {
#MicTitle {
qproperty-alignment: 'AlignCenter | AlignTop';
font-size: 12px/13px;
text-align: center;
}

#MicDuckingTitle {
qproperty-alignment: 'AlignCenter | AlignTop';
font-size: 12px/13px;
font-weight: bold;
color: #585858;
text-align: center;
#MicDuckingContainer {
qproperty-alignment: 'AlignCenter | AlignTop'; /*
background-color: #548731; */
}

#MicDuckingContainer {
margin: 0px 0px 3px 0px;
#MicDuckingStrengthKnob {
margin: 2px 0px;
}

#MicDuckingButton[displayValue="0"] {
color: #ddd;
/* styled like GuiToggleButton, VinylButton etc */
#MicDuckingButton {
}
#MicDuckingButton[displayValue="0"] {
color: #ddd;
}

#MicDuckingButton[displayValue="1"],
#MicDuckingButton[displayValue="2"] {
color: #0e0e0e;
Expand Down Expand Up @@ -1197,12 +1190,6 @@ border: 0px;
background-color: #1e1e1e;
}

#SamplerExpandbutton {
}

#SamplerMainControls {
}

#SamplerText {
qproperty-layoutAlignment: 'AlignLeft | AlignTop';
padding: 3px 3px 3px 5px;
Expand Down