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

LateNight :: 3D facelift #2298

Merged
merged 47 commits into from
Oct 15, 2019
Merged

LateNight :: 3D facelift #2298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
04a5c88
LateNight: 1st 3D facelift test
ronso0 Sep 23, 2019
bf6b071
...
ronso0 Sep 27, 2019
5f65331
...
ronso0 Sep 27, 2019
98e0ff5
new crossfader switches
ronso0 Sep 27, 2019
f5b32bf
fresh new sliders
ronso0 Sep 27, 2019
3925d7e
fresh VU meters
ronso0 Sep 27, 2019
a07d550
fix QuickEffect label when Kill buttons are hidden
ronso0 Sep 27, 2019
c64e083
ease button contrast a bit
ronso0 Sep 27, 2019
7a1615a
fix sliders
ronso0 Sep 27, 2019
e615d3b
...
ronso0 Sep 27, 2019
a1bc61c
move knobs and sliders to separate folder
ronso0 Sep 27, 2019
40f4220
separate hotcues from Play/Cue/Rev
ronso0 Sep 27, 2019
b05253a
Revert "separate hotcues from Play/Cue/Rev"
ronso0 Sep 28, 2019
fc03992
Mic/Aux tweaks, VU meters
ronso0 Sep 28, 2019
1fb4c4d
mixer, faders, knobs
ronso0 Sep 28, 2019
9a19cb0
fix order of rate buttons (rate direction), make buttons optional
ronso0 Sep 28, 2019
21d6aff
beat spinbox, effect selector
ronso0 Sep 28, 2019
9a6f2b2
keep Spinny indicator within circle mask
ronso0 Sep 28, 2019
b9a5dbb
rename vu and clipping graphics
ronso0 Sep 28, 2019
f131b38
...* except Mic/Aux
ronso0 Sep 30, 2019
23bcb0a
improve & mirror Mic/Aux units
ronso0 Sep 30, 2019
9824da7
add fx_assign_button.xml, add common small VU meter template, overhau…
ronso0 Sep 30, 2019
f2b7e5d
fixed some labels, tooltips & buttons
ronso0 Oct 1, 2019
7066d89
fix tooltips & icons, remove negative widget sizes etc.
ronso0 Oct 2, 2019
8192ac4
consistent Fx Objectnames, small fixes for buttons
ronso0 Oct 2, 2019
422e1e8
style focused fx slot
ronso0 Oct 2, 2019
4ceaa34
clean up qss, add SplitCue & MicDuck buttons
ronso0 Oct 4, 2019
94140f5
adapt remaining drop shadows
ronso0 Oct 4, 2019
cdfc06b
paint active Duck button orange, like AutoDJ button
ronso0 Oct 4, 2019
edf9844
fix text color of lib feature button, fx enable tooltip, ..
ronso0 Oct 4, 2019
9e36d3e
scale sampler expand icon when Mixxx is sccaled up
ronso0 Oct 4, 2019
4fcfcfd
adapt drop shadow of intro/outro buttons
ronso0 Oct 4, 2019
47d2d8e
add SVG drop shadows to Lib buttons, spinboxes, Fx, MicDucking, SplitCue
ronso0 Oct 5, 2019
677b9d9
remove obsolete styles
ronso0 Oct 5, 2019
9908bbd
final touchhh
ronso0 Oct 6, 2019
e6cf453
improve Key label
ronso0 Oct 6, 2019
b41ecdb
fix default font color of FxAssignButton (mixer, mic, aux)
ronso0 Oct 7, 2019
8d258fa
beatbox button polish
ronso0 Oct 7, 2019
5544c29
lower contrast on Fx buttons, SplitCue, MicDuck
ronso0 Oct 7, 2019
6ac2608
fix Fx enable icons
ronso0 Oct 8, 2019
fb6769a
concentrate qss label colors, fix Deck3/4 color, compress MicDuck icons
ronso0 Oct 9, 2019
c9c2bd2
fix pitch slider range, tweak spinny
ronso0 Oct 9, 2019
8831677
spread Mic/Aux units if there's space
ronso0 Oct 14, 2019
40b45dd
sharpen pixel icons: sYnc, plaY, Duck, xfader orientation
ronso0 Oct 14, 2019
44b869c
update skin preview image, include larger version
ronso0 Oct 15, 2019
a89319d
smaller Mic ducking controls
ronso0 Oct 15, 2019
7d8543f
make Fx buttons fit into Mic/Aux decks at minimal window size
ronso0 Oct 15, 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
  •  
  •  
  •  
