Skip to content

LateNight :: Redesign part 2 #2342

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
Be-ing merged 116 commits into from
Dec 8, 2019
Merged

LateNight :: Redesign part 2 #2342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
d86e585
LateNight: fix big Cover/Spinny layout
ronso0 Oct 31, 2019
00b93a0
LateNight: clean slider graphics
ronso0 Oct 31, 2019
1dedc89
LateNight: tweak knob scale
ronso0 Nov 1, 2019
ead69b1
prevent overlaping Fx parameter names
ronso0 Nov 1, 2019
b4d0860
prevent overlaping Fx parameter names
ronso0 Nov 1, 2019
5c4886d
LateNight: fix some drop shadows, xFader knob & fx parameter button
ronso0 Nov 1, 2019
f9a9b29
remove center notch from Vol fader, emhasize Pitch center
ronso0 Nov 2, 2019
55193e5
lower contrast and fix some separator borders
ronso0 Nov 2, 2019
c2ca237
add gap around knobs
ronso0 Nov 2, 2019
6f53aef
LateNight: desaturate Fx parameter controls
ronso0 Oct 31, 2019
2defeae
LateNight: new 3D button graphics system ...
ronso0 Nov 8, 2019
9d9cd16
resize sampler expand button to 100%
ronso0 Nov 8, 2019
3a76728
tweak button bg and icons
ronso0 Nov 9, 2019
386428d
LateNight: add glowing button edges
ronso0 Nov 10, 2019
eb87e62
LateNight: add pixel icons for elevated Fx assign buttons
ronso0 Nov 10, 2019
859d26e
LateNight: dim inactive button icons with border image overlay, fix E…
ronso0 Nov 11, 2019
1e6e2be
LateNight: fix/rename knob graphics
ronso0 Nov 11, 2019
b19b3f0
LateNight: adjust embedded library controls
ronso0 Nov 11, 2019
a954a8e
LateNight: use compact Master Fx buttons with 2 decks, 4 Fx and Booth…
ronso0 Nov 11, 2019
40a79b8
LateNight: avoid squeezed controls in decks' transport rows
ronso0 Nov 11, 2019
f62f769
LateNight: adjust active Play in mini decks / samplers
ronso0 Nov 11, 2019
23802fa
LateNight: adjust brightness of beatgrid icons
ronso0 Nov 11, 2019
83150f6
LateNight: fix Fx mix mode tooltip
ronso0 Nov 11, 2019
990df97
LateNight: avoid squeezing in deck top row
ronso0 Nov 11, 2019
6c464d3
LateNight: use border-image for Gui toggles & buttons in top row
ronso0 Nov 11, 2019
9d4189e
Merge remote-tracking branch 'mixxx/master' into latenight-sliders-knobs
ronso0 Nov 11, 2019
77d7944
LateNight: fix fademode combobox down arrow
ronso0 Nov 11, 2019
f8ed096
LateNight: dark font for gui toggles in toolbar
ronso0 Nov 11, 2019
0d4db5b
Merge remote-tracking branch 'mixxx/master' into latenight-sliders-knobs
ronso0 Nov 12, 2019
e90ac37
LateNight: revert minimum-expand policy of hotcue buttons
ronso0 Nov 12, 2019
9bbfcd4
LateNight: fix spacing in Fx parameter controls
ronso0 Nov 12, 2019
fe60168
LateNight: remove bright click higlight from buttons
ronso0 Nov 12, 2019
60ac673
LateNight: fix some button backgrounds
ronso0 Nov 12, 2019
e1ffb2e
LateNight: also remove the 'pressed' outline from Fx assign buttons
ronso0 Nov 13, 2019
9d85949
Merge remote-tracking branch 'mixxx/master' into latenight-sliders-knobs
ronso0 Nov 13, 2019
c4d9774
LateNight: remove remaining 'pressed' outlines, mirror X in FX icons,…
ronso0 Nov 13, 2019
5e13ecd
LateNight: consolidate common color definitions (also facilitates cre…
ronso0 Nov 13, 2019
7eb4fd0
LateNight: finally get expading intro cue buttons working
ronso0 Nov 13, 2019
dd356b2
LateNight: fix large 'CurPos' button in waveform
ronso0 Nov 13, 2019
5b2eaff
LateNight: center text in artist/title rows
ronso0 Nov 14, 2019
dc88a85
LateNight: add '*' label to QuickEffect, remove H/M/L label from acti…
ronso0 Nov 14, 2019
bf2de27
LateNight: remove labels from Fx Mix & Super knobs
ronso0 Nov 14, 2019
4c523dd
LateNight: update Fx focus button & fix border highlight
ronso0 Nov 14, 2019
9a07835
LateNight: yellow focus highlight for spinboxes
ronso0 Nov 14, 2019
65ef973
LateNight: equal spacing around Mix / Super knob in expanded Fx unit
ronso0 Nov 14, 2019
575c146
LateNight: fix the black left border of Spinny containers
ronso0 Nov 15, 2019
ff54282
LateNight: adjust per-deck bg/signal colors in waveforms / overviews
ronso0 Nov 15, 2019
ad637f5
LateNight: add 3D frame also to scrollings waveforms container
ronso0 Nov 15, 2019
ae70795
LateNight: use deck color for stars in deck 3/4 as well
ronso0 Nov 15, 2019
d653995
LateNight: unify label positions in waveforms / overviews
ronso0 Nov 15, 2019
1114630
LateNight: use per-deck colors for control icons quantize, eject etc.
ronso0 Nov 15, 2019
74ca9bc
LateNight: concentrate key deck controls, adjust spinbox button icons
ronso0 Nov 15, 2019
1a73601
LateNight: adapt Spinny masks
ronso0 Nov 15, 2019
e324bfd
LateNight: remove space left to deck Key controls
ronso0 Nov 15, 2019
71bd17b
LateNight: set TopRegion_btn_type, SubRegion_btn_type & bg texxture g…
ronso0 Nov 15, 2019
7ddbb6f
LateNight: 3D style for Fx link buttons
ronso0 Nov 16, 2019
d7596f4
LateNight: improveFx link buttons, minimize expanded Fx units
ronso0 Nov 16, 2019
857ab34
LateNight: improve Spinny indicator contrast above cover art
ronso0 Nov 17, 2019
d8648c9
LateNight: update knob design
ronso0 Nov 17, 2019
b4ca634
LateNight: add remaing icon outlines in Fx units, fix borderless samp…
ronso0 Nov 17, 2019
d7008d6
LateNight: use note icon for Key (match/reset) button
ronso0 Nov 17, 2019
2e0e78c
LateNight: grey bg for active SplitCue button, orange is simply to ey…
ronso0 Nov 17, 2019
d14d8b2
LateNight: fix btn_type for sampler hotcues
ronso0 Nov 17, 2019
90e4b3f
LateNight: add bright border to active embedded, square buttons
ronso0 Nov 18, 2019
d73db37
LateNight: fix separators in mini decks
ronso0 Nov 18, 2019
a59db75
LateNight: paint Play buttons yellow when stopped deck plays from Cue…
ronso0 Nov 18, 2019
e3a172d
LateNight: use horizontal battery icon
ronso0 Nov 18, 2019
6eca7fd
Merge branch 'master' of https://github.com/mixxxdj/mixxx into lateni…
ronso0 Nov 18, 2019
8f4dbda
LateNight: small fixes
ronso0 Nov 18, 2019
ed6f0bb
LateNight: show Fx main controls in one row when there's enough h-spa…
ronso0 Nov 18, 2019
0feaafb
LateNight: smaller Reverse & Cue button, straight 2x4 hotcue grid
ronso0 Nov 18, 2019
e7b9c17
LateNight: simpler transport row layout
ronso0 Nov 19, 2019
c6a39d5
LateNight: allwo to hide master/headphone mixer
ronso0 Nov 19, 2019
3224478
LateNight: clean up EQ knob templates
ronso0 Nov 19, 2019
893feae
LateNight test: increase hotcue labels in overview, contrast too
ronso0 Nov 19, 2019
c1e4088
LateNight: prepare color scheme creation
ronso0 Nov 19, 2019
f2eb654
LateNight: fix deck transport row spacing & alignment
ronso0 Nov 19, 2019
6b14821
LateNight: fix launch image
ronso0 Nov 20, 2019
b0c22d6
LateNight: prepare color scheme creation pt3
ronso0 Nov 20, 2019
6ebd5dd
LateNight: prepare color scheme creation pt4
ronso0 Nov 21, 2019
09d78de
lATEnIGHT :: new fLIP theme
ronso0 Nov 21, 2019
758a713
LateNight: simplify spinny layout
ronso0 Nov 22, 2019
fb175e3
LateNight: adapt Flip theme
ronso0 Nov 22, 2019
a4168c3
LateNight: simplify layout & qss styles
ronso0 Nov 22, 2019
b5c4c68
LateNight: adapt Flip scheme pt2
ronso0 Nov 22, 2019
fe8893b
LateNight: clean up, sharpen spinny indicator
ronso0 Nov 23, 2019
6b6d4eb
LateNight: adapt Flip scheme pt4
ronso0 Nov 23, 2019
da5689f
LateNight: whoopsy, restore lauch image
ronso0 Nov 23, 2019
a97559e
LateNight: remove duplicate spinny container ObjectName
ronso0 Nov 23, 2019
0284437
LateNight: add btn_, knobs_ & sliders_SCHEME, further clean-up
ronso0 Nov 23, 2019
3f5141e
LateNight: adapt Flip scheme pt5
ronso0 Nov 23, 2019
674a383
LateNight: final layout clean-up, hopefully...
ronso0 Nov 24, 2019
08d20cc
LateNight: adapt Flip scheme pt6
ronso0 Nov 24, 2019
44308b5
LateNight: happy birthday Flip scheme!
ronso0 Nov 24, 2019
38156aa
LateNight: qss clean up, polish
ronso0 Nov 25, 2019
05a7d2c
LateNight: balance mini spinny, add comments
ronso0 Nov 25, 2019
3d14145
LateNight: keep spinny indicator shadow within spinny mask
ronso0 Nov 25, 2019
8f4afac
LateNight: update version number, restrict QLabel & QPushButton style…
ronso0 Nov 25, 2019
72956db
Merge branch 'master' of https://github.com/mixxxdj/mixxx into lateni…
ronso0 Nov 25, 2019
57abcee
LateNight: use default font size for skin settings buttons
ronso0 Nov 25, 2019
d388fa2
LateNight: decrease 8-samplers separator
ronso0 Nov 25, 2019
5cccb42
LateNight: bold font for spinboxes as well
ronso0 Nov 25, 2019
216c13a
LateNight: remove skin settings category separator
ronso0 Nov 25, 2019
5963b9b
LateNight: restore BPM label in preview deck
ronso0 Nov 25, 2019
b4b85c4
LateNight: restore label colors, syncronise library button colors
ronso0 Nov 27, 2019
1b00478
LateNight: fix AutoDJ enable button bg color
ronso0 Nov 28, 2019
594797f
LateNight: consolidate font styles, fix some alignment issues, finali…
ronso0 Dec 4, 2019
b1d3d2c
Merge branch 'master' into latenight-sliders-knobs
ronso0 Dec 5, 2019
4b6f3e4
LateNight: add Star icon for QuickEffect button
ronso0 Dec 5, 2019
604c02f
LateNight: fix title/artist layout, clean up comments & css
ronso0 Dec 5, 2019
c3efb6a
LateNight: fix labels in preview deck
ronso0 Dec 5, 2019
ef63f58
LateNight: tweak launch logo
ronso0 Dec 5, 2019
063f2a1
LateNight: add scheme previews
ronso0 Dec 8, 2019
91cd286
LateNight: remove playing_from_cue indicator
ronso0 Dec 8, 2019
6b05e38
LateNight: remove playing_from_cue indicator from sampler & mini deck…
ronso0 Dec 8, 2019
770e202
LateNight: use displayValue instead of value for Play button background
ronso0 Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
283 changes: 134 additions & 149 deletions res/skins/LateNight/aux_unit.xml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions res/skins/LateNight/button_1state.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ Variables:
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
<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>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<Connection>
<ConfigKey><Variable name="ConfigKey"/></ConfigKey>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/LateNight/button_1state_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Variables:
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
<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>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<Connection>
<ConfigKey><Variable name="ConfigKey"/></ConfigKey>
Expand Down
8 changes: 4 additions & 4 deletions res/skins/LateNight/button_2state.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ Variables:
<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>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</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>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<Connection>
<ConfigKey><Variable name="ConfigKey"/></ConfigKey>
Expand Down
42 changes: 0 additions & 42 deletions res/skins/LateNight/button_2state_nohover.xml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions res/skins/LateNight/button_2state_persist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ Variables:
<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>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_pressed.svg</Pressed>
</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>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_pressed.svg</Pressed>
</State>
<Connection>
<ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
Expand Down
8 changes: 4 additions & 4 deletions res/skins/LateNight/button_2state_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ Variables:
<Number>0</Number>
<Text><Variable name="state_0_text"/></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_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</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="state_1_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<Connection>
<ConfigKey><Variable name="ConfigKey"/></ConfigKey>
Expand Down
8 changes: 4 additions & 4 deletions res/skins/LateNight/button_2state_right_display.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ Variables:
<Number>0</Number>
<Text><Variable name="state_0_text"/></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_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</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="state_1_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<Connection>
<ConfigKey><Variable name="ConfigKey"/></ConfigKey>
Expand Down
12 changes: 6 additions & 6 deletions res/skins/LateNight/button_3state.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ Variables:
<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>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</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>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</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>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<Connection>
<ConfigKey><Variable name="ConfigKey"/></ConfigKey>
Expand Down
12 changes: 6 additions & 6 deletions res/skins/LateNight/button_3state_display.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ Variables:
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
<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>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<State>
<Number>1</Number>
<Text><Variable name="state_1_text"/></Text>
<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>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<State>
<Number>2</Number>
<Text><Variable name="state_2_text"/></Text>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<Connection>
<ConfigKey><Variable name="ConfigKey"/></ConfigKey>
Expand Down
12 changes: 6 additions & 6 deletions res/skins/LateNight/button_3state_persist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ Variables:
<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>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</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>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</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>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<Connection>
<ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
Expand Down
20 changes: 10 additions & 10 deletions res/skins/LateNight/button_5state.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,37 +22,37 @@ Variables:
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
<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>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<State>
<Number>1</Number>
<Text><Variable name="state_1_text"/></Text>
<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>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<State>
<Number>2</Number>
<Text><Variable name="state_2_text"/></Text>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<State>
<Number>3</Number>
<Text><Variable name="state_3_text"/></Text>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_unpressed"/></Unpressed>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<State>
<Number>4</Number>
<Text><Variable name="state_4_text"/></Text>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_4_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_4_unpressed"/></Unpressed>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
</State>
<Connection>
<ConfigKey><Variable name="ConfigKey"/></ConfigKey>
Expand Down
Loading