MainWindow: Tidied restore_ui_settings

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index a339b19a1b8b3963c59a21a1d075a4493effdb2f..767ab6f31149bd4881b0db163635c86025c08818 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -56,6 +56,7 @@
 #include "view/logicsignal.hpp"
 #include "view/view.hpp"
 #include "widgets/exportmenu.hpp"
 #include "view/logicsignal.hpp"
 #include "view/view.hpp"
 #include "widgets/exportmenu.hpp"

+#include "widgets/importmenu.hpp"

 #ifdef ENABLE_DECODE
 #include "widgets/decodermenu.hpp"
 #endif
 #ifdef ENABLE_DECODE
 #include "widgets/decodermenu.hpp"
 #endif


@@ -253,6 +254,47 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
        dlg->run();
 }
 
        dlg->run();
 }
 

+void MainWindow::import_file(shared_ptr<InputFormat> format)
+{
+       assert(format);
+
+       QSettings settings;
+       const QString dir = settings.value(SettingOpenDirectory).toString();
+
+       // Construct the filter
+       const vector<string> exts = format->extensions();
+       const QString filter = exts.empty() ? "" :
+               tr("%1 files (*.%2)").arg(
+                       QString::fromStdString(format->description())).arg(
+                       QString::fromStdString(join(exts, ", *.")));
+
+       // Show the file dialog
+       const QString file_name = QFileDialog::getOpenFileName(
+               this, tr("Import File"), dir, tr(
+                       "%1 files (*.*);;All Files (*.*)").arg(
+                       QString::fromStdString(format->description())));
+
+       if (file_name.isEmpty())
+               return;
+
+       // 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()
 {
        setObjectName(QString::fromUtf8("MainWindow"));
 void MainWindow::setup_ui()
 {
        setObjectName(QString::fromUtf8("MainWindow"));


@@ -305,6 +347,14 @@ void MainWindow::setup_ui()
                this, SLOT(export_file(std::shared_ptr<sigrok::OutputFormat>)));
        menu_file->addAction(menu_file_export->menuAction());
 
                this, SLOT(export_file(std::shared_ptr<sigrok::OutputFormat>)));
        menu_file->addAction(menu_file_export->menuAction());
 

+       widgets::ImportMenu *menu_file_import = new widgets::ImportMenu(this,
+               device_manager_.context());
+       menu_file_import->setTitle(tr("&Import"));
+       connect(menu_file_import,
+               SIGNAL(format_selected(std::shared_ptr<sigrok::InputFormat>)),
+               this, SLOT(import_file(std::shared_ptr<sigrok::InputFormat>)));
+       menu_file->addAction(menu_file_import->menuAction());
+

        menu_file->addSeparator();
 
        action_connect_->setText(tr("&Connect to Device..."));
        menu_file->addSeparator();
 
        action_connect_->setText(tr("&Connect to Device..."));


@@ -459,7 +509,6 @@ void MainWindow::restore_ui_settings()
 
        map<string, string> dev_info;
        list<string> key_list;
 
        map<string, string> dev_info;
        list<string> key_list;

-       string value;

 
        settings.beginGroup("MainWindow");
 
 
        settings.beginGroup("MainWindow");
 


@@ -480,12 +529,12 @@ void MainWindow::restore_ui_settings()
        key_list.push_back("connection_id");
 
        for (string key : key_list) {
        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;
 
                        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));
        }
 
                        dev_info.insert(std::make_pair(key, value));
        }