Add error dialog

Author: miiizen

src/engraving/dom/mscore.cpp

@@ -63,6 +63,7 @@ bool MScore::svgPrinting = false;
 extern void initDrumset();
 
 MsError MScore::_error { MsError::MS_NO_ERROR };
+bool MScore::_errorIsWarning = false;
 
 void MScore::registerUiTypes()
 {
@@ -118,6 +119,7 @@ std::string MScore::errorToString(MsError err)
     case MsError::CANNOT_REMOVE_KEY_SIG: return "CANNOT_REMOVE_KEY_SIG";
     case MsError::CANNOT_JOIN_MEASURE_STAFFTYPE_CHANGE: return "CANNOT_JOIN_MEASURE_STAFFTYPE_CHANGE";
     case MsError::CANNOT_REPEAT_SELECTION: return "CANNOT_REPEAT_SELECTION";
+    case MsError::TRANSPOSE_NO_FRET_DIAGRAM: return "TRANSPOSE_NO_FRET_DIAGRAM";
     }
 
     return {};

src/engraving/dom/mscore.h

@@ -165,6 +165,7 @@ enum class MsError : unsigned char {
     CANNOT_REMOVE_KEY_SIG,
     CANNOT_JOIN_MEASURE_STAFFTYPE_CHANGE,
     CANNOT_REPEAT_SELECTION,
+    TRANSPOSE_NO_FRET_DIAGRAM,
 };
 
 /// \cond PLUGIN_API \private \endcond
@@ -187,6 +188,7 @@ class MScore
 public:
 
     static MsError _error;
+    static bool _errorIsWarning;
 
     static void registerUiTypes();
 
@@ -230,7 +232,7 @@ class MScore
     static double horizontalPageGapEven;
     static double horizontalPageGapOdd;
 
-    static void setError(MsError e) { _error = e; }
+    static void setError(MsError e, bool warning = false) { _error = e; _errorIsWarning = warning; }
 
     static std::string errorToString(MsError err);
 };

src/engraving/editing/cmd.cpp

@@ -414,7 +414,7 @@ void Score::endCmd(bool rollback, bool layoutAllParts)
         return;
     }
 
-    if (readOnly() || MScore::_error != MsError::MS_NO_ERROR) {
+    if (readOnly() || (MScore::_error != MsError::MS_NO_ERROR && !MScore::_errorIsWarning)) {
         rollback = true;
     }
 

src/engraving/editing/transpose.cpp

@@ -574,7 +574,8 @@ void Transpose::transposeFretDiagram(FretDiagram* diagram, Score* score, Interva
 
         std::vector<DiagramInfo> availableDiagrams = diagram->patternsFromHarmony(harmony->plainText());
         if (availableDiagrams.empty()) {
-            LOGI() << "ERROR";
+            diagram->undoFretClear();
+            MScore::setError(MsError::TRANSPOSE_NO_FRET_DIAGRAM, true);
             return;
         }
         score->undo(new FretDataChange(diagram, harmony->plainText()));
@@ -585,7 +586,8 @@ void Transpose::transposeFretDiagram(FretDiagram* diagram, Score* score, Interva
     String pattern = FretDiagram::patternFromDiagram(diagram);
     std::vector<String> names = FretDiagram::harmoniesFromPattern(pattern);
     if (names.empty()) {
-        LOGI() << "ERROR";
+        diagram->undoFretClear();
+        MScore::setError(MsError::TRANSPOSE_NO_FRET_DIAGRAM, true);
         return;
     }
 
@@ -622,7 +624,8 @@ void Transpose::transposeFretDiagram(FretDiagram* diagram, Score* score, Interva
 
     std::vector<DiagramInfo> availableDiagrams = diagram->patternsFromHarmony(harmony->plainText());
     if (availableDiagrams.empty()) {
-        LOGI() << "ERROR";
+        diagram->undoFretClear();
+        MScore::setError(MsError::TRANSPOSE_NO_FRET_DIAGRAM, true);
         return;
     }
     score->undo(new FretDataChange(diagram, harmony->plainText()));

src/notation/internal/mscoreerrorscontroller.cpp

@@ -166,6 +166,11 @@ void MScoreErrorsController::checkAndShowMScoreError()
         title = muse::trc("notation", "Can’t repeat this selection");
         message = muse::trc("notation", "Make a list selection of notes or rests on the same beat or any range selection and retry.");
         break;
+    case MsError::TRANSPOSE_NO_FRET_DIAGRAM:
+        title = muse::trc("notation", "Some fretboard diagrams could not be transposed");
+        message = muse::trc("notation",
+                            "Fretboard diagrams that could not be transposed have been left blank. You can undo this action if required.");
+        break;
     }
 
     interactive()->info(title, message, {}, 0,

src/notation/view/widgets/transposedialog.cpp

@@ -22,6 +22,7 @@
 
 #include "transposedialog.h"
 
+#include "internal/mscoreerrorscontroller.h"
 #include "ui/view/widgetstatestore.h"
 
 using namespace mu::notation;
@@ -218,6 +219,8 @@ void TransposeDialog::apply()
 
     interaction()->transpose(options);
 
+    MScoreErrorsController(iocContext()).checkAndShowMScoreError();
+
     if (m_allSelected) {
         interaction()->clearSelection();
     }