Skip to content

Commit 3cc91e3

Browse files
wizofauswizofaus
committed
Merge remote-tracking branch 'upstream/master' into fix-edit-linked-dynamic
2 parents 1a5940f + a70cb6e commit 3cc91e3

File tree

584 files changed

+10314
-9362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

584 files changed

+10314
-9362
lines changed

‎fonts/mscore/MusescoreIcon.ttf‎

53.2 KB
Binary file not shown.

‎src/appshell/appshell.qrc‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,14 @@
8484
<file>qml/Preferences/internal/RemoteControlSection.qml</file>
8585
<file>qml/Preferences/internal/ProgrammeStartSection.qml</file>
8686
<file>qml/Preferences/internal/FoldersSection.qml</file>
87-
<file>qml/Preferences/internal/ResetThemeButtonSection.qml</file>
87+
<file>qml/Preferences/internal/ThemeAdditionalOptionsSection.qml</file>
8888
<file>qml/Preferences/internal/AdvancedTopSection.qml</file>
89+
<file>qml/Preferences/internal/ZoomSection.qml</file>
90+
<file>qml/Preferences/internal/ScrollPagesSection.qml</file>
91+
<file>qml/Preferences/internal/NoteInputSection.qml</file>
92+
<file>qml/Preferences/internal/NoteInputPlaySection.qml</file>
93+
<file>qml/Preferences/internal/DefaultFilesSection.qml</file>
94+
<file>qml/Preferences/internal/ScoreViewSection.qml</file>
95+
<file>qml/Preferences/internal/AutomaticUpdateSection.qml</file>
8996
</qresource>
9097
</RCC>

‎src/appshell/internal/applicationactioncontroller.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void ApplicationActionController::revertToFactorySettings()
147147
IInteractive::Button::No
148148
});
149149

150-
if (result.standartButton() == IInteractive::Button::Yes) {
150+
if (result.standardButton() == IInteractive::Button::Yes) {
151151
configuration()->revertToFactorySettings();
152152
}
153153
}

