X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.hpp;h=04c344c5351088e8e636e50159adb1c536d3dc08;hb=273798599b8be55a7ed9bbc99077b3478a094aec;hp=fd4d94b8d82d57a07fc3da9f92f1c2f46d1b2127;hpb=cafe470ed977ab3bff1a865439a261c9f0eb397d;p=pulseview.git

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index fd4d94b8..04c344c5 100644
--- a/pv/toolbars/mainbar.hpp
+++ b/pv/toolbars/mainbar.hpp
@@ -56,7 +56,7 @@ class MainWindow;
 class Session;
 
 namespace views {
-namespace TraceView {
+namespace trace {
 class View;
 }
 }
@@ -86,7 +86,7 @@ private:
 
 public:
 	MainBar(Session &session, QWidget *parent,
-		pv::views::TraceView::View *view);
+		pv::views::trace::View *view);
 
 	void update_device_list();
 
@@ -98,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();
 
@@ -116,17 +116,9 @@ 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);
 	void import_file(shared_ptr<sigrok::InputFormat> format);
@@ -139,24 +131,38 @@ private Q_SLOTS:
 
 	void on_config_changed();
 
-	void on_actionNewView_triggered();
+	void on_actionNewView_triggered(QAction* action = nullptr);
 
 	void on_actionOpen_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();
+
 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_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_;
 
@@ -175,7 +181,6 @@ private:
 
 #ifdef ENABLE_DECODE
 	QToolButton *add_decoder_button_;
-	QMenu *const menu_decoders_add_;
 #endif
 };