From 19c79bac230a38b78d2b40715f07e4b01347d831 Mon Sep 17 00:00:00 2001
From: James Mizen <jamesmmizen@gmail.com>
Date: Wed, 31 Jul 2024 11:49:43 +0100
Subject: [PATCH] Properties panel changes

---
 .../models/notation/frames/horizontalframesettingsmodel.cpp | 2 +-
 .../Inspector/notation/frames/HorizontalFrameSettings.qml   | 6 ++----
 .../Inspector/notation/frames/TextFrameSettings.qml         | 6 ++----
 .../Inspector/notation/frames/VerticalFrameSettings.qml     | 6 ++----
 .../view/qml/MuseScore/Inspector/text/TextSettings.qml      | 4 ++--
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/inspector/models/notation/frames/horizontalframesettingsmodel.cpp b/src/inspector/models/notation/frames/horizontalframesettingsmodel.cpp
index 9a8f7705eaf87..467a97f565e26 100644
--- a/src/inspector/models/notation/frames/horizontalframesettingsmodel.cpp
+++ b/src/inspector/models/notation/frames/horizontalframesettingsmodel.cpp
@@ -39,7 +39,7 @@ HorizontalFrameSettingsModel::HorizontalFrameSettingsModel(QObject* parent, IEle
 void HorizontalFrameSettingsModel::createProperties()
 {
     m_frameWidth = buildPropertyItem(Pid::BOX_WIDTH);
-    m_leftGap= buildPropertyItem(Pid::TOP_GAP);
+    m_leftGap = buildPropertyItem(Pid::TOP_GAP);
     m_rightGap = buildPropertyItem(Pid::BOTTOM_GAP);
     m_shouldDisplayKeysAndBrackets = buildPropertyItem(Pid::CREATE_SYSTEM_HEADER);
     m_isSizeSpatiumDependent = buildPropertyItem(Pid::SIZE_SPATIUM_DEPENDENT);
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/frames/HorizontalFrameSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/frames/HorizontalFrameSettings.qml
index 3d4fe70fdfd2c..1cf827fc95a88 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/notation/frames/HorizontalFrameSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/notation/frames/HorizontalFrameSettings.qml
@@ -48,11 +48,11 @@ Column {
     PropertyCheckBox {
         id: matchStaffSize
 
-        navigation.name: "Follow staff size"
+        navigation.name: "Scale with staff size"
         navigation.panel: root.navigationPanel
         navigation.row: root.navigationRowStart + 1
 
-        text: qsTrc("inspector", "Follow staff size")
+        text: qsTrc("inspector", "Scale with staff size")
         propertyItem: root.model ? root.model.isSizeSpatiumDependent : null
     }
 
@@ -71,8 +71,6 @@ Column {
         navigationRowStart: root.navigationRowStart + 1
     }
 
-    SeparatorLine { anchors.margins: -12 }
-
     HorizontalGapsSection {
         id: horizontalGapsSection
         leftGap: root.model ? root.model.leftGap : null
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/frames/TextFrameSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/frames/TextFrameSettings.qml
index dcb6fc33cc789..a334a2e585e4b 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/notation/frames/TextFrameSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/notation/frames/TextFrameSettings.qml
@@ -47,11 +47,11 @@ Column {
     PropertyCheckBox {
         id: matchStaffSize
 
-        navigation.name: "Follow staff size"
+        navigation.name: "Scale with staff size"
         navigation.panel: root.navigationPanel
         navigation.row: root.navigationRowStart + 1
 
-        text: qsTrc("inspector", "Follow staff size")
+        text: qsTrc("inspector", "Scale with staff size")
         propertyItem: root.model ? root.model.isSizeSpatiumDependent : null
     }
 
@@ -64,8 +64,6 @@ Column {
         navigationRowStart: root.navigationRowStart + 1
     }
 
-    SeparatorLine { anchors.margins: -12 }
-
     HorizontalMarginsSection {
         id: horizontalMarginsSection
         frameLeftMargin: root.model ? root.model.frameLeftMargin : null
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/frames/VerticalFrameSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/frames/VerticalFrameSettings.qml
index 9abd5022586bc..d9ffac894086f 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/notation/frames/VerticalFrameSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/notation/frames/VerticalFrameSettings.qml
@@ -48,11 +48,11 @@ Column {
     PropertyCheckBox {
         id: matchStaffSize
 
-        navigation.name: "Follow staff size"
+        navigation.name: "Scale with staff size"
         navigation.panel: root.navigationPanel
         navigation.row: root.navigationRowStart + 1
 
-        text: qsTrc("inspector", "Follow staff size")
+        text: qsTrc("inspector", "Scale with staff size")
         propertyItem: root.model ? root.model.isSizeSpatiumDependent : null
     }
 
@@ -71,8 +71,6 @@ Column {
         navigationRowStart: root.navigationRowStart + 1
     }
 
-    SeparatorLine { anchors.margins: -12 }
-
     VerticalGapsSection {
         id: verticalGapsSection
         gapAbove: root.model ? root.model.gapAbove : null
diff --git a/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml
index 53f10bd9b5fba..accfa972e7852 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml
@@ -54,11 +54,11 @@ Column {
             anchors.rightMargin: 8
             anchors.verticalCenter: subscriptOptionsButtonList.verticalCenter
 
-            navigation.name: "Follow staff size"
+            navigation.name: "Scale with staff size"
             navigation.panel: root.navigationPanel
             navigation.row: root.navigationRowStart + 1
 
-            text: qsTrc("inspector", "Follow staff size")
+            text: qsTrc("inspector", "Scale with staff size")
             propertyItem: root.model ? root.model.isSizeSpatiumDependent : null
         }