diff view/View.cpp @ 1485:0e971e3d93e2 by-id

Tidy; also don't show cancel buttons for alignments

--- a/view/View.cpp	Wed Jul 17 11:20:08 2019 +0100
+++ b/view/View.cpp	Wed Jul 17 13:12:56 2019 +0100
@@ -1747,7 +1747,6 @@
 
     QSettings settings;
     settings.beginGroup("View");
-    //!!! perhaps alignments in general should not be cancellable?
     bool showCancelButton = settings.value("showcancelbuttons", true).toBool();
     settings.endGroup();
     
@@ -1808,8 +1807,14 @@
                     (model && 
                      (wfm = ModelById::getAs<RangeSummarisableTimeValueModel>
                       (model->getSourceModel())))) {
+
                     completion = wfm->getAlignmentCompletion();
 
+                    // We don't allow cancelling alignment operations
+                    // - they aren't usually all that expensive, and
+                    // it would leave things in a very uncertain state
+                    showCancelButton = false;
+
 #ifdef DEBUG_PROGRESS_STUFF
                     SVCERR << "View[" << this << "]::checkProgress(" << object << "): "
                            << "alignment completion = " << completion << endl;