From 86df6052f18ee13c0a28312e31ed13ec43462bdd Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Wed, 15 Jul 2015 22:16:09 -0400 Subject: [PATCH 1/2] Changed save dialogs to be non-native. Some idiots decided not to automatically add file extensions but only on linux. OSX and Windows did the sane thing. But, to be consistent all use the non-native dialog now. --- mainwindow.cpp | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 8eae94f..14ad914 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -479,16 +479,32 @@ void MainWindow::handleSaveFile() dialog.setNameFilters(filters); dialog.setViewMode(QFileDialog::Detail); dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setOption(QFileDialog::DontUseNativeDialog); if (dialog.exec() == QDialog::Accepted) { - const QVector *frames = model->getListReference(); + const QVector *frames = model->getListReference(); filename = dialog.selectedFiles()[0]; - if (dialog.selectedNameFilter() == filters[0]) result = FrameFileIO::saveCRTDFile(filename, frames); - if (dialog.selectedNameFilter() == filters[1]) result = FrameFileIO::saveNativeCSVFile(filename, frames); - if (dialog.selectedNameFilter() == filters[2]) result = FrameFileIO::saveGenericCSVFile(filename, frames); - if (dialog.selectedNameFilter() == filters[3]) result = FrameFileIO::saveLogFile(filename, frames); - if (dialog.selectedNameFilter() == filters[4]) result = FrameFileIO::saveMicrochipFile(filename, frames); + if (dialog.selectedNameFilter() == filters[0]) + { + result = FrameFileIO::saveCRTDFile(filename, frames); + } + if (dialog.selectedNameFilter() == filters[1]) + { + result = FrameFileIO::saveNativeCSVFile(filename, frames); + } + if (dialog.selectedNameFilter() == filters[2]) + { + result = FrameFileIO::saveGenericCSVFile(filename, frames); + } + if (dialog.selectedNameFilter() == filters[3]) + { + result = FrameFileIO::saveLogFile(filename, frames); + } + if (dialog.selectedNameFilter() == filters[4]) + { + result = FrameFileIO::saveMicrochipFile(filename, frames); + } if (result) { QStringList fileList = filename.split('/'); @@ -515,6 +531,7 @@ void MainWindow::handleSaveFilteredFile() dialog.setNameFilters(filters); dialog.setViewMode(QFileDialog::Detail); dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setOption(QFileDialog::DontUseNativeDialog); if (dialog.exec() == QDialog::Accepted) { From eb5c606c9208c4922e54cfee7d97fa4dd1ff29df Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Wed, 15 Jul 2015 22:22:08 -0400 Subject: [PATCH 2/2] More use of non-native save dialogs. This should be all the rest of them. --- flowviewwindow.cpp | 2 ++ graphingwindow.cpp | 2 ++ mainwindow.cpp | 3 +++ 3 files changed, 7 insertions(+) diff --git a/flowviewwindow.cpp b/flowviewwindow.cpp index 92414c6..68093b6 100644 --- a/flowviewwindow.cpp +++ b/flowviewwindow.cpp @@ -176,6 +176,7 @@ void FlowViewWindow::saveFileGraph() dialog.setNameFilters(filters); dialog.setViewMode(QFileDialog::Detail); dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setOption(QFileDialog::DontUseNativeDialog); if (dialog.exec() == QDialog::Accepted) { @@ -200,6 +201,7 @@ void FlowViewWindow::saveFileFlow() dialog.setNameFilters(filters); dialog.setViewMode(QFileDialog::Detail); dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setOption(QFileDialog::DontUseNativeDialog); if (dialog.exec() == QDialog::Accepted) { diff --git a/graphingwindow.cpp b/graphingwindow.cpp index 6ec190f..c2bb3a5 100644 --- a/graphingwindow.cpp +++ b/graphingwindow.cpp @@ -345,6 +345,7 @@ void GraphingWindow::saveGraphs() dialog.setNameFilters(filters); dialog.setViewMode(QFileDialog::Detail); dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setOption(QFileDialog::DontUseNativeDialog); if (dialog.exec() == QDialog::Accepted) { @@ -368,6 +369,7 @@ void GraphingWindow::saveDefinitions() dialog.setNameFilters(filters); dialog.setViewMode(QFileDialog::Detail); dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setOption(QFileDialog::DontUseNativeDialog); if (dialog.exec() == QDialog::Accepted) { diff --git a/mainwindow.cpp b/mainwindow.cpp index 14ad914..6680b22 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -564,6 +564,7 @@ void MainWindow::handleSaveFilters() dialog.setNameFilters(filters); dialog.setViewMode(QFileDialog::Detail); dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setOption(QFileDialog::DontUseNativeDialog); if (dialog.exec() == QDialog::Accepted) { @@ -627,6 +628,7 @@ void MainWindow::handleSaveDBC() dialog.setNameFilters(filters); dialog.setViewMode(QFileDialog::Detail); dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setOption(QFileDialog::DontUseNativeDialog); if (dialog.exec() == QDialog::Accepted) { @@ -650,6 +652,7 @@ void MainWindow::handleSaveDecoded() dialog.setNameFilters(filters); dialog.setViewMode(QFileDialog::Detail); dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setOption(QFileDialog::DontUseNativeDialog); if (dialog.exec() == QDialog::Accepted) {