Skip to content

Commit

Permalink
LateNight: use button templates (almost) everywhere, fix blurred beat…
Browse files Browse the repository at this point in the history 
…grid icons
  • Loading branch information
@ronso0
ronso0 committed Nov 3, 2018
1 parent ac55845 commit 931728f
Show file tree
Hide file tree
Showing 18 changed files with 561 additions and 889 deletions.
219 changes: 66 additions & 153 deletions res/skins/LateNight/aux_unit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,29 +60,14 @@
<Layout>vertical</Layout>
<SizePolicy>min,max</SizePolicy>
<Children>
<PushButton>
<TooltipId>orientation</TooltipId>
<NumberStates>3</NumberStates>
<State>
<Number>0</Number>
<Pressed>buttons/btn_orientation_aux_left.svg</Pressed>
<Unpressed>buttons/btn_orientation_aux_left.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>buttons/btn_orientation_aux_master.svg</Pressed>
<Unpressed>buttons/btn_orientation_aux_master.svg</Unpressed>
</State>
<State>
<Number>2</Number>
<Pressed>buttons/btn_orientation_aux_right.svg</Pressed>
<Unpressed>buttons/btn_orientation_aux_right.svg</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,orientation</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
<Template src="skin:button_3state.xml">
<SetVariable name="TooltipId">mute</SetVariable>
<SetVariable name="Size">34f,15f</SetVariable>
<SetVariable name="state_0">orientation_aux_left</SetVariable>
<SetVariable name="state_1">orientation_aux_master</SetVariable>
<SetVariable name="state_2">orientation_aux_right</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,orientation</SetVariable>
</Template>
</Children>
</WidgetGroup>

Expand Down Expand Up @@ -145,24 +130,12 @@
</Children>
</WidgetGroup>

<PushButton>
<TooltipId>pfl</TooltipId>
<ObjectName>MicPflButton</ObjectName>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Pressed>buttons/btn_pfl_down.svg</Pressed>
<Unpressed>buttons/btn_pfl.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>buttons/btn_pfl_overdown.svg</Pressed>
<Unpressed>buttons/btn_pfl_over.svg</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,pfl</ConfigKey>
</Connection>
</PushButton>
<Template src="skin:button_2state.xml">
<SetVariable name="TooltipId">pfl</SetVariable>
<SetVariable name="icon">pfl</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
<SetVariable name="Size">26f,26f</SetVariable>
</Template>

</Children>
</WidgetGroup><!-- /Gain, Pfl -->
Expand All @@ -172,43 +145,23 @@
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<PushButton>
<Size>35f,22f</Size>
<TooltipId>EffectUnit_auxiliary_enabled</TooltipId>
<ObjectName>FxAssignButton</ObjectName>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>FX&#8202;1</Text>
</State>
<State>
<Number>1</Number>
<Text>FX&#8202;1</Text>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit1],group_<Variable name="group"/>_enable</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>

<PushButton>
<Size>35f,22f</Size>
<TooltipId>EffectUnit_auxiliary_enabled</TooltipId>
<ObjectName>FxAssignButton</ObjectName>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>FX&#8202;2</Text>
</State>
<State>
<Number>1</Number>
<Text>FX&#8202;2</Text>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit2],group_<Variable name="group"/>_enable</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
<Template src="skin:button_2state.xml">
<SetVariable name="TooltipId">EffectUnit_auxiliary_enabled</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
<SetVariable name="Size">35f,22f</SetVariable>
<SetVariable name="state_0_text">FX&#8202;1</SetVariable>
<SetVariable name="state_1_text">FX&#8202;1</SetVariable>
<SetVariable name="ConfigKey">[EffectRack1_EffectUnit1],group_<Variable name="group"/>_enable</SetVariable>
</Template>

<Template src="skin:button_2state.xml">
<SetVariable name="TooltipId">EffectUnit_auxiliary_enabled</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
<SetVariable name="Size">35f,22f</SetVariable>
<SetVariable name="state_0_text">FX&#8202;2</SetVariable>
<SetVariable name="state_1_text">FX&#8202;2</SetVariable>
<SetVariable name="ConfigKey">[EffectRack1_EffectUnit2],group_<Variable name="group"/>_enable</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey persist="true">[Master],show_4effectunits</ConfigKey>
Expand All @@ -222,81 +175,41 @@
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<PushButton>
<Size>30f,22f</Size>
<TooltipId>EffectUnit_auxiliary_enabled</TooltipId>
<ObjectName>FxAssignButton</ObjectName>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>FX&#8202;1</Text>
</State>
<State>
<Number>1</Number>
<Text>FX&#8202;1</Text>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit1],group_<Variable name="group"/>_enable</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>

<PushButton>
<Size>20f,22f</Size>
<TooltipId>EffectUnit_auxiliary_enabled</TooltipId>
<ObjectName>FxAssignButton</ObjectName>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>2</Text>
</State>
<State>
<Number>1</Number>
<Text>2</Text>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit2],group_<Variable name="group"/>_enable</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>

<PushButton>
<Size>20f,22f</Size>
<TooltipId>EffectUnit_auxiliary_enabled</TooltipId>
<ObjectName>FxAssignButton</ObjectName>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>3</Text>
</State>
<State>
<Number>1</Number>
<Text>3</Text>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit3],group_<Variable name="group"/>_enable</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>

