Harmony and Fret update

2018-07-12 10:15:56 +02:00 · 2018-07-12 10:15:56 +02:00 · 8ca085ca76
commit 8ca085ca76
parent 78d0ea2cd1
15 changed files with 479 additions and 82 deletions
--- a/libmscore/fret.cpp
+++ b/libmscore/fret.cpp
@ -374,9 +374,6 @@ void FretDiagram::layout()

      setPos(-_spatium, -h - styleP(Sid::fretY) + _spatium );

-      if (_harmony)
-            _harmony->layout();
-
      if (!parent() || !parent()->isSegment()) {
            setPos(QPointF());
            return;
@ -676,12 +673,10 @@ bool FretDiagram::setProperty(Pid propertyId, const QVariant& v)
 QVariant FretDiagram::propertyDefault(Pid propertyId) const
      {
      switch (propertyId) {
-            case Pid::MAG:            return 1.0;
-            case Pid::FRET_STRINGS:   return DEFAULT_STRINGS;
-            case Pid::FRET_FRETS:     return DEFAULT_FRETS;
-            case Pid::FRET_BARRE:     return 0;
-            case Pid::FRET_OFFSET:    return 0;
            default:
+                  QVariant v = ScoreElement::styledPropertyDefault(propertyId);
+                  if (v.isValid())
+                        return v;
                  return Element::propertyDefault(propertyId);
            }
      }
--- a/libmscore/fret.h
+++ b/libmscore/fret.h
@ -21,9 +21,6 @@ class StringData;
 class Chord;
 class Harmony;

-static const int DEFAULT_STRINGS = 6;
-static const int DEFAULT_FRETS = 5;
-
 //---------------------------------------------------------
 //   @@ FretDiagram
 ///    Fretboard diagram
@ -36,9 +33,9 @@ static const int DEFAULT_FRETS = 5;
 //---------------------------------------------------------

 class FretDiagram final : public Element {
-      int _strings       { DEFAULT_STRINGS };
+      int _strings;
      int maxStrings     { 0 };
-      int _frets         { DEFAULT_FRETS };
+      int _frets;
      int _fretOffset    { 0  };
      int _maxFrets      { 24 };
      int _barre         { 0 };
--- a/libmscore/harmony.cpp
+++ b/libmscore/harmony.cpp
@ -998,11 +998,12 @@ void Harmony::layout()
      qreal yy = 0.0;

      if (parent()->isSegment()) {
+#if 0
            Segment* s = toSegment(parent());
            // look for fret diagram
            bool fretsFound = false;
            for (Element* e : s->annotations()) {
-                  if (e->isFretDiagram() && e->track() == track()) {
+                  if (e->isFretDiagram() && e->track() == track() && e->placement() == placement()) {
                        yy -= score()->styleP(Sid::fretY);
                        e->layout();
                        yy -= e->height();
@ -1012,13 +1013,14 @@ void Harmony::layout()
                        }
                  }
            if (!fretsFound)
+#endif
                  yy -= score()->styleP(Sid::harmonyY);
            }
      else if (parent()->isFretDiagram()) {
            qDebug("Harmony %s with fret diagram as parent", qPrintable(_textName)); // not possible?
            yy = -score()->styleP(Sid::harmonyFretDist);
            }
-      yy += offset().y();           //      yy += offset(_spatium).y();
+//      yy += offset().y();           //      yy += offset(_spatium).y();

      qreal hb = lineHeight() - TextBase::baseLine();
      if (align() & Align::BOTTOM)
@ -1061,6 +1063,7 @@ void Harmony::layout()
            layoutFrame();
            setbbox(saveBbox);
            }
+      autoplaceSegmentElement(styleP(Sid::minHarmonyDistance));
      }

 //---------------------------------------------------------
--- a/libmscore/layout.cpp
+++ b/libmscore/layout.cpp
@ -1188,10 +1188,8 @@ void Score::layoutSpanner()
                        c->layoutStem();
                        for (Note* n : c->notes()) {
                              Tie* tie = n->tieFor();
-                              if (tie) {
-printf("tie layout ??\n");
+                              if (tie)
                                    tie->layout();
-                                    }
                              for (Spanner* sp : n->spannerFor())
                                    sp->layout();
                              }
@ -2476,9 +2474,11 @@ void Score::getNextMeasure(LayoutContext& lc)
                           || e->isFermata()
                           || e->isRehearsalMark()
                           || e->isFretDiagram()
-                           || e->isStaffText()
-                           || e->isFiguredBass()))
+                           || e->isHarmony()
+                           || e->isStaffText()              // ws: whats left?
+                           || e->isFiguredBass())) {
                              e->layout();
+                              }
                        }
                  // TODO, this is not going to work, we just cleaned the tempomap
                  // it breaks the test midi/testBaroqueOrnaments.mscx where first note has stretch 2
