Skip to content

Add Hotcue Button colors to skins #2120

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
uklotzde merged 7 commits into from
May 30, 2019
Merged

Add Hotcue Button colors to skins #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99e7dc6
Restyle widget on ControlWidgetPropertyConnect::slotControlValueChanged
Holzhaus May 24, 2019
9b59a5a
Force repaint of Widget on control change
Holzhaus May 25, 2019
9305ce8
Deere: Add support for hotcue button colors
Holzhaus May 24, 2019
5f5aaee
Tango: Add support for hotcue button colors
Holzhaus May 25, 2019
87dbea2
Shade: Add support for hotcue button colors
Holzhaus May 25, 2019
272510d
Deere: Make the default hotcue mark match the button color
Holzhaus May 28, 2019
287c203
Tango: Make the default hotcue mark match the button color
Holzhaus May 28, 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
2 changes: 1 addition & 1 deletion res/skins/Deere/deck_visual_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<Align></Align>
<DefaultMark>
<Align>top</Align>
<Color>#00FF00</Color>
<Color>#006596</Color>
<TextColor>#000000</TextColor>
<Text> %1 </Text>
</DefaultMark>
Expand Down
58 changes: 42 additions & 16 deletions res/skins/Deere/hotcue_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,46 @@
SmallSquareButtonSize: the button size
-->
<Template>
<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">hotcue</SetVariable>
<SetVariable name="ObjectName">HotcueButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_pressed"></SetVariable>
<SetVariable name="state_0_unpressed"></SetVariable>
<SetVariable name="state_0_text"><Variable name="hotcue"/></SetVariable>
<SetVariable name="state_1_pressed"></SetVariable>
<SetVariable name="state_1_unpressed"></SetVariable>
<SetVariable name="state_1_text"><Variable name="hotcue"/></SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_activate</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_clear</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_enabled</SetVariable>
</Template>
<PushButton>
<TooltipId>hotcue</TooltipId>
<ObjectName>HotcueButton</ObjectName>
<MinimumSize><Variable name="SquareButtonMinimumSize"/></MinimumSize>
<MaximumSize><Variable name="SquareButtonMaximumSize"/></MaximumSize>
<SizePolicy><Variable name="SquareButtonSizePolicy"/></SizePolicy>
<NumberStates>2</NumberStates>
<LeftClickIsPushButton><Variable name="LeftClickIsPushButton"/></LeftClickIsPushButton>
<RightClickIsPushButton><Variable name="RightClickIsPushButton"/></RightClickIsPushButton>
<State>
<Number>0</Number>
<Text><Variable name="hotcue"/></Text>
<Pressed scalemode="STRETCH_ASPECT"></Pressed>
<Unpressed scalemode="STRETCH_ASPECT"></Unpressed>
</State>
<State>
<Number>1</Number>
<Text><Variable name="hotcue"/></Text>
<Pressed scalemode="STRETCH_ASPECT"></Pressed>
<Unpressed scalemode="STRETCH_ASPECT"></Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_activate</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
<ConnectValueToWidget>false</ConnectValueToWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_clear</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>RightButton</ButtonState>
<ConnectValueToWidget>false</ConnectValueToWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_enabled</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_color_id</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</PushButton>
</Template>
2 changes: 1 addition & 1 deletion res/skins/Deere/sampler_controls_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<PlayPosColor>#00FF00</PlayPosColor>
<DefaultMark>
<Align>bottom</Align>
<Color>#00FF00</Color>
<Color>#006596</Color>
<TextColor>#FFFFFF</TextColor>
<Text> %1 </Text>
</DefaultMark>
Expand Down
107 changes: 107 additions & 0 deletions res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,6 +1525,113 @@ WPushButton[value="2"]:hover {
border: 0px solid #0080BE;
}

/* Hotcue Color: No Color */
#HotcueButton[value="1"][highlight="0"],
#HotcueButton[value="2"][highlight="0"] {
background-color: #006596;
}

#HotcueButton[value="1"][highlight="0"]:hover,
#HotcueButton[value="2"][highlight="0"]:hover {
background-color: #0080BE;
}

