Moved DeviceManager::use_device and release_device into DevInst

[pulseview.git] / pv / mainwindow.h

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 51577bdb742d9a53303ed260bfc77075e17a8aa8..1acaf07227c7b8bd86a08d20ebda97e824f4115a 100644 (file)
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -23,22 +23,24 @@
 
 #include <list>
 
+#include <boost/weak_ptr.hpp>
+
 #include <QMainWindow>
 
 #include "sigsession.h"
 
-class QAction;
-class QMenuBar;
-class QMenu;
+struct srd_decoder;
+
 class QVBoxLayout;
-class QStatusBar;
-class QToolBar;
-class QWidget;
 
 namespace pv {
 
 class DeviceManager;
 
+namespace device {
+class DevInst;
+}
+
 namespace toolbars {
 class ContextBar;
 class SamplingBar;
@@ -48,6 +50,10 @@ namespace view {
 class View;
 }
 
+namespace widgets {
+class DecoderMenu;
+}
+
 class MainWindow : public QMainWindow
 {
        Q_OBJECT
@@ -69,7 +75,8 @@ private:
         * first device in the device list should be selected.
         */
        void update_device_list(
-               struct sr_dev_inst *selected_device = NULL);
+               boost::shared_ptr<pv::device::DevInst> selected_device =
+                       boost::shared_ptr<pv::device::DevInst>());
 
 private slots:
        void load_file(QString file_name);
@@ -79,6 +86,7 @@ private slots:
                const QString text, const QString info_text);
 
        void on_actionOpen_triggered();
+       void on_actionSaveAs_triggered();
        void on_actionQuit_triggered();
 
        void on_actionConnect_triggered();
@@ -87,11 +95,15 @@ private slots:
 
        void on_actionViewZoomOut_triggered();
 
+       void on_actionViewZoomFit_triggered();
+
+       void on_actionViewZoomOneToOne_triggered();
+
        void on_actionViewShowCursors_triggered();
 
        void on_actionAbout_triggered();
 
-       void device_selected();
+       void add_decoder(srd_decoder *decoder);
 
        void run_stop();
 
@@ -104,26 +116,10 @@ private:
 
        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