From f94cc2538d138569c51ef8401e78b3d083491929 Mon Sep 17 00:00:00 2001 From: Ferran Pujol Camins Date: Fri, 15 Feb 2019 22:59:43 +0100 Subject: [PATCH 1/5] Delete Teal and Gray colors and add White color --- src/util/color/predefinedcolorsset.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/util/color/predefinedcolorsset.h b/src/util/color/predefinedcolorsset.h index 0d9bc054c807..308c0dcb15dc 100644 --- a/src/util/color/predefinedcolorsset.h +++ b/src/util/color/predefinedcolorsset.h @@ -60,18 +60,12 @@ class PredefinedColorsSet final { QObject::tr("Pink"), 7 ); - const PredefinedColorPointer teal = std::make_shared( - QColor("#469990"), - QLatin1String("Teal"), - QObject::tr("Teal"), + const PredefinedColorPointer white = std::make_shared( + QColor("#FFFFFF"), + QLatin1String("White"), + QObject::tr("White"), 8 ); - const PredefinedColorPointer grey = std::make_shared( - QColor("#A9A9A9"), - QLatin1String("Grey"), - QObject::tr("Grey"), - 9 - ); // The list of the predefined colors. const QList allColors { @@ -83,8 +77,7 @@ class PredefinedColorsSet final { cyan, magenta, pink, - teal, - grey, + white, }; PredefinedColorsSet() From 28a3ba8778fc6e4b052a78b9b0e1f38bcc8a7eec Mon Sep 17 00:00:00 2001 From: Ferran Pujol Camins Date: Fri, 15 Feb 2019 23:06:04 +0100 Subject: [PATCH 2/5] Remove inline on long function --- src/util/color/color.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/color/color.h b/src/util/color/color.h index df6eea05c60b..aa333778dcf4 100644 --- a/src/util/color/color.h +++ b/src/util/color/color.h @@ -38,7 +38,7 @@ namespace Color { // If the baseColor is darker than the global threshold, // returns a lighter color, otherwise returns a darker color. - static inline QColor chooseContrastColor(QColor baseColor) { + static QColor chooseContrastColor(QColor baseColor) { // Will produce a color that is 60% brighter. static const int iLighterFactor = 160; // We consider a hsv color dark if its value is <= 20% of max value From 7f141dd9b950c522588f22fb27e98dc97f8199d3 Mon Sep 17 00:00:00 2001 From: Ferran Pujol Camins Date: Sat, 16 Feb 2019 00:46:48 +0100 Subject: [PATCH 3/5] Change default color representations --- src/util/color/predefinedcolorsset.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/util/color/predefinedcolorsset.h b/src/util/color/predefinedcolorsset.h index 308c0dcb15dc..3696e27e77e2 100644 --- a/src/util/color/predefinedcolorsset.h +++ b/src/util/color/predefinedcolorsset.h @@ -19,37 +19,37 @@ class PredefinedColorsSet final { 0 ); const PredefinedColorPointer red = std::make_shared( - QColor("#E6194B"), + QColor("#FF0000"), QLatin1String("Red"), QObject::tr("Red"), 1 ); const PredefinedColorPointer green = std::make_shared( - QColor("#3CB44B"), + QColor("#00FF00"), QLatin1String("Green"), QObject::tr("Green"), 2 ); - const PredefinedColorPointer yellow = std::make_shared( - QColor("#FFE119"), - QLatin1String("Yellow"), - QObject::tr("Yellow"), - 3 - ); const PredefinedColorPointer blue = std::make_shared( - QColor("#4363D8"), + QColor("#0000FF"), QLatin1String("Blue"), QObject::tr("Blue"), + 3 + ); + const PredefinedColorPointer yellow = std::make_shared( + QColor("#FFFF00"), + QLatin1String("Yellow"), + QObject::tr("Yellow"), 4 ); const PredefinedColorPointer cyan = std::make_shared( - QColor("#42D4F4"), + QColor("#00FFFF"), QLatin1String("Cyan"), QObject::tr("Cyan"), 5 ); const PredefinedColorPointer magenta = std::make_shared( - QColor("#F032E6"), + QColor("#FF00FF"), QLatin1String("Magenta"), QObject::tr("Magenta"), 6 From 20972b6714b3fd4c560234c2e6fa48b8a7e64747 Mon Sep 17 00:00:00 2001 From: Ferran Pujol Camins Date: Tue, 19 Feb 2019 19:19:05 +0100 Subject: [PATCH 4/5] Revert default RGBa --- src/util/color/predefinedcolorsset.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/color/predefinedcolorsset.h b/src/util/color/predefinedcolorsset.h index 3696e27e77e2..252736e0b535 100644 --- a/src/util/color/predefinedcolorsset.h +++ b/src/util/color/predefinedcolorsset.h @@ -19,37 +19,37 @@ class PredefinedColorsSet final { 0 ); const PredefinedColorPointer red = std::make_shared( - QColor("#FF0000"), + QColor("#E6194B"), QLatin1String("Red"), QObject::tr("Red"), 1 ); const PredefinedColorPointer green = std::make_shared( - QColor("#00FF00"), + QColor("#3CB44B"), QLatin1String("Green"), QObject::tr("Green"), 2 ); const PredefinedColorPointer blue = std::make_shared( - QColor("#0000FF"), + QColor("#4363D8"), QLatin1String("Blue"), QObject::tr("Blue"), 3 ); const PredefinedColorPointer yellow = std::make_shared( - QColor("#FFFF00"), + QColor("#FFE119"), QLatin1String("Yellow"), QObject::tr("Yellow"), 4 ); const PredefinedColorPointer cyan = std::make_shared( - QColor("#00FFFF"), + QColor("#42D4F4"), QLatin1String("Cyan"), QObject::tr("Cyan"), 5 ); const PredefinedColorPointer magenta = std::make_shared( - QColor("#FF00FF"), + QColor("#F032E6"), QLatin1String("Magenta"), QObject::tr("Magenta"), 6 From 8cd4d71b47f348ae243128f450e0e8b8d331b0c9 Mon Sep 17 00:00:00 2001 From: Ferran Pujol Camins Date: Sat, 2 Mar 2019 21:38:16 +0100 Subject: [PATCH 5/5] Tweak PredefinedColors and add controlelr cue color template --- res/controllers/CueColorsReference.svg | 250 +++++++++++++++++++++++++ src/util/color/predefinedcolorsset.h | 24 +-- 2 files changed, 262 insertions(+), 12 deletions(-) create mode 100644 res/controllers/CueColorsReference.svg diff --git a/res/controllers/CueColorsReference.svg b/res/controllers/CueColorsReference.svg new file mode 100644 index 000000000000..7189ffaf0de4 --- /dev/null +++ b/res/controllers/CueColorsReference.svg @@ -0,0 +1,250 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Blue + Green + Red + Purple + White + Pink + Celeste (Sky Blue) + Yellow + + + + + Mixxx Cue Button Reference Colors + + diff --git a/src/util/color/predefinedcolorsset.h b/src/util/color/predefinedcolorsset.h index 252736e0b535..14278ce71f69 100644 --- a/src/util/color/predefinedcolorsset.h +++ b/src/util/color/predefinedcolorsset.h @@ -19,49 +19,49 @@ class PredefinedColorsSet final { 0 ); const PredefinedColorPointer red = std::make_shared( - QColor("#E6194B"), + QColor("#c50a08"), QLatin1String("Red"), QObject::tr("Red"), 1 ); const PredefinedColorPointer green = std::make_shared( - QColor("#3CB44B"), + QColor("#32be44"), QLatin1String("Green"), QObject::tr("Green"), 2 ); const PredefinedColorPointer blue = std::make_shared( - QColor("#4363D8"), + QColor("#0044ff"), QLatin1String("Blue"), QObject::tr("Blue"), 3 ); const PredefinedColorPointer yellow = std::make_shared( - QColor("#FFE119"), + QColor("#f8d200"), QLatin1String("Yellow"), QObject::tr("Yellow"), 4 ); const PredefinedColorPointer cyan = std::make_shared( - QColor("#42D4F4"), - QLatin1String("Cyan"), - QObject::tr("Cyan"), + QColor("#42d4f4"), + QLatin1String("Celeste"), + QObject::tr("Celeste"), 5 ); const PredefinedColorPointer magenta = std::make_shared( - QColor("#F032E6"), - QLatin1String("Magenta"), - QObject::tr("Magenta"), + QColor("#af00cc"), + QLatin1String("Purple"), + QObject::tr("Purple"), 6 ); const PredefinedColorPointer pink = std::make_shared( - QColor("#FABEBE"), + QColor("#fca6d7"), QLatin1String("Pink"), QObject::tr("Pink"), 7 ); const PredefinedColorPointer white = std::make_shared( - QColor("#FFFFFF"), + QColor("#f2f2ff"), QLatin1String("White"), QObject::tr("White"), 8