diff --git a/res/fonts/OpenSans-Light.ttf b/res/fonts/OpenSans-Light.ttf
deleted file mode 100644
index 0d381897da2..00000000000
Binary files a/res/fonts/OpenSans-Light.ttf and /dev/null differ
diff --git a/res/skins/LateNight/123ToDo b/res/skins/LateNight/123ToDo
index 10826618d56..e24ad6bf1a5 100644
--- a/res/skins/LateNight/123ToDo
+++ b/res/skins/LateNight/123ToDo
@@ -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
+
+
diff --git a/res/skins/LateNight/aux_unit.xml b/res/skins/LateNight/aux_unit.xml
index 227d54c83ee..26891a882aa 100644
--- a/res/skins/LateNight/aux_unit.xml
+++ b/res/skins/LateNight/aux_unit.xml
@@ -6,45 +6,47 @@
MicInterior
- background_tile.png
- vertical
- min,min
- 75, 50
+ style/background_tile.png
+ horizontal
+ min,max
-
-
-
- horizontal
- min,max
- -1, 26
+
+
+ AlignCenterTop
+ vertical
+ min,min
-
- pregain
- 28
- 24
- pregain
-
+
- GuiToggleContainerPadLeft
vertical
min,min
+
+
+
+
+
+
+ AuxMuteButton
+ vertical
+ min,max
mute
- 40f,24f
- GuiToggleButton
2
0
- MUTE
+ buttons/btn_aux_play_down.svg
+ buttons/btn_aux_play.svg
1
- MUTE
+ buttons/btn_aux_play_overdown.svg
+ buttons/btn_aux_play_over.svg
,mute
@@ -52,46 +54,52 @@
-
+
+
- GuiToggleContainerPadLeft
vertical
- min,min
+ min,max
- pfl
- 2
+ orientation
+ 3
0
- buttons/btn_pfl_down.svg
- buttons/btn_pfl.svg
+ buttons/btn_orientation_aux_left.svg
+ buttons/btn_orientation_aux_left.svg
1
- buttons/btn_pfl_overdown.svg
- buttons/btn_pfl_over.svg
+ buttons/btn_orientation_aux_master.svg
+ buttons/btn_orientation_aux_master.svg
+
+
+ 2
+ buttons/btn_orientation_aux_right.svg
+ buttons/btn_orientation_aux_right.svg
- ,pfl
+ ,orientation
+ LeftButton
-
+
-
-
+
+
+
+ MicVUMeter
horizontal
- min,min
+ max,min
channel_VuMeter
- 64,4
- 64,4
- vumeter_latency_over.png
- vumeter_latency_bg_solid.png
-
- true
+ 7f,59f
+ style/vumeter_mic_aux_over.png
+ style/vumeter_mic_aux_bg_solid.png
+ false
5
500
50
@@ -100,34 +108,105 @@
,VuMeter
-
- orientation
-
- 3
-
- 0
- buttons/btn_orientation_microphone_left_over.png
- buttons/btn_orientation_microphone_left_over.png
-
-
- 1
- buttons/btn_orientation_microphone_master.png
- buttons/btn_orientation_microphone_master.png
-
-
- 2
- buttons/btn_orientation_microphone_right_over.png
- buttons/btn_orientation_microphone_right_over.png
-
-
- ,orientation
- LeftButton
-
-
-
+
+
+
+ vertical
+ min,min
+
+
+
+ MicGainPFlContainer
+ horizontal
+ min,me
+
+
+ MicGainKnob
+ horizontal
+ me,me
+
+
+ pregain
+ 36
+ 30
+
+ pregain
+
+
+
+
+
+ pfl
+ MicPflButton
+ 2
+
+ 0
+ buttons/btn_pfl_down.svg
+ buttons/btn_pfl.svg
+
+
+ 1
+ buttons/btn_pfl_overdown.svg
+ buttons/btn_pfl_over.svg
+
+
+ ,pfl
+
+
+
+
+
+
+
+ MicFxButtons
+ horizontal
+ min,min
+
+
+ 35f,22f
+ EffectUnit_auxiliary_enabled
+ FxAssignButton
+ 2
+
+ 0
+ FX 1
+
+
+ 1
+ FX 1
+
+
+ [EffectRack1_EffectUnit1],group__enable
+ LeftButton
+
+
+
+
+ 35f,22f
+ EffectUnit_auxiliary_enabled
+ FxAssignButton
+ 2
+
+ 0
+ FX 2
+
+
+ 1
+ FX 2
+
+
+ [EffectRack1_EffectUnit2],group__enable
+ LeftButton
+
+
+
+
+
+
+
-
+
-
+
diff --git a/res/skins/LateNight/background1920x1080-3.xcf.gz b/res/skins/LateNight/background1920x1080-3.xcf.gz
deleted file mode 100644
index a613b6362e1..00000000000
Binary files a/res/skins/LateNight/background1920x1080-3.xcf.gz and /dev/null differ
diff --git a/res/skins/LateNight/background1920x1080-4.xcf.gz b/res/skins/LateNight/background1920x1080-4.xcf.gz
deleted file mode 100644
index 391ced38815..00000000000
Binary files a/res/skins/LateNight/background1920x1080-4.xcf.gz and /dev/null differ
diff --git a/res/skins/LateNight/button_1state.xml b/res/skins/LateNight/button_1state.xml
new file mode 100644
index 00000000000..ad87cee3313
--- /dev/null
+++ b/res/skins/LateNight/button_1state.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+ 1
+
+ 0
+
+ skin:/buttons/btn__down.svg
+ skin:/buttons/btn_.svg
+
+
+
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_aux_play.svg b/res/skins/LateNight/buttons/btn_aux_play.svg
new file mode 100644
index 00000000000..993d8eadb9f
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_aux_play.svg
@@ -0,0 +1,1004 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_aux_play_down.svg b/res/skins/LateNight/buttons/btn_aux_play_down.svg
new file mode 100644
index 00000000000..034e1033969
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_aux_play_down.svg
@@ -0,0 +1,1067 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_aux_play_over.svg b/res/skins/LateNight/buttons/btn_aux_play_over.svg
new file mode 100644
index 00000000000..53fac486a7e
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_aux_play_over.svg
@@ -0,0 +1,1213 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_aux_play_overdown.svg b/res/skins/LateNight/buttons/btn_aux_play_overdown.svg
new file mode 100644
index 00000000000..1f206828dcc
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_aux_play_overdown.svg
@@ -0,0 +1,1137 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos.png b/res/skins/LateNight/buttons/btn_beat_curpos.png
deleted file mode 100644
index e3276d7c8db..00000000000
Binary files a/res/skins/LateNight/buttons/btn_beat_curpos.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos.svg b/res/skins/LateNight/buttons/btn_beat_curpos.svg
index efb1fe6f46a..74fc3fa4f00 100644
--- a/res/skins/LateNight/buttons/btn_beat_curpos.svg
+++ b/res/skins/LateNight/buttons/btn_beat_curpos.svg
@@ -27,7 +27,7 @@
-
-
-
+ d="m 4,12 0,2 2,0 0,-2 z"
+ id="path3805-9"
+ style="fill:#585858;fill-opacity:1" />
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos_large.svg b/res/skins/LateNight/buttons/btn_beat_curpos_large.svg
new file mode 100644
index 00000000000..71426bb4fdc
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beat_curpos_large.svg
@@ -0,0 +1,80 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos_large_down.svg b/res/skins/LateNight/buttons/btn_beat_curpos_large_down.svg
new file mode 100644
index 00000000000..266ae63ef92
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beat_curpos_large_down.svg
@@ -0,0 +1,80 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos_over.png b/res/skins/LateNight/buttons/btn_beat_curpos_over.png
deleted file mode 100644
index fdb7353b93c..00000000000
Binary files a/res/skins/LateNight/buttons/btn_beat_curpos_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos_over.svg b/res/skins/LateNight/buttons/btn_beat_curpos_over.svg
new file mode 100644
index 00000000000..c2e7d853ba2
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beat_curpos_over.svg
@@ -0,0 +1,49 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beatgrid2.png b/res/skins/LateNight/buttons/btn_beatgrid2.png
deleted file mode 100644
index 669601fa9c0..00000000000
Binary files a/res/skins/LateNight/buttons/btn_beatgrid2.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_beatgrid2_over.png b/res/skins/LateNight/buttons/btn_beatgrid2_over.png
deleted file mode 100644
index 6e6a8968ebb..00000000000
Binary files a/res/skins/LateNight/buttons/btn_beatgrid2_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_beatgrid_buttons_toggle.svg b/res/skins/LateNight/buttons/btn_beatgrid_buttons_toggle.svg
new file mode 100644
index 00000000000..688813dede2
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beatgrid_buttons_toggle.svg
@@ -0,0 +1,92 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beats_curpos.svg b/res/skins/LateNight/buttons/btn_beats_curpos.svg
new file mode 100644
index 00000000000..7f3b2ce6e37
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beats_curpos.svg
@@ -0,0 +1,32 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beats_earlier.svg b/res/skins/LateNight/buttons/btn_beats_earlier.svg
new file mode 100644
index 00000000000..d4fbb8ac758
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beats_earlier.svg
@@ -0,0 +1,52 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beats_earlier_down.svg b/res/skins/LateNight/buttons/btn_beats_earlier_down.svg
new file mode 100644
index 00000000000..f5bf0f90c97
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beats_earlier_down.svg
@@ -0,0 +1,52 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beats_faster.svg b/res/skins/LateNight/buttons/btn_beats_faster.svg
new file mode 100644
index 00000000000..3ede8826353
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beats_faster.svg
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beats_faster_down.svg b/res/skins/LateNight/buttons/btn_beats_faster_down.svg
new file mode 100644
index 00000000000..6e4b3696748
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beats_faster_down.svg
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beats_later.svg b/res/skins/LateNight/buttons/btn_beats_later.svg
new file mode 100644
index 00000000000..17bcaf2e342
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beats_later.svg
@@ -0,0 +1,52 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beats_later_down.svg b/res/skins/LateNight/buttons/btn_beats_later_down.svg
new file mode 100644
index 00000000000..9f036e52eb7
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beats_later_down.svg
@@ -0,0 +1,52 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beats_slower.svg b/res/skins/LateNight/buttons/btn_beats_slower.svg
new file mode 100644
index 00000000000..41098050591
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beats_slower.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_beats_slower_down.svg b/res/skins/LateNight/buttons/btn_beats_slower_down.svg
new file mode 100644
index 00000000000..0f3e4db73b2
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beats_slower_down.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_clear.png b/res/skins/LateNight/buttons/btn_clear.png
deleted file mode 100644
index 3e4a3965a95..00000000000
Binary files a/res/skins/LateNight/buttons/btn_clear.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_clear_down.png b/res/skins/LateNight/buttons/btn_clear_down.png
deleted file mode 100644
index 36e317888db..00000000000
Binary files a/res/skins/LateNight/buttons/btn_clear_down.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_eject.svg b/res/skins/LateNight/buttons/btn_eject.svg
new file mode 100644
index 00000000000..b651dc0a22f
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_eject.svg
@@ -0,0 +1,40 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_eject1.png b/res/skins/LateNight/buttons/btn_eject1.png
deleted file mode 100644
index 3a19a5b34b3..00000000000
Binary files a/res/skins/LateNight/buttons/btn_eject1.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_eject1_over.png b/res/skins/LateNight/buttons/btn_eject1_over.png
deleted file mode 100644
index efd0f796c39..00000000000
Binary files a/res/skins/LateNight/buttons/btn_eject1_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_eject2.png b/res/skins/LateNight/buttons/btn_eject2.png
deleted file mode 100644
index 3a19a5b34b3..00000000000
Binary files a/res/skins/LateNight/buttons/btn_eject2.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_eject2_over.png b/res/skins/LateNight/buttons/btn_eject2_over.png
deleted file mode 100644
index efd0f796c39..00000000000
Binary files a/res/skins/LateNight/buttons/btn_eject2_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_eject_over.svg b/res/skins/LateNight/buttons/btn_eject_over.svg
new file mode 100644
index 00000000000..96abbecf951
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_eject_over.svg
@@ -0,0 +1,40 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_eject_sampler.png b/res/skins/LateNight/buttons/btn_eject_sampler.png
deleted file mode 100644
index e9478e40412..00000000000
Binary files a/res/skins/LateNight/buttons/btn_eject_sampler.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_eject_sampler_over.png b/res/skins/LateNight/buttons/btn_eject_sampler_over.png
deleted file mode 100644
index 1891923bd6a..00000000000
Binary files a/res/skins/LateNight/buttons/btn_eject_sampler_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_fxCollapse.png b/res/skins/LateNight/buttons/btn_fxCollapse.png
deleted file mode 100644
index 46c388a35b7..00000000000
Binary files a/res/skins/LateNight/buttons/btn_fxCollapse.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_fxCollapse.svg b/res/skins/LateNight/buttons/btn_fxCollapse.svg
new file mode 100644
index 00000000000..d9e2bd7f2be
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_fxCollapse.svg
@@ -0,0 +1,176 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_fxExpand.png b/res/skins/LateNight/buttons/btn_fxExpand.png
deleted file mode 100644
index 60fe073c995..00000000000
Binary files a/res/skins/LateNight/buttons/btn_fxExpand.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_fxExpand.svg b/res/skins/LateNight/buttons/btn_fxExpand.svg
new file mode 100644
index 00000000000..cd566ec4474
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_fxExpand.svg
@@ -0,0 +1,175 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_fxParameter_over.svg b/res/skins/LateNight/buttons/btn_fxParameter_over.svg
index 36058e8cbe1..a38d1e23858 100644
--- a/res/skins/LateNight/buttons/btn_fxParameter_over.svg
+++ b/res/skins/LateNight/buttons/btn_fxParameter_over.svg
@@ -87,6 +87,42 @@
xlink:href="#linearGradient3801-6-9-9"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(50.5,-5.0000348)" />
+
+
+
+
@@ -100,39 +136,18 @@
-
-
-
-
-
-
-
-
+
+
diff --git a/res/skins/LateNight/buttons/btn_keylock.svg b/res/skins/LateNight/buttons/btn_keylock.svg
new file mode 100644
index 00000000000..5bac6dabcf1
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_keylock.svg
@@ -0,0 +1,33 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_keylock2.png b/res/skins/LateNight/buttons/btn_keylock2.png
deleted file mode 100644
index 06afab7e2bb..00000000000
Binary files a/res/skins/LateNight/buttons/btn_keylock2.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_keylock2_over.png b/res/skins/LateNight/buttons/btn_keylock2_over.png
deleted file mode 100644
index 0ad1537c1ef..00000000000
Binary files a/res/skins/LateNight/buttons/btn_keylock2_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_keylock_over.svg b/res/skins/LateNight/buttons/btn_keylock_over.svg
new file mode 100644
index 00000000000..376969718a0
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_keylock_over.svg
@@ -0,0 +1,33 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_keylock_sampler.png b/res/skins/LateNight/buttons/btn_keylock_sampler.png
deleted file mode 100644
index 06afab7e2bb..00000000000
Binary files a/res/skins/LateNight/buttons/btn_keylock_sampler.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_keylock_sampler_over.png b/res/skins/LateNight/buttons/btn_keylock_sampler_over.png
deleted file mode 100644
index 06685d099fa..00000000000
Binary files a/res/skins/LateNight/buttons/btn_keylock_sampler_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_lib_radio_button_off.svg b/res/skins/LateNight/buttons/btn_lib_radio_button_off.svg
new file mode 100644
index 00000000000..1fec6d85c5a
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_lib_radio_button_off.svg
@@ -0,0 +1,33 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_lib_radio_button_on.svg b/res/skins/LateNight/buttons/btn_lib_radio_button_on.svg
new file mode 100644
index 00000000000..03cc2fb8480
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_lib_radio_button_on.svg
@@ -0,0 +1,37 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_micDuck.svg b/res/skins/LateNight/buttons/btn_micDuck.svg
new file mode 100644
index 00000000000..fbc9e48c97b
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_micDuck.svg
@@ -0,0 +1,627 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_micDuck_over.svg b/res/skins/LateNight/buttons/btn_micDuck_over.svg
new file mode 100644
index 00000000000..cf3759c5514
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_micDuck_over.svg
@@ -0,0 +1,652 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_microphone_talkover.png b/res/skins/LateNight/buttons/btn_microphone_talkover.png
deleted file mode 100644
index 434e62f919d..00000000000
Binary files a/res/skins/LateNight/buttons/btn_microphone_talkover.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_microphone_talkover.svg b/res/skins/LateNight/buttons/btn_microphone_talkover.svg
new file mode 100644
index 00000000000..57500244554
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_microphone_talkover.svg
@@ -0,0 +1,1001 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_microphone_talkover_down.png b/res/skins/LateNight/buttons/btn_microphone_talkover_down.png
deleted file mode 100644
index 1148d0203f6..00000000000
Binary files a/res/skins/LateNight/buttons/btn_microphone_talkover_down.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_microphone_talkover_down.svg b/res/skins/LateNight/buttons/btn_microphone_talkover_down.svg
new file mode 100644
index 00000000000..e671b7ea31b
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_microphone_talkover_down.svg
@@ -0,0 +1,1061 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_microphone_talkover_over.png b/res/skins/LateNight/buttons/btn_microphone_talkover_over.png
deleted file mode 100644
index c7e6f995960..00000000000
Binary files a/res/skins/LateNight/buttons/btn_microphone_talkover_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_microphone_talkover_over.svg b/res/skins/LateNight/buttons/btn_microphone_talkover_over.svg
new file mode 100644
index 00000000000..be20aec7d13
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_microphone_talkover_over.svg
@@ -0,0 +1,1210 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_microphone_talkover_overdown.png b/res/skins/LateNight/buttons/btn_microphone_talkover_overdown.png
deleted file mode 100644
index 190e1d40263..00000000000
Binary files a/res/skins/LateNight/buttons/btn_microphone_talkover_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_microphone_talkover_overdown.svg b/res/skins/LateNight/buttons/btn_microphone_talkover_overdown.svg
new file mode 100644
index 00000000000..e047cc9035b
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_microphone_talkover_overdown.svg
@@ -0,0 +1,1131 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_aux_left.svg b/res/skins/LateNight/buttons/btn_orientation_aux_left.svg
new file mode 100644
index 00000000000..e96c6111cd0
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_aux_left.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_aux_master.svg b/res/skins/LateNight/buttons/btn_orientation_aux_master.svg
new file mode 100644
index 00000000000..eb9abaa7119
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_aux_master.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_aux_right.svg b/res/skins/LateNight/buttons/btn_orientation_aux_right.svg
new file mode 100644
index 00000000000..f17c836d227
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_aux_right.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_deckLeft_left.svg b/res/skins/LateNight/buttons/btn_orientation_deckLeft_left.svg
new file mode 100644
index 00000000000..7ace55a57ed
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_deckLeft_left.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_deckLeft_right.svg b/res/skins/LateNight/buttons/btn_orientation_deckLeft_right.svg
new file mode 100644
index 00000000000..273962602b3
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_deckLeft_right.svg
@@ -0,0 +1,61 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_deckRight_left.svg b/res/skins/LateNight/buttons/btn_orientation_deckRight_left.svg
new file mode 100644
index 00000000000..584a45d7117
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_deckRight_left.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_deckRight_right.svg b/res/skins/LateNight/buttons/btn_orientation_deckRight_right.svg
new file mode 100644
index 00000000000..ee03cb2955a
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_deckRight_right.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_deck_master.svg b/res/skins/LateNight/buttons/btn_orientation_deck_master.svg
new file mode 100644
index 00000000000..7837d7e35e5
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_deck_master.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_microphone_left_over.png b/res/skins/LateNight/buttons/btn_orientation_microphone_left_over.png
deleted file mode 100644
index a9ca27df02c..00000000000
Binary files a/res/skins/LateNight/buttons/btn_orientation_microphone_left_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_orientation_microphone_master.png b/res/skins/LateNight/buttons/btn_orientation_microphone_master.png
deleted file mode 100644
index 529c1a93717..00000000000
Binary files a/res/skins/LateNight/buttons/btn_orientation_microphone_master.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_orientation_microphone_right_over.png b/res/skins/LateNight/buttons/btn_orientation_microphone_right_over.png
deleted file mode 100644
index 2ff5f7542f4..00000000000
Binary files a/res/skins/LateNight/buttons/btn_orientation_microphone_right_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_orientation_sampler_left.svg b/res/skins/LateNight/buttons/btn_orientation_sampler_left.svg
new file mode 100644
index 00000000000..89966508b0d
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_sampler_left.svg
@@ -0,0 +1,50 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_sampler_left_over.png b/res/skins/LateNight/buttons/btn_orientation_sampler_left_over.png
deleted file mode 100644
index a9ca27df02c..00000000000
Binary files a/res/skins/LateNight/buttons/btn_orientation_sampler_left_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_orientation_sampler_master.png b/res/skins/LateNight/buttons/btn_orientation_sampler_master.png
deleted file mode 100644
index d5cd3838449..00000000000
Binary files a/res/skins/LateNight/buttons/btn_orientation_sampler_master.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_orientation_sampler_master.svg b/res/skins/LateNight/buttons/btn_orientation_sampler_master.svg
new file mode 100644
index 00000000000..84cee7ee011
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_sampler_master.svg
@@ -0,0 +1,53 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_sampler_right.svg b/res/skins/LateNight/buttons/btn_orientation_sampler_right.svg
new file mode 100644
index 00000000000..1b5d3a98eec
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_orientation_sampler_right.svg
@@ -0,0 +1,50 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_orientation_sampler_right_over.png b/res/skins/LateNight/buttons/btn_orientation_sampler_right_over.png
deleted file mode 100644
index 2ff5f7542f4..00000000000
Binary files a/res/skins/LateNight/buttons/btn_orientation_sampler_right_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_pfl.svg b/res/skins/LateNight/buttons/btn_pfl.svg
index ea4c671137e..91067622920 100644
--- a/res/skins/LateNight/buttons/btn_pfl.svg
+++ b/res/skins/LateNight/buttons/btn_pfl.svg
@@ -404,32 +404,20 @@
d="m 55,-19 -5,0 0,13 1,0 0,-7 4,0 0,-6"
id="path9817-6-4"
style="fill:#bfbfbf;fill-opacity:1;stroke:none;display:none" />
-
-
-
-
-
-
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_pfl_down.svg b/res/skins/LateNight/buttons/btn_pfl_down.svg
index ada68d8f8c1..47b120d3be7 100644
--- a/res/skins/LateNight/buttons/btn_pfl_down.svg
+++ b/res/skins/LateNight/buttons/btn_pfl_down.svg
@@ -318,32 +318,20 @@
d="m 9,10 0,3 5,0 0,2 2,0 0,-6 -2,0 0,3 -3,0 0,-2 -2,0"
id="path6751-6-3-5"
style="fill:#8d8f90;fill-opacity:1;stroke:none;display:none" />
-
-
-
-
-
-
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_pfl_over.svg b/res/skins/LateNight/buttons/btn_pfl_over.svg
index 688caf93b8a..1e2f34eb5c0 100644
--- a/res/skins/LateNight/buttons/btn_pfl_over.svg
+++ b/res/skins/LateNight/buttons/btn_pfl_over.svg
@@ -386,6 +386,15 @@
xlink:href="#linearGradient3801-6-9-9-1"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-2076.7244)" />
+
@@ -399,46 +408,26 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_pfl_overdown.svg b/res/skins/LateNight/buttons/btn_pfl_overdown.svg
index 0bb66417bd4..6ccfd6c7312 100644
--- a/res/skins/LateNight/buttons/btn_pfl_overdown.svg
+++ b/res/skins/LateNight/buttons/btn_pfl_overdown.svg
@@ -182,32 +182,20 @@
d="m 55,-19 -5,0 0,13 1,0 0,-7 4,0 0,-6"
id="path9817-6"
style="fill:#8d8f90;fill-opacity:1;stroke:none;display:none" />
-
-
-
-
-
-
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_quantize.svg b/res/skins/LateNight/buttons/btn_quantize.svg
new file mode 100644
index 00000000000..f3571c4d97e
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_quantize.svg
@@ -0,0 +1,41 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_quantize2.png b/res/skins/LateNight/buttons/btn_quantize2.png
deleted file mode 100644
index a8159b9eba1..00000000000
Binary files a/res/skins/LateNight/buttons/btn_quantize2.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_quantize2_over.png b/res/skins/LateNight/buttons/btn_quantize2_over.png
deleted file mode 100644
index f0ddcc5f1b1..00000000000
Binary files a/res/skins/LateNight/buttons/btn_quantize2_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_quantize_over.svg b/res/skins/LateNight/buttons/btn_quantize_over.svg
new file mode 100644
index 00000000000..bfe719a97cf
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_quantize_over.svg
@@ -0,0 +1,41 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_repeat.svg b/res/skins/LateNight/buttons/btn_repeat.svg
new file mode 100644
index 00000000000..29d11aa9c04
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_repeat.svg
@@ -0,0 +1,47 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_repeat2.png b/res/skins/LateNight/buttons/btn_repeat2.png
deleted file mode 100644
index 3ba581b9157..00000000000
Binary files a/res/skins/LateNight/buttons/btn_repeat2.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_repeat2_over.png b/res/skins/LateNight/buttons/btn_repeat2_over.png
deleted file mode 100644
index 5aeb7eecbc0..00000000000
Binary files a/res/skins/LateNight/buttons/btn_repeat2_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_repeat_over.svg b/res/skins/LateNight/buttons/btn_repeat_over.svg
new file mode 100644
index 00000000000..cf712196542
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_repeat_over.svg
@@ -0,0 +1,47 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_repeat_sampler.png b/res/skins/LateNight/buttons/btn_repeat_sampler.png
deleted file mode 100644
index 3ba581b9157..00000000000
Binary files a/res/skins/LateNight/buttons/btn_repeat_sampler.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_repeat_sampler_over.png b/res/skins/LateNight/buttons/btn_repeat_sampler_over.png
deleted file mode 100644
index 84fdc89cfa1..00000000000
Binary files a/res/skins/LateNight/buttons/btn_repeat_sampler_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_skinsettings_on.svg b/res/skins/LateNight/buttons/btn_skinsettings_on.svg
new file mode 100644
index 00000000000..e3a50e0b14e
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_skinsettings_on.svg
@@ -0,0 +1,138 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_slip.png b/res/skins/LateNight/buttons/btn_slip.png
deleted file mode 100644
index f2e50f4946f..00000000000
Binary files a/res/skins/LateNight/buttons/btn_slip.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_slip.svg b/res/skins/LateNight/buttons/btn_slip.svg
index ee774e38db2..df3bcb7e28f 100644
--- a/res/skins/LateNight/buttons/btn_slip.svg
+++ b/res/skins/LateNight/buttons/btn_slip.svg
@@ -1,19 +1,17 @@
+
+
diff --git a/res/skins/LateNight/buttons/btn_slip_over.png b/res/skins/LateNight/buttons/btn_slip_over.png
deleted file mode 100644
index b695861864d..00000000000
Binary files a/res/skins/LateNight/buttons/btn_slip_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_slip_over.svg b/res/skins/LateNight/buttons/btn_slip_over.svg
new file mode 100644
index 00000000000..c209ea577d4
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_slip_over.svg
@@ -0,0 +1,38 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_spinny1.png b/res/skins/LateNight/buttons/btn_spinny1.png
deleted file mode 100644
index 3e3c941ae7d..00000000000
Binary files a/res/skins/LateNight/buttons/btn_spinny1.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_spinny1_over.png b/res/skins/LateNight/buttons/btn_spinny1_over.png
deleted file mode 100644
index bede13b1f0c..00000000000
Binary files a/res/skins/LateNight/buttons/btn_spinny1_over.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons/btn_sync_sampler.svg b/res/skins/LateNight/buttons/btn_sync_sampler.svg
new file mode 100644
index 00000000000..3ccd22ca780
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_sync_sampler.svg
@@ -0,0 +1,661 @@
+
+
+
+
diff --git a/res/skins/LateNight/buttons/btn_sync_sampler_overdown.svg b/res/skins/LateNight/buttons/btn_sync_sampler_overdown.svg
new file mode 100644
index 00000000000..cbd9dc2708f
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_sync_sampler_overdown.svg
@@ -0,0 +1,432 @@
+
+
+
+
diff --git a/res/skins/LateNight/deck.xml b/res/skins/LateNight/deck.xml
index e191d44f738..b489437389d 100644
--- a/res/skins/LateNight/deck.xml
+++ b/res/skins/LateNight/deck.xml
@@ -288,7 +288,6 @@
- ToolbarButtons
- horizontal
+ DeckControls
+ vertical
+
+ 0min,0me
+
+
+ DeckStars
+ starrating
+
+
+
+ 0min,0me
+
+
- ToggleRowOne
- vertical
+ horizontal
@@ -75,13 +87,13 @@
2
0
- buttons/btn_slip.png
- buttons/btn_slip.png
+ buttons/btn_slip.svg
+ buttons/btn_slip.svg
1
- buttons/btn_slip_over.png
- buttons/btn_slip_over.png
+ buttons/btn_slip_over.svg
+ buttons/btn_slip_over.svg
,slip_enabled
@@ -89,81 +101,81 @@
- repeat
+ quantize
2
0
- buttons/btn_repeat2.png
- buttons/btn_repeat2.png
+ buttons/btn_quantize.svg
+ buttons/btn_quantize.svg
1
- buttons/btn_repeat2_over.png
- buttons/btn_repeat2_over.png
+ buttons/btn_quantize_over.svg
+ buttons/btn_quantize_over.svg
- ,repeat
+ ,quantize
+ LeftButton
- eject
-
+ beats_translate_curpos
1
+ true
0
- buttons/btn_eject2_over.png
- buttons/btn_eject2.png
+ buttons/btn_beat_curpos_over.svg
+ buttons/btn_beat_curpos.svg
- ,eject
+ ,beats_translate_curpos
+ true
LeftButton
+
+ ,beats_translate_match_alignment
+ true
+ RightButton
+
-
+
+
- vertical
+ horizontal
- beats_translate_curpos
+ eject
1
- true
0
- buttons/btn_beat_curpos_over.png
- buttons/btn_beat_curpos.png
+ buttons/btn_eject_over.svg
+ buttons/btn_eject.svg
- ,beats_translate_curpos
- true
+ ,eject
LeftButton
-
- ,beats_translate_match_alignment
- true
- RightButton
-
- quantize
+ repeat
2
0
- buttons/btn_quantize2.png
- buttons/btn_quantize2.png
+ buttons/btn_repeat.svg
+ buttons/btn_repeat.svg
1
- buttons/btn_quantize2_over.png
- buttons/btn_quantize2_over.png
+ buttons/btn_repeat_over.svg
+ buttons/btn_repeat_over.svg
- ,quantize
- LeftButton
+ ,repeat
@@ -172,13 +184,13 @@
2
0
- buttons/btn_keylock2.png
- buttons/btn_keylock2.png
+ buttons/btn_keylock.svg
+ buttons/btn_keylock.svg
1
- buttons/btn_keylock2_over.png
- buttons/btn_keylock2_over.png
+ buttons/btn_keylock_over.svg
+ buttons/btn_keylock_over.svg
,keylock
@@ -186,7 +198,10 @@
-
+
+
+ 0min,0me
+
diff --git a/res/skins/LateNight/deck_row_5_transportLoopJump.xml b/res/skins/LateNight/deck_row_5_transportLoopJump.xml
index f849f148937..a8c58d4dd0b 100644
--- a/res/skins/LateNight/deck_row_5_transportLoopJump.xml
+++ b/res/skins/LateNight/deck_row_5_transportLoopJump.xml
@@ -1,8 +1,8 @@
- DeckButtons
+ DeckRow_5_LoopCuesTransport
min,min
- background_tile.png
+ style/background_tile.png
horizontal
@@ -138,7 +138,7 @@
f,min
- PlayCue
+ PlayCueRevHotCues
horizontal
@@ -316,7 +316,7 @@
- PlayCue
+ PlayCueRevHotCues
horizontal
@@ -453,6 +453,10 @@
,play
LeftButton
+
+ ,cue_set
+ RigtButton
+
,play_indicator
diff --git a/res/skins/LateNight/eq_knob_left.xml b/res/skins/LateNight/eq_knob_left.xml
index 3b54f9ab8f6..0b921b972f6 100644
--- a/res/skins/LateNight/eq_knob_left.xml
+++ b/res/skins/LateNight/eq_knob_left.xml
@@ -25,6 +25,10 @@
button_parameter
+
+ [Master],show_eq_kill_buttons
+ visible
+
@@ -38,7 +42,7 @@
skin:knob_bg.svg
- -1.602
+ 1.598
,parameter
diff --git a/res/skins/LateNight/eq_knob_right.xml b/res/skins/LateNight/eq_knob_right.xml
index c81e9a77f4c..cfebd6b46b7 100644
--- a/res/skins/LateNight/eq_knob_right.xml
+++ b/res/skins/LateNight/eq_knob_right.xml
@@ -22,7 +22,7 @@
skin:knob_bg.svg
- -1.602
+ 1.598
,parameter
@@ -43,6 +43,10 @@
button_parameter
+
+ [Master],show_eq_kill_buttons
+ visible
+
diff --git a/res/skins/LateNight/fx_parameter_button.xml b/res/skins/LateNight/fx_parameter_button.xml
index 0560a57b787..58ac70d5a8d 100644
--- a/res/skins/LateNight/fx_parameter_button.xml
+++ b/res/skins/LateNight/fx_parameter_button.xml
@@ -29,15 +29,23 @@
-
- 1min,14f
- KnobLabel
-
-
-
-
- center
-
+
+ horizontal
+ me,min
+
+ me,min
+
+ FxButtonLabel
+
+
+
+
+ center
+
+ me,min
+
+
+
diff --git a/res/skins/LateNight/fx_parameter_knob.xml b/res/skins/LateNight/fx_parameter_knob.xml
index 01ea52fb04c..a28cd012935 100644
--- a/res/skins/LateNight/fx_parameter_knob.xml
+++ b/res/skins/LateNight/fx_parameter_knob.xml
@@ -14,14 +14,14 @@
FxKnobContainer
vertical
- 60f,48f
+ 60f,-1me
1min,1f
stacked
- 26me,38f
+ 26me,1min
EffectKnob
@@ -41,15 +41,24 @@
-
- 1min,40f
- FxKnobLabel
-
-
-
-
- center
-
+
+ AlignBottom
+ horizontal
+ 40me,38f
+
+ me,min
+
+ FxKnobLabel
+
+
+
+
+ center
+
+ me,min
+
+
+
@@ -69,7 +78,7 @@
EffectSlot_parameter_inversion
FxSuperLinkInvertButton
- 60f,5f
+ 60f,7f
,parameter_link_inverse
diff --git a/res/skins/LateNight/fx_unit_parameters_hidden.xml b/res/skins/LateNight/fx_unit_parameters_hidden.xml
index 0d7e3fb3335..60fdc0b91b5 100644
--- a/res/skins/LateNight/fx_unit_parameters_hidden.xml
+++ b/res/skins/LateNight/fx_unit_parameters_hidden.xml
@@ -21,7 +21,7 @@
EffectRows
me,min
horizontal
- background_tile.png
+ style/background_tile.png
0min,1me
@@ -68,7 +68,7 @@
EffectUnitControls
horizontal
- max,max
+ max,min
5f,
@@ -108,6 +108,8 @@
+
+ 1f,
diff --git a/res/skins/LateNight/fx_unit_parameters_visible.xml b/res/skins/LateNight/fx_unit_parameters_visible.xml
index 7bc19332602..17c4779c5e8 100644
--- a/res/skins/LateNight/fx_unit_parameters_visible.xml
+++ b/res/skins/LateNight/fx_unit_parameters_visible.xml
@@ -22,7 +22,7 @@
EffectRows
me,me
vertical
- background_tile.png
+ style/background_tile.png
1
@@ -52,7 +52,7 @@
FxUnit_ExpandCollapseButton
- ,3me
+ ,5f
FxUnit_DryWetKnob
@@ -62,8 +62,7 @@
vertical
min,me
- ,3me
-
+ ,5f
FxUnit_SuperKnob
@@ -74,13 +73,13 @@
- ,3me
+ ,7f
FxUnit_PflButton
- ,3f
+ ,5me
diff --git a/res/skins/LateNight/fx_units_12.xml b/res/skins/LateNight/fx_units_12.xml
index 6448b121688..100d5f7cc25 100644
--- a/res/skins/LateNight/fx_units_12.xml
+++ b/res/skins/LateNight/fx_units_12.xml
@@ -17,19 +17,19 @@
EffectUnit_show_parameters
- 40f,26f
+ 39f,24f
2
true
0
- skin:/buttons/btn_fxExpand.png
- skin:/buttons/btn_fxExpand.png
+ skin:/buttons/btn_fxExpand.svg
+ skin:/buttons/btn_fxExpand.svg
FX 1
1
- skin:/buttons/btn_fxCollapse.png
- skin:/buttons/btn_fxCollapse.png
+ skin:/buttons/btn_fxCollapse.svg
+ skin:/buttons/btn_fxCollapse.svg
FX 1
@@ -51,19 +51,19 @@
EffectUnit_show_parameters
- 40f,26f
+ 39f,24f
2
true
0
- skin:/buttons/btn_fxExpand.png
- skin:/buttons/btn_fxExpand.png
+ skin:/buttons/btn_fxExpand.svg
+ skin:/buttons/btn_fxExpand.svg
FX 2
1
- skin:/buttons/btn_fxCollapse.png
- skin:/buttons/btn_fxCollapse.png
+ skin:/buttons/btn_fxCollapse.svg
+ skin:/buttons/btn_fxCollapse.svg
FX 2
@@ -217,31 +217,31 @@
horizontal
me,max
-
+
me,min
-
-
- EffUnit1_maxi
+
+ EffUnit1_mini
vertical
- me,max
+ me,min
-
+
1
+ 1min,0me
-
- EffUnit1_mini
+
+
+ EffUnit1_maxi
vertical
- me,min
+ me,max
-
+
1
- 1min,0me
@@ -249,29 +249,29 @@
-
+
me,min
-
-
+
vertical
me,min
-
+
2
+ 1min,0me
-
+
+
vertical
me,min
-
+
2
- 1min,0me
diff --git a/res/skins/LateNight/knob_bg.svg b/res/skins/LateNight/knob_bg.svg
index 62a95397017..72c6e012be6 100644
--- a/res/skins/LateNight/knob_bg.svg
+++ b/res/skins/LateNight/knob_bg.svg
@@ -8,334 +8,341 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
width="40"
height="34"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.4 r9939"
- sodipodi:docname="knob_bg.svg">
+ id="svg2">
+ id="stop4939"
+ style="stop-color:#e90808;stop-opacity:1"
+ offset="0" />
+ id="stop4941"
+ style="stop-color:#b60000;stop-opacity:1"
+ offset="1" />
+ id="stop3941"
+ style="stop-color:#eece33;stop-opacity:0.95054942"
+ offset="0" />
+ style="stop-color:#ff734e;stop-opacity:0.8186813"
+ offset="0.61061949" />
+ id="stop3943"
+ style="stop-color:#ff2d2d;stop-opacity:0"
+ offset="1" />
+ style="stop-color:#b9dcff;stop-opacity:1"
+ offset="0" />
+ style="stop-color:#0d0d0d;stop-opacity:1"
+ offset="1" />
+ id="stop5443"
+ style="stop-color:#060606;stop-opacity:1"
+ offset="0" />
+ id="stop5445"
+ style="stop-color:#343434;stop-opacity:1"
+ offset="1" />
+ id="stop5443-2"
+ style="stop-color:#060606;stop-opacity:1"
+ offset="0" />
+ id="stop5445-4"
+ style="stop-color:#2a2a2a;stop-opacity:1"
+ offset="1" />
+ id="stop5443-4"
+ style="stop-color:#060606;stop-opacity:1"
+ offset="0" />
+ id="stop5445-7"
+ style="stop-color:#2a2a2a;stop-opacity:1"
+ offset="1" />
+ y2="506.3692"
+ id="linearGradient5573-4"
+ xlink:href="#linearGradient5441-4-6"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)" />
+ id="stop5443-2-5"
+ style="stop-color:#060606;stop-opacity:1"
+ offset="0" />
+ id="stop5445-4-9"
+ style="stop-color:#2a2a2a;stop-opacity:1"
+ offset="1" />
+ id="radialGradient3945"
+ xlink:href="#linearGradient3939"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)" />
-
+
+ y2="472.02954"
+ id="linearGradient5267"
+ xlink:href="#linearGradient5441"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(33.231373,11.944343)" />
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+ y2="472.02954"
+ id="linearGradient3839"
+ xlink:href="#linearGradient5441"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(33.231373,11.944343)" />
+
+
+
+
+
+
+ id="radialGradient4947-3"
+ xlink:href="#linearGradient3939-5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+
+
+
+
+
+
-
@@ -344,104 +351,75 @@
image/svg+xml
-
+
-
-
-
-
-
-
-
+ style="display:inline">
+ style="opacity:0.94000005;display:inline">
+ style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:11.79993725;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-
-
+ style="display:inline">
+ id="path4669-1-shadow"
+ style="fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:11.79993725;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+
+
+
+
+ d="m 516.41339,506.23793 c 4.36416,-24.17368 2.9091,-49.74094 -5.40625,-74.6875 -15.35754,-46.0736 -50.70669,-79.86553 -93.1875,-94.9375 0,0 -20.697,-8.14015 -50.19834,-8.20231 -29.50134,-0.0622 -50.92666,8.20231 -50.92666,8.20231 -70.74581,25.01887 -111.59378,97.57954 -98.5625,169.625"
+ id="path4669-1"
+ style="fill:none;stroke:#585858;stroke-width:11.79993725;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-
-
-
-
+
+
+
+
+
diff --git a/res/skins/LateNight/knob_indicator.svg b/res/skins/LateNight/knob_indicator.svg
index 2c7588a2e09..146ed652a3f 100644
--- a/res/skins/LateNight/knob_indicator.svg
+++ b/res/skins/LateNight/knob_indicator.svg
@@ -8,363 +8,366 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="40"
- height="40"
- id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
- sodipodi:docname="knob_indicator.svg">
+ width="40"
+ height="34"
+ id="svg2">
+ id="stop4939"
+ style="stop-color:#e90808;stop-opacity:1"
+ offset="0" />
+ id="stop4941"
+ style="stop-color:#b60000;stop-opacity:1"
+ offset="1" />
+ id="stop3941"
+ style="stop-color:#eece33;stop-opacity:0.95054942"
+ offset="0" />
+ style="stop-color:#ff734e;stop-opacity:0.8186813"
+ offset="0.61061949" />
+ id="stop3943"
+ style="stop-color:#ff2d2d;stop-opacity:0"
+ offset="1" />
+ style="stop-color:#b9dcff;stop-opacity:1"
+ offset="0" />
+ style="stop-color:#0d0d0d;stop-opacity:1"
+ offset="1" />
+ id="stop5443"
+ style="stop-color:#060606;stop-opacity:1"
+ offset="0" />
+ id="stop5445"
+ style="stop-color:#343434;stop-opacity:1"
+ offset="1" />
+ id="stop5443-2"
+ style="stop-color:#060606;stop-opacity:1"
+ offset="0" />
+ id="stop5445-4"
+ style="stop-color:#2a2a2a;stop-opacity:1"
+ offset="1" />
+ id="stop5443-4"
+ style="stop-color:#060606;stop-opacity:1"
+ offset="0" />
+ id="stop5445-7"
+ style="stop-color:#2a2a2a;stop-opacity:1"
+ offset="1" />
+ y2="506.3692"
+ id="linearGradient5573-4"
+ xlink:href="#linearGradient5441-4-6"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)" />
+ id="stop5443-2-5"
+ style="stop-color:#060606;stop-opacity:1"
+ offset="0" />
+ id="stop5445-4-9"
+ style="stop-color:#2a2a2a;stop-opacity:1"
+ offset="1" />
+ id="radialGradient3945"
+ xlink:href="#linearGradient3939"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)" />
-
+
+ y2="472.02954"
+ id="linearGradient5267"
+ xlink:href="#linearGradient5441"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(33.231373,11.944343)" />
-
+
-
+
-
+
+ y2="333.18509"
+ id="linearGradient5803"
+ xlink:href="#linearGradient5441-4"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,-37.471498)" />
+ color-interpolation-filters="sRGB"
+ id="filter5815">
-
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
+
+ y2="472.02954"
+ id="linearGradient3839"
+ xlink:href="#linearGradient5441"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(33.231373,11.944343)" />
+
+
+ id="radialGradient4947"
+ xlink:href="#linearGradient3939"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+ gradientTransform="matrix(1.257316,0,0,0.8685337,-234.59396,-533.43582)" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id="radialGradient3198"
+ xlink:href="#linearGradient3939-6"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
-
@@ -378,26 +381,15 @@
+ id="g3170">
+ style="fill:url(#linearGradient3166);fill-opacity:1;stroke:none" />
+ style="fill:url(#radialGradient3198);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter5815-2)" />
diff --git a/res/skins/LateNight/knob_sized_textless.xml b/res/skins/LateNight/knob_sized_textless.xml
index 474d26ca3a2..47ce868c541 100644
--- a/res/skins/LateNight/knob_sized_textless.xml
+++ b/res/skins/LateNight/knob_sized_textless.xml
@@ -17,7 +17,7 @@
knob_bg.svg
- 1.602
+ 1.598
,
diff --git a/res/skins/LateNight/knob_textless.xml b/res/skins/LateNight/knob_textless.xml
index 9374103c185..537e5e783a2 100644
--- a/res/skins/LateNight/knob_textless.xml
+++ b/res/skins/LateNight/knob_textless.xml
@@ -17,7 +17,7 @@
knob_bg.svg
- 1.602
+ 1.598
,
diff --git a/res/skins/LateNight/lower_half.xml b/res/skins/LateNight/lower_half.xml
index e24da9dba8d..cfe24682644 100644
--- a/res/skins/LateNight/lower_half.xml
+++ b/res/skins/LateNight/lower_half.xml
@@ -1,39 +1,12 @@
-
+
-
- UILowerHalf
- vertical
- me,i
- 0,0
- -1,230
-
-
-
- me,min
-
-
-
- Spacer58
- 0me,1f
- horizontal
-
- [Library],show_library
-
- visible
-
-
-
-
-
-
-
UILowerHalf
vertical
me,me
- 0,231
+ 0,0
-1,300
@@ -41,8 +14,6 @@
LibrarySingleton
-
-
@@ -52,15 +23,32 @@
me,me
0,301
-
-
+
+ vertical
+
+
+
+
+ [Microphone],show_microphone
+ visible
+
+
+
+
+ vertical
+
+
+
+
+ [Samplers],show_samplers
+ visible
+
+
LibrarySingleton
-
-
diff --git a/res/skins/LateNight/mic_aux_container.xml b/res/skins/LateNight/mic_aux_container.xml
index 37d4a9b203c..79c5f63327f 100644
--- a/res/skins/LateNight/mic_aux_container.xml
+++ b/res/skins/LateNight/mic_aux_container.xml
@@ -1,9 +1,11 @@
horizontal
- min,min
+ me,min
+ me,min
+
MicContainer
vertical
@@ -17,30 +19,63 @@
MicTitle
Microphones
+
- vertical
me,min
-
-
- MicButtonContainer
- horizontal
- f,f
+
+
+
+
+
+
+ horizontal
+ max,min
+
+
+ 1
+
+
+ 2
+
+
+ 3
+
+
+ 4
+
+
+
+ MicDuckingContainer
+ vertical
+ min,min
- 65f,15f
- GuiToggleButton
+
+ MicDuckingButton
+ talkover_duck_mode
3
0
- DUCK OFF
+ buttons/btn_micDuck.svg
+ buttons/btn_micDuck.svg
+ OFF
1
- AUTO DUCK
+ buttons/btn_micDuck_over.svg
+ buttons/btn_micDuck_over.svg
+ AUTO
2
+ buttons/btn_micDuck_over.svg
+ buttons/btn_micDuck_over.svg
MANUAL
@@ -48,28 +83,26 @@
LeftButton
+
+
+ MicDuckingStrengthKnob
+ horizontal
+ me,min
+
+
+ talkover_duck_strength
+ 40
+ 34
+ [Master]
+ duckStrength
+
+
+
-
-
-
-
- horizontal
- max,min
-
-
- 1
-
-
- 2
-
-
- 3
-
-
- 4
-
+
-
+
+
@@ -81,7 +114,6 @@
horizontal
min,min
- 0,22
+
horizontal
max,min
@@ -115,10 +148,8 @@
+ me,min
+
-
- [Microphone],show_microphone
- visible
-
diff --git a/res/skins/LateNight/mic_samplers_container.xml b/res/skins/LateNight/mic_samplers_container.xml
index 877f0be123d..5c50c4bde07 100644
--- a/res/skins/LateNight/mic_samplers_container.xml
+++ b/res/skins/LateNight/mic_samplers_container.xml
@@ -2,21 +2,19 @@
horizontal
me,max
- 0,0
-
+
+
me,min
-
- vertical
+
me,min
-
-
+
vertical
me,min
@@ -24,7 +22,7 @@
-
+
vertical
me,min
diff --git a/res/skins/LateNight/mic_samplers_lib_container.xml b/res/skins/LateNight/mic_samplers_lib_container.xml
deleted file mode 100644
index 5cf1e531c73..00000000000
--- a/res/skins/LateNight/mic_samplers_lib_container.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
- mic_sam_lib_container
- horizontal
- me,me
- 0,0
-
-
-
- me,me
-
-
-
-
- vertical
- me,max
-
-
-
-
- vertical
- me,max
-
-
-
-
-
-
- vertical
- me,max
-
-
-
-
-
-
- TEST_LibTrigger
- vertical
- me,me
-
-
- LibrarySingleton
-
-
-
-
-
-
- [Master],maximize_library
- visible
-
-
-
-
-
-
-
diff --git a/res/skins/LateNight/mic_unit.xml b/res/skins/LateNight/mic_unit.xml
index 024a38b6b5b..0ca79e2e978 100644
--- a/res/skins/LateNight/mic_unit.xml
+++ b/res/skins/LateNight/mic_unit.xml
@@ -6,48 +6,47 @@
MicInterior
- background_tile.png
- vertical
- min,min
- 100,-1
+ style/background_tile.png
+ horizontal
+ min,max
-
-
-
- horizontal
- min,max
- -1, 26
+
+ AlignCenterTop
+ vertical
+ min,min
-
- pregain
- 28
- 24
-
- pregain
-
- GuiToggleContainerPadLeft
vertical
min,min
+
+
+
+
+
+
+ MicTalkButton
+ vertical
+ min,max
- 40f,24f
microphone_talkover
- GuiToggleButton
2
0
- TALK
+ buttons/btn_microphone_talkover_down.svg
+ buttons/btn_microphone_talkover.svg
1
- TALK
+ buttons/btn_microphone_talkover_overdown.svg
+ buttons/btn_microphone_talkover_over.svg
,talkover
@@ -55,15 +54,65 @@
-
+
- GuiToggleContainerPadLeft
- vertical
- min,min
+ -1min,15f
+
+
+
+
+
+
+ MicVUMeter
+ horizontal
+ max,min
+
+
+ microphone_VuMeter
+ 7f,59f
+ style/vumeter_mic_aux_over.png
+ style/vumeter_mic_aux_bg_solid.png
+ false
+ 5
+ 500
+ 50
+ 2
+
+ ,VuMeter
+
+
+
+
+
+
+ vertical
+ min,min
+
+
+
+ MicGainPFlContainer
+ horizontal
+ min,me
+
+ MicGainKnob
+ horizontal
+ me,me
+
+
+ pregain
+ 36
+ 30
+
+ pregain
+
+
+
+
pfl
+ MicPflButton
2
0
@@ -79,57 +128,56 @@
,pfl
+
-
-
-
+
-
- horizontal
- min,min
-
-
- microphone_VuMeter
- 64,4
- 64,4
- vumeter_latency_over.png
- vumeter_latency_bg_solid.png
-
- true
- 5
- 500
- 50
- 2
-
- ,VuMeter
-
-
-
- orientation
-
- 3
-
- 0
- buttons/btn_orientation_microphone_left_over.png
- buttons/btn_orientation_microphone_left_over.png
-
-
- 1
- buttons/btn_orientation_microphone_master.png
- buttons/btn_orientation_microphone_master.png
-
-
- 2
- buttons/btn_orientation_microphone_right_over.png
- buttons/btn_orientation_microphone_right_over.png
-
-
- ,orientation
- LeftButton
-
-
+
+ MicFxButtons
+ horizontal
+ min,min
+
+
+ 35f,22f
+ EffectUnit_microphone_enabled
+ FxAssignButton
+ 2
+
+ 0
+ FX 1
+
+
+ 1
+ FX 1
+
+
+ [EffectRack1_EffectUnit1],group__enable
+ LeftButton
+
+
+
+
+ 35f,22f
+ EffectUnit_microphone_enabled
+ FxAssignButton
+ 2
+
+ 0
+ FX 2
+
+
+ 1
+ FX 2
+
+
+ [EffectRack1_EffectUnit2],group__enable
+ LeftButton
+
+
+
+
-
+
diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml
index 0bffcc132d3..e954ea0ee61 100644
--- a/res/skins/LateNight/mixer.xml
+++ b/res/skins/LateNight/mixer.xml
@@ -26,8 +26,9 @@
vertical
min,min
-
- max,min
+
+ AlignHCenter
+ min,min
horizontal
@@ -36,6 +37,7 @@
3
+ Left
@@ -46,10 +48,11 @@
1
+ Left
- MasterVuMeter2ch
+ MasterVuMeter_2Decks
vertical
max,me
@@ -66,18 +69,16 @@
master_PeakIndicator
-
- buttons/btn_clipping1_over.png
- buttons/btn_clipping1.png
+ style/clipping1_over.png
+ style/clipping1.png
[Master],PeakIndicatorL
master_PeakIndicator
-
- buttons/btn_clipping1_over.png
- buttons/btn_clipping1.png
+ style/clipping1_over.png
+ style/clipping1.png
[Master],PeakIndicatorR
@@ -91,9 +92,8 @@
master_VuMeterL
-
- buttons/btn_volume_display1_over.png
- buttons/btn_volume_display1.png
+ style/volume_display1_over.png
+ style/volume_display1.png
false
5
500
@@ -105,9 +105,8 @@
master_VuMeterR
-
- buttons/btn_volume_display1_over.png
- buttons/btn_volume_display1.png
+ style/volume_display1_over.png
+ style/volume_display1.png
false
5
500
@@ -136,6 +135,7 @@
2
+ Right
@@ -144,6 +144,7 @@
4
+ Right
@@ -152,316 +153,153 @@
-
-
-
- Crossfader
- horizontal
- min,min
-
-
- crossfader
- knob_crossfader.png
- slider_crossfader.png
- true
-
- [Master],crossfader
-
-
-
-
-
-
-
-
-
- horizontal
- 2f,min
-
-
-
-
-
- Border58
- max,min
- vertical
-
-
- MasterControls
- background_tile.png
- max,min
- vertical
-
+
-
+
+ CrossfaderAndSwitches2Decks
horizontal
- me,min
-
- 35me,22f
- EffectUnit_master_enabled
- FxAssignButton
- 2
-
- 0
- FX 1
-
-
- 1
- FX 1
-
-
- [EffectRack1_EffectUnit1],group_[Master]_enable
- LeftButton
-
-
-
- 35me,22f
- EffectUnit_master_enabled
- FxAssignButton
- 2
-
- 0
- FX 2
-
-
- 1
- FX 2
-
-
- [EffectRack1_EffectUnit2],group_[Master]_enable
- LeftButton
-
-
-
-
+
+
+ AlignLeftTop
+ vertical
+ -1min,15me
+
+
+ horizontal
+ 34f,15me
+
+
+ 34f,15f
+ orientation
+ 3
+
+ 0
+ buttons/btn_orientation_deckLeft_left.svg
+ buttons/btn_orientation_deckLeft_left.svg
+
+
+ 1
+ buttons/btn_orientation_deck_master.svg
+ buttons/btn_orientation_deck_master.svg
+
+
+ 2
+ buttons/btn_orientation_deckLeft_right.svg
+ buttons/btn_orientation_deckLeft_right.svg
+
+
+ [Channel1],orientation
+ LeftButton
+
+
-
-
- 0min,1me
-
-
- horizontal
- min,min
-
-
- 35f,30f
- master_gain
- [Master]
- gain
- Master
-
-
- 35f,30f
- balance
- [Master]
- balance
- L / R
-
-
-
-
- 0min,1me
-
-
- horizontal
- min,min
-
-
- 35f,30f
- master_gain
- [Booth]
- gain
- Booth
-
-
-
- [Master],booth_enabled
- visible
-
-
+
- 0min,1me
-
-
- MasterVuMeter4ch
- vertical
- min,me
-
-
-
- Spacer1e
+
+ Crossfader
horizontal
- max,max
+ min,min
-
- master_PeakIndicator
- buttons/btn_clipping1_over.png
- buttons/btn_clipping1.png
-
- [Master],PeakIndicatorL
-
-
-
- master_PeakIndicator
- buttons/btn_clipping1_over.png
- buttons/btn_clipping1.png
+
+ crossfader
+ knob_crossfader.png
+ slider_crossfader.png
+ true
- [Master],PeakIndicatorR
+ [Master],crossfader
-
+
-
+
-
- Spacer1e
- horizontal
- max,max
+
+
+ AlignRightTop
+ vertical
+ -1min,15me
-
- master_VuMeterL
- buttons/btn_volume_display1_over.png
- buttons/btn_volume_display1.png
- false
- 5
- 500
- 50
- 2
-
- [Master],VuMeterL
-
-
-
- master_VuMeterR
- buttons/btn_volume_display1_over.png
- buttons/btn_volume_display1.png
- false
- 5
- 500
- 50
- 2
+
+ horizontal
+ 34f,15me
+
+ me,min
+
+
+ 34f,15f
+ orientation
+ 3
+
+ 0
+ buttons/btn_orientation_deckRight_left.svg
+ buttons/btn_orientation_deckRight_left.svg
+
+
+ 1
+ buttons/btn_orientation_deck_master.svg
+ buttons/btn_orientation_deck_master.svg
+
+
+ 2
+ buttons/btn_orientation_deckRight_right.svg
+ buttons/btn_orientation_deckRight_right.svg
+
+
+ [Channel2],orientation
+ LeftButton
+
+
+
- [Master],VuMeterR
+ [Channel2],orientation
+ 2
+ visible
-
-
-
-
- 0min,15f
-
-
- [Master],show_4decks
- visible
-
-
-
-
- Spacer58
- 0min,1f
-
-
- 0min,1me
+
-
- horizontal
- min,min
-
-
- 35f,30f
- headphone_gain
- [Master]
- headGain
- Head
-
-
- 35f,30f
- headMix
- [Master]
- headMix
- Pre/MST
-
-
-
- [Master],booth_enabled
- visible
-
-
+ min,me
+
+
+ [Master],show_4decks
+
+ visible
+
+
-
- vertical
- min,min
-
-
- 35f,30f
- headphone_gain
- [Master]
- headGain
- Head
-
-
- 35f,30f
- headMix
- [Master]
- headMix
- Pre/MST
-
-
- [Master],booth_enabled
-
- visible
-
-
+
- 0min,0me
+
+
+ horizontal
+ 2f,min
+
-
+
+
+
+
@@ -472,7 +310,7 @@
NoMixer12
- 8f,-1me
+ 11f,-1me
horizontal
[Master],show_mixer
@@ -483,7 +321,7 @@
horizontal
- 8f,-1min
+ 11f,-1min
NoMixer34
diff --git a/res/skins/LateNight/mixer_channel_4decks.xml b/res/skins/LateNight/mixer_channel_4decks.xml
index de50106a732..2ee2b941a6c 100644
--- a/res/skins/LateNight/mixer_channel_4decks.xml
+++ b/res/skins/LateNight/mixer_channel_4decks.xml
@@ -1,7 +1,7 @@
[Channel]
- MixerChannel
+ MixerChannel_4Decks
vertical
min,min
@@ -70,6 +70,37 @@
+
+ CrossfaderSwitch4Decks
+ vertical
+ min,min
+
+
+ orientation
+ 3
+
+ 0
+ buttons/btn_orientation_deck_left.svg
+ buttons/btn_orientation_deck_left.svg
+
+
+ 1
+ buttons/btn_orientation_deck_master.svg
+ buttons/btn_orientation_deck_master.svg
+
+
+ 2
+ buttons/btn_orientation_deck_right.svg
+ buttons/btn_orientation_deck_right.svg
+
+
+ ,orientation
+ LeftButton
+
+
+
+
+
horizontal
@@ -105,16 +136,16 @@
channel_PeakIndicator
- buttons/btn_clipping1_over.png
- buttons/btn_clipping1.png
+ style/clipping1_over.png
+ style/clipping1.png
,PeakIndicator
channel_VuMeter
- buttons/btn_volume_display1_over.png
- buttons/btn_volume_display1.png
+ style/volume_display1_over.png
+ style/volume_display1.png
false
5
500
diff --git a/res/skins/LateNight/mixer_channel_left.xml b/res/skins/LateNight/mixer_channel_left.xml
index 52af8b67120..e20a9d31405 100644
--- a/res/skins/LateNight/mixer_channel_left.xml
+++ b/res/skins/LateNight/mixer_channel_left.xml
@@ -9,14 +9,14 @@ vertical layout and a side-by-side layout for two-deck mode -->
- MixerChannelHoriz
+ MixerChannel_2Decks
horizontal
min,min
vertical
- MixerChannel
+ MixerChannel_2Decks_Left
min,min
@@ -129,8 +129,8 @@ vertical layout and a side-by-side layout for two-deck mode -->
channel_PeakIndicator
- buttons/btn_clipping1_over.png
- buttons/btn_clipping1.png
+ style/clipping1_over.png
+ style/clipping1.png
,PeakIndicator
@@ -144,8 +144,8 @@ vertical layout and a side-by-side layout for two-deck mode -->
channel_VuMeter
- buttons/btn_volume_display1_over.png
- buttons/btn_volume_display1.png
+ style/volume_display1_over.png
+ style/volume_display1.png
false
5
500
diff --git a/res/skins/LateNight/mixer_channel_right.xml b/res/skins/LateNight/mixer_channel_right.xml
index cb97d24a483..f06e74859a5 100644
--- a/res/skins/LateNight/mixer_channel_right.xml
+++ b/res/skins/LateNight/mixer_channel_right.xml
@@ -9,7 +9,7 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
- MixerChannelHoriz
+ MixerChannel_2Decks
horizontal
min,min
@@ -46,8 +46,8 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
channel_PeakIndicator
- buttons/btn_clipping1_over.png
- buttons/btn_clipping1.png
+ style/clipping1_over.png
+ style/clipping1.png
,PeakIndicator
@@ -61,8 +61,8 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
channel_VuMeter
- buttons/btn_volume_display1_over.png
- buttons/btn_volume_display1.png
+ style/volume_display1_over.png
+ style/volume_display1.png
false
5
500
@@ -106,7 +106,7 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
vertical
- MixerChannelReversed
+ MixerChannel_2Decks_Right
min,min
diff --git a/res/skins/LateNight/mixer_master_headphone.xml b/res/skins/LateNight/mixer_master_headphone.xml
new file mode 100644
index 00000000000..0c12a31c949
--- /dev/null
+++ b/res/skins/LateNight/mixer_master_headphone.xml
@@ -0,0 +1,371 @@
+
+
+ Border58
+ max,min
+ vertical
+
+
+
+ MasterHeadphoneMixer
+ style/background_tile.png
+ min,min
+ vertical
+
+
+
+ MasterControls
+ min,me
+ vertical
+
+
+
+ horizontal
+ me,min
+
+
+ 35me,22f
+ EffectUnit_master_enabled
+ FxAssignButton
+ 2
+
+ 0
+ FX 1
+
+
+ 1
+ FX 1
+
+
+ [EffectRack1_EffectUnit1],group_[Master]_enable
+ LeftButton
+
+
+
+
+ 35me,22f
+ EffectUnit_master_enabled
+ FxAssignButton
+ 2
+
+ 0
+ FX 2
+
+
+ 1
+ FX 2
+
+
+ [EffectRack1_EffectUnit2],group_[Master]_enable
+ LeftButton
+
+
+
+
+
+
+
+ 0min,3f
+
+
+
+ horizontal
+ min,min
+
+
+ horizontal
+ me,min
+
+
+ 35f,30f
+ master_gain
+ [Master]
+ gain
+
+
+
+
+
+ horizontal
+ me,min
+
+
+ 35f,30f
+ balance
+ [Master]
+ balance
+
+
+
+
+
+
+
+
+
+ horizontal
+ min,min
+
+
+
+
+
+
+
+ 0min,7f
+
+
+ vertical
+ min,min
+
+
+ 35f,30f
+ master_gain
+ [Booth]
+ gain
+
+
+
+
+
+ [Master],booth_enabled
+ visible
+
+
+
+
+ MasterVuMeter_4Decks
+ vertical
+ min,me
+
+
+
+ Spacer1e
+ horizontal
+ max,max
+
+
+ master_PeakIndicator
+ style/clipping1_over.png
+ style/clipping1.png
+
+ [Master],PeakIndicatorL
+
+
+
+ master_PeakIndicator
+ style/clipping1_over.png
+ style/clipping1.png
+
+ [Master],PeakIndicatorR
+
+
+
+
+
+
+ Spacer1e
+ horizontal
+ max,max
+
+
+ master_VuMeterL
+ style/volume_display1_over.png
+ style/volume_display1.png
+ false
+ 5
+ 500
+ 50
+ 2
+
+ [Master],VuMeterL
+
+
+
+ master_VuMeterR
+ style/volume_display1_over.png
+ style/volume_display1.png
+ false
+ 5
+ 500
+ 50
+ 2
+
+ [Master],VuMeterR
+
+
+
+
+
+
+ [Master],show_4decks
+ visible
+
+
+
+
+
+
+
+ MasterHeadphoneDivider
+ ,11f
+
+
+
+ HeadphoneControls
+ min,me
+ vertical
+
+
+
+
+ horizontal
+ min,min
+
+
+ horizontal
+ me,min
+
+
+ 35f,30f
+ headphone_gain
+ [Master]
+ headGain
+
+
+
+
+
+ horizontal
+ me,min
+
+
+ 35f,30f
+ headMix
+ [Master]
+ headMix
+
+
+
+
+
+
+
+ horizontal
+ min,min
+
+
+
+
+
+
+
+
+ 0,3
+ -1,5
+ me,min
+
+
+
+ horizontal
+ me,min
+
+
+ 68f,22f
+ headSplit
+ FxAssignButton
+ 2
+
+ 0
+ Split Cue
+
+
+ 1
+ Split Cue
+
+
+ [Master],headSplit
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/skins/LateNight/preview_deck.xml b/res/skins/LateNight/preview_deck.xml
index e205fbdc30f..2dc6d955eff 100644
--- a/res/skins/LateNight/preview_deck.xml
+++ b/res/skins/LateNight/preview_deck.xml
@@ -59,8 +59,8 @@
1
0
- buttons/btn_eject1_over.png
- buttons/btn_eject1.png
+ buttons/btn_eject_over.svg
+ buttons/btn_eject.svg
[PreviewDeck1],eject
@@ -153,8 +153,8 @@
preview_PeakIndicator
- buttons/btn_clipping_previewdeck_over.png
- buttons/btn_clipping_previewdeck.png
+ style/clipping_previewdeck_over.png
+ style/clipping_previewdeck.png
[PreviewDeck1],PeakIndicator
@@ -162,8 +162,8 @@
preview_VuMeter
- buttons/btn_volume_display_previewdeck_over.png
- buttons/btn_volume_display_previewdeck.png
+ style/volume_display_previewdeck_over.png
+ style/volume_display_previewdeck.png
false
3
250
diff --git a/res/skins/LateNight/quick_effect_knob_left.xml b/res/skins/LateNight/quick_effect_knob_left.xml
index fe13388f279..4e82ed61691 100644
--- a/res/skins/LateNight/quick_effect_knob_left.xml
+++ b/res/skins/LateNight/quick_effect_knob_left.xml
@@ -38,6 +38,10 @@
+
+ [Master],show_eq_kill_buttons
+ visible
+
@@ -62,7 +66,6 @@
horizontal
me,f
-
0min,0min
diff --git a/res/skins/LateNight/quick_effect_knob_right.xml b/res/skins/LateNight/quick_effect_knob_right.xml
index ecca0807a21..583752ac3ae 100644
--- a/res/skins/LateNight/quick_effect_knob_right.xml
+++ b/res/skins/LateNight/quick_effect_knob_right.xml
@@ -51,6 +51,10 @@
+
+ [Master],show_eq_kill_buttons
+ visible
+
@@ -63,7 +67,6 @@
horizontal
me,f
-
KnobLabel
diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
index 288eea7cb94..d6db412d341 100644
--- a/res/skins/LateNight/sampler.xml
+++ b/res/skins/LateNight/sampler.xml
@@ -15,15 +15,16 @@
SamplerText
horizontal
- me,min
+ i,min
-
- text
-
+
+ track_title
+ SamplerTitle
+ me,min
+ title
-
+ right
+
@@ -57,7 +58,7 @@
LeftButton
- ,start_stop
+ ,cue_default
RightButton
@@ -104,13 +105,13 @@
2
0
- buttons/btn_repeat_sampler.png
- buttons/btn_repeat_sampler.png
+ buttons/btn_repeat.svg
+ buttons/btn_repeat.svg
1
- buttons/btn_repeat_sampler_over.png
- buttons/btn_repeat_sampler_over.png
+ buttons/btn_repeat_over.svg
+ buttons/btn_repeat_over.svg
,repeat
@@ -121,8 +122,8 @@
1
0
- buttons/btn_eject_sampler_over.png
- buttons/btn_eject_sampler.png
+ buttons/btn_eject_over.svg
+ buttons/btn_eject.svg
,eject
@@ -141,18 +142,18 @@
3
0
- buttons/btn_orientation_sampler_left_over.png
- buttons/btn_orientation_sampler_left_over.png
+ buttons/btn_orientation_sampler_left.svg
+ buttons/btn_orientation_sampler_left.svg
1
- buttons/btn_orientation_sampler_master.png
- buttons/btn_orientation_sampler_master.png
+ buttons/btn_orientation_sampler_master.svg
+ buttons/btn_orientation_sampler_master.svg
2
- buttons/btn_orientation_sampler_right_over.png
- buttons/btn_orientation_sampler_right_over.png
+ buttons/btn_orientation_sampler_right.svg
+ buttons/btn_orientation_sampler_right.svg
,orientation
@@ -164,13 +165,13 @@
2
0
- buttons/btn_keylock_sampler.png
- buttons/btn_keylock_sampler.png
+ buttons/btn_keylock.svg
+ buttons/btn_keylock.svg
1
- buttons/btn_keylock_sampler_over.png
- buttons/btn_keylock_sampler_over.png
+ buttons/btn_keylock_over.svg
+ buttons/btn_keylock_over.svg
,keylock
@@ -201,36 +202,11 @@
SamplerButtons
- background_tile.png
+ style/background_tile.png
horizontal
me,min
-
- SamplerSyncButton
- horizontal
- me,min
-
-
- beatsync_beatsync_tempo
- 1
-
- 0
- buttons/btn_sync_overdown.svg
- buttons/btn_sync.svg
-
-
- ,beatsync
- LeftButton
-
-
- ,beatsync_tempo
- RightButton
-
-
-
-
-
SamplerHotcues
horizontal
@@ -478,6 +454,10 @@
+
+ me,min
+
+
SamplerPfl
horizontal
@@ -523,16 +503,16 @@
sampler_PeakIndicator
- buttons/btn_clipping1_over.png
- buttons/btn_clipping1.png
+ style/clipping1_over.png
+ style/clipping1.png
,PeakIndicator
sampler_VuMeter
- buttons/btn_volume_display_sampler_over.png
- buttons/btn_volume_display_sampler.png
+ style/volume_display_sampler_over.png
+ style/volume_display_sampler.png
false
5
500
@@ -547,19 +527,50 @@
- SamplerPitch
vertical
min,min
-
- rate
- knob_pitch_sampler.png
- slider_pitch_sampler.png
- false
-
- ,rate
-
-
+
+ SamplerPitch
+ horizontal
+ min,min
+
+
+ rate
+ knob_pitch_sampler.png
+ slider_pitch_sampler.png
+ false
+
+ ,rate
+
+
+
+
+
+
+ SamplerSyncButton
+ horizontal
+ min,min
+
+
+ beatsync_beatsync_tempo
+ 1
+
+ 0
+ buttons/btn_sync_sampler_overdown.svg
+ buttons/btn_sync_sampler.svg
+
+
+ ,beatsync
+ LeftButton
+
+
+ ,beatsync_tempo
+ RightButton
+
+
+
+
diff --git a/res/skins/LateNight/samplers_container.xml b/res/skins/LateNight/samplers_container.xml
index d396d6e08aa..54502dd71a2 100644
--- a/res/skins/LateNight/samplers_container.xml
+++ b/res/skins/LateNight/samplers_container.xml
@@ -21,9 +21,5 @@
-
- [Samplers],show_samplers
- visible
-
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index f36459e9c23..1693b7beabf 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -40,23 +40,20 @@
4
0
- 0
0
0
0
0
1
1
- 0
- 2
+ 1
1
- 1
0
1
1
1
- 0
0
+ 0
@@ -83,16 +80,9 @@
-
- ClockRecLogo
-
-
-
-
-
SkinContainer
- horizontal
+ vertical
me,me
@@ -141,12 +131,13 @@
LibrarySingleton
-
+
+
diff --git a/res/skins/LateNight/slider_pitch_sampler.png b/res/skins/LateNight/slider_pitch_sampler.png
index 067bb8f9d8c..94ae7da1963 100644
Binary files a/res/skins/LateNight/slider_pitch_sampler.png and b/res/skins/LateNight/slider_pitch_sampler.png differ
diff --git a/res/skins/LateNight/sources/btn_orientation_deckLeft.xcf b/res/skins/LateNight/sources/btn_orientation_deckLeft.xcf
new file mode 100644
index 00000000000..0af9fcb5d82
Binary files /dev/null and b/res/skins/LateNight/sources/btn_orientation_deckLeft.xcf differ
diff --git a/res/skins/LateNight/sources/btn_orientation_microphone_left.xcf b/res/skins/LateNight/sources/btn_orientation_microphone_left.xcf
new file mode 100644
index 00000000000..0af9fcb5d82
Binary files /dev/null and b/res/skins/LateNight/sources/btn_orientation_microphone_left.xcf differ
diff --git a/res/skins/LateNight/spinny.xml b/res/skins/LateNight/spinny.xml
index 4acde06e4ab..592aeddfeac 100644
--- a/res/skins/LateNight/spinny.xml
+++ b/res/skins/LateNight/spinny.xml
@@ -11,7 +11,7 @@
coverart
50f,50f
- skin:/graphics/cover_default.svg
+ style/cover_default.svg
@@ -25,10 +25,10 @@
spinny
50f,50f
- spinny_bg.svg
- spinny_mask.svg
- spinny_indicator.svg
- spinny_indicator_ghost.svg
+ style/spinny_bg.svg
+ style/spinny_mask.svg
+ style/spinny_indicator.svg
+ style/spinny_indicator_ghost.svg
true
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 4081dc6ee50..32514c9b37c 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -18,10 +18,42 @@ QToolTip {/*
font-family: Ubuntu;*/
}
+#KeyText,
+#PlayPositionText,
+#DurationText,
+#BpmText,
+#RateText,
+WBeatSpinBox,
+WOverview {
+ font-family: "Open Sans";
+}
+
WPushButton, QPushButton {
font-size: 11px/12px;
}
+#Deck3 WLabel, #Deck4 WLabel {
+ color: #09B2AE;
+}
+
+#TristateButton,
+#PreviewLabel,
+#MicTitle,
+#MicSubTitle,
+#SamplerTitle,
+#Deck1 WLabel, #Deck2 WLabel,
+#Deck3 #KeyText, #Deck4 #KeyText,
+WSearchLineEdit:focus,
+#LatencyLabel,
+WTime {
+ color: #eece33;
+ font-weight: bold;
+}
+WStarRating {
+ color: #f0bb2b;
+ font-weight: bold;
+}
+
#ToolBar {
qproperty-layoutAlignment: 'AlignLeft | AlignTop';
background-color: #1e1e1e;
@@ -84,24 +116,29 @@ WPushButton, QPushButton {
/*border-top: 1px solid #585858;*/
}
-#DeckRowOne {
+#DeckRow_1_KeyVinylFx {
qproperty-layoutAlignment: 'AlignLeft | AlignTop';
border-bottom: 1px solid #585858;
background-color: #1e1e1e;
padding: 1px;
}
-#DeckRowTwoThreeFour {
+#DeckRow_2_3_ArtistTitleTime {
border-bottom: 1px solid #585858;
background-color: #1e1e1e;
}
-#DeckRowFive {
+#DeckRow_4_OverviewSpinny {
border-bottom: 1px solid #585858;
background-color: #1e1e1e;
padding: 0px;
}
+#DeckRow_5_LoopCuesTransport {
+ qproperty-layoutAlignment: 'AlignBottom';
+ padding: 3px 1px 1px 3px;
+}
+
#DecksAndMixer {
background-color: #1e1e1e;
}
@@ -154,6 +191,10 @@ WPushButton, QPushButton {
margin-bottom: 2px;
}
+WTime {
+ font-size: 13px/13px;
+}
+
#LatencyMeter {
margin: 1px;
padding-right: 4px;
@@ -162,6 +203,7 @@ WPushButton, QPushButton {
#LatencyLabel {
padding-bottom: 2px;
+ font-size: 10px/10px;
}
#Mixer {/*
@@ -191,37 +233,45 @@ WPushButton, QPushButton {
padding-top: 3px;
}
-#MasterControls {
- qproperty-layoutAlignment: 'AlignRight | AlignTop';
- padding: 2px 2px 1px 2px;
- /* this wouldn't work:
- border-left: 1px solid #585858;
- border-width: 0px 0px 0px 1px; */
- border: 1px solid #585858;
+#MasterHeadphoneMixer {
+}
+
+#MasterHeadphoneDivider {
+ background-color: #585858;
+ margin: 5px 0px 5px 0px;
}
-#MixerChannel {
+#MasterControls,
+#HeadphoneControls {
+ qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+ padding: 2px;
+}
+
+#MixerChannel_2Decks {
qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
- padding-left: 2px;
- padding-right: 2px;
}
-#MixerChannelReversed {
+#MixerChannel_4Decks {
qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
- padding-left: 2px;
- padding-right: 2px;
}
-#MixerChannelHoriz {
+#MixerChannel_2Decks_Left {
+ qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+ padding: 0px 2px;
+}
+
+#MixerChannel_2Decks_Right {
qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
+ padding: 0px 2px;
}
-#MasterVuMeter2ch {
+#MasterVuMeter_2Decks {
qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
}
-#MasterVuMeter4ch {
+#MasterVuMeter_4Decks {
qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+ margin-top: 5px;
}
#NoMixerLogo {
@@ -238,7 +288,7 @@ WPushButton, QPushButton {
#VuAndSlider {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
- padding-top: 3px;
+ padding: 1px 4px 0px 0px;
}
#VuMeter4Decks {
@@ -257,11 +307,6 @@ WPushButton, QPushButton {
padding-left: 2px;
}
-#MasterFaders, #MasterLevels {
- qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
- background-color: #1e1e1e;
-}
-
#KnobCentered {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
}
@@ -278,9 +323,9 @@ WPushButton, QPushButton {
margin-top: 2px;
}
-#TitleGutter, #AlbumGutter {
+#TitleGutter {
qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
- padding: 1px;
+ padding: 2px 3px 2px 2px;
border: 1px solid #585858;
border-top: 0px;
border-left: 0px;
@@ -289,51 +334,17 @@ WPushButton, QPushButton {
#ArtistGutter{
qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
- padding: 1px;/*
- padding-bottom: 2px;*/
+ padding: 2px;
border: 0px solid #585858;
}
#TimeGutter, #DurationGutter {
qproperty-layoutAlignment: 'AlignRight | AlignBottom';
- padding: 3px;
-}
-
-#RateGutter {
- qproperty-layoutAlignment: 'AlignCenter | AlignBottom';
- text-align: center;
- padding-top: 0px;
-}
-
-#ColumnThree {
- qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
- padding: 3px;
- padding-left:10px;
-}
-
-#LoopSizeButtons {
- qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-}
-
-#Hotcues {
- qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-}
-
-#FFRew {
- qproperty-layoutAlignment: 'AlignRight | AlignTop';
-}
-
-#ColumnFour {
- qproperty-layoutAlignment: 'AlignRight | AlignTop';
- padding: 3px;
-}
-
-#LoopInOut {
- qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+ padding: 2px;
}
-#PlayCue {
+#PlayCueRevHotCues {
qproperty-layoutAlignment: 'AlignRight | AlignBottom';
}
@@ -341,26 +352,7 @@ WPushButton, QPushButton {
qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
}
-#ColumnOne {
- qproperty-layoutAlignment: 'AlignLeft';
-}
-
-#ColumnTwo {
- padding: 3px;
- padding-left: 10px;
- qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-}
-
-#DeckButtons {
- qproperty-layoutAlignment: 'AlignBottom';
- padding: 3px 1px 1px 3px;
-}
-
-#ColumnTwo {
- qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-}
-
-#ToolbarButtons {
+#DeckControls {
qproperty-layoutAlignment: 'AlignCenter';
border: 1px solid #585858;
border-top: 0px;
@@ -370,20 +362,26 @@ WPushButton, QPushButton {
}
#KeyText {
- font-family: "Open Sans";
qproperty-alignment: 'AlignCenter';
font-size: 13px/13px;
background-color: #0f0f0f;
border: 1px solid #585858;
border-radius: 3px;
- padding-right: -0px;
margin: 0px 1px;
}
#ArtistText,
#TitleText,
#PlayPositionText {
- font-size: 18px/21px;
+ font-size: 18px/20px;
+}
+
+#ArtistText,
+#TitleText,
+#PlayPositionText,
+#KeyText,
+#PreviewTitle {
+ text-transform: none;
}
#DurationText {
@@ -394,30 +392,42 @@ WPushButton, QPushButton {
qproperty-layoutAlignment: 'AlignLeft | AlignTop';
}
-#KnobLabel {
- font: bold 10px/8px;
+#KnobLabel,
+#FxKnobLabel,
+#FxButtonLabel {
+ font: bold 10px/10px;
color: #585858;
text-align: center;
qproperty-alignment: 'AlignCenter | AlignBottom';
padding-top: -1px;
-}
-
-#FxKnobLabel {
- font: bold 10px/8px;
text-transform: uppercase;
- color: #585858;
- text-align: center;
- qproperty-alignment: 'AlignCenter | AlignBottom';
- padding-top: 24px;
}
+#MasterHeadphoneMixer WLabel,
+/*WEffectParameter,
+WEffectButtonParameter*/
+#FxKnobLabel,
+#FxButtonLabel {
+ background-color: #101010;
+ }
+ #MasterHeadphoneMixer WLabel {
+ padding: 0px;
+ }
+ #FxKnobLabel {
+ padding: 0px;
+ }
+ #FxButtonLabel {
+ padding: 0px;
+ margin: 0px 0px 0px 0px;
+ }
+
#FxKnobContainer {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';/*
background-color: #113397;*/
}
#FxUnit1_PflButton, #FxUnit2_PflButton {
- margin-left: 2px;
+ margin: 0px 0px 1px 2px;
}
#SyncControls {
@@ -427,23 +437,30 @@ WPushButton, QPushButton {
}
#ToolbarDivider {
- background: transparent url(skin:/buttons/toolbar_divider.png) no-repeat center center;
+ background: transparent url(skin:/style/toolbar_divider.png) no-repeat center center;
+ margin: 0px 5px;
}
#RecBox {
border: 1px solid #585858;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
margin: 2px;
border-radius: 2px;
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #282828,
+ stop:1 #0e0e0e);
}
#RecFeedback[displayValue="0"] {
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #282828,
+ stop:1 #0e0e0e);
}
#RecFeedback[displayValue="1"],
#RecFeedback[displayValue="2"] {
- background-color: #840600;
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #840600,
+ stop:1 #AD0800);
}
#RecDot {
@@ -480,8 +497,8 @@ WPushButton, QPushButton {
#FxAssignButton[displayValue="0"] {
color: #ddd;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
- stop:0 #282828,
- stop:1 #0e0e0e);
+ stop:0 #282828,
+ stop:1 #0e0e0e);
}
#VinylButton[displayValue="1"],
@@ -493,16 +510,17 @@ WPushButton, QPushButton {
border-radius: 2px;
color: #0e0e0e;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
- stop:0 #B69700,
- stop:1 #eece33);
+ stop:0 #B69700,
+ stop:1 #eece33);
}
#TristateButton {
border: 1px solid #585858;
border-radius: 2px;
margin: 1px;
- color: #eece33;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #282828,
+ stop:1 #0e0e0e);
}
#PitchTweakButton {
@@ -512,13 +530,15 @@ WPushButton, QPushButton {
}
#PitchTweakButton[displayValue="0"] {
- color: #ddd;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
+ color: #ddd;
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #282828,
+ stop:1 #0e0e0e);
}
#PitchTweakButton[displayValue="1"] {
- color: #ddd;
- background-color: #c00a09;
+ color: #ddd;
+ background-color: #c00a09;
}
#PitchLabel {
@@ -530,28 +550,13 @@ WPushButton, QPushButton {
margin: 2px;
}
-#SyncToggleButton[displayValue="0"] {/*
- border: 1px solid #585858;
- border-radius: 2px;
- font-size: 12px/12px;
- color: #ddd;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
- margin-right: 3px;*/
-}
-
-#SyncToggleButton[displayValue="1"] {/*
- border: 1px solid #585858;
- border-radius: 2px;
- color: #c0c0c0;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #d80000, stop:1 #910000);
- margin-right: 3px;*/
-}
-
#LoopToggleButton[displayValue="0"] {
border: 1px solid #585858;
border-radius: 2px;
color: #ddd;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #282828,
+ stop:1 #0e0e0e);
margin-right: 2px;
}
@@ -559,45 +564,11 @@ WPushButton, QPushButton {
border: 1px solid #585858;
border-radius: 2px;
color: #c0c0c0;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #d80000, stop:1 #910000);
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #d80000,
+ stop:1 #910000);
margin-right: 2px;
}
-/*
-#CueToggleButton {
- qproperty-alignment: 'AlignHCenter | AlignTop';
- border: 1px solid #585858;
- border-radius: 2px;
- font-size: 13px/10px;
- margin-right: 2px;
- margin-top: 2px;
- }
-
- #CueToggleButton[displayValue="0"] {
- color: #ddd;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
- }
-
- #CueToggleButton[displayValue="1"] {
- color: #c0c0c0;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #910000, stop:1 #d80000);
- }*/
-
-#CrossFadeContainer {
- qproperty-layoutAlignment: 'AlignCenter';
- background-color: #1e1e1e;
- padding-top: 2px;
-}
-
-#GuiToggleContainerPadLeft {
- qproperty-layoutAlignment: 'AlignLeft | AlignTop';
- padding: 0px;
- padding-left: 4px;
- border: 0px solid #585858;
- border-left:0px;
- border-right:0px;
- border-bottom:0px;
- background-color: transparent;
-}
/*################################################################
####### Loop Controls ########################################
@@ -702,7 +673,16 @@ WBeatSpinBox {
#Crossfader {
qproperty-layoutAlignment: 'AlignCenter';
/*background-color:#1e1e1e;*/
- padding: 5px 1px 5px 5px;
+ padding: 3px 1px 1px 5px;
+}
+
+#CrossfaderAndSwitches2Decks {
+ padding: 0px 10px 0px 10px;
+}
+
+#CrossfaderSwitch4Decks {
+ qproperty-layoutAlignment: 'AlignRight';
+ margin: 1px 10px 0px 0px;
}
#PreviewDeck {
@@ -724,21 +704,18 @@ WBeatSpinBox {
#PreviewLabel {
qproperty-alignment: 'AlignVCenter | AlignHCenter';
background-color: #1e1e1e;
- font-weight: bold;
text-transform: uppercase;
border-right: 1px solid #585858;
- color: #eece33;
text-align: center;
padding-top: 2px;
padding-bottom: 2px;
}
#PreviewTitle {
- font: bold 13px/14px;
- color: #cfb32c;
+ font: bold 14px/14px;
text-align: left;
- margin: 3px;
- background-color: transparent;
+ color: #cfb32c;
+ margin: 2px;
}
#PreviewPlayOverview {
@@ -769,10 +746,22 @@ border: 0px;
border-right: 0px;
}
+#AlignLeft {
+ qproperty-layoutAlignment: 'AlignLeft';
+}
+
#AlignLeftTop {
qproperty-layoutAlignment: 'AlignLeft | AlignTop';
}
+#AlignLeftBottom {
+ qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+}
+
+#AlignRight {
+ qproperty-layoutAlignment: 'AlignRight';
+}
+
#AlignRightTop {
qproperty-layoutAlignment: 'AlignRight | AlignTop';
}
@@ -785,10 +774,6 @@ border: 0px;
qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
}
-#AlignLeftBottom {
- qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-}
-
#AlignCenter {
qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
}
@@ -796,6 +781,10 @@ border: 0px;
#AlignCenterTop {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
}
+
+#AlignBottom {
+ qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
+}
/**/
#TEST {
background-color: #456113;
@@ -840,6 +829,29 @@ border: 0px;
#Waveform {
}
+#BeatgridButtonsToggle {
+ image: url(skin:/buttons/btn_beatgrid_buttons_toggle.svg) no-repeat center center;
+ border: 1px solid #585858;
+ border-radius: 2px;
+ margin: 1px;
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #282828,
+ stop:0.13 #1a1a1a,
+ stop:0.87 #1a1a1a,
+ stop:1 #0e0e0e);
+}
+
+#BeatCurpos {
+ border: 1px solid #585858;
+ border-radius: 2px;
+ margin: 1px;
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #282828,
+ stop:0.25 #1a1a1a,
+ stop:0.75 #1a1a1a,
+ stop:1 #0e0e0e);
+}
+
#RateContainer {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
border: 1px solid #585858;
@@ -864,12 +876,10 @@ border: 0px;
#RateText {
qproperty-alignment: 'AlignCenter';
font-size: 12px/13px;
- font-weight: bold;
background-color: transparent;
text-align: center;
padding: 0px;
margin: 0px;
- color: #eece33;
}
#RateControls {
@@ -889,50 +899,87 @@ border: 0px;
#MicContainer, #AuxContainer {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
border: 1px solid #585858;
- padding: 3px;
background-color: #1e1e1e;
}
#MicContainer {
- margin: 5px 3px 0px 0px;
+ margin: 5px 5px 0px 0px;
+ padding: 1px 6px 3px 6px;
}
#AuxContainer {
- margin: 5px 0px 0px 3px;
+ margin: 5px 0px 0px 5px;
+ padding: 1px 0px 3px 6px;
+}
+
+#MicTitle {
+ qproperty-alignment: 'AlignLeft | AlignTop';
+ text-transform: uppercase;
+ font-size: 15px/17px;
}
#MicBorder {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
border: 1px solid #585858;
- margin-left: 3px;
- margin-right: 3px;
+ margin: 1px 6px 1px 0px;
}
#MicInterior {
- padding-left:5px;
- padding-right:5px;
+ padding: 0px 3px 2px 3px;
}
-#MicButtonContainer {
- padding: 2px;
- padding-bottom: 5px;
+#MicSubTitle {
+ qproperty-alignment: 'AlignCenter | AlignTop';
+ font-size: 12px/13px;
+ text-align: center;
}
-#MicTitle {
- qproperty-alignment: 'AlignLeft | AlignTop';
- text-transform: uppercase;
- font-size: 15px/17px;
+#MicDuckingTitle {
+ qproperty-alignment: 'AlignCenter | AlignTop';
+ font-size: 12px/13px;
font-weight: bold;
- color: #eece33;
+ color: #585858;
+ text-align: center;
}
-#MicSubTitle {
- qproperty-alignment: 'AlignLeft | AlignTop';
- font-size: 12px/13px;
- font-weight: bold;
- color: #eece33;
+#MicDuckingContainer {
+ margin: 0px 0px 3px 0px;
}
+#MicDuckingButton[displayValue="0"] {
+ color: #ddd;
+ }
+
+ #MicDuckingButton[displayValue="1"],
+ #MicDuckingButton[displayValue="2"] {
+ color: #0e0e0e;
+ }
+
+#MicGainPFlContainer {
+ qproperty-layoutAlignment: 'AlignCenter';
+ padding: 0px;
+ margin-left: 2px;
+}
+
+#MicGainKnob {
+ qproperty-layoutAlignment: 'AlignCenter';
+ margin: 0px 8px 0px 3px;
+}
+
+#MicVUMeter {
+ qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+ padding: 3px 0px 1px 4px;
+}
+
+#MicFxButtons {
+ qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+}
+
+#MicTalkButton,
+#AuxMuteButton {
+ border-radius: 2px;
+ margin: 1px 0px 1px 2px;
+}
#SamplerDecksContainer {
background-color: #0e0e0e;
@@ -957,12 +1004,18 @@ border: 0px;
#SamplerText {
qproperty-layoutAlignment: 'AlignLeft | AlignTop';
- padding: 3px;
+ padding: 3px 3px 3px 5px;
border: 1px solid #585858;
border-top: 0px;
border-left: 0px;
}
+#SamplerTitle {
+ font-size: 16px/19px;
+ text-align: left;
+ text-transform: none;
+}
+
#SamplerRowTwo {
border: 1px solid #585858;
border-top: 0px;
@@ -982,24 +1035,19 @@ border: 0px;
border-bottom: 0px;
}
-#SamplerSyncButton {
- qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
- margin: 2px 0px 0px 3px;
-}
-
#SamplerButtonGrid {
border: 1px solid #585858;
border-top: 0px;
border-bottom: 0px;
}
-#SamplerPfl {
- margin: 2px 1px 0px 5px;
-}
-
#SamplerHotcues {
qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
- margin-top: 2px;
+ margin: 2px 0px 0px 2px;
+}
+
+#SamplerPfl {
+ margin: 2px 1px 0px 0px;
}
#SamplerGain {
@@ -1016,25 +1064,12 @@ border: 0px;
}
#SamplerPitch {
- padding: 0px 1px 1px 3px;
+ padding: 1px 2px 0px 2px;
qproperty-layoutAlignment: 'AlignRight | AlignBottom';
}
-#SamplerVol {
- qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
- border: 1px solid #585858;
- border-top: 0px;
- border-bottom: 0px;
- border-right: 0px;
- padding: 2px;
-}
-
-#Deck1 WLabel, Deck2 WLabel {
- color: #eece33;
-}
-
-#Deck3 WLabel, #Deck4 WLabel {
- color: #09B2AE;
+#SamplerSyncButton {
+ qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
}
#TitleGutter WLabel {
@@ -1054,11 +1089,11 @@ border: 0px;
}
#EffectUnit1, #EffectUnit3 {
- margin: 5px 3px 0px 2px;
+ margin: 5px 5px 2px 2px;
}
#EffectUnit2, #EffectUnit4 {
- margin: 5px 2px 0px 3px;
+ margin: 5px 2px 2px 5px;
}
#EffectRows {
@@ -1069,12 +1104,13 @@ border: 0px;
qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
background-color: #1e1e1e;
border-left: 1px solid #585858;
- padding: 0px;
+ padding: 0px 2px;
}
#FxUnit1_ExpandCollapseButton,
#FxUnit2_ExpandCollapseButton {
- qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+ qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+ margin: 1px 0px 1px 0px;
}
#FxUnit1_ExpandCollapseButton WPushButton,
@@ -1122,7 +1158,7 @@ border: 0px;
#EffectUnitKnob {
qproperty-layoutAlignment: 'AlignRight';
- padding:3px;
+ padding: 3px;
}
WEffectSelector {
@@ -1204,25 +1240,16 @@ WEffectSelector {
padding: 0px;
}
-/* this is now inline in the pushbutton so we can change styles */
-/*#EffectUnitGroupControlButton {
- font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
- font-size: 11px/13px;
- text-transform: uppercase;
- color: #eece33;
- text-transform: none;
- text-align: center;
- border: 1px solid #eece33;
- margin: 1px;
-}*/
-
#FxSuperLinkButton,
#FxSuperLinkInvertButton {
- /* those buttons are 5px tall, that's why they won't accept
- 3px radius which is set for all WPushButtons
- border-radius: 2px; */
- margin: 0px 5px 0px 5px;
-}
+ border-radius: 1px;
+ }
+ #FxSuperLinkButton {
+ margin: 0px 5px 0px 5px;
+ }
+ #FxSuperLinkInvertButton {
+ margin: 0px 5px 2px 5px;
+ }
#FxSuperLinkButton[value="0"],
#FxSuperLinkInvertButton[displayValue="0"] {
@@ -1293,28 +1320,6 @@ WEffectSelector {
stop: 1 #CDCDCD);
}
-#EffectUnitGroupControlButton[displayValue="0"] {
- font-size: 9px/11px;
- text-transform: uppercase;
- color: #585858;
- background-color: #0e0e0e;
- text-transform: none;
- text-align: center;
- border: 1px solid #585858;
- margin: 1px;
-}
-
-#EffectUnitGroupControlButton[displayValue="1"] {
- font-size: 9px/11px;
- text-transform: uppercase;
- color: #0e0e0e;
- background-color: #eece33;
- text-transform: none;
- text-align: center;
- border: 1px solid #585858;
- margin: 1px;
-}
-
#EffectToggleButton[displayValue="0"] {
border: 1px solid #585858;
font-size: 10px/12px;
@@ -1354,8 +1359,12 @@ QTableView::item:selected {
}
/* BPM lock icon in the library "BPM" column. */
-#LibraryBPMButton::indicator:checked { image: url(:/images/library/ic_library_checked.png); }
-#LibraryBPMButton::indicator:unchecked { image: url(:/images/library/ic_library_unchecked.png); }
+#LibraryBPMButton::indicator:checked {
+ image: url(:/images/library/ic_library_checked.png);
+}
+#LibraryBPMButton::indicator:unchecked {
+ image: url(:/images/library/ic_library_unchecked.png);
+}
#LibraryBPMButton::item:selected {
color: #cfb32c;
background-color: #725309;
@@ -1372,19 +1381,27 @@ QPushButton#LibraryPreviewButton {
background-color: #725309;
}*/
-QPushButton#LibraryPreviewButton:!checked{ image: url(skin:/style/style_library_preview_play.png); }
-QPushButton#LibraryPreviewButton:checked{ image: url(skin:/style/style_library_preview_pause.png); }
+QPushButton#LibraryPreviewButton:!checked{
+ image: url(skin:/style/style_library_preview_play.png);
+}
+QPushButton#LibraryPreviewButton:checked{
+ image: url(skin:/style/style_library_preview_pause.png);
+}
QHeaderView {
font-size: 13px/15px;
color: #cfb32c;
+ font-weight: bold;
background-color: #0f0f0f;
}
QHeaderView::section {
height: 18px;
border: 1px solid #585858;
border-left: 0px;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #585858, stop:1 #0f0f0f);
+ padding-left: 1px;
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #585858,
+ stop:1 #0f0f0f);
}
/* QScrollbar styling is even harder */
@@ -1414,15 +1431,19 @@ QScrollBar::add-page, QScrollBar::sub-page {
}
QScrollBar::handle:horizontal {
min-width: 25px;
- background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #725309, stop:1 #412f05);
border-radius: 3px;
border: 1px solid #725309;
+ background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #725309,
+ stop:1 #412f05);
}
QScrollBar::handle:vertical {
min-height: 25px;
- background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #725309, stop:1 #412f05);
border-radius: 3px;
border: 1px solid #725309;
+ background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #725309,
+ stop:1 #412f05);
}
/* Turn off buttons */
QScrollBar::add-line:horizontal, QScrollBar::add-line:vertical {
@@ -1437,19 +1458,39 @@ QScrollBar::sub-line:horizontal, QScrollBar::sub-line:vertical {
}
/* transition time in Auto DJ tab */
-QSpinBox:editable { background: transparent; color: #cfb32c; }
-QSpinBox { min-height: 20px; max-height: 20px;min-width: 40px; max-width: 40px;}
+QSpinBox:editable {
+ background: transparent;
+ color: #cfb32c;
+}
+QSpinBox {
+ min-height: 20px;
+ max-height: 20px;
+ min-width: 40px;
+ max-width: 40px;
+}
/* library search bar */
-WSearchLineEdit { padding: 2px; border: 1px solid #656565; background: #181818; color: #cfb32c; }
-WSearchLineEdit:focus { padding: 2px; border: 2px solid #FF6600; background: #0f0f0f; color: #eece33;}
+WSearchLineEdit {
+ padding: 2px;
+ border: 1px solid #656565;
+ background: #181818;
+ color: #cfb32c;
+}
+WSearchLineEdit:focus {
+ padding: 2px;
+ border: 2px solid #FF6600;
+ background: #0f0f0f;
+}
#SidebarContainer{
margin-top: -5px;
}
/* cover art */
-WCoverArt { background: transparent; color: #ACACAC; }
+WCoverArt {
+ background: transparent;
+ color: #ACACAC;
+}
/* splitter between treeview and library */
#LibrarySplitter::handle {
@@ -1490,59 +1531,125 @@ WCoverArt { background: transparent; color: #ACACAC; }
}
/* Extra declaration for QRadioButton otherwise it shows up with wrong colors in Linux with Gnome */
-QLabel, QRadioButton { background: transparent; color: #cfb32c; }
+QLabel, QRadioButton {
+ background: transparent;
+ color: #cfb32c;
+}
/* Additional space for QRadionButtons and QLabels */
-WLibrary QRadioButton, WLibrary QLabel { margin: 9px 3px 6px 3px; }
+WLibrary QRadioButton, WLibrary QLabel {
+ margin: 9px 3px 6px 3px;
+}
/* Additional space for the first QRadionButton in the row */
-WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 9px 3px 6px 12px; }
+WLibrary QRadioButton#radioButtonRecentlyAdded {
+ margin: 9px 3px 6px 12px;
+}
+
+WLibrary QRadioButton::indicator:checked {
+ background: url(skin:/buttons/btn_lib_radio_button_on.svg);
+}
+
+WLibrary QRadioButton::indicator:unchecked {
+ background: url(skin:/buttons/btn_lib_radio_button_off.svg);
+}
/* Additional space for the QPushButtons */
#DlgMissing > QPushButton,
#DlgHidden > QPushButton,
#DlgAutoDJ > QPushButton,
#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton { margin: 9px 3px 6px 3px; padding: 3px 8px; min-width: 65px; }
+#DlgAnalysis > QPushButton {
+ margin: 5px 3px 5px 3px;
+ padding: 3px 8px;
+ min-width: 65px;
+ border: 1px solid #585858;
+ border-radius: 2px;
+ color: #eeeeee;
+}
/* Additional space for the first QPushButton in the row */
#DlgMissing > QPushButton#btnPurge,
#DlgHidden > QPushButton#btnUnhide,
#DlgAutoDJ > QPushButton#pushButtonAutoDJ,
#DlgRecording > QPushButton#pushButtonRecording,
-#DlgAnalysis > QPushButton#pushButtonAnalyze { margin: 9px 12px 6px 3px; }
+#DlgAnalysis > QPushButton#pushButtonAnalyze {
+ margin: 5px 12px 5px 3px;
+}
/* Additional space for the last QPushButton in the row */
-#DlgAutoDJ > QPushButton#pushButtonShuffle { margin: 9px 3px 6px 12px; }
+#DlgAutoDJ > QPushButton#pushButtonShuffle {
+ margin: 5px 3px 5px 12px;
+}
+
+#DlgAutoDJ > QPushButton:checked {
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #AD5700,
+ stop:1 #DE7000);
+}
+
+#DlgRecording > QPushButton:checked {
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #840600,
+ stop:1 #AD0800);
+}
+
+#DlgMissing > QPushButton:!checked,
+#DlgHidden > QPushButton:!checked,
+#DlgAutoDJ > QPushButton:!checked,
+#DlgRecording > QPushButton:!checked,
+#DlgAnalysis > QPushButton:!checked {
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #6F7176,
+ stop:1 #626468);
+}
/* Spacing between treeview and searchbar */
-QTreeView { margin: 10px 0px 0px 0px; }
+QTreeView {
+ margin: 10px 0px 0px 0px;
+}
/* triangle for closed/opened branches in treeview */
-QTreeView { show-decoration-selected: 0; background-color: #151515; } /* Suppresses that selected sidebar items branch indicator shows wrong color when out of focus ; lp:880588 */
+QTreeView {
+ show-decoration-selected: 0;
+ background-color: #151515;
+}
+/* Suppresses that selected sidebar items branch indicator shows wrong color when out of focus ; lp:880588 */
QTreeView::branch:has-children:!has-siblings:closed,
-QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style/style_branch_closed.png);
+QTreeView::branch:closed:has-children:has-siblings {
+ border-image: none;
+ image: url(skin:/style/style_branch_closed.png);
background-color:#0f0f0f;
}
QTreeView::branch:open:has-children:!has-siblings,
-QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style/style_branch_open.png);
+QTreeView::branch:open:has-children:has-siblings {
+ border-image: none;
+ image: url(skin:/style/style_branch_open.png);
background-color:#0f0f0f;
}
QTreeView::branch:has-children:!has-siblings:closed:selected,
-QTreeView::branch:closed:has-children:has-siblings:selected { border-image: none; image: url(skin:/style/style_branch_closed.png);
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #585858, stop:1 #0f0f0f);
+QTreeView::branch:closed:has-children:has-siblings:selected {
+ border-image: none;
+ image: url(skin:/style/style_branch_closed.png);
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #585858,
+ stop:1 #0f0f0f);
}
QTreeView::branch:open:has-children:!has-siblings:selected,
-QTreeView::branch:open:has-children:has-siblings:selected { border-image: none; image: url(skin:/style/style_branch_open.png);
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #585858, stop:1 #0f0f0f);
+QTreeView::branch:open:has-children:has-siblings:selected {
+ border-image: none;
+ image: url(skin:/style/style_branch_open.png);
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #585858,
+ stop:1 #0f0f0f);
}
QTreeView::item:selected {
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #585858, stop:1 #0f0f0f);
color: #cfb32c;
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #585858,
+ stop:1 #0f0f0f);
}
-
-
QToolTip {
background-color: #0f0f0f;
color: #cfb32c;
diff --git a/res/skins/LateNight/background_tile.png b/res/skins/LateNight/style/background_tile.png
similarity index 100%
rename from res/skins/LateNight/background_tile.png
rename to res/skins/LateNight/style/background_tile.png
diff --git a/res/skins/LateNight/buttons/btn_clipping1.png b/res/skins/LateNight/style/clipping1.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_clipping1.png
rename to res/skins/LateNight/style/clipping1.png
diff --git a/res/skins/LateNight/buttons/btn_clipping1_over.png b/res/skins/LateNight/style/clipping1_over.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_clipping1_over.png
rename to res/skins/LateNight/style/clipping1_over.png
diff --git a/res/skins/LateNight/buttons/btn_clipping_previewdeck.png b/res/skins/LateNight/style/clipping_previewdeck.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_clipping_previewdeck.png
rename to res/skins/LateNight/style/clipping_previewdeck.png
diff --git a/res/skins/LateNight/buttons/btn_clipping_previewdeck_over.png b/res/skins/LateNight/style/clipping_previewdeck_over.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_clipping_previewdeck_over.png
rename to res/skins/LateNight/style/clipping_previewdeck_over.png
diff --git a/res/skins/LateNight/spinny1_mask.svg b/res/skins/LateNight/style/spinny1_mask.svg
similarity index 100%
rename from res/skins/LateNight/spinny1_mask.svg
rename to res/skins/LateNight/style/spinny1_mask.svg
diff --git a/res/skins/LateNight/spinny2_mask.svg b/res/skins/LateNight/style/spinny2_mask.svg
similarity index 100%
rename from res/skins/LateNight/spinny2_mask.svg
rename to res/skins/LateNight/style/spinny2_mask.svg
diff --git a/res/skins/LateNight/spinny3_mask.svg b/res/skins/LateNight/style/spinny3_mask.svg
similarity index 100%
rename from res/skins/LateNight/spinny3_mask.svg
rename to res/skins/LateNight/style/spinny3_mask.svg
diff --git a/res/skins/LateNight/spinny4_mask.svg b/res/skins/LateNight/style/spinny4_mask.svg
similarity index 100%
rename from res/skins/LateNight/spinny4_mask.svg
rename to res/skins/LateNight/style/spinny4_mask.svg
diff --git a/res/skins/LateNight/spinny_bg.svg b/res/skins/LateNight/style/spinny_bg.svg
similarity index 100%
rename from res/skins/LateNight/spinny_bg.svg
rename to res/skins/LateNight/style/spinny_bg.svg
diff --git a/res/skins/LateNight/spinny_indicator.svg b/res/skins/LateNight/style/spinny_indicator.svg
similarity index 100%
rename from res/skins/LateNight/spinny_indicator.svg
rename to res/skins/LateNight/style/spinny_indicator.svg
diff --git a/res/skins/LateNight/spinny_indicator_ghost.svg b/res/skins/LateNight/style/spinny_indicator_ghost.svg
similarity index 100%
rename from res/skins/LateNight/spinny_indicator_ghost.svg
rename to res/skins/LateNight/style/spinny_indicator_ghost.svg
diff --git a/res/skins/LateNight/buttons/toolbar_divider.png b/res/skins/LateNight/style/toolbar_divider.png
similarity index 100%
rename from res/skins/LateNight/buttons/toolbar_divider.png
rename to res/skins/LateNight/style/toolbar_divider.png
diff --git a/res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal1.png b/res/skins/LateNight/style/vinylcontrol_indicator_horizontal1.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal1.png
rename to res/skins/LateNight/style/vinylcontrol_indicator_horizontal1.png
diff --git a/res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal2.png b/res/skins/LateNight/style/vinylcontrol_indicator_horizontal2.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal2.png
rename to res/skins/LateNight/style/vinylcontrol_indicator_horizontal2.png
diff --git a/res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal3.png b/res/skins/LateNight/style/vinylcontrol_indicator_horizontal3.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal3.png
rename to res/skins/LateNight/style/vinylcontrol_indicator_horizontal3.png
diff --git a/res/skins/LateNight/buttons/btn_volume_display1.png b/res/skins/LateNight/style/volume_display1.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_volume_display1.png
rename to res/skins/LateNight/style/volume_display1.png
diff --git a/res/skins/LateNight/buttons/btn_volume_display1_over.png b/res/skins/LateNight/style/volume_display1_over.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_volume_display1_over.png
rename to res/skins/LateNight/style/volume_display1_over.png
diff --git a/res/skins/LateNight/buttons/btn_volume_display_previewdeck.png b/res/skins/LateNight/style/volume_display_previewdeck.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_volume_display_previewdeck.png
rename to res/skins/LateNight/style/volume_display_previewdeck.png
diff --git a/res/skins/LateNight/buttons/btn_volume_display_previewdeck_over.png b/res/skins/LateNight/style/volume_display_previewdeck_over.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_volume_display_previewdeck_over.png
rename to res/skins/LateNight/style/volume_display_previewdeck_over.png
diff --git a/res/skins/LateNight/buttons/btn_volume_display_sampler.png b/res/skins/LateNight/style/volume_display_sampler.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_volume_display_sampler.png
rename to res/skins/LateNight/style/volume_display_sampler.png
diff --git a/res/skins/LateNight/buttons/btn_volume_display_sampler_over.png b/res/skins/LateNight/style/volume_display_sampler_over.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_volume_display_sampler_over.png
rename to res/skins/LateNight/style/volume_display_sampler_over.png
diff --git a/res/skins/LateNight/vumeter_latency_bg.png b/res/skins/LateNight/style/vumeter_latency_bg.png
similarity index 100%
rename from res/skins/LateNight/vumeter_latency_bg.png
rename to res/skins/LateNight/style/vumeter_latency_bg.png
diff --git a/res/skins/LateNight/vumeter_latency_bg_solid.png b/res/skins/LateNight/style/vumeter_latency_bg_solid.png
similarity index 100%
rename from res/skins/LateNight/vumeter_latency_bg_solid.png
rename to res/skins/LateNight/style/vumeter_latency_bg_solid.png
diff --git a/res/skins/LateNight/style/vumeter_latency_over.png b/res/skins/LateNight/style/vumeter_latency_over.png
new file mode 100644
index 00000000000..0f109a55093
Binary files /dev/null and b/res/skins/LateNight/style/vumeter_latency_over.png differ
diff --git a/res/skins/LateNight/style/vumeter_mic_aux_bg_solid.png b/res/skins/LateNight/style/vumeter_mic_aux_bg_solid.png
new file mode 100644
index 00000000000..f08bb8ac503
Binary files /dev/null and b/res/skins/LateNight/style/vumeter_mic_aux_bg_solid.png differ
diff --git a/res/skins/LateNight/style/vumeter_mic_aux_over.png b/res/skins/LateNight/style/vumeter_mic_aux_over.png
new file mode 100644
index 00000000000..5f3f858629b
Binary files /dev/null and b/res/skins/LateNight/style/vumeter_mic_aux_over.png differ
diff --git a/res/skins/LateNight/toolbar.xml b/res/skins/LateNight/toolbar.xml
index 2d8ece565c2..3758aac0524 100644
--- a/res/skins/LateNight/toolbar.xml
+++ b/res/skins/LateNight/toolbar.xml
@@ -27,161 +27,324 @@
-
+
+ min,min
horizontal
- 5f,min
-
-
+
-
- ToolbarDivider
- 3f,9min
-
+
+ ToolbarDivider
+ 13f,9min
+
-
- horizontal
- 5f,min
-
-
+
+ 56f,24f
+ toggle_4decks
+ GuiToggleButton
+ 2
+
+ 0
+ 4 DECKS
+
+
+ 1
+ 4 DECKS
+
+
+ [Master],show_4decks
+
+
-
- 54f,24f
- toggle_4decks
- GuiToggleButton
- 2
-
- 0
- 4 DECKS
-
-
- 1
- 4 DECKS
-
-
- [Master],show_4decks
- LeftButton
-
-
- [Master],show_4decks
-
-
+
+ 61f,24f
+ show_spinny
+ GuiToggleButton
+ 2
+
+ 0
+ SPINNIES
+
+
+ 1
+ SPINNIES
+
+
+ [Spinny],show_spinnies
+
+
-
- 44f,24f
- toggle_4decks
- GuiToggleButton
- 2
-
- 0
- MIXER
-
-
- 1
- MIXER
-
-
- [Master],show_mixer
- LeftButton
-
-
- [Master],show_mixer
-
-
+
+ 44f,24f
+ show_vinylcontrol
+ GuiToggleButton
+ 2
+
+ 0
+ VINYL
+
+
+ 1
+ VINYL
+
+
+ [VinylControl],show_vinylcontrol
+
+
-
- 44f,24f
- GuiToggleButton
- 2
-
- 0
- EQ
-
-
- 1
- EQ
-
-
- [Master],show_eqs
- LeftButton
-
-
- [Master],show_eqs
-
-
+
+ ToolbarDivider
+ 13f,9min
+
-
- 59f,24f
- GuiToggleButton
- 2
-
- 0
- PREVIEW
-
-
- 1
- PREVIEW
-
-
- [PreviewDeck],show_previewdeck
- LeftButton
-
-
- [PreviewDeck],show_previewdeck
-
-
+
+ 46f,24f
+ show_mixer
+ GuiToggleButton
+ 2
+
+ 0
+ MIXER
+
+
+ 1
+ MIXER
+
+
+ [Master],show_mixer
+
+
-
- 59f,24f
- GuiToggleButton
- 2
-
- 0
- SPINNIES
-
-
- 1
- SPINNIES
-
-
- [Spinny],show_spinnies
- LeftButton
-
-
- [Spinny],show_spinnies
-
-
+
+ min,min
+ horizontal
+
+
+ 44f,24f
+ GuiToggleButton
+ 2
+
+ 0
+ EQ
+
+
+ 1
+ EQ
+
+
+ [Master],show_eqs
+
+
+
+
+ [Master],show_mixer
+ visible
+
+
-
- 44f,24f
- GuiToggleButton
- 2
-
- 0
- VINYL
-
-
- 1
- VINYL
-
-
- [VinylControl],show_vinylcontrol
- LeftButton
-
+
+ min,min
+ horizontal
+
+
+ min,min
+ horizontal
+
+
+ 54f,24f
+ GuiToggleButton
+ 2
+
+ 0
+ EQ KILL
+
+
+ 1
+ EQ KILL
+
+
+ [Master],show_eq_kill_buttons
+
+
+
+
+ [Master],show_eqs
+ visible
+
+
+
+
+ [Master],show_mixer
+ visible
+
+
+
+
+
+ ToolbarDivider
+ 13f,9min
+
+
+
+ 59f,24f
+ show_effects
+ GuiToggleButton
+ 2
+
+ 0
+ EFFECTS
+
+
+ 1
+ EFFECTS
+
+
+ [EffectRack1],show
+
+
+
+
+ min,min
+ horizontal
+
+
+ 88f,24f
+ GuiToggleButton
+ 2
+
+ 0
+ Super knobs
+
+
+ 1
+ Super knobs
+
+
+ [Master],show_superknobs
+
+
+
+
+ [EffectRack1],show
+ visible
+
+
+
+
+ ToolbarDivider
+ 13f,9min
+
+
+
+ 61f,24f
+ show_previewdeck
+ GuiToggleButton
+ 2
+
+ 0
+ PREVIEW
+
+
+ 1
+ PREVIEW
+
+
+ [PreviewDeck],show_previewdeck
+
+
+
+
+ 59f,24f
+ show_microphone
+ GuiToggleButton
+ 2
+
+ 0
+ MIC/AUX
+
+
+ 1
+ MIC/AUX
+
+
+ [Microphone],show_microphone
+
+
+
+
+ 69f,24f
+ show_samplers
+ GuiToggleButton
+ 2
+
+ 0
+ SAMPLERS
+
+
+ 1
+ SAMPLERS
+
+
+ [Samplers],show_samplers
+
+
+
- [VinylControl],show_vinylcontrol
+ [Master],maximize_library
+
+ visible
-
+
-
+
+
horizontal
- 5f,min
+ me,min
-
- ToolbarDivider
- 3f,9min
-
+
+ RecBox
+ stacked
+ 76f,24f
+
+
+
+
+ RecButton
+ toggle_recording
+ 70f,18f
+ [Recording],toggle_recording
+
+
+
+ horizontal
+ 70f,18f
+
+
+
+
+ RecDuration
+ 55f,18f
+ REC
+ center
+
+
+
+
+
+
+ RecFeedback
+ toggle_recording
+ 70f,18f
+ [Recording],toggle_recording
+ [Recording],status
+
+
+
horizontal
@@ -189,103 +352,61 @@
-
- 59f,24f
- show_effects
- GuiToggleButton
- 2
-
- 0
- EFFECTS
-
-
- 1
- EFFECTS
-
-
- [EffectRack1],show
- LeftButton
-
-
- [EffectRack1],show
-
-
+
-
- 59f,24f
- GuiToggleButton
- 2
-
- 0
- MIC/AUX
-
-
- 1
- MIC/AUX
-
-
- [Microphone],show_microphone
- LeftButton
-
-
- [Microphone],show_microphone
-
-
+
+ horizontal
+ 5f,min
+
+
-
- 66f,24f
- show_samplers
- GuiToggleButton
- 2
-
- 0
- SAMPLERS
-
-
- 1
- SAMPLERS
-
-
- [Samplers],show_samplers
- LeftButton
-
-
- [Samplers],show_samplers
-
-
+
+ ClockWidget
+ horizontal
+ min,min
+
+
+
+
-
- 54f,24f
- show_library
- GuiToggleButton
- 2
-
- 0
- LIBRARY
-
-
- 1
- LIBRARY
-
-
- [Library],show_library
- LeftButton
-
-
- [Library],show_library
-
-
+
+ ToolbarDivider
+ 13f,9min
+
-
horizontal
- me,min
-
-
+ min,min
+
+
-
- ClockRecLogo
-
+
+ audio_latency_usage
+ LatencyMeter
+ 72f,4min
+ style/vumeter_latency_over.png
+ style/vumeter_latency_bg.png
+
+ true
+ 5
+ 1000
+ 100
+ 1
+
+ [Master],audio_latency_usage
+
+
+
+
diff --git a/res/skins/LateNight/toolbar_big_library.xml b/res/skins/LateNight/toolbar_big_library.xml
deleted file mode 100644
index 74e7bc3d68b..00000000000
--- a/res/skins/LateNight/toolbar_big_library.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
- ToolBar
- horizontal
- e,min
-
-
-
- 84f,24f
- maximize_library
- GuiToggleButton
- 2
-
- 0
- BIG LIBRARY
-
-
- 1
- BIG LIBRARY
-
-
- [Master],maximize_library
- LeftButton
-
-
- [Master],maximize_library
-
-
-
-
-
- horizontal
- me,min
-
-
-
-
- ClockRecLogo
-
-
-
-
-
diff --git a/res/skins/LateNight/toolbar_clock_rec_logo.xml b/res/skins/LateNight/toolbar_clock_rec_logo.xml
deleted file mode 100644
index 2db060bc680..00000000000
--- a/res/skins/LateNight/toolbar_clock_rec_logo.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
- horizontal
- min,min
-
-
-
- RecBox
- stacked
- 76f,24f
-
-
-
-
- RecButton
- toggle_recording
- 70f,18f
- [Recording],toggle_recording
-
-
-
- horizontal
- 70f,18f
-
-
-
-
- RecDuration
- 55f,18f
- REC
- center
-
-
-
-
-
-
- RecFeedback
- toggle_recording
- 70f,18f
- [Recording],toggle_recording
- [Recording],status
-
-
-
-
-
- horizontal
- 5f,min
-
-
-
-
-
-
- horizontal
- 5f,min
-
-
-
-
- ClockWidget
- horizontal
- min,min
-
-
-
-
-
-
- horizontal
- 5f,min
-
-
-
-
- ToolbarDivider
- 3f,9min
-
-
-
- horizontal
- 5f,min
-
-
-
-
- horizontal
- min,min
-
-
- LatencyLabel
- horizontal
-
-
-
-
-
- audio_latency_usage
- [Master]
- audio_latency_usage
-
-
-
-
-
-
-
diff --git a/res/skins/LateNight/toolbar_no_library_button.xml b/res/skins/LateNight/toolbar_no_library_button.xml
deleted file mode 100644
index 708257982f2..00000000000
--- a/res/skins/LateNight/toolbar_no_library_button.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-
-
- ToolBar
- horizontal
- e,min
-
-
-
- 84f,24f
- maximize_library
- GuiToggleButton
- 2
-
- 0
- BIG LIBRARY
-
-
- 1
- BIG LIBRARY
-
-
- [Master],maximize_library
- LeftButton
-
-
- [Master],maximize_library
-
-
-
-
- horizontal
- 5f,min
-
-
-
-
- ToolbarDivider
- 3f,9min
-
-
-
- horizontal
- 5f,min
-
-
-
-
- 54f,24f
- toggle_4decks
- GuiToggleButton
- 2
-
- 0
- 4 DECKS
-
-
- 1
- 4 DECKS
-
-
- [Master],show_4decks
- LeftButton
-
-
- [Master],show_4decks
-
-
-
-
- 44f,24f
- toggle_4decks
- GuiToggleButton
- 2
-
- 0
- MIXER
-
-
- 1
- MIXER
-
-
- [Master],show_mixer
- LeftButton
-
-
- [Master],show_mixer
-
-
-
-
- 44f,24f
- GuiToggleButton
- 2
-
- 0
- EQ
-
-
- 1
- EQ
-
-
- [Master],show_eqs
- LeftButton
-
-
- [Master],show_eqs
-
-
-
-
- 59f,24f
- GuiToggleButton
- 2
-
- 0
- PREVIEW
-
-
- 1
- PREVIEW
-
-
- [PreviewDeck],show_previewdeck
- LeftButton
-
-
- [PreviewDeck],show_previewdeck
-
-
-
-
- 59f,24f
- GuiToggleButton
- 2
-
- 0
- SPINNIES
-
-
- 1
- SPINNIES
-
-
- [Spinny],show_spinnies
- LeftButton
-
-
- [Spinny],show_spinnies
-
-
-
-
- 44f,24f
- GuiToggleButton
- 2
-
- 0
- VINYL
-
-
- 1
- VINYL
-
-
- [VinylControl],show_vinylcontrol
- LeftButton
-
-
- [VinylControl],show_vinylcontrol
-
-
-
-
- horizontal
- 5f,min
-
-
-
-
- ToolbarDivider
- 3f,9min
-
-
-
- horizontal
- 5f,min
-
-
-
-
- 59f,24f
- show_effects
- GuiToggleButton
- 2
-
- 0
- EFFECTS
-
-
- 1
- EFFECTS
-
-
- [EffectRack1],show
- LeftButton
-
-
- [EffectRack1],show
-
-
-
-
- 59f,24f
- GuiToggleButton
- 2
-
- 0
- MIC/AUX
-
-
- 1
- MIC/AUX
-
-
- [Microphone],show_microphone
- LeftButton
-
-
- [Microphone],show_microphone
-
-
-
-
- 66f,24f
- show_samplers
- GuiToggleButton
- 2
-
- 0
- SAMPLERS
-
-
- 1
- SAMPLERS
-
-
- [Samplers],show_samplers
- LeftButton
-
-
- [Samplers],show_samplers
-
-
-
-
-
- horizontal
- me,min
-
-
-
-
- ClockRecLogo
-
-
-
-
-
diff --git a/res/skins/LateNight/vumeter_latency.xml b/res/skins/LateNight/vumeter_latency.xml
index 8a6b83a24a0..5da4d8bbfa4 100644
--- a/res/skins/LateNight/vumeter_latency.xml
+++ b/res/skins/LateNight/vumeter_latency.xml
@@ -17,8 +17,8 @@
64,4
64,4
- vumeter_latency_over.png
- vumeter_latency_bg.png
+ sytle/vumeter_latency_over.png
+ style/vumeter_latency_bg.png
true
5
diff --git a/res/skins/LateNight/vumeter_latency_over.png b/res/skins/LateNight/vumeter_latency_over.png
deleted file mode 100644
index 19b9b7cb3f3..00000000000
Binary files a/res/skins/LateNight/vumeter_latency_over.png and /dev/null differ
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 73aeadb9677..b8c94558c40 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -1,32 +1,14 @@
+ [Channel]
Waveform
- vertical
- me,min
-
+ horizontal
+ me,me
-
-
waveform_display
-
-
-
-
@@ -75,6 +57,82 @@
#FFFFFF
+
+
+ BeatgridButtons
+ vertical
+
+ f,f
+
+ 1me,0me
+
+
+ Spacer0f
+ horizontal
+ f,f
+
+
+ beats_translate_curpos
+ BeatCurpos
+ beat_curpos_large
+ 28f,56f
+ ,beats_translate_curpos
+
+
+
+ vertical
+ f,f
+
+
+ beats_translate_earlier
+ FxAssignButton
+ beats_earlier
+ 28f,28f
+ ,beats_translate_earlier
+
+
+
+ beats_adjust_faster
+ FxAssignButton
+ beats_faster
+ 28f,28f
+ ,beats_adjust_faster
+
+
+
+
+
+ vertical
+ f,f
+
+
+ beats_translate_later
+ FxAssignButton
+ beats_later
+ 28f,28f
+ ,beats_translate_later
+
+
+
+ beats_adjust_slower
+ FxAssignButton
+ beats_slower
+ 28f,28f
+ ,beats_adjust_slower
+
+
+
+
+
+
+ 1me,0me
+
+
+ [Skin],beatgrid_buttons
+ visible
+
+
diff --git a/res/skins/LateNight/waveforms.xml b/res/skins/LateNight/waveforms.xml
index 247868b4cb8..2cd7a8738e0 100644
--- a/res/skins/LateNight/waveforms.xml
+++ b/res/skins/LateNight/waveforms.xml
@@ -1,48 +1,37 @@
- vertical
- 0me,40min
+ horizontal
+ me,min
-
- horizontal
- me,me
+
+ vertical
+ me,min
- 0f,0me
-
-
- 3
- #09B2AE
- #012322
- #cb3433
- #00ff33
- #0034fe
-
-
-
- [Master],show_4decks
- visible
-
-
-
- stacked
- me,me
-
+
+ horizontal
+ me,me
+
+
+ 3
+ #09B2AE
+ #012322
+ #cb3433
+ #00ff33
+ #0034fe
+
+
+
+ [Master],show_4decks
+ visible
+
+
horizontal
me,me
-
-
-
1
#E7C413
@@ -54,86 +43,57 @@
-
+ horizontal
+ me,me
+
+ 2
+ #E7C413
+ #2f290a
+ #ff2a00
+ #33f600
+ #332acc
+
+
+
-
- 0,10
- 0,39
- f,me
-
- 1f,1f
-
-
-
-
- 0,40
- 0,69
- f,me
-
- 1f,1f
-
-
-
-
- 0,70
- 0,-1
- f,me
-
- 0f,1f
-
-
-
+
+ horizontal
+ me,me
+
+
+ 4
+ #09B2AE
+ #012322
+ #cb3433
+ #00ff33
+ #0034fe
+
- -->
-
-
+
+ [Master],show_4decks
+ visible
+
+
-
- horizontal
- me,me
-
- 1f,0min
-
-
- 2
- #E7C413
- #2f290a
- #ff2a00
- #33f600
- #332acc
-
-
+
-
- horizontal
- me,me
-
- 0f,0me
-
-
- 4
- #09B2AE
- #012322
- #cb3433
- #00ff33
- #0034fe
-
-
+
+ BeatgridButtonsToggle
+ 28f,40me
+ 2
+
+ 0
+
+
+ 1
+
- [Master],show_4decks
- visible
+ [Skin],beatgrid_buttons
-
+