X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.hpp;h=9c4b1cd4b0e4a9f9484d00736109b75a8f8cf8ee;hb=7e0c99bf95836c89574b53ae3fa7840e2ddca77d;hp=d5d79c821c67fcf8d0f7a85e4515368924242df0;hpb=7c65709437184b09753d1bcacc02467b8f6171f1;p=pulseview.git diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp index d5d79c8..9c4b1cd 100644 --- a/pv/toolbars/mainbar.hpp +++ b/pv/toolbars/mainbar.hpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_H -#define PULSEVIEW_PV_TOOLBARS_MAINBAR_H +#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP +#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP #include @@ -28,15 +28,18 @@ #include #include +#include #include #include #include +#include #include #include namespace sigrok { - class Device; +class Device; +class InputFormat; } Q_DECLARE_METATYPE(std::shared_ptr) @@ -62,16 +65,11 @@ private: public: MainBar(Session &session, pv::MainWindow &main_window); - void set_device_list( - const std::list< std::shared_ptr > &devices, - std::shared_ptr selected); - - std::shared_ptr get_selected_device() const; + void update_device_list(); void set_capture_state(pv::Session::capture_state state); -Q_SIGNALS: - void run_stop(); + void reset_device_selector(); private: void update_sample_rate_selector(); @@ -96,13 +94,13 @@ private: Session &session_; MainWindow &main_window_; - QComboBox device_selector_; - bool updating_device_selector_; + pv::widgets::DeviceToolButton device_selector_; pv::widgets::PopupToolButton configure_button_; QAction *configure_button_action_; pv::widgets::PopupToolButton channels_button_; + QAction *channels_button_action_; pv::widgets::SweepTimingWidget sample_count_; pv::widgets::SweepTimingWidget sample_rate_; @@ -115,9 +113,12 @@ private: QIcon icon_green_; QIcon icon_grey_; QToolButton run_stop_button_; + QAction *run_stop_button_action_; + + QToolButton menu_button_; }; } // namespace toolbars } // namespace pv -#endif // PULSEVIEW_PV_TOOLBARS_MAINBAR_H +#endif // PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP