X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.hpp;h=04c344c5351088e8e636e50159adb1c536d3dc08;hb=6381b375ae391a79ab50f1f5dcbe0014ff9bd46c;hp=50c30fd2a0992ded9b45032aae38888579a64fd0;hpb=e0ba4f6fb263b4cc1dae96df2a0ff1e1ef8984ce;p=pulseview.git
diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index 50c30fd2..04c344c5 100644
--- a/pv/toolbars/mainbar.hpp
+++ b/pv/toolbars/mainbar.hpp
@@ -14,15 +14,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
-#include
-
+#include
#include
#include
@@ -40,13 +38,15 @@
#include
#include
+using std::shared_ptr;
+
namespace sigrok {
class Device;
class InputFormat;
class OutputFormat;
}
-Q_DECLARE_METATYPE(std::shared_ptr)
+Q_DECLARE_METATYPE(shared_ptr)
class QAction;
@@ -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,48 +116,53 @@ 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 capture_state_changed(int state);
-
- void add_decoder(srd_decoder *decoder);
-
- void export_file(std::shared_ptr format,
+ void export_file(shared_ptr format,
bool selection_only = false);
- void import_file(std::shared_ptr format);
+ void import_file(shared_ptr format);
void on_device_selected();
void on_device_changed();
+ void on_capture_state_changed(int state);
void on_sample_count_changed();
void on_sample_rate_changed();
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_;
@@ -176,7 +181,6 @@ private:
#ifdef ENABLE_DECODE
QToolButton *add_decoder_button_;
- QMenu *const menu_decoders_add_;
#endif
};