Skip to content

Commit

Permalink
util/color/predefinedcolorpalettes: Add hotcue palette with default c…
Browse files Browse the repository at this point in the history
…olor
  • Loading branch information
Holzhaus committed Mar 20, 2020
1 parent 762de07 commit cae9a53
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
17 changes: 17 additions & 0 deletions src/util/color/predefinedcolorpalettes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,22 @@ const ColorPalette PredefinedColorPalettes::kMixxxHotcueColorPalette =
kColorMixxxWhite,
});

const ColorPalette PredefinedColorPalettes::kMixxxHotcueColorPaletteWithDefaultColor =
ColorPalette(
QStringLiteral("Mixxx Hotcue Colors (with default color)"),
QList<mixxx::RgbColor>{
kColorMixxxRed,
kColorMixxxYellow,
kColorMixxxGreen,
kColorMixxxCeleste,
kColorMixxxBlue,
kColorMixxxPurple,
kColorMixxxPink,
kColorMixxxWhite,
kSchemaMigrationReplacementColor,
},
QList<unsigned int>{8});

const ColorPalette PredefinedColorPalettes::kSeratoDJIntroHotcueColorPalette =
ColorPalette(
QStringLiteral("Serato DJ Intro Hotcue Colors"),
Expand Down Expand Up @@ -248,6 +264,7 @@ const ColorPalette PredefinedColorPalettes::kDefaultTrackColorPalette =
const QList<ColorPalette> PredefinedColorPalettes::kPalettes{
// Hotcue Color Palettes
mixxx::PredefinedColorPalettes::kMixxxHotcueColorPalette,
mixxx::PredefinedColorPalettes::kMixxxHotcueColorPaletteWithDefaultColor,
mixxx::PredefinedColorPalettes::kSeratoDJProHotcueColorPalette,
mixxx::PredefinedColorPalettes::kSeratoDJIntroHotcueColorPalette,

Expand Down
1 change: 1 addition & 0 deletions src/util/color/predefinedcolorpalettes.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace mixxx {
class PredefinedColorPalettes {
public:
static const ColorPalette kMixxxHotcueColorPalette;
static const ColorPalette kMixxxHotcueColorPaletteWithDefaultColor;
static const ColorPalette kSeratoDJIntroHotcueColorPalette;
static const ColorPalette kSeratoDJProHotcueColorPalette;

Expand Down

0 comments on commit cae9a53

Please sign in to comment.