X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=a47089620c6c1239f2adc5a565d8346bbec007f3;hb=dfe1bf82619704af27e4cbf83b75c6b5f367f425;hp=f777bfd6ca932da01450ef000c2e3aad0bd1a7cf;hpb=fd22c71c1a9cc470b53c71c0ee131a4b2d645f80;p=pulseview.git diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index f777bfd..a470896 100644 --- 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 #include @@ -204,17 +205,23 @@ shared_ptr MainWindow::add_view(const QString &title, shared_ptr main_bar = session.main_bar(); if (!main_bar) { - main_bar = make_shared(session, *this); + /* Initial view, create the main bar */ + main_bar = make_shared(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;