Fix #1147 by implementing decoder selector subwindow

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

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index 0e58fbae8163842b0a80a267158a8466ef6d8715..bc0c2dfdd528c11c6bfba37c499ae5078ab7cfeb 100644 (file)
--- a/pv/toolbars/mainbar.hpp
+++ b/pv/toolbars/mainbar.hpp
@@ -20,8 +20,7 @@
 #ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
 #define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <list>
 #include <memory>
 
@@ -57,7 +56,7 @@ class MainWindow;
 class Session;
 
 namespace views {
-namespace TraceView {
+namespace trace {
 class View;
 }
 }
@@ -87,7 +86,7 @@ private:
 
 public:
        MainBar(Session &session, QWidget *parent,
-               pv::views::TraceView::View *view);
+               pv::views::trace::View *view);
 
        void update_device_list();
 
@@ -99,10 +98,10 @@ public:
        QAction* action_open() const;
        QAction* action_save_as() const;
        QAction* action_save_selection_as() const;
+       QAction* action_restore_setup() const;
+       QAction* action_save_setup() const;
        QAction* action_connect() const;
 
-       void session_error(const QString text, const QString info_text);
-
 private:
        void run_stop();
 
@@ -121,13 +120,13 @@ private:
        QAction *const action_open_;
        QAction *const action_save_as_;
        QAction *const action_save_selection_as_;
+       QAction *const action_restore_setup_;
+       QAction *const action_save_setup_;
        QAction *const action_connect_;
 
 private Q_SLOTS:
        void show_session_error(const QString text, const QString info_text);
 
-       void add_decoder(srd_decoder *decoder);
-
        void export_file(shared_ptr<sigrok::OutputFormat> format,
                bool selection_only = false);
        void import_file(shared_ptr<sigrok::InputFormat> format);
@@ -146,8 +145,13 @@ private Q_SLOTS:
        void on_actionSaveAs_triggered();
        void on_actionSaveSelectionAs_triggered();
 
+       void on_actionSaveSetup_triggered();
+       void on_actionRestoreSetup_triggered();
+
        void on_actionConnect_triggered();
 
+       void on_add_decoder_clicked();
+
 protected:
        void add_toolbar_widgets();
 
@@ -155,6 +159,7 @@ protected:
 
 Q_SIGNALS:
        void new_view(Session *session);
+       void show_decoder_selector(Session *session);
 
 private:
        QToolButton *open_button_, *save_button_;
@@ -176,7 +181,6 @@ private:
 
 #ifdef ENABLE_DECODE
        QToolButton *add_decoder_button_;
-       QMenu *const menu_decoders_add_;
 #endif
 };