comparison main/MainWindow.cpp @ 247:587c79827c69

* (failed) attempt to hide splash screen when error occurs on startup

 {
     QString path = getOpenFileName(FileFinder::AudioFile);
 
     if (path != "") {
 	if (openAudio(path, ReplaceMainModel) == FileOpenFailed) {
+            emit hideSplash();
 	    QMessageBox::critical(this, tr("Failed to open file"),
 				  tr("<b>File open failed</b><p>Audio file \"%1\" could not be opened").arg(path));
 	}
     }
 }

 {
     QString path = getOpenFileName(FileFinder::AudioFile);
 
     if (path != "") {
 	if (openAudio(path, CreateAdditionalModel) == FileOpenFailed) {
+            emit hideSplash();
 	    QMessageBox::critical(this, tr("Failed to open file"),
 				  tr("<b>File open failed</b><p>Audio file \"%1\" could not be opened").arg(path));
 	}
     }
 }

     if (path != "") {
 
         FileOpenStatus status = openLayer(path);
         
         if (status == FileOpenFailed) {
+            emit hideSplash();
             QMessageBox::critical(this, tr("Failed to open file"),
                                   tr("<b>File open failed</b><p>Layer file %1 could not be opened.").arg(path));
             return;
         } else if (status == FileOpenWrongMode) {
+            emit hideSplash();
             QMessageBox::critical(this, tr("Failed to open file"),
                                   tr("<b>Audio required</b><p>Please load at least one audio file before importing annotation data"));
         }
     }
 }

     QString path = getOpenFileName(FileFinder::SessionFile);
 
     if (path.isEmpty()) return;
 
     if (openSessionFile(path) == FileOpenFailed) {
+        emit hideSplash();
 	QMessageBox::critical(this, tr("Failed to open file"),
 			      tr("<b>File open failed</b><p>Session file \"%1\" could not be opened").arg(path));
     }
 }
 

     if (path.isEmpty()) return;
 
     FileOpenStatus status = open(path, AskUser);
 
     if (status == FileOpenFailed) {
+        emit hideSplash();
         QMessageBox::critical(this, tr("Failed to open file"),
                               tr("<b>File open failed</b><p>File \"%1\" could not be opened").arg(path));
     } else if (status == FileOpenWrongMode) {
+        emit hideSplash();
         QMessageBox::critical(this, tr("Failed to open file"),
                               tr("<b>Audio required</b><p>Please load at least one audio file before importing annotation data"));
     }
 }
 

     if (text.isEmpty()) return;
 
     FileOpenStatus status = open(text);
 
     if (status == FileOpenFailed) {
+        emit hideSplash();
         QMessageBox::critical(this, tr("Failed to open location"),
                               tr("<b>Open failed</b><p>URL \"%1\" could not be opened").arg(text));
     } else if (status == FileOpenWrongMode) {
+        emit hideSplash();
         QMessageBox::critical(this, tr("Failed to open location"),
                               tr("<b>Audio required</b><p>Please load at least one audio file before importing annotation data"));
     }
 }
 

     if (path == "") return;
 
     FileOpenStatus status = open(path);
 
     if (status == FileOpenFailed) {
+        emit hideSplash();
         QMessageBox::critical(this, tr("Failed to open location"),
                               tr("<b>Open failed</b><p>File or URL \"%1\" could not be opened").arg(path));
     } else if (status == FileOpenWrongMode) {
+        emit hideSplash();
         QMessageBox::critical(this, tr("Failed to open location"),
                               tr("<b>Audio required</b><p>Please load at least one audio file before importing annotation data"));
     }
 }
 

     for (QStringList::iterator i = uriList.begin(); i != uriList.end(); ++i) {
 
         FileOpenStatus status = open(*i, ReplaceCurrentPane);
 
         if (status == FileOpenFailed) {
+            emit hideSplash();
             QMessageBox::critical(this, tr("Failed to open dropped URL"),
                                   tr("<b>Open failed</b><p>Dropped URL \"%1\" could not be opened").arg(*i));
         } else if (status == FileOpenWrongMode) {
+            emit hideSplash();
             QMessageBox::critical(this, tr("Failed to open dropped URL"),
                                   tr("<b>Audio required</b><p>Please load at least one audio file before importing annotation data"));
         }
     }
 }

     // Called before some destructive operation (e.g. new session,
     // exit program).  Return true if we can safely proceed, false to
     // cancel.
 
     if (!m_documentModified) return true;
+
+    emit hideSplash();
 
     int button = 
 	QMessageBox::warning(this,
 			     tr("Session modified"),
 			     tr("<b>Session modified</b><p>The current session has been modified.<br>Do you want to save it?"),

 void
 MainWindow::sampleRateMismatch(size_t requested, size_t actual,
                                bool willResample)
 {
     if (!willResample) {
+        emit hideSplash();
         QMessageBox::information
             (this, tr("Sample rate mismatch"),
              tr("<b>Wrong sample rate</b><p>The sample rate of this audio file (%1 Hz) does not match\nthe current playback rate (%2 Hz).<p>The file will play at the wrong speed and pitch.<p>Change the <i>Resample mismatching files on import</i> option under <i>File</i> -> <i>Preferences</i> if you want to alter this behaviour.")
              .arg(requested).arg(actual));
     }        

 }
 
 void
 MainWindow::modelGenerationFailed(QString transformName, QString message)
 {
+    emit hideSplash();
+
     if (message != "") {
 
         QMessageBox::warning
             (this,
              tr("Failed to generate layer"),

 }
 
 void
 MainWindow::modelGenerationWarning(QString transformName, QString message)
 {
+    emit hideSplash();
+
     QMessageBox::warning
         (this, tr("Warning"), message, QMessageBox::Ok);
 }
 
 void
 MainWindow::modelRegenerationFailed(QString layerName,
                                     QString transformName, QString message)
 {
+    emit hideSplash();
+
     if (message != "") {
 
         QMessageBox::warning
             (this,
              tr("Failed to regenerate layer"),

 
 void
 MainWindow::modelRegenerationWarning(QString layerName,
                                      QString transformName, QString message)
 {
+    emit hideSplash();
+
     QMessageBox::warning
         (this, tr("Warning"), tr("<b>Warning when regenerating layer</b><p>When regenerating the derived layer \"%1\" using new data model as input:<p>%2").arg(layerName).arg(message), QMessageBox::Ok);
 }
 
 void
 MainWindow::alignmentFailed(QString transformName, QString message)
 {
+    emit hideSplash();
+
     QMessageBox::warning
         (this,
          tr("Failed to calculate alignment"),
          tr("<b>Alignment calculation failed</b><p>Failed to calculate an audio alignment using transform \"%1\":<p>%2")
          .arg(transformName).arg(message),