diff options
author | Tomasz Olszak <olszak.tomasz@gmail.com> | 2013-09-26 21:24:09 +0200 |
---|---|---|
committer | Jarosław Staniek <staniek@kde.org> | 2013-09-26 22:56:36 +0200 |
commit | 89f90d6581a92bd6d41b5de00386022eeca33bc2 (patch) | |
tree | bb3838f2980794adb281476e195ccf82d2fbfc95 | |
parent | fd66e35cc0b0f0d841d8aec46e85afd6ff89444e (diff) |
Examples now use Text instead of Label.
Label has renderType:Text.NativeRendering. When runnig on desktop
and renderType is set to Text.NativeRendering color changing
doesn't work.
Change-Id: Ia926e1532f684b9983802db2bff6e52342e333d4
Reviewed-by: Jarosław Staniek <staniek@kde.org>
-rw-r--r-- | examples/sensor-checker/content/SensorInformationItem.qml | 6 | ||||
-rw-r--r-- | examples/touch/content/AndroidDelegate.qml | 2 | ||||
-rw-r--r-- | examples/touch/content/ConfigurationPage.qml | 4 | ||||
-rw-r--r-- | examples/touch/content/DateTimeEditPage.qml | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/examples/sensor-checker/content/SensorInformationItem.qml b/examples/sensor-checker/content/SensorInformationItem.qml index 4c14dd6..bf1b4a8 100644 --- a/examples/sensor-checker/content/SensorInformationItem.qml +++ b/examples/sensor-checker/content/SensorInformationItem.qml @@ -46,7 +46,7 @@ Panel { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - Label { + Text { id: switchLabel color: TizenControls.palette.foreground text: "Compass" @@ -55,7 +55,7 @@ Panel { verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft font.family: TizenControls.defaultFontFamily - font.pixelSize: parent.height/2 + font.pixelSize: 50 fontSizeMode: Text.Fit } Switch { @@ -63,7 +63,7 @@ Panel { checked: false } } - Label { + Text { id: compassLabel anchors.margins: 10 color: TizenControls.palette.foreground diff --git a/examples/touch/content/AndroidDelegate.qml b/examples/touch/content/AndroidDelegate.qml index f4dd8a6..1321936 100644 --- a/examples/touch/content/AndroidDelegate.qml +++ b/examples/touch/content/AndroidDelegate.qml @@ -56,7 +56,7 @@ Item { visible: detailButton.pressed } - Label { + Text { id: textitem color: TizenControls.palette.foreground font.pixelSize: 32 diff --git a/examples/touch/content/ConfigurationPage.qml b/examples/touch/content/ConfigurationPage.qml index 63e5406..bd7fe81 100644 --- a/examples/touch/content/ConfigurationPage.qml +++ b/examples/touch/content/ConfigurationPage.qml @@ -40,7 +40,7 @@ Item { Panel { x: 15 width: root.width - 30 - Label { + Text { id: pageEffectLabel anchors.margins: 10 anchors.left: parent.left @@ -76,7 +76,7 @@ Item { else themeCheckBoxPanel.hide() } - Label { + Text { id: themeLabel anchors.margins: 10 anchors.left: parent.left diff --git a/examples/touch/content/DateTimeEditPage.qml b/examples/touch/content/DateTimeEditPage.qml index 05fefe9..ff8aff6 100644 --- a/examples/touch/content/DateTimeEditPage.qml +++ b/examples/touch/content/DateTimeEditPage.qml @@ -38,7 +38,7 @@ Item { anchors.centerIn: parent spacing: 50 Column { - Label { + Text { color: TizenControls.palette.foreground text:"Today" } @@ -47,7 +47,7 @@ Item { } } Column { - Label { + Text { color: TizenControls.palette.foreground text:"Tomorrow" } @@ -58,7 +58,7 @@ Item { } } Column { - Label { + Text { color: TizenControls.palette.foreground text:"Disabled" } @@ -68,7 +68,7 @@ Item { } } Column { - Label { + Text { color: TizenControls.palette.foreground text:"Time" } @@ -76,7 +76,7 @@ Item { TimeEdit { amPmDisplay: false } } Column { - Label { + Text { color: TizenControls.palette.foreground text:"Time AM/PM" } |