<PushButton>
<Size>20f,22f</Size>
<TooltipId>EffectUnit_auxiliary_enabled</TooltipId>
<ObjectName>FxAssignButton</ObjectName>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>4</Text>
</State>
<State>
<Number>1</Number>
<Text>4</Text>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit4],group_<Variable name="group"/>_enable</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
<Template src="skin:button_2state.xml">
<SetVariable name="TooltipId">EffectUnit_auxiliary_enabled</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
<SetVariable name="Size">30f,22f</SetVariable>
<SetVariable name="state_0_text">FX&#8202;1</SetVariable>
<SetVariable name="state_1_text">FX&#8202;1</SetVariable>
<SetVariable name="ConfigKey">[EffectRack1_EffectUnit1],group_<Variable name="group"/>_enable</SetVariable>
</Template>

<Template src="skin:button_2state.xml">
<SetVariable name="TooltipId">EffectUnit_auxiliary_enabled</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
<SetVariable name="Size">20f,22f</SetVariable>
<SetVariable name="state_0_text">2</SetVariable>
<SetVariable name="state_1_text">2</SetVariable>
<SetVariable name="ConfigKey">[EffectRack1_EffectUnit2],group_<Variable name="group"/>_enable</SetVariable>
</Template>

<Template src="skin:button_2state.xml">
<SetVariable name="TooltipId">EffectUnit_auxiliary_enabled</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
<SetVariable name="Size">20f,22f</SetVariable>
<SetVariable name="state_0_text">3</SetVariable>
<SetVariable name="state_1_text">3</SetVariable>
<SetVariable name="ConfigKey">[EffectRack1_EffectUnit3],group_<Variable name="group"/>_enable</SetVariable>
</Template>

<Template src="skin:button_2state.xml">
<SetVariable name="TooltipId">EffectUnit_auxiliary_enabled</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
<SetVariable name="Size">20f,22f</SetVariable>
<SetVariable name="state_0_text">4</SetVariable>
<SetVariable name="state_1_text">4</SetVariable>
<SetVariable name="ConfigKey">[EffectRack1_EffectUnit4],group_<Variable name="group"/>_enable</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey persist="true">[Master],show_4effectunits</ConfigKey>
Expand Down
41 changes: 41 additions & 0 deletions res/skins/LateNight/button_2state_persist.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!--
Description:
A button that has click or display controls.
Variables:
ObjectName : object name
ToolTipID : standard Tooltip from mixxx db
see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/TooltipIds.cpp
Size : button size
state_X_text : label text for state X
state_X_pressed : background graphic for pressed state X
state_X_unpressed : background graphic for unpressed state X
Align : alignment of text
ConfigKey : left-click control
-->
<Template>
<PushButton>
<TooltipId><Variable name="TooltipId"/></TooltipId>
<ObjectName><Variable name="ObjectName"/></ObjectName>
<Size><Variable name="Size"/></Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>false</RightClickIsPushButton>
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
<Alignment><Variable name="Align"/></Alignment>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_down.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Text><Variable name="state_1_text"/></Text>
<Alignment><Variable name="Align"/></Alignment>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_overdown.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_over.svg</Unpressed>
</State>
<Connection>
<ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
</Template>
49 changes: 49 additions & 0 deletions res/skins/LateNight/button_3state.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<!--
Description:
A button that has click or display controls.
Variables:
ObjectName : object name
ToolTipID : standard Tooltip from mixxx db
see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/TooltipIds.cpp
Size : button size
state_X_text : label text for state X
state_X_pressed : background graphic for pressed state X
state_X_unpressed : background graphic for unpressed state X
Align : alignment of text
ConfigKey : left-click control
ConfigKeyDisp : display control
-->
<Template>
<PushButton>
<TooltipId><Variable name="TooltipId"/></TooltipId>
<ObjectName><Variable name="ObjectName"/></ObjectName>
<Size><Variable name="Size"/></Size>
<NumberStates>3</NumberStates>
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0"/>.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0"/>.svg</Unpressed>
<Alignment><Variable name="Align"/></Alignment>
</State>
<State>
<Number>1</Number>
<Text><Variable name="state_1_text"/></Text>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1"/>.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1"/>.svg</Unpressed>
<Alignment><Variable name="Align"/></Alignment>
</State>
<State>
<Number>2</Number>
<Text><Variable name="state_2_text"/></Text>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2"/>.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2"/>.svg</Unpressed>
<Alignment><Variable name="Align"/></Alignment>
</State>
<Connection>
<ConfigKey><Variable name="ConfigKey"/></ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
</Template>
48 changes: 48 additions & 0 deletions res/skins/LateNight/button_3state_persist.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<!--
Description:
A button that has click or display controls.
Variables:
ObjectName : object name
ToolTipID : standard Tooltip from mixxx db
see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/TooltipIds.cpp
Size : button size
state_X_text : label text for state X
state_X_pressed : background graphic for pressed state X
state_X_unpressed : background graphic for unpressed state X
Align : alignment of text
ConfigKey : left-click control
ConfigKeyDisp : display control
-->
<Template>
<PushButton>
<TooltipId><Variable name="TooltipId"/></TooltipId>
<ObjectName><Variable name="ObjectName"/></ObjectName>
<Size><Variable name="Size"/></Size>
<NumberStates>3</NumberStates>
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0"/>.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0"/>.svg</Unpressed>
<Alignment><Variable name="Align"/></Alignment>
</State>
<State>
<Number>1</Number>
<Text><Variable name="state_1_text"/></Text>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1"/>.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1"/>.svg</Unpressed>
<Alignment><Variable name="Align"/></Alignment>
</State>
<State>
<Number>2</Number>
<Text><Variable name="state_2_text"/></Text>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2"/>.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2"/>.svg</Unpressed>
<Alignment><Variable name="Align"/></Alignment>
</State>
<Connection>
<ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
</Template>
1 change: 1 addition & 0 deletions res/skins/LateNight/buttons/btn_quickEffect.svg
View file
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/LateNight/buttons/btn_quickEffect_down.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 931728f

Please sign in to comment.