X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.hpp;h=10475e27f751128d7d11dc82c536e07bfa7550bb;hb=59331ddaef8cc63ab8b60e6f0f9d8d76aed6e2c5;hp=d5d42f5080497840eafc95db258f1ea19e4ca628;hpb=87f0df9b4a357ea9e2d838be7663580e94beca68;p=pulseview.git

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index d5d42f5..10475e2 100644
--- a/pv/toolbars/mainbar.hpp
+++ b/pv/toolbars/mainbar.hpp
@@ -28,10 +28,12 @@
 
 #include <QComboBox>
 #include <QDoubleSpinBox>
+#include <QMenu>
 #include <QToolBar>
 #include <QToolButton>
 
 #include <pv/session.hpp>
+#include <pv/widgets/devicetoolbutton.hpp>
 #include <pv/widgets/popuptoolbutton.hpp>
 #include <pv/widgets/sweeptimingwidget.hpp>
 
@@ -62,17 +64,10 @@ private:
 public:
 	MainBar(Session &session, pv::MainWindow &main_window);
 
-	void set_device_list(
-		const std::list< std::shared_ptr<sigrok::Device> > &devices,
-		std::shared_ptr<sigrok::Device> selected);
-
-	std::shared_ptr<sigrok::Device> get_selected_device() const;
+	void update_device_list();
 
 	void set_capture_state(pv::Session::capture_state state);
 
-Q_SIGNALS:
-	void run_stop();
-
 private:
 	void update_sample_rate_selector();
 	void update_sample_rate_selector_value();
@@ -96,8 +91,7 @@ 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_;