LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10133 from igorkorsukov/project/migration

Browse source 
Improved migration dialog
This commit is contained in:
RomanPudashkin 2022-01-28 10:25:42 +02:00 committed by GitHub
commit d3a13f1cad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 310 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/project/internal/projectmigrator.cpp
View file

@ -39,7 +39,7 @@ static const QString EDWIN_STYLE_PATH(":/engraving/styles/migration-306-style-Ed
Ret ProjectMigrator::migrateEngravingProjectIfNeed(engraving::EngravingProjectPtr project)
{
if (!(project->mscVersion() < Ms::MSCVERSION)) {
if (project->mscVersion() >= 400) {
return true;
}
@ -73,9 +73,26 @@ Ret ProjectMigrator::migrateEngravingProjectIfNeed(engraving::EngravingProjectPt
Ret ProjectMigrator::askAboutMigration(MigrationOptions& out, const engraving::EngravingProjectPtr project)
{
//! NOTE Can be set three a fixed version, for each version different dialog content
auto migrationVersion = [](int v) {
if (v <= 225) {
return 225;
}
if (v <= 323) {
return 323;
}
if (v <= 400) {
return 362;
}
UNREACHABLE;
return 362;
};
UriQuery query(MIGRATION_DIALOG_URI);
query.addParam("title", Val(project->title()));
query.addParam("version", Val(QString::number(project->mscVersion())));
query.addParam("version", Val(migrationVersion(project->mscVersion())));
query.addParam("isApplyLeland", Val(out.isApplyLeland));
query.addParam("isApplyEdwin", Val(out.isApplyEdwin));
query.addParam("isApplyAutoSpacing", Val(out.isApplyAutoSpacing));
RetVal<Val> rv = interactive()->open(query);
if (!rv.ret) {
return rv.ret;
@ -87,6 +104,7 @@ Ret ProjectMigrator::askAboutMigration(MigrationOptions& out, const engraving::E
out.isAskAgain = vals.value("isAskAgain").toBool();
out.isApplyLeland = vals.value("isApplyLeland").toBool();
out.isApplyEdwin = vals.value("isApplyEdwin").toBool();
out.isApplyAutoSpacing = vals.value("isApplyAutoSpacing").toBool();
return true;
}
@ -109,7 +127,7 @@ Ret ProjectMigrator::migrateProject(engraving::EngravingProjectPtr project, cons
ok = applyEdwinStyle(score);
}
if (ok) {
if (ok && opt.isApplyAutoSpacing) {
ok = resetAllElementsPositions(score);
}

6
src/project/projecttypes.h
View file

@ -49,9 +49,9 @@ struct MigrationOptions
bool isApplyMigration = false;
bool isAskAgain = true;
// for MU 4.0 (from 3.6)
bool isApplyLeland = false;
bool isApplyEdwin = false;
bool isApplyLeland = true;
bool isApplyEdwin = true;
bool isApplyAutoSpacing = true;
bool isValid() const { return appVersion != 0; }
};

402
src/project/qml/MuseScore/Project/MigrationDialog.qml
View file

@ -28,18 +28,55 @@ import MuseScore.Project 1.0
StyledDialogView {
id: dialog
title: "" // will be set when open
title: qsTrc("project", "Style Improvements")
property string version: "?"
property bool isApplyLeland: false
property bool isApplyEdwin: false
property int version: 362 // can be: 362, 323, 225
property bool isApplyLeland: true
property bool isApplyEdwin: true
property bool isApplyAutoSpacing: true
property bool isAskAgain: true
contentWidth: 600
contentHeight: 600
contentHeight: {
switch (dialog.version) {
case 225: return 588
case 323: return 556
case 362: return 160
}
return 600
}
contentWidth: {
switch (dialog.version) {
case 225: return 600
case 323: return 600
case 362: return 480
}
return 600
}
modal: true
//! NOTE Can be set three a fixed version, for each version different dialog content
onOpened: {
switch(dialog.version) {
case 225: {
loader.sourceComponent = migrComp
loader.item.version = dialog.version
} break;
case 323: {
loader.sourceComponent = migrComp
loader.item.version = dialog.version
} break;
case 362: {
loader.sourceComponent = noteComp
} break;
default: {
console.assert(false, "Version must be 225, 323, 362")
}
}
}
function makeRet(isApply) {
var ret = {
errcode: 0,
@ -47,139 +84,270 @@ StyledDialogView {
isApplyMigration: isApply,
isAskAgain: dialog.isAskAgain,
isApplyLeland: dialog.isApplyLeland,
isApplyEdwin: dialog.isApplyEdwin
isApplyEdwin: dialog.isApplyEdwin,
isApplyAutoSpacing: dialog.isApplyAutoSpacing
}
}
return ret
}
Item {
id: content
function watchVideo() {
var link = Qt.locale().name === "zh_CN" ? "https://www.bilibili.com/video/BV1FT4y1K7UM" : "https://youtu.be/qLR40BGNy68"
Qt.openUrlExternally(link)
}
Loader {
id: loader
anchors.fill: parent
anchors.margins: 16
}
StyledTextLabel {
id: headerLabel
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
height: 36
font.bold: true
font.pixelSize: 20
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
text: qsTrc("project", "Would you like to try our improved score style?")
}
Image {
id: imageItem
anchors.top: headerLabel.bottom
anchors.left: parent.left
anchors.right: parent.right
height: 200
fillMode: Image.PreserveAspectFit
source: "migration.png"
}
CheckBox {
id: lelandOption
anchors.top: imageItem.bottom
anchors.left: parent.left
anchors.topMargin: 24
text: qsTrc("project", "Our new professional notation font, Leland")
checked: dialog.isApplyLeland
onClicked: dialog.isApplyLeland = !dialog.isApplyLeland
}
CheckBox {
id: edwinOption
anchors.top: lelandOption.bottom
anchors.left: parent.left
anchors.topMargin: 16
text: qsTrc("project", "Our improved text font, Edwin")
checked: dialog.isApplyEdwin
onClicked: dialog.isApplyEdwin = !dialog.isApplyEdwin
}
StyledTextLabel {
id: versionLabel
anchors.top: edwinOption.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: 32
font.pixelSize: 14
horizontalAlignment: Qt.AlignLeft
verticalAlignment: Qt.AlignVCenter
text: qsTrc("project", "Since this file was created in MuseScore %1, some layout changes may occur.").arg(dialog.version)
}
StyledTextLabel {
id: linkLabel
anchors.top: versionLabel.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: 16
font.pixelSize: 14
horizontalAlignment: Qt.AlignLeft
verticalAlignment: Qt.AlignVCenter
text: "<a href=\"%1\">%2</a>"
.arg(Qt.locale().name === "zh_CN" ? "https://www.bilibili.com/video/BV1FT4y1K7UM" : "https://youtu.be/qLR40BGNy68")
.arg(qsTr("Watch our release video to learn more"))
}
//! NOTE for 3.6.2
Component {
id: noteComp
Item {
id: footer
id: content
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 112
property int version: -1
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
height: 2
color: ui.theme.buttonColor
}
anchors.fill: parent
CheckBox {
id: askAgain
anchors.top: parent.top
anchors.left: parent.left
anchors.topMargin: 16
text: qsTrc("project", "Remember my choice and don't ask again")
checked: !dialog.isAskAgain
onClicked: dialog.isAskAgain = !dialog.isAskAgain
}
FlatButton {
anchors.right: applyBtn.left
anchors.bottom: parent.bottom
Column {
id: mainContent
anchors.fill: parent
anchors.margins: 16
text: qsTrc("project", "Keep old style")
onClicked: {
dialog.ret = dialog.makeRet(false)
dialog.hide()
spacing: 16
StyledTextLabel {
id: headerTitle
anchors.left: parent.left
anchors.right: parent.right
height: 32
font.weight: Font.DemiBold
font.pixelSize: 16
horizontalAlignment: Qt.AlignLeft
verticalAlignment: Qt.AlignVCenter
text: qsTrc("project", "This file was created in MuseScore %1").arg("3.6.2")
}
StyledTextLabel {
id: headerSubtitle
anchors.left: parent.left
anchors.right: parent.right
height: 24
font.weight: Font.Medium
font.pixelSize: 12
horizontalAlignment: Qt.AlignLeft
verticalAlignment: Qt.AlignVCenter
wrapMode: Text.WordWrap
elide: Text.ElideNone
text: qsTrc("project", "Please note that the appearance of your score will change due to improvements we have made to default settings for beaming, ties, slurs, system objects and horizontal spacing.")
}
}
FlatButton {
id: applyBtn
Item {
id: footer
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.leftMargin: 16
anchors.rightMargin: 16
height: 56
FlatButton {
id: watchVideo
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
text: qsTrc("project", "Watch video about changes")
onClicked: dialog.watchVideo()
}
FlatButton {
id: applyBtn
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
text: qsTrc("global", "Ok")
onClicked: {
dialog.ret = dialog.makeRet(true)
dialog.hide()
}
}
}
}
}
//! NOTE for 2.2.5 and 3.2.3
Component {
id: migrComp
Item {
id: content
property int version: -1
anchors.fill: parent
function userVersion() {
switch (content.version) {
case 225: return "2.2.5"
case 323: return "3.2.3"
}
return ""
}
Column {
id: mainContent
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: 16
text: qsTrc("project", "Apply new style")
enabled: dialog.isApplyLeland || dialog.isApplyEdwin
onClicked: {
dialog.ret = dialog.makeRet(true)
dialog.hide()
height: childrenRect.height
StyledTextLabel {
id: headerTitle
anchors.left: parent.left
anchors.right: parent.right
height: 32
font.weight: Font.DemiBold
font.pixelSize: 16
horizontalAlignment: Qt.AlignLeft
verticalAlignment: Qt.AlignVCenter
text: qsTrc("project", "This file was created in MuseScore %1").arg(content.userVersion())
}
StyledTextLabel {
id: headerSubtitle
anchors.left: parent.left
anchors.right: parent.right
height: 24
font.weight: Font.Medium
font.pixelSize: 12
horizontalAlignment: Qt.AlignLeft
verticalAlignment: Qt.AlignVCenter
text: qsTrc("project", "Select the engraving improvements you would like to apply to your score")
}
Item {
id: imageItem
anchors.left: parent.left
anchors.right: parent.right
height: 264
Image {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
height: 200
fillMode: Image.PreserveAspectFit
source: "migration.png"
}
}
CheckBox {
id: lelandOption
anchors.left: parent.left
height: 32
text: qsTrc("project", "Our new notation font, Leland")
checked: dialog.isApplyLeland
onClicked: dialog.isApplyLeland = !dialog.isApplyLeland
}
CheckBox {
id: edwinOption
anchors.left: parent.left
height: 32
text: qsTrc("project", "Our new text font, Edwin")
checked: dialog.isApplyEdwin
onClicked: dialog.isApplyEdwin = !dialog.isApplyEdwin
}
CheckBox {
id: spacingOption
anchors.left: parent.left
height: 32
text: qsTrc("project", "Automatic spacing (introduced in MuseScore 3.0)")
visible: content.version == 225
checked: dialog.isApplyAutoSpacing
onClicked: dialog.isApplyAutoSpacing = !dialog.isApplyAutoSpacing
}
Item {
width: 1
height: 16
}
StyledTextLabel {
id: noteLabel
anchors.left: parent.left
anchors.right: parent.right
height: 32
font.weight: Font.Medium
font.pixelSize: 12
horizontalAlignment: Qt.AlignLeft
verticalAlignment: Qt.AlignVCenter
text: qsTrc("project", "Please note: score layouts will be affected by improvements to MuseScore 4")
}
FlatButton {
id: watchVideo
text: qsTrc("project", "Watch video")
onClicked: dialog.watchVideo()
}
}
Item {
id: footer
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.leftMargin: 16
anchors.rightMargin: 16
height: 56
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: -16
height: 2
color: ui.theme.buttonColor
}
CheckBox {
id: askAgain
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
text: qsTrc("project", "Don't ask again")
checked: !dialog.isAskAgain
onClicked: dialog.isAskAgain = !dialog.isAskAgain
}
FlatButton {
id: applyBtn
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
text: qsTrc("global", "Ok")
onClicked: {
dialog.ret = dialog.makeRet(true)
dialog.hide()
}
}
}
}
}
}