Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/silentShape into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Only fire each UbuntuShape deprecation note once

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1595
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/832
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/834
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/834/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/831

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2104/rebuild

review: Approve (continuous-integration)

[Loïc Molinari (loic.molinari)]

Much better ;)

I'd keep the setBorderSource() log commented though.

review: Needs Fixing

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/silentShape]

1596. By Cris Dywan on 2015-08-07

Reinstate uncommented warning for setBorderSource

1597. By Cris Dywan on 2015-08-07

Remove rogue ' from comment

[Loïc Molinari (loic.molinari)]

Nice.

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-08-06 13:16:24 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-08-07 17:41:55 +0000
@@ -793,8 +793,12 @@
 */
 void UCUbuntuShape::setColor(const QColor& color)
 {
-    qmlInfo(this) << "'color' is deprecated. Use 'backgroundColor', 'secondaryBackgroundColor' and "
-        "'backgroundMode' instead.";
+    static bool deprecationNoteShown = false;
+    if (!deprecationNoteShown) {
+        deprecationNoteShown = true;
+        qmlInfo(this) << "'color' is deprecated. Use 'backgroundColor', 'secondaryBackgroundColor' and "
+            "'backgroundMode' instead.";
+    }
 
     if (!(m_flags & BackgroundApiSet)) {
         const QRgb colorRgb = qRgba(color.red(), color.green(), color.blue(), color.alpha());
@@ -822,8 +826,12 @@
 */
 void UCUbuntuShape::setGradientColor(const QColor& gradientColor)
 {
-    qmlInfo(this) << "'gradientColor' is deprecated. Use 'backgroundColor', "
-        "'secondaryBackgroundColor' and 'backgroundMode' instead.";
+    static bool deprecationNoteShown = false;
+    if (!deprecationNoteShown) {
+        deprecationNoteShown = true;
+        qmlInfo(this) << "'gradientColor' is deprecated. Use 'backgroundColor', "
+            "'secondaryBackgroundColor' and 'backgroundMode' instead.";
+    }
 
     if (!(m_flags & BackgroundApiSet)) {
         m_flags |= GradientColorSet;
@@ -849,7 +857,11 @@
 */
 void UCUbuntuShape::setImage(const QVariant& image)
 {
-    qmlInfo(this) << "'image' is deprecated. Use 'source' instead.";
+    static bool deprecationNoteShown = false;
+    if (!deprecationNoteShown) {
+        deprecationNoteShown = true;
+        qmlInfo(this) << "'image' is deprecated. Use 'source' instead.";
+    }
 
     if (!(m_flags & SourceApiSet)) {
         QQuickItem* newImage = qobject_cast<QQuickItem*>(qvariant_cast<QObject*>(image));
@@ -878,7 +890,11 @@
 // maintain it for a while for compatibility reasons.
 void UCUbuntuShape::setStretched(bool stretched)
 {
-    qmlInfo(this) << "'stretched' is deprecated. Use 'sourceFillMode' instead";
+    static bool deprecationNoteShown = false;
+    if (!deprecationNoteShown) {
+        deprecationNoteShown = true;
+        qmlInfo(this) << "'stretched' is deprecated. Use 'sourceFillMode' instead";
+    }
 
     if (!(m_flags & SourceApiSet)) {
         if (!!(m_flags & Stretched) != stretched) {
@@ -897,7 +913,11 @@
 // Deprecation layer. Same comment as setStretched().
 void UCUbuntuShape::setHorizontalAlignment(HAlignment horizontalAlignment)
 {
-    qmlInfo(this) << "'horizontalAlignment' is deprecated. Use 'sourceHorizontalAlignment' instead";
+    static bool deprecationNoteShown = false;
+    if (!deprecationNoteShown) {
+        deprecationNoteShown = true;
+        qmlInfo(this) << "'horizontalAlignment' is deprecated. Use 'sourceHorizontalAlignment' instead";
+    }
 
     if (!(m_flags & SourceApiSet)) {
         if (m_imageHorizontalAlignment != horizontalAlignment) {
@@ -912,7 +932,11 @@
 // Deprecation layer. Same comment as setStretched().
 void UCUbuntuShape::setVerticalAlignment(VAlignment verticalAlignment)
 {
-    qmlInfo(this) << "'horizontalAlignment' is deprecated. Use 'sourceVerticalAlignment' instead";
+    static bool deprecationNoteShown = false;
+    if (!deprecationNoteShown) {
+        deprecationNoteShown = true;
+        qmlInfo(this) << "'horizontalAlignment' is deprecated. Use 'sourceVerticalAlignment' instead";
+    }
 
     if (!(m_flags & SourceApiSet)) {
         if (m_imageVerticalAlignment != verticalAlignment) {