Add -s / --settings parameter to load a session setup file

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 43d1e7d2607dbf2ab9a95377f806eed9d8c0640c..638d75b5179fbb63c2e0151d6c6d09ff215b95c5 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -313,6 +313,9 @@ shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
        if (v->has_toolbar())
                dock_main->addToolBar(v->create_toolbar(dock_main));
 
        if (v->has_toolbar())
                dock_main->addToolBar(v->create_toolbar(dock_main));
 

+       if (v->minimum_width() > 0)
+               dock->setMinimumSize(v->minimum_width(), 0);
+

        return v;
 }
 
        return v;
 }
 


@@ -396,10 +399,13 @@ void MainWindow::remove_session(shared_ptr<Session> session)
 }
 
 void MainWindow::add_session_with_file(string open_file_name,
 }
 
 void MainWindow::add_session_with_file(string open_file_name,

-       string open_file_format)
+       string open_file_format,
+       string open_setup_file_name)

 {
        shared_ptr<Session> session = add_session();
 {
        shared_ptr<Session> session = add_session();

-       session->load_init_file(open_file_name, open_file_format);
+       session->load_init_file(open_file_name,
+               open_file_format,
+               open_setup_file_name);

 }
 
 void MainWindow::add_default_session()
 }
 
 void MainWindow::add_default_session()