Support updating of effect presets

src/effects/presets/effectchainpresetmanager.cpp

@@ -6,6 +6,7 @@
 #include <QMessageBox>
 
 #include "effects/backends/builtin/filtereffect.h"
+#include "effects/effectchain.h"
 #include "effects/effectsmanager.h"
 #include "effects/presets/effectxmlelements.h"
 #include "util/filename.h"
@@ -286,14 +287,12 @@ void EffectChainPresetManager::renamePreset(const QString& oldName) {
 
     int index = m_effectChainPresetsSorted.indexOf(pPreset);
     if (index != -1) {
-        m_effectChainPresetsSorted.removeAt(index);
-        m_effectChainPresetsSorted.insert(index, pPreset);
+        m_effectChainPresetsSorted.replace(index, pPreset);
         emit effectChainPresetListUpdated();
     }
     index = m_quickEffectChainPresetsSorted.indexOf(pPreset);
     if (index != -1) {
-        m_quickEffectChainPresetsSorted.removeAt(index);
-        m_quickEffectChainPresetsSorted.insert(index, pPreset);
+        m_quickEffectChainPresetsSorted.replace(index, pPreset);
         emit quickEffectChainPresetListUpdated();
     }
 }
@@ -407,6 +406,30 @@ void EffectChainPresetManager::savePreset(EffectChainPresetPointer pPreset) {
     savePresetXml(pPreset);
 }
 
+void EffectChainPresetManager::updatePreset(EffectChainPointer pChainSlot) {
+    const QString name = pChainSlot->presetName();
+    if (name.isEmpty()) {
+        return;
+    }
+
+    auto it = m_effectChainPresets.find(name);
+    VERIFY_OR_DEBUG_ASSERT(it != m_effectChainPresets.end()) {
+        return;
+    }
+
+    const int index = m_effectChainPresetsSorted.indexOf(*it);
+    VERIFY_OR_DEBUG_ASSERT(index != -1) {
+        return;
+    }
+    // Effect Chain Presets don't have a copy constructor, so we have to create a new one and
+    // replace the existing entries in the two lists. Calling reset or swap on the iterator
+    // also doesn't work.
+    auto pPreset = EffectChainPresetPointer::create(pChainSlot.data());
+    m_effectChainPresetsSorted.replace(index, pPreset);
+    m_effectChainPresets.insert(name, pPreset);
+    savePresetXml(pPreset);
+}
+
 void EffectChainPresetManager::importUserPresets() {
     QString savedPresetsPath(
             m_pConfig->getSettingsPath() + kEffectChainPresetDirectory);

src/effects/presets/effectchainpresetmanager.h

@@ -67,6 +67,7 @@ class EffectChainPresetManager : public QObject {
 
     void savePreset(EffectChainPresetPointer pPreset);
     void savePreset(EffectChainPointer pChainSlot);
+    void updatePreset(EffectChainPointer pChainSlot);
 
     EffectsXmlData readEffectsXml(const QDomDocument& doc, const QStringList& deckStrings);
     void saveEffectsXml(QDomDocument* pDoc, const EffectsXmlData& data);

src/widget/weffectchainpresetbutton.cpp

@@ -25,6 +25,10 @@ void WEffectChainPresetButton::setup(const QDomNode& node, const SkinContext& co
     m_iChainNumber = EffectWidgetUtils::getEffectUnitNumberFromNode(node, context);
     m_pChain = EffectWidgetUtils::getEffectChainFromNode(
             node, context, m_pEffectsManager);
+    connect(m_pChain.get(),
+            &EffectChain::chainPresetChanged,
+            this,
+            &WEffectChainPresetButton::populateMenu);
     for (const auto& pEffectSlot : m_pChain->getEffectSlots()) {
         connect(pEffectSlot.data(),
                 &EffectSlot::effectChanged,
@@ -42,13 +46,24 @@ void WEffectChainPresetButton::populateMenu() {
     m_pMenu->clear();
 
     // Chain preset items
+    bool chainIsPreset = false;
     for (const auto& pChainPreset : m_pChainPresetManager->getPresetsSorted()) {
-        m_pMenu->addAction(pChainPreset->name(), this, [this, pChainPreset]() {
+        QString title = pChainPreset->name();
+        if (title == m_pChain->presetName()) {
+            title = "\u2713 " + title;
+            chainIsPreset = true;
+        }
+        m_pMenu->addAction(title, this, [this, pChainPreset]() {
             m_pChain->loadChainPreset(pChainPreset);
         });
     }
     m_pMenu->addSeparator();
-    m_pMenu->addAction(tr("Save as new preset"), this, [this]() {
+    if (chainIsPreset) {
+        m_pMenu->addAction(tr("Update Preset"), this, [this]() {
+            m_pChainPresetManager->updatePreset(m_pChain);
+        });
+    }
+    m_pMenu->addAction(tr("Save As New Preset..."), this, [this]() {
         m_pChainPresetManager->savePreset(m_pChain);
     });