X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsamplingbar.cpp;h=7bc207aeca80ed20f9e230b12a6899478e074504;hp=468c1c539ef6e536fdcd551d68914d33f053532c;hb=3820592a018c777727a6e65bd754d113742f4462;hpb=cdb50f67d6fd1c54d51d0fd497c21aa6b9bfa887

diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp
index 468c1c53..7bc207ae 100644
--- a/pv/samplingbar.cpp
+++ b/pv/samplingbar.cpp
@@ -45,7 +45,7 @@ const uint64_t SamplingBar::RecordLengths[11] = {
 	250000000,
 	500000000,
 	1000000000,
-	10000000000
+	10000000000ULL,
 };
 
 SamplingBar::SamplingBar(QWidget *parent) :
@@ -54,6 +54,8 @@ SamplingBar::SamplingBar(QWidget *parent) :
 	_configure_button(this),
 	_record_length_selector(this),
 	_sample_rate_list(this),
+	_icon_green(":/icons/status-green.svg"),
+	_icon_grey(":/icons/status-grey.svg"),
 	_run_stop_button(this)
 {
 	connect(&_run_stop_button, SIGNAL(clicked()),
@@ -76,7 +78,10 @@ SamplingBar::SamplingBar(QWidget *parent) :
 
 	set_sampling(false);
 
-	_configure_button.setIcon(QIcon::fromTheme("configure"));
+	_configure_button.setIcon(QIcon::fromTheme("configure",
+		QIcon(":/icons/configure.png")));
+
+	_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
 	addWidget(&_device_selector);
 	addWidget(&_configure_button);
@@ -129,6 +134,7 @@ uint64_t SamplingBar::get_sample_rate() const
 
 void SamplingBar::set_sampling(bool sampling)
 {
+	_run_stop_button.setIcon(sampling ? _icon_green : _icon_grey);
 	_run_stop_button.setText(sampling ? "Stop" : "Run");
 }
 
@@ -171,7 +177,7 @@ void SamplingBar::update_sample_rate_selector()
 	assert(_sample_rate_value_action);
 	assert(_sample_rate_list_action);
 
-	if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
+	if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
 		(const void **)&samplerates, sdi) != SR_OK)
 		return;