Mercurial > hg > sonic-visualiser
changeset 2040:d5296c91a0ff zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Fri, 12 Oct 2018 11:14:16 +0100 |
parents | 262c656ec78f (current diff) d70122abd746 (diff) |
children | 214ee4c2bc61 |
files | main/MainWindow.cpp repoint-lock.json |
diffstat | 3 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/main/MainWindow.cpp Mon Oct 01 15:49:32 2018 +0100 +++ b/main/MainWindow.cpp Fri Oct 12 11:14:16 2018 +0100 @@ -3580,16 +3580,16 @@ void MainWindow::closeEvent(QCloseEvent *e) { -// cerr << "MainWindow::closeEvent" << endl; + SVDEBUG << "MainWindow::closeEvent" << endl; if (m_openingAudioFile) { -// cerr << "Busy - ignoring close event" << endl; + SVCERR << "Busy - ignoring close event" << endl; e->ignore(); return; } if (!m_abandoning && !checkSaveModified()) { -// cerr << "Close refused by user - ignoring close event" << endl; + SVCERR << "Close refused by user - ignoring close event" << endl; e->ignore(); return; }
--- a/repoint-lock.json Mon Oct 01 15:49:32 2018 +0100 +++ b/repoint-lock.json Fri Oct 12 11:14:16 2018 +0100 @@ -4,22 +4,22 @@ "pin": "da86fb0bccb3" }, "svcore": { - "pin": "32400727bcbd" + "pin": "2fec0d9bd7ac" }, "svgui": { - "pin": "615eb28768ca" + "pin": "e848ea0850fe" }, "svapp": { "pin": "15a566f26114" }, "checker": { - "pin": "2e8a5f665a07" + "pin": "51a8fe0a03cf" }, "piper": { "pin": "f5a04ffe4d5a0ae01e77018a86a59b48a425e674" }, "piper-cpp": { - "pin": "44cb74e186a703e7e6ce403aa295913a87b88d62" + "pin": "d95826b8f0a6022f50ec18a06d642dd25f76ee8c" }, "dataquay": { "pin": "807b55408d9e" @@ -40,7 +40,7 @@ "pin": "f1a9b270e043" }, "icons/scalable": { - "pin": "1c6516ba7fc1" + "pin": "6ef774507a98" } } }
--- a/sonic-visualiser.qrc Mon Oct 01 15:49:32 2018 +0100 +++ b/sonic-visualiser.qrc Fri Oct 12 11:14:16 2018 +0100 @@ -1,6 +1,7 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> <file>icons/scalable/align.svg</file> + <file>icons/scalable/cancel.svg</file> <file>icons/scalable/colour3d.svg</file> <file>icons/scalable/cross.svg</file> <file>icons/scalable/datadelete.svg</file>