Fix Preferences Buttons

src/controllers/dlgprefcontrollers.cpp

@@ -57,6 +57,13 @@ void DlgPrefControllers::slotApply() {
     }
 }
 
+void DlgPrefControllers::slotResetToDefaults() {
+    // Update our sub-windows.
+    foreach (DlgPrefController* pControllerWindows, m_controllerWindows) {
+        pControllerWindows->slotResetToDefaults();
+    }
+}
+
 bool DlgPrefControllers::handleTreeItemClick(QTreeWidgetItem* clickedItem) {
     int controllerIndex = m_controllerTreeItems.indexOf(clickedItem);
     if (controllerIndex >= 0) {

src/controllers/dlgprefcontrollers.h

@@ -26,9 +26,14 @@ class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControlle
     bool handleTreeItemClick(QTreeWidgetItem* clickedItem);
 
   public slots:
+    /// Called when the preference dialog (not this page) is shown to the user.
     void slotUpdate();
+    /// Called when the user clicks the global "Apply" button.
     void slotApply();
+    /// Called when the user clicks the global "Cancel" button.
     void slotCancel();
+    /// Called when the user clicks the global "Reset to Defaults" button.
+    void slotResetToDefaults();
 
   private slots:
     void rescanControllers();

src/preferences/dialog/dlgprefcolors.cpp

@@ -27,8 +27,6 @@ DlgPrefColors::DlgPrefColors(
     comboBoxHotcueColors->setIconSize(kPalettePreviewSize);
     comboBoxTrackColors->setIconSize(kPalettePreviewSize);
 
-    loadSettings();
-
     connect(comboBoxHotcueColors,
             QOverload<const QString&>::of(&QComboBox::currentIndexChanged),
             this,
@@ -43,13 +41,15 @@ DlgPrefColors::DlgPrefColors(
             &QPushButton::clicked,
             this,
             &DlgPrefColors::slotEditTrackPaletteClicked);
+
+    slotUpdate();
 }
 
 DlgPrefColors::~DlgPrefColors() {
 }
 
 // Loads the config keys and sets the widgets in the dialog to match
-void DlgPrefColors::loadSettings() {
+void DlgPrefColors::slotUpdate() {
     comboBoxHotcueColors->clear();
     comboBoxTrackColors->clear();
     for (const auto& palette : qAsConst(mixxx::PredefinedColorPalettes::kPalettes)) {
@@ -264,15 +264,15 @@ void DlgPrefColors::trackPaletteUpdated(const QString& trackColors) {
     QString hotcueColors = comboBoxHotcueColors->currentText();
     int defaultColor = comboBoxHotcueDefaultColor->currentIndex();
 
-    loadSettings();
+    slotUpdate();
     restoreComboBoxes(hotcueColors, trackColors, defaultColor);
 }
 
 void DlgPrefColors::hotcuePaletteUpdated(const QString& hotcueColors) {
     QString trackColors = comboBoxTrackColors->currentText();
     int defaultColor = comboBoxHotcueDefaultColor->currentIndex();
 
-    loadSettings();
+    slotUpdate();
     restoreComboBoxes(hotcueColors, trackColors, defaultColor);
 }
 
@@ -281,7 +281,7 @@ void DlgPrefColors::palettesUpdated() {
     QString trackColors = comboBoxTrackColors->currentText();
     int defaultColor = comboBoxHotcueDefaultColor->currentIndex();
 
-    loadSettings();
+    slotUpdate();
     restoreComboBoxes(hotcueColors, trackColors, defaultColor);
 }
 

src/preferences/dialog/dlgprefcolors.h

@@ -17,16 +17,18 @@ class DlgPrefColors : public DlgPreferencePage, public Ui::DlgPrefColorsDlg {
     virtual ~DlgPrefColors();
 
   public slots:
-    // Apply changes to widget
+    /// Called when the preference dialog (not this page) is shown to the user.
+    void slotUpdate();
+    /// Called when the user clicks the global "Apply" button.
     void slotApply();
+    /// Called when the user clicks the global "Reset to Defaults" button.
     void slotResetToDefaults();
 
   signals:
     void apply(const QString&);
 
   private slots:
     void slotHotcuePaletteChanged(const QString& palette);
-    void loadSettings();
     void trackPaletteUpdated(const QString& palette);
     void hotcuePaletteUpdated(const QString& palette);
     void palettesUpdated();