/* Hotcue Color: Red */
#HotcueButton[value="1"][highlight="1"],
#HotcueButton[value="2"][highlight="1"] {
background-color: #c50a08;
}

#HotcueButton[value="1"][highlight="1"]:hover,
#HotcueButton[value="2"][highlight="1"]:hover {
background-color: #e50c08;
}

/* Hotcue Color: Green */
#HotcueButton[value="1"][highlight="2"],
#HotcueButton[value="2"][highlight="2"] {
background-color: #32be44;
}

#HotcueButton[value="1"][highlight="2"]:hover,
#HotcueButton[value="2"][highlight="2"]:hover {
background-color: #52de64;
}

/* Hotcue Color: Blue */
#HotcueButton[value="1"][highlight="3"],
#HotcueButton[value="2"][highlight="3"] {
background-color: #0044ff;
}

#HotcueButton[value="1"][highlight="3"]:hover,
#HotcueButton[value="2"][highlight="3"]:hover {
background-color: #0064ff;
}

/* Hotcue Color: Yellow */
#HotcueButton[value="1"][highlight="4"],
#HotcueButton[value="2"][highlight="4"] {
color: #4B4B4B;
background-color: #f8d200;
}

#HotcueButton[value="1"][highlight="4"]:hover,
#HotcueButton[value="2"][highlight="4"]:hover {
color: #4B4B4B;
background-color: #f8f200;
}

/* Hotcue Color: Celeste */
#HotcueButton[value="1"][highlight="5"],
#HotcueButton[value="2"][highlight="5"] {
color: #4B4B4B;
background-color: #42d4f4;
}

#HotcueButton[value="1"][highlight="5"]:hover,
#HotcueButton[value="2"][highlight="5"]:hover {
color: #4B4B4B;
background-color: #62f4f4;
}

/* Hotcue Color: Purple */
#HotcueButton[value="1"][highlight="6"],
#HotcueButton[value="2"][highlight="6"] {
background-color: #af00cc;
}

#HotcueButton[value="1"][highlight="6"]:hover,
#HotcueButton[value="2"][highlight="6"]:hover {
background-color: #cf00ec;
}

/* Hotcue Color: Pink */
#HotcueButton[value="1"][highlight="7"],
#HotcueButton[value="2"][highlight="7"] {
color: #4B4B4B;
background-color: #fca6d7;
}

#HotcueButton[value="1"][highlight="7"]:hover,
#HotcueButton[value="2"][highlight="7"]:hover {
color: #4B4B4B;
background-color: #fcc6f7;
}

/* Hotcue Color: White */
#HotcueButton[value="1"][highlight="8"],
#HotcueButton[value="2"][highlight="8"] {
color: #4B4B4B;
background-color: #f2f2ff;
}

#HotcueButton[value="1"][highlight="8"]:hover,
#HotcueButton[value="2"][highlight="8"]:hover {
color: #4B4B4B;
background-color: #ffffff;
}

