X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=3836b09a78786516ce66514337f40e5e3517425f;hb=4b97fe09c7815411483d4682d62572092d70f8a6;hp=85e55fb3b17aa3194ae481c0b5fde9a1f1c20ceb;hpb=97378470ded88af84edaa0f1063d10d834475665;p=pulseview.git

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 85e55fb3..3836b09a 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -95,6 +95,7 @@ MainBar::MainBar(Session &session, QWidget *parent, pv::views::trace::View *view
 	action_restore_setup_(new QAction(this)),
 	action_save_setup_(new QAction(this)),
 	action_connect_(new QAction(this)),
+	new_view_button_(new QToolButton()),
 	open_button_(new QToolButton()),
 	save_button_(new QToolButton()),
 	device_selector_(parent, session.device_manager(), action_connect_),
@@ -167,6 +168,20 @@ MainBar::MainBar(Session &session, QWidget *parent, pv::views::trace::View *view
 	connect(action_connect_, SIGNAL(triggered(bool)),
 		this, SLOT(on_actionConnect_triggered()));
 
+	// New view button
+	QMenu *menu_new_view = new QMenu();
+	connect(menu_new_view, SIGNAL(triggered(QAction*)),
+		this, SLOT(on_actionNewView_triggered(QAction*)));
+
+	for (int i = 0; i < views::ViewTypeCount; i++) {
+		QAction *const action =	menu_new_view->addAction(tr(views::ViewTypeNames[i]));
+		action->setData(qVariantFromValue(i));
+	}
+
+	new_view_button_->setMenu(menu_new_view);
+	new_view_button_->setDefaultAction(action_new_view_);
+	new_view_button_->setPopupMode(QToolButton::MenuButtonPopup);
+
 	// Open button
 	vector<QAction*> open_actions;
 	open_actions.push_back(action_open_);
@@ -705,7 +720,7 @@ void MainBar::import_file(shared_ptr<InputFormat> format)
 		options = dlg.options();
 	}
 
-	session_.load_file(file_name, format, options);
+	session_.load_file(file_name, "", format, options);
 
 	const QString abs_path = QFileInfo(file_name).absolutePath();
 	settings.setValue(SettingOpenDirectory, abs_path);
@@ -754,9 +769,13 @@ void MainBar::on_config_changed()
 	commit_sample_rate();
 }
 
-void MainBar::on_actionNewView_triggered()
+void MainBar::on_actionNewView_triggered(QAction* action)
 {
-	new_view(&session_);
+	if (action)
+		new_view(&session_, action->data().toInt());
+	else
+		// When the icon of the button is clicked, we create a trace view
+		new_view(&session_, views::ViewTypeTrace);
 }
 
 void MainBar::on_actionOpen_triggered()
@@ -844,7 +863,7 @@ void MainBar::on_add_decoder_clicked()
 
 void MainBar::add_toolbar_widgets()
 {
-	addAction(action_new_view_);
+	addWidget(new_view_button_);
 	addSeparator();
 	addWidget(open_button_);
 	addWidget(save_button_);