diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-03-02 14:30:51 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-09 11:03:23 +0100 |
| commit | 4b56661fd27cf6ce0c9410759fbd5c390e41dd69 (patch) | |
| tree | dc27d3cd25f308100d8176d371a3748f2abbf65e /examples/quick/text/imgtag | |
| parent | 356bdc098d6f120003db227416c788bd9d51048d (diff) | |
Update text examples to new guidelines
Change-Id: I6bbf414f3734bc2f29a7182746c5df158a5924da
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'examples/quick/text/imgtag')
| -rw-r--r-- | examples/quick/text/imgtag/TextWithImage.qml | 6 | ||||
| -rw-r--r-- | examples/quick/text/imgtag/imgtag.qml | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/examples/quick/text/imgtag/TextWithImage.qml b/examples/quick/text/imgtag/TextWithImage.qml index bc09aa2a52..5e6fba5df4 100644 --- a/examples/quick/text/imgtag/TextWithImage.qml +++ b/examples/quick/text/imgtag/TextWithImage.qml @@ -46,10 +46,4 @@ Text { wrapMode: Text.WordWrap textFormat: Text.StyledText horizontalAlignment: main.hAlign - - Rectangle { - border.color: "#efefef" - color: "transparent" - anchors.fill: parent - } } diff --git a/examples/quick/text/imgtag/imgtag.qml b/examples/quick/text/imgtag/imgtag.qml index 9d181af2cb..a28a4911c4 100644 --- a/examples/quick/text/imgtag/imgtag.qml +++ b/examples/quick/text/imgtag/imgtag.qml @@ -44,6 +44,7 @@ Rectangle { id: main width: 320; height: 480 focus: true + color: "#dedede" property var hAlign: Text.AlignLeft @@ -62,18 +63,13 @@ Rectangle { text: "This is a <b>happy</b> face<img src=\"images/face-smile.png\">" } TextWithImage { - text: "This is a <b>very<img src=\"images/face-smile-big.png\" align=\"middle\"/>happy</b> face aligned in the middle." - } - TextWithImage { - elide: Text.ElideRight - maximumLineCount: 2 - text: "This is a sad face aligned to the top. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc rutrum dui pretium ipsum malesuada venenatis. Nulla sed turpis risus. Integer sit amet odio quis mauris varius venenatis<img src=\"images/face-sad.png\" align=\"top\">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc rutrum dui pretium ipsum malesuada venenatis. Nulla sed turpis risus. Integer sit amet odio quis mauris varius venenatis." + text: "This is a <b>very<img src=\"images/face-smile-big.png\" align=\"middle\"/>happy</b> face vertically aligned in the middle." } TextWithImage { text: "This is a tiny<img src=\"images/face-smile.png\" width=\"15\" height=\"15\">happy face." } TextWithImage { - text: "This is a starfish<img src=\"images/starfish_2.png\" width=\"50\" height=\"50\" align=\"top\">aligned to the top and another one<img src=\"images/heart200.png\" width=\"50\" height=\"50\">aligned to the bottom." + text: "This is a<img src=\"images/starfish_2.png\" width=\"50\" height=\"50\" align=\"top\">aligned to the top and a<img src=\"images/heart200.png\" width=\"50\" height=\"50\">aligned to the bottom." } TextWithImage { text: "Qt logos<img src=\"images/qtlogo.png\" width=\"55\" height=\"60\" align=\"middle\"><img src=\"images/qtlogo.png\" width=\"37\" height=\"40\" align=\"middle\"><img src=\"images/qtlogo.png\" width=\"18\" height=\"20\" align=\"middle\">aligned in the middle with different sizes." |