X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=114e6fd72cb7c5ac44d71577f7b491b0085800b6;hb=75ab6b87f1184630a03cdef015f8010d2faf4653;hp=f3bbcee1b90490af234be2db0bc9e1bac2759173;hpb=83b1c8d251386ac1980284c4668cbdd8e425550f;p=pulseview.git

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index f3bbcee..114e6fd 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -43,8 +43,8 @@
 #include <pv/dialogs/inputoutputoptions.hpp>
 #include <pv/dialogs/storeprogress.hpp>
 #include <pv/mainwindow.hpp>
-#include <pv/popups/deviceoptions.hpp>
 #include <pv/popups/channels.hpp>
+#include <pv/popups/deviceoptions.hpp>
 #include <pv/util.hpp>
 #include <pv/view/view.hpp>
 #include <pv/widgets/exportmenu.hpp>
@@ -114,6 +114,8 @@ MainBar::MainBar(Session &session, QWidget *parent,
 {
 	setObjectName(QString::fromUtf8("MainBar"));
 
+	setContextMenuPolicy(Qt::PreventContextMenu);
+
 	// Actions
 	action_new_view_->setText(tr("New &View"));
 	action_new_view_->setIcon(QIcon::fromTheme("window-new",
@@ -199,10 +201,10 @@ MainBar::MainBar(Session &session, QWidget *parent,
 	connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)),
 		this, SLOT(add_decoder(srd_decoder*)));
 
-	add_decoder_button_->setIcon(QIcon::fromTheme("add-decoder",
-		QIcon(":/icons/add-decoder.svg")));
+	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"));
 #endif
 
 	connect(&sample_count_, SIGNAL(value_changed()),
@@ -215,12 +217,11 @@ MainBar::MainBar(Session &session, QWidget *parent,
 	set_capture_state(pv::Session::Stopped);
 
 	configure_button_.setToolTip(tr("Configure Device"));
-	configure_button_.setIcon(QIcon::fromTheme("configure",
-		QIcon(":/icons/configure.png")));
+	configure_button_.setIcon(QIcon::fromTheme("preferences-system",
+		QIcon(":/icons/preferences-system.png")));
 
 	channels_button_.setToolTip(tr("Configure Channels"));
-	channels_button_.setIcon(QIcon::fromTheme("channels",
-		QIcon(":/icons/channels.svg")));
+	channels_button_.setIcon(QIcon(":/icons/channels.svg"));
 
 	add_toolbar_widgets();
 
@@ -420,8 +421,7 @@ void MainBar::update_sample_count_selector()
 	min_sample_count = min(max(min_sample_count, MinSampleCount),
 		max_sample_count);
 
-	sample_count_.show_125_list(
-		min_sample_count, max_sample_count);
+	sample_count_.show_125_list(min_sample_count, max_sample_count);
 
 	if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::GET)) {
 		auto gvar = sr_dev->config_get(ConfigKey::LIMIT_SAMPLES);
@@ -581,8 +581,7 @@ void MainBar::add_decoder(srd_decoder *decoder)
 #endif
 }
 
-void MainBar::export_file(shared_ptr<OutputFormat> format,
-	bool selection_only)
+void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only)
 {
 	using pv::dialogs::StoreProgress;
 
@@ -602,7 +601,7 @@ void MainBar::export_file(shared_ptr<OutputFormat> format,
 		if (!trace_view->cursors()->enabled()) {
 			show_session_error(tr("Missing Cursors"), tr("You need to set the " \
 					"cursors before you can save the data enclosed by them " \
-					"to a session file (e.g. using ALT-V - Show Cursors)."));
+					"to a session file (e.g. using the Show Cursors button)."));
 			return;
 		}
 
@@ -627,9 +626,9 @@ void MainBar::export_file(shared_ptr<OutputFormat> format,
 		QString::fromStdString(format->description()));
 
 	if (exts.empty())
-		filter += "(*.*)";
+		filter += "(*)";
 	else
-		filter += QString("(*.%1);;%2 (*.*)").arg(
+		filter += QString("(*.%1);;%2 (*)").arg(
 			QString::fromStdString(join(exts, ", *.")),
 			tr("All Files"));
 
@@ -680,7 +679,7 @@ void MainBar::import_file(shared_ptr<InputFormat> format)
 	// Show the file dialog
 	const QString file_name = QFileDialog::getOpenFileName(
 		this, tr("Import File"), dir, tr(
-			"%1 files (*.*);;All Files (*.*)").arg(
+			"%1 files (*);;All Files (*)").arg(
 			QString::fromStdString(format->description())));
 
 	if (file_name.isEmpty())
@@ -741,7 +740,7 @@ void MainBar::on_sample_rate_changed()
 void MainBar::on_config_changed()
 {
 	commit_sample_count();
-	commit_sample_rate();	
+	commit_sample_rate();
 }
 
 void MainBar::on_actionNewView_triggered()
@@ -758,7 +757,7 @@ void MainBar::on_actionOpen_triggered()
 	const QString file_name = QFileDialog::getOpenFileName(
 		this, tr("Open File"), dir, tr(
 			"Sigrok Sessions (*.sr);;"
-			"All Files (*.*)"));
+			"All Files (*)"));
 
 	if (!file_name.isEmpty()) {
 		session_.load_file(file_name);