X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=a3b722cc3dcfa041f6bc913c451d6f4e4fec8410;hp=736ef80b1f4ffb9f64ffadbb574cb422eeafa512;hb=4d8130bb039a3e2096d6c0f8650e027340722ead;hpb=6f925ba9d6faf1077b73c5a5808259576081716a

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 736ef80b..a3b722cc 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>
@@ -56,9 +56,7 @@
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::back_inserter;
-using std::cerr;
 using std::copy;
-using std::endl;
 using std::list;
 using std::make_pair;
 using std::map;
@@ -201,10 +199,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()),
@@ -217,12 +215,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();
 
@@ -422,8 +419,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);
@@ -583,8 +579,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;
 
@@ -743,7 +738,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()