Abstract scopes: Moved pens to ASW so other widgets can use them

svn path=/trunk/kdenlive/; revision=4794

diff --git a/src/abstractscopewidget.cpp b/src/abstractscopewidget.cpp
index 760c15ac8e3273033edb2a93c0d5135b50d40d1b..75dfa5d659420049ff8440fca7a432768d088cb1 100644 (file)
--- a/src/abstractscopewidget.cpp
+++ b/src/abstractscopewidget.cpp
@@ -25,6 +25,11 @@ const QColor light(250, 238, 226, 255);
 const QColor dark ( 40,  40,  39, 255);
 const QColor dark2( 25,  25,  23, 255);
 
+const QPen AbstractScopeWidget::penThick(QBrush(QColor(250,250,250)),     2, Qt::SolidLine);
+const QPen AbstractScopeWidget::penThin (QBrush(QColor(250,250,250)),     1, Qt::SolidLine);
+const QPen AbstractScopeWidget::penLight(QBrush(QColor(200,200,250,150)), 1, Qt::SolidLine);
+const QPen AbstractScopeWidget::penDark (QBrush(QColor(0,0,20,250)),      1, Qt::SolidLine);
+
 AbstractScopeWidget::AbstractScopeWidget(Monitor *projMonitor, Monitor *clipMonitor, QWidget *parent) :
     QWidget(parent),
     m_projMonitor(projMonitor),

diff --git a/src/abstractscopewidget.h b/src/abstractscopewidget.h
index 11074b664fa3dc899a0572932636521a5a04f1fa..6c31fec57772d73fb795742c376fc31a001304fb 100644 (file)
--- a/src/abstractscopewidget.h
+++ b/src/abstractscopewidget.h
@@ -76,6 +76,12 @@ public:
 
     virtual QString widgetName() const = 0;
 
+    ///// Variables /////
+    static const QPen penThick;
+    static const QPen penThin;
+    static const QPen penLight;
+    static const QPen penDark;
+
 protected:
     ///// Variables /////
 

diff --git a/src/vectorscope.cpp b/src/vectorscope.cpp
index ab90ced0fb7eddf2f8039e42a05d3f3d7ab51631..14217c68c633bd6dc5b8288e8c0275cd0e239567 100644 (file)
--- a/src/vectorscope.cpp
+++ b/src/vectorscope.cpp
@@ -34,11 +34,6 @@ const QPointF YUV_Cy(.147, -.615);
 const QPointF YUV_Mg(.289,  .515);
 const QPointF YUV_Yl(-.437,  .100);
 
-const QPen penThick(QBrush(QColor(250,250,250)), 2, Qt::SolidLine);
-const QPen penThin(QBrush(QColor(250,250,250)), 1, Qt::SolidLine);
-const QPen penLight(QBrush(QColor(200,200,250,150)), 1, Qt::SolidLine);
-const QPen penDark(QBrush(QColor(0,0,20,250)), 1, Qt::SolidLine);
-
 
 Vectorscope::Vectorscope(Monitor *projMonitor, Monitor *clipMonitor, QWidget *parent) :
     AbstractScopeWidget(projMonitor, clipMonitor, parent),