X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=aef26ef145c3882e73273ec9d52eb4aca3bf2646;hp=1f40d0452ff6ca8d7265cc30703eab46bcf388d4;hb=1198b8872516662c257e5dcdec346094ed4f32dd;hpb=2b49eeb02d92b4744f8ebfcfd38ef27384cdd751

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 1f40d045..aef26ef1 100644
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -31,11 +31,16 @@
 #include <QToolButton>
 
 #include <pv/sigsession.h>
+#include <pv/widgets/popuptoolbutton.h>
+#include <pv/widgets/sweeptimingwidget.h>
 
 struct st_dev_inst;
 class QAction;
 
 namespace pv {
+
+class SigSession;
+
 namespace toolbars {
 
 class SamplingBar : public QToolBar
@@ -47,7 +52,7 @@ private:
 	static const uint64_t DefaultRecordLength;
 
 public:
-	SamplingBar(QWidget *parent);
+	SamplingBar(SigSession &session, QWidget *parent);
 
 	void set_device_list(const std::list<struct sr_dev_inst*> &devices);
 
@@ -59,8 +64,6 @@ public:
 	void set_capture_state(pv::SigSession::capture_state state);
 
 signals:
-	void device_selected();
-
 	void run_stop();
 
 private:
@@ -71,19 +74,23 @@ private:
 private slots:
 	void on_device_selected();
 	void on_sample_rate_changed();
-	void on_configure();
 	void on_run_stop();
 
 private:
+	SigSession &_session;
+
 	QComboBox _device_selector;
-	QToolButton _configure_button;
+	bool _updating_device_selector;
+
+	pv::widgets::PopupToolButton _configure_button;
+	QAction *_configure_button_action;
+
+	pv::widgets::PopupToolButton _probes_button;
 
 	QComboBox _record_length_selector;
 
-	QComboBox _sample_rate_list;
-	QAction *_sample_rate_list_action;
-	QDoubleSpinBox _sample_rate_value;
-	QAction *_sample_rate_value_action;
+	pv::widgets::SweepTimingWidget _sample_rate;
+	bool _updating_sample_rate;
 
 	QIcon _icon_red;
 	QIcon _icon_green;