Add "new session" and "new view" toolbar buttons

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 8aab988b26c2fc2ce7f6bc87bdb7450d210efcb7..2bd8dadbf815d8ebdc594c9a3afb92208319a3ad 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -18,24 +18,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_MAINWINDOW_H
-#define PULSEVIEW_PV_MAINWINDOW_H
+#ifndef PULSEVIEW_PV_MAINWINDOW_HPP
+#define PULSEVIEW_PV_MAINWINDOW_HPP
 
 #include <list>
+#include <map>
 #include <memory>
 
 #include <QMainWindow>
 
 #include "session.hpp"
+#include "view/viewwidget.hpp"
 
 struct srd_decoder;
 
 class QVBoxLayout;
 
-namespace sigrok {
-class Device;
-}
-
 namespace pv {
 
 class DeviceManager;
@@ -50,45 +48,33 @@ class View;
 }
 
 namespace widgets {
+#ifdef ENABLE_DECODE
 class DecoderMenu;
+#endif
 }
 
 class MainWindow : public QMainWindow
 {
        Q_OBJECT
 
-private:
-       /**
-        * Name of the setting used to remember the directory
-        * containing the last file that was opened.
-        */
-       static const char *SettingOpenDirectory;
-
-       /**
-        * Name of the setting used to remember the directory
-        * containing the last file that was saved.
-        */
-       static const char *SettingSaveDirectory;
-
 public:
        explicit MainWindow(DeviceManager &device_manager,
-               const char *open_file_name = NULL,
+               std::string open_file_name = std::string(),
+               std::string open_file_format = std::string(),
                QWidget *parent = 0);
 
-       QAction* action_open() const;
-       QAction* action_save_as() const;
-       QAction* action_connect() const;
-       QAction* action_quit() const;
-       QAction* action_view_zoom_in() const;
-       QAction* action_view_zoom_out() const;
-       QAction* action_view_zoom_fit() const;
-       QAction* action_view_zoom_one_to_one() const;
-       QAction* action_view_show_cursors() const;
+       ~MainWindow();
+
+       QAction* action_view_sticky_scrolling() const;
+       QAction* action_view_coloured_bg() const;
        QAction* action_about() const;
 
-       void run_stop();
+       std::shared_ptr<pv::view::View> get_active_view() const;
 
-       void select_device(std::shared_ptr<sigrok::Device> device);
+       std::shared_ptr<pv::view::View> add_view(const QString &title,
+               view::ViewType type, Session &session);
+
+       std::shared_ptr<Session> add_session();
 
 private:
        void setup_ui();
@@ -97,68 +83,39 @@ private:
 
        void restore_ui_settings();
 
-       void session_error(const QString text, const QString info_text);
-
-       /**
-        * Updates the device list in the sampling bar
-        */
-       void update_device_list();
-
+private:
        void closeEvent(QCloseEvent *event);
 
-private Q_SLOTS:
-       void load_file(QString file_name);
-
-       void show_session_error(
-               const QString text, const QString info_text);
-
-       void on_actionOpen_triggered();
-       void on_actionSaveAs_triggered();
-       void on_actionQuit_triggered();
+       virtual QMenu* createPopupMenu();
 
-       void on_actionConnect_triggered();
+       virtual bool restoreState(const QByteArray &state, int version = 0);
 
-       void on_actionViewZoomIn_triggered();
-
-       void on_actionViewZoomOut_triggered();
+private Q_SLOTS:
+       void on_add_view(const QString &title, view::ViewType type,
+               Session *session);
 
-       void on_actionViewZoomFit_triggered();
+       void on_new_session();
+       void on_new_view(Session *session);
 
-       void on_actionViewZoomOneToOne_triggered();
+       void on_actionViewStickyScrolling_triggered();
 
-       void on_actionViewShowCursors_triggered();
+       void on_actionViewColouredBg_triggered();
 
        void on_actionAbout_triggered();
 
-       void add_decoder(srd_decoder *decoder);
-
-       void capture_state_changed(int state);
-       void device_selected();
-
 private:
        DeviceManager &device_manager_;
 
-       Session session_;
-
-       pv::view::View *view_;
-
-       QWidget *central_widget_;
-       QVBoxLayout *vertical_layout_;
+       std::vector< std::shared_ptr<Session> > sessions_;
 
-       toolbars::MainBar *main_bar_;
+       std::map< std::shared_ptr<QDockWidget>,
+               std::shared_ptr<pv::view::View> > view_docks_;
 
-       QAction *const action_open_;
-       QAction *const action_save_as_;
-       QAction *const action_connect_;
-       QAction *const action_quit_;
-       QAction *const action_view_zoom_in_;
-       QAction *const action_view_zoom_out_;
-       QAction *const action_view_zoom_fit_;
-       QAction *const action_view_zoom_one_to_one_;
-       QAction *const action_view_show_cursors_;
+       QAction *const action_view_sticky_scrolling_;
+       QAction *const action_view_coloured_bg_;
        QAction *const action_about_;
 };
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MAINWINDOW_H
+#endif // PULSEVIEW_PV_MAINWINDOW_HPP