summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2020-04-28 22:14:45 +0200
committerDaniel Schürmann <daschuer@mixxx.org>2020-04-28 22:14:45 +0200
commitdd5c2b181457d59b9188df8a3bd4c97b153ff5d1 (patch)
tree9cd871c33c70438f0e4efa63a9a1cf63e01ddf51 /res
parent1b5a19b8771da289217ae27810ad7eb24ffbe5b6 (diff)
Use btn_beatloop for effects, since the hotcue button is now transparent
Diffstat (limited to 'res')
-rw-r--r--res/skins/Shade/btn/btn_beatloop_3.pngbin0 -> 205 bytes
-rw-r--r--res/skins/Shade/btn/btn_beatloop_3_down.pngbin0 -> 204 bytes
-rw-r--r--res/skins/Shade/btn/btn_beatloop_3_over.pngbin0 -> 205 bytes
-rw-r--r--res/skins/Shade/btn/btn_beatloop_3_overdown.pngbin0 -> 204 bytes
-rw-r--r--res/skins/Shade/deck_effect.xml8
-rw-r--r--res/skins/Shade/effectslotsmall.xml13
6 files changed, 9 insertions, 12 deletions
diff --git a/res/skins/Shade/btn/btn_beatloop_3.png b/res/skins/Shade/btn/btn_beatloop_3.png
new file mode 100644
index 0000000000..d1bce9bba0
--- /dev/null
+++ b/res/skins/Shade/btn/btn_beatloop_3.png
Binary files differ
diff --git a/res/skins/Shade/btn/btn_beatloop_3_down.png b/res/skins/Shade/btn/btn_beatloop_3_down.png
new file mode 100644
index 0000000000..ebc18705ad
--- /dev/null
+++ b/res/skins/Shade/btn/btn_beatloop_3_down.png
Binary files differ
diff --git a/res/skins/Shade/btn/btn_beatloop_3_over.png b/res/skins/Shade/btn/btn_beatloop_3_over.png
new file mode 100644
index 0000000000..6abdb3fa0a
--- /dev/null
+++ b/res/skins/Shade/btn/btn_beatloop_3_over.png
Binary files differ
diff --git a/res/skins/Shade/btn/btn_beatloop_3_overdown.png b/res/skins/Shade/btn/btn_beatloop_3_overdown.png
new file mode 100644
index 0000000000..a563c23269
--- /dev/null
+++ b/res/skins/Shade/btn/btn_beatloop_3_overdown.png
Binary files differ
diff --git a/res/skins/Shade/deck_effect.xml b/res/skins/Shade/deck_effect.xml
index a0b7d8e132..93dd541c2a 100644
--- a/res/skins/Shade/deck_effect.xml
+++ b/res/skins/Shade/deck_effect.xml
@@ -31,13 +31,13 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
- <Pressed>skin:/btn/btn_hotcue_<Variable name="effectunitnum"/>_down.png</Pressed>
- <Unpressed>skin:/btn/btn_hotcue_<Variable name="effectunitnum"/>.png</Unpressed>
+ <Pressed>skin:/btn/btn_beatloop_<Variable name="effectunitnum"/>_down.png</Pressed>
+ <Unpressed>skin:/btn/btn_beatloop_<Variable name="effectunitnum"/>.png</Unpressed>
</State>
<State>
<Number>1</Number>
- <Pressed>skin:/btn/btn_hotcue_<Variable name="effectunitnum"/>_overdown.png</Pressed>
- <Unpressed>skin:/btn/btn_hotcue_<Variable name="effectunitnum"/>_over.png</Unpressed>
+ <Pressed>skin:/btn/btn_beatloop_<Variable name="effectunitnum"/>_overdown.png</Pressed>
+ <Unpressed>skin:/btn/btn_beatloop_<Variable name="effectunitnum"/>_over.png</Unpressed>
</State>
<Pos>4,14</Pos>
<Connection>
diff --git a/res/skins/Shade/effectslotsmall.xml b/res/skins/Shade/effectslotsmall.xml
index 8dcf4382c3..aeac38fc41 100644
--- a/res/skins/Shade/effectslotsmall.xml
+++ b/res/skins/Shade/effectslotsmall.xml
@@ -33,14 +33,14 @@
<TooltipId>EffectSlot_enabled</TooltipId>
<NumberStates>2</NumberStates>
<State>
- <Number>0</Number>
- <Pressed>skin:/btn/btn_hotcue_<Variable name="effectnum"/>_down.png</Pressed>
- <Unpressed>skin:/btn/btn_hotcue_<Variable name="effectnum"/>.png</Unpressed>
+ <Number>0</Number>
+ <Pressed>skin:/btn/btn_beatloop_<Variable name="effectnum"/>_down.png</Pressed>
+ <Unpressed>skin:/btn/btn_beatloop_<Variable name="effectnum"/>.png</Unpressed>
</State>
<State>
<Number>1</Number>
- <Pressed>skin:/btn/btn_hotcue_<Variable name="effectnum"/>_overdown.png</Pressed>
- <Unpressed>skin:/btn/btn_hotcue_<Variable name="effectnum"/>_over.png</Unpressed>
+ <Pressed>skin:/btn/btn_beatloop_<Variable name="effectnum"/>_overdown.png</Pressed>
+ <Unpressed>skin:/btn/btn_beatloop_<Variable name="effectnum"/>_over.png</Unpressed>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],enabled</ConfigKey>
@@ -85,6 +85,3 @@
</Children>
</WidgetGroup>
</Template>
-
-
-