Make the first view own the toolbar instead of the main window

[pulseview.git] / pv / toolbars / mainbar.hpp

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index 9c4b1cd4b0e4a9f9484d00736109b75a8f8cf8ee..088efa2f73cb6a8597cd6b4ea517bbbe40409a39 100644 (file)
--- a/pv/toolbars/mainbar.hpp
+++ b/pv/toolbars/mainbar.hpp
@@ -26,6 +26,8 @@
 #include <list>
 #include <memory>
 
+#include <glibmm/variant.h>
+
 #include <QComboBox>
 #include <QDoubleSpinBox>
 #include <QMenu>
@@ -40,6 +42,7 @@
 namespace sigrok {
 class Device;
 class InputFormat;
+class OutputFormat;
 }
 
 Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
@@ -62,8 +65,24 @@ private:
        static const uint64_t MaxSampleCount;
        static const uint64_t DefaultSampleCount;
 
+       /**
+        * 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:
-       MainBar(Session &session, pv::MainWindow &main_window);
+       MainBar(Session &session, pv::MainWindow &main_window,
+               std::string open_file_name = std::string(),
+               std::string open_file_format = std::string());
+
+       Session &session(void) const;
 
        void update_device_list();
 
@@ -71,7 +90,34 @@ public:
 
        void reset_device_selector();
 
+       QAction* action_open() const;
+       QAction* action_save_as() const;
+       QAction* action_save_selection_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;
+
 private:
+       void run_stop();
+
+       void select_device(std::shared_ptr<devices::Device> device);
+
+       void select_init_device();
+
+       void load_file(QString file_name,
+               std::shared_ptr<sigrok::InputFormat> format = nullptr,
+               const std::map<std::string, Glib::VariantBase> &options =
+                       std::map<std::string, Glib::VariantBase>());
+
+       void load_init_file(const std::string &file_name,
+               const std::string &format);
+
+       void save_selection_to_file();
+
        void update_sample_rate_selector();
        void update_sample_rate_selector_value();
        void update_sample_count_selector();
@@ -79,7 +125,29 @@ private:
        void commit_sample_rate();
        void commit_sample_count();
 
+       void session_error(const QString text, const QString info_text);
+
+       QAction *const action_open_;
+       QAction *const action_save_as_;
+       QAction *const action_save_selection_as_;
+       QAction *const action_connect_;
+       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_;
+
 private Q_SLOTS:
+       void show_session_error(const QString text, const QString info_text);
+
+       void capture_state_changed(int state);
+
+       void add_decoder(srd_decoder *decoder);
+
+       void export_file(std::shared_ptr<sigrok::OutputFormat> format,
+               bool selection_only = false);
+       void import_file(std::shared_ptr<sigrok::InputFormat> format);
+
        void on_device_selected();
        void on_sample_count_changed();
        void on_sample_rate_changed();
@@ -87,12 +155,27 @@ private Q_SLOTS:
 
        void on_config_changed();
 
+       void on_actionOpen_triggered();
+       void on_actionSaveAs_triggered();
+       void on_actionSaveSelectionAs_triggered();
+
+       void on_actionConnect_triggered();
+
+       void on_actionViewZoomIn_triggered();
+
+       void on_actionViewZoomOut_triggered();
+
+       void on_actionViewZoomFit_triggered();
+
+       void on_actionViewZoomOneToOne_triggered();
+
+       void on_actionViewShowCursors_triggered();
+
 protected:
        bool eventFilter(QObject *watched, QEvent *event);
 
 private:
        Session &session_;
-       MainWindow &main_window_;
 
        pv::widgets::DeviceToolButton device_selector_;
 
@@ -116,6 +199,10 @@ private:
        QAction *run_stop_button_action_;
 
        QToolButton menu_button_;
+
+#ifdef ENABLE_DECODE
+       QMenu *const menu_decoders_add_;
+#endif
 };
 
 } // namespace toolbars