another fix for #25896

musescore · Aug 6, 2014 · aa7957b · aa7957b
1 parent 0c0ac79
commit aa7957b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/libmscore/textline.cpp b/libmscore/textline.cpp
@@ -644,6 +644,8 @@ void TextLine::writeProperties(Xml& xml) const
       if (_beginText) {
             bool textDiff  = _beginText->text() != propertyDefault(P_ID::BEGIN_TEXT).toString();
             bool styleDiff = _beginText->textStyle() != propertyDefault(P_ID::BEGIN_TEXT_STYLE).value<TextStyle>();
+            if (styleDiff)
+                  textDiff = true;
             if (textDiff || styleDiff) {
                   xml.stag("beginText");
                   _beginText->writeProperties(xml, textDiff, styleDiff);
@@ -653,6 +655,8 @@ void TextLine::writeProperties(Xml& xml) const
       if (_continueText) {
             bool textDiff  = _continueText->text() != propertyDefault(P_ID::CONTINUE_TEXT).toString();
             bool styleDiff = _continueText->textStyle() != propertyDefault(P_ID::CONTINUE_TEXT_STYLE).value<TextStyle>();
+            if (styleDiff)
+                  textDiff = true;
             if (textDiff || styleDiff) {
                   xml.stag("continueText");
                   _continueText->writeProperties(xml, textDiff, styleDiff);
@@ -662,6 +666,8 @@ void TextLine::writeProperties(Xml& xml) const
       if (_endText) {
             bool textDiff  = _endText->text() != propertyDefault(P_ID::END_TEXT).toString();
             bool styleDiff = _endText->textStyle() != propertyDefault(P_ID::END_TEXT_STYLE).value<TextStyle>();
+            if (styleDiff)
+                  textDiff = true;
             if (textDiff || styleDiff) {
                   xml.stag("endText");
                   _endText->writeProperties(xml, textDiff, styleDiff);

diff --git a/mscore/textprop.cpp b/mscore/textprop.cpp
@@ -65,6 +65,7 @@ TextProp::TextProp(QWidget* parent)
       connect(resetToStyle, SIGNAL(clicked()), SIGNAL(resetToStyleClicked()));
       connect(boxButton, SIGNAL(toggled(bool)), this, SLOT(boxButtonToggled(bool)));
       connect(frame, SIGNAL(toggled(bool)), this, SLOT(boxButtonToggled(bool)));
+      connect(styles, SIGNAL(currentIndexChanged(int)), SLOT(styleIndexChanged(int)));
       }
 
 //---------------------------------------------------------
@@ -79,13 +80,15 @@ void TextProp::setScore(bool onlyStyle, Score* score)
       styleLabel->setVisible(!onlyStyle);
       styles->clear();
 
+      styles->blockSignals(true);
       const QList<TextStyle>& scoreStyles = score->style()->textStyles();
       int n = scoreStyles.size();
       for (int i = 0; i < n; ++i) {
             // if style not hidden in this context, add to combo with index in score style list as userData
             if ( !(scoreStyles.at(i).hidden() & TextStyleHidden::IN_LISTS) )
                   styles->addItem(scoreStyles.at(i).name(), i);
             }
+      styles->blockSignals(false);
       }
 
 //---------------------------------------------------------
@@ -246,5 +249,16 @@ void TextProp::boxButtonToggled(bool state)
       frameRound->setEnabled(frame->isChecked() && state);
       }
 
+//---------------------------------------------------------
+//   styleIndexChanged
+//---------------------------------------------------------
+
+void TextProp::styleIndexChanged(int i)
+      {
+      int idx = styles->itemData(i).toInt();
+      setTextStyle(_score->textStyle(TextStyleType(idx)));
+      printf("style index changed %d\n", idx);
+      }
+
 }
 
diff --git a/mscore/textprop.h b/mscore/textprop.h
@@ -44,6 +44,7 @@ class TextProp : public QWidget, public Ui::TextProperties {
       void mmToggled(bool);
       void doResetToTextStyle();
       void boxButtonToggled(bool);
+      void styleIndexChanged(int idx);
 
    signals:
       void resetToStyleClicked();