Color preferences improvements

src/preferences/colorpaletteeditor.cpp

@@ -31,20 +31,21 @@ ColorPaletteEditor::ColorPaletteEditor(QWidget* parent)
     m_pDiscardButton = pButtonBox->addButton(QDialogButtonBox::Discard);
 
     QHBoxLayout* pTopLayout = new QHBoxLayout();
-    pTopLayout->addWidget(new QLabel("Name:"));
+    pTopLayout->addWidget(new QLabel(tr("Name")));
     pTopLayout->addWidget(m_pPaletteNameComboBox, 1);
-    pTopLayout->addWidget(pButtonBox);
 
     QVBoxLayout* pLayout = new QVBoxLayout();
     pLayout->addLayout(pTopLayout);
     pLayout->addWidget(m_pTableView, 1);
+    pLayout->addWidget(pButtonBox);
     setLayout(pLayout);
     setContentsMargins(0, 0, 0, 0);
 
     // Set up model
-    m_pModel->setColumnCount(2);
+    m_pModel->setColumnCount(3);
     m_pModel->setHeaderData(0, Qt::Horizontal, tr("Color"), Qt::DisplayRole);
-    m_pModel->setHeaderData(1, Qt::Horizontal, tr("Assign to Hotcue"), Qt::DisplayRole);
+    m_pModel->setHeaderData(1, Qt::Horizontal, tr("Assign to Hotcue Number"), Qt::DisplayRole);
+    m_pModel->setHeaderData(2, Qt::Horizontal, QString(), Qt::DisplayRole);
     connect(m_pModel,
             &ColorPaletteEditorModel::dirtyChanged,
             this,
@@ -63,6 +64,10 @@ ColorPaletteEditor::ColorPaletteEditor(QWidget* parent)
     m_pTableView->setContextMenuPolicy(Qt::CustomContextMenu);
     m_pTableView->setModel(m_pModel);
 
+    m_pTableView->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+    m_pTableView->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+    m_pTableView->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Stretch);
+
     connect(m_pTableView,
             &QTableView::doubleClicked,
             this,

src/preferences/colorpaletteeditormodel.cpp

@@ -103,9 +103,15 @@ void ColorPaletteEditorModel::setColorPalette(const ColorPalette& palette) {
     // Make a map of hotcue indices
     QMap<int, int> hotcueColorIndicesMap;
     QList<unsigned int> hotcueColorIndices = palette.getHotcueIndices();
-    for (int i = 0; i < hotcueColorIndices.size(); i++) {
-        int colorIndex = hotcueColorIndices.at(i);
-        hotcueColorIndicesMap.insert(colorIndex, i);
+    if (hotcueColorIndices.size()) {
+        for (int i = 0; i < hotcueColorIndices.size(); i++) {
+            int colorIndex = hotcueColorIndices.at(i);
+            hotcueColorIndicesMap.insert(colorIndex, i);
+        }
+    } else {
+        for (int i = 0; i < palette.size(); i++) {
+            hotcueColorIndicesMap.insert(i, i);
+        }
     }
 
     for (int i = 0; i < palette.size(); i++) {

src/preferences/dialog/dlgprefcolors.cpp

@@ -1,12 +1,19 @@
 #include "preferences/dialog/dlgprefcolors.h"
 
 #include <QColorDialog>
+#include <QPainter>
 #include <QStandardItemModel>
 #include <QtDebug>
 
 #include "control/controlobject.h"
 #include "util/color/predefinedcolorpalettes.h"
 
+namespace {
+
+constexpr int kHotcueDefaultColorIndex = -1;
+
+} // anonymous namespace
+
 DlgPrefColors::DlgPrefColors(
         QWidget* parent, UserSettingsPointer pConfig)
         : DlgPreferencePage(parent),
@@ -47,12 +54,44 @@ void DlgPrefColors::loadSettings() {
         comboBoxTrackColors->addItem(paletteName);
     }
 
+    const ColorPalette hotcuePalette = m_colorPaletteSettings.getHotcueColorPalette();
+
     comboBoxHotcueColors->setCurrentText(
-            m_colorPaletteSettings.getHotcueColorPalette().getName());
+            hotcuePalette.getName());
     comboBoxTrackColors->setCurrentText(
             m_colorPaletteSettings.getTrackColorPalette().getName());
 
-    slotApply();
+    QPixmap pixmap(80, 80);
+    QPainter painter(&pixmap);
+    pixmap.fill(Qt::black);
+
+    comboBoxHotcueDefaultColor->addItem(tr("By hotcue number"), -1);
+
+    for (int i = 0; i < hotcuePalette.size() && i < 4; ++i) {
+        painter.setBrush(mixxx::RgbColor::toQColor(hotcuePalette.at(i)));
+        painter.drawRect(0, i * 20, 80, 20);
+    }
+    comboBoxHotcueDefaultColor->setItemIcon(0, QIcon(pixmap));
+
+    for (int i = 0; i < hotcuePalette.size(); ++i) {
+        comboBoxHotcueDefaultColor->addItem(tr("Palette") +
+                        QStringLiteral(" ") + QString::number(i + 1),
+                i);
+        pixmap.fill(mixxx::RgbColor::toQColor(hotcuePalette.at(i)));
+        comboBoxHotcueDefaultColor->setItemIcon(i + 1, QIcon(pixmap));
+    }
+
+    bool autoHotcueColors =
+            m_pConfig->getValue(ConfigKey("[Controls]", "auto_hotcue_colors"), false);
+    if (autoHotcueColors) {
+        comboBoxHotcueDefaultColor->setCurrentIndex(0);
+    } else {
+        int hotcueDefaultColorIndex = m_pConfig->getValue(ConfigKey("[Controls]", "HotcueDefaultColorIndex"), kHotcueDefaultColorIndex);
+        if (hotcueDefaultColorIndex < 0 || hotcueDefaultColorIndex >= hotcuePalette.size()) {
+            hotcueDefaultColorIndex = hotcuePalette.size() - 1; // default to last color (orange)
+        }
+        comboBoxHotcueDefaultColor->setCurrentIndex(hotcueDefaultColorIndex + 1);
+    }
 }
 
 // Set the default values for all the widgets
@@ -61,6 +100,7 @@ void DlgPrefColors::slotResetToDefaults() {
             mixxx::PredefinedColorPalettes::kDefaultHotcueColorPalette.getName());
     comboBoxTrackColors->setCurrentText(
             mixxx::PredefinedColorPalettes::kDefaultTrackColorPalette.getName());
+    comboBoxHotcueDefaultColor->setCurrentIndex(1);
     slotApply();
 }
 
@@ -94,7 +134,13 @@ void DlgPrefColors::slotApply() {
                         m_colorPaletteSettings.getTrackColorPalette()));
     }
 
