11565 confirmation dialog for reset preferences and make sure all preferences reset correctly

src/appshell/iappshellconfiguration.h

@@ -23,7 +23,7 @@
 #define MU_APPSHELL_IAPPSHELLCONFIGURATION_H
 
 #include "modularity/imoduleinterface.h"
-#include "types/retval.h"
+#include "types/ret.h"
 
 #include "io/path.h"
 #include "appshelltypes.h"
@@ -42,9 +42,11 @@ class IAppShellConfiguration : MODULE_EXPORT_INTERFACE
 
     virtual StartupModeType startupModeType() const = 0;
     virtual void setStartupModeType(StartupModeType type) = 0;
+    virtual muse::async::Notification startupModeTypeChanged() const = 0;
 
     virtual muse::io::path_t startupScorePath() const = 0;
     virtual void setStartupScorePath(const muse::io::path_t& scorePath) = 0;
+    virtual muse::async::Notification startupScorePathChanged() const = 0;
 
     virtual muse::io::path_t userDataPath() const = 0;
 
@@ -73,7 +75,7 @@ class IAppShellConfiguration : MODULE_EXPORT_INTERFACE
     virtual void applySettings() = 0;
     virtual void rollbackSettings() = 0;
 
-    virtual void revertToFactorySettings(bool keepDefaultSettings = false, bool notifyAboutChanges = true) const = 0;
+    virtual void revertToFactorySettings(bool keepDefaultSettings = false, bool notifyAboutChanges = true) = 0;
 
     virtual muse::io::paths_t sessionProjectsPaths() const = 0;
     virtual muse::Ret setSessionProjectsPaths(const muse::io::paths_t& paths) = 0;

src/appshell/internal/applicationactioncontroller.cpp

@@ -326,11 +326,15 @@ void ApplicationActionController::revertToFactorySettings()
                                                  "The list of recent scores will also be cleared.\n\n"
                                                  "This action will not delete any of your scores.");
 
+    IInteractive::ButtonData cancelBtn = interactive()->buttonData(IInteractive::Button::Cancel);
+    cancelBtn.accent = true;
+
     int revertBtn = int(IInteractive::Button::Apply);
     IInteractive::Result result = interactive()->warning(title, question,
-                                                         { interactive()->buttonData(IInteractive::Button::Cancel),
-                                                           IInteractive::ButtonData(revertBtn, muse::trc("appshell", "Revert"), true) },
-                                                         revertBtn);
+                                                         { cancelBtn,
+                                                           IInteractive::ButtonData(revertBtn, muse::trc("appshell", "Revert")) },
+                                                         cancelBtn.btn, { muse::IInteractive::Option::WithIcon },
+                                                         muse::trc("appshell", "Revert to factory settings"));
 
     if (result.standardButton() == IInteractive::Button::Cancel) {
         return;

src/appshell/internal/appshellconfiguration.cpp

@@ -63,7 +63,14 @@ void AppShellConfiguration::init()
     settings()->setDefaultValue(HAS_COMPLETED_FIRST_LAUNCH_SETUP, Val(false));
 
     settings()->setDefaultValue(STARTUP_MODE_TYPE, Val(StartupModeType::StartEmpty));
+    settings()->valueChanged(STARTUP_MODE_TYPE).onReceive(this, [this](const Val&) {
+        m_startupModeTypeChanged.notify();
+    });
+
     settings()->setDefaultValue(STARTUP_SCORE_PATH, Val(projectConfiguration()->myFirstProjectPath().toStdString()));
+    settings()->valueChanged(STARTUP_SCORE_PATH).onReceive(this, [this](const Val&) {
+        m_startupScorePathChanged.notify();
+    });
 
     fileSystem()->makePath(sessionDataPath());
 }
@@ -88,6 +95,11 @@ void AppShellConfiguration::setStartupModeType(StartupModeType type)
     settings()->setSharedValue(STARTUP_MODE_TYPE, Val(type));
 }
 
