From 66585a6cdabbd7a6775e289a19b4bb142dded3a1 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 18 Mar 2020 23:17:00 +0100
Subject: [PATCH 01/55] controllers/controllermanager: Make use of the
 getPresetPaths() function

---
 src/controllers/controllermanager.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index ec74976f7f5..51ded8c0669 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -119,11 +119,8 @@ void ControllerManager::slotInitialize() {
 
     // Initialize preset info parsers. This object is only for use in the main
     // thread. Do not touch it from within ControllerManager.
-    QStringList presetSearchPaths;
-    presetSearchPaths << userPresetsPath(m_pConfig)
-                      << resourcePresetsPath(m_pConfig);
     m_pMainThreadPresetEnumerator = QSharedPointer<PresetInfoEnumerator>(
-        new PresetInfoEnumerator(presetSearchPaths));
+            new PresetInfoEnumerator(getPresetPaths(m_pConfig)));
 
     // Instantiate all enumerators. Enumerators can take a long time to
     // construct since they interact with host MIDI APIs.

From 05f7ce4998ec0db221cd7bddab8ac72760abcc78 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 18 Mar 2020 23:20:39 +0100
Subject: [PATCH 02/55] controllers/controllermanager: Rename function to
 sanitizeString

---
 src/controllers/controllermanager.cpp | 17 ++++++++---------
 src/controllers/controllermanager.h   |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 51ded8c0669..b9fa4373523 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -218,7 +218,7 @@ void ControllerManager::slotSetUpDevices() {
         }
 
         // The filename for this device name.
-        QString presetBaseName = presetFilenameFromName(name);
+        QString presetBaseName = sanitizeString(name);
 
         // The first unique filename for this device (appends numbers at the end
         // if we have already seen a controller by this name on this run of
@@ -347,8 +347,8 @@ void ControllerManager::openController(Controller* pController) {
         pController->applyPreset(getPresetPaths(m_pConfig), true);
 
         // Update configuration to reflect controller is enabled.
-        m_pConfig->setValue(ConfigKey(
-            "[Controller]", presetFilenameFromName(pController->getName())), 1);
+        m_pConfig->setValue(
+                ConfigKey("[Controller]", sanitizeString(pController->getName())), 1);
     }
 }
 
@@ -359,8 +359,8 @@ void ControllerManager::closeController(Controller* pController) {
     pController->close();
     maybeStartOrStopPolling();
     // Update configuration to reflect controller is disabled.
-    m_pConfig->setValue(ConfigKey(
-        "[Controller]", presetFilenameFromName(pController->getName())), 0);
+    m_pConfig->setValue(
+            ConfigKey("[Controller]", sanitizeString(pController->getName())), 0);
 }
 
 bool ControllerManager::loadPreset(Controller* pController,
@@ -372,9 +372,8 @@ bool ControllerManager::loadPreset(Controller* pController,
     // Save the file path/name in the config so it can be auto-loaded at
     // startup next time
     m_pConfig->set(
-        ConfigKey("[ControllerPreset]",
-                  presetFilenameFromName(pController->getName())),
-        preset->filePath());
+            ConfigKey("[ControllerPreset]", sanitizeString(pController->getName())),
+            preset->filePath());
     return true;
 }
 
