Skip to content

Commit

Permalink
Merge pull request #5576 from Jojo-Schmitz/ptb
Browse files Browse the repository at this point in the history
fix #44796: enable ptb import
  • Loading branch information
anatoly-os committed Jan 13, 2020
2 parents 7efbe85 + 917d8b5 commit 7bc323b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions build/packaging/WIX.template.in
Expand Up @@ -110,6 +110,7 @@
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".gp4" Value="" Type="string" />
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".gp5" Value="" Type="string" />
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".gpx" Value="" Type="string" />
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".ptb" Value="" Type="string" />
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".sf2" Value="" Type="string" />
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".sf3" Value="" Type="string" />

Expand Down
5 changes: 3 additions & 2 deletions mscore/file.cpp
Expand Up @@ -283,7 +283,7 @@ void MuseScore::loadFiles(bool switchTab, bool singleFile)
#ifdef OMR
tr("All Supported Files") + " (*.mscz *.mscx *.mxl *.musicxml *.xml *.mid *.midi *.kar *.md *.mgu *.sgu *.cap *.capx *.pdf *.ove *.scw *.bww *.gtp *.gp3 *.gp4 *.gp5 *.gpx);;" +
#else
tr("All Supported Files") + " (*.mscz *.mscx *.mxl *.musicxml *.xml *.mid *.midi *.kar *.md *.mgu *.sgu *.cap *.capx *.ove *.scw *.bww *.gtp *.gp3 *.gp4 *.gp5 *.gpx);;" +
tr("All Supported Files") + " (*.mscz *.mscx *.mxl *.musicxml *.xml *.mid *.midi *.kar *.md *.mgu *.sgu *.cap *.capx *.ove *.scw *.bww *.gtp *.gp3 *.gp4 *.gp5 *.gpx *.ptb);;" +
#endif
tr("MuseScore Files") + " (*.mscz *.mscx);;" +
tr("MusicXML Files") + " (*.mxl *.musicxml *.xml);;" +
Expand All @@ -296,7 +296,8 @@ void MuseScore::loadFiles(bool switchTab, bool singleFile)
#endif
tr("Overture / Score Writer Files (experimental)") + " (*.ove *.scw);;" +
tr("Bagpipe Music Writer Files (experimental)") + " (*.bww);;" +
tr("Guitar Pro") + " (*.gtp *.gp3 *.gp4 *.gp5 *.gpx)",
tr("Guitar Pro Files") + " (*.gtp *.gp3 *.gp4 *.gp5 *.gpx);;" +
tr("Power Tab Editor Files (experimental)") + " (*.ptb)",
tr("Load Score"),
singleFile
);
Expand Down
2 changes: 1 addition & 1 deletion mtest/testutils.cpp
Expand Up @@ -125,7 +125,7 @@ MasterScore* MTest::readCreatedScore(const QString& name)
#endif
else if (csl == "xml" || csl == "musicxml")
rv = importMusicXml(score, name);
else if (csl == "gp3" || csl == "gp4" || csl == "gp5" || csl == "gpx")
else if (csl == "gp3" || csl == "gp4" || csl == "gp5" || csl == "gpx" || csl == "ptb")
rv = importGTP(score, name);
else
rv = Score::FileError::FILE_UNKNOWN_TYPE;
Expand Down

0 comments on commit 7bc323b

Please sign in to comment.