X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=0e3ce62374bf2c053ebf8a5eb57bd188bfcf11a8;hp=2fa2d3919af81048b6783ff91eb08bef9179007e;hb=b3e8a5d8e8139278a40508694e0b179170fffa14;hpb=68162c2925e3c5a3c7d0b4d3d100184e5c649eba

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 2fa2d391..0e3ce623 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -34,7 +34,7 @@
 #include <pv/devicemanager.h>
 #include <pv/popups/deviceoptions.h>
 
-using namespace std;
+using std::string;
 
 namespace pv {
 namespace toolbars {
@@ -70,9 +70,11 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	_device_selector(this),
 	_updating_device_selector(false),
 	_configure_button(this),
+	_configure_button_action(NULL),
 	_probes_button(this),
 	_probes_popup(_session, this),
 	_record_length_selector(this),
+	_sample_rate_action(NULL),
 	_sample_rate_list(this),
 	_icon_red(":/icons/status-red.svg"),
 	_icon_green(":/icons/status-green.svg"),
@@ -91,7 +93,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	{
 		const uint64_t &l = RecordLengths[i];
 		char *const text = sr_si_string_u64(l, " samples");
-		_record_length_selector.addItem(QString(text),
+		_record_length_selector.addItem(QString::fromUtf8(text),
 			qVariantFromValue(l));
 		g_free(text);
 
@@ -111,7 +113,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
 	addWidget(&_device_selector);
-	addWidget(&_configure_button);
+	_configure_button_action = addWidget(&_configure_button);
 	addWidget(&_probes_button);
 	addWidget(&_record_length_selector);
 	_sample_rate_list_action = addWidget(&_sample_rate_list);
@@ -184,7 +186,6 @@ void SamplingBar::update_sample_rate_selector()
 	GVariant *gvar_dict, *gvar_list;
 	const uint64_t *elements = NULL;
 	gsize num_elements;
-	QAction *selector_action = NULL;
 
 	assert(_sample_rate_value_action);
 	assert(_sample_rate_list_action);
@@ -207,7 +208,7 @@ void SamplingBar::update_sample_rate_selector()
 		_sample_rate_value.setSingleStep(elements[2]);
 		g_variant_unref(gvar_list);
 
-		selector_action = _sample_rate_value_action;
+		_sample_rate_action = _sample_rate_value_action;
 	}
 	else if ((gvar_list = g_variant_lookup_value(gvar_dict,
 			"samplerates", G_VARIANT_TYPE("at"))))
@@ -219,7 +220,7 @@ void SamplingBar::update_sample_rate_selector()
 		for (unsigned int i = 0; i < num_elements; i++)
 		{
 			char *const s = sr_samplerate_string(elements[i]);
-			_sample_rate_list.addItem(QString(s),
+			_sample_rate_list.addItem(QString::fromUtf8(s),
 				qVariantFromValue(elements[i]));
 			g_free(s);
 		}
@@ -227,7 +228,7 @@ void SamplingBar::update_sample_rate_selector()
 		_sample_rate_list.show();
 		g_variant_unref(gvar_list);
 
-		selector_action = _sample_rate_list_action;
+		_sample_rate_action = _sample_rate_list_action;
 	}
 
 	g_variant_unref(gvar_dict);
@@ -235,8 +236,8 @@ void SamplingBar::update_sample_rate_selector()
 
 	// We delay showing the action, so that value change events
 	// are ignored.
-	if (selector_action)
-		selector_action->setVisible(true);
+	if (_sample_rate_action)
+		_sample_rate_action->setVisible(true);
 }
 
 void SamplingBar::update_sample_rate_selector_value()
@@ -259,9 +260,9 @@ void SamplingBar::update_sample_rate_selector_value()
 	assert(_sample_rate_value_action);
 	assert(_sample_rate_list_action);
 
-	if (_sample_rate_value_action->isVisible())
+	if (_sample_rate_action == _sample_rate_value_action)
 		_sample_rate_value.setValue(samplerate);
-	else if (_sample_rate_list_action->isVisible())
+	else if (_sample_rate_action == _sample_rate_list_action)
 	{
 		for (int i = 0; i < _sample_rate_list.count(); i++)
 			if (samplerate == _sample_rate_list.itemData(
@@ -280,9 +281,9 @@ void SamplingBar::commit_sample_rate()
 	assert(_sample_rate_value_action);
 	assert(_sample_rate_list_action);
 
-	if (_sample_rate_value_action->isVisible())
+	if (_sample_rate_action == _sample_rate_value_action)
 		sample_rate = (uint64_t)_sample_rate_value.value();
-	else if (_sample_rate_list_action->isVisible())
+	else if (_sample_rate_action == _sample_rate_list_action)
 	{
 		const int index = _sample_rate_list.currentIndex();
 		if (index >= 0)
@@ -303,7 +304,7 @@ void SamplingBar::commit_sample_rate()
 
 void SamplingBar::on_device_selected()
 {
-	using namespace pv::popups;
+	using pv::popups::DeviceOptions;
 
 	if (_updating_device_selector)
 		return;
@@ -313,7 +314,11 @@ void SamplingBar::on_device_selected()
 	sr_dev_inst *const sdi = get_selected_device();
 	_session.set_device(sdi);
 
-	_configure_button.set_popup(new DeviceOptions(sdi, this));
+	// Update the configure popup
+	DeviceOptions *const opts = new DeviceOptions(sdi, this);
+	_configure_button_action->setVisible(
+		!opts->binding().properties().empty());
+	_configure_button.set_popup(opts);
 }
 
 void SamplingBar::on_sample_rate_changed()