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 2.1 :: fine tuning, 4 FX units, more samplers, skin menu #1489

Merged
merged 62 commits into from
Feb 3, 2018
Merged

LateNight 2.1 :: fine tuning, 4 FX units, more samplers, skin menu #1489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
fb709f3
optimize Pfl button graphic
Jan 22, 2018
56569ce
Sampler: play right-click = cue_default
Jan 22, 2018
47f1ef6
clean up lower_half.xml
Jan 22, 2018
efb488c
display Key value in regular case
Jan 22, 2018
280aa48
Mic: increase Gain knob, redesign xFader switch, arrange controls, ce…
Jan 22, 2018
fb0de27
Aux: adapt style from Mic units
Jan 23, 2018
feef67e
Decks: increase gap when mixer is hidden
Jan 23, 2018
1f96285
Toolbar: adapt button sizes to Ubuntu font
Jan 23, 2018
3f574aa
Fx Units: increase margin
Jan 23, 2018
610337f
fix Aux label & tooltips
Jan 23, 2018
5716ed0
buttons: vectorize repeat, quantize etc. in decks & samplers
Jan 23, 2018
63cd980
Mic/Aux: vectorize TALK & PLAY button, fix layout
Jan 23, 2018
998053d
Mic: remove xFader switch
Jan 24, 2018
f1fb4ce
Mixer: add xfader switch, 4 decks only
Jan 24, 2018
236e782
big knobs: fix indicator position
Jan 24, 2018
2bf01da
repair xfader switch graphics for decks & aux
Jan 24, 2018
a61c84b
fix knob range markers
Jan 24, 2018
a63a674
lower half: make visibility connections 'more presistent'
Jan 24, 2018
c16e728
Mixer 2decks: show xFader switches if Channels are not assigned to re…
Jan 24, 2018
f01e087
vectorize xFader switches
Jan 24, 2018
93c9e8e
align 2decks-xFader-switches
Jan 24, 2018
842af10
vectorize FX unit expand/collapse button
Jan 24, 2018
b4c1b3b
sort graphics into subfolders
Jan 24, 2018
950dad3
clean up COs in skin.xml
Jan 24, 2018
7941564
use 'Open Sans' for Key, BPM, Rate, PlayPosition, Duration, Beat spin…
Jan 25, 2018
a449638
Mic: add Ducking controls
Jan 25, 2018
5c71db5
fix path to Latency meter graphics
Jan 25, 2018
fddc1f7
Sampler: make space for 8 HotCues, push Sync below pitch fader
Jan 25, 2018
a46343a
add Sampler Sync graphics
Jan 25, 2018
30c5f75
res: remove unused font 'Open Sans Light'
Jan 25, 2018
717c592
FX: unify CO that keeps 'show_parameters' persistent
Jan 25, 2018
4eb73d6
Mic: vectorize Ducking button
Jan 25, 2018
8e06222
restore effective size of big knob indicator
Jan 25, 2018
dba1bf7
Mixer: separate Master/Headphone template
Jan 26, 2018
bc45bd3
Mixer: add SplitCue button
Jan 26, 2018
4a3d8c6
Sampler: display track title only
Jan 26, 2018
d938d25
Sampler: prevent samplers from expanding if title is looong
Jan 26, 2018
a2bba3d
Mixer: detach Master/Headphone knob labels from knobs so knobs are di…
Jan 26, 2018
976b21e
simplify toolbar structure
Jan 26, 2018
555948c
Waveforms: add beatgrid edit buttons
Jan 26, 2018
fdf1f86
Preview deck: fix Eject icon
Jan 26, 2018
17cdcc6
Toolbar: fix latency meter connection
Jan 26, 2018
1143ead
Mixer: fix layout without EQs
Jan 28, 2018
17d26b4
Decks: implement Star rating
Jan 28, 2018
1eafcc3
Library: prevent OS themes from making Analyze radio buttons invisible
Jan 28, 2018
f592e7e
Library: style pushbuttons, colorize toggles in Recording & AutoDJ fe…
Jan 29, 2018
3b66801
another attempt to fix Mic/Aux & Samplers visibility persistency
Jan 29, 2018
e17e93d
Mic/Aux: add FX assign buttons, rearrange controls, fix Mic/Aux conta…
Jan 29, 2018
0fc9f95
Mixer: push Headphone knob labels further apart
Jan 29, 2018
08e649b
add 'cue_set' to decks' Play button, fix Preview Eject icon sufffix
Jan 29, 2018
ccaa8cf
fix toolbar divider icon path
Jan 29, 2018
9cd7dec
add/fix Toolbar tooltips
Jan 29, 2018
77d1da2
Toolbar: re-roder GUI quick toggles, add separators
Jan 29, 2018
b935d40
Toolbar: add Super Knobs toggle
Jan 29, 2018
446ee7f
define Star rating color, unify font colors, clean up style.qss
Jan 29, 2018
20c7ff7
make EQ Kill & QuickEffect buttons opt-out
Jan 29, 2018
0c2798d
finalize font colors, use more distinct ObjectNames in mixer
Jan 29, 2018
d8a0e49
Toolbar: make EQ Kill toggle appear only when both Mixer and EQ are e…
Feb 1, 2018
a24951f
fix text-transform for Artist, sampler title
Feb 1, 2018
4df51a7
Mixer & Fx parameter: add knob/button labels background, fix positions
Feb 2, 2018
3e0b3a6
expanded Fx unit: increase padding, fix position
Feb 2, 2018
5fee827
remove uppercase transformation from Preview deck title
Feb 3, 2018
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
Binary file removed res/fonts/OpenSans-Light.ttf
View file
Open in desktop
Binary file not shown.
57 changes: 35 additions & 22 deletions res/skins/LateNight/123ToDo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,38 @@

