Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use QColor for cue colors #2345

Closed
wants to merge 26 commits into from
Closed

use QColor for cue colors #2345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
463135f
Create HotcueColorPalette class
ferranpujolcamins Oct 27, 2019
2de7846
Add methods to store QColor in the config
ferranpujolcamins Oct 27, 2019
be29b77
Add class to store HotcueColorPalette in userconfig
ferranpujolcamins Oct 27, 2019
4e2da2d
Add tests for color config methods
ferranpujolcamins Nov 1, 2019
5c31b98
Make Cue related code use QColor instead of PredefinedColorPointer
ferranpujolcamins Nov 2, 2019
3e9aca8
Migrate hotcue color id to RGBA in DB
ferranpujolcamins Nov 2, 2019
9498f16
Remove PredefinedColorRepresentation
ferranpujolcamins Nov 2, 2019
b60f292
Make UserSettings available in ControllerEngine
ferranpujolcamins Nov 3, 2019
37541e9
Remove PredefinedColors from controller scripts
ferranpujolcamins Nov 3, 2019
37d5da1
Remove PredefinedColor
ferranpujolcamins Nov 3, 2019
aff6995
Update midi-components library
ferranpujolcamins Nov 3, 2019
c756053
Avoid constructing HotcueColorPaletteSettings every time its used
ferranpujolcamins Nov 3, 2019
40825c4
Change test names
ferranpujolcamins Nov 4, 2019
b2c7c16
Reorder constructor parameters
ferranpujolcamins Nov 4, 2019
f72a679
Rename member variable
ferranpujolcamins Nov 4, 2019
1cadfea
Rename some color related classes
ferranpujolcamins Nov 4, 2019
d07b672
Remove cues tab on TrackInfo
ferranpujolcamins Nov 4, 2019
438b1c9
Set hotcue color to the first predefined color
ferranpujolcamins Nov 11, 2019
f6da0dd
Set hotcue color CO to -1 when no hotcue is loaded
ferranpujolcamins Nov 11, 2019
606091c
Make hotcue skin buttons use the cue color
ferranpujolcamins Nov 11, 2019
9047343
Allow skins to configure text color depending on background
ferranpujolcamins Nov 11, 2019
ced08e2
Highlight hotcue buttons when hovered
ferranpujolcamins Nov 11, 2019
cd3555e
Fix Shade hotcue buttons color
ferranpujolcamins Nov 12, 2019
525cd85
Make hotcue button hover highlighting configurable
ferranpujolcamins Nov 12, 2019
8e574d9
Fix auto_hotcue_colors not assigning first color
ferranpujolcamins Nov 17, 2019
df545bf
Merge branch 'master' into new_colors_impl
ferranpujolcamins Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build/depends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,7 @@ def sources(self, build):
"src/preferences/effectsettingsmodel.cpp",
"src/preferences/broadcastprofile.cpp",
"src/preferences/upgrade.cpp",
"src/preferences/hotcuecolorpalettesettings.cpp",
"src/preferences/dlgpreferencepage.cpp",

"src/effects/effectmanifest.cpp",
Expand Down Expand Up @@ -1271,6 +1272,7 @@ def sources(self, build):
"src/util/movinginterquartilemean.cpp",
"src/util/console.cpp",
"src/util/color/color.cpp",
"src/util/color/colorpalette.cpp",
"src/util/db/dbconnection.cpp",
"src/util/db/dbconnectionpool.cpp",
"src/util/db/dbconnectionpooler.cpp",
Expand All @@ -1297,8 +1299,7 @@ def sources(self, build):
"src/util/desktophelper.cpp",
"src/util/widgetrendertimer.cpp",
"src/util/workerthread.cpp",
"src/util/workerthreadscheduler.cpp",
"src/util/color/predefinedcolor.cpp"
"src/util/workerthreadscheduler.cpp"
]