+async::Notification AppShellConfiguration::startupModeTypeChanged() const
+{
+    return m_startupModeTypeChanged;
+}
+
 muse::io::path_t AppShellConfiguration::startupScorePath() const
 {
     return settings()->value(STARTUP_SCORE_PATH).toString();
@@ -98,6 +110,11 @@ void AppShellConfiguration::setStartupScorePath(const muse::io::path_t& scorePat
     settings()->setSharedValue(STARTUP_SCORE_PATH, Val(scorePath.toStdString()));
 }
 
+async::Notification AppShellConfiguration::startupScorePathChanged() const
+{
+    return m_startupScorePathChanged;
+}
+
 muse::io::path_t AppShellConfiguration::userDataPath() const
 {
     return globalConfiguration()->userDataPath();
@@ -213,7 +230,7 @@ void AppShellConfiguration::rollbackSettings()
     settings()->rollbackTransaction();
 }
 
-void AppShellConfiguration::revertToFactorySettings(bool keepDefaultSettings, bool notifyAboutChanges) const
+void AppShellConfiguration::revertToFactorySettings(bool keepDefaultSettings, bool notifyAboutChanges)
 {
     settings()->reset(keepDefaultSettings, notifyAboutChanges);
 }

src/appshell/internal/appshellconfiguration.h

@@ -61,9 +61,11 @@ class AppShellConfiguration : public IAppShellConfiguration, public muse::Inject
 
     StartupModeType startupModeType() const override;
     void setStartupModeType(StartupModeType type) override;
+    muse::async::Notification startupModeTypeChanged() const override;
 
     muse::io::path_t startupScorePath() const override;
     void setStartupScorePath(const muse::io::path_t& scorePath) override;
+    muse::async::Notification startupScorePathChanged() const override;
 
     muse::io::path_t userDataPath() const override;
 
@@ -92,7 +94,7 @@ class AppShellConfiguration : public IAppShellConfiguration, public muse::Inject
     void applySettings() override;
     void rollbackSettings() override;
 
-    void revertToFactorySettings(bool keepDefaultSettings = false, bool notifyAboutChanges = true) const override;
+    void revertToFactorySettings(bool keepDefaultSettings = false, bool notifyAboutChanges = true) override;
 
     muse::io::paths_t sessionProjectsPaths() const override;
     muse::Ret setSessionProjectsPaths(const muse::io::paths_t& paths) override;
@@ -111,6 +113,9 @@ class AppShellConfiguration : public IAppShellConfiguration, public muse::Inject
     muse::io::paths_t parseSessionProjectsPaths(const QByteArray& json) const;
 
     QString m_preferencesDialogCurrentPageId;
+
+    muse::async::Notification m_startupModeTypeChanged;
+    muse::async::Notification m_startupScorePathChanged;
 };
 }
 

src/appshell/qml/Preferences/BraillePreferencesPage.qml

@@ -34,6 +34,10 @@ PreferencesPage {
         id: preferencesModel
     }
 
+    Component.onCompleted: {
+        preferencesModel.load()
+    }
+
     Column {
         width: parent.width
         spacing: root.sectionsSpacing

src/appshell/qml/Preferences/ImportPreferencesPage.qml

@@ -42,6 +42,7 @@ PreferencesPage {
         spacing: root.sectionsSpacing
 
         ImportStyleSection {
+            id: importStyleSection
             styleFileImportPath: importPreferencesModel.styleFileImportPath
             fileChooseTitle: importPreferencesModel.styleChooseTitle()
             filePathFilter: importPreferencesModel.stylePathFilter()
@@ -145,4 +146,8 @@ PreferencesPage {
             }
         }
     }
+
+    function reset() {
+        importStyleSection.reset()
+    }
 }

src/appshell/qml/Preferences/PreferencesDialog.qml

