merged with trunk

midi files default to type=GM now
changed wildcards for opening file. midi is now selectable

1 files changed, 2 insertions, 0 deletions

diff --git a/muse2/muse/globals.cpp b/muse2/muse/globals.cpp
index 6c0bbbc6..f8ae4454 100644
--- a/muse2/muse/globals.cpp
+++ b/muse2/muse/globals.cpp
@@ -174,10 +174,12 @@ const char* med_file_save_pattern[] = {
 */      
 const QStringList med_file_pattern =  
       QT_TRANSLATE_NOOP("@default", 
+      QString("all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar);;") +
       QString("med Files (*.med *.med.gz *.med.bz2);;") +
       QString("Uncompressed med Files (*.med);;") +
       QString("gzip compressed med Files (*.med.gz);;") +
       QString("bzip2 compressed med Files (*.med.bz2);;") +
+      QString("mid Files (*.mid *.midi *.kar);;") +
       QString("All Files (*)")).split(";;");
 const QStringList med_file_save_pattern =  
       QT_TRANSLATE_NOOP("@default",