X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.hpp;h=27c947007584c10675161a2814210b3f1a4bdaf5;hp=d5d79c821c67fcf8d0f7a85e4515368924242df0;hb=3c35fcf0a15233dfd8042bc3063f7a4bb9d24256;hpb=7c65709437184b09753d1bcacc02467b8f6171f1

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index d5d79c8..27c9470 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,11 +64,7 @@ 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);
 
@@ -96,8 +94,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_;
@@ -115,6 +112,8 @@ private:
 	QIcon icon_green_;
 	QIcon icon_grey_;
 	QToolButton run_stop_button_;
+
+	QToolButton menu_button_;
 };
 
 } // namespace toolbars