Use QApplication metadata for persistent storage

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 1f683f19ecd2a8efc2d7f022776568c4aac47194..c3747e0256f945f81ce94fa5298ad7ce4c0c2904 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -30,6 +30,7 @@
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
+#include <QCloseEvent>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QMenu>
@@ -81,6 +82,7 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        _session(device_manager)
 {
        setup_ui();
+       restore_ui_settings();
        if (open_file_name) {
                const QString s(QString::fromUtf8(open_file_name));
                QMetaObject::invokeMethod(this, "load_file",
@@ -93,8 +95,6 @@ void MainWindow::setup_ui()
 {
        setObjectName(QString::fromUtf8("MainWindow"));
 
-       resize(1024, 768);
-
        // Set the window icon
        QIcon icon;
        icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"),
@@ -240,6 +240,7 @@ void MainWindow::setup_ui()
 
        // Setup the toolbar
        QToolBar *const toolbar = new QToolBar(tr("Main Toolbar"), this);
+       toolbar->setObjectName(QString::fromUtf8("MainToolbar"));
        toolbar->addAction(action_open);
        toolbar->addAction(action_save_as);
        toolbar->addSeparator();
@@ -268,6 +269,31 @@ void MainWindow::setup_ui()
 
 }
 
+void MainWindow::save_ui_settings()
+{
+       QSettings settings;
+
+       settings.beginGroup("MainWindow");
+       settings.setValue("state", saveState());
+       settings.setValue("geometry", saveGeometry());
+       settings.endGroup();
+}
+
+void MainWindow::restore_ui_settings()
+{
+       QSettings settings;
+
+       settings.beginGroup("MainWindow");
+
+       if (settings.contains("geometry")) {
+               restoreGeometry(settings.value("geometry").toByteArray());
+               restoreState(settings.value("state").toByteArray());
+       } else
+               resize(1000, 720);
+
+       settings.endGroup();
+}
+
 void MainWindow::session_error(
        const QString text, const QString info_text)
 {
@@ -282,6 +308,10 @@ void MainWindow::update_device_list()
 
        shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
        list< shared_ptr<device::DevInst> > devices;
+
+       if (_device_manager.devices().size() == 0)
+               return;
+
        std::copy(_device_manager.devices().begin(),
                _device_manager.devices().end(), std::back_inserter(devices));
 
@@ -293,6 +323,12 @@ void MainWindow::update_device_list()
        _sampling_bar->set_device_list(devices, selected_device);
 }
 
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+       save_ui_settings();
+       event->accept();
+}
+
 void MainWindow::load_file(QString file_name)
 {
        const QString errorMessage(