comparison framework/MainWindowBase.cpp @ 147:c02706551309

* Improvements to importer feedback dialogs and suchlike

         }
     }
 
     if (rdf) {
         if (rdfSession) {
-            if (!canImportLayer || shouldCreateNewSessionForRDFAudio()) {
+            bool cancel = false;
+            if (!canImportLayer || shouldCreateNewSessionForRDFAudio(&cancel)) {
                 return openSession(source);
+            } else if (cancel) {
+                return FileOpenCancelled;
             } else {
                 return openLayer(source);
             }
         } else {
             if ((status = openSession(source)) != FileOpenFailed) {

 //    std::cerr << "mode = " << mode << std::endl;
 
     if (mode == AskUser) {
         if (getMainModel()) {
 
-            static bool prevSetAsMain = true;
+            QSettings settings;
+            settings.beginGroup("MainWindow");
+            bool prevSetAsMain = settings.value("newsessionforaudio", true).toBool();
+            settings.endGroup();
             bool setAsMain = true;
             
             QStringList items;
             items << tr("Replace the existing main waveform")
                   << tr("Load this file into a new waveform pane");
 
             bool ok = false;
             QString item = ListInputDialog::getItem
                 (this, tr("Select target for import"),
-                 tr("You already have an audio waveform loaded.\nWhat would you like to do with the new audio file?"),
+                 tr("<b>Select a target for import</b><p>You already have an audio waveform loaded.\nWhat would you like to do with the new audio file?"),
                  items, prevSetAsMain ? 0 : 1, &ok);
             
             if (!ok || item.isEmpty()) {
                 delete newModel;
                 m_openingAudioFile = false;
                 return FileOpenCancelled;
             }
             
             setAsMain = (item == items[0]);
-            prevSetAsMain = setAsMain;
+            settings.beginGroup("MainWindow");
+            settings.setValue("newsessionforaudio", setAsMain);
+            settings.endGroup();
 
             if (setAsMain) mode = ReplaceMainModel;
             else mode = CreateAdditionalModel;
 
         } else {

 
     RDFImporter importer
         (QUrl::fromLocalFile(source.getLocalFilename()).toString(), rate);
 
     if (!importer.isOK()) {
+        if (importer.getErrorString() != "") {
+            QMessageBox::critical
+                (this, tr("Failed to import RDF"),
+                 tr("<b>Failed to import RDF</b><p>Importing data from RDF document at \"%1\" failed: %2</p>")
+                 .arg(source.getLocation()).arg(importer.getErrorString()));
+        }
         return FileOpenFailed;
     }
 
     std::vector<Model *> models = importer.getDataModels(&dialog);