comparison main/MainWindow.cpp @ 1151:e0aa911e1a8a 3.0-integration

Update subrepos
author Chris Cannam
date Fri, 22 Apr 2016 11:15:46 +0100
parents b3b5885e7c2c
children 2ebb6b52388a
comparison
equal deleted inserted replaced
1149:3ba5bee2ace0 1151:e0aa911e1a8a
4434 QMessageBox::warning 4434 QMessageBox::warning
4435 (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); 4435 (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);
4436 } 4436 }
4437 4437
4438 void 4438 void
4439 MainWindow::alignmentFailed(QString transformName, QString message) 4439 MainWindow::alignmentFailed(QString message)
4440 { 4440 {
4441 emit hideSplash();
4442
4443 QMessageBox::warning 4441 QMessageBox::warning
4444 (this, 4442 (this,
4445 tr("Failed to calculate alignment"), 4443 tr("Failed to calculate alignment"),
4446 tr("<b>Alignment calculation failed</b><p>Failed to calculate an audio alignment using transform \"%1\":<p>%2") 4444 tr("<b>Alignment calculation failed</b><p>Failed to calculate an audio alignment:<p>%1")
4447 .arg(transformName).arg(message), 4445 .arg(message),
4448 QMessageBox::Ok); 4446 QMessageBox::Ok);
4449 } 4447 }
4450 4448
4451 void 4449 void
4452 MainWindow::rightButtonMenuRequested(Pane *pane, QPoint position) 4450 MainWindow::rightButtonMenuRequested(Pane *pane, QPoint position)