X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Ftoolbars%2Fmainbar.hpp;h=e4aa39b6743f1a8484beaced925079269befe8c4;hb=b0773a8aa01735d7220284ab7a3e8b5d02b48e9e;hp=0e58fbae8163842b0a80a267158a8466ef6d8715;hpb=6f925ba9d6faf1077b73c5a5808259576081716a;p=pulseview.git

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index 0e58fbae..e4aa39b6 100644
--- 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();
 
@@ -97,12 +96,13 @@ public:
 
 	QAction* action_new_view() const;
 	QAction* action_open() const;
+	QAction* action_save() 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();
 
@@ -117,19 +117,11 @@ private:
 	void commit_sample_rate();
 	void commit_sample_count();
 
-	QAction *const action_new_view_;
-	QAction *const action_open_;
-	QAction *const action_save_as_;
-	QAction *const action_save_selection_as_;
-	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);
+		bool selection_only = false, QString file_name = "");
 	void import_file(shared_ptr<sigrok::InputFormat> format);
 
 	void on_device_selected();
@@ -140,24 +132,41 @@ private Q_SLOTS:
 
 	void on_config_changed();
 
-	void on_actionNewView_triggered();
+	void on_actionNewView_triggered(QAction* action = nullptr);
 
 	void on_actionOpen_triggered();
+	void on_actionSave_triggered();
 	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();
+	void on_add_math_signal_clicked();
+
 protected:
 	void add_toolbar_widgets();
 
 	bool eventFilter(QObject *watched, QEvent *event);
 
 Q_SIGNALS:
-	void new_view(Session *session);
+	void new_view(Session *session, int type);
+	void show_decoder_selector(Session *session);
 
 private:
-	QToolButton *open_button_, *save_button_;
+	QAction *const action_new_view_;
+	QAction *const action_open_;
+	QAction *const action_save_;
+	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_;
+
+	QToolButton *new_view_button_, *open_button_, *save_button_;
 
 	pv::widgets::DeviceToolButton device_selector_;
 
@@ -176,8 +185,9 @@ private:
 
 #ifdef ENABLE_DECODE
 	QToolButton *add_decoder_button_;
-	QMenu *const menu_decoders_add_;
 #endif
+
+	QToolButton *add_math_signal_button_;
 };
 
 } // namespace toolbars