Ported pv::prop::binding::DeviceOptions to GVariants

[pulseview.git] / pv / mainwindow.h

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index b53138ee5f84c83bef3a06a1281a7bec0317ada1..47d3e66d0cad0efa131b7a72b4d796026966eb34 100644 (file)
--- 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;
@@ -46,19 +50,50 @@ class MainWindow : public QMainWindow
        Q_OBJECT
 
 public:
-       explicit MainWindow(QWidget *parent = 0);
+       explicit MainWindow(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);
+
+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;
        QMenu *_menu_file;
        QAction *_action_open;
+       QAction *_action_connect;
        QAction *_action_quit;
 
        QMenu *_menu_view;
@@ -73,24 +108,7 @@ private:
        QVBoxLayout *_vertical_layout;
 
        QToolBar *_toolbar;
-       SamplingBar *_sampling_bar;
-
-private slots:
-
-       void on_actionOpen_triggered();
-       void on_actionQuit_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