X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.h;h=001c28b037033d5394088b94455b046198799e2f;hb=0a78bcaf5e2e7c8da02868716609b3410f5a1ab9;hp=3887717fb4e6c76931f245a3cfe9da89d0902969;hpb=ef7e3146c97eda68f38632cc60edf7a42e846610;p=pulseview.git

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 3887717f..001c28b0 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -23,6 +23,8 @@
 
 #include <list>
 
+#include <boost/weak_ptr.hpp>
+
 #include <QMainWindow>
 
 #include "sigsession.h"
@@ -37,7 +39,12 @@ class QWidget;
 
 namespace pv {
 
+class DeviceManager;
+
+namespace toolbars {
+class ContextBar;
 class SamplingBar;
+}
 
 namespace view {
 class View;
@@ -48,15 +55,24 @@ class MainWindow : public QMainWindow
 	Q_OBJECT
 
 public:
-	explicit MainWindow(const char *open_file_name = NULL,
+	explicit MainWindow(DeviceManager &device_manager,
+		const char *open_file_name = NULL,
 		QWidget *parent = 0);
 
 private:
 	void setup_ui();
-	void scan_devices();
 
 	void session_error(const QString text, const QString info_text);
 
+	/**
+	 * Updates the device list in the sampling bar, and updates the
+	 * selection.
+	 * @param selected_device The device to select, or NULL if the
+	 * first device in the device list should be selected.
+	 */
+	void update_device_list(
+		struct sr_dev_inst *selected_device = NULL);
+
 private slots:
 	void load_file(QString file_name);
 
@@ -77,14 +93,18 @@ private slots:
 
 	void on_actionAbout_triggered();
 
+	void device_selected();
+
 	void run_stop();
 
 	void capture_state_changed(int state);
 
+	void view_selection_changed();
+
 private:
+	DeviceManager &_device_manager;
 
 	SigSession _session;
-	std::list<sr_dev_inst*> _devices;
 
 	pv::view::View *_view;
 
@@ -106,7 +126,8 @@ private:
 	QVBoxLayout *_vertical_layout;
 
 	QToolBar *_toolbar;
-	SamplingBar *_sampling_bar;
+	toolbars::SamplingBar *_sampling_bar;
+	toolbars::ContextBar *_context_bar;
 };
 
 } // namespace pv