@ -2827,7 +2827,6 @@ void Score::layoutLyrics(System* system)

      // align lyrics line segments

-//      std::vector<LyricsLineSegment*> ll;
      for (SpannerSegment* ss : system->spannerSegments()) {
            if (ss->isLyricsLineSegment()) {
                  LyricsLineSegment* lls = toLyricsLineSegment(ss);
@ -3405,8 +3404,17 @@ System* Score::collectSystem(LayoutContext& lc)
            SegmentType st = SegmentType::ChordRest;
            Measure* m = toMeasure(mb);
            for (Segment* s = m->first(st); s; s = s->next(st)) {
+                  // layout in specific order
                  for (Element* e : s->annotations()) {
-                        if (e->visible() && (e->isRehearsalMark() || e->isStaffText() || e->isFretDiagram()))
+                        if (e->visible() && e->isFretDiagram())
+                              e->layout();
+                        }
+                  for (Element* e : s->annotations()) {
+                        if (e->visible() && (e->isStaffText() || e->isHarmony()))
+                              e->layout();
+                        }
+                  for (Element* e : s->annotations()) {
+                        if (e->visible() && e->isRehearsalMark())
                              e->layout();
                        }
                  }
@ -3421,6 +3429,15 @@ System* Score::collectSystem(LayoutContext& lc)
            lc.firstSystem        = lm->sectionBreak() && _layoutMode != LayoutMode::FLOAT;
            lc.startWithLongNames = lc.firstSystem && lm->sectionBreakElement()->startWithLongNames();
            }
+#if 1
+      for (MeasureBase* mb : system->measures()) {
+            if (!mb->isMeasure())
+                  continue;
+            Measure* m = toMeasure(mb);
+            for (int i = 0; i < score()->nstaves(); ++i)
+                  m->staffShape(i).clear();
+            }
+#endif
      return system;
      }