-    m_pConfig->setValue(
-            ConfigKey("[Controls]", "auto_hotcue_colors"),
-            checkBoxAssignHotcueColors->isChecked());
+    int index = comboBoxHotcueDefaultColor->currentIndex();
+
+    if (index > 0) {
+        m_pConfig->setValue(ConfigKey("[Controls]", "auto_hotcue_colors"), false);
+        m_pConfig->setValue(ConfigKey("[Controls]", "HotcueDefaultColorIndex"), index - 1);
+    } else {
+        m_pConfig->setValue(ConfigKey("[Controls]", "auto_hotcue_colors"), true);
+        m_pConfig->setValue(ConfigKey("[Controls]", "HotcueDefaultColorIndex"), -1);
+    }
 }

src/preferences/dialog/dlgprefcolorsdlg.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>524</width>
+    <width>656</width>
     <height>333</height>
    </rect>
   </property>
@@ -26,46 +26,50 @@
       <string>Colors</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
+      <item row="1" column="0">
        <widget class="QLabel" name="labelHotcueColors">
         <property name="text">
-         <string>Hotcues:</string>
+         <string>Hotcue palette</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="comboBoxHotcueColors"/>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="comboBoxHotcueColors">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelTrackColors">
+      <item row="3" column="0">
+       <widget class="QLabel" name="labelHotcueDefaultColor">
         <property name="text">
-         <string>Track:</string>
+         <string>Hotcue default color</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="comboBoxTrackColors"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="labelAutoHotcueColors">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelTrackColors">
         <property name="text">
-         <string>Auto hotcue colors</string>
-        </property>
-        <property name="buddy">
-         <cstring>checkBoxAssignHotcueColors</cstring>
+         <string>Track palette</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="checkBoxAssignHotcueColors">
-        <property name="toolTip">
-         <string>Automatically assigns a predefined color to a newly created hotcue point, based on its index.</string>
-        </property>
-        <property name="text">
-         <string>Assign predefined colors to newly created hotcue points</string>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxTrackColors">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
        </widget>
       </item>
+      <item row="3" column="1">
+       <widget class="QComboBox" name="comboBoxHotcueDefaultColor"/>
+      </item>
      </layout>
     </widget>
    </item>

src/util/color/predefinedcolorpalettes.cpp

@@ -122,6 +122,7 @@ const ColorPalette PredefinedColorPalettes::kMixxxHotcueColorPalette =
                         kColorMixxxPurple,
                         kColorMixxxPink,
                         kColorMixxxWhite,
+                        kSchemaMigrationReplacementColor,
                 });
 
 const ColorPalette PredefinedColorPalettes::kSeratoDJIntroHotcueColorPalette =