Decks
* introduce another deck row:
> Quantize, Keylock, ... Stars
> make overview row wider but less tall (square Cover art plus equal margin)
* test new (Hot)Cue button color: orange when set, red when pressed/playing from (Hot)Cue

Aux
General
* fix fonts: OpenSans for all numbers
* vectorize remaining buttons
* vectorize VUs, add path mask, so they are easier to resize
* clean up SVGs
* move slider/knob graphics to subfolder

Mic
* add ducking controls

Vinyl
* merge vinyl toggle & status light

Mixer
Toolbar
* re-order GUI quick toggles: decks, mixer, extras, general -- rec, clock

Sampler
* add cue_default to Play button
* make space for 8 HotCues:
> shrink Sync
> shrink VU meter & push it up

GENERAL
* re-order GUI quick toggles: decks, mixer, general
Decks
* star rating:
- beside/instead of Vinyl controls (SizeAwareStack)
- in between artist and duration
- in deck controls grid (layout varies with available height)
* don't transform Key display to uppercase
* test new (Hot)Cue button color: orange when set, red when pressed/playing from (Hot)Cue

Aux

Mic
* add ducking controls
* add cover when a Mic is not configured
= button bound to [Mic],talkover, so that Preferences will open on click

Vinyl
* merge vinyl toggle & status light

Mixer
* reduce Crossfader margin

Sampler
* make space for 8 HotCues, window at minimal size:
> shrink Sync
> shrink VU meter, put Sync below


223 changes: 151 additions & 72 deletions res/skins/LateNight/aux_unit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,92 +6,100 @@
<Children>
<WidgetGroup>
<ObjectName>MicInterior</ObjectName>
<BackPath>background_tile.png</BackPath>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<MinimumSize>75, 50</MinimumSize>
<BackPath>style/background_tile.png</BackPath>
<Layout>horizontal</Layout>
<SizePolicy>min,max</SizePolicy>
<Children>
<Label>
<ObjectName>MicSubTitle</ObjectName>
<Text>Aux <Variable name="auxnum"/></Text>
</Label>
<!-- To make each widget centered, we have to put them each in their own
widgetgroup. -->
<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,max</SizePolicy>
<MaximumSize>-1, 26</MaximumSize>

<WidgetGroup><!-- Label, TALK, orientation -->
<ObjectName>AlignCenterTop</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:knob_sized_textless.xml">
<SetVariable name="TooltipId">pregain</SetVariable>
<SetVariable name="width">28</SetVariable>
<SetVariable name="height">24</SetVariable>
<SetVariable name="control">pregain</SetVariable>
</Template>

<WidgetGroup>
<ObjectName>GuiToggleContainerPadLeft</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Label>
<ObjectName>MicSubTitle</ObjectName>
<Size>,18f</Size>
<Text>Aux <Variable name="auxnum"/></Text>
<Alignment>center</Alignment>
</Label>
</Children>
</WidgetGroup>

<WidgetGroup><!-- PLAY -->
<ObjectName>AuxMuteButton</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,max</SizePolicy>
<Children>
<PushButton>
<TooltipId>mute</TooltipId>
<Size>40f,24f</Size>
<ObjectName>GuiToggleButton</ObjectName>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>MUTE</Text>
<Pressed>buttons/btn_aux_play_down.svg</Pressed>
<Unpressed>buttons/btn_aux_play.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Text>MUTE</Text>
<Pressed>buttons/btn_aux_play_overdown.svg</Pressed>
<Unpressed>buttons/btn_aux_play_over.svg</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,mute</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
</Children>
</WidgetGroup>
</WidgetGroup><!-- /PLAY -->

