From 452d4e6568d6d9aab0f4cacfe63226af63dcb2bb Mon Sep 17 00:00:00 2001 From: Michele Spagnolo Date: Mon, 23 Dec 2024 19:17:09 +0100 Subject: [PATCH] Start changing style page --- src/notation/notationscene.qrc | 5 + .../internal/EditStyle/TimeSigPage.qml | 82 +++-- .../timeSigImages/timesig-above_staves.png | Bin 0 -> 2004 bytes .../timeSigImages/timesig-across_staves.png | Bin 0 -> 2242 bytes .../timeSigImages/timesig-courtesy-hang.png | Bin 0 -> 1952 bytes .../timesig-courtesy-right_align.png | Bin 0 -> 1943 bytes .../timeSigImages/timesig-on_all_staves.png | Bin 0 -> 2190 bytes src/notation/view/widgets/editstyle.cpp | 7 +- src/notation/view/widgets/editstyle.ui | 291 ++++++++---------- 9 files changed, 199 insertions(+), 186 deletions(-) create mode 100644 src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-above_staves.png create mode 100644 src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-across_staves.png create mode 100644 src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-hang.png create mode 100644 src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-courtesy-right_align.png create mode 100644 src/notation/qml/MuseScore/NotationScene/internal/EditStyle/timeSigImages/timesig-on_all_staves.png 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 0000000000000000000000000000000000000000..61db53325ae053758e31226d18068c59182a0d6e GIT binary patch literal 2004 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 S38%jaiV#vGXd literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5a424ce96e8d62e516789584416e25f12ac11994 GIT binary patch literal 1952 zcmZvdc{JN;7sn&~B!Y^Ns->!`8PZaMsu^1%ZDn*(gGAm~!Z6yPl+ie)k`O{W6&0$M z3RR}|bh;$8OfXF?B~?|mMQU1=R2SOPT4pk5-Z|$z=bd}ceZGI(d(Qpb=bvw`-;sm5 zFcTOE1kxq=;Qdv~RTUkosd~2_J3|D4AU_cB*Z{iPLdDeKT?9D0>`8j(_aL{Hn_e1! zX9<)6)zJs3atneKerr_+55mt>IQm~rd8`U&&nRWu#Xa`7A?IB0)VI~QMbE#zlu?(> zJ#_7M>RW?1{ z*AiFWg5Y5uB$%0-SMv7m)2EbDZNSOi!M6a-udAyYt{+=A+qUhfr-w&$s5*0D zVIgqi3WcVzV9znD^P@v^gmVgoLXy}Yi6`u*=5P(h*-?*W##sqO(@Lvc^y1BIEc^1ms#O4kBV)$ z@)YciM|ecBkH<^ULTkym0klNk_0IF&Ll$ZfnUuph!;NhO$2Y?Ty=<^TOK3}wmUmB0 zg+7RtyXCgWOS@-r#*s8y!Y8KwunCf(7i)LWWcYU$3v9WrFlJ>z_z06|r*)xKBpeUlB zjr~ymoV-Og?&Wtq%0OdKGzyV|KSC$Z$?lrd7Q2+|`yc`srRYDh8*c`XV2TMPD5P#X z;-~71nndcl{sg=9OY5#*ET1|ix!uG{WsWaBVNacleod#k?|8J2~Bm&3|BQvdSV^1D>G@3@SpWhAWXs z_)0>E`{%7}k+*?=6@z!I=yHl_XT(bIi{@Di)u(!0qULd=_4489>8~_^n)9SE4EhbJ z;PGgR_5oGS8%>_>5j{30H}de=$)KA zQf=@3&JG3Dkc+`}cgru#3`@0u$_?-T7n;rJ;N?2lygQ zezq_!=Ym}}qkA?%mTmKIp_EFcOfoH#`M%GhZ0&h`|IK5xP~hiqG0*K&cfMry_*46W zpSO_8cve+Df^)o^nxIAM{*s`kSrfnyu{worECH4H<*l9T^uNk!{Iaj zSF9y#ZFjDsmNM_H&Tx6)KGD$tBmPH(w+1(TXCgNMzwXOseCaTbMXqFed67NxQ%XO< zepHLJuw;QPEv^5SJ`1w9z2@tUowk(+9Yf+b$Kq@(c569@uTru%+{U(&pFX%?UOt%P zvi}tgk#1W`CJS=fS9~5<5kxLPHd8Nm%E;3y_V~^Sx}*#A3frvozCV?(1sG;s<0Y$@ zIm6)Nxvv%i?3{P${I+5+pMwkhCI`7`!dD^3crc2i*4%!Latnt3m*pR%D7Sdi8nrUW z@M5Y{W@n(xAlRD+?lLpc9dn3Noe?cPRlPmzfYAZGpBG*O!2ct>hE^#W@P{BZpWq4G`swPTwaR!wAj1A5_-0%<>rbk4Ylr{< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..146aa3971bbc6d4853f66bab8c10dbe730639566 GIT binary patch literal 1943 zcma)-X)qg#7RQqi`x1&sEVG#FDydtzJc2 z8cWGFuKiNYYqTXOsao2)eJZt7YkADempAk7%=_>@ob#JA|2b#o{J;De1a~KS8Mq7p z0FZaSh$D)~6jid6gs5v?zU2b|NCrFO>^+l#>(wN4v@;}+JNl#cr^O$RD0j-SMRBXF zI8arn6;L$DL49Ms9F0nov)^VIBOTnDTU#q)Cf|niUK&ZWvppS)?Kkf*?`Ve}WgI1a zk*X*T*^OLzdR|j!a%*=YQ>f@f2g%Tz>L_%X|ApHjg|2^&jnQtUrsD0o+uN75I%*VSJL9eo|zGOgM+{*+PGv*W!~$nAKrT~e*0eK;^MN>($ccY=ksUbeT8@+D@Qgs z>3*ZqD=s%5>ae@8vy+&KvP0NucUD$bwy7G_8IJqiCIW5k>{1^izgnL?3-9mmztk%M znt%7M<6L0F&#q^GsC^q5yoBV%kk-jx&Ox1C|k&L|IrS96=c#ngF1D?36?nCL)yo+C?8yg!R;p%mz zi(Sji!R7*;i)VUVhm^;iWHIMZ52q;@RSY&7+AtV`Kq^_u_g_?Br%Fuq?yO3WSWi_78RYq>$3IrPC=g( zeV{FmghL4!O@J&CcHI{u)jXv-7$vP%!f@5)!Nj>p1YP0~!*(Psw=38bvEY>Cp2AEU zS6z3SelcCQo~tYMQG>Kh#LOV)f$GK$|U<)bGw(l_n>MH-AgAruPxj*9Y&`hM1y9$H^tf8(*I zTB)jzn_#>e8kv^JHZrNyCU=FU155}KoN`Wz?aT-2%vhX4m@4NHyH8JuQUL|R1HC;O zb(9Mp;^Bc*e(5~bf1kevOd6Ze)D8a+Gx>?8qWlEwGYc%aR*|3YNx1nx+# zY3-i>{s&DcyKIkWDo57KPL@6@Vxecly*}0}olMVO3GxRx@TO*=BUrtWO=4{rauj2- zv9ZBSux)tU$a(PU#j9MRfwo>^#b@@Wu~U_oFhBzbJcRsZj#5(cx4@!S(}@HO{$~1k z6DK_JZii7EH*c@`$tk(|#Igif&pr3ysaq?tyt^dGJ5a;RAgRJ)GhCmfYQ~6roFb&; z_FaFA+jZbKVlHpcgU>!^X%K8$_-8vYCP3rdJKIk-WkIU~Pj9a1t$J7{^u`ULtO`MP zacIoJbHscy=3i^kws%0p5;#I3NxVGoli4+hahto9)A+QOhZ%iZsr!#lbMD3@Rq%Ye z-;2}q>sg#%So1+ytB+JGy9w6$=$D-Lt@kM^BL(4ZrM_S(!|tdx4>LDlVlL|NfRmso zl77>tx#gf|EvskDRhZeyBlt=3hKgZZ=$KRk>^N{+7T!N4u-rR?Qe!rk?HCk9ORV{P*Dm5Vbo@A^h$4rL)4>@rh z)X|fG!GXcJ|6td!W$7KmIg?rWI*|coQs*Ur3CpBQ)+KSeiZ@*iXum>U^?sH2m(0+C zFj*7f)z<=?GC-q$KcPK`HIukjBkzgQrNnklup}(!xXk3yZI^11Qx{GI@Lj2 zAUYwtzIkh16IkeV8x6$#Wm+8jCTOS-SD$BDBb+loja{kI7sOQ<2#hEJ+VS*VqkGz6Couch#JZ~7LT q=m)DnF53f@RR0eg6;cbCusyBw;GqIe0X9bzxBzDdcU&trH2dFwM`5}E literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..003653354b463e6b21ca5cc9a80d852a32a438de GIT binary patch literal 2190 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 literal 0 HcmV?d00001 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