move textline properties to inspector

musescore · Feb 7, 2017 · fe8a3e5 · fe8a3e5
1 parent c66f162
commit fe8a3e5
Show file tree

Hide file tree

Showing 94 changed files with 9,062 additions and 11,130 deletions.
diff --git a/libmscore/element.cpp b/libmscore/element.cpp
@@ -1217,8 +1217,7 @@ bool Element::setProperty(P_ID propertyId, const QVariant& v)
                   setSystemFlag(v.toBool());
                   break;
             default:
-                  qFatal("Element::setProperty: unknown <%s>(%d), data <%s>",
-                     propertyName(propertyId), static_cast<int>(propertyId), qPrintable(v.toString()));
+                  qFatal("unknown <%s>(%d), data <%s>", propertyName(propertyId), int(propertyId), qPrintable(v.toString()));
                   return false;
             }
       score()->setLayout(tick());

diff --git a/libmscore/hairpin.cpp b/libmscore/hairpin.cpp
@@ -27,6 +27,14 @@ namespace Ms {
 
 Spatium Hairpin::editHairpinHeight;
 
+//---------------------------------------------------------
+//   HairpinSegment
+//---------------------------------------------------------
+
+HairpinSegment::HairpinSegment(Score* s)
+   : TextLineBaseSegment(s)
+      {
+      }
 
 //---------------------------------------------------------
 //   lookupDynamic
@@ -123,10 +131,6 @@ void HairpinSegment::layout()
             }
       else {
             twoLines  = true;
-            delete _text;
-            delete _endText;
-            _text    = 0;
-            _endText = 0;
 
             QTransform t;
             qreal h1 = hairpin()->hairpinHeight().val()     * spatium() * .5;

diff --git a/libmscore/hairpin.h b/libmscore/hairpin.h
@@ -38,7 +38,7 @@ class HairpinSegment : public TextLineBaseSegment {
       qreal circledTipRadius;
 
    public:
-      HairpinSegment(Score* s) : TextLineBaseSegment(s) {}
+      HairpinSegment(Score* s);
       Hairpin* hairpin() const                       { return (Hairpin*)spanner(); }
       virtual HairpinSegment* clone() const override { return new HairpinSegment(*this); }
       virtual ElementType type() const override    { return ElementType::HAIRPIN_SEGMENT; }

diff --git a/libmscore/line.cpp b/libmscore/line.cpp
@@ -1053,15 +1053,9 @@ void SLine::writeProperties(XmlWriter& xml) const
       Spanner::writeProperties(xml);
       if (_diagonal)
             xml.tag("diagonal", _diagonal);
-      if (propertyFlags(P_ID::LINE_WIDTH) != PropertyFlags::STYLED)
-            xml.tag("lineWidth", lineWidth().val());
-      if (propertyFlags(P_ID::LINE_STYLE) == PropertyFlags::UNSTYLED || (lineStyle() != Qt::SolidLine)) {
-            if (propertyFlags(P_ID::LINE_STYLE) != PropertyFlags::STYLED)
-                  xml.tag("lineStyle", int(lineStyle()));
-            }
-      if (propertyFlags(P_ID::LINE_COLOR) == PropertyFlags::UNSTYLED || (lineColor() != MScore::defaultColor))
-            xml.tag("lineColor", lineColor());
-
+      writeProperty(xml, P_ID::LINE_WIDTH);
+      writeProperty(xml, P_ID::LINE_STYLE);
+      writeProperty(xml, P_ID::LINE_COLOR);
       writeProperty(xml, P_ID::ANCHOR);
       writeProperty(xml, P_ID::DASH_LINE_LEN);
       writeProperty(xml, P_ID::DASH_GAP_LEN);
@@ -1291,5 +1285,14 @@ QVariant SLine::propertyDefault(P_ID id) const
             }
       }
 
+//---------------------------------------------------------
+//   getPropertyStyle
+//---------------------------------------------------------
+
+StyleIdx SLine::getPropertyStyle(P_ID id) const
+      {
+      return Spanner::getPropertyStyle(id);
+      }
+
 }
 
diff --git a/libmscore/line.h b/libmscore/line.h
@@ -77,6 +77,10 @@ class SLine : public Spanner {
       qreal _dashGapLen       { 5.0   };
       bool _diagonal          { false };
 
+      PropertyFlags lineWidthStyle;
+      PropertyFlags lineStyleStyle;
+      PropertyFlags lineColorStyle;
+
    protected:
       virtual QPointF linePos(Grip, System** system) const;
 
@@ -121,6 +125,7 @@ class SLine : public Spanner {
       virtual QVariant getProperty(P_ID id) const override;
       virtual bool setProperty(P_ID propertyId, const QVariant&) override;
       virtual QVariant propertyDefault(P_ID id) const override;
+      virtual StyleIdx getPropertyStyle(P_ID) const override;
 
       friend class LineSegment;
       };