Moved default device selection into MainWindow

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index e48df546613a308b9e1374df3ea197be56fc71c5..eb567af8dfe077d4954ffe6613333e7bb2f61da2 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -194,7 +194,10 @@ void MainWindow::run_stop()
 void MainWindow::select_device(shared_ptr<devices::Device> device)
 {
        try {
-               session_.set_device(device);
+               if (device)
+                       session_.set_device(device);
+               else
+                       session_.set_default_device();
        } catch(const QString &e) {
                QMessageBox msg(this);
                msg.setText(e);
@@ -274,12 +277,25 @@ void MainWindow::import_file(shared_ptr<InputFormat> 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<string, Glib::VariantBase> 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()
@@ -496,7 +512,6 @@ void MainWindow::restore_ui_settings()
 
        map<string, string> dev_info;
        list<string> key_list;
-       string value;
 
        settings.beginGroup("MainWindow");
 
@@ -517,21 +532,19 @@ void MainWindow::restore_ui_settings()
        key_list.push_back("connection_id");
 
        for (string key : key_list) {
-               if (!settings.contains(QString::fromUtf8(key.c_str())))
+               const QString k = QString::fromStdString(key);
+               if (!settings.contains(k))
                        continue;
 
-               value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString();
-
-               if (value.size() > 0)
+               const string value = settings.value(k).toString().toStdString();
+               if (!value.empty())
                        dev_info.insert(std::make_pair(key, value));
        }
 
        const shared_ptr<devices::HardwareDevice> device =
                device_manager_.find_device_from_info(dev_info);
-       if (device) {
-               select_device(device);
-               update_device_list();
-       }
+       select_device(device);
+       update_device_list();
 
        settings.endGroup();
 }