/*"Enabled" state, e.g. for recording status
0 -- disconnected / off
1 -- connecting / enabling
Expand Down
Binary file modified res/skins/Shade/btn/btn_hotcue_1_over.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/btn_hotcue_1_overdown.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/btn_hotcue_2_over.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/btn_hotcue_2_overdown.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/btn_hotcue_3_over.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/btn_hotcue_3_overdown.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/btn_hotcue_4_over.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/btn_hotcue_4_overdown.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.
6 changes: 4 additions & 2 deletions res/skins/Shade/dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,7 @@ WLibrary QRadioButton::indicator:checked {
background: url(skin:/btn/btn_lib_radio_button_on_dark.svg) center center;
}



/* Hotcue Color: No Color */
#HotcueButton[highlight="0"] {
background-color: #b39a00;
}
20 changes: 20 additions & 0 deletions res/skins/Shade/deck_transport.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@
<Children>
<PushButton>
<TooltipId>hotcue</TooltipId>
<ObjectName>HotcueButton</ObjectName>
<Pos>0,0</Pos>
<Style></Style>
<NumberStates>2</NumberStates>
Expand Down Expand Up @@ -504,9 +505,14 @@
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_1_enabled</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
<Connection>
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_1_color_id</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</PushButton>
<PushButton>
<TooltipId>hotcue</TooltipId>
<ObjectName>HotcueButton</ObjectName>
<Pos>21,0</Pos>
<Style></Style>
<NumberStates>2</NumberStates>
Expand Down Expand Up @@ -538,9 +544,14 @@
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_2_enabled</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
<Connection>
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_2_color_id</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</PushButton>
<PushButton>
<TooltipId>hotcue</TooltipId>
<ObjectName>HotcueButton</ObjectName>
<Pos>0,21</Pos>
<Style></Style>
<NumberStates>2</NumberStates>
Expand Down Expand Up @@ -572,8 +583,13 @@
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_3_enabled</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
<Connection>
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_3_color_id</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</PushButton>
<PushButton>
<ObjectName>HotcueButton</ObjectName>
<TooltipId>hotcue</TooltipId>
<Pos>21,21</Pos>
<Style></Style>
Expand Down Expand Up @@ -606,6 +622,10 @@
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_4_enabled</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
<Connection>
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_4_color_id</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</PushButton>
</Children>
<Connection>
Expand Down
43 changes: 43 additions & 0 deletions res/skins/Shade/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,4 +490,47 @@ WLibrary QPushButton {
margin: 1px 2px 3px 10px;
}

/* Hotcue Color: No Color */
#HotcueButton[highlight="0"] {
background-color: #fd0564;
}

/* Hotcue Color: Red */
#HotcueButton[highlight="1"] {
background-color: #c50a08;
}

/* Hotcue Color: Green */
#HotcueButton[highlight="2"] {
background-color: #32be44;
}

/* Hotcue Color: Blue */
#HotcueButton[highlight="3"] {
background-color: #0044ff;
}

/* Hotcue Color: Yellow */
#HotcueButton[highlight="4"] {
background-color: #f8d200;
}

/* Hotcue Color: Celeste */
#HotcueButton[highlight="5"] {
background-color: #42d4f4;
}

/* Hotcue Color: Purple */
#HotcueButton[highlight="6"] {
background-color: #af00cc;
}

/* Hotcue Color: Pink */
#HotcueButton[highlight="7"] {
background-color: #fca6d7;
}

/* Hotcue Color: White */
#HotcueButton[highlight="8"] {
background-color: #f2f2ff;
}
4 changes: 4 additions & 0 deletions res/skins/Shade/summer_sunset.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,7 @@ WLibrary QPushButton {
border: 1px solid #52F904;
}

/* Hotcue Color: No Color */
#HotcueButton[highlight="0"] {
background-color: #52f904;
}
4 changes: 4 additions & 0 deletions res/skins/Tango/button_hotcue_deck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,9 @@ Variables:
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="HotCue"/>_enabled</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="HotCue"/>_color_id</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</PushButton>
</Template>
2 changes: 1 addition & 1 deletion res/skins/Tango/deck_overview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Variables:
<EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
<DefaultMark>
<Align>bottom|right</Align>
<Color>#00FF00</Color>
<Color>#666666</Color>
<TextColor>#FFFFFF</TextColor>
<Text> %1 </Text>
</DefaultMark>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Tango/preview_deck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Variables:
<MarkerColor>#00FF00</MarkerColor>
<DefaultMark>
<Align>bottom|right</Align>
<Color>#00FF00</Color>
<Color>#666666</Color>
<TextColor>#FFFFFF</TextColor>
<Text> %1 </Text>
</DefaultMark>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Tango/sampler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Variables:
<MarkerColor>#00FF00</MarkerColor>
<DefaultMark>
<Align>bottom|right</Align>
<Color>#00FF00</Color>
<Color>#666666</Color>
<TextColor>#FFFFFF</TextColor>
<Text> %1 </Text>
</DefaultMark>
Expand Down
Loading