338 changes: 153 additions & 185 deletions res/skins/LateNight/aux_unit.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion res/skins/LateNight/button_hotcue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</State>
<State>
<Number>1</Number>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>.svg</Unpressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_set.svg</Unpressed>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_pressed.svg</Pressed>
</State>
<Connection>
Expand Down
98 changes: 98 additions & 0 deletions res/skins/LateNight/button_xfader_aux.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<!DOCTYPE template>
<!--
Description:
A row of three buttons which set the deck's crossfader
orientation directly: L | M | R
Variables:
group:
xfaderLeft, xfaderRight: default | warning | off
Picks a colored icon for L,M,R depending on wether
the deck's orientation is the default, set to Master
or to the opposite side
-->
<Template>
<WidgetGroup>
<ObjectName>CrossfaderButtonContainerAux</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>max,min</SizePolicy>
<Children>
<!-- L -->
<PushButton>
<ObjectName>CrossfaderButton</ObjectName>
<TooltipId>orientation</TooltipId>
<Size>11f,13f</Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>false</RightClickIsPushButton>
<State>
<Number>0</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,orientation</ConfigKey>
<Transform>
<IsEqual>0</IsEqual>
</Transform>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
<!-- M -->
<PushButton>
<ObjectName>CrossfaderButton</ObjectName>
<TooltipId>orientation</TooltipId>
<Size>11f,13f</Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>false</RightClickIsPushButton>
<State>
<Number>0</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,orientation</ConfigKey>
<Transform>
<Add>-1</Add>
<IsEqual>0</IsEqual>
</Transform>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
<!-- R -->
<PushButton>
<ObjectName>CrossfaderButton</ObjectName>
<TooltipId>orientation</TooltipId>
<Size>11f,13f</Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>false</RightClickIsPushButton>
<State>
<Number>0</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,orientation</ConfigKey>
<Transform>
<Add>-2</Add>
<IsEqual>0</IsEqual>
</Transform>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
</Children>
</WidgetGroup>
</Template>
48 changes: 25 additions & 23 deletions res/skins/LateNight/button_xfader_deck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<!DOCTYPE template>
<!--
Description:
A standard knob.
A row of three buttons which set the deck's crossfader
orientation directly: L | M | R
Variables:
group
control: The control to connect to
label
Size
TooltipId
PotiMinAngle
PotiMaxAngle
group:
xfaderLeft, xfaderRight: default | warning | off
Picks a colored icon for L,M,R depending on wether
the deck's orientation is the default, set to Master
or to the opposite side
-->
<Template>
<WidgetGroup>
<ObjectName>CrossfaderButtonContainerDeck</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<WidgetGroup><Size>1f,1min</Size></WidgetGroup>
<!-- L -->
<PushButton>
<ObjectName>CrossfaderButton</ObjectName>
<TooltipId>orientation</TooltipId>
<Size>9f,15f</Size>
<Size>11f,15f</Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>false</RightClickIsPushButton>
<State>
<Number>0</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_left_off.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_left_off.svg</Unpressed>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_off.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_off.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_left_<Variable name="xfaderLeft"/>.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_left_<Variable name="xfaderLeft"/>.svg</Unpressed>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_<Variable name="xfaderLeft"/>.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_<Variable name="xfaderLeft"/>.svg</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,orientation</ConfigKey>
Expand All @@ -43,19 +43,20 @@
</PushButton>
<!-- M -->
<PushButton>
<ObjectName>CrossfaderButton</ObjectName>
<TooltipId>orientation</TooltipId>
<Size>11f,15f</Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>false</RightClickIsPushButton>
<State>
<Number>0</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_mid_off.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_mid_off.svg</Unpressed>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_off.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_off.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_mid_warning.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_mid_warning.svg</Unpressed>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_warning.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_warning.svg</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,orientation</ConfigKey>
Expand All @@ -68,19 +69,20 @@
</PushButton>
<!-- R -->
<PushButton>
<ObjectName>CrossfaderButton</ObjectName>
<TooltipId>orientation</TooltipId>
<Size>10f,15f</Size>
<Size>11f,15f</Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>false</RightClickIsPushButton>
<State>
<Number>0</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_right_off.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_right_off.svg</Unpressed>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_off.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_off.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_right_<Variable name="xfaderRight"/>.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_right_<Variable name="xfaderRight"/>.svg</Unpressed>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_<Variable name="xfaderRight"/>.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_<Variable name="xfaderRight"/>.svg</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,orientation</ConfigKey>
Expand Down
Loading