merged with release_2_0

3 files changed, 20 insertions, 27 deletions

diff --git a/muse2/muse/widgets/fdialogbuttons.ui b/muse2/muse/widgets/fdialogbuttons.ui
index 09f9e52d..a2196b66 100644
--- a/muse2/muse/widgets/fdialogbuttons.ui
+++ b/muse2/muse/widgets/fdialogbuttons.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>145</width>
+    <width>150</width>
     <height>438</height>
    </rect>
   </property>
@@ -121,7 +121,7 @@
     </spacer>
    </item>
    <item>
-    <widget class="QFrame" name="loadAllGroup">
+    <widget class="QFrame" name="readMidiPortsGroup">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -130,21 +130,16 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
-       <widget class="QRadioButton" name="loadAllButton">
+       <widget class="QCheckBox" name="readMidiPortsButton">
         <property name="text">
-         <string>Songdata +
+         <string>read Midi Port
 Configuration</string>
         </property>
-        <property name="checked">
+        <property name="checkable">
          <bool>true</bool>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="loadSongButton">
-        <property name="text">
-         <string>only
-Songdata</string>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp
index 7f2c1681..5fbae28b 100644
--- a/muse2/muse/widgets/filedialog.cpp
+++ b/muse2/muse/widgets/filedialog.cpp
@@ -239,7 +239,7 @@ MFileDialog::MFileDialog(const QString& dir,
                         }
 
 	          }
-            buttons.loadAllGroup->setVisible(false);
+            buttons.readMidiPortsGroup->setVisible(false);
             }
       }
 
@@ -276,7 +276,7 @@ void MFileDialog::directoryChanged(const QString&)
 //   getOpenFileName
 //---------------------------------------------------------
 QString getOpenFileName(const QString &startWith, const char** filters_chararray,
-            QWidget* parent, const QString& name, bool* all, MFileDialog::ViewType viewType)
+            QWidget* parent, const QString& name, bool* doReadMidiPorts, MFileDialog::ViewType viewType)
       {
       QStringList filters = localizedStringListFromCharArray(filters_chararray, "file_patterns");
       
@@ -290,26 +290,24 @@ QString getOpenFileName(const QString &startWith, const char** filters_chararray
         dlg->projectToggled(true);
       else if (viewType == MFileDialog::USER_VIEW)
         dlg->userToggled(true);
-      if (all) {
-            dlg->buttons.loadAllGroup->setVisible(true);
-            //dlg->buttons.globalButton->setVisible(false);
-      }
+      if (doReadMidiPorts)
+            dlg->buttons.readMidiPortsGroup->setVisible(true);
+
       if (!initialSelection.isEmpty())
             dlg->selectFile(initialSelection);
       dlg->setFileMode(QFileDialog::ExistingFile);
       QStringList files;
       QString result;
       if (dlg->exec() == QDialog::Accepted) {
-            files = dlg->selectedFiles();
-	    if (!files.isEmpty())
-                  result = files[0];
-            if (all) {
-                  *all = dlg->buttons.loadAllButton->isChecked();
-                  }
-            }
+          files = dlg->selectedFiles();
+          if (!files.isEmpty())
+              result = files[0];
+          if (doReadMidiPorts)
+              *doReadMidiPorts = dlg->buttons.readMidiPortsButton->isChecked();
+      }
       delete dlg;
       return result;
-      }
+}
 
 //---------------------------------------------------------
 //   getSaveFileName
diff --git a/muse2/muse/widgets/filedialog.h b/muse2/muse/widgets/filedialog.h
index b4e21e2c..c9ab8e09 100644
--- a/muse2/muse/widgets/filedialog.h
+++ b/muse2/muse/widgets/filedialog.h
@@ -93,7 +93,7 @@ class ContentsPreview : public QWidget, public Q3FilePreview {
 QString getSaveFileName(const QString& startWidth, const char** filters,
          QWidget* parent, const QString& name);
 QString getOpenFileName(const QString& startWidth, const char** filters,
-                        QWidget* parent, const QString& name, bool* openAll, MFileDialog::ViewType viewType = MFileDialog::PROJECT_VIEW);
+                        QWidget* parent, const QString& name, bool* doReadMidiPorts, MFileDialog::ViewType viewType = MFileDialog::PROJECT_VIEW);
 QString getImageFileName(const QString& startWith, const char** filters, 
          QWidget* parent, const QString& name);