From 53d45c5577e17f39dbd5b4e61e00122f6c4f689c Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Wed, 21 Jan 2015 21:48:19 -0500 Subject: [PATCH] MainWindow: Added import options dialog --- pv/mainwindow.cpp | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index e48df54..3480d8c 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -274,12 +274,25 @@ void MainWindow::import_file(shared_ptr format) "%1 files (*.*);;All Files (*.*)").arg( QString::fromStdString(format->description()))); - if (!file_name.isEmpty()) { - load_file(file_name, format); + if (file_name.isEmpty()) + return; - const QString abs_path = QFileInfo(file_name).absolutePath(); - settings.setValue(SettingOpenDirectory, abs_path); + // Show the options dialog + map options; + if (!format->options().empty()) { + dialogs::InputOutputOptions dlg( + tr("Import %1").arg(QString::fromStdString( + format->description())), + format->options(), this); + if (!dlg.exec()) + return; + options = dlg.options(); } + + load_file(file_name, format, options); + + const QString abs_path = QFileInfo(file_name).absolutePath(); + settings.setValue(SettingOpenDirectory, abs_path); } void MainWindow::setup_ui() -- 2.30.2