Add: Accessibility Panel - Score Style Preset option

musescore · Jan 11, 2025 · 4d5ea05 · 4d5ea05
1 parent ed9f1f2
commit 4d5ea05
Show file tree

Hide file tree

Showing 20 changed files with 477 additions and 8 deletions.
diff --git a/share/styles/CMakeLists.txt b/share/styles/CMakeLists.txt
@@ -31,4 +31,4 @@ install(FILES
       cchords_sym.xml
       DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}styles
       )
-
+add_subdirectory(MSN)
diff --git a/share/styles/MSN/16mm_MSN.mss b/share/styles/MSN/16mm_MSN.mss
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <museScore version="4.40">
-  <Style>
+  <Style preset="16mm MSN" edited="false">
     <pageWidth>8.27</pageWidth>
     <pageHeight>11.69</pageHeight>
     <pagePrintableWidth>7.8763</pagePrintableWidth>

diff --git a/share/styles/MSN/18mm_MSN.mss b/share/styles/MSN/18mm_MSN.mss
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <museScore version="4.40">
-  <Style>
+  <Style preset="18mm MSN" edited="false">
     <pageWidth>8.27</pageWidth>
     <pageHeight>11.69</pageHeight>
     <pagePrintableWidth>7.8763</pagePrintableWidth>

diff --git a/share/styles/MSN/20mm_MSN.mss b/share/styles/MSN/20mm_MSN.mss
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <museScore version="4.40">
-  <Style>
+  <Style preset="20mm MSN" edited="false">
     <pageWidth>16.54</pageWidth>
     <pageHeight>11.69</pageHeight>
     <pagePrintableWidth>15.7526</pagePrintableWidth>

diff --git a/share/styles/MSN/22mm_MSN.mss b/share/styles/MSN/22mm_MSN.mss
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <museScore version="4.40">
-  <Style>
+  <Style preset="22mm MSN" edited="false">
     <pageWidth>16.54</pageWidth>
     <pageHeight>11.69</pageHeight>
     <pagePrintableWidth>15.7526</pagePrintableWidth>

diff --git a/share/styles/MSN/25mm_MSN.mss b/share/styles/MSN/25mm_MSN.mss
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <museScore version="4.40">
-  <Style>
+  <Style preset="25mm MSN" edited="false">
     <pageWidth>16.54</pageWidth>
     <pageHeight>11.69</pageHeight>
     <pagePrintableWidth>15.7526</pagePrintableWidth>

diff --git a/share/styles/MSN/CMakeLists.txt b/share/styles/MSN/CMakeLists.txt
@@ -0,0 +1,8 @@
+install(FILES
+      16mm_MSN.mss
+      18mm_MSN.mss
+      20mm_MSN.mss
+      22mm_MSN.mss
+      25mm_MSN.mss
+      DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}styles/MSN
+      )
diff --git a/src/engraving/style/style.cpp b/src/engraving/style/style.cpp
@@ -299,6 +299,8 @@ bool MStyle::read(IODevice* device, bool ign)
             readVersion(e.attribute("version"));
             while (e.readNextStartElement()) {
                 if (e.name() == "Style") {
+                    m_preset = TConv::fromXml(e.asciiAttribute("preset", "Default"), ScoreStylePreset::DEFAULT);
+                    m_presetEdited = e.attribute("edited", String(u"false")) == "true";
                     read(e, nullptr);
                 } else {
                     e.unknown();
@@ -555,7 +557,17 @@ bool MStyle::write(IODevice* device)
 
 void MStyle::save(XmlWriter& xml, bool optimize)
 {
-    xml.startElement("Style");
+    muse::XmlStreamWriter::Attributes attributes;
+
+    if (preset() != ScoreStylePreset::DEFAULT) {
+        attributes.push_back({ "preset", TConv::toXml(preset()) });
+    }
+
+    if (presetEdited()) {
+        attributes.push_back({ "edited", String(u"true") });
+    }
+
+    xml.startElement("Style", attributes);
 
     for (const StyleDef::StyleValue& st : StyleDef::styleValues) {
         Sid idx = st.styleIdx();

diff --git a/src/engraving/style/style.h b/src/engraving/style/style.h
@@ -74,6 +74,11 @@ class MStyle
     void setDefaultStyleVersion(const int defaultsVersion);
     int defaultStyleVersion() const;
 
+    ScoreStylePreset preset() const { return m_preset; }
+    void setPreset(ScoreStylePreset preset) { m_preset = preset; }
+    bool presetEdited() const { return m_presetEdited; }
+    void setPresetEdited(bool isEdited) { m_presetEdited = isEdited; }
+
     bool read(muse::io::IODevice* device, bool ign = false);
     bool write(muse::io::IODevice* device);
     void save(XmlWriter& xml, bool optimize);
@@ -100,6 +105,8 @@ class MStyle
 
     void readVersion(String versionTag);
     int m_version = 0;
+    ScoreStylePreset m_preset = ScoreStylePreset::DEFAULT;
+    bool m_presetEdited = false;
 };
 } // namespace mu::engraving
 

diff --git a/src/engraving/types/types.h b/src/engraving/types/types.h
@@ -1185,6 +1185,16 @@ struct std::hash<mu::engraving::InstrumentTrackId>
     }
 };
 
