Skip to content

Commit

Permalink
Merge pull request #1489 from ronso0/LateNight-2.1-beta-tuning
Browse files Browse the repository at this point in the history 
LateNight 2.1 :: fine tuning, 4 FX units, more samplers, skin menu
  • Loading branch information
@Be-ing
Be-ing authored Feb 3, 2018
2 parents 58b9a42 + 5fee827 commit fbf7cc1
Show file tree
Hide file tree
Showing 173 changed files with 16,223 additions and 2,609 deletions.
Binary file removed res/fonts/OpenSans-Light.ttf
View file
Binary file not shown.
57 changes: 35 additions & 22 deletions res/skins/LateNight/123ToDo
View file
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
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
Binary file not shown.
Binary file removed res/skins/LateNight/background1920x1080-4.xcf.gz
View file
Binary file not shown.
32 changes: 32 additions & 0 deletions res/skins/LateNight/button_1state.xml
View file
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

0 comments on commit fbf7cc1

Please sign in to comment.