Merge branch 'buildsystem' into next

[kdenlive] / src / abstractscopewidget.h

diff --git a/src/abstractscopewidget.h b/src/abstractscopewidget.h
index c1a771181c7c33a58bf815a237685e1dddce3d15..e518e1f08758eadf723c15101ce998e30ba79313 100644 (file)
--- a/src/abstractscopewidget.h
+++ b/src/abstractscopewidget.h
@@ -58,6 +58,8 @@ class AbstractScopeWidget : public QWidget
     Q_OBJECT
 
 public:
+    /** trackMouse enables mouse tracking; The variables m_mousePos and m_mouseWithinWidget will be set
+            if mouse tracking is enabled. See also signalMousePositionChanged(). */
     AbstractScopeWidget(bool trackMouse = false, QWidget *parent = 0);
     virtual ~AbstractScopeWidget(); // Must be virtual because of inheritance, to avoid memory leaks
 
@@ -80,12 +82,18 @@ public:
     virtual QString widgetName() const = 0;
 
     ///// Variables /////
+    static const QColor colHighlightLight;
+    static const QColor colHighlightDark;
+    static const QColor colDarkWhite;
+
     static const QPen penThick;
     static const QPen penThin;
     static const QPen penLight;
     static const QPen penLightDots;
+    static const QPen penLighter;
     static const QPen penDark;
     static const QPen penDarkDots;
+    static const QPen penBackground;
 
     static const QString directions[]; // Mainly for debug output
 
@@ -176,7 +184,7 @@ protected:
     /** The Abstract Scope will try to detect the movement direction when dragging on the widget with the mouse.
         As soon as the direction is determined it will execute this method. Can be used e.g. for re-scaling content.
         This is just a dummy function, re-implement to add functionality. */
-    virtual void handleMouseDrag(const QPoint movement, const RescaleDirection rescaleDirection, const Qt::KeyboardModifiers rescaleModifiers);
+    virtual void handleMouseDrag(const QPoint &movement, const RescaleDirection rescaleDirection, const Qt::KeyboardModifiers rescaleModifiers);
 
     ///// Reimplemented /////
 
@@ -206,7 +214,8 @@ signals:
     void signalBackgroundRenderingFinished(uint mseconds, uint accelerationFactor);
 
     /** For the mouse position itself see m_mousePos.
-        To check whether the mouse has leaved the widget, see m_mouseWithinWidget. */
+        To check whether the mouse has leaved the widget, see m_mouseWithinWidget.
+        This signal is typically connected to forceUpdateHUD(). */
     void signalMousePositionChanged();
 
     /** Do we need the renderer to send its frames to us? */