+enum class ScoreStylePreset {
+    DEFAULT = 0,
+    MSN_16MM,
+    MSN_18MM,
+    MSN_20MM,
+    MSN_22MM,
+    MSN_25MM,
+    MAX_PRESET
+};
+
 #ifndef NO_QT_SUPPORT
 Q_DECLARE_METATYPE(mu::engraving::BeamMode)
 Q_DECLARE_METATYPE(mu::engraving::JumpType)

diff --git a/src/engraving/types/typesconv.cpp b/src/engraving/types/typesconv.cpp
@@ -2789,3 +2789,42 @@ String TConv::translatedUserName(Key v, bool isAtonal, bool isCustom)
 {
     return userName(v, isAtonal, isCustom).translated();
 }
+
+const std::array<Item<ScoreStylePreset>, 6> SCORE_STYLE_PRESETS = { {
+    //: Score notation style: Default
+    { ScoreStylePreset::DEFAULT,  "Default",  muse::TranslatableString("engraving/scorestylepreset", "Default") },
+    //: Score notation style: Modified Stave Notation (MSN) with 16mm staff size. Intended for visually-impaired musicians.
+    { ScoreStylePreset::MSN_16MM, "16mm MSN", muse::TranslatableString("engraving/scorestylepreset", "16mm MSN") },
+    //: Score notation style: Modified Stave Notation (MSN) with 18mm staff size. Intended for visually-impaired musicians.
+    { ScoreStylePreset::MSN_18MM, "18mm MSN", muse::TranslatableString("engraving/scorestylepreset", "18mm MSN") },
+    //: Score notation style: Modified Stave Notation (MSN) with 20mm staff size. Intended for visually-impaired musicians.
+    { ScoreStylePreset::MSN_20MM, "20mm MSN", muse::TranslatableString("engraving/scorestylepreset", "20mm MSN") },
+    //: Score notation style: Modified Stave Notation (MSN) with 22mm staff size. Intended for visually-impaired musicians.
+    { ScoreStylePreset::MSN_22MM, "22mm MSN", muse::TranslatableString("engraving/scorestylepreset", "22mm MSN") },
+    //: Score notation style: Modified Stave Notation (MSN) with 25mm staff size. Intended for visually-impaired musicians.
+    { ScoreStylePreset::MSN_25MM, "25mm MSN", muse::TranslatableString("engraving/scorestylepreset", "25mm MSN") }
+} };
+
+AsciiStringView TConv::toXml(ScoreStylePreset preset)
+{
+    return findXmlTagByType<ScoreStylePreset>(SCORE_STYLE_PRESETS, preset);
+}
+
+ScoreStylePreset TConv::fromXml(const AsciiStringView& tag, ScoreStylePreset def)
+{
+    if (tag == "Default") {
+        return def;
+    }
+
+    return findTypeByXmlTag<ScoreStylePreset>(SCORE_STYLE_PRESETS, tag, def);
+}
+
+const muse::TranslatableString& TConv::userName(ScoreStylePreset v)
+{
+    return findUserNameByType<ScoreStylePreset>(SCORE_STYLE_PRESETS, v);
+}
+
+String TConv::translatedUserName(ScoreStylePreset v)
+{
+    return findUserNameByType<ScoreStylePreset>(SCORE_STYLE_PRESETS, v).translated();
+}
diff --git a/src/engraving/types/typesconv.h b/src/engraving/types/typesconv.h
@@ -246,5 +246,11 @@ class TConv
 
     static AsciiStringView toXml(PartialSpannerDirection v);
     static PartialSpannerDirection fromXml(const AsciiStringView& str, PartialSpannerDirection def);
