Merge pull request #4751 from mattmcclinch/280492-fret-number

fix #280492: Fretboard diagrams: Offset needs to be renamed and should correspond with the diagram
musescore · Mar 4, 2019 · 85d7808 · 85d7808
2 parents f260b5a + 74554ca
commit 85d7808
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 7 deletions.
diff --git a/mscore/inspector/inspectorFret.cpp b/mscore/inspector/inspectorFret.cpp
@@ -36,13 +36,16 @@ InspectorFretDiagram::InspectorFretDiagram(QWidget* parent)
             { 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 }
             };
       mapSignals(iiList, ppList);
+      int fretNumber = toFretDiagram(inspector->element())->fretOffset() + 1;
+      f.fretNumber->setValue(fretNumber);
+      connect(f.fretNumber, SIGNAL(valueChanged(int)), SLOT(fretNumberChanged(int)));
+      connect(f.resetFretNumber, SIGNAL(resetClicked()), SLOT(resetFretNumber()));
       }
 
 //---------------------------------------------------------
@@ -67,5 +70,35 @@ void InspectorFretDiagram::setElement()
       f.diagram->setFretDiagram(fd);
       }
 
+//---------------------------------------------------------
+//   fretNumberChanged
+//---------------------------------------------------------
+
+void InspectorFretDiagram::fretNumberChanged(int fretNumber)
+      {
+      FretDiagram* fd = toFretDiagram(inspector->element());
+      fd->score()->startCmd();
+      fd->undoChangeProperty(Pid::FRET_OFFSET, fretNumber - 1);
+      fd->score()->endCmd();
+      f.resetFretNumber->setEnabled(fretNumber != 1);
+      f.diagram->setFretDiagram(fd);
+      }
+
+//---------------------------------------------------------
+//   resetFretNumberClicked
+//---------------------------------------------------------
+
+void InspectorFretDiagram::resetFretNumber()
+      {
+      FretDiagram* fd = toFretDiagram(inspector->element());
+      int fretNumber = 1;
+      fd->score()->startCmd();
+      fd->undoChangeProperty(Pid::FRET_OFFSET, fretNumber - 1);
+      fd->score()->endCmd();
+      f.fretNumber->setValue(fretNumber);
+      f.resetFretNumber->setEnabled(false);
+      f.diagram->setFretDiagram(fd);
+      }
+
 }
 
diff --git a/mscore/inspector/inspectorFret.h b/mscore/inspector/inspectorFret.h
@@ -31,6 +31,8 @@ class InspectorFretDiagram : public InspectorElementBase {
 
    private slots:
       virtual void valueChanged(int idx) override;
+      void fretNumberChanged(int fretNumber);
+      void resetFretNumber();
 
    public:
       InspectorFretDiagram(QWidget* parent);

diff --git a/mscore/inspector/inspector_fret.ui b/mscore/inspector/inspector_fret.ui
@@ -207,17 +207,20 @@
       <item row="6" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
-         <string>Offset:</string>
+         <string>Fret number:</string>
         </property>
         <property name="buddy">
-         <cstring>offset</cstring>
+         <cstring>fretNumber</cstring>
         </property>
        </widget>
       </item>
       <item row="6" column="1">
-       <widget class="QSpinBox" name="offset">
+       <widget class="QSpinBox" name="fretNumber">
         <property name="accessibleName">
-         <string>Offset</string>
+         <string>Fret number</string>
+        </property>
+        <property name="minimum">
+         <number>1</number>
         </property>
        </widget>
       </item>
@@ -256,7 +259,7 @@
        <widget class="Ms::ResetButton" name="resetBarre" native="true"/>
       </item>
       <item row="6" column="2">
-       <widget class="Ms::ResetButton" name="resetOffset" native="true"/>
+       <widget class="Ms::ResetButton" name="resetFretNumber" native="true"/>
       </item>
      </layout>
     </widget>
@@ -284,7 +287,7 @@
   <tabstop>strings</tabstop>
   <tabstop>frets</tabstop>
   <tabstop>barre</tabstop>
-  <tabstop>offset</tabstop>
+  <tabstop>fretNumber</tabstop>
  </tabstops>
  <resources/>
  <connections/>