@@ -391,7 +390,7 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
         }
         QString name = pController->getName();
         QString filename = firstAvailableFilename(
-            filenames, presetFilenameFromName(name));
+                filenames, sanitizeString(name));
         QString presetPath = userPresetsPath(m_pConfig) + filename
                 + pController->presetExtension();
         if (!pController->savePreset(presetPath)) {
diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h
index 1fa873ba4bc..0f2c45d1265 100644
--- a/src/controllers/controllermanager.h
+++ b/src/controllers/controllermanager.h
@@ -85,7 +85,7 @@ class ControllerManager : public QObject {
     void stopPolling();
     void maybeStartOrStopPolling();
 
-    static QString presetFilenameFromName(QString name) {
+    static QString sanitizeString(QString name) {
         return name.replace(" ", "_").replace("/", "_").replace("\\", "_");
     }
 

From d7269cf75641da4aac415350a3591578114c8484 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 18 Mar 2020 23:24:50 +0100
Subject: [PATCH 03/55] controllers/controllermanager: Rework device setup code

---
 src/controllers/controllermanager.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index b9fa4373523..9a997652866 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -218,24 +218,24 @@ void ControllerManager::slotSetUpDevices() {
         }
 
         // The filename for this device name.
-        QString presetBaseName = sanitizeString(name);
+        QString deviceName = sanitizeString(name);
 
-        // The first unique filename for this device (appends numbers at the end
-        // if we have already seen a controller by this name on this run of
-        // Mixxx.
-        presetBaseName = firstAvailableFilename(filenames, presetBaseName);
-
-        ControllerPresetPointer pPreset =
-                ControllerPresetFileHandler::loadPreset(
-                    presetBaseName + pController->presetExtension(),
-                    getPresetPaths(m_pConfig));
+        if (m_pConfig->getValueString(ConfigKey("[Controller]", deviceName)) != "1") {
+            continue;
+        }
 
-        if (!loadPreset(pController, pPreset)) {
-            // TODO(XXX) : auto load midi preset here.
+        QString presetFile = m_pConfig->getValueString(
+                ConfigKey("[ControllerPreset]", deviceName));
+        if (presetFile.isEmpty()) {
             continue;
         }
 
-        if (m_pConfig->getValueString(ConfigKey("[Controller]", presetBaseName)) != "1") {
+        ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset(
+                presetFile,
+                getPresetPaths(m_pConfig));
+
+        if (!loadPreset(pController, pPreset)) {
+            // TODO(XXX) : auto load midi preset here.
             continue;
         }
 

From 88132126a85c433e031420857fc643556454af47 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 19 Mar 2020 09:23:34 +0100
Subject: [PATCH 04/55] controllers: Preselect configured mapping in
 preferences if available

---
 src/controllers/controllermanager.cpp |  8 +++++---
 src/controllers/controllermanager.h   |  1 +
 src/controllers/dlgprefcontroller.cpp | 18 ++++++++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 9a997652866..8b89af3e5a3 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -202,6 +202,10 @@ QList<Controller*> ControllerManager::getControllerList(bool bOutputDevices, boo
     return filteredDeviceList;
 }
 
+QString ControllerManager::getConfiguredPresetFileForDevice(QString name) {
+    return m_pConfig->getValueString(ConfigKey("[ControllerPreset]", sanitizeString(name)));
+}
+
 void ControllerManager::slotSetUpDevices() {
     qDebug() << "ControllerManager: Setting up devices";
 
@@ -219,13 +223,11 @@ void ControllerManager::slotSetUpDevices() {
 
         // The filename for this device name.
         QString deviceName = sanitizeString(name);
-
         if (m_pConfig->getValueString(ConfigKey("[Controller]", deviceName)) != "1") {
             continue;
         }
 
-        QString presetFile = m_pConfig->getValueString(
-                ConfigKey("[ControllerPreset]", deviceName));
+        QString presetFile = getConfiguredPresetFileForDevice(deviceName);
         if (presetFile.isEmpty()) {
             continue;
         }
diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h
index 0f2c45d1265..03275338946 100644
--- a/src/controllers/controllermanager.h
+++ b/src/controllers/controllermanager.h
@@ -36,6 +36,7 @@ class ControllerManager : public QObject {
     QSharedPointer<PresetInfoEnumerator> getMainThreadPresetEnumerator() {
         return m_pMainThreadPresetEnumerator;
     }
+    QString getConfiguredPresetFileForDevice(QString name);
 
     // Prevent other parts of Mixxx from having to manually connect to our slots
     void setUpDevices() { emit requestSetUpDevices(); };
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 6217a12f13a..729e041447e 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -261,12 +261,18 @@ void DlgPrefController::enumeratePresets() {
         }
     }
 
-    // Jump to matching device in list if it was found.
-    if (match.isValid()) {
-        int index = m_ui.comboBoxPreset->findText(match.getName());
-        if (index != -1) {
-            m_ui.comboBoxPreset->setCurrentIndex(index);
-        }
+    QString configuredPresetFile = m_pControllerManager->getConfiguredPresetFileForDevice(
+            m_pController->getName());
+
+    // Preselect configured or matching preset
+    int index = -1;
+    if (!configuredPresetFile.isEmpty()) {
+        index = m_ui.comboBoxPreset->findData(configuredPresetFile);
+    } else if (match.isValid()) {
+        index = m_ui.comboBoxPreset->findText(match.getName());
+    }
+    if (index != -1) {
+        m_ui.comboBoxPreset->setCurrentIndex(index);
     }
 }
 

From 29b1df889991d63772c9a5c4d8627d66cd05bbdd Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 19 Mar 2020 15:00:50 +0100
Subject: [PATCH 05/55] controllers/dlgprefcontroller: Fix reset of combobox
 item on apply

---
 src/controllers/dlgprefcontroller.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 729e041447e..1ea7ad97ba0 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -340,9 +340,6 @@ void DlgPrefController::slotApply() {
         // the same preset.
         emit loadPreset(m_pController, m_pPreset);
 
-        //Select the "..." item again in the combobox.
-        m_ui.comboBoxPreset->setCurrentIndex(0);
-
         bool wantEnabled = m_ui.chkEnabledDevice->isChecked();
         bool enabled = m_pController->isOpen();
         if (wantEnabled && !enabled) {

From 2e314f547ded3074db6be443bed35c5ade585cfb Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 19 Mar 2020 13:50:45 +0100
Subject: [PATCH 06/55] controllers/controllerpresetinfo: Remove unused header
 file

---
 src/controllers/controllerpresetinfo.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/controllers/controllerpresetinfo.cpp b/src/controllers/controllerpresetinfo.cpp
index 3e8c1d581f4..bf0051209af 100644
--- a/src/controllers/controllerpresetinfo.cpp
+++ b/src/controllers/controllerpresetinfo.cpp
@@ -10,7 +10,6 @@
 */
 
 #include "controllers/controllerpresetinfo.h"
-#include "controllers/controllerpresetinfoenumerator.h"
 
 #include "controllers/defs_controllers.h"
 #include "util/xml.h"

From bc92e0ddb172f9eca3f4a1327424dddcaac8dd2e Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 19 Mar 2020 13:51:12 +0100
Subject: [PATCH 07/55] controllers/dlgprefcontroller: Separate user and system
 presets

---
 src/controllers/controllermanager.cpp |  6 ++--
 src/controllers/controllermanager.h   | 10 ++++--
 src/controllers/dlgprefcontroller.cpp | 50 +++++++++++++++++++--------
 3 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 8b89af3e5a3..499798a690f 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -119,8 +119,10 @@ void ControllerManager::slotInitialize() {
 
     // Initialize preset info parsers. This object is only for use in the main
     // thread. Do not touch it from within ControllerManager.
-    m_pMainThreadPresetEnumerator = QSharedPointer<PresetInfoEnumerator>(
-            new PresetInfoEnumerator(getPresetPaths(m_pConfig)));
+    m_pMainThreadUserPresetEnumerator = QSharedPointer<PresetInfoEnumerator>(
+            new PresetInfoEnumerator(QStringList{userPresetsPath(m_pConfig)}));
+    m_pMainThreadSystemPresetEnumerator = QSharedPointer<PresetInfoEnumerator>(
+            new PresetInfoEnumerator(QStringList{resourcePresetsPath(m_pConfig)}));
 
     // Instantiate all enumerators. Enumerators can take a long time to
     // construct since they interact with host MIDI APIs.
diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h
index 03275338946..e291327dd2e 100644
--- a/src/controllers/controllermanager.h
+++ b/src/controllers/controllermanager.h
@@ -33,8 +33,11 @@ class ControllerManager : public QObject {
     QList<Controller*> getControllers() const;
     QList<Controller*> getControllerList(bool outputDevices=true, bool inputDevices=true);
     ControllerLearningEventFilter* getControllerLearningEventFilter() const;
-    QSharedPointer<PresetInfoEnumerator> getMainThreadPresetEnumerator() {
-        return m_pMainThreadPresetEnumerator;
+    QSharedPointer<PresetInfoEnumerator> getMainThreadUserPresetEnumerator() {
+        return m_pMainThreadUserPresetEnumerator;
+    }
+    QSharedPointer<PresetInfoEnumerator> getMainThreadSystemPresetEnumerator() {
+        return m_pMainThreadSystemPresetEnumerator;
     }
     QString getConfiguredPresetFileForDevice(QString name);
 
@@ -98,7 +101,8 @@ class ControllerManager : public QObject {
     QList<ControllerEnumerator*> m_enumerators;
     QList<Controller*> m_controllers;
     QThread* m_pThread;
-    QSharedPointer<PresetInfoEnumerator> m_pMainThreadPresetEnumerator;
+    QSharedPointer<PresetInfoEnumerator> m_pMainThreadUserPresetEnumerator;
+    QSharedPointer<PresetInfoEnumerator> m_pMainThreadSystemPresetEnumerator;
     bool m_skipPoll;
 };
 
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 1ea7ad97ba0..0e35ebd95a6 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -239,25 +239,45 @@ void DlgPrefController::enumeratePresets() {
     // user has their controller plugged in)
     m_ui.comboBoxPreset->addItem("...");
 
-    // Ask the controller manager for a list of applicable presets
-    QSharedPointer<PresetInfoEnumerator> pie =
-            m_pControllerManager->getMainThreadPresetEnumerator();
+    QList<PresetInfo> presets;
+    PresetInfo match;
 
-    // Not ready yet. Should be rare. We will re-enumerate on the next open of
-    // the preferences.
-    if (pie.isNull()) {
-        return;
+    // Ask the controller manager for a list of applicable user presets
+    QSharedPointer<PresetInfoEnumerator> userPresetEnumerator =
+            m_pControllerManager->getMainThreadUserPresetEnumerator();
+    // Check if enumerator is ready. Should be rare. We will re-enumerate on
+    // the next open of the preferences.
+    if (!userPresetEnumerator.isNull()) {
+        // Making the list of presets in the alphabetical order
+        QList<PresetInfo> userPresets = userPresetEnumerator->getPresetsByExtension(
+                m_pController->presetExtension());
+
+        for (const PresetInfo& preset : userPresets) {
+            m_ui.comboBoxPreset->addItem(preset.getName(), preset.getPath());
+            if (m_pController->matchPreset(preset)) {
+                match = preset;
+            }
+        }
     }
 
-    // Making the list of presets in the alphabetical order
-    QList<PresetInfo> presets = pie->getPresetsByExtension(
-        m_pController->presetExtension());
+    // Insert a separator between user presets (+ dummy item) and system presets
+    m_ui.comboBoxPreset->insertSeparator(m_ui.comboBoxPreset->count());
 
-    PresetInfo match;
-    for (const PresetInfo& preset : presets) {
-        m_ui.comboBoxPreset->addItem(preset.getName(), preset.getPath());
-        if (m_pController->matchPreset(preset)) {
-            match = preset;
+    // Ask the controller manager for a list of applicable system presets
+    QSharedPointer<PresetInfoEnumerator> systemPresetEnumerator =
+            m_pControllerManager->getMainThreadSystemPresetEnumerator();
+    // Check if enumerator is ready. Should be rare. We will re-enumerate on
+    // the next open of the preferences.
+    if (!systemPresetEnumerator.isNull()) {
+        // Making the list of presets in the alphabetical order
+        QList<PresetInfo> systemPresets = systemPresetEnumerator->getPresetsByExtension(
+                m_pController->presetExtension());
+
+        for (const PresetInfo& preset : systemPresets) {
+            m_ui.comboBoxPreset->addItem(preset.getName(), preset.getPath());
+            if (m_pController->matchPreset(preset)) {
+                match = preset;
+            }
         }
     }
 

From 2730b6abc3ca1e4a20c57b55cb6d61ba445ec86f Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 19 Mar 2020 15:49:57 +0100
Subject: [PATCH 08/55] controllers/controllermanager: Always write preset to
 config on exit

---
 src/controllers/controllermanager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 499798a690f..2843f5371a8 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -392,15 +392,15 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
         if (onlyActive && !pController->isOpen()) {
             continue;
         }
-        QString name = pController->getName();
-        QString filename = firstAvailableFilename(
-                filenames, sanitizeString(name));
+        QString deviceName = sanitizeString(pController->getName());
+        QString filename = firstAvailableFilename(filenames, deviceName);
         QString presetPath = userPresetsPath(m_pConfig) + filename
                 + pController->presetExtension();
         if (!pController->savePreset(presetPath)) {
             qWarning() << "Failed to write preset for device"
-                       << name << "to" << presetPath;
+                       << deviceName << "to" << presetPath;
         }
+        m_pConfig->set(ConfigKey("[ControllerPreset]", deviceName), presetPath);
     }
 }
 

From 8b46ef0a008911fbce83951fc51fb72e927e00e2 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 19 Mar 2020 16:53:35 +0100
Subject: [PATCH 09/55] controllers/midi: Make MidiControllerPreset's mappings
 private

---
 .../controllerinputmappingtablemodel.cpp      | 11 ++---
 .../controlleroutputmappingtablemodel.cpp     | 11 ++---
 src/controllers/midi/midicontroller.cpp       | 26 ++++++-----
 src/controllers/midi/midicontrollerpreset.h   | 43 ++++++++++++++++++-
 .../midi/midicontrollerpresetfilehandler.cpp  | 18 ++++----
 src/test/midicontrollertest.cpp               |  2 +-
 6 files changed, 79 insertions(+), 32 deletions(-)

diff --git a/src/controllers/controllerinputmappingtablemodel.cpp b/src/controllers/controllerinputmappingtablemodel.cpp
index 456e0556307..237cda87745 100644
--- a/src/controllers/controllerinputmappingtablemodel.cpp
+++ b/src/controllers/controllerinputmappingtablemodel.cpp
@@ -18,12 +18,13 @@ void ControllerInputMappingTableModel::apply() {
     if (m_pMidiPreset != NULL) {
         // Clear existing input mappings and insert all the input mappings in
         // the table into the preset.
-        m_pMidiPreset->inputMappings.clear();
+        QHash<uint16_t, MidiInputMapping> mappings;
         foreach (const MidiInputMapping& mapping, m_midiInputMappings) {
             // Use insertMulti because we support multiple inputs mappings for
             // the same input MidiKey.
-            m_pMidiPreset->inputMappings.insertMulti(mapping.key.key, mapping);
+            mappings.insertMulti(mapping.key.key, mapping);
         }
+        m_pMidiPreset->setInputMappings(mappings);
     }
 }
 
@@ -39,9 +40,9 @@ void ControllerInputMappingTableModel::onPresetLoaded() {
         setHeaderData(MIDI_COLUMN_ACTION, Qt::Horizontal, tr("Action"));
         setHeaderData(MIDI_COLUMN_COMMENT, Qt::Horizontal, tr("Comment"));
 
-        if (!m_pMidiPreset->inputMappings.isEmpty()) {
-            beginInsertRows(QModelIndex(), 0, m_pMidiPreset->inputMappings.size() - 1);
-            m_midiInputMappings = m_pMidiPreset->inputMappings.values();
+        if (!m_pMidiPreset->getInputMappings().isEmpty()) {
+            beginInsertRows(QModelIndex(), 0, m_pMidiPreset->getInputMappings().size() - 1);
+            m_midiInputMappings = m_pMidiPreset->getInputMappings().values();
             endInsertRows();
         }
     }
diff --git a/src/controllers/controlleroutputmappingtablemodel.cpp b/src/controllers/controlleroutputmappingtablemodel.cpp
index 7dc3756e414..253aa412d6d 100644
--- a/src/controllers/controlleroutputmappingtablemodel.cpp
+++ b/src/controllers/controlleroutputmappingtablemodel.cpp
@@ -18,12 +18,13 @@ void ControllerOutputMappingTableModel::apply() {
     if (m_pMidiPreset != NULL) {
         // Clear existing output mappings and insert all the output mappings in
         // the table into the preset.
-        m_pMidiPreset->outputMappings.clear();
+        QHash<ConfigKey, MidiOutputMapping> mappings;
         foreach (const MidiOutputMapping& mapping, m_midiOutputMappings) {
             // Use insertMulti because we support multiple outputs from the same
             // control.
-            m_pMidiPreset->outputMappings.insertMulti(mapping.controlKey, mapping);
+            mappings.insertMulti(mapping.controlKey, mapping);
         }
+        m_pMidiPreset->setOutputMappings(mappings);
     }
 }
 
@@ -42,9 +43,9 @@ void ControllerOutputMappingTableModel::onPresetLoaded() {
         setHeaderData(MIDI_COLUMN_MAX, Qt::Horizontal, tr("On Range Max"));
         setHeaderData(MIDI_COLUMN_COMMENT, Qt::Horizontal, tr("Comment"));
 
-        if (!m_pMidiPreset->outputMappings.isEmpty()) {
-            beginInsertRows(QModelIndex(), 0, m_pMidiPreset->outputMappings.size() - 1);
-            m_midiOutputMappings = m_pMidiPreset->outputMappings.values();
+        if (!m_pMidiPreset->getOutputMappings().isEmpty()) {
+            beginInsertRows(QModelIndex(), 0, m_pMidiPreset->getOutputMappings().size() - 1);
+            m_midiOutputMappings = m_pMidiPreset->getOutputMappings().values();
             endInsertRows();
         }
     }
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
index 877897f00f1..2f613c954ba 100644
--- a/src/controllers/midi/midicontroller.cpp
+++ b/src/controllers/midi/midicontroller.cpp
@@ -75,11 +75,11 @@ bool MidiController::applyPreset(QList<QString> scriptPaths, bool initializeScri
 }
 
 void MidiController::createOutputHandlers() {
-    if (m_preset.outputMappings.isEmpty()) {
+    if (m_preset.getOutputMappings().isEmpty()) {
         return;
     }
 
-    QHashIterator<ConfigKey, MidiOutputMapping> outIt(m_preset.outputMappings);
+    QHashIterator<ConfigKey, MidiOutputMapping> outIt(m_preset.getOutputMappings());
     QStringList failures;
     while (outIt.hasNext()) {
         outIt.next();
@@ -185,15 +185,19 @@ void MidiController::clearTemporaryInputMappings() {
 void MidiController::commitTemporaryInputMappings() {
     // We want to replace duplicates that exist in m_preset but allow duplicates
     // in m_temporaryInputMappings. To do this, we first remove every key in
-    // m_temporaryInputMappings from m_preset.inputMappings.
+    // m_temporaryInputMappings from m_preset's input mappings.
     for (auto it = m_temporaryInputMappings.constBegin();
          it != m_temporaryInputMappings.constEnd(); ++it) {
-        m_preset.inputMappings.remove(it.key());
+        m_preset.removeInputMapping(it.key());
     }
 
-    // Now, we can just use unite since we manually removed the duplicates in
-    // the original set.
-    m_preset.inputMappings.unite(m_temporaryInputMappings);
+    // Now, we can just use add all mappings from m_temporaryInputMappings
+    // since we removed the duplicates in the original set.
+    for (auto it = m_temporaryInputMappings.constBegin();
+            it != m_temporaryInputMappings.constEnd();
+            ++it) {
+        m_preset.addInputMapping(it.key(), it.value());
+    }
     m_temporaryInputMappings.clear();
 }
 
@@ -219,8 +223,8 @@ void MidiController::receive(unsigned char status, unsigned char control,
         }
     }
 
-    auto it = m_preset.inputMappings.constFind(mappingKey.key);
-    for (; it != m_preset.inputMappings.constEnd() && it.key() == mappingKey.key; ++it) {
+    auto it = m_preset.getInputMappings().constFind(mappingKey.key);
+    for (; it != m_preset.getInputMappings().constEnd() && it.key() == mappingKey.key; ++it) {
         processInputMapping(it.value(), status, control, value, timestamp);
     }
 }
@@ -470,8 +474,8 @@ void MidiController::receive(QByteArray data, mixxx::Duration timestamp) {
         }
     }
 
-    auto it = m_preset.inputMappings.constFind(mappingKey.key);
-    for (; it != m_preset.inputMappings.constEnd() && it.key() == mappingKey.key; ++it) {
+    auto it = m_preset.getInputMappings().constFind(mappingKey.key);
+    for (; it != m_preset.getInputMappings().constEnd() && it.key() == mappingKey.key; ++it) {
         processInputMapping(it.value(), data, timestamp);
     }
 }
diff --git a/src/controllers/midi/midicontrollerpreset.h b/src/controllers/midi/midicontrollerpreset.h
index 12ef6f0a13d..4bc131daba7 100644
--- a/src/controllers/midi/midicontrollerpreset.h
+++ b/src/controllers/midi/midicontrollerpreset.h
@@ -39,9 +39,48 @@ class MidiControllerPreset : public ControllerPreset {
         return true;
     }
 
+    void addInputMapping(uint16_t key, MidiInputMapping mapping) {
+        m_inputMappings.insertMulti(key, mapping);
+    }
+
+    void removeInputMapping(uint16_t key) {
+        m_inputMappings.remove(key);
+    }
+
+    const QHash<uint16_t, MidiInputMapping>& getInputMappings() const {
+        return m_inputMappings;
+    }
+
+    void setInputMappings(const QHash<uint16_t, MidiInputMapping>& mappings) {
+        if (m_inputMappings != mappings) {
+            m_inputMappings.clear();
+            m_inputMappings.unite(mappings);
+        }
+    }
+
+    void addOutputMapping(ConfigKey key, MidiOutputMapping mapping) {
+        m_outputMappings.insertMulti(key, mapping);
+    }
+
+    void removeOutputMapping(ConfigKey key) {
+        m_outputMappings.remove(key);
+    }
+
+    const QHash<ConfigKey, MidiOutputMapping>& getOutputMappings() const {
+        return m_outputMappings;
+    }
+
+    void setOutputMappings(const QHash<ConfigKey, MidiOutputMapping>& mappings) {
+        if (m_outputMappings != mappings) {
+            m_outputMappings.clear();
+            m_outputMappings.unite(mappings);
+        }
+    }
+
+  private:
     // MIDI input and output mappings.
-    QHash<uint16_t, MidiInputMapping> inputMappings;
-    QHash<ConfigKey, MidiOutputMapping> outputMappings;
+    QHash<uint16_t, MidiInputMapping> m_inputMappings;
+    QHash<ConfigKey, MidiOutputMapping> m_outputMappings;
 };
 
 #endif
diff --git a/src/controllers/midi/midicontrollerpresetfilehandler.cpp b/src/controllers/midi/midicontrollerpresetfilehandler.cpp
index 32e01244768..dc90812b8f6 100644
--- a/src/controllers/midi/midicontrollerpresetfilehandler.cpp
+++ b/src/controllers/midi/midicontrollerpresetfilehandler.cpp
@@ -101,7 +101,7 @@ ControllerPresetPointer MidiControllerPresetFileHandler::load(const QDomElement
 
         // Use insertMulti because we support multiple inputs mappings for the
         // same input MidiKey.
-        preset->inputMappings.insertMulti(mapping.key.key, mapping);
+        preset->addInputMapping(mapping.key.key, mapping);
         control = control.nextSiblingElement("control");
     }
 
@@ -181,7 +181,7 @@ ControllerPresetPointer MidiControllerPresetFileHandler::load(const QDomElement
 
         // Use insertMulti because we support multiple outputs from the same
         // control.
-        preset->outputMappings.insertMulti(mapping.controlKey, mapping);
+        preset->addOutputMapping(mapping.controlKey, mapping);
 
         output = output.nextSiblingElement("output");
     }
@@ -209,11 +209,12 @@ void MidiControllerPresetFileHandler::addControlsToDocument(const MidiController
     QDomElement controls = doc->createElement("controls");
     // We will iterate over all of the values that have the same keys, so we need
     // to remove duplicate keys or else we'll duplicate those values.
-    auto sortedInputKeys = preset.inputMappings.uniqueKeys();
+    auto sortedInputKeys = preset.getInputMappings().uniqueKeys();
     std::sort(sortedInputKeys.begin(), sortedInputKeys.end());
     for (const auto& key : sortedInputKeys) {
-        for (auto it = preset.inputMappings.constFind(key);
-                it != preset.inputMappings.constEnd() && it.key() == key; ++it) {
+        for (auto it = preset.getInputMappings().constFind(key);
+                it != preset.getInputMappings().constEnd() && it.key() == key;
+                ++it) {
             QDomElement controlNode = inputMappingToXML(doc, it.value());
             controls.appendChild(controlNode);
         }
@@ -223,11 +224,12 @@ void MidiControllerPresetFileHandler::addControlsToDocument(const MidiController
 
     // Repeat the process for the output mappings.
     QDomElement outputs = doc->createElement("outputs");
-    auto sortedOutputKeys = preset.outputMappings.uniqueKeys();
+    auto sortedOutputKeys = preset.getOutputMappings().uniqueKeys();
     std::sort(sortedOutputKeys.begin(), sortedOutputKeys.end());
     for (const auto& key : sortedOutputKeys) {
-        for (auto it = preset.outputMappings.constFind(key);
-                it != preset.outputMappings.constEnd() && it.key() == key; ++it) {
+        for (auto it = preset.getOutputMappings().constFind(key);
+                it != preset.getOutputMappings().constEnd() && it.key() == key;
+                ++it) {
             QDomElement outputNode = outputMappingToXML(doc, it.value());
             outputs.appendChild(outputNode);
         }
diff --git a/src/test/midicontrollertest.cpp b/src/test/midicontrollertest.cpp
index ac520908638..1e44a89e850 100644
--- a/src/test/midicontrollertest.cpp
+++ b/src/test/midicontrollertest.cpp
@@ -33,7 +33,7 @@ class MidiControllerTest : public MixxxTest {
     }
 
     void addMapping(MidiInputMapping mapping) {
-        m_preset.inputMappings.insertMulti(mapping.key.key, mapping);
+        m_preset.addInputMapping(mapping.key.key, mapping);
     }
 
     void loadPreset(const MidiControllerPreset& preset) {

From 436cd8809a58e8327885c2663478327b9ca407b0 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 19 Mar 2020 17:15:57 +0100
Subject: [PATCH 10/55] controllers: Only write preset to user directory if
 it's dirty

---
 src/controllers/controllermanager.cpp         | 10 ++++++++
 src/controllers/controllerpreset.h            | 25 ++++++++++++++++++-
 .../controllerpresetfilehandler.cpp           |  8 +++---
 src/controllers/midi/midicontrollerpreset.h   |  6 +++++
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 2843f5371a8..2d2f594e188 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -392,7 +392,17 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
         if (onlyActive && !pController->isOpen()) {
             continue;
         }
+        ControllerPresetPointer pPreset = pController->getPreset();
+        DEBUG_ASSERT(!pPreset);
+
         QString deviceName = sanitizeString(pController->getName());
+        if (!pPreset->isDirty()) {
+            qWarning()
+                    << "Preset for device" << deviceName
+                    << "is not dirty, no need to save it to the user presets.";
+            continue;
+        }
+
         QString filename = firstAvailableFilename(filenames, deviceName);
         QString presetPath = userPresetsPath(m_pConfig) + filename
                 + pController->presetExtension();
diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h
index ad4019632e1..19fcfefad9e 100644
--- a/src/controllers/controllerpreset.h
+++ b/src/controllers/controllerpreset.h
@@ -21,7 +21,9 @@ class ConstControllerPresetVisitor;
 
 class ControllerPreset {
   public:
-    ControllerPreset() {}
+    ControllerPreset()
+            : m_bDirty(false) {
+    }
     virtual ~ControllerPreset() {}
 
     struct ScriptFileInfo {
@@ -47,10 +49,20 @@ class ControllerPreset {
         info.functionPrefix = functionprefix;
         info.builtin = builtin;
         scripts.append(info);
+        setDirty(true);
+    }
+
+    inline void setDirty(bool bDirty) {
+        m_bDirty = bDirty;
+    }
+
+    inline bool isDirty() const {
+        return m_bDirty;
     }
 
     inline void setDeviceId(const QString id) {
         m_deviceId = id;
+        setDirty(true);
     }
 
     inline QString deviceId() const {
@@ -59,6 +71,7 @@ class ControllerPreset {
 
     inline void setFilePath(const QString filePath) {
         m_filePath = filePath;
+        setDirty(true);
     }
 
     inline QString filePath() const {
@@ -67,6 +80,7 @@ class ControllerPreset {
 
     inline void setName(const QString name) {
         m_name = name;
+        setDirty(true);
     }
 
     inline QString name() const {
@@ -75,6 +89,7 @@ class ControllerPreset {
 
     inline void setAuthor(const QString author) {
         m_author = author;
+        setDirty(true);
     }
 
     inline QString author() const {
@@ -83,6 +98,7 @@ class ControllerPreset {
 
     inline void setDescription(const QString description) {
         m_description = description;
+        setDirty(true);
     }
 
     inline QString description() const {
@@ -91,6 +107,7 @@ class ControllerPreset {
 
     inline void setForumLink(const QString forumlink) {
         m_forumlink = forumlink;
+        setDirty(true);
     }
 
     inline QString forumlink() const {
@@ -99,6 +116,7 @@ class ControllerPreset {
 
     inline void setWikiLink(const QString wikilink) {
         m_wikilink = wikilink;
+        setDirty(true);
     }
 
     inline QString wikilink() const {
@@ -107,6 +125,7 @@ class ControllerPreset {
 
     inline void setSchemaVersion(const QString schemaVersion) {
         m_schemaVersion = schemaVersion;
+        setDirty(true);
     }
 
     inline QString schemaVersion() const {
@@ -115,6 +134,7 @@ class ControllerPreset {
 
     inline void setMixxxVersion(const QString mixxxVersion) {
         m_mixxxVersion = mixxxVersion;
+        setDirty(true);
     }
 
     inline QString mixxxVersion() const {
@@ -123,6 +143,7 @@ class ControllerPreset {
 
     inline void addProductMatch(QHash<QString,QString> match) {
         m_productMatches.append(match);
+        setDirty(true);
     }
 
     virtual void accept(ControllerPresetVisitor* visitor) = 0;
@@ -134,6 +155,8 @@ class ControllerPreset {
     QList< QHash<QString,QString> > m_productMatches;
 
   private:
+    bool m_bDirty;
+
     QString m_deviceId;
     QString m_filePath;
     QString m_name;
diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp
index f50b8bd1b23..22e045bef52 100644
--- a/src/controllers/controllerpresetfilehandler.cpp
+++ b/src/controllers/controllerpresetfilehandler.cpp
@@ -45,9 +45,11 @@ ControllerPresetPointer ControllerPresetFileHandler::loadPreset(const QString& p
         return ControllerPresetPointer();
     }
 
-    // NOTE(rryan): We don't provide a device name. It's unused currently.
-    // TODO(rryan): Delete pHandler.
-    return pHandler->load(scriptPath, QString());
+    ControllerPresetPointer pPreset = pHandler->load(scriptPath, QString());
+    if (pPreset) {
+        pPreset->setDirty(false);
+    }
+    return pPreset;
 }
 
 ControllerPresetPointer ControllerPresetFileHandler::load(const QString path,
diff --git a/src/controllers/midi/midicontrollerpreset.h b/src/controllers/midi/midicontrollerpreset.h
index 4bc131daba7..1c25659059b 100644
--- a/src/controllers/midi/midicontrollerpreset.h
+++ b/src/controllers/midi/midicontrollerpreset.h
@@ -41,10 +41,12 @@ class MidiControllerPreset : public ControllerPreset {
 
     void addInputMapping(uint16_t key, MidiInputMapping mapping) {
         m_inputMappings.insertMulti(key, mapping);
+        setDirty(true);
     }
 
     void removeInputMapping(uint16_t key) {
         m_inputMappings.remove(key);
+        setDirty(true);
     }
 
     const QHash<uint16_t, MidiInputMapping>& getInputMappings() const {
@@ -55,15 +57,18 @@ class MidiControllerPreset : public ControllerPreset {
         if (m_inputMappings != mappings) {
             m_inputMappings.clear();
             m_inputMappings.unite(mappings);
+            setDirty(true);
         }
     }
 
     void addOutputMapping(ConfigKey key, MidiOutputMapping mapping) {
         m_outputMappings.insertMulti(key, mapping);
+        setDirty(true);
     }
 
     void removeOutputMapping(ConfigKey key) {
         m_outputMappings.remove(key);
+        setDirty(true);
     }
 
     const QHash<ConfigKey, MidiOutputMapping>& getOutputMappings() const {
@@ -74,6 +79,7 @@ class MidiControllerPreset : public ControllerPreset {
         if (m_outputMappings != mappings) {
             m_outputMappings.clear();
             m_outputMappings.unite(mappings);
+            setDirty(true);
         }
     }
 

From 7f08658ad8170afbbed91abd649417fd4486c739 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 19 Mar 2020 17:31:22 +0100
Subject: [PATCH 11/55] controllers/dlgprefcontroller: Don't import scripts
 into user directory

---
 src/controllers/dlgprefcontroller.cpp | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 0e35ebd95a6..92882863964 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -394,27 +394,6 @@ void DlgPrefController::slotLoadPreset(int chosenIndex) {
         return;
     }
 
-    // Import the preset scripts to the user scripts folder.
-    for (QList<ControllerPreset::ScriptFileInfo>::iterator it =
-                 pPreset->scripts.begin(); it != pPreset->scripts.end(); ++it) {
-        // No need to import builtin scripts.
-        if (it->builtin) {
-            continue;
-        }
-
-        QString scriptPath = ControllerManager::getAbsolutePath(
-                it->name, presetDirs);
-
-
-        QString importedScriptFileName;
-        // If a conflict exists then importScript will provide a new filename to
-        // use. If importing fails then load the preset anyway without the
-        // import.
-        if (m_pControllerManager->importScript(scriptPath, &importedScriptFileName)) {
-            it->name = importedScriptFileName;
-        }
-    }
-
     // TODO(rryan): We really should not load the preset here. We should load it
     // into the preferences GUI and then load it to the actual controller once
     // the user hits apply.

From d94a183f79c93f7604692ce9f5f0f1e8cf63e1d4 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 6 Apr 2020 15:13:55 +0200
Subject: [PATCH 12/55] controllers/controllermanager: Rename sanitizeString
 and move to anon NS

---
 src/controllers/controllermanager.cpp | 19 +++++++++++++------
 src/controllers/controllermanager.h   |  4 ----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 2d2f594e188..a6ff633c0b2 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -39,6 +39,12 @@ const int kPollIntervalMillis = 5;
 const int kPollIntervalMillis = 1;
 #endif
 
+// Strip slashes and spaces from device name, so that it can be used as config
+// key or a filename.
+QString sanitizeDeviceName(QString name) {
+    return name.replace(" ", "_").replace("/", "_").replace("\\", "_");
+}
+
 } // anonymous namespace
 
 QString firstAvailableFilename(QSet<QString>& filenames,
@@ -205,7 +211,7 @@ QList<Controller*> ControllerManager::getControllerList(bool bOutputDevices, boo
 }
 
 QString ControllerManager::getConfiguredPresetFileForDevice(QString name) {
-    return m_pConfig->getValueString(ConfigKey("[ControllerPreset]", sanitizeString(name)));
+    return m_pConfig->getValueString(ConfigKey("[ControllerPreset]", sanitizeDeviceName(name)));
 }
 
 void ControllerManager::slotSetUpDevices() {
@@ -224,7 +230,7 @@ void ControllerManager::slotSetUpDevices() {
         }
 
         // The filename for this device name.
-        QString deviceName = sanitizeString(name);
+        QString deviceName = sanitizeDeviceName(name);
         if (m_pConfig->getValueString(ConfigKey("[Controller]", deviceName)) != "1") {
             continue;
         }
@@ -352,7 +358,7 @@ void ControllerManager::openController(Controller* pController) {
 
         // Update configuration to reflect controller is enabled.
         m_pConfig->setValue(
-                ConfigKey("[Controller]", sanitizeString(pController->getName())), 1);
+                ConfigKey("[Controller]", sanitizeDeviceName(pController->getName())), 1);
     }
 }
 
@@ -364,7 +370,7 @@ void ControllerManager::closeController(Controller* pController) {
     maybeStartOrStopPolling();
     // Update configuration to reflect controller is disabled.
     m_pConfig->setValue(
-            ConfigKey("[Controller]", sanitizeString(pController->getName())), 0);
+            ConfigKey("[Controller]", sanitizeDeviceName(pController->getName())), 0);
 }
 
 bool ControllerManager::loadPreset(Controller* pController,
@@ -376,7 +382,7 @@ bool ControllerManager::loadPreset(Controller* pController,
     // Save the file path/name in the config so it can be auto-loaded at
     // startup next time
     m_pConfig->set(
-            ConfigKey("[ControllerPreset]", sanitizeString(pController->getName())),
+            ConfigKey("[ControllerPreset]", sanitizeDeviceName(pController->getName())),
             preset->filePath());
     return true;
 }
@@ -392,10 +398,11 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
         if (onlyActive && !pController->isOpen()) {
             continue;
         }
+
         ControllerPresetPointer pPreset = pController->getPreset();
         DEBUG_ASSERT(!pPreset);
 
-        QString deviceName = sanitizeString(pController->getName());
+        QString deviceName = sanitizeDeviceName(pController->getName());
         if (!pPreset->isDirty()) {
             qWarning()
                     << "Preset for device" << deviceName
diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h
index e291327dd2e..dae740ee713 100644
--- a/src/controllers/controllermanager.h
+++ b/src/controllers/controllermanager.h
@@ -89,10 +89,6 @@ class ControllerManager : public QObject {
     void stopPolling();
     void maybeStartOrStopPolling();
 
-    static QString sanitizeString(QString name) {
-        return name.replace(" ", "_").replace("/", "_").replace("\\", "_");
-    }
-
   private:
     UserSettingsPointer m_pConfig;
     ControllerLearningEventFilter* m_pControllerLearningEventFilter;

From 3e0729ad7eb8edc1d139fe903a7e24ed1af2b456 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 6 Apr 2020 18:55:32 +0200
Subject: [PATCH 13/55] controllers/controllermanager: Fix assertion if no
 preset is configured

---
 src/controllers/controllermanager.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index a6ff633c0b2..f965eae2152 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -399,10 +399,14 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
             continue;
         }
 
+        QString deviceName = sanitizeDeviceName(pController->getName());
+
         ControllerPresetPointer pPreset = pController->getPreset();
-        DEBUG_ASSERT(!pPreset);
+        if (!pPreset) {
+            qDebug() << "Device" << deviceName << "has no configurated preset";
+            continue;
+        }
 
-        QString deviceName = sanitizeDeviceName(pController->getName());
         if (!pPreset->isDirty()) {
             qWarning()
                     << "Preset for device" << deviceName

From 8a30f3a5214ebdaac5996db5fa96bbf38d79ea85 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 6 Apr 2020 18:56:34 +0200
Subject: [PATCH 14/55] controllers/controllermanager: Use qDebug() instead of
 qWarning()

---
 src/controllers/controllermanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index f965eae2152..eaa860089f3 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -408,7 +408,7 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
         }
 
         if (!pPreset->isDirty()) {
-            qWarning()
+            qDebug()
                     << "Preset for device" << deviceName
                     << "is not dirty, no need to save it to the user presets.";
             continue;

From 5277c500e8a724263c0e9ef82fb4328f972abc24 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 6 Apr 2020 19:25:01 +0200
Subject: [PATCH 15/55] controllers/dlgprefcontroller: Move shared enumeration
 code to method

---
 src/controllers/dlgprefcontroller.cpp | 66 +++++++++++++--------------
 src/controllers/dlgprefcontroller.h   |  3 ++
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 92882863964..e939147cbc7 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -239,46 +239,22 @@ void DlgPrefController::enumeratePresets() {
     // user has their controller plugged in)
     m_ui.comboBoxPreset->addItem("...");
 
-    QList<PresetInfo> presets;
     PresetInfo match;
-
-    // Ask the controller manager for a list of applicable user presets
-    QSharedPointer<PresetInfoEnumerator> userPresetEnumerator =
-            m_pControllerManager->getMainThreadUserPresetEnumerator();
-    // Check if enumerator is ready. Should be rare. We will re-enumerate on
-    // the next open of the preferences.
-    if (!userPresetEnumerator.isNull()) {
-        // Making the list of presets in the alphabetical order
-        QList<PresetInfo> userPresets = userPresetEnumerator->getPresetsByExtension(
-                m_pController->presetExtension());
-
-        for (const PresetInfo& preset : userPresets) {
-            m_ui.comboBoxPreset->addItem(preset.getName(), preset.getPath());
-            if (m_pController->matchPreset(preset)) {
-                match = preset;
-            }
-        }
+    // Enumerate user presets
+    PresetInfo userPresetsMatch = enumeratePresetsFromEnumerator(
+            m_pControllerManager->getMainThreadUserPresetEnumerator());
+    if (userPresetsMatch.isValid()) {
+        match = userPresetsMatch;
     }
 
     // Insert a separator between user presets (+ dummy item) and system presets
     m_ui.comboBoxPreset->insertSeparator(m_ui.comboBoxPreset->count());
 
-    // Ask the controller manager for a list of applicable system presets
-    QSharedPointer<PresetInfoEnumerator> systemPresetEnumerator =
-            m_pControllerManager->getMainThreadSystemPresetEnumerator();
-    // Check if enumerator is ready. Should be rare. We will re-enumerate on
-    // the next open of the preferences.
-    if (!systemPresetEnumerator.isNull()) {
-        // Making the list of presets in the alphabetical order
-        QList<PresetInfo> systemPresets = systemPresetEnumerator->getPresetsByExtension(
-                m_pController->presetExtension());
-
-        for (const PresetInfo& preset : systemPresets) {
-            m_ui.comboBoxPreset->addItem(preset.getName(), preset.getPath());
-            if (m_pController->matchPreset(preset)) {
-                match = preset;
-            }
-        }
+    // Enumerate system presets
+    PresetInfo systemPresetsMatch = enumeratePresetsFromEnumerator(
+            m_pControllerManager->getMainThreadSystemPresetEnumerator());
+    if (systemPresetsMatch.isValid()) {
+        match = systemPresetsMatch;
     }
 
     QString configuredPresetFile = m_pControllerManager->getConfiguredPresetFileForDevice(
@@ -296,6 +272,28 @@ void DlgPrefController::enumeratePresets() {
     }
 }
 
+PresetInfo DlgPrefController::enumeratePresetsFromEnumerator(
+        QSharedPointer<PresetInfoEnumerator> pPresetEnumerator) {
+    PresetInfo match;
+
+    // Check if enumerator is ready. Should be rare. We will re-enumerate on
+    // the next open of the preferences.
+    if (!pPresetEnumerator.isNull()) {
+        // Making the list of presets in the alphabetical order
+        QList<PresetInfo> systemPresets = pPresetEnumerator->getPresetsByExtension(
+                m_pController->presetExtension());
+
+        for (const PresetInfo& preset : systemPresets) {
+            m_ui.comboBoxPreset->addItem(preset.getName(), preset.getPath());
+            if (m_pController->matchPreset(preset)) {
+                match = preset;
+            }
+        }
+    }
+
+    return match;
+}
+
 void DlgPrefController::slotUpdate() {
     enumeratePresets();
 
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index e0cb88ed5aa..973478c398b 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -23,6 +23,7 @@
 // Forward declarations
 class Controller;
 class ControllerManager;
+class PresetInfoEnumerator;
 
 class DlgPrefController : public DlgPreferencePage {
     Q_OBJECT
@@ -88,6 +89,8 @@ class DlgPrefController : public DlgPreferencePage {
 
     // Reload the mappings in the dropdown dialog
     void enumeratePresets();
+    PresetInfo enumeratePresetsFromEnumerator(
+            QSharedPointer<PresetInfoEnumerator> pPresetEnumerator);
 
     void enableDevice();
     void disableDevice();

From 6367448993658ebacd7963b57c4503cbd75086b0 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 6 Apr 2020 19:29:08 +0200
Subject: [PATCH 16/55] controllers/dlgprefcontroller: Improve some comments

---
 src/controllers/dlgprefcontroller.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index e939147cbc7..f39deaa508e 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -276,10 +276,10 @@ PresetInfo DlgPrefController::enumeratePresetsFromEnumerator(
         QSharedPointer<PresetInfoEnumerator> pPresetEnumerator) {
     PresetInfo match;
 
-    // Check if enumerator is ready. Should be rare. We will re-enumerate on
-    // the next open of the preferences.
+    // Check if enumerator is ready. Should be rare that it isn't. We will
+    // re-enumerate on the next open of the preferences.
     if (!pPresetEnumerator.isNull()) {
-        // Making the list of presets in the alphabetical order
+        // Get a list of presets in alphabetical order
         QList<PresetInfo> systemPresets = pPresetEnumerator->getPresetsByExtension(
                 m_pController->presetExtension());
 

From c2e2db69d5ef68d1cc4355bef2f3cd3a3259831c Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 6 Apr 2020 19:52:35 +0200
Subject: [PATCH 17/55] controllers/controllermanager: Improve device setup
 code

---
 src/controllers/controllermanager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index eaa860089f3..a1e0ab63800 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -231,10 +231,13 @@ void ControllerManager::slotSetUpDevices() {
 
         // The filename for this device name.
         QString deviceName = sanitizeDeviceName(name);
-        if (m_pConfig->getValueString(ConfigKey("[Controller]", deviceName)) != "1") {
+
+        // Check if device is enabled
+        if (!m_pConfig->getValue(ConfigKey("[Controller]", deviceName), 0)) {
             continue;
         }
 
+        // Check if device has a configured preset
         QString presetFile = getConfiguredPresetFileForDevice(deviceName);
         if (presetFile.isEmpty()) {
             continue;

From 08d52d93b4d04e2588aebcf5ef437b28446a3ff0 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 6 Apr 2020 19:53:16 +0200
Subject: [PATCH 18/55]     controllers/controllermanager: Remove unused
 variable

---
 src/controllers/controllermanager.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index a1e0ab63800..dfccefee22e 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -220,8 +220,6 @@ void ControllerManager::slotSetUpDevices() {
     updateControllerList();
     QList<Controller*> deviceList = getControllerList(false, true);
 
-    QSet<QString> filenames;
-
     foreach (Controller* pController, deviceList) {
         QString name = pController->getName();
 

From fb1573c2640e81ab563a1badf30ce5a789d07572 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 6 Apr 2020 22:30:02 +0200
Subject: [PATCH 19/55] controllers/dlgprefcontroller: Add icon to user
 controller presets

---
 res/images/ic_custom.svg              | 67 +++++++++++++++++++++++++++
 res/mixxx.qrc                         |  1 +
 src/controllers/dlgprefcontroller.cpp |  7 +--
 src/controllers/dlgprefcontroller.h   |  3 +-
 4 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 res/images/ic_custom.svg

diff --git a/res/images/ic_custom.svg b/res/images/ic_custom.svg
new file mode 100644
index 00000000000..44a0fe3f680
--- /dev/null
+++ b/res/images/ic_custom.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 8.4666669 8.4666662"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="ic_custom.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="5.8672002"
+     inkscape:cy="24.59093"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1896"
+     inkscape:window-height="2102"
+     inkscape:window-x="16"
+     inkscape:window-y="38"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-43.381965,-122.49859)">
+    <path
+       style="fill:#000000;stroke-width:0.01701626"
+       d="m 44.015975,127.01486 c 0.441248,0.10389 0.410779,0.0912 0.423871,0.17684 0.04426,0.28965 0.190689,0.76544 0.303216,0.9853 0.02913,0.057 0.05219,0.1115 0.05125,0.12129 -9.44e-4,0.0101 -0.11494,0.13136 -0.253325,0.27016 -0.138384,0.13879 -0.257331,0.25998 -0.264324,0.26932 -0.007,0.01 0.140753,0.20301 0.328323,0.43041 l 0.341039,0.41345 0.313691,-0.21043 c 0.17253,-0.11574 0.32117,-0.2097 0.330309,-0.20884 0.0092,8.8e-4 0.05715,0.0334 0.10668,0.0722 0.162531,0.12748 0.444076,0.28678 0.714451,0.40422 0.212848,0.0925 0.266717,0.12236 0.270428,0.1501 0.0026,0.0191 0.01109,0.19114 0.019,0.38242 l 0.01435,0.34779 0.542631,0.0478 0.542631,0.0477 0.09011,-0.3674 c 0.04956,-0.20208 0.09086,-0.36927 0.09175,-0.37154 9.07e-4,-0.002 0.02126,-0.002 0.04524,7e-5 0.04522,0.004 0.301939,-0.0496 0.325286,-0.0684 0.0073,-0.006 -0.122018,-0.22743 -0.287376,-0.49237 -0.218984,-0.35086 -0.30952,-0.48192 -0.333302,-0.48248 -0.01795,-4.5e-4 -0.09451,0.002 -0.170123,0.006 -0.164217,0.01 -0.389278,-0.0258 -0.618808,-0.095 -1.186662,-0.35809 -1.840444,-1.67392 -1.407057,-2.83191 0.141756,-0.37878 0.354119,-0.67257 0.676054,-0.93532 0.348552,-0.28448 0.762649,-0.45066 1.208108,-0.48485 0.193773,-0.0149 0.537214,0.0193 0.73384,0.0728 0.685119,0.18679 1.256728,0.72538 1.486881,1.40098 0.100167,0.29404 0.131614,0.59664 0.09837,0.94653 l -0.02172,0.22868 0.424453,0.42347 0.424454,0.42347 0.04484,-0.0771 c 0.02466,-0.0425 0.05916,-0.1247 0.07666,-0.18287 0.01751,-0.0581 0.03619,-0.10586 0.04153,-0.10599 0.0053,-1.3e-4 0.175918,-0.01 0.379064,-0.0191 l 0.369357,-0.0188 0.05213,-0.54104 0.05213,-0.54103 -0.361469,-0.11488 c -0.198807,-0.0632 -0.364296,-0.11831 -0.367753,-0.12251 -0.0034,-0.004 -0.02444,-0.098 -0.04662,-0.20839 -0.05372,-0.26738 -0.1542,-0.58204 -0.255389,-0.79973 l -0.08261,-0.17772 0.271584,-0.27409 0.271584,-0.27407 -0.342358,-0.41536 -0.342358,-0.41537 -0.314454,0.21094 c -0.172951,0.11602 -0.321409,0.21027 -0.32991,0.20945 -0.0085,-8.1e-4 -0.06397,-0.0382 -0.123284,-0.0831 -0.165778,-0.12544 -0.420474,-0.27167 -0.658036,-0.3778 -0.118497,-0.0529 -0.226861,-0.0976 -0.240809,-0.0992 -0.06418,-0.007 -0.07054,-0.0375 -0.08748,-0.41294 l -0.01691,-0.3749 -0.542041,-0.0568 -0.542042,-0.0567 -0.08289,0.36406 c -0.0456,0.20024 -0.08825,0.38032 -0.09481,0.40019 -0.0094,0.0284 -0.03836,0.0411 -0.136587,0.0598 -0.325703,0.0621 -0.673941,0.17173 -0.928316,0.29226 l -0.134288,0.0637 -0.116953,-0.11744 c -0.06431,-0.0645 -0.186865,-0.18728 -0.272315,-0.27265 l -0.155365,-0.15523 -0.415936,0.34284 -0.415937,0.34283 0.210942,0.31445 c 0.116018,0.17295 0.210272,0.32141 0.209453,0.32991 -8.18e-4,0.008 -0.03822,0.064 -0.08311,0.12328 -0.125007,0.16518 -0.264343,0.40806 -0.374701,0.65318 -0.05499,0.12213 -0.101149,0.23307 -0.102592,0.24655 -0.0068,0.0631 -0.03815,0.0697 -0.412637,0.0867 l -0.374902,0.0169 -0.05676,0.54239 -0.05676,0.54241 z m 2.106666,-0.50477 c 0.0058,0.26039 0.08734,0.54454 0.216342,0.75382 0.280163,0.45452 0.875076,0.69894 1.423062,0.58467 l 0.09712,-0.0202 0.120557,0.1157 c 0.829702,0.97849 1.288529,1.51877 2.220836,2.67973 0.243453,0.27387 1.061484,-0.47479 0.888274,-0.68774 -1.338712,-1.45629 -1.38928,-1.53146 -2.376116,-2.71453 -0.08922,-0.12512 -0.07867,-0.12306 -0.04007,-0.22729 0.120265,-0.32478 0.08865,-0.76414 -0.07779,-1.08087 -0.170978,-0.32537 -0.421621,-0.5388 -0.762311,-0.64913 -0.194783,-0.063 -0.510823,-0.0785 -0.699741,-0.0342 -0.07695,0.018 -0.146638,0.0383 -0.154842,0.0449 -0.0082,0.007 0.164889,0.16622 0.384655,0.35468 0.49216,0.42206 0.525953,0.45493 0.562238,0.54693 0.03642,0.0923 0.0262,0.22338 -0.0234,0.30028 -0.07422,0.11504 -0.416009,0.51942 -0.471167,0.55745 -0.09441,0.0651 -0.241436,0.0599 -0.360843,-0.0125 -0.03012,-0.0182 -0.245552,-0.19802 -0.478719,-0.39944 -0.233165,-0.20141 -0.427686,-0.36311 -0.432267,-0.35934 -0.01279,0.0105 -0.03731,0.17979 -0.03581,0.24715 z"
+       id="path4583"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscccccccccccccccccccscccssccscccccscccccccsscccccsccscscccscccccccccsccccccccccsscccccsccscsccccccc" />
+  </g>
+</svg>
diff --git a/res/mixxx.qrc b/res/mixxx.qrc
index 545cba1feac..9d8a939ce80 100644
--- a/res/mixxx.qrc
+++ b/res/mixxx.qrc
@@ -33,6 +33,7 @@
         <file>images/mixxx-icon-logo-symbolic.svg</file> <!-- default launch image -->
         <file>images/skin_preview_placeholder.png</file>
         <file>images/ic_checkmark.svg</file>
+        <file>images/ic_custom.svg</file>
         <file>images/ic_delete.svg</file>
         <file>images/preferences/ic_preferences_autodj.svg</file>
         <file>images/preferences/ic_preferences_bpmdetect.svg</file>
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index f39deaa508e..b24fa335499 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -241,8 +241,9 @@ void DlgPrefController::enumeratePresets() {
 
     PresetInfo match;
     // Enumerate user presets
+    QIcon icon(":/images/ic_custom.svg");
     PresetInfo userPresetsMatch = enumeratePresetsFromEnumerator(
-            m_pControllerManager->getMainThreadUserPresetEnumerator());
+            m_pControllerManager->getMainThreadUserPresetEnumerator(), icon);
     if (userPresetsMatch.isValid()) {
         match = userPresetsMatch;
     }
@@ -273,7 +274,7 @@ void DlgPrefController::enumeratePresets() {
 }
 
 PresetInfo DlgPrefController::enumeratePresetsFromEnumerator(
-        QSharedPointer<PresetInfoEnumerator> pPresetEnumerator) {
+        QSharedPointer<PresetInfoEnumerator> pPresetEnumerator, QIcon icon) {
     PresetInfo match;
 
     // Check if enumerator is ready. Should be rare that it isn't. We will
@@ -284,7 +285,7 @@ PresetInfo DlgPrefController::enumeratePresetsFromEnumerator(
                 m_pController->presetExtension());
 
         for (const PresetInfo& preset : systemPresets) {
-            m_ui.comboBoxPreset->addItem(preset.getName(), preset.getPath());
+            m_ui.comboBoxPreset->addItem(icon, preset.getName(), preset.getPath());
             if (m_pController->matchPreset(preset)) {
                 match = preset;
             }
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index 973478c398b..92fc9086616 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -90,7 +90,8 @@ class DlgPrefController : public DlgPreferencePage {
     // Reload the mappings in the dropdown dialog
     void enumeratePresets();
     PresetInfo enumeratePresetsFromEnumerator(
-            QSharedPointer<PresetInfoEnumerator> pPresetEnumerator);
+            QSharedPointer<PresetInfoEnumerator> pPresetEnumerator,
+            QIcon icon = QIcon());
 
     void enableDevice();
     void disableDevice();

From d25942171c3bfe397dabfc15bc5319c1303f5a6a Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 6 Apr 2020 23:37:25 +0200
Subject: [PATCH 20/55] controllers/controllerpresetinfoenumerator: Add
 constructor for single path

---
 src/controllers/controllermanager.cpp              | 4 ++--
 src/controllers/controllerpresetinfoenumerator.cpp | 4 ++++
 src/controllers/controllerpresetinfoenumerator.h   | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index dfccefee22e..06864bd8398 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -126,9 +126,9 @@ void ControllerManager::slotInitialize() {
     // Initialize preset info parsers. This object is only for use in the main
     // thread. Do not touch it from within ControllerManager.
     m_pMainThreadUserPresetEnumerator = QSharedPointer<PresetInfoEnumerator>(
-            new PresetInfoEnumerator(QStringList{userPresetsPath(m_pConfig)}));
+            new PresetInfoEnumerator(userPresetsPath(m_pConfig)));
     m_pMainThreadSystemPresetEnumerator = QSharedPointer<PresetInfoEnumerator>(
-            new PresetInfoEnumerator(QStringList{resourcePresetsPath(m_pConfig)}));
+            new PresetInfoEnumerator(resourcePresetsPath(m_pConfig)));
 
     // Instantiate all enumerators. Enumerators can take a long time to
     // construct since they interact with host MIDI APIs.
diff --git a/src/controllers/controllerpresetinfoenumerator.cpp b/src/controllers/controllerpresetinfoenumerator.cpp
index 60e5d6e0408..14f43a247eb 100644
--- a/src/controllers/controllerpresetinfoenumerator.cpp
+++ b/src/controllers/controllerpresetinfoenumerator.cpp
@@ -29,6 +29,10 @@ bool presetInfoNameComparator(const PresetInfo &a, const PresetInfo &b) {
 }
 }
 
+PresetInfoEnumerator::PresetInfoEnumerator(const QString& searchPath)
+        : PresetInfoEnumerator(QList<QString>{searchPath}) {
+}
+
 PresetInfoEnumerator::PresetInfoEnumerator(const QStringList& searchPaths)
         : m_controllerDirPaths(searchPaths) {
     loadSupportedPresets();
diff --git a/src/controllers/controllerpresetinfoenumerator.h b/src/controllers/controllerpresetinfoenumerator.h
index d948aadfb61..24b5a7be4db 100644
--- a/src/controllers/controllerpresetinfoenumerator.h
+++ b/src/controllers/controllerpresetinfoenumerator.h
@@ -15,6 +15,7 @@
 
 class PresetInfoEnumerator {
   public:
+    PresetInfoEnumerator(const QString& searchPath);
     PresetInfoEnumerator(const QStringList& searchPaths);
 
     // Return cached list of presets for this extension

From 302155ee5b88631c26c8ae642d073d5dc75074c1 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 6 Apr 2020 23:43:52 +0200
Subject: [PATCH 21/55] controllers/dlgprefcontroller: Show Mixxx icon for
 system presets

---
 res/images/ic_mixxx_symbolic.svg      | 1308 +++++++++++++++++++++++++
 res/mixxx.qrc                         |    1 +
 src/controllers/dlgprefcontroller.cpp |    7 +-
 3 files changed, 1313 insertions(+), 3 deletions(-)
 create mode 100644 res/images/ic_mixxx_symbolic.svg

diff --git a/res/images/ic_mixxx_symbolic.svg b/res/images/ic_mixxx_symbolic.svg
new file mode 100644
index 00000000000..c51004a4556
--- /dev/null
+++ b/res/images/ic_mixxx_symbolic.svg
@@ -0,0 +1,1308 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="32"
+   height="32"
+   id="svg3923"
+   style="display:inline"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="ic_mixxx_symbolic.svg">
+  <metadata
+     id="metadata133">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Mixxx application icon</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="768"
+     id="namedview131"
+     showgrid="true"
+     inkscape:zoom="8"
+     inkscape:cx="47.008788"
+     inkscape:cy="15.213158"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer3"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1058" />
+  </sodipodi:namedview>
+  <title
+     id="title2956">Mixxx application icon</title>
+  <defs
+     id="defs3925">
+    <radialGradient
+       cx="422.82339"
+       cy="489.90631"
+       r="117.14286"
+       fx="422.82339"
+       fy="489.90631"
+       id="radialGradient3860"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.7949011,0,0,2.0015961,-839.44782,-893.92913)" />
+    <radialGradient
+       cx="576.93286"
+       cy="486.67465"
+       r="117.14286"
+       fx="576.93286"
+       fy="486.67465"
+       id="radialGradient3858"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9485383,-1.3567159e-7,8.3867703e-6,1.9847499,-1724.9422,-879.26196)" />
+    <linearGradient
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       id="linearGradient3856"
+       xlink:href="#linearGradient5048"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.4517517,0,0,1.984663,-3212.5289,-882.00175)" />
+    <linearGradient
+       id="linearGradient3460">
+      <stop
+         id="stop3462"
+         style="stop-color:#f1f1f1;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3464"
+         style="stop-color:#dddddd;stop-opacity:0.93693691"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.125"
+       y1="6"
+       x2="25.125"
+       y2="43.641815"
+       id="linearGradient3862"
+       xlink:href="#linearGradient3460"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.8780488,7.0096992e-7,1.4268286)" />
+    <linearGradient
+       id="linearGradient3468">
+      <stop
+         id="stop3470"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3476"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop3472"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="18.384777"
+       y1="3.62905"
+       x2="24.660351"
+       y2="22.5"
+       id="linearGradient3864"
+       xlink:href="#linearGradient3468"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="422.82336"
+       cy="489.90631"
+       r="117.14286"
+       fx="422.82336"
+       fy="489.90631"
+       id="radialGradient3871"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.7847743,0,0,1.986426,-371.34893,-888.32389)" />
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         id="stop5062"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5064"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="576.93292"
+       cy="486.67462"
+       r="117.14286"
+       fx="576.93292"
+       fy="486.67462"
+       id="radialGradient3869"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0206614,3.6412947e-4,-2.7703425e-4,1.9847492,-996.45554,-879.47183)" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         id="stop5050"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop5056"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop5052"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       id="linearGradient3867"
+       xlink:href="#linearGradient5048"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.5306581,0,0,1.969706,-1897.5221,-872.8854)" />
+    <linearGradient
+       id="linearGradient4008">
+      <stop
+         id="stop4010"
+         style="stop-color:#797979;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4012"
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.37451"
+       y1="-43.625004"
+       x2="27.195475"
+       y2="-43.625004"
+       id="linearGradient3873"
+       xlink:href="#linearGradient4008"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7999999,0,0,0.7446809,-2.3000016,-6.1276619)" />
+    <linearGradient
+       id="linearGradient3992">
+      <stop
+         id="stop3994"
+         style="stop-color:#6b6d68;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3996"
+         style="stop-color:#4d4e4b;stop-opacity:1"
+         offset="0.10344828" />
+      <stop
+         id="stop3998"
+         style="stop-color:#454643;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.979203"
+       y1="10.432049"
+       x2="12.979203"
+       y2="42.633118"
+       id="linearGradient3875"
+       xlink:href="#linearGradient3992"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6551725,0,0,0.4594593,1.6206891,12.972982)" />
+    <linearGradient
+       id="linearGradient4000">
+      <stop
+         id="stop4002"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4004"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="13.999999"
+       y1="-10.187501"
+       x2="45.125"
+       y2="-40.312504"
+       id="linearGradient3877"
+       xlink:href="#linearGradient4000"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7391304,0,0,0.6521746,-1.2173906,-8.3478209)" />
+    <linearGradient
+       id="linearGradient6346">
+      <stop
+         id="stop6348"
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6350"
+         style="stop-color:#3e3e3e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.155962"
+       y1="37.015266"
+       x2="23.155962"
+       y2="10"
+       id="linearGradient3881"
+       xlink:href="#linearGradient6346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6315789,0,0,0.4230768,-0.2894746,14.057692)" />
+    <linearGradient
+       id="linearGradient6330">
+      <stop
+         id="stop6332"
+         style="stop-color:#6b6d68;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6334"
+         style="stop-color:#4d4e4b;stop-opacity:1"
+         offset="0.58620691" />
+      <stop
+         id="stop6336"
+         style="stop-color:#454643;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.985714"
+       y1="37.923729"
+       x2="24.985714"
+       y2="9"
+       id="linearGradient3879"
+       xlink:href="#linearGradient6330"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5210918,0,0,0.3793103,2.4801441,14.896551)" />
+    <linearGradient
+       x1="24.985714"
+       y1="37.923729"
+       x2="24.985714"
+       y2="9"
+       id="linearGradient4803-7-6"
+       xlink:href="#linearGradient6330-9-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52109186,0,0,0.37930873,3.4801399,14.896562)" />
+    <linearGradient
+       id="linearGradient6330-9-2">
+      <stop
+         id="stop6332-3-7"
+         style="stop-color:#6b6d68;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6334-8-0"
+         style="stop-color:#4d4e4b;stop-opacity:1"
+         offset="0.58620691" />
+      <stop
+         id="stop6336-0-3"
+         style="stop-color:#454643;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.979203"
+       y1="10.432049"
+       x2="12.979203"
+       y2="42.633118"
+       id="linearGradient4458-9-9"
+       xlink:href="#linearGradient3992-0-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.65517252,0,0,0.45945946,2.6206895,12.972984)" />
+    <linearGradient
+       id="linearGradient3992-0-9">
+      <stop
+         id="stop3994-5-9"
+         style="stop-color:#6b6d68;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3996-2-1"
+         style="stop-color:#4d4e4b;stop-opacity:1"
+         offset="0.10344828" />
+      <stop
+         id="stop3998-2-7"
+         style="stop-color:#454643;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="13.999999"
+       y1="-10.187501"
+       x2="45.125"
+       y2="-40.312504"
+       id="linearGradient4456-2-2"
+       xlink:href="#linearGradient4000-4-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.73913041,0,0,0.65217433,-0.2173946,-8.347818)" />
+    <linearGradient
+       id="linearGradient4000-4-3">
+      <stop
+         id="stop4002-8-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4004-3-5"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.125"
+       y1="6"
+       x2="25.125"
+       y2="43.641815"
+       id="linearGradient3461"
+       xlink:href="#linearGradient3460"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9993784,0,0,0.92617795,0.01491559,1.2717397)" />
+    <linearGradient
+       x1="18.384777"
+       y1="3.62905"
+       x2="24.660351"
+       y2="22.5"
+       id="linearGradient3463"
+       xlink:href="#linearGradient3468"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0000002,0,0,1.0285715,0.00656877,0.8571449)" />
+    <linearGradient
+       id="linearGradient5048-7">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050-5" />
+      <stop
+         id="stop5056-5"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060-8">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062-8" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3468-8"
+       id="linearGradient3864-7"
+       gradientUnits="userSpaceOnUse"
+       x1="18.384777"
+       y1="3.62905"
+       x2="24.660351"
+       y2="22.5" />
+    <linearGradient
+       id="linearGradient3468-8">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop3470-4" />
+      <stop
+         id="stop3476-1"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3472-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048-7"
+       id="linearGradient3867-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.5306581,0,0,1.969706,-1897.5222,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060-8"
+       id="radialGradient3869-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0206614,3.6412947e-4,-2.7703425e-4,1.9847492,-996.45567,-879.47183)"
+       cx="576.93292"
+       cy="486.67462"
+       fx="576.93292"
+       fy="486.67462"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060-8"
+       id="radialGradient3871-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.7847743,0,0,1.986426,-371.34906,-888.32389)"
+       cx="422.82336"
+       cy="489.90631"
+       fx="422.82336"
+       fy="489.90631"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient3992-9">
+      <stop
+         style="stop-color:#6b6d68;stop-opacity:1;"
+         offset="0"
+         id="stop3994-1" />
+      <stop
+         id="stop3996-5"
+         offset="0.10344828"
+         style="stop-color:#4d4e4b;stop-opacity:1;" />
+      <stop
+         style="stop-color:#454643;stop-opacity:1"
+         offset="1"
+         id="stop3998-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6330-2">
+      <stop
+         id="stop6332-0"
+         offset="0"
+         style="stop-color:#6b6d68;stop-opacity:1;" />
+      <stop
+         style="stop-color:#4d4e4b;stop-opacity:1;"
+         offset="0.58620691"
+         id="stop6334-7" />
+      <stop
+         id="stop6336-4"
+         offset="1"
+         style="stop-color:#454643;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       r="117.14286"
+       fy="489.90631"
+       fx="422.82339"
+       cy="489.90631"
+       cx="422.82339"
+       gradientTransform="matrix(-2.7949011,0,0,2.0015961,-839.44791,-652.93441)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3305"
+       xlink:href="#linearGradient5060-8"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="25.125"
+       y1="6"
+       x2="25.125"
+       y2="43.641815"
+       id="linearGradient3461-0"
+       xlink:href="#linearGradient3460-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9993784,0,0,0.92617795,0.01491564,1.2717398)" />
+    <linearGradient
+       id="linearGradient3460-4">
+      <stop
+         id="stop3462-64"
+         style="stop-color:#f1f1f1;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3464-64"
+         style="stop-color:#dddddd;stop-opacity:0.93693691"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="18.384777"
+       y1="3.62905"
+       x2="24.660351"
+       y2="22.5"
+       id="linearGradient3463-3"
+       xlink:href="#linearGradient3468-84"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0000002,0,0,1.0285715,0.00656884,0.85714502)" />
+    <linearGradient
+       id="linearGradient3468-84">
+      <stop
+         id="stop3470-0"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3476-0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop3472-9"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       id="linearGradient3867-3"
+       xlink:href="#linearGradient5048-75"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.5306581,0,0,1.969706,-1897.5221,-872.88539)" />
+    <linearGradient
+       id="linearGradient5048-75">
+      <stop
+         id="stop5050-7"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop5056-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop5052-9"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="576.93292"
+       cy="486.67462"
+       r="117.14286"
+       fx="576.93292"
+       fy="486.67462"
+       id="radialGradient3869-7"
+       xlink:href="#linearGradient5060-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0206614,3.6412947e-4,-2.7703425e-4,1.9847492,-996.45559,-879.47182)" />
+    <linearGradient
+       id="linearGradient5060-5">
+      <stop
+         id="stop5062-6"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5064-5"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="422.82336"
+       cy="489.90631"
+       r="117.14286"
+       fx="422.82336"
+       fy="489.90631"
+       id="radialGradient3871-3"
+       xlink:href="#linearGradient5060-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.7847743,0,0,1.986426,-371.34893,-888.32388)" />
+    <linearGradient
+       x1="12.979203"
+       y1="10.432049"
+       x2="12.979203"
+       y2="42.633118"
+       id="linearGradient4458-9-9-0"
+       xlink:href="#linearGradient3992-0-9-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.65517252,0,0,0.45945946,2.6206896,12.972984)" />
+    <linearGradient
+       id="linearGradient3992-0-9-4">
+      <stop
+         id="stop3994-5-9-8"
+         style="stop-color:#6b6d68;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3996-2-1-5"
+         style="stop-color:#4d4e4b;stop-opacity:1"
+         offset="0.10344828" />
+      <stop
+         id="stop3998-2-7-5"
+         style="stop-color:#454643;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="13.999999"
+       y1="-10.187501"
+       x2="45.125"
+       y2="-40.312504"
+       id="linearGradient4456-2-2-5"
+       xlink:href="#linearGradient4000-4-3-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.73913041,0,0,0.65217433,-0.21739448,-8.3478181)" />
+    <linearGradient
+       id="linearGradient4000-4-3-4">
+      <stop
+         id="stop4002-8-6-2"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4004-3-5-1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.985714"
+       y1="37.923729"
+       x2="24.985714"
+       y2="9"
+       id="linearGradient4803-7-6-9"
+       xlink:href="#linearGradient6330-9-2-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52109186,0,0,0.37930873,3.48014,14.896562)" />
+    <linearGradient
+       id="linearGradient6330-9-2-2">
+      <stop
+         id="stop6332-3-7-4"
+         style="stop-color:#6b6d68;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6334-8-0-5"
+         style="stop-color:#4d4e4b;stop-opacity:1"
+         offset="0.58620691" />
+      <stop
+         id="stop6336-0-3-8"
+         style="stop-color:#454643;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="default"
+     style="display:inline"
+     transform="translate(0,-16)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.69388872;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="rect3806-5"
+       width="28.586378"
+       height="26"
+       x="1.6666656"
+       y="19"
+       rx="1.3809509"
+       ry="1.4960302" />
+    <g
+       style="display:inline;opacity:0.35371178"
+       transform="matrix(-0.00823561,0,0,0.00820673,12.060097,35.266539)"
+       id="g3814-1">
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#linearGradient3867-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+         id="rect3816-5"
+         width="1295.1887"
+         height="478.35718"
+         x="-1125.9932"
+         y="-150.69685" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient3869-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+         d="m 169.19562,-154.32944 c 0,0 0,481.98393 0,481.98393 133.93815,0.90732 323.79728,-107.98815 323.7972,-241.022987 0,-133.034858 -149.46489,-240.960923 -323.7972,-240.960943 z"
+         id="path3818-2"
+         sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="path3820-1"
+         d="m -1125.9932,-154.32945 c 0,0 0,478.33079 0,478.33079 -133.938,0.90045 -323.7972,-107.16966 -323.7972,-239.196174 0,-132.026541 149.4649,-239.134596 323.7972,-239.134616 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient3871-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+    </g>
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.66666651;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="M 5.5839844 13 C 4.8914842 13 4.3339844 13.5575 4.3339844 14.25 L 4.3339844 14.416016 C 4.3339844 15.108516 4.8914842 15.666016 5.5839844 15.666016 L 10.333984 15.666016 L 10.333984 13 L 5.5839844 13 z M 21.666016 13 L 21.666016 15.666016 L 26.416016 15.666016 C 27.108516 15.666016 27.666016 15.108516 27.666016 14.416016 L 27.666016 14.25 C 27.666016 13.5575 27.108516 13 26.416016 13 L 21.666016 13 z "
+       transform="translate(0,16)"
+       id="rect3842-6" />
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.66666645;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="M 11.583984 7.6660156 C 10.891484 7.6660156 10.333984 8.2235156 10.333984 8.9160156 L 10.333984 19.083984 C 10.333984 19.776484 10.891484 20.333984 11.583984 20.333984 L 20.416016 20.333984 C 21.108516 20.333984 21.666016 19.776484 21.666016 19.083984 L 21.666016 8.9160156 C 21.666016 8.2235156 21.108516 7.6660156 20.416016 7.6660156 L 11.583984 7.6660156 z M 13.583984 8.3339844 L 18.416016 8.3339844 C 19.108516 8.3339844 19.666016 8.8914844 19.666016 9.5839844 L 19.666016 15.083984 C 19.666016 15.776484 19.108516 16.333984 18.416016 16.333984 L 13.583984 16.333984 C 12.891484 16.333984 12.333984 15.776484 12.333984 15.083984 L 12.333984 9.5839844 C 12.333984 8.8914844 12.891484 8.3339844 13.583984 8.3339844 z "
+       transform="translate(0,16)"
+       id="rect3846-8" />
+    <rect
+       ry="0.45241138"
+       rx="0.45241138"
+       y="-16.666666"
+       x="25.333332"
+       height="1.3333334"
+       width="6"
+       id="rect3852-4"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.66666657;marker:none;enable-background:accumulate;stroke-opacity:1"
+       transform="rotate(90)" />
+    <g
+       style="display:inline;fill:#000000;fill-opacity:1"
+       id="g1078"
+       transform="translate(0,2)">
+      <rect
+         y="-8"
+         x="-40"
+         height="1"
+         width="3.9999993"
+         id="rect3824-0"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.81649631;marker:none;enable-background:accumulate"
+         transform="matrix(0,-1,-1,0,0,0)" />
+      <rect
+         y="-11"
+         x="-38.766998"
+         height="1"
+         width="2.767"
+         id="rect3828-8"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83171463;marker:none;enable-background:accumulate"
+         transform="matrix(0,-1,-1,0,0,0)" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.81649631;marker:none;enable-background:accumulate"
+         id="rect3830-7"
+         width="2.000001"
+         height="1"
+         x="-38"
+         y="-14"
+         transform="matrix(0,-1,-1,0,0,0)" />
+      <rect
+         y="-17"
+         x="-40"
+         height="1"
+         width="4"
+         id="rect3832-6"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.81649613;marker:none;enable-background:accumulate"
+         transform="matrix(0,-1,-1,0,0,0)" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.81649631;marker:none;enable-background:accumulate"
+         id="rect3834-0"
+         width="2.000001"
+         height="1"
+         x="-38"
+         y="-20"
+         transform="matrix(0,-1,-1,0,0,0)" />
+      <rect
+         y="-23"
+         x="-38.666668"
+         height="1"
+         width="2.6666663"
+         id="rect3836-0"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.81649631;marker:none;enable-background:accumulate"
+         transform="matrix(0,-1,-1,0,0,0)" />
+      <rect
+         y="-26"
+         x="-40"
+         height="1"
+         width="3.9999993"
+         id="rect3840-5"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.81649631;marker:none;enable-background:accumulate"
+         transform="matrix(0,-1,-1,0,0,0)" />
+    </g>
+  </g>
+  <g
+     id="layer1"
+     style="display:none"
+     transform="translate(0,-16)">
+    <g
+       transform="matrix(-0.01750066,0,0,0.01659787,5.627702,42.561536)"
+       id="g3798"
+       style="display:inline;opacity:0.35371178">
+      <rect
+         width="1999.9241"
+         height="481.98959"
+         x="-2021.1974"
+         y="-154.32925"
+         id="rect3800"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#linearGradient3856);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+      <path
+         d="m -23.829401,-154.32944 c 0,0 0,481.98411 0,481.98411 142.874161,0.90732 345.400231,-107.98819 345.400151,-241.023076 0,-133.034907 -159.43683,-240.961014 -345.400151,-240.961034 z"
+         id="path3802"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient3858);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -2021.1974,-154.32926 c 0,0 0,481.98375 0,481.98375 -141.8168,0.90732 -342.8441,-107.98811 -342.8441,-241.02289 0,-133.034808 158.257,-240.96084 342.8441,-240.96086 z"
+         id="path3804"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient3860);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <rect
+       width="42.879566"
+       height="36"
+       rx="2.0714264"
+       ry="2.0714264"
+       x="2.5"
+       y="7.499999"
+       id="rect3806"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b8b8b8;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       width="43"
+       height="36"
+       rx="2.0714264"
+       ry="2.0714264"
+       x="2.5"
+       y="4.499999"
+       id="rect3808"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3862);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       width="41"
+       height="34"
+       rx="1.0107666"
+       ry="1.0107665"
+       x="3.5000002"
+       y="5.499999"
+       id="rect3810"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.8253275;fill:none;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       width="42"
+       height="35"
+       rx="1.0107665"
+       ry="1.0107665"
+       x="3"
+       y="4.999999"
+       id="rect3812"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3864);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
+    <g
+       transform="matrix(-0.01235341,0,0,0.01231009,18.090147,25.899808)"
+       id="g3814"
+       style="display:inline;opacity:0.35371178">
+      <rect
+         width="1295.1887"
+         height="478.35718"
+         x="-1125.9932"
+         y="-150.69685"
+         id="rect3816"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#linearGradient3867);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+      <path
+         d="m 169.19562,-154.32944 c 0,0 0,481.98393 0,481.98393 133.93815,0.90732 323.79728,-107.98815 323.7972,-241.022987 0,-133.034858 -149.46489,-240.960923 -323.7972,-240.960943 z"
+         id="path3818"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient3869);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -1125.9932,-154.32945 c 0,0 0,478.33079 0,478.33079 -133.938,0.90045 -323.7972,-107.16966 -323.7972,-239.196174 0,-132.026541 149.4649,-239.134596 323.7972,-239.134616 z"
+         id="path3820"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient3871);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(1.0000029,-2.0000016)"
+       id="g3822">
+      <rect
+         width="5.999999"
+         height="1"
+         x="-38"
+         y="-8"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3824"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="5"
+         height="1.0000005"
+         x="-37"
+         y="-12"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3826"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="4"
+         height="1.0000005"
+         x="-36"
+         y="-16"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3828"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="3.0000014"
+         height="1"
+         x="-35"
+         y="-20"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3830"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="6"
+         height="1.0000005"
+         x="-38"
+         y="-24"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3832"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="3.0000014"
+         height="1"
+         x="-35"
+         y="-28"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3834"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="3.9999995"
+         height="1"
+         x="-36"
+         y="-32"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3836"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="5.0000014"
+         height="1"
+         x="-37"
+         y="-35"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3838"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="5.999999"
+         height="1"
+         x="-38"
+         y="-39"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3840"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+    </g>
+    <rect
+       width="4"
+       height="35.000004"
+       rx="1.8750004"
+       ry="1.8750006"
+       x="16.499998"
+       y="-41.500008"
+       transform="rotate(90)"
+       id="rect3842"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3873);fill-opacity:1;fill-rule:nonzero;stroke:#676a65;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       width="2"
+       height="33"
+       rx="0.8125003"
+       ry="0.81250036"
+       x="17.499998"
+       y="-40.500008"
+       transform="rotate(90)"
+       id="rect3844"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.51091715;fill:none;stroke:#ffffff;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       width="19"
+       height="16.999996"
+       rx="1.8750001"
+       ry="1.8750006"
+       x="8.4999981"
+       y="15.500007"
+       transform="matrix(0,1,1,0,0,0)"
+       id="rect3846"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3875);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       width="17"
+       height="15.00001"
+       rx="0.90272874"
+       ry="0.9027288"
+       x="9.4999981"
+       y="-31.500011"
+       transform="rotate(90)"
+       id="rect3848"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.66375547;fill:none;stroke:url(#linearGradient3877);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       width="12"
+       height="11"
+       rx="1.8749999"
+       ry="1.8750002"
+       x="9.4999981"
+       y="18.500002"
+       transform="matrix(0,1,1,0,0,0)"
+       id="rect3850"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3879);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3881);stroke-width:0.99999964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       width="9"
+       height="2"
+       rx="0.67861706"
+       ry="0.67861706"
+       x="10.999999"
+       y="-25"
+       transform="rotate(90)"
+       id="rect3852"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;enable-background:accumulate" />
+    <rect
+       width="10.000001"
+       height="9"
+       rx="0.91964298"
+       ry="0.91964298"
+       x="10.499997"
+       y="-28.500004"
+       transform="rotate(90)"
+       id="rect3854"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.31004363;fill:none;stroke:#ffffff;stroke-width:0.99999964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <g
+       transform="translate(2.0000029,-1.0000016)"
+       id="g3902"
+       style="fill:#ffffff;fill-opacity:0.8243243">
+      <rect
+         width="5.999999"
+         height="1"
+         x="-38"
+         y="-8"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3904"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0.8243243;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="5"
+         height="1.0000005"
+         x="-37"
+         y="-12"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3906"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0.8243243;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="4"
+         height="1.0000005"
+         x="-36"
+         y="-16"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3908"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0.8243243;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="3.0000014"
+         height="1"
+         x="-35"
+         y="-20"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3910"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0.8243243;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="6"
+         height="1.0000005"
+         x="-38"
+         y="-24"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3912"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0.8243243;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="3.0000014"
+         height="1"
+         x="-35"
+         y="-28"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3914"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0.8243243;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="3.9999995"
+         height="1"
+         x="-36"
+         y="-32"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3916"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0.8243243;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="5.0000014"
+         height="1"
+         x="-37"
+         y="-35"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3919"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0.8243243;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+      <rect
+         width="5.999999"
+         height="1"
+         x="-38"
+         y="-39"
+         transform="matrix(0,-1,-1,0,0,0)"
+         id="rect3921"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0.8243243;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;marker:none;enable-background:accumulate" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="16x16 version"
+     style="display:none"
+     transform="translate(0,-16)">
+    <g
+       id="g3312"
+       style="display:inline"
+       transform="matrix(0.66666667,0,0,0.66666667,0,16)">
+      <rect
+         width="42.879566"
+         height="36"
+         rx="2.0714264"
+         ry="2.0714264"
+         x="2.5"
+         y="9.499999"
+         id="rect3322"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b8b8b8;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="42.973278"
+         height="37.973278"
+         rx="2.0701389"
+         ry="2.1849692"
+         x="2.5133612"
+         y="4.513361"
+         id="rect3324"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3461-0);fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1.02672172;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="39.03812"
+         height="33.03812"
+         rx="0.9624005"
+         ry="0.98217142"
+         x="4.4809399"
+         y="6.4809422"
+         id="rect3326"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.8253275;fill:none;stroke:#ffffff;stroke-width:0.96187979;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="42"
+         height="36"
+         rx="1.0107669"
+         ry="1.0396458"
+         x="3.0065689"
+         y="6"
+         id="rect3328"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3463-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
+      <g
+         transform="matrix(-0.01235341,0,0,0.01231009,18.090147,25.899808)"
+         id="g3330"
+         style="display:inline;opacity:0.35371178">
+        <rect
+           width="1295.1887"
+           height="478.35718"
+           x="-1125.9932"
+           y="-150.69685"
+           id="rect3332"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#linearGradient3867-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+        <path
+           d="m 169.19562,-154.32944 c 0,0 0,481.98393 0,481.98393 133.93815,0.90732 323.79728,-107.98815 323.7972,-241.022987 0,-133.034858 -149.46489,-240.960923 -323.7972,-240.960943 z"
+           id="path3334"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient3869-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -1125.9932,-154.32945 c 0,0 0,478.33079 0,478.33079 -133.938,0.90045 -323.7972,-107.16966 -323.7972,-239.196174 0,-132.026541 149.4649,-239.134596 323.7972,-239.134616 z"
+           id="path3336"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient3871-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         width="4"
+         height="34.999996"
+         rx="1.8750007"
+         ry="1.8750006"
+         x="17"
+         y="-41.499996"
+         transform="rotate(90)"
+         id="rect3815-7-5"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="19"
+         height="16.999998"
+         rx="1.875"
+         ry="1.8750008"
+         x="9.5000019"
+         y="15.5"
+         transform="matrix(0,1,1,0,0,0)"
+         id="rect3819-3-8"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4458-9-9-0);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="17"
+         height="15"
+         rx="0.90272886"
+         ry="0.9027285"
+         x="10.499998"
+         y="-31.500019"
+         transform="rotate(90)"
+         id="rect3821-7-1"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.75;fill:none;stroke:url(#linearGradient4456-2-2-5);stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="12.96245"
+         height="10.962404"
+         rx="2.0253832"
+         ry="1.8685919"
+         x="10.518773"
+         y="18.518776"
+         transform="matrix(0,1,1,0,0,0)"
+         id="rect3823-9-4"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4803-7-6-9);fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1.03755069;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="9.000001"
+         height="2.0000005"
+         rx="0.67861718"
+         ry="0.67861718"
+         x="12.499998"
+         y="-25"
+         transform="rotate(90)"
+         id="rect3825-0-7"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0.99999946;marker:none;enable-background:accumulate" />
+      <rect
+         width="10.802174"
+         height="8.9692335"
+         rx="0.99341387"
+         ry="0.9164989"
+         x="11.598912"
+         y="-28.484621"
+         transform="rotate(90)"
+         id="rect3827-2-1"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.75;fill:none;stroke:#ececec;stroke-width:1.03742468;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <g
+         transform="translate(1.53e-5,1.3e-6)"
+         id="g3207-3"
+         style="display:inline;fill:#666666">
+        <g
+           transform="matrix(0.75,0,0,1.0000002,14.238756,2.9999915)"
+           id="g4739-9-8"
+           style="fill:#666666">
+          <g
+             id="g4741-9-4"
+             style="fill:#666666">
+            <rect
+               width="5.999999"
+               height="2"
+               x="-36"
+               y="-9"
+               transform="matrix(0,-1,-1,0,0,0)"
+               id="rect4743-7-8"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+          </g>
+        </g>
+        <use
+           transform="translate(7.8970706)"
+           id="use4783-0-0"
+           style="display:inline;fill:#666666"
+           x="0"
+           y="0"
+           width="48"
+           height="48"
+           xlink:href="#g4739-9-8" />
+        <use
+           transform="matrix(1,0,0,0.66666664,14.597858,11.000001)"
+           id="use4783-6-3-4"
+           style="display:inline;fill:#666666;stroke:#cccccc"
+           x="0"
+           y="0"
+           width="48"
+           height="48"
+           xlink:href="#g4739-9-8" />
+        <use
+           transform="translate(19.729749)"
+           id="use4783-9-9-6"
+           style="display:inline;fill:#666666"
+           x="0"
+           y="0"
+           width="48"
+           height="48"
+           xlink:href="#g4739-9-8" />
+        <g
+           transform="matrix(0.75,0,0,1.0000002,2.1259847,2.9999915)"
+           id="g4739-4-8-0"
+           style="display:inline;fill:#666666">
+          <g
+             id="g4741-2-6-3"
+             style="fill:#666666">
+            <rect
+               width="5.999999"
+               height="2"
+               x="-36"
+               y="-9"
+               transform="matrix(0,-1,-1,0,0,0)"
+               id="rect4743-0-5-2"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+          </g>
+        </g>
+        <use
+           transform="matrix(1,0,0,0.66666664,-7.402142,11.000001)"
+           id="use3267-6"
+           style="display:inline;fill:#666666;stroke:#cccccc"
+           x="0"
+           y="0"
+           width="48"
+           height="48"
+           xlink:href="#g4739-9-8" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/res/mixxx.qrc b/res/mixxx.qrc
index 9d8a939ce80..33381991f02 100644
--- a/res/mixxx.qrc
+++ b/res/mixxx.qrc
@@ -35,6 +35,7 @@
         <file>images/ic_checkmark.svg</file>
         <file>images/ic_custom.svg</file>
         <file>images/ic_delete.svg</file>
+        <file>images/ic_mixxx_symbolic.svg</file>
         <file>images/preferences/ic_preferences_autodj.svg</file>
         <file>images/preferences/ic_preferences_bpmdetect.svg</file>
         <file>images/preferences/ic_preferences_broadcast.svg</file>
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index b24fa335499..5bdf9e084c7 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -241,9 +241,9 @@ void DlgPrefController::enumeratePresets() {
 
     PresetInfo match;
     // Enumerate user presets
-    QIcon icon(":/images/ic_custom.svg");
+    QIcon userPresetIcon(":/images/ic_custom.svg");
     PresetInfo userPresetsMatch = enumeratePresetsFromEnumerator(
-            m_pControllerManager->getMainThreadUserPresetEnumerator(), icon);
+            m_pControllerManager->getMainThreadUserPresetEnumerator(), userPresetIcon);
     if (userPresetsMatch.isValid()) {
         match = userPresetsMatch;
     }
@@ -252,8 +252,9 @@ void DlgPrefController::enumeratePresets() {
     m_ui.comboBoxPreset->insertSeparator(m_ui.comboBoxPreset->count());
 
     // Enumerate system presets
+    QIcon systemPresetIcon(":/images/ic_mixxx_symbolic.svg");
     PresetInfo systemPresetsMatch = enumeratePresetsFromEnumerator(
-            m_pControllerManager->getMainThreadSystemPresetEnumerator());
+            m_pControllerManager->getMainThreadSystemPresetEnumerator(), systemPresetIcon);
     if (systemPresetsMatch.isValid()) {
         match = systemPresetsMatch;
     }

From 6f5ce05132bd33793ba0acba9db7df5d029b7759 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 00:15:13 +0200
Subject: [PATCH 22/55] controllers/dlgprefcontroller: Disable checkbox if no
 preset selected

---
 src/controllers/dlgprefcontroller.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 5bdf9e084c7..8581ec30c98 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -269,8 +269,11 @@ void DlgPrefController::enumeratePresets() {
     } else if (match.isValid()) {
         index = m_ui.comboBoxPreset->findText(match.getName());
     }
-    if (index != -1) {
+    if (index == -1) {
+        m_ui.chkEnabledDevice->setEnabled(false);
+    } else {
         m_ui.comboBoxPreset->setCurrentIndex(index);
+        m_ui.chkEnabledDevice->setEnabled(true);
     }
 }
 
@@ -375,8 +378,10 @@ void DlgPrefController::slotApply() {
 void DlgPrefController::slotLoadPreset(int chosenIndex) {
     if (chosenIndex == 0) {
         // User picked ...
+        m_ui.chkEnabledDevice->setEnabled(false);
         return;
     }
+    m_ui.chkEnabledDevice->setEnabled(true);
 
     const QString presetPath = m_ui.comboBoxPreset->itemData(chosenIndex).toString();
     // When loading the preset, we only want to load from the same dir as the

From cd14e38ca6186787cfb6972ee827d317cec11185 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 00:26:38 +0200
Subject: [PATCH 23/55] controllers/dlgprefcontroller: Rename "..." to "No
 Preset" and add icon

---
 res/images/ic_none.svg                | 77 +++++++++++++++++++++++++++
 res/mixxx.qrc                         |  1 +
 src/controllers/dlgprefcontroller.cpp |  7 +--
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 res/images/ic_none.svg

diff --git a/res/images/ic_none.svg b/res/images/ic_none.svg
new file mode 100644
index 00000000000..1d4ae648d3a
--- /dev/null
+++ b/res/images/ic_none.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 8.4666669 8.4666662"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="ic_none.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="0.7130553"
+     inkscape:cy="20.044608"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1366"
+     inkscape:window-height="768"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-43.381965,-122.49859)">
+    <circle
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path818"
+       cx="47.672115"
+       cy="126.78344"
+       r="3.4076865" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 46.233009,125.3743 2.873248,2.77192"
+       id="path830"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 46.292704,128.20554 2.75386,-2.89056"
+       id="path830-3"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/res/mixxx.qrc b/res/mixxx.qrc
index 33381991f02..6e4684376e4 100644
--- a/res/mixxx.qrc
+++ b/res/mixxx.qrc
@@ -36,6 +36,7 @@
         <file>images/ic_custom.svg</file>
         <file>images/ic_delete.svg</file>
         <file>images/ic_mixxx_symbolic.svg</file>
+        <file>images/ic_none.svg</file>
         <file>images/preferences/ic_preferences_autodj.svg</file>
         <file>images/preferences/ic_preferences_bpmdetect.svg</file>
         <file>images/preferences/ic_preferences_broadcast.svg</file>
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 8581ec30c98..dcdcfbd80aa 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -234,10 +234,11 @@ void DlgPrefController::enumeratePresets() {
 
     // qDebug() << "Enumerating presets for controller" << m_pController->getName();
 
-    // Insert a dummy "..." item at the top to try to make it less confusing.
+    // Insert a dummy item at the top to try to make it less confusing.
     // (We don't want the first found file showing up as the default item when a
     // user has their controller plugged in)
-    m_ui.comboBoxPreset->addItem("...");
+    QIcon noPresetIcon(":/images/ic_none.svg");
+    m_ui.comboBoxPreset->addItem(noPresetIcon, "No Preset");
 
     PresetInfo match;
     // Enumerate user presets
@@ -377,7 +378,7 @@ void DlgPrefController::slotApply() {
 
 void DlgPrefController::slotLoadPreset(int chosenIndex) {
     if (chosenIndex == 0) {
-        // User picked ...
+        // User picked no preset
         m_ui.chkEnabledDevice->setEnabled(false);
         return;
     }

From 00b625f47a8199d9efa5de63be41a2180738de42 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 00:33:23 +0200
Subject: [PATCH 24/55] controllers/controllermanager: Fix typo in debug
 message

---
 src/controllers/controllermanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 06864bd8398..3131fc2ca69 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -404,7 +404,7 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
 
         ControllerPresetPointer pPreset = pController->getPreset();
         if (!pPreset) {
-            qDebug() << "Device" << deviceName << "has no configurated preset";
+            qDebug() << "Device" << deviceName << "has no configured preset";
             continue;
         }
 

From 12f083eaabcb749dedd3dd9e17561bb2dfe55fbc Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 11:43:41 +0200
Subject: [PATCH 25/55] controllers/midi/midimessage: Use desc in 
 MidiInputMapping == operator

---
 src/controllers/midi/midimessage.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/controllers/midi/midimessage.h b/src/controllers/midi/midimessage.h
index 5e04d07ef3e..6349f446730 100644
--- a/src/controllers/midi/midimessage.h
+++ b/src/controllers/midi/midimessage.h
@@ -160,11 +160,9 @@ struct MidiInputMapping {
               control(control) {
     }
 
-    // Don't use descriptions in operator== since we only use equality testing
-    // for unit tests.
     bool operator==(const MidiInputMapping& other) const {
         return key == other.key && options == other.options &&
-                control == other.control;
+                control == other.control && description == other.description;
     }
 
     MidiKey key;

From 5ee9c9bb0061fb8b5a7da946690d099033f4436e Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 12:35:32 +0200
Subject: [PATCH 26/55] controllers/midi/midimessage: Fix MidiInputMapping ==
 operator

---
 src/controllers/midi/midimessage.h |  10 ++
 src/test/learningutilstest.cpp     | 182 ++++++++++++++++++++---------
 2 files changed, 134 insertions(+), 58 deletions(-)

diff --git a/src/controllers/midi/midimessage.h b/src/controllers/midi/midimessage.h
index 6349f446730..8223dea32e8 100644
--- a/src/controllers/midi/midimessage.h
+++ b/src/controllers/midi/midimessage.h
@@ -160,6 +160,16 @@ struct MidiInputMapping {
               control(control) {
     }
 
+    MidiInputMapping(MidiKey key,
+            MidiOptions options,
+            const ConfigKey& control,
+            QString description)
+            : key(key),
+              options(options),
+              control(control),
+              description(description) {
+    }
+
     bool operator==(const MidiInputMapping& other) const {
         return key == other.key && options == other.options &&
                 control == other.control && description == other.description;
diff --git a/src/test/learningutilstest.cpp b/src/test/learningutilstest.cpp
index 664c88a8275..07ca3c995b2 100644
--- a/src/test/learningutilstest.cpp
+++ b/src/test/learningutilstest.cpp
@@ -15,6 +15,21 @@ class LearningUtilsTest : public MixxxTest {
         m_messages.append(qMakePair(MidiKey(status, control), value));
     }
 
+    /** Check if mapping in present in mapping list.
+     *  Similar to MidiInputMappings::contains(const MidiInputMapping&), but
+     *  does not compare the description.
+     */
+    bool containsMapping(const MidiInputMappings& haystack, const MidiInputMapping& needle) {
+        for (const MidiInputMapping& mapping : haystack) {
+            if (mapping.key == needle.key &&
+                    mapping.options == needle.options &&
+                    mapping.control == needle.control) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     QList<QPair<MidiKey, unsigned char> > m_messages;
 };
 
@@ -29,8 +44,10 @@ TEST_F(LearningUtilsTest, NoteOnButton) {
 
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_NOTE_ON | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.first());
+                      MidiOptions(),
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, NoteOnNoteOffButton) {
@@ -44,11 +61,15 @@ TEST_F(LearningUtilsTest, NoteOnNoteOffButton) {
 
     ASSERT_EQ(2, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_NOTE_ON | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.at(0));
+                      MidiOptions(),
+                      control,
+                      mappings.at(0).description),
+            mappings.at(0));
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_NOTE_OFF | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.at(1));
+                      MidiOptions(),
+                      control,
+                      mappings.at(1).description),
+            mappings.at(1));
 }
 
 TEST_F(LearningUtilsTest, CC7BitKnob) {
@@ -69,8 +90,10 @@ TEST_F(LearningUtilsTest, CC7BitKnob) {
 
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.at(0));
+                      MidiOptions(),
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, CC7BitKnob_CenterPointButton_NoteOn) {
@@ -103,10 +126,13 @@ TEST_F(LearningUtilsTest, CC7BitKnob_CenterPointButton_NoteOn) {
             LearningUtils::guessMidiInputMappings(control, m_messages);
 
     ASSERT_EQ(2, mappings.size());
-    EXPECT_TRUE(mappings.contains(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                                                   MidiOptions(), control)));
-    EXPECT_TRUE(mappings.contains(MidiInputMapping(MidiKey(MIDI_NOTE_ON | 0x01, 0xE0),
-                                                   MidiOptions(), resetControl)));
+    EXPECT_TRUE(containsMapping(mappings,
+            MidiInputMapping(
+                    MidiKey(MIDI_CC | 0x01, 0x10), MidiOptions(), control)));
+    EXPECT_TRUE(containsMapping(mappings,
+            MidiInputMapping(MidiKey(MIDI_NOTE_ON | 0x01, 0xE0),
+                    MidiOptions(),
+                    resetControl)));
 
     m_messages.clear();
 
@@ -124,10 +150,13 @@ TEST_F(LearningUtilsTest, CC7BitKnob_CenterPointButton_NoteOn) {
     addMessage(MIDI_CC | 0x01, 0x10, 0x00);
 
     ASSERT_EQ(2, mappings.size());
-    EXPECT_TRUE(mappings.contains(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                                                   MidiOptions(), control)));
-    EXPECT_TRUE(mappings.contains(MidiInputMapping(MidiKey(MIDI_NOTE_ON | 0x01, 0xE0),
-                                                   MidiOptions(), resetControl)));
+    EXPECT_TRUE(containsMapping(mappings,
+            MidiInputMapping(
+                    MidiKey(MIDI_CC | 0x01, 0x10), MidiOptions(), control)));
+    EXPECT_TRUE(containsMapping(mappings,
+            MidiInputMapping(MidiKey(MIDI_NOTE_ON | 0x01, 0xE0),
+                    MidiOptions(),
+                    resetControl)));
 }
 
 TEST_F(LearningUtilsTest, CC14BitKnob_MSBFirst) {
@@ -167,12 +196,14 @@ TEST_F(LearningUtilsTest, CC14BitKnob_MSBFirst) {
     ASSERT_EQ(2, mappings.size());
     MidiOptions lsb_option;
     lsb_option.fourteen_bit_lsb = true;
-    EXPECT_TRUE(mappings.contains(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                                                   lsb_option, control)));
+    EXPECT_TRUE(containsMapping(mappings,
+            MidiInputMapping(
+                    MidiKey(MIDI_CC | 0x01, 0x10), lsb_option, control)));
     MidiOptions msb_option;
     msb_option.fourteen_bit_msb = true;
-    EXPECT_TRUE(mappings.contains(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x11),
-                                                   msb_option, control)));
+    EXPECT_TRUE(containsMapping(mappings,
+            MidiInputMapping(
+                    MidiKey(MIDI_CC | 0x01, 0x11), msb_option, control)));
 }
 
 TEST_F(LearningUtilsTest, CC14BitKnob_LSBFirst) {
@@ -212,12 +243,14 @@ TEST_F(LearningUtilsTest, CC14BitKnob_LSBFirst) {
     ASSERT_EQ(2, mappings.size());
     MidiOptions lsb_option;
     lsb_option.fourteen_bit_lsb = true;
-    EXPECT_TRUE(mappings.contains(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                                                   lsb_option, control)));
+    EXPECT_TRUE(containsMapping(mappings,
+            MidiInputMapping(
+                    MidiKey(MIDI_CC | 0x01, 0x10), lsb_option, control)));
     MidiOptions msb_option;
     msb_option.fourteen_bit_msb = true;
-    EXPECT_TRUE(mappings.contains(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x11),
-                                                   msb_option, control)));
+    EXPECT_TRUE(containsMapping(mappings,
+            MidiInputMapping(
+                    MidiKey(MIDI_CC | 0x01, 0x11), msb_option, control)));
 }
 
 TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForCC7BitTicker_Zeroes) {
@@ -236,8 +269,11 @@ TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForCC7BitTicker_Zeroes) {
     MidiOptions options;
     options.selectknob = true;
     ASSERT_EQ(1, mappings.size());
-    EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10), options, control),
-              mappings.at(0));
+    EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
+                      options,
+                      control,
+                      mappings.first().description),
+            mappings.first());
 
     m_messages.clear();
 
@@ -252,8 +288,10 @@ TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForCC7BitTicker_Zeroes) {
 
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.at(0));
+                      MidiOptions(),
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForCC7BitTicker_ZeroIncluded) {
@@ -285,8 +323,10 @@ TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForCC7BitTicker_ZeroIncluded) {
 
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.at(0));
+                      MidiOptions(),
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForCC7BitTicker) {
@@ -312,11 +352,14 @@ TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForCC7BitTicker) {
 
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.at(0));
+                      MidiOptions(),
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
-TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForSpread64Ticker_StartAndStopOn41) {
+TEST_F(LearningUtilsTest,
+        CC7BitKnob_ConfusableForSpread64Ticker_StartAndStopOn41) {
     // Moving a CC knob through its range multiple times is confusable for
     // Spread64 select knobs when a 0x41 or 0x3F is repeated. If we start and
     // stop on 0x41 (and don't pass through 0x40) then this can set off Spread64
@@ -342,8 +385,10 @@ TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForSpread64Ticker_StartAndStopOn4
 
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.at(0));
+                      MidiOptions(),
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForSpread64Ticker_0x40Included) {
@@ -375,8 +420,10 @@ TEST_F(LearningUtilsTest, CC7BitKnob_ConfusableForSpread64Ticker_0x40Included) {
 
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.at(0));
+                      MidiOptions(),
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, CC7BitTicker) {
@@ -401,8 +448,10 @@ TEST_F(LearningUtilsTest, CC7BitTicker) {
     MidiOptions options;
     options.selectknob = true;
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               options, control),
-              mappings.at(0));
+                      options,
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, Spread64Ticker) {
@@ -425,8 +474,10 @@ TEST_F(LearningUtilsTest, Spread64Ticker) {
     MidiOptions options;
     options.spread64 = true;
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               options, control),
-              mappings.at(0));
+                      options,
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, CC7BitTicker_SingleDirection) {
@@ -452,8 +503,10 @@ TEST_F(LearningUtilsTest, CC7BitTicker_SingleDirection) {
             LearningUtils::guessMidiInputMappings(control, m_messages);
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               options, control),
-              mappings.at(0));
+                      options,
+                      control,
+                      mappings.first().description),
+            mappings.first());
 
     m_messages.clear();
 
@@ -466,8 +519,10 @@ TEST_F(LearningUtilsTest, CC7BitTicker_SingleDirection) {
     mappings = LearningUtils::guessMidiInputMappings(control, m_messages);
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               options, control),
-              mappings.at(0));
+                      options,
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, SingleMessageSwitchMode_NoteOn) {
@@ -485,8 +540,10 @@ TEST_F(LearningUtilsTest, SingleMessageSwitchMode_NoteOn) {
     MidiOptions options;
     options.sw = true;
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_NOTE_ON | 0x01, 0x10),
-                               options, control),
-              mappings.at(0));
+                      options,
+                      control,
+                      mappings.first().description),
+            mappings.first());
 
     m_messages.clear();
 
@@ -497,8 +554,10 @@ TEST_F(LearningUtilsTest, SingleMessageSwitchMode_NoteOn) {
 
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_NOTE_ON | 0x01, 0x10),
-                               options, control),
-              mappings.at(0));
+                      options,
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, SingleMessageSwitchMode_CC) {
@@ -516,8 +575,10 @@ TEST_F(LearningUtilsTest, SingleMessageSwitchMode_CC) {
     MidiOptions options;
     options.sw = true;
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               options, control),
-              mappings.at(0));
+                      options,
+                      control,
+                      mappings.first().description),
+            mappings.first());
 
     m_messages.clear();
 
@@ -528,11 +589,12 @@ TEST_F(LearningUtilsTest, SingleMessageSwitchMode_CC) {
 
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_CC | 0x01, 0x10),
-                               options, control),
-              mappings.at(0));
+                      options,
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
-
 TEST_F(LearningUtilsTest, MultipleControlsUnrecognized_BindsFirst) {
     // Status 0x91, Control 0x10
     addMessage(MIDI_NOTE_ON | 0x01, 0x10, 0x7F);
@@ -547,8 +609,10 @@ TEST_F(LearningUtilsTest, MultipleControlsUnrecognized_BindsFirst) {
             LearningUtils::guessMidiInputMappings(control, m_messages);
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_NOTE_ON | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.first());
+                      MidiOptions(),
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }
 
 TEST_F(LearningUtilsTest, MultipleChannelsUnrecognized_BindsFirst) {
@@ -565,6 +629,8 @@ TEST_F(LearningUtilsTest, MultipleChannelsUnrecognized_BindsFirst) {
             LearningUtils::guessMidiInputMappings(control, m_messages);
     ASSERT_EQ(1, mappings.size());
     EXPECT_EQ(MidiInputMapping(MidiKey(MIDI_NOTE_ON | 0x01, 0x10),
-                               MidiOptions(), control),
-              mappings.first());
+                      MidiOptions(),
+                      control,
+                      mappings.first().description),
+            mappings.first());
 }

From fc97ef7c33eb25144aca8007da644a5a0c4ab620 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 13:05:32 +0200
Subject: [PATCH 27/55] controllers/controllermanager: Add "(edited)" suffix to
 changed presets

---
 src/controllers/controllermanager.cpp                    | 6 ++++++
 src/controllers/midi/midicontrollerpresetfilehandler.cpp | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 3131fc2ca69..2b5ea1b5b98 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -415,6 +415,12 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
             continue;
         }
 
+        if (pPreset->filePath().startsWith(resourcePresetsPath(m_pConfig))) {
+            pPreset->setName(QString(tr("%1 (edited)")).arg(pPreset->name()));
+            pController->setPreset(*pPreset);
+            qDebug() << "Renamed preset to " << pPreset->name();
+        }
+
         QString filename = firstAvailableFilename(filenames, deviceName);
         QString presetPath = userPresetsPath(m_pConfig) + filename
                 + pController->presetExtension();
diff --git a/src/controllers/midi/midicontrollerpresetfilehandler.cpp b/src/controllers/midi/midicontrollerpresetfilehandler.cpp
index dc90812b8f6..beafe38b753 100644
--- a/src/controllers/midi/midicontrollerpresetfilehandler.cpp
+++ b/src/controllers/midi/midicontrollerpresetfilehandler.cpp
@@ -194,7 +194,7 @@ ControllerPresetPointer MidiControllerPresetFileHandler::load(const QDomElement
 bool MidiControllerPresetFileHandler::save(const MidiControllerPreset& preset,
                                            const QString deviceName,
                                            const QString fileName) const {
-    qDebug() << "Saving preset for" << deviceName << "to" << fileName;
+    qDebug() << "Saving preset" << preset.name() << "for" << deviceName << "to" << fileName;
     QDomDocument doc = buildRootWithScripts(preset, deviceName);
     addControlsToDocument(preset, &doc);
     return writeDocument(doc, fileName);

From 390d3ddd331430eadac6c478c15ba8f385cf4f31 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 13:18:31 +0200
Subject: [PATCH 28/55] controllers: Add some comments to undocumented classes

---
 src/controllers/controllerinputmappingtablemodel.h  |  4 ++++
 src/controllers/controlleroutputmappingtablemodel.h |  4 ++++
 src/controllers/dlgprefcontroller.h                 |  2 +-
 src/controllers/dlgprefcontrollers.h                | 10 ++++++----
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/controllers/controllerinputmappingtablemodel.h b/src/controllers/controllerinputmappingtablemodel.h
index 96b6134f2a7..6abaa5ed6d0 100644
--- a/src/controllers/controllerinputmappingtablemodel.h
+++ b/src/controllers/controllerinputmappingtablemodel.h
@@ -9,6 +9,10 @@
 #include "controllers/controllermappingtablemodel.h"
 #include "controllers/midi/midimessage.h"
 
+/** Table Model for the "Inputs" table view in the preferences dialog.
+ *
+ *  This allows editing the input mappings for a MIDI preset.
+ */
 class ControllerInputMappingTableModel : public ControllerMappingTableModel {
     Q_OBJECT
   public:
diff --git a/src/controllers/controlleroutputmappingtablemodel.h b/src/controllers/controlleroutputmappingtablemodel.h
index 781338c0e7a..317837b7fef 100644
--- a/src/controllers/controlleroutputmappingtablemodel.h
+++ b/src/controllers/controlleroutputmappingtablemodel.h
@@ -9,6 +9,10 @@
 #include "controllers/controllermappingtablemodel.h"
 #include "controllers/midi/midimessage.h"
 
+/** Table Model for the "Outputs" table view in the preferences dialog.
+ *
+ *  This allows editing the output mappings for a MIDI preset.
+ */
 class ControllerOutputMappingTableModel : public ControllerMappingTableModel {
     Q_OBJECT
   public:
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index a344011a543..30c354de9b6 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -2,7 +2,7 @@
 * @file dlgprefcontroller.h
 * @author Sean M. Pappalardo  spappalardo@mixxx.org
 * @date Mon May 2 2011
-* @brief Configuration dialog for a DJ controller
+* @brief Configuration dialog for a single DJ controller
 */
 
 #ifndef DLGPREFCONTROLLER_H
diff --git a/src/controllers/dlgprefcontrollers.h b/src/controllers/dlgprefcontrollers.h
index 9fbef1bc47e..66be4651cf8 100644
--- a/src/controllers/dlgprefcontrollers.h
+++ b/src/controllers/dlgprefcontrollers.h
@@ -1,5 +1,4 @@
-#ifndef DLGPREFCONTROLLERS_H
-#define DLGPREFCONTROLLERS_H
+#pragma once
 
 #include <QTreeWidgetItem>
 
@@ -11,6 +10,11 @@ class DlgPreferences;
 class DlgPrefController;
 class ControllerManager;
 
+/** Controllers Overview in the preferences
+ *
+ *  This dialog allows selecting controllers for configuration.
+ */
+
 class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControllersDlg {
     Q_OBJECT
   public:
@@ -43,5 +47,3 @@ class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControlle
     QList<DlgPrefController*> m_controllerWindows;
     QList<QTreeWidgetItem*> m_controllerTreeItems;
 };
-
-#endif /* DLGPREFCONTROLLERS_H */

From 02ee5c447347326466c9accf6eaefd68895d7e88 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 13:51:21 +0200
Subject: [PATCH 29/55] controllers/controllermanager: Remove obsolete
 importScript method

---
 src/controllers/controllermanager.cpp | 68 ---------------------------
 src/controllers/controllermanager.h   |  1 -
 2 files changed, 69 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 2b5ea1b5b98..59e59dc0c65 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -479,71 +479,3 @@ QString ControllerManager::getAbsolutePath(const QString& pathOrFilename,
 
     return QString();
 }
-
-bool ControllerManager::importScript(const QString& scriptPath,
-                                     QString* newScriptFileName) {
-    QDir userPresets(userPresetsPath(m_pConfig));
-
-    qDebug() << "ControllerManager::importScript importing script" << scriptPath
-             << "to" << userPresets.absolutePath();
-
-    QFile scriptFile(scriptPath);
-    QFileInfo script(scriptFile);
-
-    if (!script.exists() || !script.isReadable()) {
-        qWarning() << "ControllerManager::importScript script does not exist"
-                   << "or is unreadable:" << scriptPath;
-        return false;
-    }
-
-    // Not fatal if we can't checksum but still warn about it.
-    quint16 scriptChecksum = 0;
-    bool scriptChecksumGood = checksumFile(scriptPath, &scriptChecksum);
-    if (!scriptChecksumGood) {
-        qWarning() << "ControllerManager::importScript could not checksum file:"
-                   << scriptPath;
-    }
-
-    // The name we will save this file as in our local script mixxxdb. The
-    // conflict resolution logic below will mutate this variable if the name is
-    // already taken.
-    QString scriptFileName = script.fileName();
-
-    // For a file like "myfile.foo.bar.js", scriptBaseName is "myfile.foo.bar"
-    // and scriptSuffix is "js".
-    QString scriptBaseName = script.completeBaseName();
-    QString scriptSuffix = script.suffix();
-    int conflictNumber = 1;
-
-    // This script exists.
-    while (userPresets.exists(scriptFileName)) {
-        // If the two files are identical. We're done.
-        quint16 localScriptChecksum = 0;
-        if (checksumFile(userPresets.filePath(scriptFileName), &localScriptChecksum) &&
-            scriptChecksumGood && scriptChecksum == localScriptChecksum) {
-            *newScriptFileName = scriptFileName;
-            qDebug() << "ControllerManager::importScript" << scriptFileName
-                     << "had identical checksum to a file of the same name."
-                     << "Skipping import.";
-            return true;
-        }
-
-        // Otherwise, we need to rename the file to a non-conflicting
-        // name. Insert a .X where X is a counter that we count up until we find
-        // a filename that does not exist.
-        scriptFileName = QString("%1.%2.%3").arg(
-            scriptBaseName,
-            QString::number(conflictNumber++),
-            scriptSuffix);
-    }
-
-    QString destinationPath = userPresets.filePath(scriptFileName);
-    if (!scriptFile.copy(destinationPath)) {
-        qDebug() << "ControllerManager::importScript could not copy script to"
-                 << "local preset path:" << destinationPath;
-        return false;
-    }
-
-    *newScriptFileName = scriptFileName;
-    return true;
-}
diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h
index dae740ee713..e1047f09d7d 100644
--- a/src/controllers/controllermanager.h
+++ b/src/controllers/controllermanager.h
@@ -53,7 +53,6 @@ class ControllerManager : public QObject {
     static QString getAbsolutePath(const QString& pathOrFilename,
                                    const QStringList& presetPaths);
 
-    bool importScript(const QString& scriptPath, QString* newScriptFileName);
     static bool checksumFile(const QString& filename, quint16* pChecksum);
 
   signals:

From 98d50b00cc93e84e253662d136f0e8d0082ded44 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 14:37:28 +0200
Subject: [PATCH 30/55]     controllers: Always load scripts from mapping dir
 (with system as fallback)

---
 src/controllers/controller.cpp                 | 11 ++++++++++-
 src/controllers/controller.h                   |  2 +-
 src/controllers/controllermanager.cpp          |  4 ++--
 src/controllers/controllerpreset.h             |  7 ++++++-
 src/controllers/midi/midicontroller.cpp        |  4 ++--
 src/controllers/midi/midicontroller.h          |  2 +-
 src/test/controller_preset_validation_test.cpp | 14 +++++++-------
 7 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/controllers/controller.cpp b/src/controllers/controller.cpp
index 15a1e1dd5ec..f1ac6dc8f48 100644
--- a/src/controllers/controller.cpp
+++ b/src/controllers/controller.cpp
@@ -50,7 +50,7 @@ void Controller::stopEngine() {
     m_pEngine = NULL;
 }
 
-bool Controller::applyPreset(QList<QString> scriptPaths, bool initializeScripts) {
+bool Controller::applyPreset(const QString& fallbackScriptPath, bool initializeScripts) {
     qDebug() << "Applying controller preset...";
 
     const ControllerPreset* pPreset = preset();
@@ -66,6 +66,15 @@ bool Controller::applyPreset(QList<QString> scriptPaths, bool initializeScripts)
         return true;
     }
 
+    // Always prefer script from the mapping's directory
+    QList<QString> scriptPaths = {pPreset->dirPath().absolutePath()};
+
+    // Additional fallback path if a script file is not present in the
+    // mapping's directory
+    if (!scriptPaths.contains(fallbackScriptPath)) {
+        scriptPaths << fallbackScriptPath;
+    }
+
     bool success = m_pEngine->loadScriptFiles(scriptPaths, pPreset->scripts);
     if (initializeScripts) {
         m_pEngine->initializeScripts(pPreset->scripts);
diff --git a/src/controllers/controller.h b/src/controllers/controller.h
index 09a20d8181b..f5deeb87ba7 100644
--- a/src/controllers/controller.h
+++ b/src/controllers/controller.h
@@ -83,7 +83,7 @@ class Controller : public QObject, ConstControllerPresetVisitor {
     virtual void receive(const QByteArray data, mixxx::Duration timestamp);
 
     // Initializes the controller engine and returns whether it was successful.
-    virtual bool applyPreset(QList<QString> scriptPaths, bool initializeScripts);
+    virtual bool applyPreset(const QString& fallbackScriptPath, bool initializeScripts);
 
     // Puts the controller in and out of learning mode.
     void startLearning();
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 59e59dc0c65..0f90618fce9 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -263,7 +263,7 @@ void ControllerManager::slotSetUpDevices() {
             qWarning() << "There was a problem opening" << name;
             continue;
         }
-        pController->applyPreset(getPresetPaths(m_pConfig), true);
+        pController->applyPreset(resourcePresetsPath(m_pConfig), true);
     }
 
     maybeStartOrStopPolling();
@@ -355,7 +355,7 @@ void ControllerManager::openController(Controller* pController) {
     // If successfully opened the device, apply the preset and save the
     // preference setting.
     if (result == 0) {
-        pController->applyPreset(getPresetPaths(m_pConfig), true);
+        pController->applyPreset(resourcePresetsPath(m_pConfig), true);
 
         // Update configuration to reflect controller is enabled.
         m_pConfig->setValue(
diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h
index 19fcfefad9e..b8acab95765 100644
--- a/src/controllers/controllerpreset.h
+++ b/src/controllers/controllerpreset.h
@@ -11,10 +11,11 @@
 #ifndef CONTROLLERPRESET_H
 #define CONTROLLERPRESET_H
 
+#include <QDir>
 #include <QHash>
+#include <QList>
 #include <QSharedPointer>
 #include <QString>
-#include <QList>
 
 class ControllerPresetVisitor;
 class ConstControllerPresetVisitor;
@@ -78,6 +79,10 @@ class ControllerPreset {
         return m_filePath;
     }
 
+    inline QDir dirPath() const {
+        return QFileInfo(filePath()).absoluteDir();
+    }
+
     inline void setName(const QString name) {
         m_name = name;
         setDirty(true);
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
index 2f613c954ba..a9554c30cda 100644
--- a/src/controllers/midi/midicontroller.cpp
+++ b/src/controllers/midi/midicontroller.cpp
@@ -59,9 +59,9 @@ bool MidiController::savePreset(const QString fileName) const {
     return handler.save(m_preset, getName(), fileName);
 }
 
-bool MidiController::applyPreset(QList<QString> scriptPaths, bool initializeScripts) {
+bool MidiController::applyPreset(const QString& fallbackScriptPath, bool initializeScripts) {
     // Handles the engine
-    bool result = Controller::applyPreset(scriptPaths, initializeScripts);
+    bool result = Controller::applyPreset(fallbackScriptPath, initializeScripts);
 
     // Only execute this code if this is an output device
     if (isOutputDevice()) {
diff --git a/src/controllers/midi/midicontroller.h b/src/controllers/midi/midicontroller.h
index a81ff7d680c..ee173ee2914 100644
--- a/src/controllers/midi/midicontroller.h
+++ b/src/controllers/midi/midicontroller.h
@@ -76,7 +76,7 @@ class MidiController : public Controller {
 
   private slots:
     // Initializes the engine and static output mappings.
-    bool applyPreset(QList<QString> scriptPaths, bool initializeScripts) override;
+    bool applyPreset(const QString& fallbackScriptPath, bool initializeScripts) override;
 
     void learnTemporaryInputMappings(const MidiInputMappings& mappings);
     void clearTemporaryInputMappings();
diff --git a/src/test/controller_preset_validation_test.cpp b/src/test/controller_preset_validation_test.cpp
index a1a65f4015f..5ce0cb64dfe 100644
--- a/src/test/controller_preset_validation_test.cpp
+++ b/src/test/controller_preset_validation_test.cpp
@@ -122,14 +122,15 @@ FakeController::~FakeController() {
 class ControllerPresetValidationTest : public MixxxTest {
   protected:
     void SetUp() override {
-        m_presetPaths << QDir::currentPath() + "/res/controllers";
-        m_pEnumerator.reset(new PresetInfoEnumerator(m_presetPaths));
+        m_presetPath = QDir::currentPath() + "/res/controllers";
+        m_pEnumerator.reset(new PresetInfoEnumerator(QList<QString>{m_presetPath}));
     }
 
     bool testLoadPreset(const PresetInfo& preset) {
         ControllerPresetPointer pPreset =
-                ControllerPresetFileHandler::loadPreset(preset.getPath(),
-                                                        m_presetPaths);
+                ControllerPresetFileHandler::loadPreset(
+                        preset.getPath(),
+                        QList<QString>{m_presetPath});
         if (pPreset.isNull()) {
             return false;
         }
@@ -139,13 +140,12 @@ class ControllerPresetValidationTest : public MixxxTest {
         controller.startEngine();
         controller.setPreset(*pPreset);
         // Do not initialize the scripts.
-        bool result = controller.applyPreset(m_presetPaths, false);
+        bool result = controller.applyPreset(m_presetPath, false);
         controller.stopEngine();
         return result;
     }
 
-
-    QStringList m_presetPaths;
+    QString m_presetPath;
     QScopedPointer<PresetInfoEnumerator> m_pEnumerator;
 };
 

From cb12d22ea4bddd682ac482173387e26f9fe146c2 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 14:39:45 +0200
Subject: [PATCH 31/55] controllers/dlgprefcontroller: Add "(built-in)" to
 system scripts

---
 src/controllers/dlgprefcontroller.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index bd1487aa177..c945029f0f5 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -224,16 +224,27 @@ QString DlgPrefController::presetScriptFileLinks(const ControllerPresetPointer p
     QString scriptFileLinks;
 
     if (pPreset) {
-        QList<QString> presetDirs;
-        presetDirs.append(userPresetsPath(m_pConfig));
-        presetDirs.append(resourcePresetsPath(m_pConfig));
+        // Always prefer script from the mapping's directory
+        QList<QString> scriptPaths = {pPreset->dirPath().absolutePath()};
+
+        QString systemPresetPath = resourcePresetsPath(m_pConfig);
+        if (!scriptPaths.contains(systemPresetPath)) {
+            scriptPaths << systemPresetPath;
+        }
+
         QStringList linkList;
         for (QList<ControllerPreset::ScriptFileInfo>::iterator it =
                      pPreset->scripts.begin(); it != pPreset->scripts.end(); ++it) {
             QString name = it->name;
             QString path = ControllerManager::getAbsolutePath(
-                    name, presetDirs);
+                    name, scriptPaths);
             QString scriptFileLink = "<a href=\"" + path + "\">" + name + "</a>";
+
+            qDebug() << "path" << path << systemPresetPath;
+            if (path.startsWith(systemPresetPath)) {
+                scriptFileLink = QString(tr("%1 (built-in)")).arg(scriptFileLink);
+            }
+
             linkList << scriptFileLink;
         }
         scriptFileLinks = linkList.join("<br/>");

From 148a4e684600931695746809394e1e909517bfa0 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 19:58:51 +0200
Subject: [PATCH 32/55] controllers: Move script file search code into
 ControllerPreset class

---
 src/controllers/controller.cpp                | 17 ++-----
 src/controllers/controllerengine.cpp          | 50 ++++++-------------
 src/controllers/controllerengine.h            |  7 ++-
 src/controllers/controllerpreset.h            | 32 ++++++++++--
 .../controllerpresetfilehandler.cpp           |  8 ++-
 src/controllers/controllerpresetfilehandler.h |  4 +-
 src/controllers/dlgprefcontroller.cpp         | 39 ++++++---------
 .../hid/hidcontrollerpresetfilehandler.cpp    |  4 +-
 .../hid/hidcontrollerpresetfilehandler.h      |  3 +-
 .../midi/midicontrollerpresetfilehandler.cpp  |  4 +-
 .../midi/midicontrollerpresetfilehandler.h    |  4 +-
 11 files changed, 85 insertions(+), 87 deletions(-)

diff --git a/src/controllers/controller.cpp b/src/controllers/controller.cpp
index f1ac6dc8f48..97be00322ae 100644
--- a/src/controllers/controller.cpp
+++ b/src/controllers/controller.cpp
@@ -61,23 +61,16 @@ bool Controller::applyPreset(const QString& fallbackScriptPath, bool initializeS
         return false;
     }
 
-    if (pPreset->scripts.isEmpty()) {
+    QList<ControllerPreset::ScriptFileInfo> scriptFiles =
+            pPreset->getScriptFiles(fallbackScriptPath);
+    if (scriptFiles.isEmpty()) {
         qWarning() << "No script functions available! Did the XML file(s) load successfully? See above for any errors.";
         return true;
     }
 
-    // Always prefer script from the mapping's directory
-    QList<QString> scriptPaths = {pPreset->dirPath().absolutePath()};
-
-    // Additional fallback path if a script file is not present in the
-    // mapping's directory
-    if (!scriptPaths.contains(fallbackScriptPath)) {
-        scriptPaths << fallbackScriptPath;
-    }
-
-    bool success = m_pEngine->loadScriptFiles(scriptPaths, pPreset->scripts);
+    bool success = m_pEngine->loadScriptFiles(scriptFiles);
     if (initializeScripts) {
-        m_pEngine->initializeScripts(pPreset->scripts);
+        m_pEngine->initializeScripts(scriptFiles);
     }
     return success;
 }
diff --git a/src/controllers/controllerengine.cpp b/src/controllers/controllerengine.cpp
index 1488353b5d4..0f10d74c19e 100644
--- a/src/controllers/controllerengine.cpp
+++ b/src/controllers/controllerengine.cpp
@@ -227,14 +227,10 @@ void ControllerEngine::initializeScriptEngine() {
    Input:   List of script paths and file names to load
    Output:  Returns true if no errors occurred.
    -------- ------------------------------------------------------ */
-bool ControllerEngine::loadScriptFiles(const QList<QString>& scriptPaths,
-                                       const QList<ControllerPreset::ScriptFileInfo>& scripts) {
-    m_lastScriptPaths = scriptPaths;
-
-    // scriptPaths holds the paths to search in when we're looking for scripts
+bool ControllerEngine::loadScriptFiles(const QList<ControllerPreset::ScriptFileInfo>& scripts) {
     bool result = true;
-    for (const ControllerPreset::ScriptFileInfo& script : scripts) {
-        if (!evaluate(script.name, scriptPaths)) {
+    for (const auto& script : scripts) {
+        if (!evaluate(script.file)) {
             result = false;
         }
 
@@ -243,6 +239,8 @@ bool ControllerEngine::loadScriptFiles(const QList<QString>& scriptPaths,
         }
     }
 
+    m_lastScriptFiles = scripts;
+
     connect(&m_scriptWatcher, SIGNAL(fileChanged(QString)),
             this, SLOT(scriptHasChanged(QString)));
 
@@ -271,10 +269,10 @@ void ControllerEngine::scriptHasChanged(const QString& scriptFilename) {
     }
 
     initializeScriptEngine();
-    loadScriptFiles(m_lastScriptPaths, pPreset->scripts);
+    loadScriptFiles(m_lastScriptFiles);
 
     qDebug() << "Re-initializing scripts";
-    initializeScripts(pPreset->scripts);
+    initializeScripts(m_lastScriptFiles);
 }
 
 /* -------- ------------------------------------------------------
@@ -310,10 +308,7 @@ void ControllerEngine::initializeScripts(const QList<ControllerPreset::ScriptFil
    Output:  -
    -------- ------------------------------------------------------ */
 bool ControllerEngine::evaluate(const QString& filepath) {
-    QList<QString> dummy;
-    bool ret = evaluate(filepath, dummy);
-
-    return ret;
+    return evaluate(QFileInfo(filepath));
 }
 
 bool ControllerEngine::syntaxIsValid(const QString& scriptCode) {
@@ -933,35 +928,22 @@ void ControllerEngine::trigger(QString group, QString name) {
    Input:   Script filename
    Output:  false if the script file has errors or doesn't exist
    -------- ------------------------------------------------------ */
-bool ControllerEngine::evaluate(const QString& scriptName, QList<QString> scriptPaths) {
+bool ControllerEngine::evaluate(const QFileInfo& scriptFile) {
     if (m_pEngine == nullptr) {
         return false;
     }
 
-    QString filename = "";
-    QFile input;
-
-    if (scriptPaths.length() == 0) {
-        // If we aren't given any paths to search, assume that scriptName
-        // contains the full file name
-        filename = scriptName;
-        input.setFileName(filename);
-    } else {
-        for (const QString& scriptPath : scriptPaths) {
-            QDir scriptPathDir(scriptPath);
-            filename = scriptPathDir.absoluteFilePath(scriptName);
-            input.setFileName(filename);
-            if (input.exists())  {
-                qDebug() << "ControllerEngine: Watching JS File:" << filename;
-                m_scriptWatcher.addPath(filename);
-                break;
-            }
-        }
+    if (!scriptFile.exists()) {
+        qWarning() << "ControllerEngine: File does not exist:" << scriptFile;
+        return false;
     }
+    m_scriptWatcher.addPath(scriptFile.absoluteFilePath());
 
-    qDebug() << "ControllerEngine: Loading" << filename;
+    qDebug() << "ControllerEngine: Loading" << scriptFile;
 
     // Read in the script file
+    QString filename = scriptFile.absoluteFilePath();
+    QFile input(filename);
     if (!input.open(QIODevice::ReadOnly)) {
         qWarning() << QString("ControllerEngine: Problem opening the script file: %1, error # %2, %3")
                 .arg(filename, QString::number(input.error()), input.errorString());
diff --git a/src/controllers/controllerengine.h b/src/controllers/controllerengine.h
index 87a75abd730..ecc1c4a4761 100644
--- a/src/controllers/controllerengine.h
+++ b/src/controllers/controllerengine.h
@@ -158,8 +158,7 @@ class ControllerEngine : public QObject {
 
     // Evaluates all provided script files and returns true if no script errors
     // occurred while evaluating them.
-    bool loadScriptFiles(const QList<QString>& scriptPaths,
-                         const QList<ControllerPreset::ScriptFileInfo>& scripts);
+    bool loadScriptFiles(const QList<ControllerPreset::ScriptFileInfo>& scripts);
     void initializeScripts(const QList<ControllerPreset::ScriptFileInfo>& scripts);
     void gracefulShutdown();
     void scriptHasChanged(const QString&);
@@ -173,7 +172,7 @@ class ControllerEngine : public QObject {
 
   private:
     bool syntaxIsValid(const QString& scriptCode);
-    bool evaluate(const QString& scriptName, QList<QString> scriptPaths);
+    bool evaluate(const QFileInfo& scriptFile);
     bool internalExecute(QScriptValue thisObject, const QString& scriptCode);
     bool internalExecute(QScriptValue thisObject, QScriptValue functionObject,
                          QScriptValueList arguments);
@@ -221,7 +220,7 @@ class ControllerEngine : public QObject {
     QHash<QString, QScriptValue> m_scriptWrappedFunctionCache;
     // Filesystem watcher for script auto-reload
     QFileSystemWatcher m_scriptWatcher;
-    QList<QString> m_lastScriptPaths;
+    QList<ControllerPreset::ScriptFileInfo> m_lastScriptFiles;
 
     friend class ControllerEngineTest;
 };
diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h
index b8acab95765..8ed4cd15cd6 100644
--- a/src/controllers/controllerpreset.h
+++ b/src/controllers/controllerpreset.h
@@ -11,6 +11,7 @@
 #ifndef CONTROLLERPRESET_H
 #define CONTROLLERPRESET_H
 
+#include <QDebug>
 #include <QDir>
 #include <QHash>
 #include <QList>
@@ -35,6 +36,7 @@ class ControllerPreset {
 
         QString name;
         QString functionPrefix;
+        QFileInfo file;
         bool builtin;
     };
 
@@ -43,16 +45,38 @@ class ControllerPreset {
      * @param filename Name of the XML file to add
      * @param functionprefix Function prefix to add
      */
-    void addScriptFile(QString filename, QString functionprefix,
-                       bool builtin=false) {
+    void addScriptFile(QString filename, QString functionprefix, bool builtin = false) {
         ScriptFileInfo info;
         info.name = filename;
         info.functionPrefix = functionprefix;
+        // Always try to load script from the mapping's directory first
+        info.file = QFileInfo(dirPath().absoluteFilePath(filename));
         info.builtin = builtin;
-        scripts.append(info);
+        m_scripts.append(info);
         setDirty(true);
     }
 
+    QList<ScriptFileInfo> getScriptFiles(const QString& fallbackPath = QString()) const {
+        if (fallbackPath.isEmpty()) {
+            return m_scripts;
+        }
+
+        QDir path(fallbackPath);
+        QList<ScriptFileInfo> scriptsWithFallbackPath;
+        for (const ScriptFileInfo& script : m_scripts) {
+            qDebug() << "script" << script.file;
+            if (script.file.exists()) {
+                scriptsWithFallbackPath << script;
+                continue;
+            }
+
+            ScriptFileInfo info(script);
+            info.file = QFileInfo(path.absoluteFilePath(info.name));
+            scriptsWithFallbackPath << info;
+        }
+        return scriptsWithFallbackPath;
+    }
+
     inline void setDirty(bool bDirty) {
         m_bDirty = bDirty;
     }
@@ -171,6 +195,8 @@ class ControllerPreset {
     QString m_wikilink;
     QString m_schemaVersion;
     QString m_mixxxVersion;
+
+    QList<ScriptFileInfo> m_scripts;
 };
 
 typedef QSharedPointer<ControllerPreset> ControllerPresetPointer;
diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp
index 22e045bef52..ec063ac9e3c 100644
--- a/src/controllers/controllerpresetfilehandler.cpp
+++ b/src/controllers/controllerpresetfilehandler.cpp
@@ -56,10 +56,8 @@ ControllerPresetPointer ControllerPresetFileHandler::load(const QString path,
                                                           const QString deviceName) {
     qDebug() << "Loading controller preset from" << path;
     ControllerPresetPointer pPreset = load(XmlParse::openXMLFile(path, "controller"),
-                                           deviceName);
-    if (pPreset) {
-        pPreset->setFilePath(path);
-    }
+            path,
+            deviceName);
     return pPreset;
 }
 
@@ -198,7 +196,7 @@ QDomDocument ControllerPresetFileHandler::buildRootWithScripts(const ControllerP
     QDomElement scriptFiles = doc.createElement("scriptfiles");
     controller.appendChild(scriptFiles);
 
-    foreach (const ControllerPreset::ScriptFileInfo& script, preset.scripts) {
+    foreach (const ControllerPreset::ScriptFileInfo& script, preset.getScriptFiles()) {
         QString filename = script.name;
         // Don't need to write anything for built-in files.
         if (script.builtin) {
diff --git a/src/controllers/controllerpresetfilehandler.h b/src/controllers/controllerpresetfilehandler.h
index 904a8721960..04a1f266c15 100644
--- a/src/controllers/controllerpresetfilehandler.h
+++ b/src/controllers/controllerpresetfilehandler.h
@@ -58,7 +58,9 @@ class ControllerPresetFileHandler {
 
   private:
     // Sub-classes implement this.
-    virtual ControllerPresetPointer load(const QDomElement root, const QString deviceName) = 0;
+    virtual ControllerPresetPointer load(const QDomElement root,
+            const QString filePath,
+            const QString deviceName) = 0;
 };
 
 #endif
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index c945029f0f5..04fc78e096f 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -221,35 +221,26 @@ QString DlgPrefController::presetWikiLink(const ControllerPresetPointer pPreset)
 }
 
 QString DlgPrefController::presetScriptFileLinks(const ControllerPresetPointer pPreset) const {
-    QString scriptFileLinks;
+    if (!pPreset) {
+        return QString();
+    }
 
-    if (pPreset) {
-        // Always prefer script from the mapping's directory
-        QList<QString> scriptPaths = {pPreset->dirPath().absolutePath()};
+    QString systemPresetPath = resourcePresetsPath(m_pConfig);
+    QStringList linkList;
+    for (const auto& script : pPreset->getScriptFiles(resourcePresetsPath(m_pConfig))) {
+        QString scriptFileLink = QStringLiteral("<a href=\"") +
+                script.file.absoluteFilePath() + QStringLiteral("\">") +
+                script.name + QStringLiteral("</a>");
 
-        QString systemPresetPath = resourcePresetsPath(m_pConfig);
-        if (!scriptPaths.contains(systemPresetPath)) {
-            scriptPaths << systemPresetPath;
+        if (!script.file.exists()) {
+            scriptFileLink += QStringLiteral(" (") + tr("missing") + QStringLiteral(")");
+        } else if (script.file.absoluteFilePath().startsWith(systemPresetPath)) {
+            scriptFileLink += QStringLiteral(" (") + tr("built-in") + QStringLiteral(")");
         }
 
-        QStringList linkList;
-        for (QList<ControllerPreset::ScriptFileInfo>::iterator it =
-                     pPreset->scripts.begin(); it != pPreset->scripts.end(); ++it) {
-            QString name = it->name;
-            QString path = ControllerManager::getAbsolutePath(
-                    name, scriptPaths);
-            QString scriptFileLink = "<a href=\"" + path + "\">" + name + "</a>";
-
-            qDebug() << "path" << path << systemPresetPath;
-            if (path.startsWith(systemPresetPath)) {
-                scriptFileLink = QString(tr("%1 (built-in)")).arg(scriptFileLink);
-            }
-
-            linkList << scriptFileLink;
-        }
-        scriptFileLinks = linkList.join("<br/>");
+        linkList << scriptFileLink;
     }
-    return scriptFileLinks;
+    return linkList.join("<br/>");
 }
 
 void DlgPrefController::slotDirty() {
diff --git a/src/controllers/hid/hidcontrollerpresetfilehandler.cpp b/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
index c300103a6fd..09616054bc5 100644
--- a/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
+++ b/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
@@ -8,7 +8,8 @@ bool HidControllerPresetFileHandler::save(const HidControllerPreset& preset,
 }
 
 ControllerPresetPointer HidControllerPresetFileHandler::load(const QDomElement root,
-                                                             const QString deviceName) {
+        const QString filePath,
+        const QString deviceName) {
     if (root.isNull()) {
         return ControllerPresetPointer();
     }
@@ -19,6 +20,7 @@ ControllerPresetPointer HidControllerPresetFileHandler::load(const QDomElement r
     }
 
     HidControllerPreset* preset = new HidControllerPreset();
+    preset->setFilePath(filePath);
     parsePresetInfo(root, preset);
     addScriptFilesToPreset(controller, preset);
     return ControllerPresetPointer(preset);
diff --git a/src/controllers/hid/hidcontrollerpresetfilehandler.h b/src/controllers/hid/hidcontrollerpresetfilehandler.h
index 7e27fc0eafe..ee1eff7fbf8 100644
--- a/src/controllers/hid/hidcontrollerpresetfilehandler.h
+++ b/src/controllers/hid/hidcontrollerpresetfilehandler.h
@@ -14,7 +14,8 @@ class HidControllerPresetFileHandler : public ControllerPresetFileHandler {
 
   private:
     virtual ControllerPresetPointer load(const QDomElement root,
-                                         const QString deviceName);
+            const QString filePath,
+            const QString deviceName);
 };
 
 #endif /* HIDCONTROLLERPRESETFILEHANDLER_H */
diff --git a/src/controllers/midi/midicontrollerpresetfilehandler.cpp b/src/controllers/midi/midicontrollerpresetfilehandler.cpp
index beafe38b753..51f67473666 100644
--- a/src/controllers/midi/midicontrollerpresetfilehandler.cpp
+++ b/src/controllers/midi/midicontrollerpresetfilehandler.cpp
@@ -15,7 +15,8 @@
 #define DEFAULT_OUTPUT_OFF  0x00
 
 ControllerPresetPointer MidiControllerPresetFileHandler::load(const QDomElement root,
-                                                              const QString deviceName) {
+        const QString filePath,
+        const QString deviceName) {
     if (root.isNull()) {
         return ControllerPresetPointer();
     }
@@ -26,6 +27,7 @@ ControllerPresetPointer MidiControllerPresetFileHandler::load(const QDomElement
     }
 
     MidiControllerPreset* preset = new MidiControllerPreset();
+    preset->setFilePath(filePath);
 
     // Superclass handles parsing <info> tag and script files
     parsePresetInfo(root, preset);
diff --git a/src/controllers/midi/midicontrollerpresetfilehandler.h b/src/controllers/midi/midicontrollerpresetfilehandler.h
index e43e850580f..b1767b4b520 100644
--- a/src/controllers/midi/midicontrollerpresetfilehandler.h
+++ b/src/controllers/midi/midicontrollerpresetfilehandler.h
@@ -20,7 +20,9 @@ class MidiControllerPresetFileHandler : public ControllerPresetFileHandler {
               const QString deviceName, const QString fileName) const;
 
   private:
-    virtual ControllerPresetPointer load(const QDomElement root, const QString deviceName);
+    virtual ControllerPresetPointer load(const QDomElement root,
+            const QString filePath,
+            const QString deviceName);
 
     void addControlsToDocument(const MidiControllerPreset& preset,
                                QDomDocument* doc) const;

From 86829dfd1f9f87d6af9f6994fedce551b6b8519a Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 21:32:35 +0200
Subject: [PATCH 33/55] controllers/controllerpreset: Remove leftover qDebug()
 statement

---
 src/controllers/controllerpreset.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h
index 8ed4cd15cd6..45dccd1156e 100644
--- a/src/controllers/controllerpreset.h
+++ b/src/controllers/controllerpreset.h
@@ -64,7 +64,6 @@ class ControllerPreset {
         QDir path(fallbackPath);
         QList<ScriptFileInfo> scriptsWithFallbackPath;
         for (const ScriptFileInfo& script : m_scripts) {
-            qDebug() << "script" << script.file;
             if (script.file.exists()) {
                 scriptsWithFallbackPath << script;
                 continue;

From 6ac15f13d79a475a5037b93b78afd1936d4cbbca Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 21:33:33 +0200
Subject: [PATCH 34/55] controllers/controllerpresetfilehandler: Use for loop
 instead of foreach

---
 src/controllers/controllerpresetfilehandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp
index ec063ac9e3c..56a90bd2c0e 100644
--- a/src/controllers/controllerpresetfilehandler.cpp
+++ b/src/controllers/controllerpresetfilehandler.cpp
@@ -196,7 +196,7 @@ QDomDocument ControllerPresetFileHandler::buildRootWithScripts(const ControllerP
     QDomElement scriptFiles = doc.createElement("scriptfiles");
     controller.appendChild(scriptFiles);
 
-    foreach (const ControllerPreset::ScriptFileInfo& script, preset.getScriptFiles()) {
+    for (const ControllerPreset::ScriptFileInfo& script : preset.getScriptFiles()) {
         QString filename = script.name;
         // Don't need to write anything for built-in files.
         if (script.builtin) {

From 4fe397be6cb370184442c596a06fbfde813b6f8c Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 00:10:36 +0200
Subject: [PATCH 35/55] controllers: Move controller script file handling to
 FileHandler classes

---
 src/controllers/controller.cpp                |  5 +-
 src/controllers/controller.h                  |  2 +-
 src/controllers/controllermanager.cpp         | 16 +++-
 src/controllers/controllerpreset.h            | 30 ++-----
 .../controllerpresetfilehandler.cpp           | 80 +++++++++++--------
 src/controllers/controllerpresetfilehandler.h | 14 ++--
 src/controllers/dlgprefcontroller.cpp         |  4 +-
 .../hid/hidcontrollerpresetfilehandler.cpp    |  5 +-
 .../hid/hidcontrollerpresetfilehandler.h      |  3 +-
 src/controllers/midi/midicontroller.cpp       |  4 +-
 src/controllers/midi/midicontroller.h         |  2 +-
 .../midi/midicontrollerpresetfilehandler.cpp  |  5 +-
 .../midi/midicontrollerpresetfilehandler.h    |  3 +-
 .../controller_preset_validation_test.cpp     | 11 +--
 14 files changed, 98 insertions(+), 86 deletions(-)

diff --git a/src/controllers/controller.cpp b/src/controllers/controller.cpp
index 97be00322ae..fb16eea5a70 100644
--- a/src/controllers/controller.cpp
+++ b/src/controllers/controller.cpp
@@ -50,7 +50,7 @@ void Controller::stopEngine() {
     m_pEngine = NULL;
 }
 
-bool Controller::applyPreset(const QString& fallbackScriptPath, bool initializeScripts) {
+bool Controller::applyPreset(bool initializeScripts) {
     qDebug() << "Applying controller preset...";
 
     const ControllerPreset* pPreset = preset();
@@ -61,8 +61,7 @@ bool Controller::applyPreset(const QString& fallbackScriptPath, bool initializeS
         return false;
     }
 
-    QList<ControllerPreset::ScriptFileInfo> scriptFiles =
-            pPreset->getScriptFiles(fallbackScriptPath);
+    QList<ControllerPreset::ScriptFileInfo> scriptFiles = pPreset->getScriptFiles();
     if (scriptFiles.isEmpty()) {
         qWarning() << "No script functions available! Did the XML file(s) load successfully? See above for any errors.";
         return true;
diff --git a/src/controllers/controller.h b/src/controllers/controller.h
index f5deeb87ba7..34a74a329f6 100644
--- a/src/controllers/controller.h
+++ b/src/controllers/controller.h
@@ -83,7 +83,7 @@ class Controller : public QObject, ConstControllerPresetVisitor {
     virtual void receive(const QByteArray data, mixxx::Duration timestamp);
 
     // Initializes the controller engine and returns whether it was successful.
-    virtual bool applyPreset(const QString& fallbackScriptPath, bool initializeScripts);
+    virtual bool applyPreset(bool initializeScripts);
 
     // Puts the controller in and out of learning mode.
     void startLearning();
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 0f90618fce9..64e2f8cc2c9 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -219,6 +219,7 @@ void ControllerManager::slotSetUpDevices() {
 
     updateControllerList();
     QList<Controller*> deviceList = getControllerList(false, true);
+    QStringList presetPaths(getPresetPaths(m_pConfig));
 
     foreach (Controller* pController, deviceList) {
         QString name = pController->getName();
@@ -241,9 +242,16 @@ void ControllerManager::slotSetUpDevices() {
             continue;
         }
 
+        qDebug() << "Searching for controller preset" << presetFile
+                 << "in paths:" << presetPaths.join(",");
+        QString presetFilePath = ControllerManager::getAbsolutePath(presetFile, presetPaths);
+        if (presetFilePath.isEmpty()) {
+            qDebug() << "Could not find" << presetFilePath << "in any preset path.";
+            continue;
+        }
+
         ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset(
-                presetFile,
-                getPresetPaths(m_pConfig));
+                QFileInfo(presetFilePath), resourcePresetsPath(m_pConfig));
 
         if (!loadPreset(pController, pPreset)) {
             // TODO(XXX) : auto load midi preset here.
@@ -263,7 +271,7 @@ void ControllerManager::slotSetUpDevices() {
             qWarning() << "There was a problem opening" << name;
             continue;
         }
-        pController->applyPreset(resourcePresetsPath(m_pConfig), true);
+        pController->applyPreset(true);
     }
 
     maybeStartOrStopPolling();
@@ -355,7 +363,7 @@ void ControllerManager::openController(Controller* pController) {
     // If successfully opened the device, apply the preset and save the
     // preference setting.
     if (result == 0) {
-        pController->applyPreset(resourcePresetsPath(m_pConfig), true);
+        pController->applyPreset(true);
 
         // Update configuration to reflect controller is enabled.
         m_pConfig->setValue(
diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h
index 45dccd1156e..d0a2576ba1a 100644
--- a/src/controllers/controllerpreset.h
+++ b/src/controllers/controllerpreset.h
@@ -45,35 +45,21 @@ class ControllerPreset {
      * @param filename Name of the XML file to add
      * @param functionprefix Function prefix to add
      */
-    void addScriptFile(QString filename, QString functionprefix, bool builtin = false) {
+    void addScriptFile(const QString& name,
+            const QString& functionprefix,
+            const QFileInfo& file,
+            bool builtin = false) {
         ScriptFileInfo info;
-        info.name = filename;
+        info.name = name;
         info.functionPrefix = functionprefix;
-        // Always try to load script from the mapping's directory first
-        info.file = QFileInfo(dirPath().absoluteFilePath(filename));
+        info.file = file;
         info.builtin = builtin;
         m_scripts.append(info);
         setDirty(true);
     }
 
-    QList<ScriptFileInfo> getScriptFiles(const QString& fallbackPath = QString()) const {
-        if (fallbackPath.isEmpty()) {
-            return m_scripts;
-        }
-
-        QDir path(fallbackPath);
-        QList<ScriptFileInfo> scriptsWithFallbackPath;
-        for (const ScriptFileInfo& script : m_scripts) {
-            if (script.file.exists()) {
-                scriptsWithFallbackPath << script;
-                continue;
-            }
-
-            ScriptFileInfo info(script);
-            info.file = QFileInfo(path.absoluteFilePath(info.name));
-            scriptsWithFallbackPath << info;
-        }
-        return scriptsWithFallbackPath;
+    const QList<ScriptFileInfo>& getScriptFiles() const {
+        return m_scripts;
     }
 
     inline void setDirty(bool bDirty) {
diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp
index 56a90bd2c0e..4b5e06ac86e 100644
--- a/src/controllers/controllerpresetfilehandler.cpp
+++ b/src/controllers/controllerpresetfilehandler.cpp
@@ -13,39 +13,33 @@
 #include "controllers/hid/hidcontrollerpresetfilehandler.h"
 
 // static
-ControllerPresetPointer ControllerPresetFileHandler::loadPreset(const QString& pathOrFilename,
-                                                                const QStringList& presetPaths) {
-    qDebug() << "Searching for controller preset" << pathOrFilename
-             << "in paths:" << presetPaths.join(",");
-    QString scriptPath = ControllerManager::getAbsolutePath(pathOrFilename,
-                                                            presetPaths);
-
-    if (scriptPath.isEmpty()) {
-        qDebug() << "Could not find" << pathOrFilename
-                 << "in any preset path.";
+ControllerPresetPointer ControllerPresetFileHandler::loadPreset(
+        const QFileInfo& presetFile, const QDir& systemPresetsPath) {
+    VERIFY_OR_DEBUG_ASSERT(presetFile.exists() && presetFile.isReadable()) {
+        qDebug() << "Preset" << presetFile.absoluteFilePath()
+                 << "does not exist or is unreadable.";
         return ControllerPresetPointer();
     }
 
-    QFileInfo scriptPathInfo(scriptPath);
-    if (!scriptPathInfo.exists() || !scriptPathInfo.isReadable()) {
-        qDebug() << "Preset" << scriptPath << "does not exist or is unreadable.";
-        return ControllerPresetPointer();
-    }
-
-    ControllerPresetFileHandler* pHandler = NULL;
-    if (scriptPath.endsWith(MIDI_PRESET_EXTENSION, Qt::CaseInsensitive)) {
+    ControllerPresetFileHandler* pHandler = nullptr;
+    if (presetFile.fileName().endsWith(
+                MIDI_PRESET_EXTENSION, Qt::CaseInsensitive)) {
         pHandler = new MidiControllerPresetFileHandler();
-    } else if (scriptPath.endsWith(HID_PRESET_EXTENSION, Qt::CaseInsensitive) ||
-               scriptPath.endsWith(BULK_PRESET_EXTENSION, Qt::CaseInsensitive)) {
+    } else if (presetFile.fileName().endsWith(
+                       HID_PRESET_EXTENSION, Qt::CaseInsensitive) ||
+            presetFile.fileName().endsWith(
+                    BULK_PRESET_EXTENSION, Qt::CaseInsensitive)) {
         pHandler = new HidControllerPresetFileHandler();
     }
 
-    if (pHandler == NULL) {
-        qDebug() << "Preset" << scriptPath << "has an unrecognized extension.";
+    if (pHandler == nullptr) {
+        qDebug() << "Preset" << presetFile.absoluteFilePath()
+                 << "has an unrecognized extension.";
         return ControllerPresetPointer();
     }
 
-    ControllerPresetPointer pPreset = pHandler->load(scriptPath, QString());
+    ControllerPresetPointer pPreset = pHandler->load(
+            presetFile.absoluteFilePath(), QString(), systemPresetsPath);
     if (pPreset) {
         pPreset->setDirty(false);
     }
@@ -53,16 +47,19 @@ ControllerPresetPointer ControllerPresetFileHandler::loadPreset(const QString& p
 }
 
 ControllerPresetPointer ControllerPresetFileHandler::load(const QString path,
-                                                          const QString deviceName) {
+        const QString deviceName,
+        const QDir& systemPresetsPath) {
     qDebug() << "Loading controller preset from" << path;
-    ControllerPresetPointer pPreset = load(XmlParse::openXMLFile(path, "controller"),
-            path,
-            deviceName);
+    ControllerPresetPointer pPreset =
+            load(XmlParse::openXMLFile(path, "controller"),
+                    path,
+                    deviceName,
+                    systemPresetsPath);
     return pPreset;
 }
 
-void ControllerPresetFileHandler::parsePresetInfo(const QDomElement& root,
-                                                  ControllerPreset* preset) const {
+void ControllerPresetFileHandler::parsePresetInfo(
+        const QDomElement& root, ControllerPreset* preset) const {
     if (root.isNull() || !preset) {
         return;
     }
@@ -88,8 +85,8 @@ void ControllerPresetFileHandler::parsePresetInfo(const QDomElement& root,
     preset->setWikiLink(wiki.isNull() ? "" : wiki.text());
 }
 
-QDomElement ControllerPresetFileHandler::getControllerNode(const QDomElement& root,
-                                                           const QString deviceName) {
+QDomElement ControllerPresetFileHandler::getControllerNode(
+        const QDomElement& root, const QString deviceName) {
     Q_UNUSED(deviceName);
     if (root.isNull()) {
         return QDomElement();
@@ -102,7 +99,9 @@ QDomElement ControllerPresetFileHandler::getControllerNode(const QDomElement& ro
 }
 
 void ControllerPresetFileHandler::addScriptFilesToPreset(
-    const QDomElement& controller, ControllerPreset* preset) const {
+        const QDomElement& controller,
+        ControllerPreset* preset,
+        const QDir& systemPresetsPath) const {
     if (controller.isNull())
         return;
 
@@ -111,16 +110,27 @@ void ControllerPresetFileHandler::addScriptFilesToPreset(
 
     // Build a list of script files to load
     QDomElement scriptFile = controller.firstChildElement("scriptfiles")
-            .firstChildElement("file");
+                                     .firstChildElement("file");
 
     // Default currently required file
-    preset->addScriptFile(REQUIRED_SCRIPT_FILE, "", true);
+    preset->addScriptFile(REQUIRED_SCRIPT_FILE,
+            "",
+            QFileInfo(systemPresetsPath.absoluteFilePath(REQUIRED_SCRIPT_FILE)),
+            true);
 
     // Look for additional ones
     while (!scriptFile.isNull()) {
         QString functionPrefix = scriptFile.attribute("functionprefix","");
         QString filename = scriptFile.attribute("filename","");
-        preset->addScriptFile(filename, functionPrefix);
+
+        // Always try to load script from the mapping's directory first
+        QFileInfo file = QFileInfo(preset->dirPath().absoluteFilePath(filename));
+        if (!file.exists()) {
+            // If the script does not exist, try to find it in the fallback dir
+            file = QFileInfo(systemPresetsPath.absoluteFilePath(filename));
+        }
+
+        preset->addScriptFile(filename, functionPrefix, file);
         scriptFile = scriptFile.nextSiblingElement("file");
     }
 }
diff --git a/src/controllers/controllerpresetfilehandler.h b/src/controllers/controllerpresetfilehandler.h
index 04a1f266c15..527706c4d9e 100644
--- a/src/controllers/controllerpresetfilehandler.h
+++ b/src/controllers/controllerpresetfilehandler.h
@@ -16,15 +16,17 @@ class ControllerPresetFileHandler {
     ControllerPresetFileHandler() {};
     virtual ~ControllerPresetFileHandler() {};
 
-    static ControllerPresetPointer loadPreset(const QString& path,
-                                              const QStringList& presetPaths);
+    static ControllerPresetPointer loadPreset(const QFileInfo& presetFile,
+            const QDir& systemPresetsPath);
 
     /** load(QString,QString,bool)
      * Overloaded function for convenience
      * @param path The path to a controller preset XML file.
      * @param deviceName The name/id of the controller
      */
-    ControllerPresetPointer load(const QString path, const QString deviceName);
+    ControllerPresetPointer load(const QString path,
+            const QString deviceName,
+            const QDir& systemPresetsPath);
 
     // Returns just the name of a given device (everything before the first
     // space)
@@ -47,7 +49,8 @@ class ControllerPresetFileHandler {
      * @param preset The ControllerPreset into which the scripts should be placed.
      */
     void addScriptFilesToPreset(const QDomElement& root,
-                                ControllerPreset* preset) const;
+            ControllerPreset* preset,
+            const QDir& systemPresetsPath) const;
 
     // Creates the XML document and includes what script files are currently
     // loaded. Sub-classes need to call this before adding any other items.
@@ -60,7 +63,8 @@ class ControllerPresetFileHandler {
     // Sub-classes implement this.
     virtual ControllerPresetPointer load(const QDomElement root,
             const QString filePath,
-            const QString deviceName) = 0;
+            const QString deviceName,
+            const QDir& systemPresetPath) = 0;
 };
 
 #endif
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 04fc78e096f..73167ccc049 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -227,7 +227,7 @@ QString DlgPrefController::presetScriptFileLinks(const ControllerPresetPointer p
 
     QString systemPresetPath = resourcePresetsPath(m_pConfig);
     QStringList linkList;
-    for (const auto& script : pPreset->getScriptFiles(resourcePresetsPath(m_pConfig))) {
+    for (const auto& script : pPreset->getScriptFiles()) {
         QString scriptFileLink = QStringLiteral("<a href=\"") +
                 script.file.absoluteFilePath() + QStringLiteral("\">") +
                 script.name + QStringLiteral("</a>");
@@ -390,7 +390,7 @@ void DlgPrefController::slotLoadPreset(int chosenIndex) {
     presetDirs.append(presetFileInfo.canonicalPath());
 
     ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset(
-        presetPath, ControllerManager::getPresetPaths(m_pConfig));
+            presetPath, QDir(resourcePresetsPath(m_pConfig)));
 
     if (!pPreset) {
         return;
diff --git a/src/controllers/hid/hidcontrollerpresetfilehandler.cpp b/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
index 09616054bc5..7b04dda605c 100644
--- a/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
+++ b/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
@@ -9,7 +9,8 @@ bool HidControllerPresetFileHandler::save(const HidControllerPreset& preset,
 
 ControllerPresetPointer HidControllerPresetFileHandler::load(const QDomElement root,
         const QString filePath,
-        const QString deviceName) {
+        const QString deviceName,
+        const QDir& systemPresetsPath) {
     if (root.isNull()) {
         return ControllerPresetPointer();
     }
@@ -22,6 +23,6 @@ ControllerPresetPointer HidControllerPresetFileHandler::load(const QDomElement r
     HidControllerPreset* preset = new HidControllerPreset();
     preset->setFilePath(filePath);
     parsePresetInfo(root, preset);
-    addScriptFilesToPreset(controller, preset);
+    addScriptFilesToPreset(controller, preset, systemPresetsPath);
     return ControllerPresetPointer(preset);
 }
diff --git a/src/controllers/hid/hidcontrollerpresetfilehandler.h b/src/controllers/hid/hidcontrollerpresetfilehandler.h
index ee1eff7fbf8..910900dabd8 100644
--- a/src/controllers/hid/hidcontrollerpresetfilehandler.h
+++ b/src/controllers/hid/hidcontrollerpresetfilehandler.h
@@ -15,7 +15,8 @@ class HidControllerPresetFileHandler : public ControllerPresetFileHandler {
   private:
     virtual ControllerPresetPointer load(const QDomElement root,
             const QString filePath,
-            const QString deviceName);
+            const QString deviceName,
+            const QDir& systemPresetsPath);
 };
 
 #endif /* HIDCONTROLLERPRESETFILEHANDLER_H */
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
index a9554c30cda..dc3196ecc2a 100644
--- a/src/controllers/midi/midicontroller.cpp
+++ b/src/controllers/midi/midicontroller.cpp
@@ -59,9 +59,9 @@ bool MidiController::savePreset(const QString fileName) const {
     return handler.save(m_preset, getName(), fileName);
 }
 
-bool MidiController::applyPreset(const QString& fallbackScriptPath, bool initializeScripts) {
+bool MidiController::applyPreset(bool initializeScripts) {
     // Handles the engine
-    bool result = Controller::applyPreset(fallbackScriptPath, initializeScripts);
+    bool result = Controller::applyPreset(initializeScripts);
 
     // Only execute this code if this is an output device
     if (isOutputDevice()) {
diff --git a/src/controllers/midi/midicontroller.h b/src/controllers/midi/midicontroller.h
index ee173ee2914..04460a2b201 100644
--- a/src/controllers/midi/midicontroller.h
+++ b/src/controllers/midi/midicontroller.h
@@ -76,7 +76,7 @@ class MidiController : public Controller {
 
   private slots:
     // Initializes the engine and static output mappings.
-    bool applyPreset(const QString& fallbackScriptPath, bool initializeScripts) override;
+    bool applyPreset(bool initializeScripts) override;
 
     void learnTemporaryInputMappings(const MidiInputMappings& mappings);
     void clearTemporaryInputMappings();
diff --git a/src/controllers/midi/midicontrollerpresetfilehandler.cpp b/src/controllers/midi/midicontrollerpresetfilehandler.cpp
index 51f67473666..4954d92f1d3 100644
--- a/src/controllers/midi/midicontrollerpresetfilehandler.cpp
+++ b/src/controllers/midi/midicontrollerpresetfilehandler.cpp
@@ -16,7 +16,8 @@
 
 ControllerPresetPointer MidiControllerPresetFileHandler::load(const QDomElement root,
         const QString filePath,
-        const QString deviceName) {
+        const QString deviceName,
+        const QDir& systemPresetsPath) {
     if (root.isNull()) {
         return ControllerPresetPointer();
     }
@@ -31,7 +32,7 @@ ControllerPresetPointer MidiControllerPresetFileHandler::load(const QDomElement
 
     // Superclass handles parsing <info> tag and script files
     parsePresetInfo(root, preset);
-    addScriptFilesToPreset(controller, preset);
+    addScriptFilesToPreset(controller, preset, systemPresetsPath);
 
     QDomElement control = controller.firstChildElement("controls").firstChildElement("control");
 
diff --git a/src/controllers/midi/midicontrollerpresetfilehandler.h b/src/controllers/midi/midicontrollerpresetfilehandler.h
index b1767b4b520..020810386f7 100644
--- a/src/controllers/midi/midicontrollerpresetfilehandler.h
+++ b/src/controllers/midi/midicontrollerpresetfilehandler.h
@@ -22,7 +22,8 @@ class MidiControllerPresetFileHandler : public ControllerPresetFileHandler {
   private:
     virtual ControllerPresetPointer load(const QDomElement root,
             const QString filePath,
-            const QString deviceName);
+            const QString deviceName,
+            const QDir& systemPresetPath);
 
     void addControlsToDocument(const MidiControllerPreset& preset,
                                QDomDocument* doc) const;
diff --git a/src/test/controller_preset_validation_test.cpp b/src/test/controller_preset_validation_test.cpp
index 5ce0cb64dfe..334205d7efe 100644
--- a/src/test/controller_preset_validation_test.cpp
+++ b/src/test/controller_preset_validation_test.cpp
@@ -122,15 +122,16 @@ FakeController::~FakeController() {
 class ControllerPresetValidationTest : public MixxxTest {
   protected:
     void SetUp() override {
-        m_presetPath = QDir::currentPath() + "/res/controllers";
-        m_pEnumerator.reset(new PresetInfoEnumerator(QList<QString>{m_presetPath}));
+        m_presetPath = QDir::current();
+        m_presetPath.cd("res/controllers");
+        m_pEnumerator.reset(new PresetInfoEnumerator(QList<QString>{m_presetPath.absolutePath()}));
     }
 
     bool testLoadPreset(const PresetInfo& preset) {
         ControllerPresetPointer pPreset =
                 ControllerPresetFileHandler::loadPreset(
                         preset.getPath(),
-                        QList<QString>{m_presetPath});
+                        m_presetPath);
         if (pPreset.isNull()) {
             return false;
         }
@@ -140,12 +141,12 @@ class ControllerPresetValidationTest : public MixxxTest {
         controller.startEngine();
         controller.setPreset(*pPreset);
         // Do not initialize the scripts.
-        bool result = controller.applyPreset(m_presetPath, false);
+        bool result = controller.applyPreset(false);
         controller.stopEngine();
         return result;
     }
 
-    QString m_presetPath;
+    QDir m_presetPath;
     QScopedPointer<PresetInfoEnumerator> m_pEnumerator;
 };
 

From a93cd8dac960aa8ebf2da7f66ed5f809d329e4d3 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 10:07:29 +0200
Subject: [PATCH 36/55] controllers: Make applyPreset initializeScripts param
 optional

---
 src/controllers/controller.h          | 10 ++++++++--
 src/controllers/controllermanager.cpp |  4 ++--
 src/controllers/midi/midicontroller.h | 10 ++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/controllers/controller.h b/src/controllers/controller.h
index 34a74a329f6..215f4d24b06 100644
--- a/src/controllers/controller.h
+++ b/src/controllers/controller.h
@@ -82,8 +82,14 @@ class Controller : public QObject, ConstControllerPresetVisitor {
     // this if they have an alternate way of handling such data.)
     virtual void receive(const QByteArray data, mixxx::Duration timestamp);
 
-    // Initializes the controller engine and returns whether it was successful.
-    virtual bool applyPreset(bool initializeScripts);
+    /** Apply the preset to the controller.
+     *  @brief Initializes both controller engine and static output mappings.
+     *
+     *  @param initializeScripts Can be set to false to skip script
+     *  initialization for unit tests.
+     *  @return Returns whether it was successful.
+     */
+    virtual bool applyPreset(bool initializeScripts = true);
 
     // Puts the controller in and out of learning mode.
     void startLearning();
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 64e2f8cc2c9..69b9918d3d9 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -271,7 +271,7 @@ void ControllerManager::slotSetUpDevices() {
             qWarning() << "There was a problem opening" << name;
             continue;
         }
-        pController->applyPreset(true);
+        pController->applyPreset();
     }
 
     maybeStartOrStopPolling();
@@ -363,7 +363,7 @@ void ControllerManager::openController(Controller* pController) {
     // If successfully opened the device, apply the preset and save the
     // preference setting.
     if (result == 0) {
-        pController->applyPreset(true);
+        pController->applyPreset();
 
         // Update configuration to reflect controller is enabled.
         m_pConfig->setValue(
diff --git a/src/controllers/midi/midicontroller.h b/src/controllers/midi/midicontroller.h
index 04460a2b201..8b11b57c93b 100644
--- a/src/controllers/midi/midicontroller.h
+++ b/src/controllers/midi/midicontroller.h
@@ -75,8 +75,14 @@ class MidiController : public Controller {
     int close() override;
 
   private slots:
-    // Initializes the engine and static output mappings.
-    bool applyPreset(bool initializeScripts) override;
+    /** Apply the preset to the controller.
+     *  @brief Initializes both controller engine and static output mappings.
+     *
+     *  @param initializeScripts Can be set to false to skip script
+     *  initialization for unit tests.
+     *  @return Returns whether it was successful.
+     */
+    bool applyPreset(bool initializeScripts = false) override;
 
     void learnTemporaryInputMappings(const MidiInputMappings& mappings);
     void clearTemporaryInputMappings();

From 43220941f729eaa9f66f99b7fbad0ff97766a464 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 10:12:43 +0200
Subject: [PATCH 37/55] controllers/controllermanager: Replace foreach for for
 loops

---
 src/controllers/controllermanager.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 69b9918d3d9..103a0ce4cd3 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -155,7 +155,7 @@ void ControllerManager::slotShutdown() {
     locker.unlock();
 
     // Delete enumerators and they'll delete their Devices
-    foreach (ControllerEnumerator* pEnumerator, enumerators) {
+    for (ControllerEnumerator* pEnumerator : enumerators) {
         delete pEnumerator;
     }
 
@@ -173,7 +173,7 @@ void ControllerManager::updateControllerList() {
     locker.unlock();
 
     QList<Controller*> newDeviceList;
-    foreach (ControllerEnumerator* pEnumerator, enumerators) {
+    for (ControllerEnumerator* pEnumerator : enumerators) {
         newDeviceList.append(pEnumerator->queryDevices());
     }
 
@@ -201,7 +201,7 @@ QList<Controller*> ControllerManager::getControllerList(bool bOutputDevices, boo
     // options.
     QList<Controller*> filteredDeviceList;
 
-    foreach (Controller* device, controllers) {
+    for (Controller* device : controllers) {
         if ((bOutputDevices == device->isOutputDevice()) ||
             (bInputDevices == device->isInputDevice())) {
             filteredDeviceList.push_back(device);
@@ -221,7 +221,7 @@ void ControllerManager::slotSetUpDevices() {
     QList<Controller*> deviceList = getControllerList(false, true);
     QStringList presetPaths(getPresetPaths(m_pConfig));
 
-    foreach (Controller* pController, deviceList) {
+    for (Controller* pController : deviceList) {
         QString name = pController->getName();
 
         if (pController->isOpen()) {
@@ -283,7 +283,7 @@ void ControllerManager::maybeStartOrStopPolling() {
     locker.unlock();
 
     bool shouldPoll = false;
-    foreach (Controller* pController, controllers) {
+    for (Controller* pController : controllers) {
         if (pController->isOpen() && pController->isPolling()) {
             shouldPoll = true;
         }
@@ -337,7 +337,7 @@ void ControllerManager::pollDevices() {
     }
 
     mixxx::Duration start = mixxx::Time::elapsed();
-    foreach (Controller* pDevice, m_controllers) {
+    for (Controller* pDevice : m_controllers) {
         if (pDevice->isOpen() && pDevice->isPolling()) {
             pDevice->poll();
         }
@@ -403,7 +403,7 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
     // TODO(rryan): This should be split up somehow but the filename selection
     // is dependent on all of the controllers to prevent over-writing each
     // other. We need a better solution.
-    foreach (Controller* pController, deviceList) {
+    for (Controller* pController : deviceList) {
         if (onlyActive && !pController->isOpen()) {
             continue;
         }
@@ -477,7 +477,7 @@ QString ControllerManager::getAbsolutePath(const QString& pathOrFilename,
         return pathOrFilename;
     }
 
-    foreach (const QString& path, paths) {
+    for (const QString& path : paths) {
         QDir pathDir(path);
 
         if (pathDir.exists(pathOrFilename)) {

From e18e5d6eb15644ea14f635ff9d8e3f613345bcf8 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 10:27:05 +0200
Subject: [PATCH 38/55] controllers/controllerpresetfilehandler: Improve script
 file search code

---
 .../controllerpresetfilehandler.cpp           | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp
index 4b5e06ac86e..2e5a7e5c952 100644
--- a/src/controllers/controllerpresetfilehandler.cpp
+++ b/src/controllers/controllerpresetfilehandler.cpp
@@ -12,6 +12,32 @@
 #include "controllers/midi/midicontrollerpresetfilehandler.h"
 #include "controllers/hid/hidcontrollerpresetfilehandler.h"
 
+namespace {
+
+/** Find script file in the preset or system path.
+ *
+ *  @param preset The controller preset the script belongs to.
+ *  @param filename The script filename.
+ *  @param systemPresetsPath The system presets path to use as fallback.
+ *  @return Returns a QFileInfo object. If the script was not found in either
+ *  of the search directories, the QFileInfo object might point to a
+ *  non-existing file.
+ */
+QFileInfo findScriptFile(ControllerPreset* preset,
+        const QString& filename,
+        const QDir& systemPresetsPath) {
+    // Always try to load script from the mapping's directory first
+    QFileInfo file = QFileInfo(preset->dirPath().absoluteFilePath(filename));
+
+    // If the script does not exist, try to find it in the fallback dir
+    if (!file.exists()) {
+        file = QFileInfo(systemPresetsPath.absoluteFilePath(filename));
+    }
+    return file;
+}
+
+} // namespace
+
 // static
 ControllerPresetPointer ControllerPresetFileHandler::loadPreset(
         const QFileInfo& presetFile, const QDir& systemPresetsPath) {
@@ -115,20 +141,14 @@ void ControllerPresetFileHandler::addScriptFilesToPreset(
     // Default currently required file
     preset->addScriptFile(REQUIRED_SCRIPT_FILE,
             "",
-            QFileInfo(systemPresetsPath.absoluteFilePath(REQUIRED_SCRIPT_FILE)),
+            findScriptFile(preset, REQUIRED_SCRIPT_FILE, systemPresetsPath),
             true);
 
     // Look for additional ones
     while (!scriptFile.isNull()) {
         QString functionPrefix = scriptFile.attribute("functionprefix","");
         QString filename = scriptFile.attribute("filename","");
-
-        // Always try to load script from the mapping's directory first
-        QFileInfo file = QFileInfo(preset->dirPath().absoluteFilePath(filename));
-        if (!file.exists()) {
-            // If the script does not exist, try to find it in the fallback dir
-            file = QFileInfo(systemPresetsPath.absoluteFilePath(filename));
-        }
+        QFileInfo file = findScriptFile(preset, filename, systemPresetsPath);
 
         preset->addScriptFile(filename, functionPrefix, file);
         scriptFile = scriptFile.nextSiblingElement("file");

From 814b2435d3e8031fa33ea492c81ed2e7c2c79194 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 10:32:30 +0200
Subject: [PATCH 39/55] controllers/controllerpresetfilehandler: Remove wrong
 debug assertion

---
 src/controllers/controllerpresetfilehandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp
index 2e5a7e5c952..ba00b92f1c3 100644
--- a/src/controllers/controllerpresetfilehandler.cpp
+++ b/src/controllers/controllerpresetfilehandler.cpp
@@ -41,7 +41,7 @@ QFileInfo findScriptFile(ControllerPreset* preset,
 // static
 ControllerPresetPointer ControllerPresetFileHandler::loadPreset(
         const QFileInfo& presetFile, const QDir& systemPresetsPath) {
-    VERIFY_OR_DEBUG_ASSERT(presetFile.exists() && presetFile.isReadable()) {
+    if (!presetFile.exists() || !presetFile.isReadable()) {
         qDebug() << "Preset" << presetFile.absoluteFilePath()
                  << "does not exist or is unreadable.";
         return ControllerPresetPointer();

From a0d395f472a42cdf760fcfb0a45110b7913c0dfb Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 10:44:18 +0200
Subject: [PATCH 40/55] controllers/controllerpresetfilehandler: Improve
 comments

---
 src/controllers/controllerpresetfilehandler.h | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/controllers/controllerpresetfilehandler.h b/src/controllers/controllerpresetfilehandler.h
index 527706c4d9e..66891f44e5a 100644
--- a/src/controllers/controllerpresetfilehandler.h
+++ b/src/controllers/controllerpresetfilehandler.h
@@ -1,12 +1,17 @@
+#pragma once
 /**
 * @file controllerpresetfilehandler.h
 * @author Sean Pappalardo spappalardo@mixxx.org
 * @date Mon 9 Apr 2012
 * @brief Handles loading and saving of Controller presets.
 *
+* The ControllerPresetFileHandler is used for serializing/deserializing the
+* ControllerPreset objects to/from XML files and is also responsible
+* finding the script files that belong to a preset in the file system.
+*
+* Subclasses can implement the private load function to add support for XML
+* elements that are only useful for certain mapping types.
 */
-#ifndef CONTROLLERPRESETFILEHANDLER_H
-#define CONTROLLERPRESETFILEHANDLER_H
 
 #include "util/xml.h"
 #include "controllers/controllerpreset.h"
@@ -19,8 +24,8 @@ class ControllerPresetFileHandler {
     static ControllerPresetPointer loadPreset(const QFileInfo& presetFile,
             const QDir& systemPresetsPath);
 
-    /** load(QString,QString,bool)
-     * Overloaded function for convenience
+    /** Overloaded function for convenience
+     *
      * @param path The path to a controller preset XML file.
      * @param deviceName The name/id of the controller
      */
@@ -41,12 +46,15 @@ class ControllerPresetFileHandler {
     void parsePresetInfo(const QDomElement& root,
                          ControllerPreset* preset) const;
 
-    /** addScriptFilesToPreset(QDomElement,QString,bool)
-     * Loads script files specified in a QDomElement structure into the supplied
-     *   ControllerPreset.
+    /** Adds script files from XML to the ControllerPreset.
+     *
+     * This function parses the supplied QDomElement structure, finds the
+     * matching script files inside the search paths and adds them to
+     * ControllerPreset.
+     *
      * @param root The root node of the XML document for the preset.
-     * @param deviceName The name/id of the controller
-     * @param preset The ControllerPreset into which the scripts should be placed.
+     * @param deviceName The name/id of the controller.
+     * @param preset The ControllerPreset these scripts belong to.
      */
     void addScriptFilesToPreset(const QDomElement& root,
             ControllerPreset* preset,
@@ -66,5 +74,3 @@ class ControllerPresetFileHandler {
             const QString deviceName,
             const QDir& systemPresetPath) = 0;
 };
-
-#endif

From e59d4654c1c9b704cbe58e445c5778f3c7baeadc Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 10:46:09 +0200
Subject: [PATCH 41/55] controllers/dlgprefcontroller: Remove unused  presetDir
 code

---
 src/controllers/dlgprefcontroller.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 73167ccc049..bfd7bee5d74 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -381,14 +381,6 @@ void DlgPrefController::slotLoadPreset(int chosenIndex) {
     m_ui.chkEnabledDevice->setEnabled(true);
 
     const QString presetPath = m_ui.comboBoxPreset->itemData(chosenIndex).toString();
-    // When loading the preset, we only want to load from the same dir as the
-    // preset itself, otherwise when loading from the system-wide dir we'll
-    // start the search in the user's dir find the existing script,
-    // and do nothing.
-    const QFileInfo presetFileInfo(presetPath);
-    QList<QString> presetDirs;
-    presetDirs.append(presetFileInfo.canonicalPath());
-
     ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset(
             presetPath, QDir(resourcePresetsPath(m_pConfig)));
 

From d4ee3889e62e37870d6448216b6404354cc9ecea Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 13:55:09 +0200
Subject: [PATCH 42/55] controllers/controllerengine: Fix warnings for older
 Qt5 versions

---
 src/controllers/controllerengine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/controllerengine.cpp b/src/controllers/controllerengine.cpp
index 0f10d74c19e..7739b742d4a 100644
--- a/src/controllers/controllerengine.cpp
+++ b/src/controllers/controllerengine.cpp
@@ -934,12 +934,12 @@ bool ControllerEngine::evaluate(const QFileInfo& scriptFile) {
     }
 
     if (!scriptFile.exists()) {
-        qWarning() << "ControllerEngine: File does not exist:" << scriptFile;
+        qWarning() << "ControllerEngine: File does not exist:" << scriptFile.absoluteFilePath();
         return false;
     }
     m_scriptWatcher.addPath(scriptFile.absoluteFilePath());
 
-    qDebug() << "ControllerEngine: Loading" << scriptFile;
+    qDebug() << "ControllerEngine: Loading" << scriptFile.absoluteFilePath();
 
     // Read in the script file
     QString filename = scriptFile.absoluteFilePath();

From 13c2d599470d3aed9ce58624cbba7b3cd5a1f9ba Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 15:15:54 +0200
Subject: [PATCH 43/55] controllers: Move savePreset() from Controller into
 Preset classes

---
 CMakeLists.txt                                |  2 +
 build/depends.py                              |  1 +
 build/features.py                             |  3 +-
 src/controllers/bulk/bulkcontroller.cpp       |  5 --
 src/controllers/bulk/bulkcontroller.h         |  2 -
 src/controllers/controller.h                  |  2 -
 src/controllers/controllermanager.cpp         |  2 +-
 src/controllers/controllerpreset.h            |  2 +
 .../controllerpresetfilehandler.cpp           | 37 ++++-----
 src/controllers/controllerpresetfilehandler.h | 15 ++--
 src/controllers/hid/hidcontroller.cpp         |  5 --
 src/controllers/hid/hidcontroller.h           |  2 -
 src/controllers/hid/hidcontrollerpreset.cpp   | 36 +++++++++
 src/controllers/hid/hidcontrollerpreset.h     | 31 +++----
 .../hid/hidcontrollerpresetfilehandler.cpp    | 12 ++-
 .../hid/hidcontrollerpresetfilehandler.h      |  8 +-
 src/controllers/midi/midicontroller.cpp       |  5 --
 src/controllers/midi/midicontroller.h         |  2 -
 src/controllers/midi/midicontrollerpreset.cpp | 79 ++++++++++++++++++
 src/controllers/midi/midicontrollerpreset.h   | 80 ++++---------------
 .../midi/midicontrollerpresetfilehandler.cpp  | 14 ++--
 .../midi/midicontrollerpresetfilehandler.h    |  8 +-
 .../controller_preset_validation_test.cpp     |  5 --
 23 files changed, 192 insertions(+), 166 deletions(-)
 create mode 100644 src/controllers/hid/hidcontrollerpreset.cpp
 create mode 100644 src/controllers/midi/midicontrollerpreset.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d8c5f9385b..66c2b5aecf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,6 +217,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/controllers/keyboard/keyboardeventfilter.cpp
   src/controllers/learningutils.cpp
   src/controllers/midi/midicontroller.cpp
+  src/controllers/midi/midicontrollerpreset.cpp
   src/controllers/midi/midicontrollerpresetfilehandler.cpp
   src/controllers/midi/midienumerator.cpp
   src/controllers/midi/midimessage.cpp
@@ -1979,6 +1980,7 @@ if(HID)
   target_sources(mixxx-lib PRIVATE
     src/controllers/hid/hidcontroller.cpp
     src/controllers/hid/hidenumerator.cpp
+    src/controllers/hid/hidcontrollerpreset.cpp
     src/controllers/hid/hidcontrollerpresetfilehandler.cpp
   )
   target_compile_definitions(mixxx-lib PUBLIC __HID__)
diff --git a/build/depends.py b/build/depends.py
index b68c7f85cdf..f8794c9a680 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -924,6 +924,7 @@ def sources(self, build):
                    "src/controllers/midi/midimessage.cpp",
                    "src/controllers/midi/midiutils.cpp",
                    "src/controllers/midi/midicontroller.cpp",
+                   "src/controllers/midi/midicontrollerpreset.cpp",
                    "src/controllers/midi/midicontrollerpresetfilehandler.cpp",
                    "src/controllers/midi/midienumerator.cpp",
                    "src/controllers/midi/midioutputhandler.cpp",
diff --git a/build/features.py b/build/features.py
index 993d6a2824b..ed9a80858d7 100644
--- a/build/features.py
+++ b/build/features.py
@@ -100,6 +100,7 @@ def configure(self, build, conf):
 
     def sources(self, build):
         sources = ['src/controllers/hid/hidcontroller.cpp',
+                   'src/controllers/hid/hidcontrollerpreset.cpp',
                    'src/controllers/hid/hidenumerator.cpp',
                    'src/controllers/hid/hidcontrollerpresetfilehandler.cpp']
 
@@ -707,7 +708,7 @@ def configure(self, build, conf):
             # https://bugs.launchpad.net/mixxx/+bug/1833225
             if not conf.CheckForPKG('shout', '2.4.4'):
                 self.INTERNAL_LINK = True
- 
+
         if not self.INTERNAL_LINK:
             self.INTERNAL_LINK = not conf.CheckLib(['libshout', 'shout'])
 
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp
index 49468b1ceab..4280cc75bee 100644
--- a/src/controllers/bulk/bulkcontroller.cpp
+++ b/src/controllers/bulk/bulkcontroller.cpp
@@ -116,11 +116,6 @@ void BulkController::visit(const HidControllerPreset* preset) {
     emit presetLoaded(getPreset());
 }
 
-bool BulkController::savePreset(const QString fileName) const {
-    HidControllerPresetFileHandler handler;
-    return handler.save(m_preset, getName(), fileName);
-}
-
 bool BulkController::matchPreset(const PresetInfo& preset) {
     const QList<ProductInfo>& products = preset.getProducts();
     for (const auto& product : products) {
diff --git a/src/controllers/bulk/bulkcontroller.h b/src/controllers/bulk/bulkcontroller.h
index 9d67c1041ea..94e32869ba1 100644
--- a/src/controllers/bulk/bulkcontroller.h
+++ b/src/controllers/bulk/bulkcontroller.h
@@ -56,8 +56,6 @@ class BulkController : public Controller {
         return ControllerPresetPointer(pClone);
     }
 
-    bool savePreset(const QString fileName) const override;
-
     void visit(const MidiControllerPreset* preset) override;
     void visit(const HidControllerPreset* preset) override;
 
diff --git a/src/controllers/controller.h b/src/controllers/controller.h
index 215f4d24b06..c831134d0b2 100644
--- a/src/controllers/controller.h
+++ b/src/controllers/controller.h
@@ -39,8 +39,6 @@ class Controller : public QObject, ConstControllerPresetVisitor {
 
     virtual void accept(ControllerVisitor* visitor) = 0;
 
-    virtual bool savePreset(const QString filename) const = 0;
-
     // Returns a clone of the Controller's loaded preset.
     virtual ControllerPresetPointer getPreset() const = 0;
 
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 103a0ce4cd3..5617713c312 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -432,7 +432,7 @@ void ControllerManager::slotSavePresets(bool onlyActive) {
         QString filename = firstAvailableFilename(filenames, deviceName);
         QString presetPath = userPresetsPath(m_pConfig) + filename
                 + pController->presetExtension();
-        if (!pController->savePreset(presetPath)) {
+        if (!pPreset->savePreset(presetPath)) {
             qWarning() << "Failed to write preset for device"
                        << deviceName << "to" << presetPath;
         }
diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h
index d0a2576ba1a..d49f57fb7ba 100644
--- a/src/controllers/controllerpreset.h
+++ b/src/controllers/controllerpreset.h
@@ -160,6 +160,8 @@ class ControllerPreset {
         setDirty(true);
     }
 
+    virtual bool savePreset(const QString& filename) const = 0;
+
     virtual void accept(ControllerPresetVisitor* visitor) = 0;
     virtual void accept(ConstControllerPresetVisitor* visitor) const = 0;
     virtual bool isMappable() const = 0;
diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp
index ba00b92f1c3..eb27038e4f6 100644
--- a/src/controllers/controllerpresetfilehandler.cpp
+++ b/src/controllers/controllerpresetfilehandler.cpp
@@ -65,22 +65,18 @@ ControllerPresetPointer ControllerPresetFileHandler::loadPreset(
     }
 
     ControllerPresetPointer pPreset = pHandler->load(
-            presetFile.absoluteFilePath(), QString(), systemPresetsPath);
+            presetFile.absoluteFilePath(), systemPresetsPath);
     if (pPreset) {
         pPreset->setDirty(false);
     }
     return pPreset;
 }
 
-ControllerPresetPointer ControllerPresetFileHandler::load(const QString path,
-        const QString deviceName,
-        const QDir& systemPresetsPath) {
+ControllerPresetPointer ControllerPresetFileHandler::load(
+        const QString& path, const QDir& systemPresetsPath) {
     qDebug() << "Loading controller preset from" << path;
-    ControllerPresetPointer pPreset =
-            load(XmlParse::openXMLFile(path, "controller"),
-                    path,
-                    deviceName,
-                    systemPresetsPath);
+    ControllerPresetPointer pPreset = load(
+            XmlParse::openXMLFile(path, "controller"), path, systemPresetsPath);
     return pPreset;
 }
 
@@ -112,8 +108,7 @@ void ControllerPresetFileHandler::parsePresetInfo(
 }
 
 QDomElement ControllerPresetFileHandler::getControllerNode(
-        const QDomElement& root, const QString deviceName) {
-    Q_UNUSED(deviceName);
+        const QDomElement& root) {
     if (root.isNull()) {
         return QDomElement();
     }
@@ -146,8 +141,8 @@ void ControllerPresetFileHandler::addScriptFilesToPreset(
 
     // Look for additional ones
     while (!scriptFile.isNull()) {
-        QString functionPrefix = scriptFile.attribute("functionprefix","");
-        QString filename = scriptFile.attribute("filename","");
+        QString functionPrefix = scriptFile.attribute("functionprefix", "");
+        QString filename = scriptFile.attribute("filename", "");
         QFileInfo file = findScriptFile(preset, filename, systemPresetsPath);
 
         preset->addScriptFile(filename, functionPrefix, file);
@@ -155,8 +150,8 @@ void ControllerPresetFileHandler::addScriptFilesToPreset(
     }
 }
 
-bool ControllerPresetFileHandler::writeDocument(QDomDocument root,
-                                                const QString fileName) const {
+bool ControllerPresetFileHandler::writeDocument(
+        QDomDocument root, const QString fileName) const {
     // Need to do this on Windows
     QDir directory;
     if (!directory.mkpath(fileName.left(fileName.lastIndexOf("/")))) {
@@ -180,16 +175,18 @@ bool ControllerPresetFileHandler::writeDocument(QDomDocument root,
     return true;
 }
 
-void addTextTag(QDomDocument& doc, QDomElement& holder,
-                QString tagName, QString tagText) {
+void addTextTag(QDomDocument& doc,
+        QDomElement& holder,
+        QString tagName,
+        QString tagText) {
     QDomElement tag = doc.createElement(tagName);
     QDomText textNode = doc.createTextNode(tagText);
     tag.appendChild(textNode);
     holder.appendChild(tag);
 }
 
-QDomDocument ControllerPresetFileHandler::buildRootWithScripts(const ControllerPreset& preset,
-                                                               const QString deviceName) const {
+QDomDocument ControllerPresetFileHandler::buildRootWithScripts(
+        const ControllerPreset& preset) const {
     QDomDocument doc("Preset");
     QString blank = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
         "<MixxxControllerPreset>\n"
@@ -220,7 +217,7 @@ QDomDocument ControllerPresetFileHandler::buildRootWithScripts(const ControllerP
 
     QDomElement controller = doc.createElement("controller");
     // Strip off the serial number
-    controller.setAttribute("id", rootDeviceName(deviceName));
+    controller.setAttribute("id", rootDeviceName(preset.deviceId()));
     rootNode.appendChild(controller);
 
     QDomElement scriptFiles = doc.createElement("scriptfiles");
diff --git a/src/controllers/controllerpresetfilehandler.h b/src/controllers/controllerpresetfilehandler.h
index 66891f44e5a..fce44f55d80 100644
--- a/src/controllers/controllerpresetfilehandler.h
+++ b/src/controllers/controllerpresetfilehandler.h
@@ -29,9 +29,7 @@ class ControllerPresetFileHandler {
      * @param path The path to a controller preset XML file.
      * @param deviceName The name/id of the controller
      */
-    ControllerPresetPointer load(const QString path,
-            const QString deviceName,
-            const QDir& systemPresetsPath);
+    ControllerPresetPointer load(const QString& path, const QDir& systemPresetsPath);
 
     // Returns just the name of a given device (everything before the first
     // space)
@@ -40,8 +38,7 @@ class ControllerPresetFileHandler {
     }
 
   protected:
-    QDomElement getControllerNode(const QDomElement& root,
-                                  const QString deviceName);
+    QDomElement getControllerNode(const QDomElement& root);
 
     void parsePresetInfo(const QDomElement& root,
                          ControllerPreset* preset) const;
@@ -62,15 +59,13 @@ class ControllerPresetFileHandler {
 
     // Creates the XML document and includes what script files are currently
     // loaded. Sub-classes need to call this before adding any other items.
-    QDomDocument buildRootWithScripts(const ControllerPreset& preset,
-                                      const QString deviceName) const;
+    QDomDocument buildRootWithScripts(const ControllerPreset& preset) const;
 
     bool writeDocument(QDomDocument root, const QString fileName) const;
 
   private:
     // Sub-classes implement this.
-    virtual ControllerPresetPointer load(const QDomElement root,
-            const QString filePath,
-            const QString deviceName,
+    virtual ControllerPresetPointer load(const QDomElement& root,
+            const QString& filePath,
             const QDir& systemPresetPath) = 0;
 };
diff --git a/src/controllers/hid/hidcontroller.cpp b/src/controllers/hid/hidcontroller.cpp
index ec118012088..08bff7ef126 100644
--- a/src/controllers/hid/hidcontroller.cpp
+++ b/src/controllers/hid/hidcontroller.cpp
@@ -101,11 +101,6 @@ void HidController::visit(const HidControllerPreset* preset) {
     emit presetLoaded(getPreset());
 }
 
-bool HidController::savePreset(const QString fileName) const {
-    HidControllerPresetFileHandler handler;
-    return handler.save(m_preset, getName(), fileName);
-}
-
 bool HidController::matchPreset(const PresetInfo& preset) {
     const QList<ProductInfo>& products = preset.getProducts();
     for (const auto& product : products) {
diff --git a/src/controllers/hid/hidcontroller.h b/src/controllers/hid/hidcontroller.h
index f60843067a8..543684ee766 100644
--- a/src/controllers/hid/hidcontroller.h
+++ b/src/controllers/hid/hidcontroller.h
@@ -31,8 +31,6 @@ class HidController final : public Controller {
         return ControllerPresetPointer(pClone);
     }
 
-    bool savePreset(const QString fileName) const override;
-
     void visit(const MidiControllerPreset* preset) override;
     void visit(const HidControllerPreset* preset) override;
 
diff --git a/src/controllers/hid/hidcontrollerpreset.cpp b/src/controllers/hid/hidcontrollerpreset.cpp
new file mode 100644
index 00000000000..f5e8d49331e
--- /dev/null
+++ b/src/controllers/hid/hidcontrollerpreset.cpp
@@ -0,0 +1,36 @@
+/**
+ * @file hidcontrollerpreset.cpp
+ * @author Jan Holthuis holzhaus@mixxx.org
+ * @date Mon 8 Apr 2020
+ * @brief HID/Bulk Controller Preset
+ *
+ * This class represents a HID or Bulk controller preset, containing the data
+ * elements that make it up.
+ */
+
+#include "controllers/hid/hidcontrollerpreset.h"
+
+#include "controllers/controllerpresetvisitor.h"
+#include "controllers/defs_controllers.h"
+#include "controllers/hid/hidcontrollerpresetfilehandler.h"
+
+bool HidControllerPreset::savePreset(const QString& fileName) const {
+    HidControllerPresetFileHandler handler;
+    return handler.save(*this, fileName);
+}
+
+void HidControllerPreset::accept(ControllerPresetVisitor* visitor) {
+    if (visitor) {
+        visitor->visit(this);
+    }
+}
+
+void HidControllerPreset::accept(ConstControllerPresetVisitor* visitor) const {
+    if (visitor) {
+        visitor->visit(this);
+    }
+}
+
+bool HidControllerPreset::isMappable() const {
+    return false;
+}
diff --git a/src/controllers/hid/hidcontrollerpreset.h b/src/controllers/hid/hidcontrollerpreset.h
index 4a66ea0554b..f1e2b8e36b8 100644
--- a/src/controllers/hid/hidcontrollerpreset.h
+++ b/src/controllers/hid/hidcontrollerpreset.h
@@ -1,29 +1,24 @@
-#ifndef HIDCONTROLLERPRESET_H
-#define HIDCONTROLLERPRESET_H
+#pragma once
+/**
+ * @file hidcontrollerpreset.h
+ * @brief HID/Bulk Controller Preset
+ *
+ * This class represents a HID or Bulk controller preset, containing the data
+ * elements that make it up.
+ */
 
 #include "controllers/controllerpreset.h"
 #include "controllers/controllerpresetvisitor.h"
+#include "controllers/hid/hidcontrollerpresetfilehandler.h"
 
 class HidControllerPreset : public ControllerPreset {
   public:
     HidControllerPreset() {}
     virtual ~HidControllerPreset() {}
 
-    virtual void accept(ControllerPresetVisitor* visitor) {
-        if (visitor) {
-            visitor->visit(this);
-        }
-    }
+    bool savePreset(const QString& fileName) const override;
 
-    virtual void accept(ConstControllerPresetVisitor* visitor) const {
-        if (visitor) {
-            visitor->visit(this);
-        }
-    }
-
-    virtual bool isMappable() const {
-        return false;
-    }
+    virtual void accept(ControllerPresetVisitor* visitor);
+    virtual void accept(ConstControllerPresetVisitor* visitor) const;
+    virtual bool isMappable() const;
 };
-
-#endif /* HIDCONTROLLERPRESET_H */
diff --git a/src/controllers/hid/hidcontrollerpresetfilehandler.cpp b/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
index 7b04dda605c..253090ce9fe 100644
--- a/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
+++ b/src/controllers/hid/hidcontrollerpresetfilehandler.cpp
@@ -1,21 +1,19 @@
 #include "controllers/hid/hidcontrollerpresetfilehandler.h"
 
 bool HidControllerPresetFileHandler::save(const HidControllerPreset& preset,
-                                          const QString deviceName,
-                                          const QString fileName) const {
-    QDomDocument doc = buildRootWithScripts(preset, deviceName);
+        const QString& fileName) const {
+    QDomDocument doc = buildRootWithScripts(preset);
     return writeDocument(doc, fileName);
 }
 
-ControllerPresetPointer HidControllerPresetFileHandler::load(const QDomElement root,
-        const QString filePath,
-        const QString deviceName,
+ControllerPresetPointer HidControllerPresetFileHandler::load(const QDomElement& root,
+        const QString& filePath,
         const QDir& systemPresetsPath) {
     if (root.isNull()) {
         return ControllerPresetPointer();
     }
 
-    QDomElement controller = getControllerNode(root, deviceName);
+    QDomElement controller = getControllerNode(root);
     if (controller.isNull()) {
         return ControllerPresetPointer();
     }
diff --git a/src/controllers/hid/hidcontrollerpresetfilehandler.h b/src/controllers/hid/hidcontrollerpresetfilehandler.h
index 910900dabd8..7f99f56481d 100644
--- a/src/controllers/hid/hidcontrollerpresetfilehandler.h
+++ b/src/controllers/hid/hidcontrollerpresetfilehandler.h
@@ -9,13 +9,11 @@ class HidControllerPresetFileHandler : public ControllerPresetFileHandler {
     HidControllerPresetFileHandler() {};
     virtual ~HidControllerPresetFileHandler() {};
 
-    bool save(const HidControllerPreset& preset,
-              const QString deviceName, const QString fileName) const;
+    bool save(const HidControllerPreset& preset, const QString& fileName) const;
 
   private:
-    virtual ControllerPresetPointer load(const QDomElement root,
-            const QString filePath,
-            const QString deviceName,
+    virtual ControllerPresetPointer load(const QDomElement& root,
+            const QString& filePath,
             const QDir& systemPresetsPath);
 };
 
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
index dc3196ecc2a..7f6c8ea5d6b 100644
--- a/src/controllers/midi/midicontroller.cpp
+++ b/src/controllers/midi/midicontroller.cpp
@@ -54,11 +54,6 @@ bool MidiController::matchPreset(const PresetInfo& preset) {
     return false;
 }
 
-bool MidiController::savePreset(const QString fileName) const {
-    MidiControllerPresetFileHandler handler;
-    return handler.save(m_preset, getName(), fileName);
-}
-
 bool MidiController::applyPreset(bool initializeScripts) {
     // Handles the engine
     bool result = Controller::applyPreset(initializeScripts);
diff --git a/src/controllers/midi/midicontroller.h b/src/controllers/midi/midicontroller.h
index 8b11b57c93b..25a555c8373 100644
--- a/src/controllers/midi/midicontroller.h
+++ b/src/controllers/midi/midicontroller.h
@@ -34,8 +34,6 @@ class MidiController : public Controller {
         return ControllerPresetPointer(pClone);
     }
 
-    bool savePreset(const QString fileName) const override;
-
     void visit(const MidiControllerPreset* preset) override;
     void visit(const HidControllerPreset* preset) override;
 
diff --git a/src/controllers/midi/midicontrollerpreset.cpp b/src/controllers/midi/midicontrollerpreset.cpp
new file mode 100644
index 00000000000..c3ac3efe153
--- /dev/null
+++ b/src/controllers/midi/midicontrollerpreset.cpp
@@ -0,0 +1,79 @@
+/**
+ * @file midicontrollerpreset.cpp
+ * @author Jan Holthuis holzhaus@mixxx.org
+ * @date Wed 8 Apr 2020
+ * @brief MIDI Controller Preset
+ *
+ * This class represents a MIDI controller preset, containing the data elements
+ *   that make it up.
+ */
+
+#include "controllers/midi/midicontrollerpreset.h"
+
+#include "controllers/defs_controllers.h"
+#include "controllers/midi/midicontrollerpresetfilehandler.h"
+
+bool MidiControllerPreset::savePreset(const QString& fileName) const {
+    MidiControllerPresetFileHandler handler;
+    return handler.save(*this, fileName);
+}
+
+void MidiControllerPreset::accept(ControllerPresetVisitor* visitor) {
+    if (visitor) {
+        visitor->visit(this);
+    }
+}
+
+void MidiControllerPreset::accept(ConstControllerPresetVisitor* visitor) const {
+    if (visitor) {
+        visitor->visit(this);
+    }
+}
+
+bool MidiControllerPreset::isMappable() const {
+    return true;
+}
+
+void MidiControllerPreset::addInputMapping(uint16_t key, MidiInputMapping mapping) {
+    m_inputMappings.insertMulti(key, mapping);
+    setDirty(true);
+}
+
+void MidiControllerPreset::removeInputMapping(uint16_t key) {
+    m_inputMappings.remove(key);
+    setDirty(true);
+}
+
+const QHash<uint16_t, MidiInputMapping>& MidiControllerPreset::getInputMappings() const {
+    return m_inputMappings;
+}
+
+void MidiControllerPreset::setInputMappings(const QHash<uint16_t, MidiInputMapping>& mappings) {
+    if (m_inputMappings != mappings) {
+        m_inputMappings.clear();
+        m_inputMappings.unite(mappings);
+        setDirty(true);
+    }
+}
+
+void MidiControllerPreset::addOutputMapping(ConfigKey key, MidiOutputMapping mapping) {
+    m_outputMappings.insertMulti(key, mapping);
+    setDirty(true);
+}
+
+void MidiControllerPreset::removeOutputMapping(ConfigKey key) {
+    m_outputMappings.remove(key);
+    setDirty(true);
+}
+
+const QHash<ConfigKey, MidiOutputMapping>& MidiControllerPreset::getOutputMappings() const {
+    return m_outputMappings;
+}
+
+void MidiControllerPreset::setOutputMappings(const QHash<ConfigKey, MidiOutputMapping>& mappings) {
+    if (m_outputMappings != mappings) {
+        m_outputMappings.clear();
+        m_outputMappings.unite(mappings);
+        setDirty(true);
+    }
+}
diff --git a/src/controllers/midi/midicontrollerpreset.h b/src/controllers/midi/midicontrollerpreset.h
index 1c25659059b..a2f16e5efc8 100644
--- a/src/controllers/midi/midicontrollerpreset.h
+++ b/src/controllers/midi/midicontrollerpreset.h
@@ -1,3 +1,4 @@
+#pragma once
 /**
  * @file midicontrollerpreset.h
  * @author Sean Pappalardo spappalardo@mixxx.org
@@ -9,9 +10,6 @@
  *
  */
 
-#ifndef MIDICONTROLLERPRESET_H
-#define MIDICONTROLLERPRESET_H
-
 #include <QHash>
 
 #include "controllers/controllerpreset.h"
@@ -20,73 +18,29 @@
 
 class MidiControllerPreset : public ControllerPreset {
   public:
-    MidiControllerPreset() {}
-    virtual ~MidiControllerPreset() {}
-
-    virtual void accept(ControllerPresetVisitor* visitor) {
-        if (visitor) {
-            visitor->visit(this);
-        }
-    }
-
-    virtual void accept(ConstControllerPresetVisitor* visitor) const {
-        if (visitor) {
-            visitor->visit(this);
-        }
-    }
-
-    virtual bool isMappable() const {
-        return true;
-    }
-
-    void addInputMapping(uint16_t key, MidiInputMapping mapping) {
-        m_inputMappings.insertMulti(key, mapping);
-        setDirty(true);
-    }
+    MidiControllerPreset(){};
+    virtual ~MidiControllerPreset(){};
 
-    void removeInputMapping(uint16_t key) {
-        m_inputMappings.remove(key);
-        setDirty(true);
-    }
+    bool savePreset(const QString& fileName) const override;
 
-    const QHash<uint16_t, MidiInputMapping>& getInputMappings() const {
-        return m_inputMappings;
-    }
+    virtual void accept(ControllerPresetVisitor* visitor);
+    virtual void accept(ConstControllerPresetVisitor* visitor) const;
+    virtual bool isMappable() const;
 
-    void setInputMappings(const QHash<uint16_t, MidiInputMapping>& mappings) {
-        if (m_inputMappings != mappings) {
-            m_inputMappings.clear();
-            m_inputMappings.unite(mappings);
-            setDirty(true);
-        }
-    }
+    // Input mappings
+    void addInputMapping(uint16_t key, MidiInputMapping mapping);
+    void removeInputMapping(uint16_t key);
+    const QHash<uint16_t, MidiInputMapping>& getInputMappings() const;
+    void setInputMappings(const QHash<uint16_t, MidiInputMapping>& mappings);
 
-    void addOutputMapping(ConfigKey key, MidiOutputMapping mapping) {
-        m_outputMappings.insertMulti(key, mapping);
-        setDirty(true);
-    }
-
-    void removeOutputMapping(ConfigKey key) {
-        m_outputMappings.remove(key);
-        setDirty(true);
-    }
-
-    const QHash<ConfigKey, MidiOutputMapping>& getOutputMappings() const {
-        return m_outputMappings;
-    }
-
-    void setOutputMappings(const QHash<ConfigKey, MidiOutputMapping>& mappings) {
-        if (m_outputMappings != mappings) {
-            m_outputMappings.clear();
-            m_outputMappings.unite(mappings);
-            setDirty(true);
-        }
-    }
+    // Output mappings
+    void addOutputMapping(ConfigKey key, MidiOutputMapping mapping);
+    void removeOutputMapping(ConfigKey key);
+    const QHash<ConfigKey, MidiOutputMapping>& getOutputMappings() const;
+    void setOutputMappings(const QHash<ConfigKey, MidiOutputMapping>& mappings);
 
   private:
     // MIDI input and output mappings.
     QHash<uint16_t, MidiInputMapping> m_inputMappings;
     QHash<ConfigKey, MidiOutputMapping> m_outputMappings;
 };
-
-#endif
diff --git a/src/controllers/midi/midicontrollerpresetfilehandler.cpp b/src/controllers/midi/midicontrollerpresetfilehandler.cpp
index 4954d92f1d3..fddafd929a7 100644
--- a/src/controllers/midi/midicontrollerpresetfilehandler.cpp
+++ b/src/controllers/midi/midicontrollerpresetfilehandler.cpp
@@ -14,15 +14,14 @@
 #define DEFAULT_OUTPUT_ON   0x7F
 #define DEFAULT_OUTPUT_OFF  0x00
 
-ControllerPresetPointer MidiControllerPresetFileHandler::load(const QDomElement root,
-        const QString filePath,
-        const QString deviceName,
+ControllerPresetPointer MidiControllerPresetFileHandler::load(const QDomElement& root,
+        const QString& filePath,
         const QDir& systemPresetsPath) {
     if (root.isNull()) {
         return ControllerPresetPointer();
     }
 
-    QDomElement controller = getControllerNode(root, deviceName);
+    QDomElement controller = getControllerNode(root);
     if (controller.isNull()) {
         return ControllerPresetPointer();
     }
@@ -195,10 +194,9 @@ ControllerPresetPointer MidiControllerPresetFileHandler::load(const QDomElement
 }
 
 bool MidiControllerPresetFileHandler::save(const MidiControllerPreset& preset,
-                                           const QString deviceName,
-                                           const QString fileName) const {
-    qDebug() << "Saving preset" << preset.name() << "for" << deviceName << "to" << fileName;
-    QDomDocument doc = buildRootWithScripts(preset, deviceName);
+        const QString& fileName) const {
+    qDebug() << "Saving preset" << preset.name() << "to" << fileName;
+    QDomDocument doc = buildRootWithScripts(preset);
     addControlsToDocument(preset, &doc);
     return writeDocument(doc, fileName);
 }
diff --git a/src/controllers/midi/midicontrollerpresetfilehandler.h b/src/controllers/midi/midicontrollerpresetfilehandler.h
index 020810386f7..ad7c43419e0 100644
--- a/src/controllers/midi/midicontrollerpresetfilehandler.h
+++ b/src/controllers/midi/midicontrollerpresetfilehandler.h
@@ -16,13 +16,11 @@ class MidiControllerPresetFileHandler : public ControllerPresetFileHandler {
     MidiControllerPresetFileHandler() {};
     virtual ~MidiControllerPresetFileHandler() {};
 
-    bool save(const MidiControllerPreset& preset,
-              const QString deviceName, const QString fileName) const;
+    bool save(const MidiControllerPreset& preset, const QString& fileName) const;
 
   private:
-    virtual ControllerPresetPointer load(const QDomElement root,
-            const QString filePath,
-            const QString deviceName,
+    virtual ControllerPresetPointer load(const QDomElement& root,
+            const QString& filePath,
             const QDir& systemPresetPath);
 
     void addControlsToDocument(const MidiControllerPreset& preset,
diff --git a/src/test/controller_preset_validation_test.cpp b/src/test/controller_preset_validation_test.cpp
index 334205d7efe..415ca1920d8 100644
--- a/src/test/controller_preset_validation_test.cpp
+++ b/src/test/controller_preset_validation_test.cpp
@@ -35,11 +35,6 @@ class FakeController : public Controller {
         }
     }
 
-    bool savePreset(const QString fileName) const override {
-        Q_UNUSED(fileName);
-        return true;
-    }
-
     void visit(const MidiControllerPreset* preset) override {
         m_bMidiPreset = true;
         m_bHidPreset = false;

From f79cdf254b46c8efc80c53a078bc4a6abffcf81e Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 17:52:13 +0200
Subject: [PATCH 44/55] controllers: Move preset saving from ControllerManger
 to Preferences

---
 src/controllers/controller.h           |   7 +-
 src/controllers/controllermanager.cpp  | 139 ++++------
 src/controllers/controllermanager.h    |  16 +-
 src/controllers/dlgprefcontroller.cpp  | 341 +++++++++++++++----------
 src/controllers/dlgprefcontroller.h    |  44 +++-
 src/controllers/dlgprefcontrollers.cpp |  12 +-
 6 files changed, 286 insertions(+), 273 deletions(-)

diff --git a/src/controllers/controller.h b/src/controllers/controller.h
index c831134d0b2..058537f5a81 100644
--- a/src/controllers/controller.h
+++ b/src/controllers/controller.h
@@ -69,8 +69,10 @@ class Controller : public QObject, ConstControllerPresetVisitor {
     // preset, not a pointer to the preset itself.
     void presetLoaded(ControllerPresetPointer pPreset);
 
-  // Making these slots protected/private ensures that other parts of Mixxx can
-  // only signal them which allows us to use no locks.
+    void openChanged(bool bOpen);
+
+    // Making these slots protected/private ensures that other parts of Mixxx can
+    // only signal them which allows us to use no locks.
   protected slots:
     // TODO(XXX) move this into the inherited classes since is not called here
     // (via Controller) and re-implemented anyway in most cases.
@@ -126,6 +128,7 @@ class Controller : public QObject, ConstControllerPresetVisitor {
     }
     inline void setOpen(bool open) {
         m_bIsOpen = open;
+        emit openChanged(m_bIsOpen);
     }
 
   private: // but used by ControllerManager
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 5617713c312..17ce5433c20 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -45,6 +45,23 @@ QString sanitizeDeviceName(QString name) {
     return name.replace(" ", "_").replace("/", "_").replace("\\", "_");
 }
 
+QString findPresetFile(const QString& pathOrFilename, const QStringList& paths) {
+    QFileInfo fileInfo(pathOrFilename);
+    if (fileInfo.isAbsolute()) {
+        return pathOrFilename;
+    }
+
+    for (const QString& path : paths) {
+        QDir pathDir(path);
+
+        if (pathDir.exists(pathOrFilename)) {
+            return pathDir.absoluteFilePath(pathOrFilename);
+        }
+    }
+
+    return QString();
+}
+
 } // anonymous namespace
 
 QString firstAvailableFilename(QSet<QString>& filenames,
@@ -101,8 +118,6 @@ ControllerManager::ControllerManager(UserSettingsPointer pConfig)
             this, SLOT(slotSetUpDevices()));
     connect(this, SIGNAL(requestShutdown()),
             this, SLOT(slotShutdown()));
-    connect(this, SIGNAL(requestSave(bool)),
-            this, SLOT(slotSavePresets(bool)));
 
     // Signal that we should run slotInitialize once our event loop has started
     // up.
@@ -244,7 +259,7 @@ void ControllerManager::slotSetUpDevices() {
 
         qDebug() << "Searching for controller preset" << presetFile
                  << "in paths:" << presetPaths.join(",");
-        QString presetFilePath = ControllerManager::getAbsolutePath(presetFile, presetPaths);
+        QString presetFilePath = findPresetFile(presetFile, presetPaths);
         if (presetFilePath.isEmpty()) {
             qDebug() << "Could not find" << presetFilePath << "in any preset path.";
             continue;
@@ -253,11 +268,12 @@ void ControllerManager::slotSetUpDevices() {
         ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset(
                 QFileInfo(presetFilePath), resourcePresetsPath(m_pConfig));
 
-        if (!loadPreset(pController, pPreset)) {
-            // TODO(XXX) : auto load midi preset here.
+        if (!pPreset) {
             continue;
         }
 
+        pController->setPreset(*pPreset);
+
         // If we are in safe mode, skip opening controllers.
         if (CmdlineArgs::Instance().getSafeMode()) {
             qDebug() << "We are in safe mode -- skipping opening controller.";
@@ -382,61 +398,36 @@ void ControllerManager::closeController(Controller* pController) {
             ConfigKey("[Controller]", sanitizeDeviceName(pController->getName())), 0);
 }
 
-bool ControllerManager::loadPreset(Controller* pController,
-                                   ControllerPresetPointer preset) {
-    if (!preset) {
-        return false;
+void ControllerManager::slotApplyPreset(Controller* pController,
+        ControllerPresetPointer pPreset,
+        bool bEnabled) {
+    VERIFY_OR_DEBUG_ASSERT(pController) {
+        qWarning() << "slotApplyPreset got invalid controller!";
+        return;
     }
-    pController->setPreset(*preset.data());
-    // Save the file path/name in the config so it can be auto-loaded at
-    // startup next time
-    m_pConfig->set(
-            ConfigKey("[ControllerPreset]", sanitizeDeviceName(pController->getName())),
-            preset->filePath());
-    return true;
-}
-
-void ControllerManager::slotSavePresets(bool onlyActive) {
-    QList<Controller*> deviceList = getControllerList(false, true);
-    QSet<QString> filenames;
-
-    // TODO(rryan): This should be split up somehow but the filename selection
-    // is dependent on all of the controllers to prevent over-writing each
-    // other. We need a better solution.
-    for (Controller* pController : deviceList) {
-        if (onlyActive && !pController->isOpen()) {
-            continue;
-        }
 
-        QString deviceName = sanitizeDeviceName(pController->getName());
+    ConfigKey key("[ControllerPreset]", sanitizeDeviceName(pController->getName()));
+    if (!pPreset) {
+        closeController(pController);
+        // Unset the controller preset for this controller
+        m_pConfig->remove(key);
+        return;
+    }
 
-        ControllerPresetPointer pPreset = pController->getPreset();
-        if (!pPreset) {
-            qDebug() << "Device" << deviceName << "has no configured preset";
-            continue;
-        }
+    VERIFY_OR_DEBUG_ASSERT(!pPreset->isDirty()) {
+        qWarning() << "Preset is dirty, changes might be lost on restart!";
+    }
 
-        if (!pPreset->isDirty()) {
-            qDebug()
-                    << "Preset for device" << deviceName
-                    << "is not dirty, no need to save it to the user presets.";
-            continue;
-        }
+    pController->setPreset(*pPreset);
 
-        if (pPreset->filePath().startsWith(resourcePresetsPath(m_pConfig))) {
-            pPreset->setName(QString(tr("%1 (edited)")).arg(pPreset->name()));
-            pController->setPreset(*pPreset);
-            qDebug() << "Renamed preset to " << pPreset->name();
-        }
+    // Save the file path/name in the config so it can be auto-loaded at
+    // startup next time
+    m_pConfig->set(key, pPreset->filePath());
 
-        QString filename = firstAvailableFilename(filenames, deviceName);
-        QString presetPath = userPresetsPath(m_pConfig) + filename
-                + pController->presetExtension();
-        if (!pPreset->savePreset(presetPath)) {
-            qWarning() << "Failed to write preset for device"
-                       << deviceName << "to" << presetPath;
-        }
-        m_pConfig->set(ConfigKey("[ControllerPreset]", deviceName), presetPath);
+    if (bEnabled) {
+        openController(pController);
+    } else {
+        closeController(pController);
     }
 }
 
@@ -447,43 +438,3 @@ QList<QString> ControllerManager::getPresetPaths(UserSettingsPointer pConfig) {
     scriptPaths.append(resourcePresetsPath(pConfig));
     return scriptPaths;
 }
-
-// static
-bool ControllerManager::checksumFile(const QString& filename,
-                                     quint16* pChecksum) {
-    QFile file(filename);
-    if (!file.open(QIODevice::ReadOnly)) {
-        return false;
-    }
-
-    qint64 fileSize = file.size();
-    const char* pFile = reinterpret_cast<char*>(file.map(0, fileSize));
-
-    if (pFile == NULL) {
-        file.close();
-        return false;
-    }
-
-    *pChecksum = qChecksum(pFile, fileSize);
-    file.close();
-    return true;
-}
-
-// static
-QString ControllerManager::getAbsolutePath(const QString& pathOrFilename,
-                                           const QStringList& paths) {
-    QFileInfo fileInfo(pathOrFilename);
-    if (fileInfo.isAbsolute()) {
-        return pathOrFilename;
-    }
-
-    for (const QString& path : paths) {
-        QDir pathDir(path);
-
-        if (pathDir.exists(pathOrFilename)) {
-            return pathDir.absoluteFilePath(pathOrFilename);
-        }
-    }
-
-    return QString();
-}
diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h
index e1047f09d7d..8837d903580 100644
--- a/src/controllers/controllermanager.h
+++ b/src/controllers/controllermanager.h
@@ -43,34 +43,22 @@ class ControllerManager : public QObject {
 
     // Prevent other parts of Mixxx from having to manually connect to our slots
     void setUpDevices() { emit requestSetUpDevices(); };
-    void savePresets(bool onlyActive=false) { emit requestSave(onlyActive); };
 
     static QList<QString> getPresetPaths(UserSettingsPointer pConfig);
 
-    // If pathOrFilename is an absolute path, returns it. If it is a relative
-    // path and it is contained within any of the directories in presetPaths,
-    // returns the path to the first file in the path that exists.
-    static QString getAbsolutePath(const QString& pathOrFilename,
-                                   const QStringList& presetPaths);
-
-    static bool checksumFile(const QString& filename, quint16* pChecksum);
-
   signals:
     void devicesChanged();
     void requestSetUpDevices();
     void requestShutdown();
-    void requestSave(bool onlyActive);
     void requestInitialize();
 
   public slots:
     void updateControllerList();
 
+    void slotApplyPreset(Controller* pController, ControllerPresetPointer pPreset, bool bEnabled);
     void openController(Controller* pController);
     void closeController(Controller* pController);
 
-    // Writes out presets for currently connected input devices
-    void slotSavePresets(bool onlyActive=false);
-
   private slots:
     // Perform initialization that should be delayed until the ControllerManager
     // thread is started.
@@ -80,8 +68,6 @@ class ControllerManager : public QObject {
     // preferences dialog on apply, and only open/close changed devices
     void slotSetUpDevices();
     void slotShutdown();
-    bool loadPreset(Controller* pController,
-                    ControllerPresetPointer preset);
     // Calls poll() on all devices that have isPolling() true.
     void pollDevices();
     void startPolling();
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index bfd7bee5d74..1b54eb42a39 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -39,15 +39,14 @@ DlgPrefController::DlgPrefController(QWidget* parent, Controller* controller,
     initTableView(m_ui.m_pInputMappingTableView);
     initTableView(m_ui.m_pOutputMappingTableView);
 
-    connect(m_pController, SIGNAL(presetLoaded(ControllerPresetPointer)),
-            this, SLOT(slotPresetLoaded(ControllerPresetPointer)));
+    connect(m_pController, &Controller::presetLoaded, this, &DlgPrefController::slotShowPreset);
     // TODO(rryan): Eh, this really isn't thread safe but it's the way it's been
     // since 1.11.0. We shouldn't be calling Controller methods because it lives
     // in a different thread. Booleans (like isOpen()) are fine but a complex
     // object like a preset involves QHash's and other data structures that
     // really don't like concurrent access.
     ControllerPresetPointer pPreset = m_pController->getPreset();
-    slotPresetLoaded(pPreset);
+    slotShowPreset(pPreset);
 
     m_ui.labelDeviceName->setText(m_pController->getName());
     QString category = m_pController->getCategory();
@@ -58,44 +57,55 @@ DlgPrefController::DlgPrefController(QWidget* parent, Controller* controller,
     }
 
     // When the user picks a preset, load it.
-    connect(m_ui.comboBoxPreset, SIGNAL(activated(int)),
-            this, SLOT(slotLoadPreset(int)));
+    connect(m_ui.comboBoxPreset, SIGNAL(activated(int)), this, SLOT(slotPresetSelected(int)));
 
-    // When the user toggles the Enabled checkbox, toggle.
-    connect(m_ui.chkEnabledDevice, SIGNAL(clicked(bool)),
-            this, SLOT(slotEnableDevice(bool)));
+    // When the user toggles the Enabled checkbox, mark as dirty
+    connect(m_ui.chkEnabledDevice, &QCheckBox::clicked, [this] { setDirty(true); });
 
     // Connect our signals to controller manager.
-    connect(this, SIGNAL(openController(Controller*)),
-            m_pControllerManager, SLOT(openController(Controller*)));
-    connect(this, SIGNAL(closeController(Controller*)),
-            m_pControllerManager, SLOT(closeController(Controller*)));
-    connect(this, SIGNAL(loadPreset(Controller*, ControllerPresetPointer)),
-            m_pControllerManager, SLOT(loadPreset(Controller*, ControllerPresetPointer)));
+    connect(this,
+            &DlgPrefController::applyPreset,
+            m_pControllerManager,
+            &ControllerManager::slotApplyPreset);
 
     // Open script file links
     connect(m_ui.labelLoadedPresetScriptFileLinks,
             &QLabel::linkActivated,
-            [](const QString & path) {
-            QDesktopServices::openUrl(QUrl::fromLocalFile(path)); });
+            [](const QString& path) {
+                QDesktopServices::openUrl(QUrl::fromLocalFile(path));
+            });
 
     // Input mappings
-    connect(m_ui.btnAddInputMapping, SIGNAL(clicked()),
-            this, SLOT(addInputMapping()));
-    connect(m_ui.btnRemoveInputMappings, SIGNAL(clicked()),
-            this, SLOT(removeInputMappings()));
-    connect(m_ui.btnLearningWizard, SIGNAL(clicked()),
-            this, SLOT(showLearningWizard()));
-    connect(m_ui.btnClearAllInputMappings, SIGNAL(clicked()),
-            this, SLOT(clearAllInputMappings()));
+    connect(m_ui.btnAddInputMapping,
+            SIGNAL(clicked()),
+            this,
+            SLOT(addInputMapping()));
+    connect(m_ui.btnRemoveInputMappings,
+            SIGNAL(clicked()),
+            this,
+            SLOT(removeInputMappings()));
+    connect(m_ui.btnLearningWizard,
+            SIGNAL(clicked()),
+            this,
+            SLOT(showLearningWizard()));
+    connect(m_ui.btnClearAllInputMappings,
+            SIGNAL(clicked()),
+            this,
+            SLOT(clearAllInputMappings()));
 
     // Output mappings
-    connect(m_ui.btnAddOutputMapping, SIGNAL(clicked()),
-            this, SLOT(addOutputMapping()));
-    connect(m_ui.btnRemoveOutputMappings, SIGNAL(clicked()),
-            this, SLOT(removeOutputMappings()));
-    connect(m_ui.btnClearAllOutputMappings, SIGNAL(clicked()),
-            this, SLOT(clearAllOutputMappings()));
+    connect(m_ui.btnAddOutputMapping,
+            SIGNAL(clicked()),
+            this,
+            SLOT(addOutputMapping()));
+    connect(m_ui.btnRemoveOutputMappings,
+            SIGNAL(clicked()),
+            this,
+            SLOT(removeOutputMappings()));
+    connect(m_ui.btnClearAllOutputMappings,
+            SIGNAL(clicked()),
+            this,
+            SLOT(clearAllOutputMappings()));
 }
 
 DlgPrefController::~DlgPrefController() {
@@ -107,13 +117,14 @@ void DlgPrefController::showLearningWizard() {
     // learning dialog. If we don't apply the settings first and open the
     // device, the dialog won't react to controller messages.
     if (m_ui.chkEnabledDevice->isChecked() && !m_pController->isOpen()) {
-        QMessageBox::StandardButton result = QMessageBox::question(
-            this,
-            tr("Apply device settings?"),
-            tr("Your settings must be applied before starting the learning wizard.\n"
-               "Apply settings and continue?"),
-            QMessageBox::Ok | QMessageBox::Cancel,  // Buttons to be displayed
-            QMessageBox::Ok);  // Default button
+        QMessageBox::StandardButton result = QMessageBox::question(this,
+                tr("Apply device settings?"),
+                tr("Your settings must be applied before starting the learning "
+                   "wizard.\n"
+                   "Apply settings and continue?"),
+                QMessageBox::Ok |
+                        QMessageBox::Cancel, // Buttons to be displayed
+                QMessageBox::Ok);            // Default button
         // Stop if the user has not pressed the Ok button,
         // which could be the Cancel or the Close Button.
         if (result != QMessageBox::Ok) {
@@ -123,7 +134,7 @@ void DlgPrefController::showLearningWizard() {
     slotApply();
 
     // After this point we consider the mapping wizard as dirtying the preset.
-    slotDirty();
+    setDirty(true);
 
     // Note that DlgControllerLearning is set to delete itself on close using
     // the Qt::WA_DeleteOnClose attribute (so this "new" doesn't leak memory)
@@ -132,23 +143,36 @@ void DlgPrefController::showLearningWizard() {
     ControllerLearningEventFilter* pControllerLearning =
             m_pControllerManager->getControllerLearningEventFilter();
     pControllerLearning->startListening();
-    connect(pControllerLearning, SIGNAL(controlClicked(ControlObject*)),
-            m_pDlgControllerLearning, SLOT(controlClicked(ControlObject*)));
-    connect(m_pDlgControllerLearning, SIGNAL(listenForClicks()),
-            pControllerLearning, SLOT(startListening()));
-    connect(m_pDlgControllerLearning, SIGNAL(stopListeningForClicks()),
-            pControllerLearning, SLOT(stopListening()));
-    connect(m_pDlgControllerLearning, SIGNAL(stopLearning()),
-            this, SLOT(show()));
-    connect(m_pDlgControllerLearning, SIGNAL(inputMappingsLearned(MidiInputMappings)),
-            this, SLOT(midiInputMappingsLearned(MidiInputMappings)));
+    connect(pControllerLearning,
+            SIGNAL(controlClicked(ControlObject*)),
+            m_pDlgControllerLearning,
+            SLOT(controlClicked(ControlObject*)));
+    connect(m_pDlgControllerLearning,
+            SIGNAL(listenForClicks()),
+            pControllerLearning,
+            SLOT(startListening()));
+    connect(m_pDlgControllerLearning,
+            SIGNAL(stopListeningForClicks()),
+            pControllerLearning,
+            SLOT(stopListening()));
+    connect(m_pDlgControllerLearning,
+            SIGNAL(stopLearning()),
+            this,
+            SLOT(show()));
+    connect(m_pDlgControllerLearning,
+            SIGNAL(inputMappingsLearned(MidiInputMappings)),
+            this,
+            SLOT(midiInputMappingsLearned(MidiInputMappings)));
 
     emit mappingStarted();
-    connect(m_pDlgControllerLearning, SIGNAL(stopLearning()),
-            this, SIGNAL(mappingEnded()));
+    connect(m_pDlgControllerLearning,
+            SIGNAL(stopLearning()),
+            this,
+            SIGNAL(mappingEnded()));
 }
 
-void DlgPrefController::midiInputMappingsLearned(const MidiInputMappings& mappings) {
+void DlgPrefController::midiInputMappingsLearned(
+        const MidiInputMappings& mappings) {
     // This is just a shortcut since doing a round-trip from Learning ->
     // Controller -> slotPresetLoaded -> setPreset is too heavyweight.
     if (m_pInputTableModel != NULL) {
@@ -156,7 +180,8 @@ void DlgPrefController::midiInputMappingsLearned(const MidiInputMappings& mappin
     }
 }
 
-QString DlgPrefController::presetShortName(const ControllerPresetPointer pPreset) const {
+QString DlgPrefController::presetShortName(
+        const ControllerPresetPointer pPreset) const {
     QString presetName = tr("None");
     if (pPreset) {
         QString name = pPreset->name();
@@ -173,7 +198,8 @@ QString DlgPrefController::presetShortName(const ControllerPresetPointer pPreset
     return presetName;
 }
 
-QString DlgPrefController::presetName(const ControllerPresetPointer pPreset) const {
+QString DlgPrefController::presetName(
+        const ControllerPresetPointer pPreset) const {
     if (pPreset) {
         QString name = pPreset->name();
         if (name.length() > 0)
@@ -182,7 +208,8 @@ QString DlgPrefController::presetName(const ControllerPresetPointer pPreset) con
     return tr("No Name");
 }
 
-QString DlgPrefController::presetDescription(const ControllerPresetPointer pPreset) const {
+QString DlgPrefController::presetDescription(
+        const ControllerPresetPointer pPreset) const {
     if (pPreset) {
         QString description = pPreset->description();
         if (description.length() > 0)
@@ -191,7 +218,8 @@ QString DlgPrefController::presetDescription(const ControllerPresetPointer pPres
     return tr("No Description");
 }
 
-QString DlgPrefController::presetAuthor(const ControllerPresetPointer pPreset) const {
+QString DlgPrefController::presetAuthor(
+        const ControllerPresetPointer pPreset) const {
     if (pPreset) {
         QString author = pPreset->author();
         if (author.length() > 0)
@@ -200,7 +228,8 @@ QString DlgPrefController::presetAuthor(const ControllerPresetPointer pPreset) c
     return tr("No Author");
 }
 
-QString DlgPrefController::presetForumLink(const ControllerPresetPointer pPreset) const {
+QString DlgPrefController::presetForumLink(
+        const ControllerPresetPointer pPreset) const {
     QString url;
     if (pPreset) {
         QString link = pPreset->forumlink();
@@ -210,7 +239,8 @@ QString DlgPrefController::presetForumLink(const ControllerPresetPointer pPreset
     return url;
 }
 
-QString DlgPrefController::presetWikiLink(const ControllerPresetPointer pPreset) const {
+QString DlgPrefController::presetWikiLink(
+        const ControllerPresetPointer pPreset) const {
     QString url;
     if (pPreset) {
         QString link = pPreset->wikilink();
@@ -220,7 +250,8 @@ QString DlgPrefController::presetWikiLink(const ControllerPresetPointer pPreset)
     return url;
 }
 
-QString DlgPrefController::presetScriptFileLinks(const ControllerPresetPointer pPreset) const {
+QString DlgPrefController::presetScriptFileLinks(
+        const ControllerPresetPointer pPreset) const {
     if (!pPreset) {
         return QString();
     }
@@ -233,9 +264,12 @@ QString DlgPrefController::presetScriptFileLinks(const ControllerPresetPointer p
                 script.name + QStringLiteral("</a>");
 
         if (!script.file.exists()) {
-            scriptFileLink += QStringLiteral(" (") + tr("missing") + QStringLiteral(")");
-        } else if (script.file.absoluteFilePath().startsWith(systemPresetPath)) {
-            scriptFileLink += QStringLiteral(" (") + tr("built-in") + QStringLiteral(")");
+            scriptFileLink +=
+                    QStringLiteral(" (") + tr("missing") + QStringLiteral(")");
+        } else if (script.file.absoluteFilePath().startsWith(
+                           systemPresetPath)) {
+            scriptFileLink +=
+                    QStringLiteral(" (") + tr("built-in") + QStringLiteral(")");
         }
 
         linkList << scriptFileLink;
@@ -243,11 +277,7 @@ QString DlgPrefController::presetScriptFileLinks(const ControllerPresetPointer p
     return linkList.join("<br/>");
 }
 
-void DlgPrefController::slotDirty() {
-    m_bDirty = true;
-}
-
-void DlgPrefController::enumeratePresets() {
+void DlgPrefController::enumeratePresets(const QString& selectedPresetPath) {
     m_ui.comboBoxPreset->clear();
 
     // qDebug() << "Enumerating presets for controller" << m_pController->getName();
@@ -262,7 +292,8 @@ void DlgPrefController::enumeratePresets() {
     // Enumerate user presets
     QIcon userPresetIcon(":/images/ic_custom.svg");
     PresetInfo userPresetsMatch = enumeratePresetsFromEnumerator(
-            m_pControllerManager->getMainThreadUserPresetEnumerator(), userPresetIcon);
+            m_pControllerManager->getMainThreadUserPresetEnumerator(),
+            userPresetIcon);
     if (userPresetsMatch.isValid()) {
         match = userPresetsMatch;
     }
@@ -273,18 +304,16 @@ void DlgPrefController::enumeratePresets() {
     // Enumerate system presets
     QIcon systemPresetIcon(":/images/ic_mixxx_symbolic.svg");
     PresetInfo systemPresetsMatch = enumeratePresetsFromEnumerator(
-            m_pControllerManager->getMainThreadSystemPresetEnumerator(), systemPresetIcon);
+            m_pControllerManager->getMainThreadSystemPresetEnumerator(),
+            systemPresetIcon);
     if (systemPresetsMatch.isValid()) {
         match = systemPresetsMatch;
     }
 
-    QString configuredPresetFile = m_pControllerManager->getConfiguredPresetFileForDevice(
-            m_pController->getName());
-
     // Preselect configured or matching preset
     int index = -1;
-    if (!configuredPresetFile.isEmpty()) {
-        index = m_ui.comboBoxPreset->findData(configuredPresetFile);
+    if (!selectedPresetPath.isEmpty()) {
+        index = m_ui.comboBoxPreset->findData(selectedPresetPath);
     } else if (match.isValid()) {
         index = m_ui.comboBoxPreset->findText(match.getName());
     }
@@ -304,11 +333,13 @@ PresetInfo DlgPrefController::enumeratePresetsFromEnumerator(
     // re-enumerate on the next open of the preferences.
     if (!pPresetEnumerator.isNull()) {
         // Get a list of presets in alphabetical order
-        QList<PresetInfo> systemPresets = pPresetEnumerator->getPresetsByExtension(
-                m_pController->presetExtension());
+        QList<PresetInfo> systemPresets =
+                pPresetEnumerator->getPresetsByExtension(
+                        m_pController->presetExtension());
 
         for (const PresetInfo& preset : systemPresets) {
-            m_ui.comboBoxPreset->addItem(icon, preset.getName(), preset.getPath());
+            m_ui.comboBoxPreset->addItem(
+                    icon, preset.getName(), preset.getPath());
             if (m_pController->matchPreset(preset)) {
                 match = preset;
             }
@@ -319,7 +350,8 @@ PresetInfo DlgPrefController::enumeratePresetsFromEnumerator(
 }
 
 void DlgPrefController::slotUpdate() {
-    enumeratePresets();
+    enumeratePresets(m_pControllerManager->getConfiguredPresetFileForDevice(
+            m_pController->getName()));
 
     // Check if the controller is open.
     bool deviceOpen = m_pController->isOpen();
@@ -335,64 +367,121 @@ void DlgPrefController::slotUpdate() {
 }
 
 void DlgPrefController::slotCancel() {
-    if (m_pInputTableModel != NULL) {
+    slotShowPreset(m_pController->getPreset());
+}
+
+void DlgPrefController::revertPresetChanges() {
+    if (m_pInputTableModel) {
         m_pInputTableModel->cancel();
     }
 
-    if (m_pOutputTableModel != NULL) {
+    if (m_pOutputTableModel) {
         m_pOutputTableModel->cancel();
     }
 }
 
+void DlgPrefController::applyPresetChanges() {
+    if (m_pInputTableModel) {
+        m_pInputTableModel->apply();
+    }
+
+    if (m_pOutputTableModel) {
+        m_pOutputTableModel->apply();
+    }
+}
+
 void DlgPrefController::slotApply() {
-    if (m_bDirty) {
-        // Apply the presets and load the resulting preset.
-        if (m_pInputTableModel != NULL) {
-            m_pInputTableModel->apply();
-        }
+    applyPresetChanges();
 
-        if (m_pOutputTableModel != NULL) {
-            m_pOutputTableModel->apply();
-        }
+    // If no changes were made, do nothing
+    if (!isDirty() && (!m_pPreset || m_pPreset->isDirty())) {
+        return;
+    }
 
-        // Load the resulting preset (which has been mutated by the input/output
-        // table models). The controller clones the preset so we aren't touching
-        // the same preset.
-        emit loadPreset(m_pController, m_pPreset);
-
-        bool wantEnabled = m_ui.chkEnabledDevice->isChecked();
-        bool enabled = m_pController->isOpen();
-        if (wantEnabled && !enabled) {
-            enableDevice();
-        } else if (!wantEnabled && enabled) {
-            disableDevice();
+    bool bEnabled = false;
+    if (m_pPreset) {
+        bEnabled = m_ui.chkEnabledDevice->isChecked();
+
+        if (m_pPreset->isDirty()) {
+            savePreset();
         }
+    }
+    m_ui.chkEnabledDevice->setChecked(bEnabled);
 
-        m_bDirty = false;
+    // The shouldn't be dirty at this pint because we already tried to save
+    // it. If that failed, don't apply the preset.
+    if (m_pPreset && m_pPreset->isDirty()) {
+        return;
     }
+
+    // Load the resulting preset (which has been mutated by the input/output
+    // table models). The controller clones the preset so we aren't touching
+    // the same preset.
+    emit applyPreset(m_pController, m_pPreset, bEnabled);
 }
 
-void DlgPrefController::slotLoadPreset(int chosenIndex) {
+void DlgPrefController::slotPresetSelected(int chosenIndex) {
+    QString presetPath;
     if (chosenIndex == 0) {
-        // User picked no preset
+        // User picked "No Preset" item
         m_ui.chkEnabledDevice->setEnabled(false);
-        return;
+    } else {
+        // User picked a preset
+        m_ui.chkEnabledDevice->setEnabled(true);
+
+        presetPath = m_ui.comboBoxPreset->itemData(chosenIndex).toString();
+    }
+
+    if (m_pControllerManager->getConfiguredPresetFileForDevice(
+                m_pController->getName()) != presetPath) {
+        setDirty(true);
+    }
+
+    applyPresetChanges();
+    if (m_pPreset && m_pPreset->isDirty()) {
+        if (QMessageBox::question(this,
+                    tr("Preset has been edited"),
+                    tr("Do you want to save the changes?")) ==
+                QMessageBox::Yes) {
+            savePreset();
+        }
     }
-    m_ui.chkEnabledDevice->setEnabled(true);
 
-    const QString presetPath = m_ui.comboBoxPreset->itemData(chosenIndex).toString();
     ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset(
             presetPath, QDir(resourcePresetsPath(m_pConfig)));
 
-    if (!pPreset) {
+    if (pPreset) {
+        DEBUG_ASSERT(!pPreset->isDirty());
+    }
+
+    slotShowPreset(pPreset);
+}
+
+void DlgPrefController::savePreset() {
+    VERIFY_OR_DEBUG_ASSERT(m_pPreset) {
+        return;
+    }
+
+    if (!m_pPreset->isDirty()) {
+        qDebug() << "Preset is not dirty, no need to save it.";
         return;
     }
 
-    // TODO(rryan): We really should not load the preset here. We should load it
-    // into the preferences GUI and then load it to the actual controller once
-    // the user hits apply.
-    emit loadPreset(m_pController, pPreset);
-    slotDirty();
+    if (m_pPreset->filePath().startsWith(resourcePresetsPath(m_pConfig))) {
+        m_pPreset->setName(QString(tr("%1 (edited)")).arg(m_pPreset->name()));
+        qDebug() << "Renamed preset to " << m_pPreset->name();
+    }
+
+    QString fileName = QFileInfo(m_pPreset->filePath()).fileName();
+    QString filePath = QDir(userPresetsPath(m_pConfig)).absoluteFilePath(fileName);
+    if (!m_pPreset->savePreset(filePath)) {
+        qDebug() << "Failed to save preset!";
+    }
+
+    m_pPreset->setFilePath(filePath);
+    m_pPreset->setDirty(false);
+
+    enumeratePresets(m_pPreset->filePath());
 }
 
 void DlgPrefController::initTableView(QTableView* pTable) {
@@ -415,7 +504,7 @@ void DlgPrefController::initTableView(QTableView* pTable) {
     pTable->setAlternatingRowColors(true);
 }
 
-void DlgPrefController::slotPresetLoaded(ControllerPresetPointer preset) {
+void DlgPrefController::slotShowPreset(ControllerPresetPointer preset) {
     m_ui.labelLoadedPreset->setText(presetName(preset));
     m_ui.labelLoadedPresetDescription->setText(presetDescription(preset));
     m_ui.labelLoadedPresetAuthor->setText(presetAuthor(preset));
@@ -451,13 +540,6 @@ void DlgPrefController::slotPresetLoaded(ControllerPresetPointer preset) {
 
     ControllerInputMappingTableModel* pInputModel =
             new ControllerInputMappingTableModel(this);
-    // If the model reports changes, mark ourselves as dirty.
-    connect(pInputModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
-            this, SLOT(slotDirty()));
-    connect(pInputModel, SIGNAL(rowsInserted(QModelIndex, int, int)),
-            this, SLOT(slotDirty()));
-    connect(pInputModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
-            this, SLOT(slotDirty()));
     pInputModel->setPreset(preset);
 
     QSortFilterProxyModel* pInputProxyModel = new QSortFilterProxyModel(this);
@@ -505,23 +587,6 @@ void DlgPrefController::slotPresetLoaded(ControllerPresetPointer preset) {
     m_pOutputTableModel = pOutputModel;
 }
 
-void DlgPrefController::slotEnableDevice(bool enable) {
-    slotDirty();
-
-    // Set tree item text to normal/bold.
-    emit controllerEnabled(this, enable);
-}
-
-void DlgPrefController::enableDevice() {
-    emit openController(m_pController);
-    //TODO: Should probably check if open() actually succeeded.
-}
-
-void DlgPrefController::disableDevice() {
-    emit closeController(m_pController);
-    //TODO: Should probably check if close() actually succeeded.
-}
-
 void DlgPrefController::addInputMapping() {
     if (m_pInputTableModel) {
         m_pInputTableModel->addEmptyMapping();
@@ -534,7 +599,6 @@ void DlgPrefController::addInputMapping() {
         m_ui.m_pInputMappingTableView->selectionModel()->select(
             QItemSelection(left, right), QItemSelectionModel::Clear | QItemSelectionModel::Select);
         m_ui.m_pInputMappingTableView->scrollTo(left);
-        slotDirty();
     }
 }
 
@@ -545,7 +609,6 @@ void DlgPrefController::removeInputMappings() {
         QModelIndexList selectedIndices = selection.indexes();
         if (selectedIndices.size() > 0 && m_pInputTableModel) {
             m_pInputTableModel->removeMappings(selectedIndices);
-            slotDirty();
         }
     }
 }
@@ -559,7 +622,6 @@ void DlgPrefController::clearAllInputMappings() {
     }
     if (m_pInputTableModel) {
         m_pInputTableModel->clear();
-        slotDirty();
     }
 }
 
@@ -575,7 +637,6 @@ void DlgPrefController::addOutputMapping() {
         m_ui.m_pOutputMappingTableView->selectionModel()->select(
             QItemSelection(left, right), QItemSelectionModel::Clear | QItemSelectionModel::Select);
         m_ui.m_pOutputMappingTableView->scrollTo(left);
-        slotDirty();
     }
 }
 
@@ -586,7 +647,6 @@ void DlgPrefController::removeOutputMappings() {
         QModelIndexList selectedIndices = selection.indexes();
         if (selectedIndices.size() > 0 && m_pOutputTableModel) {
             m_pOutputTableModel->removeMappings(selectedIndices);
-            slotDirty();
         }
     }
 }
@@ -600,6 +660,5 @@ void DlgPrefController::clearAllOutputMappings() {
     }
     if (m_pOutputTableModel) {
         m_pOutputTableModel->clear();
-        slotDirty();
     }
 }
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index 30c354de9b6..2e066357bdf 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -40,24 +40,16 @@ class DlgPrefController : public DlgPreferencePage {
     void slotCancel();
     // Called when preference dialog (not this dialog) is displayed.
     void slotUpdate();
-    // Called when the user toggles the enabled checkbox.
-    void slotEnableDevice(bool enable);
-    // Called when the user selects a preset from the combobox.
-    void slotLoadPreset(int index);
-    // Mark that we need to apply the settings.
-    void slotDirty();
 
   signals:
-    void controllerEnabled(DlgPrefController*, bool);
-    void openController(Controller* pController);
-    void closeController(Controller* pController);
-    void loadPreset(Controller* pController, QString controllerName);
-    void loadPreset(Controller* pController, ControllerPresetPointer pPreset);
+    void applyPreset(Controller* pController, ControllerPresetPointer pPreset, bool bEnabled);
     void mappingStarted();
     void mappingEnded();
 
   private slots:
-    void slotPresetLoaded(ControllerPresetPointer preset);
+    // Called when the user toggles the enabled checkbox.
+    void slotPresetSelected(int index);
+    void slotShowPreset(ControllerPresetPointer preset);
 
     // Input mappings
     void addInputMapping();
@@ -80,11 +72,35 @@ class DlgPrefController : public DlgPreferencePage {
     QString presetForumLink(const ControllerPresetPointer pPreset) const;
     QString presetWikiLink(const ControllerPresetPointer pPreset) const;
     QString presetScriptFileLinks(const ControllerPresetPointer pPreset) const;
-    void savePreset(QString path);
+    void revertPresetChanges();
+    void applyPresetChanges();
+    void savePreset();
     void initTableView(QTableView* pTable);
 
+    /** Set dirty state (i.e. changes have been made).
+     *
+     * When this preferences page is marked as "dirty", changes have occured
+     * that can be applied or discarded.
+     *
+     * @param bDirty The new dialog's dirty state.
+     */
+    void setDirty(bool bDirty) {
+        m_bDirty = bDirty;
+    }
+
+    /** Set dirty state (i.e. changes have been made).
+     *
+     * When this preferences page is marked as "dirty", changes have occured
+     * that can be applied or discarded.
+     *
+     * @param bDirty The new dialog's dirty state.
+     */
+    bool isDirty() {
+        return m_bDirty;
+    }
+
     // Reload the mappings in the dropdown dialog
-    void enumeratePresets();
+    void enumeratePresets(const QString& selectedPresetPath);
     PresetInfo enumeratePresetsFromEnumerator(
             QSharedPointer<PresetInfoEnumerator> pPresetEnumerator,
             QIcon icon = QIcon());
diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp
index babf12c0887..3af59017f85 100644
--- a/src/controllers/dlgprefcontrollers.cpp
+++ b/src/controllers/dlgprefcontrollers.cpp
@@ -55,11 +55,6 @@ void DlgPrefControllers::slotApply() {
     foreach (DlgPrefController* pControllerWindows, m_controllerWindows) {
         pControllerWindows->slotApply();
     }
-
-    // Save all controller presets.
-    // TODO(rryan): Get rid of this and make DlgPrefController do this for each
-    // preset.
-    m_pControllerManager->savePresets();
 }
 
 bool DlgPrefControllers::handleTreeItemClick(QTreeWidgetItem* clickedItem) {
@@ -116,8 +111,11 @@ void DlgPrefControllers::setupControllerWidgets() {
         m_controllerWindows.append(controllerDlg);
         m_pDlgPreferences->addPageWidget(controllerDlg);
 
-        connect(controllerDlg, SIGNAL(controllerEnabled(DlgPrefController*, bool)),
-                this, SLOT(slotHighlightDevice(DlgPrefController*, bool)));
+        connect(pController,
+                &Controller::openChanged,
+                [this, controllerDlg](bool bOpen) {
+                    slotHighlightDevice(controllerDlg, bOpen);
+                });
 
         QTreeWidgetItem * controllerWindowLink = new QTreeWidgetItem(QTreeWidgetItem::Type);
         controllerWindowLink->setIcon(0, QIcon(":/images/preferences/ic_preferences_controllers.png"));

From ffec734edd0dc85ba85d4493abb4b0d62ce3470d Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 18:59:31 +0200
Subject: [PATCH 45/55] controllers/dlgprefcontroller: Reload user presets
 after saving

---
 src/controllers/controllerpresetinfoenumerator.cpp | 4 ++++
 src/controllers/controllerpresetinfoenumerator.h   | 2 --
 src/controllers/dlgprefcontroller.cpp              | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/controllers/controllerpresetinfoenumerator.cpp b/src/controllers/controllerpresetinfoenumerator.cpp
index 14f43a247eb..becbad20a4d 100644
--- a/src/controllers/controllerpresetinfoenumerator.cpp
+++ b/src/controllers/controllerpresetinfoenumerator.cpp
@@ -52,6 +52,10 @@ QList<PresetInfo> PresetInfoEnumerator::getPresetsByExtension(const QString& ext
 }
 
 void PresetInfoEnumerator::loadSupportedPresets() {
+    m_midiPresets.clear();
+    m_hidPresets.clear();
+    m_bulkPresets.clear();
+
     for (const QString& dirPath : m_controllerDirPaths) {
         QDirIterator it(dirPath);
         while (it.hasNext()) {
diff --git a/src/controllers/controllerpresetinfoenumerator.h b/src/controllers/controllerpresetinfoenumerator.h
index 24b5a7be4db..07a71dfd10d 100644
--- a/src/controllers/controllerpresetinfoenumerator.h
+++ b/src/controllers/controllerpresetinfoenumerator.h
@@ -20,8 +20,6 @@ class PresetInfoEnumerator {
 
     // Return cached list of presets for this extension
     QList<PresetInfo> getPresetsByExtension(const QString& extension);
-
-  protected:
     void loadSupportedPresets();
 
   private:
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 1b54eb42a39..19e64b53db1 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -291,6 +291,10 @@ void DlgPrefController::enumeratePresets(const QString& selectedPresetPath) {
     PresetInfo match;
     // Enumerate user presets
     QIcon userPresetIcon(":/images/ic_custom.svg");
+
+    // Reload user presets to detect added, changed or removed mappings
+    m_pControllerManager->getMainThreadUserPresetEnumerator()->loadSupportedPresets();
+
     PresetInfo userPresetsMatch = enumeratePresetsFromEnumerator(
             m_pControllerManager->getMainThreadUserPresetEnumerator(),
             userPresetIcon);

From c562f66872f90825c19912fc184c1abb17bd33f4 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 19:04:11 +0200
Subject: [PATCH 46/55] controllers/dlgprefcontroller: Remove obsolete method

---
 src/controllers/dlgprefcontroller.cpp | 10 ----------
 src/controllers/dlgprefcontroller.h   |  1 -
 2 files changed, 11 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 19e64b53db1..692808518df 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -374,16 +374,6 @@ void DlgPrefController::slotCancel() {
     slotShowPreset(m_pController->getPreset());
 }
 
-void DlgPrefController::revertPresetChanges() {
-    if (m_pInputTableModel) {
-        m_pInputTableModel->cancel();
-    }
-
-    if (m_pOutputTableModel) {
-        m_pOutputTableModel->cancel();
-    }
-}
-
 void DlgPrefController::applyPresetChanges() {
     if (m_pInputTableModel) {
         m_pInputTableModel->apply();
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index 2e066357bdf..084e46b306e 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -72,7 +72,6 @@ class DlgPrefController : public DlgPreferencePage {
     QString presetForumLink(const ControllerPresetPointer pPreset) const;
     QString presetWikiLink(const ControllerPresetPointer pPreset) const;
     QString presetScriptFileLinks(const ControllerPresetPointer pPreset) const;
-    void revertPresetChanges();
     void applyPresetChanges();
     void savePreset();
     void initTableView(QTableView* pTable);

From b4db43b63e6bc3965c59859307bf3cde3448d307 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 19:33:25 +0200
Subject: [PATCH 47/55] controllers/dlgprefcontroller: Fix dirty detection in
 slotApply()

---
 src/controllers/dlgprefcontroller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 692808518df..4a29e6af4c8 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -388,7 +388,7 @@ void DlgPrefController::slotApply() {
     applyPresetChanges();
 
     // If no changes were made, do nothing
-    if (!isDirty() && (!m_pPreset || m_pPreset->isDirty())) {
+    if (!(isDirty() || (m_pPreset && m_pPreset->isDirty()))) {
         return;
     }
 

From 6dcffced4be30f77cad34d3c45566de0a362ec6e Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 20:19:27 +0200
Subject: [PATCH 48/55] controllers/dlgprefcontroller: Reset dialog dirty state
 on apply

---
 src/controllers/dlgprefcontroller.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 4a29e6af4c8..e440bda1ddf 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -412,6 +412,9 @@ void DlgPrefController::slotApply() {
     // table models). The controller clones the preset so we aren't touching
     // the same preset.
     emit applyPreset(m_pController, m_pPreset, bEnabled);
+
+    // Mark the dialog as not dirty
+    setDirty(false);
 }
 
 void DlgPrefController::slotPresetSelected(int chosenIndex) {

From 47f1ccd59c1d846a38677144dd53ab69dfb16f29 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 21:10:45 +0200
Subject: [PATCH 49/55] controllers/dlgprefcontroller: Remove wrong dirty state
 change

---
 src/controllers/dlgprefcontroller.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index e440bda1ddf..5e770955aab 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -133,9 +133,6 @@ void DlgPrefController::showLearningWizard() {
     }
     slotApply();
 
-    // After this point we consider the mapping wizard as dirtying the preset.
-    setDirty(true);
-
     // Note that DlgControllerLearning is set to delete itself on close using
     // the Qt::WA_DeleteOnClose attribute (so this "new" doesn't leak memory)
     m_pDlgControllerLearning = new DlgControllerLearning(this, m_pController);

From 420ceb91b45fcfedb0e4c7629362ec43677b033c Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 21:11:13 +0200
Subject: [PATCH 50/55] controllers/dlgprefcontroller: Add acomment

---
 src/controllers/dlgprefcontroller.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 5e770955aab..ab6ed7bd88a 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -426,6 +426,7 @@ void DlgPrefController::slotPresetSelected(int chosenIndex) {
         presetPath = m_ui.comboBoxPreset->itemData(chosenIndex).toString();
     }
 
+    // Check if the preset is different from the configured preset
     if (m_pControllerManager->getConfiguredPresetFileForDevice(
                 m_pController->getName()) != presetPath) {
         setDirty(true);

From 54c38e11279810b74c27cdce76a016d0c4ca10ff Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Wed, 8 Apr 2020 23:46:09 +0200
Subject: [PATCH 51/55] controllers/controllermanager: Return QFileInfo in
 findPresetFile()

---
 src/controllers/controllermanager.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 17ce5433c20..6bc5f42e744 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -45,21 +45,20 @@ QString sanitizeDeviceName(QString name) {
     return name.replace(" ", "_").replace("/", "_").replace("\\", "_");
 }
 
-QString findPresetFile(const QString& pathOrFilename, const QStringList& paths) {
+QFileInfo findPresetFile(const QString& pathOrFilename, const QStringList& paths) {
     QFileInfo fileInfo(pathOrFilename);
     if (fileInfo.isAbsolute()) {
-        return pathOrFilename;
+        return fileInfo;
     }
 
     for (const QString& path : paths) {
-        QDir pathDir(path);
-
-        if (pathDir.exists(pathOrFilename)) {
-            return pathDir.absoluteFilePath(pathOrFilename);
+        fileInfo = QFileInfo(QDir(path).absoluteFilePath(pathOrFilename));
+        if (fileInfo.exists()) {
+            return fileInfo;
         }
     }
 
-    return QString();
+    return QFileInfo();
 }
 
 } // anonymous namespace
@@ -252,21 +251,21 @@ void ControllerManager::slotSetUpDevices() {
         }
 
         // Check if device has a configured preset
-        QString presetFile = getConfiguredPresetFileForDevice(deviceName);
-        if (presetFile.isEmpty()) {
+        QString presetFilePath = getConfiguredPresetFileForDevice(deviceName);
+        if (presetFilePath.isEmpty()) {
             continue;
         }
 
-        qDebug() << "Searching for controller preset" << presetFile
+        qDebug() << "Searching for controller preset" << presetFilePath
                  << "in paths:" << presetPaths.join(",");
-        QString presetFilePath = findPresetFile(presetFile, presetPaths);
-        if (presetFilePath.isEmpty()) {
+        QFileInfo presetFile = findPresetFile(presetFilePath, presetPaths);
+        if (!presetFile.exists()) {
             qDebug() << "Could not find" << presetFilePath << "in any preset path.";
             continue;
         }
 
         ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset(
-                QFileInfo(presetFilePath), resourcePresetsPath(m_pConfig));
+                presetFile, resourcePresetsPath(m_pConfig));
 
         if (!pPreset) {
             continue;

From 00ad201acc04b3443b26d6f363e24163e6ed83ba Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 9 Apr 2020 01:16:17 +0200
Subject: [PATCH 52/55] controllers/dlgprefcontroller: Add edited suffix to
 filenames

    This allows editing user controller scripts (e.g. downloaded
    from the forum) as well.
---
 src/controllers/dlgprefcontroller.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index ab6ed7bd88a..3a2c99a58fd 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -462,13 +462,24 @@ void DlgPrefController::savePreset() {
         return;
     }
 
-    if (m_pPreset->filePath().startsWith(resourcePresetsPath(m_pConfig))) {
-        m_pPreset->setName(QString(tr("%1 (edited)")).arg(m_pPreset->name()));
+    QFileInfo fileInfo(m_pPreset->filePath());
+    QString fileName = fileInfo.fileName();
+
+    // Add " (edited)" to preset name (if it's not already present)
+    QString editedSuffix = QStringLiteral(" (") + tr("edited") + QStringLiteral(")");
+    if (!m_pPreset->name().endsWith(editedSuffix)) {
+        m_pPreset->setName(m_pPreset->name() + editedSuffix);
         qDebug() << "Renamed preset to " << m_pPreset->name();
-    }
 
-    QString fileName = QFileInfo(m_pPreset->filePath()).fileName();
+        // Add " (edited)" to file name (if it's not already present)
+        QString baseName = fileInfo.baseName();
+        if (baseName.endsWith(editedSuffix)) {
+            baseName.chop(editedSuffix.size());
+        }
+        fileName = baseName + editedSuffix + QStringLiteral(".") + fileInfo.completeSuffix();
+    }
     QString filePath = QDir(userPresetsPath(m_pConfig)).absoluteFilePath(fileName);
+
     if (!m_pPreset->savePreset(filePath)) {
         qDebug() << "Failed to save preset!";
     }

From 419ccf468c101e67fe5cb14818c42b0e5fcc8501 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 9 Apr 2020 02:06:00 +0200
Subject: [PATCH 53/55] controllers/dlgprefcontroller: Tick Enabled checkbox on
 preset change

---
 src/controllers/dlgprefcontroller.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 3a2c99a58fd..4ac394989b7 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -419,10 +419,20 @@ void DlgPrefController::slotPresetSelected(int chosenIndex) {
     if (chosenIndex == 0) {
         // User picked "No Preset" item
         m_ui.chkEnabledDevice->setEnabled(false);
+
+        if (m_ui.chkEnabledDevice->isChecked()) {
+            m_ui.chkEnabledDevice->setChecked(false);
+            setDirty(true);
+        }
     } else {
         // User picked a preset
         m_ui.chkEnabledDevice->setEnabled(true);
 
+        if (!m_ui.chkEnabledDevice->isChecked()) {
+            m_ui.chkEnabledDevice->setChecked(true);
+            setDirty(true);
+        }
+
         presetPath = m_ui.comboBoxPreset->itemData(chosenIndex).toString();
     }
 

From b9079e040c7a948cb029ea0bca76d0b0d3b800b0 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 9 Apr 2020 11:15:06 +0200
Subject: [PATCH 54/55] controllers/dlgprefcontroller: Display "No scripts" for
 scriptless presets

---
 src/controllers/dlgprefcontroller.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 4ac394989b7..e281bbb5011 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -249,8 +249,8 @@ QString DlgPrefController::presetWikiLink(
 
 QString DlgPrefController::presetScriptFileLinks(
         const ControllerPresetPointer pPreset) const {
-    if (!pPreset) {
-        return QString();
+    if (!pPreset || pPreset->getScriptFiles().empty()) {
+        return tr("No Scripts");
     }
 
     QString systemPresetPath = resourcePresetsPath(m_pConfig);

From 4760291684b6bd79f4e5d09ddc2f32337eba1693 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 9 Apr 2020 12:52:16 +0200
Subject: [PATCH 55/55] controllers: Fix comments and include guards

---
 src/controllers/controller.h                  | 20 +++----
 .../controllerinputmappingtablemodel.h        | 12 ++--
 src/controllers/controllermanager.cpp         |  4 +-
 .../controlleroutputmappingtablemodel.h       | 12 ++--
 src/controllers/controllerpreset.h            | 31 ++++-------
 .../controllerpresetfilehandler.cpp           | 28 ++++------
 src/controllers/controllerpresetfilehandler.h | 55 +++++++++----------
 src/controllers/dlgprefcontroller.h           | 42 +++++++-------
 src/controllers/dlgprefcontrollers.h          |  7 +--
 src/controllers/hid/hidcontrollerpreset.cpp   | 16 +++---
 src/controllers/hid/hidcontrollerpreset.h     | 11 ++--
 src/controllers/midi/midicontroller.h         | 23 ++++----
 src/controllers/midi/midicontrollerpreset.cpp | 16 +++---
 src/controllers/midi/midicontrollerpreset.h   | 16 ++----
 src/test/learningutilstest.cpp                |  7 +--
 15 files changed, 130 insertions(+), 170 deletions(-)

diff --git a/src/controllers/controller.h b/src/controllers/controller.h
index 058537f5a81..06fed55a482 100644
--- a/src/controllers/controller.h
+++ b/src/controllers/controller.h
@@ -26,9 +26,9 @@ class Controller : public QObject, ConstControllerPresetVisitor {
     explicit Controller(UserSettingsPointer pConfig);
     ~Controller() override;  // Subclass should call close() at minimum.
 
-    // Returns the extension for the controller (type) preset files.  This is
-    // used by the ControllerManager to display only relevant preset files for
-    // the controller (type.)
+    /// Returns the extension for the controller (type) preset files.  This is
+    /// used by the ControllerManager to display only relevant preset files for
+    /// the controller (type.)
     virtual QString presetExtension() = 0;
 
     void setPreset(const ControllerPreset& preset) {
@@ -69,6 +69,7 @@ class Controller : public QObject, ConstControllerPresetVisitor {
     // preset, not a pointer to the preset itself.
     void presetLoaded(ControllerPresetPointer pPreset);
 
+    /// Emitted when the controller is opened or closed.
     void openChanged(bool bOpen);
 
     // Making these slots protected/private ensures that other parts of Mixxx can
@@ -82,13 +83,12 @@ class Controller : public QObject, ConstControllerPresetVisitor {
     // this if they have an alternate way of handling such data.)
     virtual void receive(const QByteArray data, mixxx::Duration timestamp);
 
-    /** Apply the preset to the controller.
-     *  @brief Initializes both controller engine and static output mappings.
-     *
-     *  @param initializeScripts Can be set to false to skip script
-     *  initialization for unit tests.
-     *  @return Returns whether it was successful.
-     */
+    /// Apply the preset to the controller.
+    /// @brief Initializes both controller engine and static output mappings.
+    ///
+    /// @param initializeScripts Can be set to false to skip script
+    /// initialization for unit tests.
+    /// @return Returns whether it was successful.
     virtual bool applyPreset(bool initializeScripts = true);
 
     // Puts the controller in and out of learning mode.
diff --git a/src/controllers/controllerinputmappingtablemodel.h b/src/controllers/controllerinputmappingtablemodel.h
index 6abaa5ed6d0..40d51d08c63 100644
--- a/src/controllers/controllerinputmappingtablemodel.h
+++ b/src/controllers/controllerinputmappingtablemodel.h
@@ -1,5 +1,4 @@
-#ifndef CONTROLLERINPUTMAPPINGTABLEMODEL_H
-#define CONTROLLERINPUTMAPPINGTABLEMODEL_H
+#pragma once
 
 #include <QAbstractTableModel>
 #include <QVariant>
@@ -9,10 +8,9 @@
 #include "controllers/controllermappingtablemodel.h"
 #include "controllers/midi/midimessage.h"
 
-/** Table Model for the "Inputs" table view in the preferences dialog.
- *
- *  This allows editing the input mappings for a MIDI preset.
- */
+/// Table Model for the "Inputs" table view in the preferences dialog.
+///
+/// This allows editing the input mappings for a MIDI preset.
 class ControllerInputMappingTableModel : public ControllerMappingTableModel {
     Q_OBJECT
   public:
@@ -68,5 +66,3 @@ class ControllerInputMappingTableModel : public ControllerMappingTableModel {
 
     QList<MidiInputMapping> m_midiInputMappings;
 };
-
-#endif /* CONTROLLERINPUTMAPPINGTABLEMODEL_H */
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 6bc5f42e744..a232fbfa294 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -39,8 +39,8 @@ const int kPollIntervalMillis = 5;
 const int kPollIntervalMillis = 1;
 #endif
 
-// Strip slashes and spaces from device name, so that it can be used as config
-// key or a filename.
+/// Strip slashes and spaces from device name, so that it can be used as config
+/// key or a filename.
 QString sanitizeDeviceName(QString name) {
     return name.replace(" ", "_").replace("/", "_").replace("\\", "_");
 }
diff --git a/src/controllers/controlleroutputmappingtablemodel.h b/src/controllers/controlleroutputmappingtablemodel.h
index 317837b7fef..36be40f69a6 100644
--- a/src/controllers/controlleroutputmappingtablemodel.h
+++ b/src/controllers/controlleroutputmappingtablemodel.h
@@ -1,5 +1,4 @@
-#ifndef CONTROLLEROUTPUTMAPPINGTABLEMODEL_H
-#define CONTROLLEROUTPUTMAPPINGTABLEMODEL_H
+#pragma once
 
 #include <QAbstractTableModel>
 #include <QVariant>
@@ -9,10 +8,9 @@
 #include "controllers/controllermappingtablemodel.h"
 #include "controllers/midi/midimessage.h"
 
-/** Table Model for the "Outputs" table view in the preferences dialog.
- *
- *  This allows editing the output mappings for a MIDI preset.
- */
+/// Table Model for the "Outputs" table view in the preferences dialog.
+///
+/// This allows editing the output mappings for a MIDI preset.
 class ControllerOutputMappingTableModel : public ControllerMappingTableModel {
     Q_OBJECT
   public:
@@ -62,5 +60,3 @@ class ControllerOutputMappingTableModel : public ControllerMappingTableModel {
 
     QList<MidiOutputMapping> m_midiOutputMappings;
 };
-
-#endif /* CONTROLLEROUTPUTMAPPINGTABLEMODEL_H */
diff --git a/src/controllers/controllerpreset.h b/src/controllers/controllerpreset.h
index d49f57fb7ba..e51092961de 100644
--- a/src/controllers/controllerpreset.h
+++ b/src/controllers/controllerpreset.h
@@ -1,15 +1,8 @@
-/**
-* @file controllerpreset.h
-* @author Sean Pappalardo spappalardo@mixxx.org
-* @date Mon 9 Apr 2012
-* @brief Controller preset
-*
-* This class represents a controller preset, containing the data elements that
-* make it up.
-*/
-
-#ifndef CONTROLLERPRESET_H
-#define CONTROLLERPRESET_H
+#pragma once
+/// @file controllerpreset.h
+/// @author Sean Pappalardo spappalardo@mixxx.org
+/// @date Mon 9 Apr 2012
+/// @brief Controller Preset
 
 #include <QDebug>
 #include <QDir>
@@ -21,6 +14,8 @@
 class ControllerPresetVisitor;
 class ConstControllerPresetVisitor;
 
+/// This class represents a controller preset, containing the data elements that
+/// make it up.
 class ControllerPreset {
   public:
     ControllerPreset()
@@ -40,11 +35,11 @@ class ControllerPreset {
         bool builtin;
     };
 
-    /** addScriptFile(QString,QString)
-     * Adds an entry to the list of script file names & associated list of function prefixes
-     * @param filename Name of the XML file to add
-     * @param functionprefix Function prefix to add
-     */
+    /// Adds a script file to the list of controller scripts for this preset.
+    /// @param filename Name of the script file to add
+    /// @param functionprefix The script's function prefix (or empty string)
+    /// @param file A FileInfo object pointing to the script file
+    /// @param builtin If this is true, the script won't be written to the XML
     void addScriptFile(const QString& name,
             const QString& functionprefix,
             const QFileInfo& file,
@@ -187,5 +182,3 @@ class ControllerPreset {
 };
 
 typedef QSharedPointer<ControllerPreset> ControllerPresetPointer;
-
-#endif
diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp
index eb27038e4f6..6d147a6e885 100644
--- a/src/controllers/controllerpresetfilehandler.cpp
+++ b/src/controllers/controllerpresetfilehandler.cpp
@@ -1,10 +1,7 @@
-/**
-* @file controllerpresetfilehandler.cpp
-* @author Sean Pappalardo spappalardo@mixxx.org
-* @date Mon 9 Apr 2012
-* @brief Handles loading and saving of Controller presets.
-*
-*/
+/// @file controllerpresetfilehandler.cpp
+/// @author Sean Pappalardo spappalardo@mixxx.org
+/// @date Mon 9 Apr 2012
+/// @brief Handles loading and saving of Controller presets.
 
 #include "controllers/controllerpresetfilehandler.h"
 #include "controllers/controllermanager.h"
@@ -14,15 +11,14 @@
 
 namespace {
 
-/** Find script file in the preset or system path.
- *
- *  @param preset The controller preset the script belongs to.
- *  @param filename The script filename.
- *  @param systemPresetsPath The system presets path to use as fallback.
- *  @return Returns a QFileInfo object. If the script was not found in either
- *  of the search directories, the QFileInfo object might point to a
- *  non-existing file.
- */
+/// Find script file in the preset or system path.
+///
+/// @param preset The controller preset the script belongs to.
+/// @param filename The script filename.
+/// @param systemPresetsPath The system presets path to use as fallback.
+/// @return Returns a QFileInfo object. If the script was not found in either
+/// of the search directories, the QFileInfo object might point to a
+/// non-existing file.
 QFileInfo findScriptFile(ControllerPreset* preset,
         const QString& filename,
         const QDir& systemPresetsPath) {
diff --git a/src/controllers/controllerpresetfilehandler.h b/src/controllers/controllerpresetfilehandler.h
index fce44f55d80..2ee8c34e37d 100644
--- a/src/controllers/controllerpresetfilehandler.h
+++ b/src/controllers/controllerpresetfilehandler.h
@@ -1,21 +1,18 @@
 #pragma once
-/**
-* @file controllerpresetfilehandler.h
-* @author Sean Pappalardo spappalardo@mixxx.org
-* @date Mon 9 Apr 2012
-* @brief Handles loading and saving of Controller presets.
-*
-* The ControllerPresetFileHandler is used for serializing/deserializing the
-* ControllerPreset objects to/from XML files and is also responsible
-* finding the script files that belong to a preset in the file system.
-*
-* Subclasses can implement the private load function to add support for XML
-* elements that are only useful for certain mapping types.
-*/
+/// @file controllerpresetfilehandler.h
+/// @author Sean Pappalardo spappalardo@mixxx.org
+/// @date Mon 9 Apr 2012
+/// @brief Handles loading and saving of Controller presets.
 
 #include "util/xml.h"
 #include "controllers/controllerpreset.h"
 
+/// The ControllerPresetFileHandler is used for serializing/deserializing the
+/// ControllerPreset objects to/from XML files and is also responsible
+/// finding the script files that belong to a preset in the file system.
+///
+/// Subclasses can implement the private load function to add support for XML
+/// elements that are only useful for certain mapping types.
 class ControllerPresetFileHandler {
   public:
     ControllerPresetFileHandler() {};
@@ -24,11 +21,10 @@ class ControllerPresetFileHandler {
     static ControllerPresetPointer loadPreset(const QFileInfo& presetFile,
             const QDir& systemPresetsPath);
 
-    /** Overloaded function for convenience
-     *
-     * @param path The path to a controller preset XML file.
-     * @param deviceName The name/id of the controller
-     */
+    ///  Overloaded function for convenience
+    ///
+    /// @param path The path to a controller preset XML file.
+    /// @param systemPresetsPath Fallback directory for searching script files.
     ControllerPresetPointer load(const QString& path, const QDir& systemPresetsPath);
 
     // Returns just the name of a given device (everything before the first
@@ -43,22 +39,21 @@ class ControllerPresetFileHandler {
     void parsePresetInfo(const QDomElement& root,
                          ControllerPreset* preset) const;
 
-    /** Adds script files from XML to the ControllerPreset.
-     *
-     * This function parses the supplied QDomElement structure, finds the
-     * matching script files inside the search paths and adds them to
-     * ControllerPreset.
-     *
-     * @param root The root node of the XML document for the preset.
-     * @param deviceName The name/id of the controller.
-     * @param preset The ControllerPreset these scripts belong to.
-     */
+    /// Adds script files from XML to the ControllerPreset.
+    ///
+    /// This function parses the supplied QDomElement structure, finds the
+    /// matching script files inside the search paths and adds them to
+    /// ControllerPreset.
+    ///
+    /// @param root The root node of the XML document for the preset.
+    /// @param preset The ControllerPreset these scripts belong to.
+    /// @param systemPresetsPath Fallback directory for searching script files.
     void addScriptFilesToPreset(const QDomElement& root,
             ControllerPreset* preset,
             const QDir& systemPresetsPath) const;
 
-    // Creates the XML document and includes what script files are currently
-    // loaded. Sub-classes need to call this before adding any other items.
+    /// Creates the XML document and includes what script files are currently
+    /// loaded. Sub-classes need to call this before adding any other items.
     QDomDocument buildRootWithScripts(const ControllerPreset& preset) const;
 
     bool writeDocument(QDomDocument root, const QString fileName) const;
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index 084e46b306e..45774383310 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -1,9 +1,7 @@
-/**
-* @file dlgprefcontroller.h
-* @author Sean M. Pappalardo  spappalardo@mixxx.org
-* @date Mon May 2 2011
-* @brief Configuration dialog for a single DJ controller
-*/
+/// @file dlgprefcontroller.h
+/// @author Sean M. Pappalardo  spappalardo@mixxx.org
+/// @date Mon May 2 2011
+/// @brief Configuration dialog for a single DJ controller
 
 #ifndef DLGPREFCONTROLLER_H
 #define DLGPREFCONTROLLER_H
@@ -47,8 +45,10 @@ class DlgPrefController : public DlgPreferencePage {
     void mappingEnded();
 
   private slots:
-    // Called when the user toggles the enabled checkbox.
+    /// Called when the user selects another preset in the combobox
     void slotPresetSelected(int index);
+    /// Used to selected the current preset in the combobox and display the
+    /// preset information.
     void slotShowPreset(ControllerPresetPointer preset);
 
     // Input mappings
@@ -76,29 +76,27 @@ class DlgPrefController : public DlgPreferencePage {
     void savePreset();
     void initTableView(QTableView* pTable);
 
-    /** Set dirty state (i.e. changes have been made).
-     *
-     * When this preferences page is marked as "dirty", changes have occured
-     * that can be applied or discarded.
-     *
-     * @param bDirty The new dialog's dirty state.
-     */
+    /// Set dirty state (i.e. changes have been made).
+    ///
+    /// When this preferences page is marked as "dirty", changes have occured
+    /// that can be applied or discarded.
+    ///
+    /// @param bDirty The new dialog's dirty state.
     void setDirty(bool bDirty) {
         m_bDirty = bDirty;
     }
 
-    /** Set dirty state (i.e. changes have been made).
-     *
-     * When this preferences page is marked as "dirty", changes have occured
-     * that can be applied or discarded.
-     *
-     * @param bDirty The new dialog's dirty state.
-     */
+    /// Set dirty state (i.e. changes have been made).
+    ///
+    /// When this preferences page is marked as "dirty", changes have occured
+    /// that can be applied or discarded.
+    ///
+    /// @param bDirty The new dialog's dirty state.
     bool isDirty() {
         return m_bDirty;
     }
 
-    // Reload the mappings in the dropdown dialog
+    /// Reload the mappings in the dropdown dialog
     void enumeratePresets(const QString& selectedPresetPath);
     PresetInfo enumeratePresetsFromEnumerator(
             QSharedPointer<PresetInfoEnumerator> pPresetEnumerator,
diff --git a/src/controllers/dlgprefcontrollers.h b/src/controllers/dlgprefcontrollers.h
index 66be4651cf8..5e704f211ca 100644
--- a/src/controllers/dlgprefcontrollers.h
+++ b/src/controllers/dlgprefcontrollers.h
@@ -10,10 +10,9 @@ class DlgPreferences;
 class DlgPrefController;
 class ControllerManager;
 
-/** Controllers Overview in the preferences
- *
- *  This dialog allows selecting controllers for configuration.
- */
+/// Controllers Overview in the preferences
+///
+/// This dialog allows selecting controllers for configuration.
 
 class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControllersDlg {
     Q_OBJECT
diff --git a/src/controllers/hid/hidcontrollerpreset.cpp b/src/controllers/hid/hidcontrollerpreset.cpp
index f5e8d49331e..5bcbd327255 100644
--- a/src/controllers/hid/hidcontrollerpreset.cpp
+++ b/src/controllers/hid/hidcontrollerpreset.cpp
@@ -1,12 +1,10 @@
-/**
- * @file hidcontrollerpreset.cpp
- * @author Jan Holthuis holzhaus@mixxx.org
- * @date Mon 8 Apr 2020
- * @brief HID/Bulk Controller Preset
- *
- * This class represents a HID or Bulk controller preset, containing the data
- * elements that make it up.
- */
+/// @file hidcontrollerpreset.cpp
+/// @author Jan Holthuis holzhaus@mixxx.org
+/// @date Mon 8 Apr 2020
+/// @brief HID/Bulk Controller Preset
+///
+/// This class represents a HID or Bulk controller preset, containing the data
+/// elements that make it up.
 
 #include "controllers/hid/hidcontrollerpreset.h"
 
diff --git a/src/controllers/hid/hidcontrollerpreset.h b/src/controllers/hid/hidcontrollerpreset.h
index f1e2b8e36b8..77cfc7f34b3 100644
--- a/src/controllers/hid/hidcontrollerpreset.h
+++ b/src/controllers/hid/hidcontrollerpreset.h
@@ -1,16 +1,13 @@
 #pragma once
-/**
- * @file hidcontrollerpreset.h
- * @brief HID/Bulk Controller Preset
- *
- * This class represents a HID or Bulk controller preset, containing the data
- * elements that make it up.
- */
+/// @file hidcontrollerpreset.h
+/// @brief HID/Bulk Controller Preset
 
 #include "controllers/controllerpreset.h"
 #include "controllers/controllerpresetvisitor.h"
 #include "controllers/hid/hidcontrollerpresetfilehandler.h"
 
+/// This class represents a HID or Bulk controller preset, containing the data
+/// elements that make it up.
 class HidControllerPreset : public ControllerPreset {
   public:
     HidControllerPreset() {}
diff --git a/src/controllers/midi/midicontroller.h b/src/controllers/midi/midicontroller.h
index 25a555c8373..0fe825f5661 100644
--- a/src/controllers/midi/midicontroller.h
+++ b/src/controllers/midi/midicontroller.h
@@ -57,9 +57,9 @@ class MidiController : public Controller {
     Q_INVOKABLE virtual void sendShortMsg(unsigned char status,
                                           unsigned char byte1, unsigned char byte2) = 0;
 
-    // Alias for send()
-    // The length parameter is here for backwards compatibility for when scripts
-    // were required to specify it.
+    /// Alias for send()
+    /// The length parameter is here for backwards compatibility for when scripts
+    /// were required to specify it.
     Q_INVOKABLE inline void sendSysexMsg(QList<int> data, unsigned int length = 0) {
         Q_UNUSED(length);
         send(data);
@@ -73,13 +73,12 @@ class MidiController : public Controller {
     int close() override;
 
   private slots:
-    /** Apply the preset to the controller.
-     *  @brief Initializes both controller engine and static output mappings.
-     *
-     *  @param initializeScripts Can be set to false to skip script
-     *  initialization for unit tests.
-     *  @return Returns whether it was successful.
-     */
+    /// Apply the preset to the controller.
+    /// @brief Initializes both controller engine and static output mappings.
+    ///
+    /// @param initializeScripts Can be set to false to skip script
+    /// initialization for unit tests.
+    /// @return Returns whether it was successful.
     bool applyPreset(bool initializeScripts = false) override;
 
     void learnTemporaryInputMappings(const MidiInputMappings& mappings);
@@ -101,8 +100,8 @@ class MidiController : public Controller {
     void updateAllOutputs();
     void destroyOutputHandlers();
 
-    // Returns a pointer to the currently loaded controller preset. For internal
-    // use only.
+    /// Returns a pointer to the currently loaded controller preset. For internal
+    /// use only.
     ControllerPreset* preset() override {
         return &m_preset;
     }
diff --git a/src/controllers/midi/midicontrollerpreset.cpp b/src/controllers/midi/midicontrollerpreset.cpp
index c3ac3efe153..31d363349ac 100644
--- a/src/controllers/midi/midicontrollerpreset.cpp
+++ b/src/controllers/midi/midicontrollerpreset.cpp
@@ -1,12 +1,10 @@
-/**
- * @file midicontrollerpreset.cpp
- * @author Jan Holthuis holzhaus@mixxx.org
- * @date Wed 8 Apr 2020
- * @brief MIDI Controller Preset
- *
- * This class represents a MIDI controller preset, containing the data elements
- *   that make it up.
- */
+/// @file midicontrollerpreset.cpp
+/// @author Jan Holthuis holzhaus@mixxx.org
+/// @date Wed 8 Apr 2020
+/// @brief MIDI Controller Preset
+///
+/// This class represents a MIDI controller preset, containing the data elements
+///   that make it up.
 
 #include "controllers/midi/midicontrollerpreset.h"
 
diff --git a/src/controllers/midi/midicontrollerpreset.h b/src/controllers/midi/midicontrollerpreset.h
index a2f16e5efc8..530e1e34950 100644
--- a/src/controllers/midi/midicontrollerpreset.h
+++ b/src/controllers/midi/midicontrollerpreset.h
@@ -1,14 +1,8 @@
 #pragma once
-/**
- * @file midicontrollerpreset.h
- * @author Sean Pappalardo spappalardo@mixxx.org
- * @date Mon 9 Apr 2012
- * @brief MIDI Controller preset
- *
- * This class represents a MIDI controller preset, containing the data elements
- *   that make it up.
- *
- */
+/// @file midicontrollerpreset.h
+/// @author Sean Pappalardo spappalardo@mixxx.org
+/// @date Mon 9 Apr 2012
+/// @brief MIDI Controller preset
 
 #include <QHash>
 
@@ -16,6 +10,8 @@
 #include "controllers/controllerpresetvisitor.h"
 #include "controllers/midi/midimessage.h"
 
+/// This class represents a MIDI controller preset, containing the data elements
+///   that make it up.
 class MidiControllerPreset : public ControllerPreset {
   public:
     MidiControllerPreset(){};
diff --git a/src/test/learningutilstest.cpp b/src/test/learningutilstest.cpp
index 07ca3c995b2..c6e2057503b 100644
--- a/src/test/learningutilstest.cpp
+++ b/src/test/learningutilstest.cpp
@@ -15,10 +15,9 @@ class LearningUtilsTest : public MixxxTest {
         m_messages.append(qMakePair(MidiKey(status, control), value));
     }
 
-    /** Check if mapping in present in mapping list.
-     *  Similar to MidiInputMappings::contains(const MidiInputMapping&), but
-     *  does not compare the description.
-     */
+    /// Check if mapping in present in mapping list.
+    /// Similar to MidiInputMappings::contains(const MidiInputMapping&), but
+    /// does not compare the description.
     bool containsMapping(const MidiInputMappings& haystack, const MidiInputMapping& needle) {
         for (const MidiInputMapping& mapping : haystack) {
             if (mapping.key == needle.key &&