From 88372b61827bba25fc9bd1ee939ec5447b1d2ee4 Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Tue, 31 Aug 2010 12:39:21 +0000 Subject: [PATCH] Abstract scopes: Moved pens to ASW so other widgets can use them svn path=/trunk/kdenlive/; revision=4794 --- src/abstractscopewidget.cpp | 5 +++++ src/abstractscopewidget.h | 6 ++++++ src/vectorscope.cpp | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/abstractscopewidget.cpp b/src/abstractscopewidget.cpp index 760c15ac8..75dfa5d65 100644 --- 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 11074b664..6c31fec57 100644 --- 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 ab90ced0f..14217c68c 100644 --- 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), -- GitLab