X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.h;h=47d3e66d0cad0efa131b7a72b4d796026966eb34;hp=993c608493a39a6b4a1b4a1f75486ee822985e57;hb=de1d99bbe58f825e30048baa48a9439c01686f10;hpb=9663c82b7fa8ec54ece3045b41bbc4a53db8bb0b

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 993c6084..47d3e66d 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -21,6 +21,8 @@
 #ifndef PULSEVIEW_PV_MAINWINDOW_H
 #define PULSEVIEW_PV_MAINWINDOW_H
 
+#include <list>
+
 #include <QMainWindow>
 
 #include "sigsession.h"
@@ -35,7 +37,9 @@ class QWidget;
 
 namespace pv {
 
+namespace toolbars {
 class SamplingBar;
+}
 
 namespace view {
 class View;
@@ -51,10 +55,39 @@ public:
 
 private:
 	void setup_ui();
+	void scan_devices();
+
+	void session_error(const QString text, const QString info_text);
+
+private slots:
+	void load_file(QString file_name);
+
+
+	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();
+
+	void on_actionViewZoomOut_triggered();
+
+	void on_actionViewShowCursors_triggered();
+
+	void on_actionAbout_triggered();
+
+	void run_stop();
+
+	void capture_state_changed(int state);
 
 private:
 
 	SigSession _session;
+	std::list<sr_dev_inst*> _devices;
+
 	pv::view::View *_view;
 
 	QMenuBar *_menu_bar;
@@ -75,27 +108,7 @@ private:
 	QVBoxLayout *_vertical_layout;
 
 	QToolBar *_toolbar;
-	SamplingBar *_sampling_bar;
-
-private slots:
-	void load_file(QString file_name);
-
-	void on_actionOpen_triggered();
-	void on_actionQuit_triggered();
-
-	void on_actionConnect_triggered();
-
-	void on_actionViewZoomIn_triggered();
-
-	void on_actionViewZoomOut_triggered();
-
-	void on_actionViewShowCursors_triggered();
-
-	void on_actionAbout_triggered();
-
-	void run_stop();
-
-	void capture_state_changed(int state);
+	toolbars::SamplingBar *_sampling_bar;
 };
 
 } // namespace pv