diff --git a/src/notation/notationscene.qrc b/src/notation/notationscene.qrc index e5b98bdb5b6b4..410b9257f6e9f 100644 --- a/src/notation/notationscene.qrc +++ b/src/notation/notationscene.qrc @@ -67,5 +67,10 @@ qml/MuseScore/NotationScene/internal/EditStyle/TextFieldWithReset.qml qml/MuseScore/NotationScene/internal/EditStyle/IconAndTextButtonSelector.qml qml/MuseScore/NotationScene/PercussionPanelPadSwapDialog.qml + qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-above_staves.png + qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-across_staves.png + qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-hang.png + qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-right_align.png + qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-on_all_staves.png diff --git a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/TimeSigPage.qml b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/TimeSigPage.qml index 80be630435b02..73d5527632fd3 100644 --- a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/TimeSigPage.qml +++ b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/TimeSigPage.qml @@ -28,7 +28,7 @@ import Muse.Ui 1.0 Rectangle { anchors.fill: parent - color: ui.theme.backgroundPrimaryColor + color: "transparent" TimeSigPageModel { id: model @@ -38,40 +38,72 @@ Rectangle { width: parent.width spacing: 12 - StyledTextLabel { - horizontalAlignment: Text.AlignLeft - text: qsTrc("notation/editstyle/timesignatures", "Position:") - } + RowLayout { + Layout.fillHeight: true + Layout.fillWidth: true - RoundedRadioButton { - text: qsTrc("notation/editstyle/timesignatures", "On all staves") - checked: model.timeSigPlacement.value === 0 - onToggled: model.timeSigPlacement.value = 0 - } + ColumnLayout { + Layout.fillWidth: true + spacing: 8 - RoundedRadioButton { - text: qsTrc("notation/editstyle/timesignatures", "Above staves") - checked: model.timeSigPlacement.value === 1 - onToggled: model.timeSigPlacement.value = 1 - } + StyledTextLabel { + Layout.fillWidth: true + horizontalAlignment: Text.AlignLeft + text: qsTrc("notation/editstyle/timesignatures", "Position:") + } - RoundedRadioButton { - text: qsTrc("notation/editstyle/timesignatures", "Across staves") - checked: model.timeSigPlacement.value === 2 - onToggled: model.timeSigPlacement.value = 2 - } + RoundedRadioButton { + text: qsTrc("notation/editstyle/timesignatures", "On all staves") + checked: model.timeSigPlacement.value === 0 + onToggled: model.timeSigPlacement.value = 0 + } + + RoundedRadioButton { + text: qsTrc("notation/editstyle/timesignatures", "Above staves") + checked: model.timeSigPlacement.value === 1 + onToggled: model.timeSigPlacement.value = 1 + } - FlatButton { - visible: model.timeSigPlacement.value !== 0 - text: qsTrc("notation/editstyle/timesignatures", "Edit system object staves…") - //onClicked: + RoundedRadioButton { + text: qsTrc("notation/editstyle/timesignatures", "Across staves") + checked: model.timeSigPlacement.value === 2 + onToggled: model.timeSigPlacement.value = 2 + } + + StyledTextLabel { + visible: model.timeSigPlacement.value !== 0 + text: qsTrc("notation/editstyle/timesignatures", "Set where time signatures appear using the Layout panel.") + } + } + + Rectangle { + Layout.preferredWidth: childrenRect.width + 16 + Layout.fillHeight: true + color: "#ffffff" + border.color: ui.theme.strokeColor + radius: ui.theme.borderWidth + + Image { + id: image + + height: parent.height - 16 + anchors.centerIn: parent + mipmap: true + + fillMode: Image.PreserveAspectFit + + source: model.timeSigPlacement.value === 0 ? "timeSigImages/timesig-on_all_staves.png" + : model.timeSigPlacement.value === 1 ? "timeSigImages/timesig-above_staves.png" + : "timeSigImages/timesig-across_staves.png" + } + } } StyledGroupBox { Layout.fillWidth: true Layout.fillHeight: true - title: qsTrc("notation/editstyle/timesignatures", "Style") + title: qsTrc("notation/editstyle/timesignatures", "Style and size") ColumnLayout { Layout.fillWidth: true diff --git a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-above_staves.png b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-above_staves.png new file mode 100644 index 0000000000000..61db53325ae05 Binary files /dev/null and b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-above_staves.png differ diff --git a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-across_staves.png b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-across_staves.png new file mode 100644 index 0000000000000..89c92b0d4218a Binary files /dev/null and b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-across_staves.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 new file mode 100644 index 0000000000000..5a424ce96e8d6 Binary files /dev/null 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 new file mode 100644 index 0000000000000..146aa3971bbc6 Binary files /dev/null and b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-right_align.png differ diff --git a/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-on_all_staves.png b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-on_all_staves.png new file mode 100644 index 0000000000000..003653354b463 Binary files /dev/null and b/src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-on_all_staves.png differ diff --git a/src/notation/view/widgets/editstyle.cpp b/src/notation/view/widgets/editstyle.cpp index 50ff4f96504c0..0236d17b33d3a 100644 --- a/src/notation/view/widgets/editstyle.cpp +++ b/src/notation/view/widgets/editstyle.cpp @@ -595,7 +595,6 @@ EditStyle::EditStyle(QWidget* parent) { StyleId::hideTabClefAfterFirst, false, hideTabClefs, 0 }, { StyleId::genClef, false, clefVisibility, 0 }, { StyleId::genKeysig, false, keysigVisibility, 0 }, - { StyleId::genCourtesyTimesig, false, genCourtesyTimesig, 0 }, { StyleId::genCourtesyKeysig, false, genCourtesyKeysig, 0 }, { StyleId::genCourtesyClef, false, genCourtesyClef, 0 }, { StyleId::keySigCourtesyBarlineMode, false, ksbl, 0 }, @@ -944,10 +943,10 @@ EditStyle::EditStyle(QWidget* parent) // ==================================================== auto timeSigPage = createQmlWidget( - groupBoxTimeSig, + groupBox_timeSigSettings, QUrl(QString::fromUtf8("qrc:/qml/MuseScore/NotationScene/internal/EditStyle/TimeSigPage.qml"))); - timeSigPage.widget->setMinimumSize(224, 440); - groupBoxTimeSig->layout()->addWidget(timeSigPage.widget); + timeSigPage.widget->setMinimumSize(224, 650); + groupBox_timeSigSettings->layout()->addWidget(timeSigPage.widget); // ==================================================== // Figured Bass diff --git a/src/notation/view/widgets/editstyle.ui b/src/notation/view/widgets/editstyle.ui index d7678956b1e41..9c7610aeeb0ce 100644 --- a/src/notation/view/widgets/editstyle.ui +++ b/src/notation/view/widgets/editstyle.ui @@ -91,12 +91,7 @@ - Clefs & key signatures - - - - - Time signatures + Clefs, time & key signatures @@ -262,7 +257,7 @@ - 7 + 6 @@ -3847,154 +3842,137 @@ - - - Clefs - - - - - - Visibility - - - - - - - Show all clefs on every system - - - - - - - Hide all clefs after the first system where they appear - - - - - - - Hide TAB clefs after the first system where they appear - - - - - - - Show courtesy clefs - - - - - - - Default TAB clef - - - Default TAB clef - - - - - - Standard TAB clef - - - - - - - Serif TAB clef - - - - - - - - - - - - - Key signatures - - - - - - Visibility - - - - - - - Show on every system - - - - - - - Hide after the first system where they appear - - - - - - - Show courtesy key signatures - - - - - - - - - - Time signatures - - - - - - Show courtesy time signatures - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 0 - - - - - - - - - - - - Time signatures + + + true - + + + + 0 + 0 + 605 + 466 + + + + + + + Clefs + + + + + + Visibility + + + + + + + Show all clefs on every system + + + + + + + Hide all clefs after the first system where they appear + + + + + + + Hide TAB clefs after the first system where they appear + + + + + + + Show courtesy clefs + + + + + + + Default TAB clef + + + Default TAB clef + + + + + + Standard TAB clef + + + + + + + Serif TAB clef + + + + + + + + + + + + + Time signatures + + + + + + + + Key signatures + + + + + + Visibility + + + + + + + Show on every system + + + + + + + Hide after the first system where they appear + + + + + + + Show courtesy key signatures + + + + + + + + @@ -13768,8 +13746,8 @@ first note of the system 0 0 - 98 - 28 + 617 + 478 @@ -15237,7 +15215,6 @@ first note of the system radioShowAllKeys radioHideKeys genCourtesyKeysig - genCourtesyTimesig scrollAreaAccidentals accidentalsBracketsBadding resetAccidentalsBracketPadding