From: Toby Smithe Subject: Use mscore-common. On Debian systems, use mscore-common files as opposed to those linked into the mscore binary where possible. This is done for two reasons: to make users aware of the available demo files in /usr/share/mscore, and to reduce the size of the mscore binary. --- mscore/mscore/mscore.qrc | 6 ------ mscore/mscore/preferences.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) --- a/mscore/mscore/mscore.qrc +++ b/mscore/mscore/mscore.qrc @@ -5,11 +5,6 @@ data/previous.png data/next.png data/repeat.svg - data/paper1.png - data/paper2.png - data/paper3.png - data/paper4.png - data/paper5.png data/text_bold.svg data/text_italic.svg data/text_left.svg @@ -38,7 +33,6 @@ fonts/MuseJazz.ttf ../share/templates/instruments.xml data/splash.jpg - ../demos/Reunion.mscz data/speaker.svg data/midiin.svg data/undo.svg --- a/mscore/mscore/preferences.cpp +++ b/mscore/mscore/preferences.cpp @@ -115,7 +115,7 @@ bgUseColor = true; fgUseColor = false; bgWallpaper = QString(); - fgWallpaper = ":/data/paper5.png"; + fgWallpaper = "/usr/share/mscore/wallpaper/paper4.png"; fgColor.setRgb(255, 255, 255); bgColor.setRgb(0x76, 0x76, 0x6e); @@ -163,7 +163,7 @@ layoutBreakColor = Qt::green; antialiasedDrawing = true; sessionStart = SCORE_SESSION; - startScore = ":/data/Reunion_Example.mscz"; + startScore = "/usr/share/mscore/demos/Reunion.mscz"; workingDirectory = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation); showSplashScreen = true; @@ -183,7 +183,7 @@ midiExpandRepeats = true; playRepeats = true; - instrumentList = ":/data/instruments.xml"; + instrumentList = "/usr/share/mscore/templates/instruments.xml"; alternateNoteEntryMethod = false; proximity = 6; @@ -350,7 +350,7 @@ bgUseColor = s.value("bgUseColor", true).toBool(); fgUseColor = s.value("fgUseColor", false).toBool(); bgWallpaper = s.value("bgWallpaper").toString(); - fgWallpaper = s.value("fgWallpaper", ":/data/paper5.png").toString(); + fgWallpaper = s.value("fgWallpaper", "/usr/share/mscore/wallpaper/paper4.png").toString(); fgColor = s.value("fgColor", QColor(255, 255, 255)).value(); bgColor = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value(); @@ -459,9 +459,15 @@ else if (ss == "empty") sessionStart = EMPTY_SESSION; - startScore = s.value("startScore", ":/data/Reunion_Example.mscz").toString(); + startScore = s.value("startScore", "/usr/share/mscore/demos/Reunion.mscz").toString(); if(startScore == ":/data/Promenade_Example.mscx") - startScore = ":/data/Reunion_Example.mscz"; + startScore = "/usr/share/mscore/demos/Reunion.mscz"; + if(startScore == ":/data/Reunion_Example.mscz") + startScore = "/usr/share/mscore/demos/Reunion.mscz"; + if(startScore == "/usr/share/mscore/demos/Promenade_Example.mscx") + startScore = "/usr/share/mscore/demos/Reunion.mscz"; + if(startScore == "/usr/share/mscore/demos/promenade.mscx") + startScore = "/usr/share/mscore/demos/Reunion.mscz"; instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString(); readShortcuts();