MainBar: Correct event handler name

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 1738f9b16cfea0adfcfa65d6018c0bbffab68bf4..a47089620c6c1239f2adc5a565d8346bbec007f3 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -44,6 +44,7 @@
 #include "dialogs/about.hpp"
 #include "toolbars/mainbar.hpp"
 #include "view/view.hpp"
+#include "views/trace/standardbar.hpp"
 
 #include <stdint.h>
 #include <stdarg.h>
@@ -87,7 +88,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 +108,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);
        }
 }
 
@@ -205,17 +205,23 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
                        shared_ptr<MainBar> main_bar = session.main_bar();
                        if (!main_bar) {
-                               main_bar = make_shared<MainBar>(session, *this);
+                               /* Initial view, create the main bar */
+                               main_bar = make_shared<MainBar>(session, this, v.get());
                                dock_main->addToolBar(main_bar.get());
                                session.set_main_bar(main_bar);
 
                                connect(main_bar.get(), SIGNAL(new_view(Session*)),
                                        this, SLOT(on_new_view(Session*)));
-                       }
-                       main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
 
-                       connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)),
-                               main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool)));
+                               main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+                       } else {
+                               /* Additional view, create a standard bar */
+                               pv::views::trace::StandardBar *standard_bar =
+                                       new pv::views::trace::StandardBar(session, this, v.get());
+                               dock_main->addToolBar(standard_bar);
+
+                               standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+                       }
                }
 
                return v;