changeset 688:a2c308bd5530

Subrepo update
author Chris Cannam
date Wed, 25 Mar 2020 13:26:42 +0000
parents 08680771bf04
children 4bf2fd246c09
files main/MainWindow.cpp main/MainWindow.h repoint-lock.json
diffstat 3 files changed, 27 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/main/MainWindow.cpp	Wed Jan 15 09:58:34 2020 +0000
+++ b/main/MainWindow.cpp	Wed Mar 25 13:26:42 2020 +0000
@@ -1901,7 +1901,7 @@
         return;
     }
 
-    if (!m_abandoning && !checkSaveModified()) {
+    if (!checkSaveModified()) {
 //        cerr << "Ignoring close event" << endl;
         e->ignore();
         return;
@@ -2368,7 +2368,7 @@
 
     } else {
 
-        DataExportOptions options = DataExportOmitLevels;
+        DataExportOptions options = DataExportOmitLevel;
         
         CSVFileWriter writer(path, model.get(),
                              ((suffix == "csv") ? "," : "\t"),
@@ -3198,7 +3198,7 @@
 }
 
 void
-MainWindow::rightButtonMenuRequested(Pane *pane, QPoint position)
+MainWindow::paneRightButtonMenuRequested(Pane *pane, QPoint position)
 {
 //    cerr << "MainWindow::rightButtonMenuRequested(" << pane << ", " << position.x() << ", " << position.y() << ")" << endl;
     m_paneStack->setCurrentPane(pane);
@@ -3206,6 +3206,16 @@
 }
 
 void
+MainWindow::panePropertiesRightButtonMenuRequested(Pane *, QPoint)
+{
+}
+
+void
+MainWindow::layerPropertiesRightButtonMenuRequested(Pane *, Layer *, QPoint)
+{
+}
+
+void
 MainWindow::handleOSCMessage(const OSCMessage &)
 {
     cerr << "MainWindow::handleOSCMessage: Not implemented" << endl;
--- a/main/MainWindow.h	Wed Jan 15 09:58:34 2020 +0000
+++ b/main/MainWindow.h	Wed Mar 25 13:26:42 2020 +0000
@@ -146,7 +146,9 @@
     virtual void modelRegenerationWarning(QString, QString, QString);
     virtual void alignmentFailed(QString);
 
-    virtual void rightButtonMenuRequested(Pane *, QPoint point);
+    virtual void paneRightButtonMenuRequested(Pane *, QPoint point);
+    virtual void panePropertiesRightButtonMenuRequested(Pane *, QPoint point);
+    virtual void layerPropertiesRightButtonMenuRequested(Pane *, Layer *, QPoint point);
 
     virtual void setupRecentFilesMenu();
 
--- a/repoint-lock.json	Wed Jan 15 09:58:34 2020 +0000
+++ b/repoint-lock.json	Wed Mar 25 13:26:42 2020 +0000
@@ -1,25 +1,25 @@
 {
   "libraries": {
     "vamp-plugin-sdk": {
-      "pin": "c42e50a5c297"
+      "pin": "74c5b0bfa108"
     },
     "svcore": {
-      "pin": "ee3b248bda25"
+      "pin": "a4dce53b3353"
     },
     "svgui": {
-      "pin": "76e4302a3fc2"
+      "pin": "01a41a37bd26"
     },
     "svapp": {
-      "pin": "55f317633b93"
+      "pin": "7b1d30af4b38"
     },
     "checker": {
-      "pin": "c8c17e51aab0"
+      "pin": "ef64b3f171d9"
     },
     "piper-vamp-cpp": {
-      "pin": "0e3328c6091f59c912e25bc392a7dc75182be1c7"
+      "pin": "f381235a4ba88eac2fa31fc1f7f613cca9707f63"
     },
     "dataquay": {
-      "pin": "b82360a98f49"
+      "pin": "35098262cadd"
     },
     "bqvec": {
       "pin": "cd235ecbeb31"
@@ -31,7 +31,7 @@
       "pin": "c2fb51b31fe4"
     },
     "bqaudioio": {
-      "pin": "9f275ac85af1"
+      "pin": "4fe94361597f"
     },
     "bqaudiostream": {
       "pin": "a0926b93e771"
@@ -40,13 +40,13 @@
       "pin": "7686116dcdd5"
     },
     "sv-dependency-builds": {
-      "pin": "d0c2a83c1364"
+      "pin": "08ae793730bd"
     },
     "icons/scalable": {
-      "pin": "be45984f7915"
+      "pin": "fd0ace21dce3"
     },
     "pyin": {
-      "pin": "3faac48d491d"
+      "pin": "a7d9c6142f8f"
     },
     "chp": {
       "pin": "de970142809f"