Change parameter to ViewBase constructor

diff --git a/pv/views/decoder_output/view.cpp b/pv/views/decoder_output/view.cpp
index e6e42cbb965f2d11fcf3d5183a47f6889f981752..28fe907ece0614b50cc961cdfe16ae706fbb3299 100644 (file)
--- a/pv/views/decoder_output/view.cpp
+++ b/pv/views/decoder_output/view.cpp
@@ -20,6 +20,7 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include <QMenu>
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include <QMenu>

+#include <QToolBar>

 #include <QVBoxLayout>
 
 #include "view.hpp"
 #include <QVBoxLayout>
 
 #include "view.hpp"


@@ -36,7 +37,7 @@ namespace pv {
 namespace views {
 namespace decoder_output {
 
 namespace views {
 namespace decoder_output {
 

-View::View(Session &session, bool is_main_view, QWidget *parent) :
+View::View(Session &session, bool is_main_view, QMainWindow *parent) :

        ViewBase(session, is_main_view, parent)
 
        // Note: Place defaults in View::reset_view_state(), not here
        ViewBase(session, is_main_view, parent)
 
        // Note: Place defaults in View::reset_view_state(), not here


@@ -44,6 +45,11 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
        QVBoxLayout *root_layout = new QVBoxLayout(this);
        root_layout->setContentsMargins(0, 0, 0, 0);
 
        QVBoxLayout *root_layout = new QVBoxLayout(this);
        root_layout->setContentsMargins(0, 0, 0, 0);
 

+       QToolBar* tool_bar = new QToolBar();
+       tool_bar->setContextMenuPolicy(Qt::PreventContextMenu);
+
+       parent->addToolBar(tool_bar);
+

        reset_view_state();
 }
 
        reset_view_state();
 }
 

diff --git a/pv/views/decoder_output/view.hpp b/pv/views/decoder_output/view.hpp
index a780c2f374d505834298f3a196757d23ef61a12a..a4db819e50f1f883fbaf38f67f7c509b70f23a3d 100644 (file)
--- a/pv/views/decoder_output/view.hpp
+++ b/pv/views/decoder_output/view.hpp
@@ -35,7 +35,7 @@ class View : public ViewBase
        Q_OBJECT
 
 public:
        Q_OBJECT
 
 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();
 
 
        ~View();
 

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 668ebb70b0e85b25701bccaa6adf91c638672860..8c2b37b85874d09cf884e6456b7d98e565ac76e3 100644 (file)
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -124,7 +124,7 @@ bool CustomScrollArea::viewportEvent(QEvent *event)
        }
 }
 
        }
 }
 

-View::View(Session &session, bool is_main_view, QWidget *parent) :
+View::View(Session &session, bool is_main_view, QMainWindow *parent) :

        ViewBase(session, is_main_view, parent),
 
        // Note: Place defaults in View::reset_view_state(), not here
        ViewBase(session, is_main_view, parent),
 
        // Note: Place defaults in View::reset_view_state(), not here

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 82a2f728116608555cee5b6ebb6a5001c30abd9b..b0cf02603d53a22a38f758fe54af8b37e7b5093a 100644 (file)
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -100,7 +100,7 @@ private:
        static const int ScaleUnits[3];
 
 public:
        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();
 
 
        ~View();
 

diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp
index a4dc5490bcd050e97c8ec24dc34898abc2f96946..69be61c892b67a5815b0096db1d78ea516ef4eac 100644 (file)
--- a/pv/views/viewbase.cpp
+++ b/pv/views/viewbase.cpp
@@ -42,7 +42,7 @@ const char* ViewTypeNames[ViewTypeCount] = {
 
 const int ViewBase::MaxViewAutoUpdateRate = 25; // No more than 25 Hz
 
 
 const int ViewBase::MaxViewAutoUpdateRate = 25; // No more than 25 Hz
 

-ViewBase::ViewBase(Session &session, bool is_main_view, QWidget *parent) :
+ViewBase::ViewBase(Session &session, bool is_main_view, QMainWindow *parent) :

        // Note: Place defaults in ViewBase::reset_view_state(), not here
        QWidget(parent),
        session_(session),
        // Note: Place defaults in ViewBase::reset_view_state(), not here
        QWidget(parent),
        session_(session),

diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp
index 0c7b0463661d3019943859883bff3b14987962e4..3d43ca9a12bc6d3277f92ee7805da0e851f1584f 100644 (file)
--- a/pv/views/viewbase.hpp
+++ b/pv/views/viewbase.hpp
@@ -26,6 +26,7 @@
 #include <unordered_set>
 #include <vector>
 
 #include <unordered_set>
 #include <vector>
 

+#include <QMainWindow>

 #include <QTimer>
 #include <QWidget>
 
 #include <QTimer>
 #include <QWidget>
 


@@ -69,7 +70,7 @@ private:
        static const int MaxViewAutoUpdateRate;
 
 public:
        static const int MaxViewAutoUpdateRate;
 
 public:

-       explicit ViewBase(Session &session, bool is_main_view = false, QWidget *parent = nullptr);
+       explicit ViewBase(Session &session, bool is_main_view = false, QMainWindow *parent = nullptr);

 
        /**
         * Resets the view to its default state after construction. It does however
 
        /**
         * Resets the view to its default state after construction. It does however