Improved wording and added checkbox

Author: mike-spa

src/engraving/rendering/score/lyricslayout.cpp

@@ -357,9 +357,8 @@ void LyricsLayout::layoutDashes(LyricsLineSegment* item)
         dashCount = std::max(dashCount, 1);
     }
 
-    int maxDashCount = style.styleI(Sid::lyricsMaxDashCount);
-    if (maxDashCount > 0) {
-        dashCount = std::min(dashCount, maxDashCount);
+    if (style.styleB(Sid::lyricsLimitDashCount)) {
+        dashCount = std::min(dashCount, style.styleI(Sid::lyricsMaxDashCount));
     }
 
     if (curLength < dashMinLength && dashCount > 0) {

src/engraving/style/styledef.cpp

@@ -100,7 +100,8 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     styleDef(lyricsMelismaMinLength,                     Spatium(1.0)),
     styleDef(lyricsDashPosAtStartOfSystem,               int(LyricsDashSystemStart::STANDARD)),
     styleDef(lyricsAvoidBarlines,                        true),
-    styleDef(lyricsMaxDashCount,                         0),
+    styleDef(lyricsLimitDashCount,                       false),
+    styleDef(lyricsMaxDashCount,                         1),
     styleDef(lyricsCenterDashedSyllables,                false),
 
     styleDef(lyricsOddFontFace,                          "Edwin"),

src/engraving/style/styledef.h

@@ -116,6 +116,7 @@ enum class Sid {
     lyricsMelismaMinLength,
     lyricsDashPosAtStartOfSystem,
     lyricsAvoidBarlines,
+    lyricsLimitDashCount,
     lyricsMaxDashCount,
     lyricsCenterDashedSyllables,
 

src/notation/view/widgets/editstyle.cpp

@@ -380,6 +380,7 @@ EditStyle::EditStyle(QWidget* parent)
         { StyleId::lyricsMelismaForce,      false, lyricsMelismaForce,   resetLyricsMelismaForce },
         { StyleId::lyricsDashPosAtStartOfSystem, false, lyricsDashStartSystemPlacement, resetLyricsDashStartSystemPlacement },
         { StyleId::lyricsAvoidBarlines, false, lyricsAvoidBarlines, resetLyricsAvoidBarlines },
+        { StyleId::lyricsLimitDashCount, false, limitDashCount, 0 },
         { StyleId::lyricsMaxDashCount, false, lyricsMaxDashCount, resetLyricsMaxDashCount },
         { StyleId::lyricsCenterDashedSyllables, false, lyricsCenterDashedSyllables, lyricsResetCenterDashedSyllables },
 
@@ -1273,6 +1274,11 @@ EditStyle::EditStyle(QWidget* parent)
         textStyles->setCurrentRow(ALL_TEXT_STYLE_SUBPAGE_CODES.indexOf("lyrics-odd-lines"));
     });
 
+    connect(resetLyricsMaxDashCount, &QCheckBox::clicked, this, [this] () {
+        resetStyleValue(int(StyleId::lyricsLimitDashCount));
+        resetStyleValue(int(StyleId::lyricsMaxDashCount));
+    });
+
     adjustPagesStackSize(0);
 
     WidgetStateStore::restoreGeometry(this);
@@ -2433,6 +2439,14 @@ void EditStyle::setValues()
     mmRestSingleUseHBar->setEnabled(!styleValue(StyleId::oldStyleMultiMeasureRests).toBool());
     mmRestRefDuration->setEnabled(styleValue(StyleId::mmRestConstantWidth).toBool());
 
+    lyricsMaxDashCount->setEnabled(styleValue(StyleId::lyricsLimitDashCount).toBool());
+    resetLyricsMaxDashCount->setEnabled(styleValue(StyleId::lyricsLimitDashCount) != defaultStyleValue(StyleId::lyricsLimitDashCount)
+                                        || styleValue(StyleId::lyricsMaxDashCount) != defaultStyleValue(StyleId::lyricsMaxDashCount));
+    lyricsDashMaxDistance->setEnabled(!styleValue(StyleId::lyricsLimitDashCount).toBool()
+                                      || styleValue(StyleId::lyricsMaxDashCount).toInt() > 1);
+    resetLyricsDashMaxDistance->setEnabled(lyricsDashMaxDistance->isEnabled() && styleValue(StyleId::lyricsDashMaxDistance)
+                                           != defaultStyleValue(StyleId::lyricsDashMaxDistance));
+
     updateParenthesisIndicatingTiesGroupState();
 }
 
@@ -2766,6 +2780,16 @@ void EditStyle::valueChanged(int i)
         }
         mmRestSingleUseHBar->setEnabled(!useOldStyle);
     }
+
+    if (idx == StyleId::lyricsLimitDashCount || idx == StyleId::lyricsMaxDashCount) {
+        lyricsMaxDashCount->setEnabled(styleValue(StyleId::lyricsLimitDashCount).toBool());
+        resetLyricsMaxDashCount->setEnabled(styleValue(StyleId::lyricsLimitDashCount) != defaultStyleValue(StyleId::lyricsLimitDashCount)
+                                            || styleValue(StyleId::lyricsMaxDashCount) != defaultStyleValue(StyleId::lyricsMaxDashCount));
+        lyricsDashMaxDistance->setEnabled(!styleValue(StyleId::lyricsLimitDashCount).toBool()
+                                          || styleValue(StyleId::lyricsMaxDashCount).toInt() > 1);
+        resetLyricsDashMaxDistance->setEnabled(lyricsDashMaxDistance->isEnabled() && styleValue(StyleId::lyricsDashMaxDistance)
+                                               != defaultStyleValue(StyleId::lyricsDashMaxDistance));
+    }
 }
 
 //---------------------------------------------------------