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

Latenight :: implement hotcue colors #2205

Merged
merged 5 commits into from
Jul 18, 2019
Merged

Latenight :: implement hotcue colors #2205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93035e0
LateNight: move hotcue button color from SVG to css, add outlines to …
ronso0 Jul 16, 2019
ed5b054
LateNight: use hotcue SVGs for in/outro cues as well, adapt colors fr…
ronso0 Jul 16, 2019
f5f1514
align hotcue labels right to waveform markers
ronso0 Jul 16, 2019
2eb3223
simplify hotcue/intro/outro button icons...
ronso0 Jul 17, 2019
8ffd45a
improve borders within PreviewDeck
ronso0 Jul 17, 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
43 changes: 32 additions & 11 deletions res/skins/LateNight/button_hotcue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,35 @@
<!-- A hotcue button. The only variable that needs to be specified is "number" -->
<Template>
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="TooltipId">hotcue</SetVariable>
<SetVariable name="state_0_pressed">hotcue_<Variable name="number"/>_down.svg</SetVariable>
<SetVariable name="state_0_unpressed">hotcue_<Variable name="number"/>.svg</SetVariable>
<SetVariable name="state_1_pressed">hotcue_<Variable name="number"/>_overdown.svg</SetVariable>
<SetVariable name="state_1_unpressed">hotcue_<Variable name="number"/>_over.svg</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,hotcue_<Variable name="number"/>_activate</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="group"/>,hotcue_<Variable name="number"/>_clear</SetVariable>
<SetVariable name="ConfigKeyDisp"><Variable name="group"/>,hotcue_<Variable name="number"/>_enabled</SetVariable>
<SetVariable name="Size">26,26</SetVariable>
</Template>
<PushButton>
<TooltipId>hotcue</TooltipId>
<ObjectName>HotcueButton</ObjectName>
<Size>26f,26f</Size>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_unset.svg</Unpressed>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_pressed.svg</Pressed>
</State>
<State>
<Number>1</Number>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>.svg</Unpressed>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_pressed.svg</Pressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_activate</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_clear</ConfigKey>
<ButtonState>RightButton</ButtonState>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_enabled</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_color_id</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</PushButton>
</Template>
12 changes: 4 additions & 8 deletions res/skins/LateNight/button_special_cue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@ Variables:
<RightClickIsPushButton>true</RightClickIsPushButton>
<State>
<Number>0</Number>
<Text><Variable name="label"/></Text>
<Alignment><Variable name="Align"/></Alignment>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
<Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>_pressed.svg</Pressed>
</State>
<State>
<Number>1</Number>
<Text><Variable name="label"/></Text>
<Alignment><Variable name="Align"/></Alignment>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
<Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>_pressed.svg</Pressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_activate</ConfigKey>
Expand Down
1 change: 1 addition & 0 deletions res/skins/LateNight/buttons/btn_cue_N_set.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_cue_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.
2 changes: 1 addition & 1 deletion res/skins/LateNight/buttons/btn_hotcue_1.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: 0 additions & 1 deletion res/skins/LateNight/buttons/btn_hotcue_1_down.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion res/skins/LateNight/buttons/btn_hotcue_1_over.svg
View file
Open in desktop

This file was deleted.

Loading