Skip to content
Permalink
Browse files

Merge pull request #4767 from Jojo-Schmitz/musescore-3-file

Fix #283063: "MuseScore File" string (under File -> Save As...) does not indicate which version you are about to save as
  • Loading branch information
anatoly-os committed May 1, 2019
2 parents f69f4ea + 47df5a1 commit 68fb453496892208d27e7ce2c34aa4b8dd8a31c5
Showing with 9 additions and 8 deletions.
  1. +9 −8 mscore/file.cpp
@@ -409,8 +409,8 @@ bool MuseScore::saveFile(MasterScore* score)
if (t)
fn = t->plainText();
QString name = createDefaultFileName(fn);
QString f1 = tr("MuseScore File") + " (*.mscz)";
QString f2 = tr("Uncompressed MuseScore File") + " (*.mscx)";
QString f1 = tr("MuseScore 3 File") + " (*.mscz)";
QString f2 = tr("Uncompressed MuseScore 3 File") + " (*.mscx)"; // for debugging purposes

QSettings set;
if (mscore->lastSaveDirectory.isEmpty())
@@ -1684,7 +1684,7 @@ void MuseScore::exportFile()
fl.append(tr("Standard MIDI File") + " (*.mid)");
fl.append(tr("Compressed MusicXML File") + " (*.mxl)");
fl.append(tr("Uncompressed MusicXML File") + " (*.musicxml)");
fl.append(tr("Uncompressed MuseScore File") + " (*.mscx)");
fl.append(tr("Uncompressed MuseScore 3 File") + " (*.mscx)"); // for debugging purposes

QString saveDialogTitle = tr("Export");

@@ -1763,8 +1763,8 @@ bool MuseScore::exportParts()
fl.append(tr("Standard MIDI File") + " (*.mid)");
fl.append(tr("Compressed MusicXML File") + " (*.mxl)");
fl.append(tr("Uncompressed MusicXML File") + " (*.musicxml)");
fl.append(tr("MuseScore File") + " (*.mscz)");
fl.append(tr("Uncompressed MuseScore File") + " (*.mscx)");
fl.append(tr("MuseScore 3 File") + " (*.mscz)");
fl.append(tr("Uncompressed MuseScore 3 File") + " (*.mscx)"); // for debugging purposes

QString saveDialogTitle = tr("Export Parts");

@@ -2365,8 +2365,8 @@ Score::FileError readScore(MasterScore* score, QString name, bool ignoreVersionE
bool MuseScore::saveAs(Score* cs_, bool saveCopy)
{
QStringList fl;
fl.append(tr("MuseScore File") + " (*.mscz)");
fl.append(tr("Uncompressed MuseScore File") + " (*.mscx)"); // for debugging purposes
fl.append(tr("MuseScore 3 File") + " (*.mscz)");
fl.append(tr("Uncompressed MuseScore 3 File") + " (*.mscx)"); // for debugging purposes
QString saveDialogTitle = saveCopy ? tr("Save a Copy") :
tr("Save As");

@@ -2436,7 +2436,8 @@ bool MuseScore::saveSelection(Score* cs_)
return false;
}
QStringList fl;
fl.append(tr("MuseScore File") + " (*.mscz)");
fl.append(tr("MuseScore 3 File") + " (*.mscz)");
fl.append(tr("Uncompressed MuseScore 3 File") + " (*.mscx)"); // for debugging purposes
QString saveDialogTitle = tr("Save Selection");

QString saveDirectory;

0 comments on commit 68fb453

Please sign in to comment.
You can’t perform that action at this time.