Change parameter to ViewBase constructor

[pulseview.git] / pv / views / trace / view.hpp

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index a0e6f6bcc1d237689b3e6bb67afce9600b56166b..b0cf02603d53a22a38f758fe54af8b37e7b5093a 100644 (file)
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include <QAbstractScrollArea>
+#include <QShortcut>
 #include <QSizeF>
 #include <QSplitter>
 
@@ -99,7 +100,7 @@ private:
        static const int ScaleUnits[3];
 
 public:
-       explicit View(Session &session, bool is_main_view=false, QWidget *parent = nullptr);
+       explicit View(Session &session, bool is_main_view=false, QMainWindow *parent = nullptr);
 
        ~View();
 
@@ -109,8 +110,8 @@ public:
         */
        virtual void reset_view_state();
 
-       Session& session();
-       const Session& session() const;
+       Session& session();  // This method is needed for TraceTreeItemOwner, not ViewBase
+       const Session& session() const;  // This method is needed for TraceTreeItemOwner, not ViewBase
 
        /**
         * Returns the signals contained in this view.
@@ -259,27 +260,11 @@ public:
 
        pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
 
-       /**
-        * Enables or disables colored trace backgrounds. If they're not
-        * colored then they will use alternating colors.
-        */
-       void enable_colored_bg(bool state);
-
        /**
         * Returns true if the trace background should be drawn with a colored background.
         */
        bool colored_bg() const;
 
-       /**
-        * Enable or disable showing sampling points.
-        */
-       void enable_show_sampling_points(bool state);
-
-       /**
-        * Enable or disable showing the analog minor grid.
-        */
-       void enable_show_analog_minor_grid(bool state);
-
        /**
         * Returns true if cursors are displayed. false otherwise.
         */
@@ -442,6 +427,11 @@ private Q_SLOTS:
        void on_signal_name_changed();
        void on_splitter_moved();
 
+       void on_zoom_in_shortcut_triggered();
+       void on_zoom_out_shortcut_triggered();
+       void on_scroll_to_start_shortcut_triggered();
+       void on_scroll_to_end_shortcut_triggered();
+
        void h_scroll_value_changed(int value);
        void v_scroll_value_changed();
 
@@ -506,6 +496,10 @@ private:
        Header *header_;
        QSplitter *splitter_;
 
+       QShortcut *zoom_in_shortcut_, *zoom_in_shortcut_2_;
+       QShortcut *zoom_out_shortcut_, *zoom_out_shortcut_2_;
+       QShortcut *home_shortcut_, *end_shortcut_;
+
        unordered_set< shared_ptr<Signal> > signals_;
 
 #ifdef ENABLE_DECODE