--- a/libmscore/segment.cpp
+++ b/libmscore/segment.cpp
@ -1828,6 +1828,7 @@ void Segment::createShape(int staffIdx)
            if (e->staffIdx() == staffIdx
               && !e->isRehearsalMark()
               && !e->isFretDiagram()
+               && !e->isHarmony()
               && !e->isTempoText()
               && !e->isDynamic()
               && !e->isSymbol()
--- a/libmscore/style.cpp
+++ b/libmscore/style.cpp
@ -220,18 +220,33 @@ static const StyleType styleTypes[] {
      { Sid::vibratoPosAbove,         "vibratoPosAbove",         Spatium(-1) },
      { Sid::vibratoPosBelow,         "vibratoPosBelow",         Spatium(1) },

-      { Sid::harmonyY,                "harmonyY",                Spatium(2.5) },
-      { Sid::harmonyFretDist,         "harmonyFretDist",         Spatium(0.5) },
-      { Sid::minHarmonyDistance,      "minHarmonyDistance",      Spatium(0.5) },
-      { Sid::maxHarmonyBarDistance,   "maxHarmonyBarDistance",   Spatium(3.0) },
+      { Sid::harmonyY,                 "harmonyY",                 Spatium(2.5) },
+      { Sid::harmonyFretDist,          "harmonyFretDist",          Spatium(0.5) },
+      { Sid::minHarmonyDistance,       "minHarmonyDistance",       Spatium(0.5) },
+      { Sid::maxHarmonyBarDistance,    "maxHarmonyBarDistance",    Spatium(3.0) },
+      { Sid::harmonyPlacement,         "harmonyPlacement",         int(Placement::ABOVE) },
+      { Sid::chordSymbolFontFace,      "chordSymbolFontFace",      "FreeSerif" },
+      { Sid::chordSymbolFontSize,      "chordSymbolFontSize",      12.0 },
+      { Sid::chordSymbolFontBold,      "chordSymbolFontBold",      false },
+      { Sid::chordSymbolFontItalic,    "chordSymbolFontItalic",    false },
+      { Sid::chordSymbolFontUnderline, "chordSymbolFontUnderline", false },
+//      { Sid::chordSymbolAlign,         "chordSymbolAlign",         QVariant::fromValue(Align::LEFT | Align::BASELINE) },
+      { Sid::chordSymbolAlign,         "chordSymbolAlign",         QVariant::fromValue(Align::HCENTER | Align::BASELINE) },
+
      { Sid::capoPosition,            "capoPosition",            QVariant(0) },
      { Sid::fretNumMag,              "fretNumMag",              QVariant(2.0) },
      { Sid::fretNumPos,              "fretNumPos",              QVariant(0) },
      { Sid::fretY,                   "fretY",                   Spatium(2.0) },
      { Sid::fretMinDistance,         "fretMinDistance",         Spatium(0.5) },
+      { Sid::fretMag,                 "fretMag",                 QVariant(1.0) },
+      { Sid::fretPlacement,           "fretPlacement",           int(Placement::ABOVE) },
+      { Sid::fretStrings,             "fretStrings",             6 },
+      { Sid::fretFrets,               "fretFrets",               5 },
+      { Sid::fretOffset,              "fretOffset",              0 },
+      { Sid::fretBarre,               "fretBarre",               0 },
+
      { Sid::showPageNumber,          "showPageNumber",          QVariant(true) },
      { Sid::showPageNumberOne,       "showPageNumberOne",       QVariant(false) },
-
      { Sid::pageNumberOddEven,       "pageNumberOddEven",       QVariant(true) },
      { Sid::showMeasureNumber,       "showMeasureNumber",       QVariant(true) },
      { Sid::showMeasureNumberOne,    "showMeasureNumberOne",    QVariant(false) },
@ -389,7 +404,6 @@ static const StyleType styleTypes[] {
      { Sid::tupletAlign,             "tupletAlign",             QVariant::fromValue(Align::CENTER) },

      { Sid::barreLineWidth,          "barreLineWidth",          QVariant(1.0) },
-      { Sid::fretMag,                 "fretMag",                 QVariant(1.0) },
      { Sid::scaleBarlines,           "scaleBarlines",           QVariant(true) },
      { Sid::barGraceDistance,        "barGraceDistance",        Spatium(.6) },
      { Sid::minVerticalDistance,     "minVerticalDistance",     Spatium(0.5) },
@ -413,8 +427,6 @@ static const StyleType styleTypes[] {
      { Sid::jumpPosAbove,              "jumpPosAbove",              Spatium(-2.0) },
      { Sid::markerPosAbove,            "markerPosAbove",            Spatium(-2.0) },

-//====
-
      { Sid::defaultFontFace,               "defaultFontFace",               "FreeSerif" },
      { Sid::defaultFontSize,               "defaultFontSize",               10.0  },
      { Sid::defaultFontSpatiumDependent,   "defaultFontSpatiumDependent",   true  },
@ -628,13 +640,6 @@ static const StyleType styleTypes[] {
      { Sid::staffTextPosBelow,             "staffTextPosBelow",            Spatium(3.5)  },
      { Sid::staffTextMinDistance,          "staffTextMinDistance",         Spatium(0.5)  },

-      { Sid::chordSymbolFontFace,           "chordSymbolFontFace",          "FreeSerif" },
-      { Sid::chordSymbolFontSize,           "chordSymbolFontSize",          12.0 },
-      { Sid::chordSymbolFontBold,           "chordSymbolFontBold",          false },
-      { Sid::chordSymbolFontItalic,         "chordSymbolFontItalic",        false },
-      { Sid::chordSymbolFontUnderline,      "chordSymbolFontUnderline",     false },
-      { Sid::chordSymbolAlign,              "chordSymbolAlign",             QVariant::fromValue(Align::LEFT | Align::BASELINE) },
-
      { Sid::rehearsalMarkFontFace,         "rehearsalMarkFontFace",        "FreeSerif" },
      { Sid::rehearsalMarkFontSize,         "rehearsalMarkFontSize",        14.0 },
      { Sid::rehearsalMarkFontBold,         "rehearsalMarkFontBold",        true },
@ -1125,6 +1130,7 @@ const std::vector<StyledProperty> chordSymbolStyle {
      { Sid::chordSymbolFontItalic,              Pid::FONT_ITALIC            },
      { Sid::chordSymbolFontUnderline,           Pid::FONT_UNDERLINE         },
      { Sid::chordSymbolAlign,                   Pid::ALIGN                  },
+      { Sid::harmonyPlacement,                   Pid::PLACEMENT              },
      { Sid::NOSTYLE,                            Pid::END                    }      // end of list marker
      };

@ -1430,6 +1436,12 @@ const std::vector<StyledProperty> boxStyle {

 const std::vector<StyledProperty> fretStyle {
      { Sid::fretNumPos,                         Pid::FRET_NUM_POS            },
+      { Sid::fretMag,                            Pid::MAG                     },
+      { Sid::fretPlacement,                      Pid::PLACEMENT               },
+      { Sid::fretStrings,                        Pid::FRET_STRINGS            },
+      { Sid::fretFrets,                          Pid::FRET_FRETS              },
+      { Sid::fretOffset,                         Pid::FRET_OFFSET             },
+      { Sid::fretBarre,                          Pid::FRET_BARRE              },
      { Sid::NOSTYLE,                            Pid::END                     }      // end of list marker
      };

--- a/libmscore/style.h
+++ b/libmscore/style.h
@ -201,11 +201,25 @@ enum class Sid {
      harmonyFretDist,
      minHarmonyDistance,
      maxHarmonyBarDistance,
+      harmonyPlacement,
+      chordSymbolFontFace,
+      chordSymbolFontSize,
+      chordSymbolFontBold,
+      chordSymbolFontItalic,
+      chordSymbolFontUnderline,
+      chordSymbolAlign,
+
      capoPosition,
      fretNumMag,
      fretNumPos,
      fretY,
      fretMinDistance,
+      fretMag,
+      fretPlacement,
+      fretStrings,
+      fretFrets,
+      fretOffset,
+      fretBarre,

      showPageNumber,
      showPageNumberOne,
@ -368,7 +382,6 @@ enum class Sid {
      tupletAlign,

      barreLineWidth,
-      fretMag,
      scaleBarlines,
      barGraceDistance,

@ -606,13 +619,6 @@ enum class Sid {
      staffTextPosBelow,
      staffTextMinDistance,

-      chordSymbolFontFace,
-      chordSymbolFontSize,
-      chordSymbolFontBold,
-      chordSymbolFontItalic,
-      chordSymbolFontUnderline,
-      chordSymbolAlign,
-
      rehearsalMarkFontFace,
      rehearsalMarkFontSize,
      rehearsalMarkFontBold,
--- a/mscore/CMakeLists.txt
+++ b/mscore/CMakeLists.txt
@ -101,6 +101,7 @@ QT5_WRAP_UI (ui_headers
      inspector/inspector_chord.ui
      inspector/inspector_group_element.ui
      inspector/inspector_image.ui
+      inspector/inspector_harmony.ui
      inspector/inspector_lasso.ui
      inspector/inspector_volta.ui
      inspector/inspector_ottava.ui
@ -287,6 +288,7 @@ add_executable ( ${ExecutableName}
      inspector/inspectorBeam.cpp
      inspector/inspectorGroupElement.cpp
      inspector/inspectorImage.cpp
+      inspector/inspectorHarmony.cpp
      inspector/inspectorFret.cpp
      inspector/inspectorText.cpp
      inspector/inspectorLasso.cpp
--- a/mscore/inspector/inspector.cpp
+++ b/mscore/inspector/inspector.cpp
@ -33,6 +33,7 @@
 #include "inspectorBarline.h"
 #include "inspectorFingering.h"
 #include "inspectorDynamic.h"
+#include "inspectorHarmony.h"
 #include "musescore.h"
 #include "scoreview.h"
 #include "bendproperties.h"
@ -324,6 +325,9 @@ void Inspector::update(Score* s)
                        case ElementType::STEM:
                              ie = new InspectorStem(this);
                              break;
+                        case ElementType::HARMONY:
+                              ie = new InspectorHarmony(this);
+                              break;
                        default:
                              if (element()->isText())
                                    ie = new InspectorText(this);
--- a/mscore/inspector/inspectorFret.cpp
+++ b/mscore/inspector/inspectorFret.cpp
@ -29,10 +29,15 @@ InspectorFretDiagram::InspectorFretDiagram(QWidget* parent)
      f.setupUi(addWidget());

      const std::vector<InspectorItem> iiList = {
-            { Pid::COLOR,    0, e.color,       e.resetColor      },
-            { Pid::VISIBLE,  0, e.visible,     e.resetVisible    },
-            { Pid::USER_OFF, 0, e.offset,      e.resetOffset     },
-            { Pid::MAG,      0, f.mag,         f.resetMag        }
+            { Pid::COLOR,        0, e.color,       e.resetColor       },
+            { Pid::VISIBLE,      0, e.visible,     e.resetVisible     },
+            { Pid::USER_OFF,     0, e.offset,      e.resetOffset      },
+            { Pid::MAG,          0, f.mag,         f.resetMag         },
+            { Pid::PLACEMENT,    0, f.placement,   f.resetPlacement   },
+            { Pid::FRET_STRINGS, 0, f.strings,     f.resetStrings     },
+            { Pid::FRET_FRETS,   0, f.frets,       f.resetFrets       },
+            { Pid::FRET_OFFSET,  0, f.offset,      f.resetOffset      },
+            { Pid::FRET_BARRE,   0, f.barre,       f.resetBarre       },
            };
      const std::vector<InspectorPanel> ppList = {
            { f.title, f.panel }
--- a/mscore/inspector/inspectorHarmony.cpp
+++ b/mscore/inspector/inspectorHarmony.cpp
@ -0,0 +1,50 @@
+//=============================================================================
+//  MuseScore
+//  Music Composition & Notation
+//  $Id:$
+//
+//  Copyright (C) 2011 Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2
+//  as published by the Free Software Foundation and appearing in
+//  the file LICENSE.GPL
+//=============================================================================
+
+#include "inspectorHarmony.h"
+#include "musescore.h"
+#include "libmscore/harmony.h"
+#include "libmscore/score.h"
+
+namespace Ms {
+
+//---------------------------------------------------------
+//   InspectorHarmony
+//---------------------------------------------------------
+
+InspectorHarmony::InspectorHarmony(QWidget* parent)
+   : InspectorElementBase(parent)
+      {
+      b.setupUi(addWidget());
+
+//      Element* e = inspector->element();
+
+      const std::vector<InspectorItem> iiList = {
+//            { Pid::AUTOSCALE,         0, b.autoscale,       b.resetAutoscale       },
+            };
+      const std::vector<InspectorPanel> ppList = { { b.title, b.panel } };
+
+      mapSignals(iiList, ppList);
+      }
+
+//---------------------------------------------------------
+//   valueChanged
+//---------------------------------------------------------
+
+void InspectorHarmony::valueChanged(int idx)
+      {
+      InspectorBase::valueChanged(idx);
+      }
+
+}
+
--- a/mscore/inspector/inspectorHarmony.h
+++ b/mscore/inspector/inspectorHarmony.h
@ -0,0 +1,42 @@
+//=============================================================================
+//  MuseScore
+//  Music Composition & Notation
+//  $Id:$
+//
+//  Copyright (C) 2011 Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2
+//  as published by the Free Software Foundation and appearing in
+//  the file LICENSE.GPL
+//=============================================================================
+
+#ifndef __INSPECTOR_HARMONY_H__
+#define __INSPECTOR_HARMONY_H__
+
+#include "inspector.h"
+#include "ui_inspector_harmony.h"
+#include "libmscore/property.h"
+
+namespace Ms {
+
+//---------------------------------------------------------
+//   InspectorHarmony
+//---------------------------------------------------------
+
+class InspectorHarmony : public InspectorElementBase {
+      Q_OBJECT
+
+      Ui::InspectorHarmony b;
+
+   protected slots:
+      virtual void valueChanged(int idx) override;
+
+   public:
+      InspectorHarmony(QWidget* parent);
+      };
+
+
+} // namespace Ms
+#endif
+
--- a/mscore/inspector/inspector_fret.ui
+++ b/mscore/inspector/inspector_fret.ui
@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>121</width>
-    <height>108</height>
+    <width>367</width>
+    <height>312</height>
   </rect>
  </property>
  <property name="accessibleName">
@ -79,22 +79,6 @@
      <property name="verticalSpacing">
       <number>0</number>
      </property>
-      <item row="1" column="0">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@ -105,6 +89,39 @@
        </property>
       </widget>
      </item>
+      <item row="0" column="1">
+       <widget class="QDoubleSpinBox" name="mag">
+        <property name="minimum">
+         <double>0.200000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>50.000000000000000</double>
+        </property>
+        <property name="singleStep">
+         <double>0.200000000000000</double>
+        </property>
+        <property name="value">
+         <double>1.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0" colspan="3">
+       <widget class="QToolButton" name="properties">
+        <property name="text">
+         <string>Properties</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Placement:</string>
+        </property>
+        <property name="buddy">
+         <cstring>placement</cstring>
+        </property>
+       </widget>
+      </item>
      <item row="0" column="2">
       <widget class="QToolButton" name="resetMag">
        <property name="toolTip">
@ -122,26 +139,169 @@
        </property>
       </widget>
      </item>
-      <item row="0" column="1">
-       <widget class="QDoubleSpinBox" name="mag">
-        <property name="minimum">
-         <double>0.200000000000000</double>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="placement">
+        <property name="accessibleName">
+         <string>Placement</string>
        </property>
-        <property name="maximum">
-         <double>50.000000000000000</double>
+        <item>
+         <property name="text">
+          <string notr="true">Below</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string notr="true">Above</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QToolButton" name="resetPlacement">
+        <property name="toolTip">
+         <string>Reset to default</string>
        </property>
-        <property name="singleStep">
-         <double>0.200000000000000</double>
+        <property name="accessibleName">
+         <string>Reset 'Placement' value</string>
        </property>
-        <property name="value">
-         <double>1.000000000000000</double>
+        <property name="text">
+         <string notr="true"/>
+        </property>
+        <property name="icon">
+         <iconset resource="../musescore.qrc">
+          <normaloff>:/data/icons/edit-reset.svg</normaloff>:/data/icons/edit-reset.svg</iconset>
        </property>
       </widget>
      </item>
-      <item row="2" column="0" colspan="3">
-       <widget class="QToolButton" name="properties">
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_4">
        <property name="text">
-         <string>Properties</string>
+         <string>Frets:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Barre:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Strings:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QToolButton" name="resetStrings">
+        <property name="toolTip">
+         <string>Reset to default</string>
+        </property>
+        <property name="accessibleName">
+         <string>Reset 'Placement' value</string>
+        </property>
+        <property name="text">
+         <string notr="true"/>
+        </property>
+        <property name="icon">
+         <iconset resource="../musescore.qrc">
+          <normaloff>:/data/icons/edit-reset.svg</normaloff>:/data/icons/edit-reset.svg</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QSpinBox" name="frets">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="strings">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QSpinBox" name="barre"/>
+      </item>
+      <item row="3" column="2">
+       <widget class="QToolButton" name="resetFrets">
+        <property name="toolTip">
+         <string>Reset to default</string>
+        </property>
+        <property name="accessibleName">
+         <string>Reset 'Placement' value</string>
+        </property>
+        <property name="text">
+         <string notr="true"/>
+        </property>
+        <property name="icon">
+         <iconset resource="../musescore.qrc">
+          <normaloff>:/data/icons/edit-reset.svg</normaloff>:/data/icons/edit-reset.svg</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2">
+       <widget class="QToolButton" name="resetBarre">
+        <property name="toolTip">
+         <string>Reset to default</string>
+        </property>
+        <property name="accessibleName">
+         <string>Reset 'Placement' value</string>
+        </property>
+        <property name="text">
+         <string notr="true"/>
+        </property>
+        <property name="icon">
+         <iconset resource="../musescore.qrc">
+          <normaloff>:/data/icons/edit-reset.svg</normaloff>:/data/icons/edit-reset.svg</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Offset:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1">
+       <widget class="QSpinBox" name="offset"/>
+      </item>
+      <item row="6" column="2">
+       <widget class="QToolButton" name="resetOffset">
+        <property name="toolTip">
+         <string>Reset to default</string>
+        </property>
+        <property name="accessibleName">
+         <string>Reset 'Placement' value</string>
+        </property>
+        <property name="text">
+         <string notr="true"/>
+        </property>
+        <property name="icon">
+         <iconset resource="../musescore.qrc">
+          <normaloff>:/data/icons/edit-reset.svg</normaloff>:/data/icons/edit-reset.svg</iconset>
        </property>
       </widget>
      </item>
--- a/mscore/inspector/inspector_harmony.ui
+++ b/mscore/inspector/inspector_harmony.ui
@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>InspectorHarmony</class>
+ <widget class="QWidget" name="InspectorHarmony">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>294</width>
+    <height>205</height>
+   </rect>
+  </property>
+  <property name="accessibleName">
+   <string>Image Inspector</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QToolButton" name="title">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Chord Name</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::HLine</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <property name="lineWidth">
+      <number>2</number>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="panel" native="true">
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="horizontalSpacing">
+       <number>3</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>0</number>
+      </property>
+      <item row="1" column="0" colspan="2">
+       <widget class="Ms::SizeSelect" name="size" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Ms::SizeSelect</class>
+   <extends>QWidget</extends>
+   <header>inspector/sizeSelect.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>title</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../musescore.qrc"/>
+ </resources>
+ <connections/>
+</ui>
--- a/mtest/libmscore/compat206/textstyles-ref.mscx
+++ b/mtest/libmscore/compat206/textstyles-ref.mscx
@ -29,6 +29,9 @@
      <pedalPosBelow>0</pedalPosBelow>
      <pedalFontFace>MuseJazz Text</pedalFontFace>
      <trillPosAbove>0</trillPosAbove>
+      <chordSymbolFontFace>MuseJazz Text</chordSymbolFontFace>
+      <chordSymbolFontSize>15</chordSymbolFontSize>
+      <chordSymbolAlign>left,baseline</chordSymbolAlign>
      <measureNumberSystem>0</measureNumberSystem>
      <chordStyle>jazz</chordStyle>
      <chordDescriptionFile>chords_jazz.xml</chordDescriptionFile>
@ -84,8 +87,6 @@
      <staffFontSize>11</staffFontSize>
      <staffAlign>left,top</staffAlign>
      <staffTextPosAbove>5.5</staffTextPosAbove>
-      <chordSymbolFontFace>MuseJazz Text</chordSymbolFontFace>
-      <chordSymbolFontSize>15</chordSymbolFontSize>
      <rehearsalMarkFontFace>MuseJazz Text</rehearsalMarkFontFace>
      <rehearsalMarkFontBold>0</rehearsalMarkFontBold>
      <rehearsalMarkAlign>right,baseline</rehearsalMarkAlign>