11565: Made the Cancel button the accent button on the confirm Reset Preferences and Revert to Factory Settings dialogs

Author: krasko78

src/appshell/internal/applicationactioncontroller.cpp

@@ -326,11 +326,14 @@ 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);
 
     if (result.standardButton() == IInteractive::Button::Cancel) {
         return;

src/appshell/view/preferences/preferencesmodel.cpp

@@ -216,7 +216,7 @@ bool PreferencesModel::askForConfirmationOfPreferencesReset()
 
     muse::IInteractive::ButtonData cancelBtn = interactive()->buttonData(muse::IInteractive::Button::Cancel);
     muse::IInteractive::ButtonData resetBtn = interactive()->buttonData(muse::IInteractive::Button::Reset);
-    resetBtn.accent = true;
+    cancelBtn.accent = true;
 
     muse::IInteractive::Result result = interactive()->warning(title, question, { cancelBtn, resetBtn }, cancelBtn.btn);
     return result.standardButton() == muse::IInteractive::Button::Reset;