Merge branch 'master' into feature/pkey

[kdenlive] / src / choosecolorwidget.h

diff --git a/src/choosecolorwidget.h b/src/choosecolorwidget.h
index 4c2c2ff2bb46246043e7b3e57457d0b4c8438687..303c4a4e1aff52fa30f80025e8cc84690e5d37c2 100644 (file)
--- a/src/choosecolorwidget.h
+++ b/src/choosecolorwidget.h
@@ -38,14 +38,12 @@ class ChooseColorWidget : public QWidget
 public:
     /** @brief Sets up the widget.
     * @param text (optional) What the color will be used for
-    * @param color (optional) initial color */
-    ChooseColorWidget(QString text = QString(), QString color = "0xffffffff", QWidget* parent = 0);
+    * @param color (optional) initial color 
+    * @param alphaEnabled (optional) Should transparent colors be enabled */
+    explicit ChooseColorWidget(QString text = QString(), QString color = "0xffffffff", bool alphaEnabled = false, QWidget* parent = 0);
 
     /** @brief Gets the choosen color. */
     QString getColor();
-    /** @brief Enable the use of alpha channel.
-    * @param enabled (required) whether alpha is enabled or disabled */
-    void setAlphaChannelEnabled(bool enabled);
 
 private:
     KColorButton *m_button;
@@ -58,6 +56,8 @@ signals:
     /** @brief Emitted whenever a different color was choosen. */
     void modified();
     void displayMessage(const QString&, int);
+    /** @brief When user wants to pick a color, it's better to disable filter so we get proper color values. */
+    void disableCurrentFilter(bool);
 };
 
 #endif