summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/widget/wcolorpicker.cpp6
-rw-r--r--src/widget/wcolorpicker.h2
-rw-r--r--src/widget/wcolorpickeraction.cpp4
-rw-r--r--src/widget/wcolorpickeraction.h1
-rw-r--r--src/widget/wcuemenupopup.cpp6
-rw-r--r--src/widget/wcuemenupopup.h2
-rw-r--r--src/widget/woverview.cpp2
-rw-r--r--src/widget/wtracktableview.cpp54
8 files changed, 42 insertions, 35 deletions
diff --git a/src/widget/wcolorpicker.cpp b/src/widget/wcolorpicker.cpp
index 76d3d7505c..ff32b4de00 100644
--- a/src/widget/wcolorpicker.cpp
+++ b/src/widget/wcolorpicker.cpp
@@ -11,10 +11,10 @@ namespace {
const int kNumColumns = 4;
}
-WColorPicker::WColorPicker(ColorOption colorOption, QWidget* parent)
+WColorPicker::WColorPicker(ColorOption colorOption, const ColorPalette& palette, QWidget* parent)
: QWidget(parent),
m_colorOption(colorOption),
- m_palette(ColorPalette::mixxxPalette) {
+ m_palette(palette) {
QGridLayout* pLayout = new QGridLayout();
pLayout->setMargin(0);
pLayout->setContentsMargins(0, 0, 0, 0);
@@ -146,6 +146,8 @@ void WColorPicker::setSelectedColor(const mixxx::RgbColor::optional_t& color) {
}
void WColorPicker::useColorSet(const ColorPalette& palette) {
+ resetSelectedColor();
+
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 2a97b2e0cf..f43419c425 100644
--- a/src/widget/wcolorpicker.h
+++ b/src/widget/wcolorpicker.h
@@ -17,7 +17,7 @@ class WColorPicker : public QWidget {
AllowNoColor,
};
- explicit WColorPicker(ColorOption colorOption, QWidget* parent = nullptr);
+ explicit WColorPicker(ColorOption colorOption, const ColorPalette& palette, QWidget* parent = nullptr);
void resetSelectedColor();
void setSelectedColor(const mixxx::RgbColor::optional_t& color);
diff --git a/src/widget/wcolorpickeraction.cpp b/src/widget/wcolorpickeraction.cpp
index 6c2afc6579..b57f1e4b78 100644
--- a/src/widget/wcolorpickeraction.cpp
+++ b/src/widget/wcolorpickeraction.cpp
@@ -1,8 +1,8 @@
#include "widget/wcolorpickeraction.h"
-WColorPickerAction::WColorPickerAction(WColorPicker::ColorOption colorOption, QWidget* parent)
+WColorPickerAction::WColorPickerAction(WColorPicker::ColorOption colorOption, const ColorPalette& palette, QWidget* parent)
: QWidgetAction(parent),
- m_pColorPicker(make_parented<WColorPicker>(colorOption)) {
+ m_pColorPicker(make_parented<WColorPicker>(colorOption, palette)) {
connect(m_pColorPicker.get(), &WColorPicker::colorPicked, this, &WColorPickerAction::colorPicked);
QHBoxLayout* pLayout = new QHBoxLayout();
diff --git a/src/widget/wcolorpickeraction.h b/src/widget/wcolorpickeraction.h
index e565f33004..e7ca0095b4 100644
--- a/src/widget/wcolorpickeraction.h
+++ b/src/widget/wcolorpickeraction.h
@@ -12,6 +12,7 @@ class WColorPickerAction : public QWidgetAction {
public:
explicit WColorPickerAction(
WColorPicker::ColorOption colorOption,
+ const ColorPalette& palette,
QWidget* parent = nullptr);
void resetSelectedColor();
diff --git a/src/widget/wcuemenupopup.cpp b/src/widget/wcuemenupopup.cpp
index 9e22308fdb..4ff1e13f66 100644
--- a/src/widget/wcuemenupopup.cpp
+++ b/src/widget/wcuemenupopup.cpp
@@ -5,9 +5,10 @@
#include <QVBoxLayout>
#include "engine/engine.h"
+#include "preferences/hotcuecolorpalettesettings.h"
#include "util/color/color.h"
-WCueMenuPopup::WCueMenuPopup(QWidget* parent)
+WCueMenuPopup::WCueMenuPopup(UserSettingsPointer pConfig, QWidget* parent)
: QWidget(parent) {
QWidget::hide();
setWindowFlags(Qt::Popup);
@@ -30,7 +31,8 @@ WCueMenuPopup::WCueMenuPopup(QWidget* parent)
connect(m_pEditLabel, &QLineEdit::textEdited, this, &WCueMenuPopup::slotEditLabel);
connect(m_pEditLabel, &QLineEdit::returnPressed, this, &WCueMenuPopup::hide);
- m_pColorPicker = new WColorPicker(WColorPicker::ColorOption::DenyNoColor, this);
+ HotcueColorPaletteSettings colorPaletteSettings(pConfig);
+ m_pColorPicker = new WColorPicker(WColorPicker::ColorOption::DenyNoColor, colorPaletteSettings.getHotcueColorPalette(), this);
m_pColorPicker->setObjectName("CueColorPicker");
connect(m_pColorPicker, &WColorPicker::colorPicked, this, &WCueMenuPopup::slotChangeCueColor);
diff --git a/src/widget/wcuemenupopup.h b/src/widget/wcuemenupopup.h
index 14d448d91e..9338783c76 100644
--- a/src/widget/wcuemenupopup.h
+++ b/src/widget/wcuemenupopup.h
@@ -11,7 +11,7 @@
class WCueMenuPopup : public QWidget {
Q_OBJECT
public:
- WCueMenuPopup(QWidget* parent = nullptr);
+ WCueMenuPopup(UserSettingsPointer pConfig, QWidget* parent = nullptr);
~WCueMenuPopup() {
delete m_pCueNumber;
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index c72cbea087..a59bc84fa7 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -55,7 +55,7 @@ WOverview::WOverview(
m_group(group),
m_pConfig(pConfig),
m_endOfTrack(false),
- m_pCueMenuPopup(std::make_unique<WCueMenuPopup>(this)),
+ m_pCueMenuPopup(std::make_unique<WCueMenuPopup>(pConfig, this)),
m_bShowCueTimes(true),
m_iPosSeconds(0),
m_bLeftClickDragging(false),
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index b393f0dbc6..a23a1020b2 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -1,44 +1,45 @@
-#include <QModelIndex>
-#include <QInputDialog>
+#include "widget/wtracktableview.h"
+
+#include <QCheckBox>
#include <QDesktopServices>
-#include <QUrl>
#include <QDrag>
-#include <QShortcut>
-#include <QWidgetAction>
-#include <QCheckBox>
+#include <QInputDialog>
#include <QLinkedList>
+#include <QModelIndex>
#include <QScrollBar>
+#include <QShortcut>
+#include <QUrl>
+#include <QWidgetAction>
-#include "widget/wtracktableview.h"
-
-#include "widget/wcolorpickeraction.h"
-#include "widget/wcoverartmenu.h"
-#include "widget/wskincolor.h"
-#include "widget/wtracktableviewheader.h"
-#include "widget/wwidget.h"
+#include "control/controlobject.h"
+#include "control/controlproxy.h"
#include "library/coverartcache.h"
-#include "library/dlgtagfetcher.h"
-#include "library/dlgtrackinfo.h"
-#include "library/librarytablemodel.h"
#include "library/crate/cratefeaturehelper.h"
#include "library/dao/trackschema.h"
+#include "library/dlgtagfetcher.h"
+#include "library/dlgtrackinfo.h"
#include "library/dlgtrackmetadataexport.h"
#include "library/externaltrackcollection.h"
+#include "library/librarytablemodel.h"
#include "library/trackcollection.h"
#include "library/trackcollectionmanager.h"
-#include "control/controlobject.h"
-#include "control/controlproxy.h"
-#include "track/track.h"
-#include "track/trackref.h"
-#include "sources/soundsourceproxy.h"
#include "mixer/playermanager.h"
#include "preferences/dialog/dlgpreflibrary.h"
-#include "waveform/guitick.h"
-#include "util/dnd.h"
-#include "util/time.h"
+#include "preferences/hotcuecolorpalettesettings.h"
+#include "sources/soundsourceproxy.h"
+#include "track/track.h"
+#include "track/trackref.h"
#include "util/assert.h"
-#include "util/parented_ptr.h"
#include "util/desktophelper.h"
+#include "util/dnd.h"
+#include "util/parented_ptr.h"
+#include "util/time.h"
+#include "waveform/guitick.h"
+#include "widget/wcolorpickeraction.h"
+#include "widget/wcoverartmenu.h"
+#include "widget/wskincolor.h"
+#include "widget/wtracktableviewheader.h"
+#include "widget/wwidget.h"
WTrackTableView::WTrackTableView(QWidget * parent,
UserSettingsPointer pConfig,
@@ -573,7 +574,8 @@ void WTrackTableView::createActions() {
connect(m_pBpmThreeHalvesAction, &QAction::triggered,
this, [this] { slotScaleBpm(Beats::THREEHALVES); });
- m_pColorPickerAction = new WColorPickerAction(WColorPicker::ColorOption::AllowNoColor, this);
+ HotcueColorPaletteSettings colorPaletteSettings(m_pConfig);
+ m_pColorPickerAction = new WColorPickerAction(WColorPicker::ColorOption::AllowNoColor, colorPaletteSettings.getHotcueColorPalette(), this);
m_pColorPickerAction->setObjectName("TrackColorPickerAction");
connect(m_pColorPickerAction,
&WColorPickerAction::colorPicked,
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 04:27:38 +0000