X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=3bd2cb39519eaab2872a439a1f0fabc26c8c9e07;hp=bafb9cd406bf05f9c76b54f2d91156e34d593e93;hb=27e8df221014d1a8c7769866773e8dbb0486eea8;hpb=95237c18d988245fd5f484b70a481891982f5f37

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index bafb9cd4..3bd2cb39 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -71,7 +71,9 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	_updating_device_selector(false),
 	_configure_button(this),
 	_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"),
@@ -90,7 +92,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);
 
@@ -102,8 +104,10 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 
 	_configure_button.setIcon(QIcon::fromTheme("configure",
 		QIcon(":/icons/configure.png")));
+
 	_probes_button.setIcon(QIcon::fromTheme("probes",
 		QIcon(":/icons/probes.svg")));
+	_probes_button.set_popup(&_probes_popup);
 
 	_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
@@ -136,7 +140,7 @@ void SamplingBar::set_device_list(
 
 	_updating_device_selector = false;
 
-	update_sample_rate_selector();
+	on_device_selected();
 }
 
 struct sr_dev_inst* SamplingBar::get_selected_device() const
@@ -181,7 +185,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);
@@ -189,8 +192,8 @@ void SamplingBar::update_sample_rate_selector()
 	if (!sdi)
 		return;
 
-	if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
-			&gvar_dict, sdi) != SR_OK)
+	if (sr_config_list(sdi->driver, sdi, NULL,
+			SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK)
 		return;
 
 	_sample_rate_list_action->setVisible(false);
@@ -204,7 +207,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"))))
@@ -216,7 +219,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);
 		}
@@ -224,7 +227,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);
@@ -232,8 +235,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()
@@ -244,8 +247,8 @@ void SamplingBar::update_sample_rate_selector_value()
 
 	assert(sdi);
 
-	if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-		&gvar, sdi) != SR_OK) {
+	if (sr_config_get(sdi->driver, sdi, NULL,
+		SR_CONF_SAMPLERATE, &gvar) != SR_OK) {
 		qDebug() <<
 				"WARNING: Failed to get value of sample rate";
 		return;
@@ -256,9 +259,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(
@@ -277,9 +280,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)
@@ -291,7 +294,7 @@ void SamplingBar::commit_sample_rate()
 		return;
 
 	// Set the samplerate
-	if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
+	if (sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE,
 		g_variant_new_uint64(sample_rate)) != SR_OK) {
 		qDebug() << "Failed to configure samplerate.";
 		return;
@@ -311,7 +314,6 @@ void SamplingBar::on_device_selected()
 	_session.set_device(sdi);
 
 	_configure_button.set_popup(new DeviceOptions(sdi, this));
-	_probes_button.set_popup(new Probes(_session, this));
 }
 
 void SamplingBar::on_sample_rate_changed()