Mercurial > hg > sonic-lineup
changeset 468:ad155cf0bd9f
UI text tweaks, and a small MATCH fix
| author | Chris Cannam |
|---|---|
| date | Fri, 24 Jul 2020 14:35:27 +0100 |
| parents | 6ac890a4e4cf |
| children | e7d373cd97a2 |
| files | main/MainWindow.cpp repoint-lock.json |
| diffstat | 2 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/main/MainWindow.cpp Fri Jul 24 08:57:22 2020 +0100 +++ b/main/MainWindow.cpp Fri Jul 24 14:35:27 2020 +0100 @@ -722,9 +722,9 @@ m_keyReference->registerShortcut(action); menu->addAction(action); - action = new QAction(tr("Show Vertical Scales"), this); + action = new QAction(tr("Show Times and Scales"), this); action->setShortcut(tr("S")); - action->setStatusTip(tr("Show or hide all vertical scales")); + action->setStatusTip(tr("Show or hide centre-line timings and all vertical scales")); connect(action, SIGNAL(triggered()), this, SLOT(toggleVerticalScales())); action->setCheckable(true); action->setChecked(false); @@ -3104,17 +3104,18 @@ if (m_shownAlignmentError) { return; } - + + // Set this before showing the dialog, in case we have more than + // one pending. It will be reset when e.g. alignment type changes + // or new session started. + m_shownAlignmentError = true; + QMessageBox::warning (this, tr("Failed to calculate alignment"), tr("<b>Alignment calculation failed</b><p>Failed to calculate an audio alignment:<p>%1") .arg(message), QMessageBox::Ok); - - m_shownAlignmentError = true; // (will be reset when - // e.g. alignment type changes or - // new session started) } void