X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.hpp;h=e1394372dc4a0a5273b9b03501f99dba24c5d48e;hp=0c9cad8094c150206c3e1bde9abb61ab2a16f52a;hb=7daebd054e65a244dce36933cbf173b8d7532a09;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/views/trace/standardbar.hpp b/pv/views/trace/standardbar.hpp
index 0c9cad80..e1394372 100644
--- a/pv/views/trace/standardbar.hpp
+++ b/pv/views/trace/standardbar.hpp
@@ -21,9 +21,10 @@
 #ifndef PULSEVIEW_PV_VIEWS_TRACE_STANDARDBAR_HPP
 #define PULSEVIEW_PV_VIEWS_TRACE_STANDARDBAR_HPP
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <QAction>
+#include <QSpinBox>
 #include <QToolBar>
 #include <QWidget>
 
@@ -36,7 +37,7 @@ class Session;
 
 namespace views {
 
-namespace TraceView {
+namespace trace {
 class View;
 }
 
@@ -48,9 +49,9 @@ class StandardBar : public QToolBar
 
 public:
 	StandardBar(Session &session, QWidget *parent,
-		TraceView::View *view, bool add_default_widgets=true);
+		trace::View *view, bool add_default_widgets = true);
 
-	Session &session(void) const;
+	Session &session() const;
 
 	QAction* action_view_zoom_in() const;
 	QAction* action_view_zoom_out() const;
@@ -61,8 +62,10 @@ public:
 protected:
 	virtual void add_toolbar_widgets();
 
+	virtual void show_multi_segment_ui(const bool state);
+
 	Session &session_;
-	TraceView::View *view_;
+	trace::View *view_;
 
 	QAction *const action_view_zoom_in_;
 	QAction *const action_view_zoom_out_;
@@ -70,6 +73,8 @@ protected:
 	QAction *const action_view_zoom_one_to_one_;
 	QAction *const action_view_show_cursors_;
 
+	QSpinBox *segment_selector_;
+
 protected Q_SLOTS:
 	void on_actionViewZoomIn_triggered();
 
@@ -82,6 +87,13 @@ protected Q_SLOTS:
 	void on_actionViewShowCursors_triggered();
 
 	void on_always_zoom_to_fit_changed(bool state);
+
+	void on_new_segment(int new_segment_id);
+	void on_segment_changed(int segment_id);
+	void on_segment_display_mode_changed(bool segment_selectable);
+
+private:
+	vector<QAction*> multi_segment_actions_;
 };
 
 } // namespace trace