X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=18790f54e4bd750be12f02fad722f23cb323672f;hb=e23d7aa0d9980c3c269cbddb4cfbb32350d7425c;hp=4eaf5c2425ce0f8e825717d73a8201f43f9ed4c9;hpb=323715c41a09a1aba08f4b716e9d93da58f0f3a8;p=pulseview.git

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 4eaf5c24..18790f54 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -50,7 +50,6 @@
 #include <pv/widgets/exportmenu.hpp>
 #include <pv/widgets/importmenu.hpp>
 #ifdef ENABLE_DECODE
-#include <pv/widgets/decodermenu.hpp>
 #include <pv/data/decodesignal.hpp>
 #endif
 
@@ -96,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_),
@@ -109,8 +109,7 @@ MainBar::MainBar(Session &session, QWidget *parent, pv::views::trace::View *view
 	updating_sample_count_(false),
 	sample_count_supported_(false)
 #ifdef ENABLE_DECODE
-	, add_decoder_button_(new QToolButton()),
-	menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
+	, add_decoder_button_(new QToolButton())
 #endif
 {
 	setObjectName(QString::fromUtf8("MainBar"));
@@ -169,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(QVariant::fromValue(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_);
@@ -210,14 +223,13 @@ MainBar::MainBar(Session &session, QWidget *parent, pv::views::trace::View *view
 
 	// Setup the decoder button
 #ifdef ENABLE_DECODE
-	menu_decoders_add_->setTitle(tr("&Add"));
-	connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)),
-		this, SLOT(add_decoder(srd_decoder*)));
-
 	add_decoder_button_->setIcon(QIcon(":/icons/add-decoder.svg"));
 	add_decoder_button_->setPopupMode(QToolButton::InstantPopup);
-	add_decoder_button_->setMenu(menu_decoders_add_);
-	add_decoder_button_->setToolTip(tr("Add low-level, non-stacked protocol decoder"));
+	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()));
 #endif
 
 	connect(&sample_count_, SIGNAL(value_changed()),
@@ -583,18 +595,6 @@ void MainBar::show_session_error(const QString text, const QString info_text)
 	msg.exec();
 }
 
-void MainBar::add_decoder(srd_decoder *decoder)
-{
-#ifdef ENABLE_DECODE
-	assert(decoder);
-	shared_ptr<data::DecodeSignal> signal = session_.add_decode_signal();
-	if (signal)
-		signal->stack_decoder(decoder);
-#else
-	(void)decoder;
-#endif
-}
-
 void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only)
 {
 	using pv::dialogs::StoreProgress;
@@ -721,7 +721,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);
@@ -770,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()
@@ -853,9 +857,14 @@ void MainBar::on_actionConnect_triggered()
 	update_device_list();
 }
 
+void MainBar::on_add_decoder_clicked()
+{
+	show_decoder_selector(&session_);
+}
+
 void MainBar::add_toolbar_widgets()
 {
-	addAction(action_new_view_);
+	addWidget(new_view_button_);
 	addSeparator();
 	addWidget(open_button_);
 	addWidget(save_button_);