@@ -149,6 +149,10 @@ StyledDialogView {
             navigation.order: 100000
 
             onRevertFactorySettingsRequested: {
+                if (!preferencesModel.askForConfirmationOfPreferencesReset()) {
+                    return;
+                }
+
                 var pages = preferencesModel.availablePages()
 
                 for (var i in pages) {

src/appshell/qml/Preferences/UpdatePreferencesPage.qml

@@ -34,6 +34,10 @@ PreferencesPage {
         id: updateModel
     }
 
+    Component.onCompleted: {
+        updateModel.load()
+    }
+
     Column {
         width: parent.width
         spacing: root.sectionsSpacing

src/appshell/qml/Preferences/internal/ImportStyleSection.qml

@@ -41,7 +41,12 @@ BaseSection {
     QtObject {
         id: prv
 
-        property bool useStyleFile: root.styleFileImportPath !== ""
+        property bool useStyleFileExplicitlySet: root.styleFileImportPath !== ""
+        property bool useStyleFile: prv.useStyleFileExplicitlySet || root.styleFileImportPath !== ""
+    }
+
+    function reset() {
+        prv.useStyleFileExplicitlySet = false
     }
 
     RoundedRadioButton {
@@ -57,7 +62,7 @@ BaseSection {
         navigation.column: 0
 
         onToggled: {
-            prv.useStyleFile = false
+            prv.useStyleFileExplicitlySet = false
             root.styleFileImportPathChangeRequested("")
         }
     }
@@ -81,7 +86,7 @@ BaseSection {
             navigation.column: 0
 
             onToggled: {
-                prv.useStyleFile = true
+                prv.useStyleFileExplicitlySet = true
             }
         }
 

src/appshell/view/preferences/advancedpreferencesmodel.cpp

@@ -58,7 +58,7 @@ bool AdvancedPreferencesModel::setData(const QModelIndex& index, const QVariant&
 
     switch (role) {
     case ValueRole:
-        changeVal(index.row(), value);
+        changeVal(index.row(), Val::fromQVariant(value));
         emit dataChanged(index, index, { ValueRole });
         return true;
     default:
@@ -96,28 +96,56 @@ void AdvancedPreferencesModel::load()
     for (auto it = items.cbegin(); it != items.cend(); ++it) {
         if (it->second.canBeManuallyEdited) {
             m_items << it->second;
+
+            muse::Settings::Key key = it->second.key;
+            settings()->valueChanged(key).onReceive(this, [this, key](const Val& val) {
+                QModelIndex index = findIndex(key);
+                if (!index.isValid() || m_items[index.row()].value == val) {
+                    return;
+                }
+
+                changeModelVal(m_items[index.row()], val);
+                emit dataChanged(index, index, { ValueRole });
+            });
         }
     }
 
     endResetModel();
 }
 
-void AdvancedPreferencesModel::changeVal(int index, QVariant newVal)
+QModelIndex AdvancedPreferencesModel::findIndex(const muse::Settings::Key& key)
+{
+    for (int i = 0; i < m_items.size(); ++i) {
+        if (m_items[i].key == key) {
+            return index(i, 0);
+        }
+    }
+    return QModelIndex();
+}
+
+void AdvancedPreferencesModel::changeVal(int index, const Val& newVal)
 {
     Settings::Item& item = m_items[index];
+    changeModelVal(item, newVal);
+    settings()->setSharedValue(item.key, item.value);
+}
+
+void AdvancedPreferencesModel::changeModelVal(Settings::Item& item, const Val& newVal)
+{
+    if (item.value == newVal) {
+        return;
+    }
     Val::Type type = item.value.type();
-    item.value = Val::fromQVariant(newVal);
+    item.value = newVal;
     item.value.setType(type);
-
-    settings()->setSharedValue(item.key, item.value);
 }
 
 void AdvancedPreferencesModel::resetToDefault()
 {
     beginResetModel();
 
     for (int i = 0; i < m_items.size(); ++i) {
-        changeVal(i, m_items[i].defaultValue.toQVariant());
+        changeVal(i, m_items[i].defaultValue);
     }
 
     endResetModel();

src/appshell/view/preferences/advancedpreferencesmodel.h

@@ -24,10 +24,11 @@
 
 #include <QAbstractListModel>
 
+#include "async/asyncable.h"
 #include "settings.h"
 
 namespace mu::appshell {
-class AdvancedPreferencesModel : public QAbstractListModel
+class AdvancedPreferencesModel : public QAbstractListModel, public muse::async::Asyncable
 {
     Q_OBJECT
 
@@ -53,7 +54,9 @@ class AdvancedPreferencesModel : public QAbstractListModel
         MaxValueRole
     };
 
-    void changeVal(int index, QVariant newVal);
+    QModelIndex findIndex(const muse::Settings::Key& key);
+    void changeVal(int index, const muse::Val& newVal);
+    void changeModelVal(muse::Settings::Item& item, const muse::Val& newVal);
     QString typeToString(muse::Val::Type type) const;
 
     QList<muse::Settings::Item> m_items;

src/appshell/view/preferences/audiomidipreferencesmodel.cpp

@@ -92,6 +92,10 @@ void AudioMidiPreferencesModel::init()
         emit midiOutputDeviceIdChanged();
     });
 
+    midiConfiguration()->useMIDI20OutputChanged().onReceive(this, [this](bool) {
+        emit useMIDI20OutputChanged();
+    });
+
     playbackConfiguration()->muteHiddenInstrumentsChanged().onReceive(this, [this](bool mute) {
         emit muteHiddenInstrumentsChanged(mute);
     });

src/appshell/view/preferences/braillepreferencesmodel.cpp

@@ -32,6 +32,21 @@ BraillePreferencesModel::BraillePreferencesModel(QObject* parent)
 {
 }
 
+void BraillePreferencesModel::load()
+{
+    brailleConfiguration()->braillePanelEnabledChanged().onNotify(this, [this]() {
+        emit braillePanelEnabledChanged(braillePanelEnabled());
+    });
+
+    brailleConfiguration()->intervalDirectionChanged().onNotify(this, [this]() {
+        emit intervalDirectionChanged(intervalDirection());
+    });
+
+    brailleConfiguration()->brailleTableChanged().onNotify(this, [this]() {
+        emit brailleTableChanged(brailleTable());
+    });
+}
+
 bool BraillePreferencesModel::braillePanelEnabled() const
 {
     return brailleConfiguration()->braillePanelEnabled();

src/appshell/view/preferences/braillepreferencesmodel.h

@@ -25,11 +25,12 @@
 
 #include <QObject>
 
+#include "async/asyncable.h"
 #include "modularity/ioc.h"
 #include "braille/ibrailleconfiguration.h"
 
 namespace mu::appshell {
-class BraillePreferencesModel : public QObject, public muse::Injectable
+class BraillePreferencesModel : public QObject, public muse::Injectable, public muse::async::Asyncable
 {
     Q_OBJECT
 
@@ -42,6 +43,8 @@ class BraillePreferencesModel : public QObject, public muse::Injectable
 public:
     explicit BraillePreferencesModel(QObject* parent = nullptr);
 
+    Q_INVOKABLE void load();
+
     bool braillePanelEnabled() const;
     QString brailleTable() const;
     int intervalDirection() const;