X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.h;h=001c28b037033d5394088b94455b046198799e2f;hb=b08d7222556b0a56b4fc61782faa4664a0368d59;hp=df7d86f5f3151b0a399a0c45bdf7eba1a7965799;hpb=e072efc8aa62ff67bc7270515159e2f71f43d9f0;p=pulseview.git

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index df7d86f5..001c28b0 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -21,6 +21,10 @@
 #ifndef PULSEVIEW_PV_MAINWINDOW_H
 #define PULSEVIEW_PV_MAINWINDOW_H
 
+#include <list>
+
+#include <boost/weak_ptr.hpp>
+
 #include <QMainWindow>
 
 #include "sigsession.h"
@@ -35,7 +39,12 @@ class QWidget;
 
 namespace pv {
 
+class DeviceManager;
+
+namespace toolbars {
+class ContextBar;
 class SamplingBar;
+}
 
 namespace view {
 class View;
@@ -46,37 +55,35 @@ class MainWindow : public QMainWindow
 	Q_OBJECT
 
 public:
-	explicit MainWindow(QWidget *parent = 0);
+	explicit MainWindow(DeviceManager &device_manager,
+		const char *open_file_name = NULL,
+		QWidget *parent = 0);
 
 private:
 	void setup_ui();
 
-private:
+	void session_error(const QString text, const QString info_text);
 
-	SigSession _session;
-	pv::view::View *_view;
-
-	QAction *_action_open;
-	QAction *_action_view_zoom_in;
-	QAction *_action_view_zoom_out;
-	QAction *_action_view_show_cursors;
-	QAction *_action_about;
+	/**
+	 * 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);
 
-	QMenuBar *_menu_bar;
-	QMenu *_menu_file;
-	QMenu *_menu_view;
-	QMenu *_menu_help;
-
-	QWidget *_central_widget;
-	QVBoxLayout *_vertical_layout;
+private slots:
+	void load_file(QString file_name);
 
-	QToolBar *_toolbar;
-	SamplingBar *_sampling_bar;
-	QStatusBar *_status_bar;
 
-private slots:
+	void show_session_error(
+		const QString text, const QString info_text);
 
 	void on_actionOpen_triggered();
+	void on_actionQuit_triggered();
+
+	void on_actionConnect_triggered();
 
 	void on_actionViewZoomIn_triggered();
 
@@ -86,7 +93,41 @@ 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;
+
+	pv::view::View *_view;
+
+	QMenuBar *_menu_bar;
+	QMenu *_menu_file;
+	QAction *_action_open;
+	QAction *_action_connect;
+	QAction *_action_quit;
+
+	QMenu *_menu_view;
+	QAction *_action_view_zoom_in;
+	QAction *_action_view_zoom_out;
+	QAction *_action_view_show_cursors;
+
+	QMenu *_menu_help;
+	QAction *_action_about;
+
+	QWidget *_central_widget;
+	QVBoxLayout *_vertical_layout;
+
+	QToolBar *_toolbar;
+	toolbars::SamplingBar *_sampling_bar;
+	toolbars::ContextBar *_context_bar;
 };
 
 } // namespace pv