+
+    static AsciiStringView toXml(ScoreStylePreset preset);
+    static ScoreStylePreset fromXml(const AsciiStringView& tag, ScoreStylePreset def);
+
+    static const TranslatableString& userName(ScoreStylePreset v);
+    static String translatedUserName(ScoreStylePreset v);
 };
 }
diff --git a/src/inspector/CMakeLists.txt b/src/inspector/CMakeLists.txt
@@ -86,6 +86,8 @@ set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/models/measures/measuressettingsmodel.h
     ${CMAKE_CURRENT_LIST_DIR}/models/score/scoreappearancesettingsmodel.cpp
     ${CMAKE_CURRENT_LIST_DIR}/models/score/scoreappearancesettingsmodel.h
+    ${CMAKE_CURRENT_LIST_DIR}/models/score/scoreaccessibilitysettingsmodel.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/models/score/scoreaccessibilitysettingsmodel.h
     ${CMAKE_CURRENT_LIST_DIR}/models/score/scoredisplaysettingsmodel.cpp
     ${CMAKE_CURRENT_LIST_DIR}/models/score/scoredisplaysettingsmodel.h
     ${CMAKE_CURRENT_LIST_DIR}/models/score/internal/pagetypelistmodel.cpp

diff --git a/src/inspector/models/abstractinspectormodel.h b/src/inspector/models/abstractinspectormodel.h
@@ -67,6 +67,7 @@ class AbstractInspectorModel : public QObject, public muse::async::Asyncable
         SECTION_TEXT,
         SECTION_SCORE_DISPLAY,
         SECTION_SCORE_APPEARANCE,
+        SECTION_SCORE_ACCESSIBILITY,
         SECTION_PARTS,
     };
     Q_ENUM(InspectorSectionType)

diff --git a/src/inspector/models/inspectorlistmodel.cpp b/src/inspector/models/inspectorlistmodel.cpp
@@ -28,6 +28,7 @@
 #include "text/textsettingsmodel.h"
 #include "score/scoredisplaysettingsmodel.h"
 #include "score/scoreappearancesettingsmodel.h"
+#include "score/scoreaccessibilitysettingsmodel.h"
 #include "notation/inotationinteraction.h"
 
 #include "internal/services/elementrepositoryservice.h"
@@ -73,7 +74,8 @@ void InspectorListModel::buildModelsForEmptySelection()
 
     static const InspectorSectionTypeSet persistentSections {
         InspectorSectionType::SECTION_SCORE_DISPLAY,
-        InspectorSectionType::SECTION_SCORE_APPEARANCE
+        InspectorSectionType::SECTION_SCORE_APPEARANCE,
+        InspectorSectionType::SECTION_SCORE_ACCESSIBILITY
     };
 
     removeUnusedModels({}, false /*isRangeSelection*/, {}, persistentSections);
@@ -195,6 +197,9 @@ void InspectorListModel::createModelsBySectionType(const InspectorSectionTypeSet
         case InspectorSectionType::SECTION_SCORE_APPEARANCE:
             newModel = new ScoreAppearanceSettingsModel(this, m_repository);
             break;
+        case InspectorSectionType::SECTION_SCORE_ACCESSIBILITY:
+            newModel = new ScoreAccessibilitySettingsModel(this, m_repository);
+            break;
         case InspectorSectionType::SECTION_PARTS:
             newModel = new PartsSettingsModel(this, m_repository);
             break;