<WidgetGroup>
<ObjectName>GuiToggleContainerPadLeft</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<SizePolicy>min,max</SizePolicy>
<Children>
<PushButton>
<TooltipId>pfl</TooltipId>
<NumberStates>2</NumberStates>
<TooltipId>orientation</TooltipId>
<NumberStates>3</NumberStates>
<State>
<Number>0</Number>
<Pressed>buttons/btn_pfl_down.svg</Pressed>
<Unpressed>buttons/btn_pfl.svg</Unpressed>
<Pressed>buttons/btn_orientation_aux_left.svg</Pressed>
<Unpressed>buttons/btn_orientation_aux_left.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>buttons/btn_pfl_overdown.svg</Pressed>
<Unpressed>buttons/btn_pfl_over.svg</Unpressed>
<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"/>,pfl</ConfigKey>
<ConfigKey><Variable name="group"/>,orientation</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>

</Children>
</WidgetGroup>

</Children>
</WidgetGroup>
<WidgetGroup>
</WidgetGroup><!-- Label, TALK, orientation -->

<WidgetGroup><!-- VU meter -->
<ObjectName>MicVUMeter</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<SizePolicy>max,min</SizePolicy>
<Children>
<VuMeter>
<TooltipId>channel_VuMeter</TooltipId>
<MinimumSize>64,4</MinimumSize>
<MaximumSize>64,4</MaximumSize>
<PathVu>vumeter_latency_over.png</PathVu>
<PathBack>vumeter_latency_bg_solid.png</PathBack>
<!-- <PathVu>vumeter_latency.svg</PathVu> -->
<Horizontal>true</Horizontal>
<Size>7f,59f</Size>
<PathVu>style/vumeter_mic_aux_over.png</PathVu>
<PathBack>style/vumeter_mic_aux_bg_solid.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>5</PeakHoldSize>
<PeakHoldTime>500</PeakHoldTime>
<PeakFallTime>50</PeakFallTime>
Expand All @@ -100,34 +108,105 @@
<ConfigKey><Variable name="group"/>,VuMeter</ConfigKey>
</Connection>
</VuMeter>
<PushButton>
<TooltipId>orientation</TooltipId>
<Style></Style>
<NumberStates>3</NumberStates>
<State>
<Number>0</Number>
<Pressed>buttons/btn_orientation_microphone_left_over.png</Pressed>
<Unpressed>buttons/btn_orientation_microphone_left_over.png</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>buttons/btn_orientation_microphone_master.png</Pressed>
<Unpressed>buttons/btn_orientation_microphone_master.png</Unpressed>
</State>
<State>
<Number>2</Number>
<Pressed>buttons/btn_orientation_microphone_right_over.png</Pressed>
<Unpressed>buttons/btn_orientation_microphone_right_over.png</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,orientation</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</PushButton>
</Children>
</WidgetGroup>
</WidgetGroup><!-- /VU meter -->

<WidgetGroup><!-- Gain, Pfl, FX buttons -->
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>

<WidgetGroup><!-- Gain, Pfl -->
<ObjectName>MicGainPFlContainer</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,me</SizePolicy>
<Children>
<WidgetGroup>
<ObjectName>MicGainKnob</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<Children>
<Template src="skin:knob_sized_textless.xml">
<SetVariable name="TooltipId">pregain</SetVariable>
<SetVariable name="width">36</SetVariable>
<SetVariable name="height">30</SetVariable>
<SetVariable name="group"><Variable name="group"/></SetVariable>
<SetVariable name="control">pregain</SetVariable>
</Template>
</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>

</Children>
</WidgetGroup><!-- /Gain, Pfl -->

<WidgetGroup>
<ObjectName>MicFxButtons</ObjectName>
<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>
</Children>
</WidgetGroup><!-- /FX buttons -->
</Children>
</WidgetGroup><!-- /Gain, Pfl, FX buttons -->

</Children>
</WidgetGroup>
</WidgetGroup><!-- /MicInterior -->
</Children>
</WidgetGroup>
</WidgetGroup><!-- /MicBorder -->
</Template>
Binary file removed res/skins/LateNight/background1920x1080-3.xcf.gz
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/LateNight/background1920x1080-4.xcf.gz
View file
Open in desktop
Binary file not shown.
32 changes: 32 additions & 0 deletions res/skins/LateNight/button_1state.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!--
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>1</NumberStates>
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
<Pressed>skin:/buttons/btn_<Variable name="Icon"/>_down.svg</Pressed>
<Unpressed>skin:/buttons/btn_<Variable name="Icon"/>.svg</Unpressed>
<Alignment><Variable name="Align"/></Alignment>
</State>
<Connection>
<ConfigKey><Variable name="ConfigKey"/></ConfigKey>
</Connection>
</PushButton>
</Template>
Loading