comparison main/MainWindow.cpp @ 688:a2c308bd5530

Subrepo update
author Chris Cannam
date Wed, 25 Mar 2020 13:26:42 +0000
parents a8f913f79bd7
children bae63907ff02
comparison
equal deleted inserted replaced
687:08680771bf04 688:a2c308bd5530
1899 // cerr << "Busy - ignoring close event" << endl; 1899 // cerr << "Busy - ignoring close event" << endl;
1900 e->ignore(); 1900 e->ignore();
1901 return; 1901 return;
1902 } 1902 }
1903 1903
1904 if (!m_abandoning && !checkSaveModified()) { 1904 if (!checkSaveModified()) {
1905 // cerr << "Ignoring close event" << endl; 1905 // cerr << "Ignoring close event" << endl;
1906 e->ignore(); 1906 e->ignore();
1907 return; 1907 return;
1908 } 1908 }
1909 1909
2366 error = exporter.getError(); 2366 error = exporter.getError();
2367 } 2367 }
2368 2368
2369 } else { 2369 } else {
2370 2370
2371 DataExportOptions options = DataExportOmitLevels; 2371 DataExportOptions options = DataExportOmitLevel;
2372 2372
2373 CSVFileWriter writer(path, model.get(), 2373 CSVFileWriter writer(path, model.get(),
2374 ((suffix == "csv") ? "," : "\t"), 2374 ((suffix == "csv") ? "," : "\t"),
2375 options); 2375 options);
2376 writer.write(); 2376 writer.write();
3196 .arg(message), 3196 .arg(message),
3197 QMessageBox::Ok); 3197 QMessageBox::Ok);
3198 } 3198 }
3199 3199
3200 void 3200 void
3201 MainWindow::rightButtonMenuRequested(Pane *pane, QPoint position) 3201 MainWindow::paneRightButtonMenuRequested(Pane *pane, QPoint position)
3202 { 3202 {
3203 // cerr << "MainWindow::rightButtonMenuRequested(" << pane << ", " << position.x() << ", " << position.y() << ")" << endl; 3203 // cerr << "MainWindow::rightButtonMenuRequested(" << pane << ", " << position.x() << ", " << position.y() << ")" << endl;
3204 m_paneStack->setCurrentPane(pane); 3204 m_paneStack->setCurrentPane(pane);
3205 m_rightButtonMenu->popup(position); 3205 m_rightButtonMenu->popup(position);
3206 }
3207
3208 void
3209 MainWindow::panePropertiesRightButtonMenuRequested(Pane *, QPoint)
3210 {
3211 }
3212
3213 void
3214 MainWindow::layerPropertiesRightButtonMenuRequested(Pane *, Layer *, QPoint)
3215 {
3206 } 3216 }
3207 3217
3208 void 3218 void
3209 MainWindow::handleOSCMessage(const OSCMessage &) 3219 MainWindow::handleOSCMessage(const OSCMessage &)
3210 { 3220 {