proto_args = {
Expand Down
12 changes: 6 additions & 6 deletions res/controllers/Roland_DJ-505-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1603,7 +1603,7 @@ DJ505.PitchPlayMode = function(deck, offset) {
this.number = n + 1;
this.on = this.color + DJ505.PadColor.DIM_MODIFIER;
this.colors = pitchplayColors;
this.colorIdKey = "hotcue_" + this.number + "_color_id";
this.colorKey = "hotcue_" + this.number + "_color";
components.Button.call(this);
};
this.PerformancePad.prototype = new components.Button({
Expand Down Expand Up @@ -1665,8 +1665,8 @@ DJ505.PitchPlayMode = function(deck, offset) {
this.outKey = "hotcue_" + this.number + "_enabled";
this.output = function(value, _group, _control) {
var outval = this.outValueScale(value);
if (this.colorIdKey !== undefined && outval !== this.off) {
this.outputColor(engine.getValue(this.group, this.colorIdKey));
if (this.colorKey !== undefined && outval !== this.off) {
this.outputColor(engine.getValue(this.group, this.colorKey));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be more convenient to use color.colorFromHexCode on the ControlObject value before passing it to this.outputColor.

Copy link
Contributor Author

@ferranpujolcamins ferranpujolcamins Nov 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe @Holzhaus can help us here.
Can you have a look and check if I didn't break something?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not work. hotcue_X_color contains an actual ARGB value, not the index of the color in the color palette.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The HotcueButtons stopped working as well. Let me check what causes this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, the problem is that the colors property of HotcueButton now needs to be an object with the different colors as keys. Here's a diff:

diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js
index 2e2777c0e8..94dde87533 100644
--- a/res/controllers/Roland_DJ-505-scripts.js
+++ b/res/controllers/Roland_DJ-505-scripts.js
@@ -941,17 +941,17 @@ DJ505.PadColor = {
     DIM_MODIFIER: 0x10,
 };

-DJ505.PadColorMap = [
-    DJ505.PadColor.OFF,
-    DJ505.PadColor.RED,
-    DJ505.PadColor.GREEN,
-    DJ505.PadColor.BLUE,
-    DJ505.PadColor.YELLOW,
-    DJ505.PadColor.CELESTE,
-    DJ505.PadColor.PURPLE,
-    DJ505.PadColor.APRICOT,
-    DJ505.PadColor.WHITE,
-];
+DJ505.PadColorMap = {
+    0: DJ505.PadColor.OFF,
+    0xffc50a08: DJ505.PadColor.RED,
+    0xff32be44: DJ505.PadColor.GREEN,
+    0xff0044ff: DJ505.PadColor.BLUE,
+    0xfff8d200: DJ505.PadColor.YELLOW,
+    0xff42d4f4: DJ505.PadColor.CELESTE,
+    0xffaf00cc: DJ505.PadColor.PURPLE,
+    0xfffca6d7: DJ505.PadColor.APRICOT,
+    0xfff2f2fe: DJ505.PadColor.WHITE,
+}

 DJ505.PadSection = function (deck, offset) {
     // TODO: Add support for missing modes (flip, slicer, slicerloop)
@@ -1190,7 +1190,7 @@ DJ505.HotcueMode = function (deck, offset) {
     this.ledControl = DJ505.PadMode.HOTCUE;
     this.color = DJ505.PadColor.WHITE;

-    var hotcueColors = [this.color].concat(DJ505.PadColorMap.slice(1));
+    var hotcueColors = DJ505.PadColorMap;
     this.pads = new components.ComponentContainer();
     for (var i = 0; i <= 7; i++) {
         this.pads[i] = new components.HotcueButton({
@@ -1226,7 +1226,7 @@ DJ505.CueLoopMode = function (deck, offset) {
     this.ledControl = DJ505.PadMode.HOTCUE;
     this.color = DJ505.PadColor.BLUE;

-    var cueloopColors = [this.color].concat(DJ505.PadColorMap.slice(1));
+    var cueloopColors = DJ505.PadColorMap;
     this.PerformancePad = function(n) {
         this.midi = [0x94 + offset, 0x14 + n];
         this.number = n + 1;
@@ -1492,7 +1492,7 @@ DJ505.PitchPlayMode = function (deck, offset) {
     this.color = DJ505.PadColor.GREEN;
     this.cuepoint = 1;
     this.range = PitchPlayRange.MID;
-    var pitchplayColors = [this.color].concat(DJ505.PadColorMap.slice(1));
+    var pitchplayColors = DJ505.PadColorMap;

     this.PerformancePad = function(n) {
         this.midi = [0x94 + offset, 0x14 + n];

} else {
this.send(DJ505.PadColor.OFF);
}
Expand All @@ -1676,13 +1676,13 @@ DJ505.PitchPlayMode = function(deck, offset) {
var previousCuepoint = this.mode.cuepoint;
this.mode.cuepoint = this.number;
this.mode.pads[previousCuepoint - 1].trigger();
this.outputColor(engine.getValue(this.group, this.colorIdKey));
this.outputColor(engine.getValue(this.group, this.colorKey));
}
};
this.connect = function() {
components.Button.prototype.connect.call(this); // call parent connect
if (undefined !== this.group && this.colorIdKey !== undefined) {
this.connections[1] = engine.makeConnection(this.group, this.colorIdKey, function(id) {
if (undefined !== this.group && this.colorKey !== undefined) {
this.connections[1] = engine.makeConnection(this.group, this.colorKey, function(id) {
if (engine.getValue(this.group, this.outKey)) {
this.outputColor(id);
}
Expand Down
16 changes: 8 additions & 8 deletions res/controllers/midi-components-0.0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,9 @@
return;
}
if (options.colors !== undefined || options.sendRGB !== undefined) {
this.colorIdKey = "hotcue_" + options.number + "_color_id";
this.colorKey = "hotcue_" + options.number + "_color";
if (options.colors === undefined) {
options.colors = color.predefinedColorsList();
options.colors = color.hotcueColorPalette();
}
}
this.number = options.number;
Expand All @@ -312,8 +312,8 @@
this.inKey = "hotcue_" + this.number + "_clear";
},
getColor: function() {
if (this.colorIdKey !== undefined) {
return color.predefinedColorFromId(engine.getValue(this.group, this.colorIdKey));
if (this.colorKey !== undefined) {
return color.colorFromHexCode(engine.getValue(this.group,this.colorKey));
} else {
return null;
}
Expand All @@ -324,8 +324,8 @@
// and there is no hotcueColor for turning the LED
// off. So the `send()` function is responsible for turning the
// actual LED off.
if (this.colorIdKey !== undefined && outval !== this.off) {
this.outputColor(engine.getValue(this.group, this.colorIdKey));
if (this.colorKey !== undefined && outval !== this.off) {
this.outputColor(engine.getValue(this.group, this.colorKey));
} else {
this.send(outval);
}
Expand All @@ -348,8 +348,8 @@
},
connect: function() {
Button.prototype.connect.call(this); // call parent connect
if (undefined !== this.group && this.colorIdKey !== undefined) {
this.connections[1] = engine.makeConnection(this.group, this.colorIdKey, function(id) {
if (undefined !== this.group && this.colorKey !== undefined) {
this.connections[1] = engine.makeConnection(this.group, this.colorKey, function(id) {
if (engine.getValue(this.group, this.outKey)) {
this.outputColor(id);
}
Expand Down
27 changes: 26 additions & 1 deletion res/schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,5 +480,30 @@ METADATA
position INTEGER
);
</sql>
</revision>
</revision>
<revision version="31" min_compatible="3">
<description>
Convert the PredefinedColor id to the actual RGBA value.
</description>
<sql>
<!-- No Color becomes red-->
UPDATE cues SET color=4291103240 WHERE color=0;
<!-- Red -->
UPDATE cues SET color=4291103240 WHERE color=1;
<!-- Green -->
UPDATE cues SET color=4281515588 WHERE color=2;
<!-- Blue -->
UPDATE cues SET color=4278207743 WHERE color=3;
<!-- Yellow -->
UPDATE cues SET color=4294496768 WHERE color=4;
<!-- Celeste -->
UPDATE cues SET color=4282569972 WHERE color=5;
<!-- Magenta -->
UPDATE cues SET color=4289659084 WHERE color=6;
<!-- Pink -->
UPDATE cues SET color=4294747863 WHERE color=7;
<!-- White -->
UPDATE cues SET color=4294111999 WHERE color=8;
</sql>
</revision>
</schema>
4 changes: 2 additions & 2 deletions res/skins/Deere/hotcue_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_color_id</ConfigKey>
<BindProperty>highlight</BindProperty>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_color</ConfigKey>
<BindProperty>backgroundColorRgba</BindProperty>
</Connection>
</PushButton>
</Template>
123 changes: 5 additions & 118 deletions res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,6 @@ WPushButton:hover {
/*"Pressed" state*/
WPushButton[value="1"],
WPushButton[value="2"] {
/*color: #FDFDFD;*/
color: #FDFDFD;
background-color: #006596;
border: 0px solid #006596;
Expand All @@ -1579,129 +1578,17 @@ WPushButton[value="2"]:hover {
border: 0px solid #0080BE;
}

/* Hotcue Color: No Color */
#HotcueButton[value="1"][highlight="0"],
#HotcueButton[value="2"][highlight="0"] {
background-color: #006596;
}

#HotcueButton[value="1"][highlight="0"]:hover,
#HotcueButton[value="2"][highlight="0"]:hover {
background-color: #0080BE;
}

/* Hotcue Color: Red */
#HotcueButton[value="1"][highlight="1"],
#HotcueButton[value="2"][highlight="1"] {
background-color: #c50a08;
}

#HotcueButton[value="1"][highlight="1"]:hover,
#HotcueButton[value="2"][highlight="1"]:hover {
background-color: #e50c08;
}

/* Hotcue Color: Green */
#HotcueButton[value="1"][highlight="2"],
#HotcueButton[value="2"][highlight="2"] {
background-color: #32be44;
}

#HotcueButton[value="1"][highlight="2"]:hover,
#HotcueButton[value="2"][highlight="2"]:hover {
background-color: #52de64;
}

/* Hotcue Color: Blue */
#HotcueButton[value="1"][highlight="3"],
#HotcueButton[value="2"][highlight="3"] {
background-color: #0044ff;
}

#HotcueButton[value="1"][highlight="3"]:hover,
#HotcueButton[value="2"][highlight="3"]:hover {
background-color: #0064ff;
}

/* Hotcue Color: Yellow */
#HotcueButton[value="1"][highlight="4"],
#HotcueButton[value="2"][highlight="4"] {
color: #4B4B4B;
background-color: #f8d200;
}

#HotcueButton[value="1"][highlight="4"]:hover,
#HotcueButton[value="2"][highlight="4"]:hover {
color: #4B4B4B;
background-color: #f8f200;
}

/* Hotcue Color: Celeste */
#HotcueButton[value="1"][highlight="5"],
#HotcueButton[value="2"][highlight="5"] {
color: #4B4B4B;
background-color: #42d4f4;
#HotcueButton {
qproperty-shouldHighlightBackgroundOnHover: true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem to be working. I see no color change when hovering hotcue buttons in Deere that have a hotcue set.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is weird, it works for me :/
What Qt version are you linking with?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

5.12.5

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably depends on the QStyle in use... Did you test with ./mixxx -style fusion?

}

#HotcueButton[value="1"][highlight="5"]:hover,
#HotcueButton[value="2"][highlight="5"]:hover {
color: #4B4B4B;
background-color: #62f4f4;
}

/* Hotcue Color: Purple */
#HotcueButton[value="1"][highlight="6"],
#HotcueButton[value="2"][highlight="6"] {
background-color: #af00cc;
}

#HotcueButton[value="1"][highlight="6"]:hover,
#HotcueButton[value="2"][highlight="6"]:hover {
background-color: #cf00ec;
}

/* Hotcue Color: Pink */
#HotcueButton[value="1"][highlight="7"],
#HotcueButton[value="2"][highlight="7"] {
color: #4B4B4B;
background-color: #fca6d7;
}

#HotcueButton[value="1"][highlight="7"]:hover,
#HotcueButton[value="2"][highlight="7"]:hover {
color: #4B4B4B;
background-color: #fcc6f7;
}

/* Hotcue Color: White */
#HotcueButton[value="1"][highlight="8"],
#HotcueButton[value="2"][highlight="8"] {
color: #4B4B4B;
background-color: #f2f2ff;
}

#HotcueButton[value="1"][highlight="8"]:hover,
#HotcueButton[value="2"][highlight="8"]:hover {
color: #4B4B4B;
background-color: #ffffff;
}

/*"Enabled" state, e.g. for recording status
0 -- disconnected / off
1 -- connecting / enabling
2 -- connected / enabled
WPushButton[value="2"] {
#HotcueButton[backgroundIsDark=true][hasBackgroundColor=true] {
color: #FDFDFD;
background-color: #4B4B4B;
border: 0px solid #006596;
}

WPushButton[value="2"]:hover {
color: #FDFDFD;
background-color: #4B4B4B;
border: 0px solid #0080BE;
#HotcueButton[backgroundIsDark=false][hasBackgroundColor=true] {
color: #1f1e1e;
}
*/

#PlayToggle[value="0"] {
image: url(skin:/icon/ic_play_48px.svg) no-repeat center center;
Expand Down
4 changes: 2 additions & 2 deletions res/skins/LateNight/button_hotcue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_color_id</ConfigKey>
<BindProperty>highlight</BindProperty>
<ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_color</ConfigKey>
<BindProperty>backgroundColorRgba</BindProperty>
</Connection>
</PushButton>
</Children>
Expand Down
38 changes: 0 additions & 38 deletions res/skins/LateNight/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,44 +696,6 @@ QPushButton#pushButtonAutoDJ:checked,
}
/* ToDo
* orange Play button when playing from Cue / Hotcue */
/* Hotcue Color: Green */
#HotcueButton[displayValue="1"][highlight="2"],
#HotcueButton[displayValue="2"][highlight="2"] {
background-color: #32be44;
}
/* Hotcue Color: Blue */
#HotcueButton[displayValue="1"][highlight="3"],
#HotcueButton[displayValue="2"][highlight="3"],
#SpecialCueButton[value="1"] {
background-color: #0044ff;
}
/* Hotcue Color: Yellow */
#HotcueButton[displayValue="1"][highlight="4"],
#HotcueButton[displayValue="2"][highlight="4"] {
background-color: #f8d200;
}
/* Hotcue Color: Celeste */
#HotcueButton[displayValue="1"][highlight="5"],
#HotcueButton[displayValue="2"][highlight="5"] {
background-color: #42d4f4;
}
/* Hotcue Color: Purple */
#HotcueButton[displayValue="1"][highlight="6"],
#HotcueButton[displayValue="2"][highlight="6"] {
background-color: #af00cc;
}
/* Hotcue Color: Pink */
#HotcueButton[displayValue="1"][highlight="7"],
#HotcueButton[displayValue="2"][highlight="7"] {
background-color: #fca6d7;
}
/* Hotcue Color: White */
#HotcueButton[displayValue="1"][highlight="8"],
#HotcueButton[displayValue="2"][highlight="8"] {
background-color: #f2f2ff;
}
/************** Button borders & backgrounds **********************************/



/************** Button icons **************************************************/
Expand Down
Binary file modified res/skins/Shade/btn/btn_hotcue_1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/skins/Shade/btn/btn_hotcue_1_down.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_1_over.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_1_overdown.png
View file
Open in desktop
Binary file not shown.
Binary file modified res/skins/Shade/btn/btn_hotcue_2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/skins/Shade/btn/btn_hotcue_2_down.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_2_over.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_2_overdown.png
View file
Open in desktop
Binary file not shown.
Binary file modified res/skins/Shade/btn/btn_hotcue_3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/skins/Shade/btn/btn_hotcue_3_down.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_3_over.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_3_overdown.png
View file
Open in desktop
Binary file not shown.
Binary file modified res/skins/Shade/btn/btn_hotcue_4.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/skins/Shade/btn/btn_hotcue_4_down.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_4_over.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_4_overdown.png
View file
Open in desktop
Binary file not shown.
Binary file modified res/skins/Shade/btn/btn_hotcue_5.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/skins/Shade/btn/btn_hotcue_5_down.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_5_over.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_5_overdown.png
View file
Open in desktop
Binary file not shown.
Binary file modified res/skins/Shade/btn/btn_hotcue_6.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/skins/Shade/btn/btn_hotcue_6_down.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_6_over.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/skins/Shade/btn/btn_hotcue_6_overdown.png
View file
Open in desktop
Binary file not shown.
Binary file modified res/skins/Shade/btn/btn_hotcue_7.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/skins/Shade/btn/btn_hotcue_7_down.png
View file
Open in desktop
Diff not rendered.
Binary file removed res/skins/Shade/btn/btn_hotcue_7_over.png
View file
Open in desktop
Diff not rendered.
Binary file removed res/skins/Shade/btn/btn_hotcue_7_overdown.png
View file
Open in desktop
Diff not rendered.
Binary file modified res/skins/Shade/btn/btn_hotcue_8.png
View file
Open in desktop
Binary file removed res/skins/Shade/btn/btn_hotcue_8_down.png
View file
Open in desktop
Diff not rendered.
Binary file removed res/skins/Shade/btn/btn_hotcue_8_over.png
View file
Open in desktop
Diff not rendered.
Binary file removed res/skins/Shade/btn/btn_hotcue_8_overdown.png
View file
Open in desktop
Diff not rendered.
10 changes: 5 additions & 5 deletions res/skins/Shade/deck_hotcue_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<RightClickIsPushButton>true</RightClickIsPushButton>
<State>
<Number>0</Number>
<Pressed>skin:/btn/btn_hotcue_<Variable name="hotcue"/>_down.png</Pressed>
<Pressed>skin:/btn/btn_hotcue_<Variable name="hotcue"/>.png</Pressed>
<Unpressed>skin:/btn/btn_hotcue_<Variable name="hotcue"/>.png</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>skin:/btn/btn_hotcue_<Variable name="hotcue"/>_overdown.png</Pressed>
<Unpressed>skin:/btn/btn_hotcue_<Variable name="hotcue"/>_over.png</Unpressed>
<Pressed>skin:/btn/btn_hotcue_<Variable name="hotcue"/>.png</Pressed>
<Unpressed>skin:/btn/btn_hotcue_<Variable name="hotcue"/>.png</Unpressed>
</State>
<Connection>
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_<Variable name="hotcue"/>_activate</ConfigKey>
Expand All @@ -33,8 +33,8 @@
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
<Connection>
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_<Variable name="hotcue"/>_color_id</ConfigKey>
<BindProperty>highlight</BindProperty>
<ConfigKey>[Channel<Variable name="channum"/>],hotcue_<Variable name="hotcue"/>_color</ConfigKey>
<BindProperty>backgroundColorRgba</BindProperty>
</Connection>
</PushButton>
</Template>
Loading