X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.hpp;h=c79837e592bad4dfdf470c8c0d6f5d3aa764d817;hp=0242dc9da0ec73f184902b9570c40af6716aaf7c;hb=323715c41a09a1aba08f4b716e9d93da58f0f3a8;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index 0242dc9..c79837e 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>
 
@@ -39,13 +38,15 @@
 #include <pv/widgets/popuptoolbutton.hpp>
 #include <pv/widgets/sweeptimingwidget.hpp>
 
+using std::shared_ptr;
+
 namespace sigrok {
 class Device;
 class InputFormat;
 class OutputFormat;
 }
 
-Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
+Q_DECLARE_METATYPE(shared_ptr<sigrok::Device>)
 
 class QAction;
 
@@ -55,7 +56,7 @@ class MainWindow;
 class Session;
 
 namespace views {
-namespace TraceView {
+namespace trace {
 class View;
 }
 }
@@ -85,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,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();
 
@@ -119,6 +120,8 @@ 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:
@@ -126,9 +129,9 @@ private Q_SLOTS:
 
 	void add_decoder(srd_decoder *decoder);
 
-	void export_file(std::shared_ptr<sigrok::OutputFormat> format,
+	void export_file(shared_ptr<sigrok::OutputFormat> format,
 		bool selection_only = false);
-	void import_file(std::shared_ptr<sigrok::InputFormat> format);
+	void import_file(shared_ptr<sigrok::InputFormat> format);
 
 	void on_device_selected();
 	void on_device_changed();
@@ -144,6 +147,9 @@ private Q_SLOTS:
 	void on_actionSaveAs_triggered();
 	void on_actionSaveSelectionAs_triggered();
 
+	void on_actionSaveSetup_triggered();
+	void on_actionRestoreSetup_triggered();
+
 	void on_actionConnect_triggered();
 
 protected: