Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntushape-qml-code-snippets-indentation into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

[UbuntuShape*] Fixed embedded QML code snippets indentation.

[UbuntuShape*] Fixed embedded QML code snippets indentation.

[Zsombor Egri (zsombi)]

Thanks for the fix, docs look nice now :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-03-06 11:45:09 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-03-10 11:56:07 +0000
@@ -224,21 +224,21 @@
     Examples:
 
     \qml
-        import Ubuntu.Components 1.2
-
-        UbuntuShape {
-            backgroundColor: "green"
+    import Ubuntu.Components 1.2
+
+    UbuntuShape {
+        backgroundColor: "green"
+    }
+    \endqml
+
+    \qml
+    import Ubuntu.Components 1.2
+
+    UbuntuShape {
+        source: Image {
+            source: "ubuntu.png"
         }
-    \endqml
-
-    \qml
-        import Ubuntu.Components 1.2
-
-        UbuntuShape {
-            source: Image {
-               source: "ubuntu.png"
-           }
-       }
+    }
     \endqml
 */
 UCUbuntuShape::UCUbuntuShape(QQuickItem* parent)
@@ -336,26 +336,26 @@
     It can be set either with an inlined \c Image:
 
     \qml
-        Item {
-            UbuntuShape {
-                source: Image { source: "ubuntu.png" }
-            }
+    Item {
+        UbuntuShape {
+            source: Image { source: "ubuntu.png" }
         }
+    }
     \endqml
 
     or with an \c Image \c id:
 
     \qml
-        Item {
-            Image {
-                id: img
-                visible: false
-                source: "ubuntu.png"
-            }
-            UbuntuShape {
-                source: img
-            }
-        }
+    Item {
+        Image {
+            id: img
+            visible: false
+            source: "ubuntu.png"
+        }
+        UbuntuShape {
+            source: img
+        }
+    }
     \endqml
 
     Note that in this case, the \c Image is stored in the scene tree as any other items. So setting
@@ -575,10 +575,10 @@
     Here is a code sample showing how to apply an horizontal flip:
 
     \qml
-        UbuntuShape {
-            source: Image { source: "ubuntu.png" }
-            sourceScale: Qt.vector2d(-1.0, 1.0)
-        }
+    UbuntuShape {
+        source: Image { source: "ubuntu.png" }
+        sourceScale: Qt.vector2d(-1.0, 1.0)
+    }
     \endqml
 
     \note Setting this disables support for the deprecated \l image property.

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-03-05 10:42:54 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-03-10 11:56:07 +0000
@@ -102,13 +102,13 @@
     Example:
 
     \qml
-        import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.2
 
-        UbuntuShapeOverlay {
-            backgroundColor: "white"
-            overlayColor: "black"
-            overlayGeometry: Qt.rect(0.25, 0.25, 0.5, 0.5)
-        }
+    UbuntuShapeOverlay {
+        backgroundColor: "white"
+        overlayColor: "black"
+        overlayGeometry: Qt.rect(0.25, 0.25, 0.5, 0.5)
+    }
     \endqml
 */
 UCUbuntuShapeOverlay::UCUbuntuShapeOverlay(QQuickItem* parent)
@@ -131,22 +131,22 @@
     at the vertical center can be done like that:
 
     \qml
-        UbuntuShapeOverlay {
-            width: 200; height: 200
-            overlayColor: Qt.rgba(0.0, 0.0, 0.5, 0.5)
-            overlayGeometry: Qt.rect(0.0, 0.5, 1.0, 0.5)
-        }
+    UbuntuShapeOverlay {
+        width: 200; height: 200
+        overlayColor: Qt.rgba(0.0, 0.0, 0.5, 0.5)
+        overlayGeometry: Qt.rect(0.0, 0.5, 1.0, 0.5)
+    }
     \endqml
 
     Converting a position and a size in pixels to normalized item coordinates can be done with a
     division by the size. Here is an equivalent of the previous code sample:
 
     \qml
-        UbuntuShapeOverlay {
-            width: 200; height: 200
-            overlayColor: Qt.rgba(0.0, 0.0, 0.5, 0.5)
-            overlayGeometry: Qt.rect(100.0/width, 100.0/height, 200.0/width, 100.0/height)
-        }
+    UbuntuShapeOverlay {
+        width: 200; height: 200
+        overlayColor: Qt.rgba(0.0, 0.0, 0.5, 0.5)
+        overlayGeometry: Qt.rect(100.0/width, 100.0/height, 200.0/width, 100.0/height)
+    }
     \endqml
 
     A geometry exceeding the item area is cropped.