Move file loading from MainBar to Session

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index f0840bca8372c445d7851e0245c67c5397820bf2..f777bfd6ca932da01450ef000c2e3aad0bd1a7cf 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -87,7 +87,7 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 
        if (!open_file_name.empty()) {
                shared_ptr<Session> session = add_session();
-               session->main_bar()->load_init_file(open_file_name, open_file_format);
+               session->load_init_file(open_file_name, open_file_format);
        }
 
        // Add empty default session if there aren't any sessions
@@ -107,8 +107,7 @@ MainWindow::MainWindow(DeviceManager &device_manager,
                }
 
                // ...and if there isn't any, just use demo then
-               session->main_bar()->select_device(other_device ?
-                       other_device : demo_device);
+               session->select_device(other_device ? other_device : demo_device);
        }
 }
 
@@ -346,14 +345,23 @@ void MainWindow::setup_ui()
        run_stop_button_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
        run_stop_button_->setShortcut(QKeySequence(Qt::Key_Space));
 
-       QFrame *separator = new QFrame();
-       separator->setFrameStyle(QFrame::VLine | QFrame::Raised);
+       settings_button_ = new QToolButton();
+       settings_button_->setIcon(QIcon::fromTheme("configure",
+               QIcon(":/icons/configure.png")));
+       settings_button_->setAutoRaise(true);
+
+       QFrame *separator1 = new QFrame();
+       separator1->setFrameStyle(QFrame::VLine | QFrame::Raised);
+       QFrame *separator2 = new QFrame();
+       separator2->setFrameStyle(QFrame::VLine | QFrame::Raised);
 
        QHBoxLayout* layout = new QHBoxLayout();
        layout->setContentsMargins(2, 2, 2, 2);
        layout->addWidget(new_session_button_);
-       layout->addWidget(separator);
+       layout->addWidget(separator1);
        layout->addWidget(run_stop_button_);
+       layout->addWidget(separator2);
+       layout->addWidget(settings_button_);
 
        static_tab_widget_ = new QWidget();
        static_tab_widget_->setLayout(layout);
@@ -569,6 +577,14 @@ void MainWindow::on_session_name_changed()
                        }
        }
 
+       // Update the tab widget by finding the main window and the tab from that
+       for (auto entry : session_windows_)
+               if (entry.first.get() == session) {
+                       QMainWindow *window = entry.second;
+                       const int index = session_selector_.indexOf(window);
+                       session_selector_.setTabText(index, session->name());
+               }
+
        // Refresh window title if the affected session has focus
        if (session == last_focused_session_.get())
                setWindowTitle(session->name() + " - " + WindowTitle);