diff options
author | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2019-11-04 09:50:15 +0100 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-28 23:47:05 +0100 |
commit | bbc45039679110475e85ce06f0ec61416f0a6d10 (patch) | |
tree | 84308c628491e6f72ad1bc04f28d30310d5f27ee | |
parent | 0ef7da41f6a2765e1817c58b4432bf02bf530a31 (diff) |
Rename some color related classes
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | build/depends.py | 2 | ||||
-rw-r--r-- | src/engine/controls/cuecontrol.cpp | 6 | ||||
-rw-r--r-- | src/library/dlgtrackinfo.cpp | 2 | ||||
-rw-r--r-- | src/preferences/hotcuecolorpalettesettings.cpp | 8 | ||||
-rw-r--r-- | src/preferences/hotcuecolorpalettesettings.h | 6 | ||||
-rw-r--r-- | src/test/colorconfig_test.cpp | 16 | ||||
-rw-r--r-- | src/test/controllerengine_test.cpp | 4 | ||||
-rw-r--r-- | src/util/color/colorpalette.cpp (renamed from src/util/color/hotcuecolorpalette.cpp) | 10 | ||||
-rw-r--r-- | src/util/color/colorpalette.h | 40 | ||||
-rw-r--r-- | src/widget/wcolorpicker.cpp | 4 | ||||
-rw-r--r-- | src/widget/wcolorpicker.h | 6 | ||||
-rw-r--r-- | src/widget/wcuemenupopup.h | 2 |
13 files changed, 72 insertions, 36 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a71a311cea..af9b88af50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -534,7 +534,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/util/cache.cpp src/util/cmdlineargs.cpp src/util/color/color.cpp - src/util/color/hotcuecolorpalette.cpp + src/util/color/colorpalette.cpp src/util/console.cpp src/util/db/dbconnection.cpp src/util/db/dbconnectionpool.cpp diff --git a/build/depends.py b/build/depends.py index 2f8f24d034..ac62b65794 100644 --- a/build/depends.py +++ b/build/depends.py @@ -1278,7 +1278,7 @@ class MixxxCore(Feature): "src/util/cache.cpp", "src/util/console.cpp", "src/util/color/color.cpp", - "src/util/color/hotcuecolorpalette.cpp", + "src/util/color/colorpalette.cpp", "src/util/db/dbconnection.cpp", "src/util/db/dbconnectionpool.cpp", "src/util/db/dbconnectionpooler.cpp", diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp index 6d2ff1c3d8..f89718376e 100644 --- a/src/engine/controls/cuecontrol.cpp +++ b/src/engine/controls/cuecontrol.cpp @@ -1693,8 +1693,8 @@ void CueControl::hotcueFocusColorPrev(double v) { QColor color = pControl->getColor(); DEBUG_ASSERT(color.isValid()); - HotcueColorPaletteSettings colorPaletteSettings(m_pConfig); - HotcueColorPalette colorPalette = colorPaletteSettings.getHotcueColorPalette(); + HotcueColorPaletteSettings m_colorPaletteSettings(m_pConfig); + ColorPalette colorPalette = m_colorPaletteSettings.getHotcueColorPalette(); // Get previous color in color set int iColorIndex = colorPalette.indexOf(color) - 1; @@ -1725,7 +1725,7 @@ void CueControl::hotcueFocusColorNext(double v) { DEBUG_ASSERT(color.isValid()); HotcueColorPaletteSettings colorPaletteSettings(m_pConfig); - HotcueColorPalette colorPalette = colorPaletteSettings.getHotcueColorPalette(); + ColorPalette colorPalette = colorPaletteSettings.getHotcueColorPalette(); // Get previous color in color set int iColorIndex = colorPalette.indexOf(color) + 1; diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp index 7844a865ba..df5e27a2d2 100644 --- a/src/library/dlgtrackinfo.cpp +++ b/src/library/dlgtrackinfo.cpp @@ -13,7 +13,7 @@ #include "track/cue.h" #include "track/keyfactory.h" #include "track/keyutils.h" -#include "util/color/hotcuecolorpalette.h" +#include "util/color/colorpalette.h" #include "util/compatibility.h" #include "util/desktophelper.h" #include "util/duration.h" diff --git a/src/preferences/hotcuecolorpalettesettings.cpp b/src/preferences/hotcuecolorpalettesettings.cpp index b6a745606c..4faf0f9308 100644 --- a/src/preferences/hotcuecolorpalettesettings.cpp +++ b/src/preferences/hotcuecolorpalettesettings.cpp @@ -2,7 +2,7 @@ const QString HotcueColorPaletteSettings::sGroup = "[HotcueColorPalette]"; -HotcueColorPalette HotcueColorPaletteSettings::getHotcueColorPalette() const { +ColorPalette HotcueColorPaletteSettings::getHotcueColorPalette() const { QList<QColor> colorList; for (const ConfigKey& key : m_pConfig->getKeysWithGroup(sGroup)) { QColor color = m_pConfig->getValue<QColor>(key); @@ -13,14 +13,14 @@ HotcueColorPalette HotcueColorPaletteSettings::getHotcueColorPalette() const { // If no palette is defined in the settings, we use the default one. if (colorList.isEmpty()) { - return HotcueColorPalette::mixxxPalette; + return ColorPalette::mixxxPalette; } return colorList; } void HotcueColorPaletteSettings::setHotcueColorPalette( - const HotcueColorPalette& colorPalette) { + const ColorPalette& colorPalette) { removePalette(); for (int index = 0; index < colorPalette.m_colorList.count(); ++index) { @@ -33,4 +33,4 @@ void HotcueColorPaletteSettings::removePalette() { for (const ConfigKey& key : m_pConfig->getKeysWithGroup(sGroup)) { m_pConfig->remove(key); } -}
\ No newline at end of file +} diff --git a/src/preferences/hotcuecolorpalettesettings.h b/src/preferences/hotcuecolorpalettesettings.h index fb1891e32c..9ed134146a 100644 --- a/src/preferences/hotcuecolorpalettesettings.h +++ b/src/preferences/hotcuecolorpalettesettings.h @@ -1,7 +1,7 @@ #pragma once #include "preferences/usersettings.h" -#include "util/color/hotcuecolorpalette.h" +#include "util/color/colorpalette.h" class HotcueColorPaletteSettings { public: @@ -9,9 +9,9 @@ class HotcueColorPaletteSettings { : m_pConfig(pConfig) { } - HotcueColorPalette getHotcueColorPalette() const; + ColorPalette getHotcueColorPalette() const; - void setHotcueColorPalette(const HotcueColorPalette& colorPalette); + void setHotcueColorPalette(const ColorPalette& colorPalette); private: static const QString sGroup; diff --git a/src/test/colorconfig_test.cpp b/src/test/colorconfig_test.cpp index e3fd79c72c..477bab40a5 100644 --- a/src/test/colorconfig_test.cpp +++ b/src/test/colorconfig_test.cpp @@ -4,7 +4,7 @@ #include "test/mixxxtest.h" #include <preferences/hotcuecolorpalettesettings.h> -#include <util/color/hotcuecolorpalette.h> +#include <util/color/colorpalette.h> class ColorConfigTest : public MixxxTest {}; @@ -35,7 +35,7 @@ TEST_F(ColorConfigTest, GetDefaultColorWhenNoStoredColor) { TEST_F(ColorConfigTest, SaveColorPalette) { HotcueColorPaletteSettings colorPaletteSettings(config()); - HotcueColorPalette originalColorPalette(QList<QColor>{ + ColorPalette originalColorPalette(QList<QColor>{ QColor("#66FF9900"), QColor("#FF9900"), QColor("#00000000"), @@ -44,20 +44,20 @@ TEST_F(ColorConfigTest, SaveColorPalette) { ConfigKey key("[ColorPalette]", "colorPalette"); colorPaletteSettings.setHotcueColorPalette(originalColorPalette); saveAndReloadConfig(); - HotcueColorPalette colorPaletteFromConfig = + ColorPalette colorPaletteFromConfig = colorPaletteSettings.getHotcueColorPalette(); ASSERT_EQ(originalColorPalette, colorPaletteFromConfig); } TEST_F(ColorConfigTest, ReplaceColorPalette) { HotcueColorPaletteSettings colorPaletteSettings(config()); - HotcueColorPalette colorPalette1(QList<QColor>{ + ColorPalette colorPalette1(QList<QColor>{ QColor("#66FF9900"), QColor("#FF9900"), QColor("#00000000"), QColor("#FFFFFF"), }); - HotcueColorPalette colorPalette2(QList<QColor>{ + ColorPalette colorPalette2(QList<QColor>{ QColor("#0000FF"), QColor("#FF0000"), }); @@ -66,14 +66,14 @@ TEST_F(ColorConfigTest, ReplaceColorPalette) { saveAndReloadConfig(); colorPaletteSettings.setHotcueColorPalette(colorPalette2); saveAndReloadConfig(); - HotcueColorPalette colorPaletteFromConfig = + ColorPalette colorPaletteFromConfig = colorPaletteSettings.getHotcueColorPalette(); ASSERT_EQ(colorPalette2, colorPaletteFromConfig); } TEST_F(ColorConfigTest, DefaultColorPalette) { HotcueColorPaletteSettings colorPaletteSettings(config()); - HotcueColorPalette colorPaletteFromConfig = + ColorPalette colorPaletteFromConfig = colorPaletteSettings.getHotcueColorPalette(); - ASSERT_EQ(HotcueColorPalette::mixxxPalette, colorPaletteFromConfig); + ASSERT_EQ(ColorPalette::mixxxHotcuesPalette, colorPaletteFromConfig); } diff --git a/src/test/controllerengine_test.cpp b/src/test/controllerengine_test.cpp index ccf717dbc8..ea6a9ad011 100644 --- a/src/test/controllerengine_test.cpp +++ b/src/test/controllerengine_test.cpp @@ -8,7 +8,7 @@ #include "controllers/softtakeover.h" #include "preferences/usersettings.h" #include "test/mixxxtest.h" -#include "util/color/hotcuecolorpalette.h" +#include "util/color/colorpalette.h" #include "util/memory.h" #include "util/time.h" @@ -620,7 +620,7 @@ TEST_F(ControllerEngineTest, connectionExecutesWithCorrectThisObject) { } TEST_F(ControllerEngineTest, colorProxyTestMixxxPalette) { - QList<QColor> allColors = HotcueColorPalette::mixxxPalette.m_colorList; + QList<QColor> allColors = ColorPalette::mixxxPalette.m_colorList; for (int i = 0; i < allColors.length(); ++i) { QColor color = allColors[i]; qDebug() << "Testing color " << color.name(); diff --git a/src/util/color/hotcuecolorpalette.cpp b/src/util/color/colorpalette.cpp index 0bac5436bd..3f16c8f676 100644 --- a/src/util/color/hotcuecolorpalette.cpp +++ b/src/util/color/colorpalette.cpp @@ -1,11 +1,7 @@ -// -// Created by Ferran Pujol Camins on 27/10/2019. -// +#include "colorpalette.h" -#include "hotcuecolorpalette.h" - -const HotcueColorPalette HotcueColorPalette::mixxxPalette = - HotcueColorPalette(QList<QColor>{QColor("#c50a08"), +const ColorPalette ColorPalette::mixxxPalette = + ColorPalette(QList<QColor>{QColor("#c50a08"), QColor("#32be44"), QColor("#0044ff"), QColor("#f8d200"), diff --git a/src/util/color/colorpalette.h b/src/util/color/colorpalette.h new file mode 100644 index 0000000000..5bd2eb836d --- /dev/null +++ b/src/util/color/colorpalette.h @@ -0,0 +1,40 @@ +#pragma once + +#include <QColor> +#include <QList> + +class ColorPalette { + public: + ColorPalette(QList<QColor> colorList) + : m_colorList(colorList) { + } + + QColor at(int i) const { + return m_colorList.at(i); + } + + int size() const { + return m_colorList.size(); + } + + int indexOf(QColor color) const { + return m_colorList.indexOf(color); + } + + QList<QColor>::const_iterator begin() const { + return m_colorList.begin(); + } + + QList<QColor>::const_iterator end() const { + return m_colorList.end(); + } + + static const ColorPalette mixxxPalette; + + QList<QColor> m_colorList; +}; + +inline bool operator==( + const ColorPalette& lhs, const ColorPalette& rhs) { + return lhs.m_colorList == rhs.m_colorList; +} diff --git a/src/widget/wcolorpicker.cpp b/src/widget/wcolorpicker.cpp index 10e2257f76..717ea97a27 100644 --- a/src/widget/wcolorpicker.cpp +++ b/src/widget/wcolorpicker.cpp @@ -14,7 +14,7 @@ namespace { WColorPicker::WColorPicker(ColorOption colorOption, QWidget* parent) : QWidget(parent), m_colorOption(colorOption), - m_palette(HotcueColorPalette::mixxxPalette) { + m_palette(ColorPalette::mixxxPalette) { QGridLayout* pLayout = new QGridLayout(); pLayout->setMargin(0); pLayout->setContentsMargins(0, 0, 0, 0); @@ -139,7 +139,7 @@ void WColorPicker::setSelectedColor(const QColor& color) { pButton->style()->polish(pButton); } -void WColorPicker::useColorSet(const HotcueColorPalette& palette) { +void WColorPicker::useColorSet(const ColorPalette& palette) { for (int i = 0; i < m_colorButtons.size(); ++i) { int j = i; if (m_colorOption == ColorOption::AllowNoColor) { diff --git a/src/widget/wcolorpicker.h b/src/widget/wcolorpicker.h index 0e7befac1b..cb3d45e6b3 100644 --- a/src/widget/wcolorpicker.h +++ b/src/widget/wcolorpicker.h @@ -7,7 +7,7 @@ #include <QStyleFactory> #include "util/color/color.h" -#include "util/color/hotcuecolorpalette.h" +#include "util/color/colorpalette.h" class WColorPicker : public QWidget { Q_OBJECT @@ -21,7 +21,7 @@ class WColorPicker : public QWidget { void resetSelectedColor(); void setSelectedColor(const QColor& color); - void useColorSet(const HotcueColorPalette& palette); + void useColorSet(const ColorPalette& palette); signals: void colorPicked(QColor color); @@ -33,7 +33,7 @@ class WColorPicker : public QWidget { void addColorButton(const QColor& color, QGridLayout* pLayout, int row, int column); ColorOption m_colorOption; QColor m_selectedColor; - HotcueColorPalette m_palette; + ColorPalette m_palette; QList<QPushButton*> m_colorButtons; QStyle* m_pStyle; }; diff --git a/src/widget/wcuemenupopup.h b/src/widget/wcuemenupopup.h index e9d7a93274..1861a82203 100644 --- a/src/widget/wcuemenupopup.h +++ b/src/widget/wcuemenupopup.h @@ -23,7 +23,7 @@ class WCueMenuPopup : public QWidget { void setTrackAndCue(TrackPointer pTrack, CuePointer pCue); - void useColorSet(const HotcueColorPalette& palette) { + void useColorSet(const ColorPalette& palette) { if (m_pColorPicker != nullptr) { m_pColorPicker->useColorSet(palette); } |