Move the "new session" button to the main window's tab area

[pulseview.git] / pv / toolbars / mainbar.cpp

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index ea36a77e90957609158017775c9a01bfae694247..f928de5166afe46063be9ccaf6215063961d3689 100644 (file)
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -89,7 +89,6 @@ const char *MainBar::SettingSaveDirectory = "MainWindow/SaveDirectory";
 
 MainBar::MainBar(Session &session, MainWindow &main_window) :
        QToolBar("Sampling Bar", &main_window),
-       action_new_session_(new QAction(this)),
        action_new_view_(new QAction(this)),
        action_open_(new QAction(this)),
        action_save_as_(new QAction(this)),
@@ -128,12 +127,6 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
        setContextMenuPolicy(Qt::PreventContextMenu);
 
        // Actions
-       action_new_session_->setText(tr("New &Session"));
-       action_new_session_->setIcon(QIcon::fromTheme("document-new",
-               QIcon(":/icons/document-new.png")));
-       connect(action_new_session_, SIGNAL(triggered(bool)),
-               this, SLOT(on_actionNewSession_triggered()));
-
        action_new_view_->setText(tr("New &View"));
        action_new_view_->setIcon(QIcon::fromTheme("window-new",
                QIcon(":/icons/window-new.png")));
@@ -268,7 +261,6 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 #endif
 
        // Setup the toolbar
-       addAction(action_new_session_);
        addAction(action_new_view_);
        addSeparator();
        addWidget(open_button);
@@ -957,11 +949,6 @@ void MainBar::on_config_changed()
        commit_sample_rate();   
 }
 
-void MainBar::on_actionNewSession_triggered()
-{
-       new_session();
-}
-
 void MainBar::on_actionNewView_triggered()
 {
        new_view(&session_);