‎src/appshell/qml/Preferences/AdvancedPreferencesPage.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ PreferencesPage {
4242

4343
ColumnLayout {
4444
anchors.fill: parent
45-
spacing: 20
45+
spacing: root.sectionsSpacing
4646

4747
AdvancedTopSection {
4848
id: topSection

‎src/appshell/qml/Preferences/AppearancePreferencesPage.qml‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ PreferencesPage {
4444
id: content
4545

4646
width: parent.width
47-
spacing: 24
47+
spacing: root.sectionsSpacing
4848

4949
ThemesSection {
5050
width: content.width
@@ -171,17 +171,6 @@ PreferencesPage {
171171

172172
SeparatorLine {}
173173

174-
CheckBox {
175-
id: scoreInversionEnable
176-
177-
checked: appearanceModel.scoreInversionEnabled
178-
text: qsTrc("appshell", "Invert score colors")
179-
180-
onClicked: {
181-
appearanceModel.scoreInversionEnabled = !checked
182-
}
183-
}
184-
185174
ColorAndWallpaperSection {
186175
id: paperSettings
187176

@@ -220,7 +209,11 @@ PreferencesPage {
220209
}
221210
}
222211

223-
ResetThemeButtonSection {
212+
SeparatorLine {}
213+
214+
ThemeAdditionalOptionsSection {
215+
scoreInversionEnabled: appearanceModel.scoreInversionEnabled
216+
224217
navigation.section: root.navigationSection
225218
navigation.order: root.navigationOrderStart + 7
226219

@@ -233,6 +226,10 @@ PreferencesPage {
233226
root.ensureContentVisibleRequested(Qt.rect(x, y, width, height))
234227
}
235228
}
229+
230+
onScoreInversionEnableChangeRequested: {
231+
appearanceModel.scoreInversionEnabled = enable
232+
}
236233
}
237234
}
238235
}

‎src/appshell/qml/Preferences/CanvasPreferencesPage.qml‎

Lines changed: 25 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -41,134 +41,44 @@ PreferencesPage {
4141

4242
Column {
4343
anchors.fill: parent
44-
spacing: 24
44+
spacing: root.sectionsSpacing
4545

46-
Column {
47-
anchors.left: parent.left
48-
anchors.right: parent.right
49-
spacing: 18
46+
ZoomSection {
47+
defaultZoom: preferencesModel.defaultZoom
48+
zoomTypes: preferencesModel.zoomTypes()
49+
mouseZoomPrecision: preferencesModel.mouseZoomPrecision
5050

51-
StyledTextLabel {
52-
text: qsTrc("appshell", "Zoom")
53-
font: ui.theme.bodyBoldFont
54-
}
55-
56-
Column {
57-
spacing: 8
58-
59-
Row {
60-
spacing: 12
61-
62-
ComboBoxWithTitle {
63-
title: qsTrc("appshell", "Default zoom:")
64-
titleWidth: 210
65-
66-
control.textRole: "title"
67-
control.valueRole: "value"
68-
69-
currentIndex: control.indexOfValue(preferencesModel.defaultZoom.type)
70-
71-
model: preferencesModel.zoomTypes()
72-
73-
onValueEdited: {
74-
preferencesModel.setDefaultZoomType(newValue)
75-
}
76-
}
77-
78-
IncrementalPropertyControl {
79-
id: defaultZoomControl
80-
width: 64
81-
82-
maxValue: 1600
83-
minValue: 10
84-
step: 10
85-
decimals: 0
86-
87-
measureUnitsSymbol: "%"
88-
89-
currentValue: preferencesModel.defaultZoom.level
90-
enabled: preferencesModel.defaultZoom.isPercentage
91-
92-
onValueEdited: {
93-
preferencesModel.setDefaultZoomLevel(newValue)
94-
}
95-
}
96-
}
97-
98-
IncrementalPropertyControlWithTitle {
99-
title: qsTrc("appshell", "Mouse zoom precision:")
51+
navigation.section: root.navigationSection
52+
navigation.order: root.navigationOrderStart + 1
10053

101-
titleWidth: 208
102-
control.width: 60
54+
onDefaultZoomTypeChangeRequested: {
55+
preferencesModel.setDefaultZoomType(zoomType)
56+
}
10357

104-
minValue: 1
105-
maxValue: 16
106-
currentValue: preferencesModel.mouseZoomPrecision
58+
onDefaultZoomLevelChangeRequested: {
59+
preferencesModel.setDefaultZoomLevel(zoomLevel)
60+
}
10761

108-
onValueEdited: {
109-
preferencesModel.mouseZoomPrecision = newValue
110-
}
111-
}
62+
onMouseZoomPrecisionChangeRequested: {
63+
preferencesModel.mouseZoomPrecision = zoomPrecision
11264
}
11365
}
11466

11567
SeparatorLine { }
11668

117-
Column {
118-
anchors.left: parent.left
119-
anchors.right: parent.right
120-
spacing: 18
121-
122-
StyledTextLabel {
123-
text: qsTrc("appshell", "Scroll pages")
124-
font: ui.theme.bodyBoldFont
125-
}
126-
127-
Column {
128-
spacing: 16
129-
130-
RadioButtonGroup {
131-
id: radioButtonList
132-
133-
width: 100
134-
height: implicitHeight
69+
ScrollPagesSection {
70+
orientation: preferencesModel.scrollPagesOrientation
71+
limitScrollArea: preferencesModel.limitScrollArea
13572

136-
spacing: 12
137-
orientation: ListView.Vertical
73+
navigation.section: root.navigationSection
74+
navigation.order: root.navigationOrderStart + 2
13875

139-
model: [
140-
{ title: qsTrc("appshell", "Horizontal"), value: Qt.Horizontal },
141-
{ title: qsTrc("appshell", "Vertical"), value: Qt.Vertical }
142-
]
143-
144-
delegate: RoundedRadioButton {
145-
width: parent.width
146-
leftPadding: 0
147-
spacing: 6
148-
149-
ButtonGroup.group: radioButtonList.radioButtonGroup
150-
151-
checked: preferencesModel.scrollPagesOrientation === modelData["value"]
152-
153-
StyledTextLabel {
154-
text: modelData["title"]
155-
horizontalAlignment: Text.AlignLeft
156-
}
157-
158-
onToggled: {
159-
preferencesModel.scrollPagesOrientation = modelData["value"]
160-
}
161-
}
162-
}
163-
164-
CheckBox {
165-
text: qsTrc("appshell", "Limit scroll area to page borders")
166-
checked: preferencesModel.limitScrollArea
76+
onOrientationChangeRequested: {
77+
preferencesModel.scrollPagesOrientation = orientation
78+
}
16779

168-
onClicked: {
169-
preferencesModel.limitScrollArea = !preferencesModel.limitScrollArea
170-
}
171-
}
80+
onLimitScrollAreaChangeRequested: {
81+
preferencesModel.limitScrollArea = limit
17282
}
17383
}
17484
}

‎src/appshell/qml/Preferences/FoldersPreferencesPage.qml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,17 @@ PreferencesPage {
4040
foldersPreferencesModel.load()
4141
}
4242

43-
FoldersSection {
44-
id: content
43+
Column {
44+
anchors.fill: parent
45+
spacing: root.sectionsSpacing
4546

46-
model: foldersPreferencesModel
47+
FoldersSection {
48+
id: content
4749

48-
navigation.section: root.navigationSection
49-
navigation.order: root.navigationOrderStart + 1
50+
model: foldersPreferencesModel
51+
52+
navigation.section: root.navigationSection
53+
navigation.order: root.navigationOrderStart + 1
54+
}
5055
}
5156
}

‎src/appshell/qml/Preferences/GeneralPreferencesPage.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ PreferencesPage {
4545
id: content
4646

4747
width: parent.width
48-
spacing: 24
48+
spacing: root.sectionsSpacing
4949

5050
LanguagesSection {
5151
languages: preferencesModel.languages

‎src/appshell/qml/Preferences/IOPreferencesPage.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ PreferencesPage {
4343
id: content
4444

4545
width: parent.width
46-
spacing: 24
46+
spacing: root.sectionsSpacing
4747

4848
readonly property int firstColumnWidth: 220
4949

0 commit comments

Comments
 (0)