X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=a7998b4046511077502a4971bdfa7bc55d3e21d0;hb=6381b375ae391a79ab50f1f5dcbe0014ff9bd46c;hp=666c28d3049f7bd6b8a9ff7ccc35dc902b69814b;hpb=96dbf014dad1309d4ade9c14a8b46733e2f531c8;p=pulseview.git

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 666c28d3..a7998b40 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_);
@@ -211,6 +226,7 @@ MainBar::MainBar(Session &session, QWidget *parent, pv::views::trace::View *view
 	add_decoder_button_->setIcon(QIcon(":/icons/add-decoder.svg"));
 	add_decoder_button_->setPopupMode(QToolButton::InstantPopup);
 	add_decoder_button_->setToolTip(tr("Add protocol decoder"));
+	add_decoder_button_->setShortcut(QKeySequence(Qt::Key_D));
 
 	connect(add_decoder_button_, SIGNAL(clicked()),
 		this, SLOT(on_add_decoder_clicked()));
@@ -754,9 +770,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 +864,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_);