Merge lp:~aacid/unity-2d/unity-2d-shell_inputshapemask_improvements into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

Add sourceChanged and colorChanged signals to InputShapeMask

=== modified file 'libunity-2d-private/src/inputshapemask.cpp'
--- libunity-2d-private/src/inputshapemask.cpp	2012-02-07 20:19:29 +0000
+++ libunity-2d-private/src/inputshapemask.cpp	2012-02-08 14:06:20 +0000
@@ -78,6 +78,7 @@
 {
     if (m_source != source) {
         m_source = source;
+        Q_EMIT sourceChanged(m_source);
         updateShape();
     }
 }
@@ -86,6 +87,7 @@
 {
     if (m_color != color) {
         m_color = color;
+        Q_EMIT colorChanged(m_color);
         updateShape();
     }
 }
 
=== modified file 'libunity-2d-private/src/inputshapemask.h'
--- libunity-2d-private/src/inputshapemask.h	2012-02-07 20:19:29 +0000
+++ libunity-2d-private/src/inputshapemask.h	2012-02-08 14:06:20 +0000
@@ -30,8 +30,8 @@
 class InputShapeMask : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QString source READ source WRITE setSource)
-    Q_PROPERTY(QColor color READ color WRITE setColor)
+    Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
     Q_PROPERTY(QPoint position READ position WRITE setPosition NOTIFY positionChanged)
     Q_PROPERTY(QBitmap shape READ shape NOTIFY shapeChanged)
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
@@ -51,6 +51,8 @@
     void setEnabled(bool enabled);
 
 Q_SIGNALS:
+    void sourceChanged(const QString& source);
+    void colorChanged(const QColor& color);
     void enabledChanged();
     void shapeChanged();
     void positionChanged();