diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/StyledGroupBox.qml b/src/framework/uicomponents/qml/Muse/UiComponents/StyledGroupBox.qml index aa97695d4131b..9e878af62af6a 100644 --- a/src/framework/uicomponents/qml/Muse/UiComponents/StyledGroupBox.qml +++ b/src/framework/uicomponents/qml/Muse/UiComponents/StyledGroupBox.qml @@ -32,11 +32,10 @@ GroupBox { spacing: 4 background: Rectangle { - x: root.leftInset - y: root.topInset + root.implicitLabelHeight + root.spacing + y: root.topPadding - root.padding - width: root.width - x - root.rightInset - height: root.height - y - root.bottomInset + width: parent.width + height: root.height - y color: ui.theme.backgroundPrimaryColor border.color: ui.theme.strokeColor diff --git a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/TimeSigPage.qml b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/TimeSigPage.qml index 17491f0977096..d427ac0c7b142 100644 --- a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/TimeSigPage.qml +++ b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/TimeSigPage.qml @@ -350,6 +350,7 @@ ScrollView { IncrementalPropertyControl { Layout.preferredWidth: 100 decimals: 2 + step: 0.1 measureUnitsSymbol: 'sp' currentValue: parent.numDistStyle.value @@ -388,20 +389,20 @@ ScrollView { } } - + CheckBox { + id: showCourtesy + text: qsTrc("notation/editstyle/timesignatures", "Show courtesy time signatures") + checked: model.genCourtesyTimesig.value === true + onClicked: model.genCourtesyTimesig.value = !model.genCourtesyTimesig.value + } StyledGroupBox { Layout.fillWidth: true visible: model.timeSigPlacement.value === 1 - - label: CheckBox { - id: showCourtesy - text: qsTrc("notation/editstyle/timesignatures", "Show courtesy time signatures") - checked: model.genCourtesyTimesig.value === true - onClicked: model.genCourtesyTimesig.value = !model.genCourtesyTimesig.value - } + label: null RowLayout { + anchors.topMargin: 20 id: courtesyAboveVSMargin enabled: model.genCourtesyTimesig.value === true width: parent.width @@ -432,7 +433,7 @@ ScrollView { } RoundedRadioButton { - text: qsTrc("notation/editstyle/timesignatures", "Create space") + text: qsTrc("notation/editstyle/timesignatures", "Inset barline") checked: courtesyAboveVSMargin.timeSigVsMarginStyle.value === 2 onToggled: courtesyAboveVSMargin.timeSigVsMarginStyle.value = 2 } diff --git a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-create_space.png b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-create_space.png index 2d261eb76426e..dbed4453bb08b 100644 Binary files a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-create_space.png and b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-create_space.png differ diff --git a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-hang.png b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-hang.png index a57a4df73a359..477b47a0dfd05 100644 Binary files a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-hang.png and b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-hang.png differ diff --git a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-right_align.png b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-right_align.png index 3bcec0ec4f1ea..7893580346e82 100644 Binary files a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-right_align.png and b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-right_align.png differ