X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=039e4e41192e781dc4ddeff35503928c84d2b043;hb=aca00b1e0d3483926c53dfd856483a397f1c29a5;hp=1f40d0452ff6ca8d7265cc30703eab46bcf388d4;hpb=2b49eeb02d92b4744f8ebfcfd38ef27384cdd751;p=pulseview.git diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h index 1f40d04..039e4e4 100644 --- a/pv/toolbars/samplingbar.h +++ b/pv/toolbars/samplingbar.h @@ -31,11 +31,16 @@ #include #include +#include +#include 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 &devices); @@ -59,8 +64,6 @@ public: void set_capture_state(pv::SigSession::capture_state state); signals: - void device_selected(); - void run_stop(); private: @@ -71,12 +74,15 @@ 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; + + pv::widgets::PopupToolButton _configure_button; + pv::widgets::PopupToolButton _probes_button; QComboBox _record_length_selector;