diff --git a/res/skins/Tango/aux_unit.xml b/res/skins/Tango/aux_unit.xml
index fada7cda535..f571ae205a6 100644
--- a/res/skins/Tango/aux_unit.xml
+++ b/res/skins/Tango/aux_unit.xml
@@ -43,32 +43,9 @@ Variables:
3f,1min
-
- VUMeterMicAux
- 5f,29f
- stacked
-
-
- skin:/graphics/vumeter_mini_clipping_over.png
- skin:/graphics/vumeter_mini_clipping.png
-
- ,PeakIndicator
-
-
-
- skin:/graphics/vumeter_mini_over.png
- skin:/graphics/vumeter_mini.png
- false
- 5
- 500
- 50
- 2
-
- ,VuMeter
-
-
-
-
+
+ 5f,29f
+
1f,1min
@@ -91,10 +68,8 @@ Variables:
pfl
PflButton
18f,18f
- pfl_off.svg
- pfl_off.svg
- pfl_on.svg
- pfl_on.svg
+ pfl_off.svg
+ pfl_on.svg
,pfl
@@ -102,12 +77,9 @@ Variables:
orientation
AuxXfaderButton
18f,15f
- aux_xfader_left.svg
- aux_xfader_left.svg
- aux_xfader_center.svg
- aux_xfader_center.svg
- aux_xfader_right.svg
- aux_xfader_right.svg
+ aux_xfader_left.svg
+ aux_xfader_center.svg
+ aux_xfader_right.svg
,orientation
diff --git a/res/skins/Tango/button_2state.xml b/res/skins/Tango/button_2state.xml
index da312ddd750..802bc5ce6a9 100644
--- a/res/skins/Tango/button_2state.xml
+++ b/res/skins/Tango/button_2state.xml
@@ -23,15 +23,15 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_2state_display.xml b/res/skins/Tango/button_2state_display.xml
index 62b6e57b57f..fcba176584b 100644
--- a/res/skins/Tango/button_2state_display.xml
+++ b/res/skins/Tango/button_2state_display.xml
@@ -23,15 +23,15 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_2state_highlight.xml b/res/skins/Tango/button_2state_highlight.xml
index 619b8beadc9..d2497ffe61c 100644
--- a/res/skins/Tango/button_2state_highlight.xml
+++ b/res/skins/Tango/button_2state_highlight.xml
@@ -23,15 +23,15 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_2state_persist.xml b/res/skins/Tango/button_2state_persist.xml
index 8f41af8cc0a..3327a17ba78 100644
--- a/res/skins/Tango/button_2state_persist.xml
+++ b/res/skins/Tango/button_2state_persist.xml
@@ -22,15 +22,15 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_2state_right.xml b/res/skins/Tango/button_2state_right.xml
index d6bfec8d11a..9f2fef4cd35 100644
--- a/res/skins/Tango/button_2state_right.xml
+++ b/res/skins/Tango/button_2state_right.xml
@@ -24,15 +24,15 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_2state_right_display.xml b/res/skins/Tango/button_2state_right_display.xml
index b0930d9485a..ea75b6b658d 100644
--- a/res/skins/Tango/button_2state_right_display.xml
+++ b/res/skins/Tango/button_2state_right_display.xml
@@ -25,15 +25,15 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_3state.xml b/res/skins/Tango/button_3state.xml
index ca996475141..1e4026a8e61 100644
--- a/res/skins/Tango/button_3state.xml
+++ b/res/skins/Tango/button_3state.xml
@@ -21,22 +21,22 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
2
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_3state_display.xml b/res/skins/Tango/button_3state_display.xml
index c8d60c8cc91..ec0dc4ef0f8 100644
--- a/res/skins/Tango/button_3state_display.xml
+++ b/res/skins/Tango/button_3state_display.xml
@@ -22,22 +22,22 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
2
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_3state_persist.xml b/res/skins/Tango/button_3state_persist.xml
index 88ef9520830..b9b14ebfa35 100644
--- a/res/skins/Tango/button_3state_persist.xml
+++ b/res/skins/Tango/button_3state_persist.xml
@@ -21,22 +21,22 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
2
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_4state_display.xml b/res/skins/Tango/button_4state_display.xml
index a41013949f0..1fe17c4ceb6 100644
--- a/res/skins/Tango/button_4state_display.xml
+++ b/res/skins/Tango/button_4state_display.xml
@@ -22,29 +22,29 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
2
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
3
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_5state.xml b/res/skins/Tango/button_5state.xml
index 74a0dfb7141..b088003b4ea 100644
--- a/res/skins/Tango/button_5state.xml
+++ b/res/skins/Tango/button_5state.xml
@@ -22,36 +22,36 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
2
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
3
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
4
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/button_5state_display.xml b/res/skins/Tango/button_5state_display.xml
index ccf8f258d98..0d3408fca0a 100644
--- a/res/skins/Tango/button_5state_display.xml
+++ b/res/skins/Tango/button_5state_display.xml
@@ -22,36 +22,36 @@ Variables:
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
2
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
3
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
4
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
diff --git a/res/skins/Tango/buttons/btn_pause.svg b/res/skins/Tango/buttons/btn_pause_deck.svg
similarity index 90%
rename from res/skins/Tango/buttons/btn_pause.svg
rename to res/skins/Tango/buttons/btn_pause_deck.svg
index 1451e407fbf..9d1d7fe7bbc 100644
--- a/res/skins/Tango/buttons/btn_pause.svg
+++ b/res/skins/Tango/buttons/btn_pause_deck.svg
@@ -8,7 +8,7 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
- width="24"
+ width="50"
height="24"
id="svg3922">
diff --git a/res/skins/Tango/buttons/btn_pause_hover.svg b/res/skins/Tango/buttons/btn_pause_hover.svg
deleted file mode 100644
index 7c831b9b71f..00000000000
--- a/res/skins/Tango/buttons/btn_pause_hover.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_pause_previewdeck.svg b/res/skins/Tango/buttons/btn_pause_previewdeck.svg
new file mode 100644
index 00000000000..ee682354400
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_pause_previewdeck.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/res/skins/Tango/buttons/btn_pause_sampler.svg b/res/skins/Tango/buttons/btn_pause_sampler.svg
new file mode 100644
index 00000000000..81937959211
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_pause_sampler.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/res/skins/Tango/buttons/btn_play.svg b/res/skins/Tango/buttons/btn_play.svg
deleted file mode 100644
index f178e8f4dad..00000000000
--- a/res/skins/Tango/buttons/btn_play.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_play_hover.svg b/res/skins/Tango/buttons/btn_play_deck.svg
similarity index 72%
rename from res/skins/Tango/buttons/btn_play_hover.svg
rename to res/skins/Tango/buttons/btn_play_deck.svg
index a64e186b7ff..bde72269089 100644
--- a/res/skins/Tango/buttons/btn_play_hover.svg
+++ b/res/skins/Tango/buttons/btn_play_deck.svg
@@ -8,11 +8,11 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
- width="24"
+ width="50"
height="24"
- id="svg3033">
+ id="svg3110">
+ id="metadata3120">
@@ -24,13 +24,13 @@
+ id="defs3118" />
+ d="M 31.392488,12.000025 21.000212,18.000009 V 6.0000416 z"
+ id="path3114"
+ style="fill:#cccccc" />
diff --git a/res/skins/Tango/buttons/btn_play_previewdeck.svg b/res/skins/Tango/buttons/btn_play_previewdeck.svg
new file mode 100644
index 00000000000..689fb01f3e4
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_play_previewdeck.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/res/skins/Tango/buttons/btn_play_sampler.svg b/res/skins/Tango/buttons/btn_play_sampler.svg
new file mode 100644
index 00000000000..8d27d7f2419
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_play_sampler.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/res/skins/Tango/buttons/btn_sampler_play.xcf b/res/skins/Tango/buttons/btn_sampler_play.xcf
deleted file mode 100644
index a722e06efa8..00000000000
Binary files a/res/skins/Tango/buttons/btn_sampler_play.xcf and /dev/null differ
diff --git a/res/skins/Tango/deck_buttons_left.xml b/res/skins/Tango/deck_buttons_left.xml
index 5e1ef1d83d0..bc7dcbb3363 100644
--- a/res/skins/Tango/deck_buttons_left.xml
+++ b/res/skins/Tango/deck_buttons_left.xml
@@ -58,10 +58,8 @@ Variables:
18f
keylock
- keylock_off.svg
- keylock_off.svg
- keylock_on.svg
- keylock_on.svg
+ keylock_off.svg
+ keylock_on.svg
keylock
@@ -76,42 +74,33 @@ Variables:
22f
slip_mode
- slipmode_off.svg
- slipmode_off.svg
- slipmode_on.svg
- slipmode_on.svg
+ slipmode_off.svg
+ slipmode_on.svg
slip_enabled
22f
repeat
- repeat_off.svg
- repeat_off.svg
- repeat_on.svg
- repeat_on.svg
+ repeat_off.svg
+ repeat_on.svg
repeat
20f
orientation
- xfader_left.svg
- xfader_left.svg
- xfader_center_attention.svg
- xfader_center_attention.svg
- xfader_right_attention.svg
- xfader_right_attention.svg
+ xfader_left.svg
+ xfader_center_attention.svg
+ xfader_right_attention.svg
orientation
20f
quantize
- quantize_off.svg
- quantize_off.svg
- quantize_on.svg
- quantize_on.svg
+ quantize_off.svg
+ quantize_on.svg
quantize
@@ -127,10 +116,8 @@ Variables:
18max
keylock
- keylock_off.svg
- keylock_off.svg
- keylock_on.svg
- keylock_on.svg
+ keylock_off.svg
+ keylock_on.svg
keylock
@@ -145,42 +132,33 @@ Variables:
22max
slip_mode
- slipmode_off.svg
- slipmode_off.svg
- slipmode_on.svg
- slipmode_on.svg
+ slipmode_off.svg
+ slipmode_on.svg
slip_enabled
22max
repeat
- repeat_off.svg
- repeat_off.svg
- repeat_on.svg
- repeat_on.svg
+ repeat_off.svg
+ repeat_on.svg
repeat
20max
orientation
- xfader_left.svg
- xfader_left.svg
- xfader_center_attention.svg
- xfader_center_attention.svg
- xfader_right_attention.svg
- xfader_right_attention.svg
+ xfader_left.svg
+ xfader_center_attention.svg
+ xfader_right_attention.svg
orientation
20max
quantize
- quantize_off.svg
- quantize_off.svg
- quantize_on.svg
- quantize_on.svg
+ quantize_off.svg
+ quantize_on.svg
quantize
@@ -245,6 +223,8 @@ Variables:
PlayCue
play_cue_set
50f,24f
+ play_deck.svg
+ pause_deck.svg
,play
,cue_default
,play_indicator
@@ -320,6 +300,8 @@ Variables:
PlayCue
play_cue_set
50f,24f
+ play_deck.svg
+ pause_deck.svg
,play
,play
,play_indicator
diff --git a/res/skins/Tango/deck_buttons_right.xml b/res/skins/Tango/deck_buttons_right.xml
index 74b2b26f293..457046b55ab 100644
--- a/res/skins/Tango/deck_buttons_right.xml
+++ b/res/skins/Tango/deck_buttons_right.xml
@@ -49,6 +49,8 @@ Variables:
PlayCue
play_cue_set
50f,24f
+ play_deck.svg
+ pause_deck.svg
,play
,cue_default
,play_indicator
@@ -103,6 +105,8 @@ Variables:
PlayCue
play_cue_set
50f,24f
+ play_deck.svg
+ pause_deck.svg
,play
,play
,play_indicator
@@ -182,42 +186,33 @@ Variables:
20max
quantize
- quantize_off.svg
- quantize_off.svg
- quantize_on.svg
- quantize_on.svg
+ quantize_off.svg
+ quantize_on.svg
quantize
20max
orientation
- xfader_left_attention.svg
- xfader_left_attention.svg
- xfader_center_attention.svg
- xfader_center_attention.svg
- xfader_right.svg
- xfader_right.svg
+ xfader_left_attention.svg
+ xfader_center_attention.svg
+ xfader_right.svg
orientation
22max
repeat
- repeat_off.svg
- repeat_off.svg
- repeat_on.svg
- repeat_on.svg
+ repeat_off.svg
+ repeat_on.svg
repeat
22max
slip_mode
- slipmode_off.svg
- slipmode_off.svg
- slipmode_on.svg
- slipmode_on.svg
+ slipmode_off.svg
+ slipmode_on.svg
slip_enabled
@@ -232,10 +227,8 @@ Variables:
18max
keylock
- keylock_off.svg
- keylock_off.svg
- keylock_on.svg
- keylock_on.svg
+ keylock_off.svg
+ keylock_on.svg
keylock
@@ -250,42 +243,33 @@ Variables:
20f
quantize
- quantize_off.svg
- quantize_off.svg
- quantize_on.svg
- quantize_on.svg
+ quantize_off.svg
+ quantize_on.svg
quantize
20f
orientation
- xfader_left_attention.svg
- xfader_left_attention.svg
- xfader_center_attention.svg
- xfader_center_attention.svg
- xfader_right.svg
- xfader_right.svg
+ xfader_left_attention.svg
+ xfader_center_attention.svg
+ xfader_right.svg
orientation
22f
repeat
- repeat_off.svg
- repeat_off.svg
- repeat_on.svg
- repeat_on.svg
+ repeat_off.svg
+ repeat_on.svg
repeat
22f
slip_mode
- slipmode_off.svg
- slipmode_off.svg
- slipmode_on.svg
- slipmode_on.svg
+ slipmode_off.svg
+ slipmode_on.svg
slip_enabled
@@ -300,10 +284,8 @@ Variables:
18f
keylock
- keylock_off.svg
- keylock_off.svg
- keylock_on.svg
- keylock_on.svg
+ keylock_off.svg
+ keylock_on.svg
keylock
diff --git a/res/skins/Tango/deckbutton_2state_optional.xml b/res/skins/Tango/deckbutton_2state_optional.xml
index 926a6cc448d..6757ea8d5e6 100644
--- a/res/skins/Tango/deckbutton_2state_optional.xml
+++ b/res/skins/Tango/deckbutton_2state_optional.xml
@@ -23,13 +23,13 @@ Variables:
2
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
,
diff --git a/res/skins/Tango/deckbutton_2state_permanent.xml b/res/skins/Tango/deckbutton_2state_permanent.xml
index d158fa33725..b6cc291a5f4 100644
--- a/res/skins/Tango/deckbutton_2state_permanent.xml
+++ b/res/skins/Tango/deckbutton_2state_permanent.xml
@@ -22,13 +22,13 @@ Variables:
2
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
,
diff --git a/res/skins/Tango/deckbutton_3state_optional.xml b/res/skins/Tango/deckbutton_3state_optional.xml
index 3a9cf875a53..01659478804 100644
--- a/res/skins/Tango/deckbutton_3state_optional.xml
+++ b/res/skins/Tango/deckbutton_3state_optional.xml
@@ -23,18 +23,18 @@ Variables:
3
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
2
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
,
diff --git a/res/skins/Tango/deckbutton_3state_permanent.xml b/res/skins/Tango/deckbutton_3state_permanent.xml
index c00686ce7b6..0ea67837508 100644
--- a/res/skins/Tango/deckbutton_3state_permanent.xml
+++ b/res/skins/Tango/deckbutton_3state_permanent.xml
@@ -22,18 +22,18 @@ Variables:
3
0
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
1
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
2
- skin:/buttons/btn_
- skin:/buttons/btn_
+ skin:/buttons/btn_
+ skin:/buttons/btn_
,
diff --git a/res/skins/Tango/fx_unit_left.xml b/res/skins/Tango/fx_unit_left.xml
index dbf24f3dffc..31c8e6ba764 100644
--- a/res/skins/Tango/fx_unit_left.xml
+++ b/res/skins/Tango/fx_unit_left.xml
@@ -283,10 +283,8 @@ Variables:
PflButton
EffectUnit_headphones_enabled
24f,24f
- pfl_off.svg
- pfl_off.svg
- pfl_on.svg
- pfl_on.svg
+ pfl_off.svg
+ pfl_on.svg
[],group_[Headphone]_enable
diff --git a/res/skins/Tango/fx_unit_left_mini.xml b/res/skins/Tango/fx_unit_left_mini.xml
index 580a5d41945..e962a367138 100644
--- a/res/skins/Tango/fx_unit_left_mini.xml
+++ b/res/skins/Tango/fx_unit_left_mini.xml
@@ -197,10 +197,8 @@ Variables:
PflButton
EffectUnit_headphones_enabled
20f,20f
- pfl_off.svg
- pfl_off.svg
- pfl_on.svg
- pfl_on.svg
+ pfl_off.svg
+ pfl_on.svg
[EffectRack1_EffectUnit],group_[Headphone]_enable
@@ -243,7 +241,7 @@ Variables:
FxUnitControlsLeft
vertical
- min,min
+ 30f,30f
diff --git a/res/skins/Tango/fx_unit_right_mini.xml b/res/skins/Tango/fx_unit_right_mini.xml
index df8bba41d86..ba27f55c9ac 100644
--- a/res/skins/Tango/fx_unit_right_mini.xml
+++ b/res/skins/Tango/fx_unit_right_mini.xml
@@ -18,7 +18,7 @@ Variables:
Spacer25
vertical
- min,min
+ 30f,30f
diff --git a/res/skins/Tango/graphics/cover_default.svg b/res/skins/Tango/graphics/cover_default.svg
index 6fac1f5af61..23155c2d7bd 100644
--- a/res/skins/Tango/graphics/cover_default.svg
+++ b/res/skins/Tango/graphics/cover_default.svg
@@ -8,8 +8,8 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
- width="96"
- height="96"
+ width="444"
+ height="444"
id="svg2">
@@ -26,23 +26,23 @@
diff --git a/res/skins/Tango/graphics/cover_default_mini_1.svg b/res/skins/Tango/graphics/cover_default_mini_1.svg
index 16defa85a95..4cfffe9bd36 100644
--- a/res/skins/Tango/graphics/cover_default_mini_1.svg
+++ b/res/skins/Tango/graphics/cover_default_mini_1.svg
@@ -8,8 +8,8 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
- width="50"
- height="50"
+ width="200"
+ height="200"
id="svg3969">
@@ -26,22 +26,22 @@
+ style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#080808;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
diff --git a/res/skins/Tango/graphics/cover_default_mini_2.svg b/res/skins/Tango/graphics/cover_default_mini_2.svg
index 16defa85a95..4cfffe9bd36 100644
--- a/res/skins/Tango/graphics/cover_default_mini_2.svg
+++ b/res/skins/Tango/graphics/cover_default_mini_2.svg
@@ -8,8 +8,8 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
- width="50"
- height="50"
+ width="200"
+ height="200"
id="svg3969">
@@ -26,22 +26,22 @@
+ style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#080808;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
diff --git a/res/skins/Tango/graphics/cover_default_mini_3.svg b/res/skins/Tango/graphics/cover_default_mini_3.svg
index 753a5d90efb..99bdf740554 100644
--- a/res/skins/Tango/graphics/cover_default_mini_3.svg
+++ b/res/skins/Tango/graphics/cover_default_mini_3.svg
@@ -8,8 +8,8 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
- width="50"
- height="50"
+ width="200"
+ height="200"
id="svg3969">
@@ -26,22 +26,22 @@
+ style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#080808;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
diff --git a/res/skins/Tango/graphics/cover_default_mini_4.svg b/res/skins/Tango/graphics/cover_default_mini_4.svg
index 753a5d90efb..99bdf740554 100644
--- a/res/skins/Tango/graphics/cover_default_mini_4.svg
+++ b/res/skins/Tango/graphics/cover_default_mini_4.svg
@@ -8,8 +8,8 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
- width="50"
- height="50"
+ width="200"
+ height="200"
id="svg3969">
@@ -26,22 +26,22 @@
+ style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#080808;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
diff --git a/res/skins/Tango/graphics/latency_usage.png b/res/skins/Tango/graphics/latency_usage.png
deleted file mode 100644
index e7c414d9090..00000000000
Binary files a/res/skins/Tango/graphics/latency_usage.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/latency_usage.svg b/res/skins/Tango/graphics/latency_usage.svg
new file mode 100644
index 00000000000..f5c3bd85e4b
--- /dev/null
+++ b/res/skins/Tango/graphics/latency_usage.svg
@@ -0,0 +1,160 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/latency_usage_over.png b/res/skins/Tango/graphics/latency_usage_over.png
deleted file mode 100644
index ffb302e559c..00000000000
Binary files a/res/skins/Tango/graphics/latency_usage_over.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/latency_usage_over.svg b/res/skins/Tango/graphics/latency_usage_over.svg
new file mode 100644
index 00000000000..414f87823a1
--- /dev/null
+++ b/res/skins/Tango/graphics/latency_usage_over.svg
@@ -0,0 +1,160 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/spinny_bg.svg b/res/skins/Tango/graphics/spinny_bg.svg
index 9a276bea58d..75de55a03b5 100644
--- a/res/skins/Tango/graphics/spinny_bg.svg
+++ b/res/skins/Tango/graphics/spinny_bg.svg
@@ -1 +1,35 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/res/skins/Tango/graphics/spinny_indicator.svg b/res/skins/Tango/graphics/spinny_indicator.svg
index 68b635db617..effa3d429ba 100644
--- a/res/skins/Tango/graphics/spinny_indicator.svg
+++ b/res/skins/Tango/graphics/spinny_indicator.svg
@@ -1 +1,32 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/res/skins/Tango/graphics/spinny_indicator_ghost.svg b/res/skins/Tango/graphics/spinny_indicator_ghost.svg
index 5f4148403ee..cea5d4da081 100644
--- a/res/skins/Tango/graphics/spinny_indicator_ghost.svg
+++ b/res/skins/Tango/graphics/spinny_indicator_ghost.svg
@@ -1 +1,60 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/res/skins/Tango/graphics/spinny_mask.svg b/res/skins/Tango/graphics/spinny_mask.svg
index f5ef7412f68..00ba3134e33 100644
--- a/res/skins/Tango/graphics/spinny_mask.svg
+++ b/res/skins/Tango/graphics/spinny_mask.svg
@@ -1 +1,43 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/res/skins/Tango/graphics/splitterHori_handle.png b/res/skins/Tango/graphics/splitterHori_handle.png
deleted file mode 100644
index bb58a5a1955..00000000000
Binary files a/res/skins/Tango/graphics/splitterHori_handle.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/splitterHori_handle.svg b/res/skins/Tango/graphics/splitterHori_handle.svg
new file mode 100644
index 00000000000..bf8cb0064aa
--- /dev/null
+++ b/res/skins/Tango/graphics/splitterHori_handle.svg
@@ -0,0 +1,56 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/splitterHori_handle_pressed.png b/res/skins/Tango/graphics/splitterHori_handle_pressed.png
deleted file mode 100644
index 458ed19b989..00000000000
Binary files a/res/skins/Tango/graphics/splitterHori_handle_pressed.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/splitterHori_handle_pressed.svg b/res/skins/Tango/graphics/splitterHori_handle_pressed.svg
new file mode 100644
index 00000000000..d9580f124a7
--- /dev/null
+++ b/res/skins/Tango/graphics/splitterHori_handle_pressed.svg
@@ -0,0 +1,56 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/splitterVert_handle.png b/res/skins/Tango/graphics/splitterVert_handle.png
deleted file mode 100644
index 75c18c379cb..00000000000
Binary files a/res/skins/Tango/graphics/splitterVert_handle.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/splitterVert_handle.svg b/res/skins/Tango/graphics/splitterVert_handle.svg
new file mode 100644
index 00000000000..ca019169695
--- /dev/null
+++ b/res/skins/Tango/graphics/splitterVert_handle.svg
@@ -0,0 +1,52 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/splitterVert_handle_pressed.png b/res/skins/Tango/graphics/splitterVert_handle_pressed.png
deleted file mode 100644
index 4ffa7c33dab..00000000000
Binary files a/res/skins/Tango/graphics/splitterVert_handle_pressed.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/splitterVert_handle_pressed.svg b/res/skins/Tango/graphics/splitterVert_handle_pressed.svg
new file mode 100644
index 00000000000..64788d67cf1
--- /dev/null
+++ b/res/skins/Tango/graphics/splitterVert_handle_pressed.svg
@@ -0,0 +1,52 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_floating.png b/res/skins/Tango/graphics/vumeter_floating.png
deleted file mode 100644
index f3cc6e94446..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_floating.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_floating.svg b/res/skins/Tango/graphics/vumeter_floating.svg
new file mode 100644
index 00000000000..b1d9eb2ef85
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_floating.svg
@@ -0,0 +1,414 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_floating_clipping.png b/res/skins/Tango/graphics/vumeter_floating_clipping.png
deleted file mode 100644
index ee8c90c3646..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_floating_clipping.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_floating_clipping.svg b/res/skins/Tango/graphics/vumeter_floating_clipping.svg
new file mode 100644
index 00000000000..668ff093ccd
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_floating_clipping.svg
@@ -0,0 +1,31 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_floating_clipping_over.png b/res/skins/Tango/graphics/vumeter_floating_clipping_over.png
deleted file mode 100644
index 1eaf57b307a..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_floating_clipping_over.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_floating_clipping_over.svg b/res/skins/Tango/graphics/vumeter_floating_clipping_over.svg
new file mode 100644
index 00000000000..5166910bd32
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_floating_clipping_over.svg
@@ -0,0 +1,39 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_floating_over.png b/res/skins/Tango/graphics/vumeter_floating_over.png
deleted file mode 100644
index 9b4b9872041..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_floating_over.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_floating_over.svg b/res/skins/Tango/graphics/vumeter_floating_over.svg
new file mode 100644
index 00000000000..6d8ed7b2504
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_floating_over.svg
@@ -0,0 +1,421 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_mini.png b/res/skins/Tango/graphics/vumeter_mini.png
deleted file mode 100644
index d8bca475bf1..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_mini.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_mini.svg b/res/skins/Tango/graphics/vumeter_mini.svg
new file mode 100644
index 00000000000..28f1fd345cb
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_mini.svg
@@ -0,0 +1,40 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_mini_clipping.png b/res/skins/Tango/graphics/vumeter_mini_clipping.png
deleted file mode 100644
index b60c3eaba55..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_mini_clipping.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_mini_clipping.svg b/res/skins/Tango/graphics/vumeter_mini_clipping.svg
new file mode 100644
index 00000000000..4abd7da0726
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_mini_clipping.svg
@@ -0,0 +1,31 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_mini_clipping_over.png b/res/skins/Tango/graphics/vumeter_mini_clipping_over.png
deleted file mode 100644
index 12d26666216..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_mini_clipping_over.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_mini_clipping_over.svg b/res/skins/Tango/graphics/vumeter_mini_clipping_over.svg
new file mode 100644
index 00000000000..fc569c557ca
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_mini_clipping_over.svg
@@ -0,0 +1,40 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_mini_over.png b/res/skins/Tango/graphics/vumeter_mini_over.png
deleted file mode 100644
index 3a689701ac2..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_mini_over.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_mini_over.svg b/res/skins/Tango/graphics/vumeter_mini_over.svg
new file mode 100644
index 00000000000..aa0739feb69
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_mini_over.svg
@@ -0,0 +1,69 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_mixer.png b/res/skins/Tango/graphics/vumeter_mixer.png
deleted file mode 100644
index b57c85bbddd..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_mixer.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_mixer.svg b/res/skins/Tango/graphics/vumeter_mixer.svg
new file mode 100644
index 00000000000..13105505013
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_mixer.svg
@@ -0,0 +1,394 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_mixer_clipping.png b/res/skins/Tango/graphics/vumeter_mixer_clipping.png
deleted file mode 100644
index 75760a8b21a..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_mixer_clipping.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_mixer_clipping.svg b/res/skins/Tango/graphics/vumeter_mixer_clipping.svg
new file mode 100644
index 00000000000..f150581cde1
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_mixer_clipping.svg
@@ -0,0 +1,31 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_mixer_clipping_over.png b/res/skins/Tango/graphics/vumeter_mixer_clipping_over.png
deleted file mode 100644
index 47d4c1d8e9c..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_mixer_clipping_over.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_mixer_clipping_over.svg b/res/skins/Tango/graphics/vumeter_mixer_clipping_over.svg
new file mode 100644
index 00000000000..3f2337b7290
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_mixer_clipping_over.svg
@@ -0,0 +1,39 @@
+
+
+
+
diff --git a/res/skins/Tango/graphics/vumeter_mixer_over.png b/res/skins/Tango/graphics/vumeter_mixer_over.png
deleted file mode 100644
index 2b494d7ea7c..00000000000
Binary files a/res/skins/Tango/graphics/vumeter_mixer_over.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_mixer_over.svg b/res/skins/Tango/graphics/vumeter_mixer_over.svg
new file mode 100644
index 00000000000..0acfa185aab
--- /dev/null
+++ b/res/skins/Tango/graphics/vumeter_mixer_over.svg
@@ -0,0 +1,426 @@
+
+
+
+
diff --git a/res/skins/Tango/loop_jump_controls_left.xml b/res/skins/Tango/loop_jump_controls_left.xml
index be07c1e4093..2b42c128b94 100644
--- a/res/skins/Tango/loop_jump_controls_left.xml
+++ b/res/skins/Tango/loop_jump_controls_left.xml
@@ -38,12 +38,10 @@ Variables:
beatloop_activate
- LoopBeatJumpButton
+ LoopActivateButton
30f,22f
- loop_on.svg
- loop.svg
- loop_on.svg
- loop_on.svg
+ loop.svg
+ loop_on.svg
,beatloop_activate
,beatlooproll_activate
@@ -74,10 +72,8 @@ Variables:
reloop_toggle
ReloopButton
22f,22f
- reloop_off.svg
- reloop_off.svg
- reloop_on.svg
- reloop_on.svg
+ reloop_off.svg
+ reloop_on.svg
,reloop_toggle
,reloop_andstop
,loop_enabled
diff --git a/res/skins/Tango/loop_jump_controls_right.xml b/res/skins/Tango/loop_jump_controls_right.xml
index 57e3bc0c15f..17689ffb1ba 100644
--- a/res/skins/Tango/loop_jump_controls_right.xml
+++ b/res/skins/Tango/loop_jump_controls_right.xml
@@ -114,12 +114,10 @@ Variables:
beatloop_activate
- LoopBeatJumpButton
+ LoopActivateButton
30f,22f
- loop_on.svg
- loop.svg
- loop_on.svg
- loop_on.svg
+ loop.svg
+ loop_on.svg
,beatloop_activate
,beatlooproll_activate
@@ -142,10 +140,8 @@ Variables:
reloop_toggle
ReloopButton
22f,22f
- reloop_off.svg
- reloop_off.svg
- reloop_on.svg
- reloop_on.svg
+ reloop_off.svg
+ reloop_on.svg
,reloop_toggle
,reloop_andstop
,loop_enabled
diff --git a/res/skins/Tango/mic_unit.xml b/res/skins/Tango/mic_unit.xml
index 80745673817..91f729516b7 100644
--- a/res/skins/Tango/mic_unit.xml
+++ b/res/skins/Tango/mic_unit.xml
@@ -46,32 +46,10 @@ Variables:
3f,1min
-
- VUMeterMicAux
- 5f,29f
- stacked
-
-
- skin:/graphics/vumeter_mini_clipping_over.png
- skin:/graphics/vumeter_mini_clipping.png
-
- ,PeakIndicator
-
-
-
- skin:/graphics/vumeter_mini_over.png
- skin:/graphics/vumeter_mini.png
- false
- 5
- 500
- 50
- 2
-
- ,VuMeter
-
-
-
-
+
+ microphone_VuMeter
+ 5f,29f
+
1f,1min
@@ -90,10 +68,8 @@ Variables:
pfl
PflButton
20f,20f
- pfl_off.svg
- pfl_off.svg
- pfl_on.svg
- pfl_on.svg
+ pfl_off.svg
+ pfl_on.svg
,pfl
diff --git a/res/skins/Tango/mixer_channel_left.xml b/res/skins/Tango/mixer_channel_left.xml
index 5c1c0c6cbcf..e9af592e337 100644
--- a/res/skins/Tango/mixer_channel_left.xml
+++ b/res/skins/Tango/mixer_channel_left.xml
@@ -110,10 +110,8 @@ Variables:
pfl
PflButton
24f,24f
- pfl_off.svg
- pfl_off.svg
- pfl_on.svg
- pfl_on.svg
+ pfl_off.svg
+ pfl_on.svg
,pfl
diff --git a/res/skins/Tango/mixer_channel_right.xml b/res/skins/Tango/mixer_channel_right.xml
index 11d79b34c33..fa46753fa72 100644
--- a/res/skins/Tango/mixer_channel_right.xml
+++ b/res/skins/Tango/mixer_channel_right.xml
@@ -48,10 +48,8 @@ Variables:
pfl
PflButton
24f,24f
- pfl_off.svg
- pfl_off.svg
- pfl_on.svg
- pfl_on.svg
+ pfl_off.svg
+ pfl_on.svg
,pfl
diff --git a/res/skins/Tango/mixer_headphone.xml b/res/skins/Tango/mixer_headphone.xml
index c37665784be..d94ca6cefd4 100644
--- a/res/skins/Tango/mixer_headphone.xml
+++ b/res/skins/Tango/mixer_headphone.xml
@@ -70,10 +70,8 @@ Description:
headSplit
GuiToggleButton
32f,24f
- headSplit_off.svg
- headSplit_off.svg
- headSplit_on.svg
- headSplit_on.svg
+ headSplit_off.svg
+ headSplit_on.svg
[Master],headSplit
diff --git a/res/skins/Tango/preview_deck.xml b/res/skins/Tango/preview_deck.xml
index 63c8d122786..ace9472a417 100644
--- a/res/skins/Tango/preview_deck.xml
+++ b/res/skins/Tango/preview_deck.xml
@@ -81,6 +81,8 @@ Variables:
PlayCue
24f,34f
+ play_previewdeck.svg
+ pause_previewdeck.svg
,play
,cue_default
,play_indicator
@@ -122,6 +124,10 @@ Variables:
+
+ 5f,1me
+
+
PreviewGainKnob
22f,22f
diff --git a/res/skins/Tango/rate_pitch_key.xml b/res/skins/Tango/rate_pitch_key.xml
index e7f93622829..fab3e894cfc 100644
--- a/res/skins/Tango/rate_pitch_key.xml
+++ b/res/skins/Tango/rate_pitch_key.xml
@@ -29,7 +29,7 @@ Variables:
horizontal
1me,14f
-
+
pitch_down
KeyDown
12me,13f
@@ -137,7 +137,7 @@ Variables:
horizontal
50f,14f
-
+
rate_temp_down_rate_temp_down_small
RateDown
13me,13f
diff --git a/res/skins/Tango/sampler.xml b/res/skins/Tango/sampler.xml
index 5dedc7041b5..fcfed183d54 100644
--- a/res/skins/Tango/sampler.xml
+++ b/res/skins/Tango/sampler.xml
@@ -20,6 +20,8 @@ Variables:
SamplerPlayCue
34f,34f
+ play_sampler.svg
+ pause_sampler.svg
,cue_gotoandplay
,cue_default
,play_indicator
@@ -104,12 +106,9 @@ Variables:
orientation
SamplerButton
16f,16f
- sampler_xfader_left_white.svg
- sampler_xfader_left_white.svg
- sampler_xfader_center.svg
- sampler_xfader_center.svg
- sampler_xfader_right_white.svg
- sampler_xfader_right_white.svg
+ sampler_xfader_left_white.svg
+ sampler_xfader_center.svg
+ sampler_xfader_right_white.svg
,orientation
@@ -215,32 +214,9 @@ Variables:
1f,0min
-
- VUMeterSampler
- 7f,36f
- stacked
-
-
- skin:/graphics/vumeter_mini_clipping_over.png
- skin:/graphics/vumeter_mini_clipping.png
-
- ,PeakIndicator
-
-
-
- skin:/graphics/vumeter_mini_over.png
- skin:/graphics/vumeter_mini.png
- false
- 5
- 500
- 50
- 2
-
- ,VuMeter
-
-
-
-
+
+ 6f,1me
+
@@ -286,10 +262,8 @@ Variables:
- 0min,1min
-
- 18f,18f
+ 20f,20f
stacked
@@ -310,24 +284,22 @@ Variables:
pfl
PflButton
- 18f,18f
- pfl_off.svg
- pfl_off.svg
- pfl_on.svg
- pfl_on.svg
+ 20f,20f
+ pfl_off.svg
+ pfl_on.svg
,pfl
+ 0min,1min
+
repeat
SamplerButton
16f,16f
- sampler_repeat_off.svg
- sampler_repeat_off.svg
- sampler_repeat_on.svg
- sampler_repeat_on.svg
+ sampler_repeat_off.svg
+ sampler_repeat_on.svg
,repeat
@@ -344,10 +316,8 @@ Variables:
keylock
SamplerButton
14f,16f
- sampler_keylock_off.svg
- sampler_keylock_off.svg
- sampler_keylock_on.svg
- sampler_keylock_on.svg
+ sampler_keylock_off.svg
+ sampler_keylock_on.svg
,keylock
@@ -355,12 +325,9 @@ Variables:
orientation
SamplerButton
16f,16f
- sampler_xfader_left_white.svg
- sampler_xfader_left_white.svg
- sampler_xfader_center.svg
- sampler_xfader_center.svg
- sampler_xfader_right_white.svg
- sampler_xfader_right_white.svg
+ sampler_xfader_left_white.svg
+ sampler_xfader_center.svg
+ sampler_xfader_right_white.svg
,orientation
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index e39b339dbae..aeaaa97282d 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -200,6 +200,7 @@ Description:
me,me
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 5a6099c634d..28bdf87b853 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -50,13 +50,27 @@ WWidgetGroup {
background-color: rgba(51, 51, 51, 200);
}
-#WaveformSplitter::handle:vertical {
- image: url(skin:/graphics/splitterVert_handle.png);
+/* splitters between
+ - waveforms & lower skin part
+ - treeview & library table */
+#LibrarySplitter::handle:horizontal {
+ image: url(skin:/graphics/splitterHori_handle.svg);
}
- #WaveformSplitter::handle:vertical:hover,
- #WaveformSplitter::handle:vertical:pressed {
- image: url(skin:/graphics/splitterVert_handle_pressed.png);
+ #LibrarySplitter::handle:horizontal:hover,
+ #LibrarySplitter::handle:horizontal:pressed {
+ image: url(skin:/graphics/splitterHori_handle_pressed.svg);
}
+ /* splitter between coverArt and tree view */
+ #LibrarySplitter::handle:vertical,
+ #WaveformSplitter::handle:vertical {
+ image: url(skin:/graphics/splitterVert_handle.svg);
+ }
+ #LibrarySplitter::handle:vertical:hover,
+ #LibrarySplitter::handle:vertical:pressed,
+ #WaveformSplitter::handle:vertical:hover,
+ #WaveformSplitter::handle:vertical:pressed {
+ image: url(skin:/graphics/splitterVert_handle_pressed.svg);
+ }
/* ################################################################
@@ -131,7 +145,7 @@ WWidgetGroup {
qproperty-layoutAlignment: 'AlignLeft | AlignTop';
border: 1px solid #1e1e1e;
border-width: 0px 0px 3px 0px;
-}
+ }
#CategoryLabel {
font-size: 16px/16px;
text-align: left;
@@ -181,7 +195,11 @@ WWidgetGroup {
}
#SubmenuLabel {
color: #666666;
-}
+ }
+ #SkinSettingsLabel,
+ #SubmenuLabel {
+ font-size: 12px/12px;
+ }
#CoverSpinnyHint {
font-size: 13px/15px;
font-weight: bold;
@@ -239,33 +257,6 @@ WWidgetGroup {
#BoothMixerLabel {
image: url(skin:/buttons/btn_booth.svg) no-repeat center center;
}
-
-#MixerbarButton,
-#MixerbarPflButton,
-#MixerbarXfaderButton {
- font-weight: bold;
- }
- #MixerbarButton[displayValue="0"],
- #MixerbarPflButton[displayValue="0"],
- #MixerbarXfaderButton[displayValue="0"] {
- background-color: #333;
- border: 1px solid #333;
- color: #888;
- }
- #MixerbarButton[displayValue="0"]:hover,
- #MixerbarPflButton:hover,
- #MixerbarXfaderButton:hover {
- border: 1px solid #888;
- }
- #MixerbarButton[displayValue="1"],
- #MixerbarButton[displayValue="2"] {
- background-color: #666;
- color: #eeeeee;
- }
-
-#VUMeterMixerbar {
- margin: 2px 0px 0px 0px;
-}
#MixerbarKnob {
margin: 2px 0px 0px 0px;
}
@@ -836,19 +827,19 @@ WWidgetGroup {
/* Actual Play button. Receives click events, turns red
when playing regularly, not from Cue or HotCue */
#PlayCue[displayValue="0"] {
- background-color: transparent;
- image: url(skin:/buttons/btn_play.svg) no-repeat center center;
+ background-color: transparent; /*
+ image: url(skin:/buttons/btn_play.svg) no-repeat center center; */
}
#PlayCue[displayValue="0"]:hover {
- background-color: transparent;
- image: url(skin:/buttons/btn_play_hover.svg) no-repeat center center;
+ background-color: transparent; /*
+ image: url(skin:/buttons/btn_play_hover.svg) no-repeat center center; */
}
#SamplerPlayCue[displayValue="0"] {
/* different than decks' Play button, this has some soft shadow to distinguish
it better from underlying Cover Art (if available) */
- background-color: transparent;
- image: url(skin:/buttons/btn_sampler_play.png) no-repeat center center;
+ background-color: transparent; /*
+ image: url(skin:/buttons/btn_sampler_play.png) no-repeat center center; */
}
#SamplerPlayCueUnderlay[displayValue="1"] {
background: #a90000;
@@ -881,8 +872,8 @@ WWidgetGroup {
}
#PlayCue[displayValue="1"],
-#SamplerPlayCue[displayValue="1"] {
- image: url(skin:/buttons/btn_pause.svg) no-repeat center center;
+#SamplerPlayCue[displayValue="1"] { /*
+ image: url(skin:/buttons/btn_pause.svg) no-repeat center center; */
}
#PlayCue[displayValue="1"],
#SamplerPlayCue[displayValue="1"],
@@ -979,7 +970,7 @@ WWidgetGroup {
background-color: #333;
}
#ReloopButton[displayValue="0"]:hover {
- border: 1px solid #888;
+ border: 1px solid #ff8f00;
}
#ReloopButton[displayValue="1"] {
/* See also #LoopIndicator */
@@ -989,6 +980,19 @@ WWidgetGroup {
border: 1px solid #eeeeee;
}
+#LoopActivateButton[displayValue="0"] {
+ background-color: #333;
+ }
+ #LoopActivateButton[displayValue="0"]:hover {
+ border: 1px solid #ff8f00;
+ }
+ #LoopActivateButton[displayValue="1"] {
+ /* See also #LoopIndicator
+ background-color: #ff8f00; */
+ border: 1px solid #ff8f00;
+ background-color: #0f0f0f;
+ }
+
WBeatSpinBox {
/* Note(ronso0):
make it 2px smaller in each dimension,
@@ -1277,7 +1281,6 @@ decks, samplers, mic, aux, fx */
#PflButton[displayValue="0"] {
background-color: #333;
}
-
#PflButton[displayValue="1"] {
background-color: #0f0f0f;
}
@@ -1286,6 +1289,28 @@ decks, samplers, mic, aux, fx */
background-color: #151515;
}
+#FxUnitMixerLeft_mini WPushButton[displayValue="0"],
+#FxUnitMixerRight_mini WPushButton[displayValue="0"],
+#FxUnitMixerLeft WPushButton[displayValue="0"],
+#FxUnitMixerRight WPushButton[displayValue="0"],
+#SamplerDeck #PflButton {
+ border: 1px solid #151515;
+ }
+ #SamplerDeck #PflButton {
+ border-width: 0px 1px 0px 1px;
+ border-radius: 0px;
+ }
+ #FxUnitMixerLeft_mini WPushButton[displayValue="1"],
+ #FxUnitMixerRight_mini WPushButton[displayValue="1"],
+ #FxUnitMixerLeft WPushButton[displayValue="1"],
+ #FxUnitMixerRight WPushButton[displayValue="1"],
+ #FxUnitMixerLeft_mini WPushButton[displayValue="0"]:hover,
+ #FxUnitMixerRight_mini WPushButton[displayValue="0"]:hover,
+ #FxUnitMixerLeft WPushButton[displayValue="0"]:hover,
+ #FxUnitMixerRight WPushButton[displayValue="0"]:hover {
+ border: 1px solid #151515;
+ }
+
#VUMeterMixer {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
margin-top: 4px;
@@ -2113,26 +2138,6 @@ QScrollBar:horizontal {
height: 0px;
}
-/* splitters between treeview and library table */
-#LibrarySplitter::handle:horizontal {
- image: url(skin:/graphics/splitterHori_handle.png);
- }
- #LibrarySplitter::handle:horizontal:hover,
- #LibrarySplitter::handle:horizontal:pressed {
- image: url(skin:/graphics/splitterHori_handle_pressed.png);
- }
- /* splitter between coverArt and tree view */
- #LibrarySplitter::handle:vertical,
- #WaveformSplitter::handle:vertical {
- image: url(skin:/graphics/splitterVert_handle.png);
- }
- #LibrarySplitter::handle:vertical:hover,
- #LibrarySplitter::handle:vertical:pressed,
- #WaveformSplitter::handle:vertical:hover,
- #WaveformSplitter::handle:vertical:pressed {
- image: url(skin:/graphics/splitterVert_handle_pressed.png);
- }
-
/* Pushbuttons, a lot of them...
Library features and their buttons:
Tracks DlgMissing
diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
index 769676cd153..a0a9a934303 100644
--- a/res/skins/Tango/topbar.xml
+++ b/res/skins/Tango/topbar.xml
@@ -136,10 +136,8 @@ Description:
GuiToggleButton
30f,20f
- wave_off.svg
- wave_off.svg
- wave_on.svg
- wave_on.svg
+ wave_off.svg
+ wave_on.svg
[Tango],stacked_waveforms
@@ -160,10 +158,8 @@ Description:
show_samplers
GuiToggleButton
30f,20f
- samplers_off.svg
- samplers_off.svg
- samplers_on.svg
- samplers_on.svg
+ samplers_off.svg
+ samplers_on.svg
[Samplers],show_samplers
@@ -173,10 +169,8 @@ Description:
show_microphone
GuiToggleButton
30f,20f
- mic_aux_off.svg
- mic_aux_off.svg
- mic_aux_on.svg
- mic_aux_on.svg
+ mic_aux_off.svg
+ mic_aux_on.svg
[Microphone],show_microphone
@@ -186,10 +180,8 @@ Description:
show_mixer
GuiToggleButton
20f,20f
- mixer_off.svg
- mixer_off.svg
- mixer_on.svg
- mixer_on.svg
+ mixer_off.svg
+ mixer_on.svg
[Master],show_mixer
@@ -198,10 +190,8 @@ Description:
GuiToggleButton
20f,20f
- loop_beatjump_off.svg
- loop_beatjump_off.svg
- loop_beatjump_on.svg
- loop_beatjump_on.svg
+ loop_beatjump_off.svg
+ loop_beatjump_on.svg
[Tango],loop_beatjump_controls
@@ -211,10 +201,8 @@ Description:
GuiToggleButton2
20f,20f
toggle_4decks
- 2decks.svg
- 2decks.svg
- 4decks.svg
- 4decks.svg
+ 2decks.svg
+ 4decks.svg
[Master],show_4decks
@@ -289,8 +277,8 @@ Description:
31f,3f
audio_latency_usage
- skin:/graphics/latency_usage_over.png
- skin:/graphics/latency_usage.png
+ skin:/graphics/latency_usage_over.svg
+ skin:/graphics/latency_usage.svg
true
5
1000
diff --git a/res/skins/Tango/vumeter_floating.xml b/res/skins/Tango/vumeter_floating.xml
index 65b8fcef99a..464006c88ed 100644
--- a/res/skins/Tango/vumeter_floating.xml
+++ b/res/skins/Tango/vumeter_floating.xml
@@ -21,20 +21,20 @@ Variables:
channel_VuMeterL
- skin:/graphics/vumeter_floating_clipping_over.png
- skin:/graphics/vumeter_floating_clipping.png
+ skin:/graphics/vumeter_floating_clipping_over.svg
+ skin:/graphics/vumeter_floating_clipping.svg
,PeakIndicatorL
- skin:/graphics/vumeter_floating_over.png
- skin:/graphics/vumeter_floating.png
+ skin:/graphics/vumeter_floating_over.svg
+ skin:/graphics/vumeter_floating.svg
false
- 5
- 500
- 50
- 2
+ 4
+ 800
+ 200
+ 5
,VuMeterL
@@ -48,20 +48,20 @@ Variables:
channel_VuMeterR
- skin:/graphics/vumeter_floating_clipping_over.png
- skin:/graphics/vumeter_floating_clipping.png
+ skin:/graphics/vumeter_floating_clipping_over.svg
+ skin:/graphics/vumeter_floating_clipping.svg
,PeakIndicatorR
- skin:/graphics/vumeter_floating_over.png
- skin:/graphics/vumeter_floating.png
+ skin:/graphics/vumeter_floating_over.svg
+ skin:/graphics/vumeter_floating.svg
false
- 5
- 500
- 50
- 2
+ 4
+ 800
+ 200
+ 5
,VuMeterR
diff --git a/res/skins/Tango/vumeter_master.xml b/res/skins/Tango/vumeter_master.xml
index f0dff7ce05e..b7abca94e46 100644
--- a/res/skins/Tango/vumeter_master.xml
+++ b/res/skins/Tango/vumeter_master.xml
@@ -25,20 +25,20 @@ Description:
master_VuMeterL
- skin:/graphics/vumeter_floating_clipping_over.png
- skin:/graphics/vumeter_floating_clipping.png
+ skin:/graphics/vumeter_floating_clipping_over.svg
+ skin:/graphics/vumeter_floating_clipping.svg
[Master],PeakIndicatorL
- skin:/graphics/vumeter_floating_over.png
- skin:/graphics/vumeter_floating.png
+ skin:/graphics/vumeter_floating_over.svg
+ skin:/graphics/vumeter_floating.svg
false
- 5
- 500
- 50
- 2
+ 4
+ 800
+ 200
+ 5
[Master],VuMeterL
@@ -52,20 +52,20 @@ Description:
master_VuMeterR
- skin:/graphics/vumeter_floating_clipping_over.png
- skin:/graphics/vumeter_floating_clipping.png
+ skin:/graphics/vumeter_floating_clipping_over.svg
+ skin:/graphics/vumeter_floating_clipping.svg
[Master],PeakIndicatorR
- skin:/graphics/vumeter_floating_over.png
- skin:/graphics/vumeter_floating.png
+ skin:/graphics/vumeter_floating_over.svg
+ skin:/graphics/vumeter_floating.svg
false
- 5
- 500
- 50
- 2
+ 4
+ 800
+ 200
+ 5
[Master],VuMeterR
diff --git a/res/skins/Tango/vumeter_mini.xml b/res/skins/Tango/vumeter_mini.xml
new file mode 100644
index 00000000000..250b1752f40
--- /dev/null
+++ b/res/skins/Tango/vumeter_mini.xml
@@ -0,0 +1,34 @@
+
+
+
+
+ stacked
+
+
+ skin:/graphics/vumeter_mini_clipping_over.svg
+ skin:/graphics/vumeter_mini_clipping.svg
+
+ ,PeakIndicator
+
+
+
+ skin:/graphics/vumeter_mini_over.svg
+ skin:/graphics/vumeter_mini.svg
+ false
+ 5
+ 500
+ 50
+ 2
+
+ ,VuMeter
+
+
+
+
+
diff --git a/res/skins/Tango/vumeter_mixer.xml b/res/skins/Tango/vumeter_mixer.xml
index f7f30bd559c..fa5799ecfae 100644
--- a/res/skins/Tango/vumeter_mixer.xml
+++ b/res/skins/Tango/vumeter_mixer.xml
@@ -17,20 +17,20 @@ Variables:
channel_VuMeterL
- skin:/graphics/vumeter_mixer_clipping_over.png
- skin:/graphics/vumeter_mixer_clipping.png
+ skin:/graphics/vumeter_mixer_clipping_over.svg
+ skin:/graphics/vumeter_mixer_clipping.svg
,PeakIndicatorL
- skin:/graphics/vumeter_mixer_over.png
- skin:/graphics/vumeter_mixer.png
+ skin:/graphics/vumeter_mixer_over.svg
+ skin:/graphics/vumeter_mixer.svg
false
- 5
- 500
- 50
- 2
+ 4
+ 800
+ 200
+ 5
,VuMeterL
@@ -44,20 +44,20 @@ Variables:
channel_VuMeterR
- skin:/graphics/vumeter_mixer_clipping_over.png
- skin:/graphics/vumeter_mixer_clipping.png
+ skin:/graphics/vumeter_mixer_clipping_over.svg
+ skin:/graphics/vumeter_mixer_clipping.svg
,PeakIndicatorR
- skin:/graphics/vumeter_mixer_over.png
- skin:/graphics/vumeter_mixer.png
+ skin:/graphics/vumeter_mixer_over.svg
+ skin:/graphics/vumeter_mixer.svg
false
- 5
- 500
- 50
- 2
+ 4
+ 800
+ 200
+ 5
,VuMeterR