Merge lp:~zsombi/ubuntu-ui-toolkit/cpp-Label into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Moving Label to cpp.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1604
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2220/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/948/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/950/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/947/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1605
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2222/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/950/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/952/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/949/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

+ * \qmlproperty enumeration LabelBase::adaptiveSize
Third party comment: why not just "size"?

[Zsombor Egri (zsombi)]

> + * \qmlproperty enumeration LabelBase::adaptiveSize
> Third party comment: why not just "size"?

Hmm... I don't know :) It can be size :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1606
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2255/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/983/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/985/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/982/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1609
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2258/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/986/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/988/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/985/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1610
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2261/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/989
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/991
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/991/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/988

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

+ property TextSize textSize 1.3

+ property int adaptiveLabelSize

Why the totally different names? They both take Label.TextSize and set the exact same thing. How about adaptiveFontSize in both cases?

- QTest::newRow("single MainView") << "MainView.qml" << QUrl();
+// QTest::newRow("single MainView") << "MainView.qml" << QUrl();

What's up with this?

+ qmlInfo(this) << "'fontSize' is deprecated, use 'textSize' property instead.";

Please use SUPPRESS_DEPRECATED_NOTE here so you won't see it unless it's set to no, as done elsewhere now.

+ switch (reinterpret_cast<int*>(fontSize.toLatin1().data())[0]) {

Can you avoid duplicating this? As a method or macro.

Should we maybe have a simple unit test that checks that setting "medium" results in the same pixelSize as Label.Medium?

review: Needs Fixing

[Cris Dywan (kalikiana)]

Very nice!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1613
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2271/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/999
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1001
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1001/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/998

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

Looks good. The PageHeadStyle will probably soon be replaced by some kind of PageHeaderStyle anyway. Or maybe the PageHeader will anyway have direct access to the Labels. So this can go.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/1096/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/404/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/403/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/403/console

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/cpp-Label]

1614. By Zsombor Egri on 2015-09-24

staging sync

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1614
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2293/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1021
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1023
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1023/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1020

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

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-09-22 18:20:39 +0000
+++ components.api	2015-09-24 05:10:37 +0000
@@ -434,6 +434,14 @@
     property string fontSize
 Ubuntu.Components.Label 1.3: Text
     property string fontSize
+    property TextSize textSize 1.3
+Ubuntu.Components.Label.TextSize: Enum
+    Large
+    Medium
+    Small
+    XLarge
+    XSmall
+    XxSmall
 Ubuntu.Layouts.Layouts 1.0 0.1: Item
     readonly property string currentLayout
     readonly property ConditionalLayout layouts
@@ -642,15 +650,25 @@
     property Action backAction
     property Item contents
     property PageHeadConfiguration head
-Ubuntu.Components.Styles.PageHeadStyle 1.3 1.1: Item
-    property double contentHeight
-    property string fontSize
-    property int fontWeight
-    property int maximumNumberOfActions
-    property url separatorBottomSource
-    property url separatorSource
-    property color textColor
-    property double textLeftMargin
+Ubuntu.Components.Styles.PageHeadStyle 1.1: Item
+    property double contentHeight
+    property string fontSize
+    property int fontWeight
+    property int maximumNumberOfActions
+    property url separatorBottomSource
+    property url separatorSource
+    property color textColor
+    property double textLeftMargin
+Ubuntu.Components.Styles.PageHeadStyle 1.3: Item
+    property double contentHeight
+    property string fontSize
+    property int fontWeight
+    property int maximumNumberOfActions
+    property url separatorBottomSource
+    property url separatorSource
+    property color textColor
+    property double textLeftMargin
+    property int textSize
 Ubuntu.Components.PageStack 1.0 0.1: PageTreeNode
     property Item currentPage
     property int depth

=== modified file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install'
--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2015-05-05 09:06:13 +0000
+++ debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2015-09-24 05:10:37 +0000
@@ -27,6 +27,7 @@
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/1.3/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.2/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.3/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Test
 usr/share/locale/*/LC_MESSAGES/ubuntu-ui-toolkit.mo

=== modified file 'examples/calculator/calculator.qml'
--- examples/calculator/calculator.qml	2015-04-25 08:18:45 +0000
+++ examples/calculator/calculator.qml	2015-09-24 05:10:37 +0000
@@ -77,7 +77,7 @@
                         width: units.gu(3)
                         height: parent.height
                         text: "M"
-                        fontSize: "large"
+                        textSize: Label.Large
                         font.bold: true
                     }
                 }

=== modified file 'examples/jokes/jokes.qml'
--- examples/jokes/jokes.qml	2015-04-25 08:18:45 +0000
+++ examples/jokes/jokes.qml	2015-09-24 05:10:37 +0000
@@ -105,7 +105,7 @@
             id: jokeHolder
             anchors.fill: parent
             text: "Tap here!"
-            fontSize: "large"
+            textSize: Label.Large
             color: Theme.palette.normal.baseText
             textFormat: Text.RichText
             horizontalAlignment: Text.AlignHCenter

=== modified file 'examples/locale/locale.qml'
--- examples/locale/locale.qml	2015-04-29 07:21:29 +0000
+++ examples/locale/locale.qml	2015-09-24 05:10:37 +0000
@@ -106,27 +106,27 @@
                 anchors.fill: parent
                 spacing: units.gu(0.5)
                 Label {
-                    fontSize: "large"
+                    textSize: Label.Large
                     property var date: new Date()
                     text: "Date: " + date.toLocaleDateString(Qt.locale(root.locale))
                 }
                 Label {
-                    fontSize: "large"
+                    textSize: Label.Large
                     property var date: new Date()
                     text: "Time: " + date.toLocaleTimeString(Qt.locale(root.locale))
                 }
                 Label {
-                    fontSize: "large"
+                    textSize: Label.Large
                     property var dow: Qt.locale(root.locale).firstDayOfWeek
                     text: "First day of week: " + Qt.locale(root.locale).standaloneDayName(dow)
                 }
                 Label {
-                    fontSize: "large"
+                    textSize: Label.Large
                     property var num: 10023823
                     text: "Number: " + num.toLocaleString(Qt.locale(root.locale))
                 }
                 Label {
-                    fontSize: "large"
+                    textSize: Label.Large
                     property var num: 10023823
                     text: "Currency: " + num.toLocaleCurrencyString(Qt.locale(root.locale))
                 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Label.qml'
--- examples/ubuntu-ui-toolkit-gallery/Label.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Label.qml	2015-09-24 05:10:37 +0000
@@ -27,27 +27,27 @@
             spacing: units.gu(2)
 
             Label {
-                fontSize: "xx-small"
+                textSize: Label.XxSmall
                 text: "xx-small"
             }
             Label {
-                fontSize: "x-small"
+                textSize: Label.XSmall
                 text: "x-small"
             }
             Label {
-                fontSize: "small"
+                textSize: Label.Small
                 text: "small"
             }
             Label {
-                fontSize: "medium"
+                textSize: Label.Medium
                 text: "medium"
             }
             Label {
-                fontSize: "large"
+                textSize: Label.Large
                 text: "large"
             }
             Label {
-                fontSize: "x-large"
+                textSize: Label.XLarge
                 text: "x-large"
             }
         }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/TemplateSection.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateSection.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/TemplateSection.qml	2015-09-24 05:10:37 +0000
@@ -33,7 +33,7 @@
         Label {
             id: label
             text: templateSection.title
-            fontSize: "large"
+            textSize: Label.Large
             anchors.left: parent.left
         }
 
@@ -45,7 +45,7 @@
             label: title ? "API Documentation" : "%1 API Documentation".arg(className)
             url: prefix + documentation
             visible: documentation != ""
-            fontSize: "small"
+            textSize: Label.Small
         }
     }
 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml	2015-09-24 05:10:37 +0000
@@ -32,7 +32,7 @@
     Label {
         id: label
         text: templateSection.title
-        fontSize: "large"
+        textSize: Label.Large
         anchors.left: parent.left
     }
 
@@ -42,14 +42,14 @@
         label: title ? "API Documentation" : "%1 API Documentation".arg(className)
         url: prefix + documentation
         visible: documentation != ""
-        fontSize: "small"
+        textSize: Label.Small
         anchors.left: parent.left
     }
 
     WebLink {
         label: "Design guidelines"
         url: templateSection.designUrl
-        fontSize: "small"
+        textSize: Label.Small
         anchors.left: parent.left
     }
 

=== modified file 'examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml'
--- examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml	2015-07-23 14:32:47 +0000
+++ examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml	2015-09-24 05:10:37 +0000
@@ -37,7 +37,7 @@
                 Label {
                     anchors.centerIn: parent
                     text: "Inset"
-                    fontSize: "x-small"
+                    textSize: Label.XSmall
                     color: theme.palette.normal.foregroundText
                 }
             }
@@ -50,7 +50,7 @@
                 Label {
                     anchors.centerIn: parent
                     text: "DropShadow"
-                    fontSize: "xx-small"
+                    textSize: Label.XxSmall
                     color: theme.palette.normal.foregroundText
                 }
             }
@@ -63,7 +63,7 @@
                 Label {
                     anchors.centerIn: parent
                     text: "Flat"
-                    fontSize: "xx-small"
+                    textSize: Label.XxSmall
                     color: theme.palette.normal.foregroundText
                 }
             }
@@ -81,7 +81,7 @@
                 Label {
                     anchors.centerIn: parent
                     text: "small"
-                    fontSize: "xx-small"
+                    textSize: Label.XxSmall
                     color: theme.palette.normal.foregroundText
                 }
             }
@@ -93,7 +93,7 @@
                 Label {
                     anchors.centerIn: parent
                     text: "medium"
-                    fontSize: "xx-small"
+                    textSize: Label.XxSmall
                     color: theme.palette.normal.foregroundText
                 }
             }
@@ -105,7 +105,7 @@
                 Label {
                     anchors.centerIn: parent
                     text: "large"
-                    fontSize: "xx-small"
+                    textSize: Label.XxSmall
                     color: theme.palette.normal.foregroundText
                 }
             }

=== modified file 'examples/unit-converter/unit-converter.qml'
--- examples/unit-converter/unit-converter.qml	2015-04-25 08:18:45 +0000
+++ examples/unit-converter/unit-converter.qml	2015-09-24 05:10:37 +0000
@@ -118,7 +118,7 @@
                             spacing: units.gu(1)
                             Label {
                                 text: i18n.tr(modelData.unit)
-                                fontSize: "large"
+                                textSize: Label.Large
                                 width: root.labelWidth
                                 height: input.height
                                 verticalAlignment: Text.AlignVCenter

=== modified file 'src/Ubuntu/Components/1.3/BottomEdgeHint.qml'
--- src/Ubuntu/Components/1.3/BottomEdgeHint.qml	2015-07-24 13:28:17 +0000
+++ src/Ubuntu/Components/1.3/BottomEdgeHint.qml	2015-09-24 05:10:37 +0000
@@ -134,7 +134,7 @@
             horizontalCenter: parent.horizontalCenter
         }
         text: icon.name ? "" : bottomEdgeHint.text
-        fontSize: "medium"
+        textSize: Label.Medium
         height: bottomEdgeHint.height
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter

=== modified file 'src/Ubuntu/Components/1.3/Captions.qml'
--- src/Ubuntu/Components/1.3/Captions.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/Captions.qml	2015-09-24 05:10:37 +0000
@@ -64,7 +64,7 @@
       subtitle.text: "Subtitle"
       Label {
           text: "third line"
-          fontSize: "xx-small"
+          textSize: Label.XxSmall
       }
   }
   \endqml
@@ -129,7 +129,7 @@
             left: parent.left
             right: parent.right
         }
-        fontSize: (captionStyle == Ubuntu.SummaryCaptionStyle) ? "small" : "medium"
+        textSize: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Label.Small : Label.Medium
         horizontalAlignment: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Text.AlignRight : Text.AlignLeft
         visible: text !== ""
         elide: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.ElideRight : Text.ElideNone
@@ -140,7 +140,7 @@
             left: parent.left
             right: parent.right
         }
-        fontSize: "small"
+        textSize: Label.Small
         horizontalAlignment: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Text.AlignRight : Text.AlignLeft
         visible: text !== ""
         maximumLineCount: (captionStyle == Ubuntu.TitleCaptionStyle) ? 2 : 1

=== removed file 'src/Ubuntu/Components/1.3/Label.qml'
--- src/Ubuntu/Components/1.3/Label.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/Label.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-
-/*!
-    \qmltype Label
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief Text with Ubuntu styling.
-
-    Example:
-    \qml
-    Rectangle {
-        color: UbuntuColors.coolGrey
-        width: units.gu(30)
-        height: units.gu(30)
-
-        Label {
-            anchors.centerIn: parent
-            text: "Hello, world!"
-            fontSize: "large"
-        }
-    }
-    \endqml
-*/
-Text {
-    id: label
-
-    /*!
-      The size of the text. One of the following strings (from smallest to largest):
-        \list
-          \li "xx-small"
-          \li "x-small"
-          \li "small"
-          \li "medium"
-          \li "large"
-          \li "x-large"
-        \endlist
-        Default value is "medium".
-      */
-    property string fontSize: "medium"
-
-    font.pixelSize: FontUtils.sizeToPixels(fontSize)
-    color: theme.palette.selected.backgroundText
-}

=== modified file 'src/Ubuntu/Components/1.3/OptionSelector.qml'
--- src/Ubuntu/Components/1.3/OptionSelector.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/OptionSelector.qml	2015-09-24 05:10:37 +0000
@@ -202,7 +202,7 @@
             right: parent.right
         }
 
-        Label {
+        Toolkit.Label {
             id : label
 
             text: optionSelector.text

=== modified file 'src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml'
--- src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml	2015-07-16 10:57:11 +0000
+++ src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml	2015-09-24 05:10:37 +0000
@@ -322,17 +322,17 @@
             width: option.width - leftIcon.width - image.width
                 - parent.spacing * 2 - parent.anchors.leftMargin
 
-            Label {
+            Toolkit.Label {
                 text: option.text === "" ? modelData : option.text
                 width: parent.width
                 elide: Text.ElideRight
             }
-            Label {
+            Toolkit.Label {
                 text: option.subText
                 width: parent.width
                 elide: Text.ElideRight
                 visible: option.subText !== "" ? true : false
-                fontSize: "small"
+                textSize: Toolkit.Label.Small
             }
         }
 

=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
--- src/Ubuntu/Components/1.3/TextArea.qml	2015-08-11 17:15:59 +0000
+++ src/Ubuntu/Components/1.3/TextArea.qml	2015-09-24 05:10:37 +0000
@@ -805,10 +805,10 @@
     Keys.onReleased: event.accepted = (event.key === Qt.Key_Enter) || (event.key === Qt.Key_Return)
 
     // holding default values
-    Label { id: fontHolder }
+    Ubuntu.Label { id: fontHolder }
 
     //hint
-    Label {
+    Ubuntu.Label {
         id: hint
         anchors {
             fill: parent

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-08-20 06:56:44 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2015-09-24 05:10:37 +0000
@@ -930,7 +930,7 @@
     }
 
     // hint text
-    Label {
+    Ubuntu.Label {
         id: hint
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: editor.horizontalAlignment

=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-09-03 13:12:12 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2015-09-24 05:10:37 +0000
@@ -94,7 +94,6 @@
              1.3/dateUtils.js \
              1.3/DraggingArea.qml \
              1.3/InputHandler.qml \
-             1.3/Label.qml \
              1.3/MainViewBase.qml \
              1.3/MainView.qml \
              1.3/mathUtils.js \

=== modified file 'src/Ubuntu/Components/ListItems/1.3/Caption.qml'
--- src/Ubuntu/Components/ListItems/1.3/Caption.qml	2015-05-27 14:15:17 +0000
+++ src/Ubuntu/Components/ListItems/1.3/Caption.qml	2015-09-24 05:10:37 +0000
@@ -60,6 +60,6 @@
         wrapMode: Text.Wrap
         color: theme.palette.normal.backgroundText
         horizontalAlignment: Text.AlignLeft
-        fontSize: "small"
+        textSize: Label.Small
     }
 }

=== modified file 'src/Ubuntu/Components/ListItems/1.3/Empty.qml'
--- src/Ubuntu/Components/ListItems/1.3/Empty.qml	2015-08-24 16:02:50 +0000
+++ src/Ubuntu/Components/ListItems/1.3/Empty.qml	2015-09-24 05:10:37 +0000
@@ -401,7 +401,7 @@
                             verticalCenter: parent.verticalCenter
                         }
                         width: units.gu(7)
-                        fontSize: "medium"
+                        textSize: Label.Medium
                     }
                 }
 

=== modified file 'src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml'
--- src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml	2015-04-29 07:21:29 +0000
+++ src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml	2015-09-24 05:10:37 +0000
@@ -30,7 +30,6 @@
         return item.parent.hasOwnProperty("pointerTarget") || label.isInsideOverlay(item.parent)
     }
 
-    fontSize: "medium"
     elide: Text.ElideRight
     color: selected ? UbuntuColors.orange : secondary ? overlay ? theme.palette.normal.overlayText : theme.palette.normal.backgroundText
                                                       : overlay ? theme.palette.selected.overlayText : theme.palette.selected.backgroundText

=== modified file 'src/Ubuntu/Components/ListItems/1.3/ListItemHeader.qml'
--- src/Ubuntu/Components/ListItems/1.3/ListItemHeader.qml	2015-09-16 20:48:01 +0000
+++ src/Ubuntu/Components/ListItems/1.3/ListItemHeader.qml	2015-09-24 05:10:37 +0000
@@ -58,7 +58,6 @@
 
     LabelVisual {
         id: label
-        fontSize: "medium"
         font.weight: Text.Normal
         anchors {
             verticalCenter: parent.verticalCenter

=== modified file 'src/Ubuntu/Components/ListItems/1.3/MultiValue.qml'
--- src/Ubuntu/Components/ListItems/1.3/MultiValue.qml	2015-04-29 07:21:29 +0000
+++ src/Ubuntu/Components/ListItems/1.3/MultiValue.qml	2015-09-24 05:10:37 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype MultiValue
@@ -76,7 +77,7 @@
                 left: parent.left
                 right: parent.right
             }
-            fontSize: "small"
+            textSize: Label.Small
             text: concatenatedValues(multiValueListItem.values)
 
             function concatenatedValues(values) {

=== modified file 'src/Ubuntu/Components/ListItems/1.3/SingleValue.qml'
--- src/Ubuntu/Components/ListItems/1.3/SingleValue.qml	2015-04-29 07:21:29 +0000
+++ src/Ubuntu/Components/ListItems/1.3/SingleValue.qml	2015-09-24 05:10:37 +0000
@@ -76,6 +76,5 @@
             leftMargin: listItem.__contentsMargins
         }
         horizontalAlignment: Text.AlignRight
-        fontSize: "medium"
     }
 }

=== modified file 'src/Ubuntu/Components/ListItems/1.3/Subtitled.qml'
--- src/Ubuntu/Components/ListItems/1.3/Subtitled.qml	2015-04-29 07:21:29 +0000
+++ src/Ubuntu/Components/ListItems/1.3/Subtitled.qml	2015-09-24 05:10:37 +0000
@@ -104,7 +104,7 @@
                 right: parent.right
                 top: label.bottom
             }
-            fontSize: "small"
+            textSize: Label.Small
             wrapMode: Text.Wrap
             maximumLineCount: 5
         }

=== modified file 'src/Ubuntu/Components/ListItems/1.3/ValueSelector.qml'
--- src/Ubuntu/Components/ListItems/1.3/ValueSelector.qml	2015-04-29 07:21:29 +0000
+++ src/Ubuntu/Components/ListItems/1.3/ValueSelector.qml	2015-09-24 05:10:37 +0000
@@ -185,7 +185,7 @@
                     leftMargin: selector.__contentsMargins
                     left: label.right
                 }
-                fontSize: "small"
+                textSize: Label.Small
                 text: selector.values[selector.selectedIndex]
                 font.bold: selector.expanded
                 horizontalAlignment: Text.AlignRight

=== modified file 'src/Ubuntu/Components/Popups/1.3/Dialog.qml'
--- src/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-08-11 02:03:59 +0000
+++ src/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-09-24 05:10:37 +0000
@@ -190,7 +190,7 @@
                     wrapMode: Text.Wrap
                     maximumLineCount: 2
                     elide: Text.ElideRight
-                    fontSize: "large"
+                    textSize: Label.Large
                     color: UbuntuColors.darkGrey
                     visible: (text !== "")
                 }
@@ -198,7 +198,6 @@
                 Label {
                     horizontalAlignment: Text.AlignHCenter
                     text: dialog.text
-                    fontSize: "medium"
                     color: UbuntuColors.darkGrey
                     wrapMode: Text.Wrap
                     visible: (text !== "")

=== added directory 'src/Ubuntu/Components/Styles/1.3'
=== added file 'src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml'
--- src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml	2015-09-24 05:10:37 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+
+/*!
+    \qmltype PageHeadStyle
+    \inqmlmodule Ubuntu.Components.Styles 1.1
+    \ingroup style-api
+    \brief Style API for page header.
+
+    The component defines the style API for the page header component.
+  */
+Item {
+    /*!
+      The height of the header excluding the height of the bottom divider and
+      the (optional) row that displays the sections.
+     */
+    property real contentHeight
+
+    /*!
+      The source of the image that separates the header from the contents of a \l MainView.
+      The separator will be drawn over the contents. Set to empty string to use the new
+      header separator.
+      \deprecated
+     */
+    property url separatorSource
+
+    /*!
+      The source of an additional image attached to the bottom of the separator. The contents
+      of the \l MainView will be drawn on top of the separator bottom image.
+      This property is ignored when separatorSource is an empty string.
+      \deprecated
+     */
+    property url separatorBottomSource
+
+    /*!
+      The size of the title font.
+      \deprecated
+     */
+    property string fontSize
+
+    /*!
+      The size of the title Label.
+      */
+    property int textSize
+
+    /*!
+      The weight of the title font.
+     */
+    property int fontWeight
+
+    /*!
+      \deprecated
+     */
+    property color textColor
+
+    /*!
+      Left margin of title text.
+     */
+    property real textLeftMargin
+
+    /*!
+      The number of slots for actions in the header, including the optional
+      (custom or automatic) back button in the left side of the header.
+      If the number of actions defined is larger than the numer of actions
+      specified here, extra actions are put into an overflow.
+     */
+    property int maximumNumberOfActions
+}

=== modified file 'src/Ubuntu/Components/Styles/Styles.pro'
--- src/Ubuntu/Components/Styles/Styles.pro	2015-05-19 13:17:41 +0000
+++ src/Ubuntu/Components/Styles/Styles.pro	2015-09-24 05:10:37 +0000
@@ -5,6 +5,7 @@
 QML_FILES += 1.2/ComboButtonStyle.qml \
              1.2/PageHeadStyle.qml \
              1.2/PullToRefreshStyle.qml \
+             1.3/PageHeadStyle.qml \
              $$ARTWORK_FILES
 
 load(ubuntu_qml_module)

=== modified file 'src/Ubuntu/Components/Styles/qmldir'
--- src/Ubuntu/Components/Styles/qmldir	2015-07-13 12:27:35 +0000
+++ src/Ubuntu/Components/Styles/qmldir	2015-09-24 05:10:37 +0000
@@ -4,4 +4,5 @@
 PageHeadStyle 1.1 1.2/PageHeadStyle.qml
 
 #version 1.2 introduced by ListItemStyle
-PageHeadStyle 1.3 1.2/PageHeadStyle.qml
+#version 1.3
+PageHeadStyle 1.3 1.3/PageHeadStyle.qml

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml	2015-04-25 07:36:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml	2015-09-24 05:10:37 +0000
@@ -50,7 +50,6 @@
             verticalCenter: parent.verticalCenter
             verticalCenterOffset: units.dp(-1)
         }
-        fontSize: "medium"
         elide: Text.ElideRight
     }
 

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml	2015-05-26 10:54:14 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml	2015-09-24 05:10:37 +0000
@@ -66,7 +66,7 @@
             color: iconButtonStyle.foregroundColor
             opacity: styledItem.enabled ? 1.0 : 0.3
             text: styledItem.text
-            fontSize: "xx-small"
+            textSize: Label.XxSmall
         }
     }
     Loader {

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml	2015-08-18 09:13:48 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml	2015-09-24 05:10:37 +0000
@@ -106,7 +106,7 @@
             }
             // In the tabs overflow panel there are no icons, and the font-size
             //  is medium as opposed to the small font-size in the actions overflow panel.
-            fontSize: actionIcon.visible ? "small" : "medium"
+            textSize: actionIcon.visible ? Label.Small : Label.Medium
             elide: Text.ElideRight
             text: action.text
             color: overflow.foregroundColor

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml	2015-05-21 20:47:27 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml	2015-09-24 05:10:37 +0000
@@ -57,7 +57,7 @@
             color: button.color
             opacity: button.enabled ? 1.0 : 0.3
             text: button.text
-            fontSize: "xx-small"
+            textSize: Label.XxSmall
         }
     }
     Loader {

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2015-07-17 16:27:55 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2015-09-24 05:10:37 +0000
@@ -23,7 +23,7 @@
     objectName: "PageHeadStyle" // used in unit tests
     contentHeight: units.gu(6)
     fontWeight: Font.Light
-    fontSize: "large"
+    textSize: Label.Large
     textLeftMargin: units.gu(2)
     maximumNumberOfActions: 3
 
@@ -358,7 +358,7 @@
                 }
                 text: headerStyle.config.title
                 font.weight: headerStyle.fontWeight
-                fontSize: headerStyle.fontSize
+                textSize: headerStyle.textSize
                 color: headerStyle.titleColor
                 elide: Text.ElideRight
             }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml	2015-04-24 14:07:02 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml	2015-09-24 05:10:37 +0000
@@ -46,7 +46,6 @@
     Label {
         id: valueLabel
         anchors.centerIn: background
-        fontSize: "medium"
         color: backgroundTextColor
         text: progressBar.indeterminate ? i18n.dtr("ubuntu-ui-toolkit", "In Progress")
               : "%1%".arg(Number(progressBarStyle.progress * 100.0).toFixed(0))

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2015-06-16 23:18:45 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2015-09-24 05:10:37 +0000
@@ -43,7 +43,7 @@
     /*!
       The font size for the text in the buttons.
      */
-    property string fontSize: "small"
+    property int textSize: Label.Small
 
     /*!
       The spacing on the left and right sides of the label
@@ -94,7 +94,7 @@
                     objectName: "section_button_label_" + index
                     // modelData may be either a string, or an Action
                     text: modelData.hasOwnProperty("text") ? modelData.text : modelData
-                    fontSize: sectionsStyle.fontSize
+                    textSize: sectionsStyle.textSize
                     anchors.centerIn: parent
                     color: sectionButton.selected ?
                                sectionsStyle.selectedSectionColor :

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml	2015-07-22 13:14:43 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml	2015-09-24 05:10:37 +0000
@@ -116,7 +116,7 @@
             id: label
             anchors.centerIn: parent
             text: styledItem.formatValue(SliderUtils.liveValue(styledItem))
-            fontSize: "large"
+            textSize: Label.Large
             color: theme.palette.normal.overlayText
         }
     }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/TabBarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/TabBarStyle.qml	2015-04-24 14:07:02 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/TabBarStyle.qml	2015-09-24 05:10:37 +0000
@@ -40,7 +40,7 @@
     property int headerTextFadeDuration: animate ? 350 : 0
     property url indicatorImageSource: Qt.resolvedUrl("../artwork/chevron.png")
 
-    property string headerFontSize: "x-large"
+    property string headerAdaptiveLabelSize: Label.XLarge
     property int headerTextStyle: Text.Normal
     property color headerTextStyleColor: theme.palette.normal.backgroundText
     property int headerFontWeight: Font.Light
@@ -202,7 +202,7 @@
                             baselineOffset: -headerTextBottomMargin
                         }
                         text: (model.hasOwnProperty("tab") && tab.hasOwnProperty("title")) ? tab.title : title
-                        fontSize: headerFontSize
+                        textSize: headerAdaptiveLabelSize
                         font.weight: headerFontWeight
                         style: headerTextStyle
                         styleColor: headerTextStyleColor

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml	2015-04-25 07:36:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml	2015-09-24 05:10:37 +0000
@@ -52,7 +52,7 @@
             }
             width: paintedWidth
             text: styledItem.text
-            fontSize: "x-small"
+            textSize: Label.XSmall
         }
     }
 

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-09-22 18:20:39 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-09-24 05:10:37 +0000
@@ -67,6 +67,7 @@
 #include "uchaptics.h"
 #include "ucabstractbutton.h"
 #include "ucheader.h"
+#include "uclabel.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -242,6 +243,7 @@
     qmlRegisterType<LiveTimer>(uri, 1, 3, "LiveTimer");
     qmlRegisterType<UCAbstractButton>(uri, 1, 3, "AbstractButton");
     qmlRegisterType<UCHeader>(uri, 1, 3, "Header");
+    qmlRegisterType<UCLabel, 1>(uri, 1, 3, "Label");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-09-22 18:20:39 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-09-24 05:10:37 +0000
@@ -85,7 +85,8 @@
     $$PWD/uchaptics.h \
     $$PWD/ucabstractbutton.h \
     $$PWD/ucthemingextension.h \
-    $$PWD/ucheader.h
+    $$PWD/ucheader.h \
+    $$PWD/uclabel.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \
@@ -143,7 +144,8 @@
     $$PWD/uchaptics.cpp \
     $$PWD/ucabstractbutton.cpp \
     $$PWD/ucthemingextension.cpp \
-    $$PWD/ucheader.cpp
+    $$PWD/ucheader.cpp \
+    $$PWD/uclabel.cpp
 
 # adapters
 SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp

=== modified file 'src/Ubuntu/Components/plugin/ucfontutils.cpp'
--- src/Ubuntu/Components/plugin/ucfontutils.cpp	2015-03-03 13:47:48 +0000
+++ src/Ubuntu/Components/plugin/ucfontutils.cpp	2015-09-24 05:10:37 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -64,7 +64,7 @@
  */
 qreal UCFontUtils::sizeToPixels(const QString &size)
 {
-    return modularScale(size) * UCUnits::instance().dp(14);
+    return modularScale(size) * UCUnits::instance().dp(fontUnits);
 }
 
 /*!
@@ -82,18 +82,17 @@
  */
 qreal UCFontUtils::modularScale(const QString &size)
 {
-    if (size == "xx-small") {
-        return 0.677;
-    } else if (size == "x-small") {
-        return 0.804;
-    } else if (size == "small") {
-        return 0.931;
-    } else if (size == "medium") {
-        return 1.079;
-    } else if (size == "large") {
-        return 1.291;
-    } else if (size == "x-large") {
-        return 1.714;
-    }
-    return 0.0;
+    if (size.size() < 4) {
+        return 0.0;
+    }
+
+    switch (SCALE_CODE(size)) {
+        case SCALE_MEDIUM: { return mediumScale; }
+        case SCALE_LARGE: { return largeScale; }
+        case SCALE_SMALL: { return smallScale; }
+        case SCALE_XLARGE: { return xLargeScale; }
+        case SCALE_XSMALL: { return xSmallScale; }
+        case SCALE_XXSMALL: { return xxSmallScale; }
+        default: { return 0.0; }
+    }
 }

=== modified file 'src/Ubuntu/Components/plugin/ucfontutils.h'
--- src/Ubuntu/Components/plugin/ucfontutils.h	2013-05-20 11:38:32 +0000
+++ src/Ubuntu/Components/plugin/ucfontutils.h	2015-09-24 05:10:37 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -23,7 +23,15 @@
 class UCFontUtils : public QObject
 {
     Q_OBJECT
+
 public:
+    static constexpr float fontUnits = 14.0f;
+    static constexpr float xxSmallScale = 0.677f;
+    static constexpr float xSmallScale = 0.804f;
+    static constexpr float smallScale = 0.931f;
+    static constexpr float mediumScale = 1.079f;
+    static constexpr float largeScale = 1.291f;
+    static constexpr float xLargeScale = 1.714f;
 
     static UCFontUtils& instance()
     {
@@ -37,4 +45,12 @@
     Q_INVOKABLE qreal modularScale(const QString &size);
 };
 
+#define SCALE_CODE(size)    reinterpret_cast<int*>(size.toLatin1().data())[0]
+#define SCALE_MEDIUM        0x6964656d // "medi"
+#define SCALE_LARGE         0x6772616c // "larg"
+#define SCALE_SMALL         0x6c616d73 // "smal"
+#define SCALE_XLARGE        0x616c2d78 // "x-la"
+#define SCALE_XSMALL        0x6d732d78 // "x-sm"
+#define SCALE_XXSMALL       0x732d7878 // "xx-s"
+
 #endif // UCFONTUTILS_H

=== added file 'src/Ubuntu/Components/plugin/uclabel.cpp'
--- src/Ubuntu/Components/plugin/uclabel.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/uclabel.cpp	2015-09-24 05:10:37 +0000
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "uclabel.h"
+#include "ucfontutils.h"
+#include "ucunits.h"
+#include "uctheme.h"
+#include "quickutils.h"
+
+void UCLabel::updatePixelSize()
+{
+    if (m_flags & PixelSizeSet) {
+        return;
+    }
+    const float sizes[] = {
+        UCFontUtils::xxSmallScale, UCFontUtils::xSmallScale, UCFontUtils::smallScale,
+        UCFontUtils::mediumScale, UCFontUtils::largeScale, UCFontUtils::xLargeScale
+    };
+    QFont textFont = font();
+    textFont.setPixelSize(
+        qRound(sizes[m_textSize] * UCUnits::instance().dp(UCFontUtils::fontUnits)));
+    setFont(textFont);
+    // remove PixelSizeSet flag
+    m_flags &= ~PixelSizeSet;
+}
+
+void UCLabel::_q_updateFontFlag(const QFont &font)
+{
+    Q_UNUSED(font);
+    if (m_defaultFont.pixelSize() != font.pixelSize()) {
+        m_flags |= PixelSizeSet;
+    }
+}
+
+void UCLabel::_q_customColor()
+{
+    m_flags |= ColorSet;
+}
+
+/*!
+ * \qmltype LabelBase
+ * \qmlabstract
+ * \instantiates UCLabel
+ * \inqmlmodule Ubuntu.Components 1.3
+ * \ingroup ubuntu
+ * \brief Extended Text item with Ubuntu styling.
+ *
+ * Label is an extended Text item with Ubuntu styling. It exposes an additional property that
+ * provides adaptive resizing based on the measurement unit.
+ *
+ * Example:
+ * \qml
+ * Rectangle {
+ *     color: UbuntuColors.warmGrey
+ *     width: units.gu(30)
+ *     height: units.gu(30)
+ *
+ *     Label {
+ *         anchors.centerIn: parent
+ *         text: "Hello world!"
+ *         textSize: Label.Large
+ *     }
+ * }
+ * \endqml
+ */
+UCLabel::UCLabel(QQuickItem* parent)
+    : QQuickText(parent)
+    , m_textSize(Medium)
+    , m_flags(0)
+{
+}
+
+void UCLabel::classBegin()
+{
+    QQuickText::classBegin();
+    initTheming(this);
+    postThemeChanged();
+    updatePixelSize();
+    m_defaultFont = font();
+    m_defaultFont.setFamily("Ubuntu");
+    m_defaultFont.setWeight(QFont::Light);
+    setFont(m_defaultFont);
+
+    connect(this, &UCLabel::fontChanged, this, &UCLabel::_q_updateFontFlag, Qt::DirectConnection);
+    connect(this, &UCLabel::colorChanged, this, &UCLabel::_q_customColor, Qt::DirectConnection);
+}
+
+void UCLabel::customEvent(QEvent *event)
+{
+    if (UCThemeEvent::isThemeEvent(event)) {
+        handleThemeEvent(static_cast<UCThemeEvent*>(event));
+    }
+}
+
+void UCLabel::postThemeChanged()
+{
+    if (m_flags & ColorSet) {
+        return;
+    }
+    setColor(theme->getPaletteColor("selected", "backgroundText"));
+    m_flags &= ~ColorSet;
+}
+
+/*!
+ * \qmlproperty enumeration LabelBase::textSize
+ * \since Ubuntu.Components 1.3
+ *
+ * This property holds an abstract size that allows adaptive resizing based on the measurement unit
+ * (see Units). The default value is \c Label.Medium.
+ *
+ * \note Setting this disables support for the deprecated \l fontSize property.
+ *
+ * \list
+ *  \li \b Label.XxSmall - extremely small font size
+ *  \li \b Label.XSmall - very small font size
+ *  \li \b Label.Small - small font size
+ *  \li \b Label.Medium - medium font size
+ *  \li \b Label.Large - large font size
+ *  \li \b Label.XLarge - very large font size
+ *  \endlist
+ */
+void UCLabel::setTextSize(TextSize size)
+{
+    if (!(m_flags & TextSizeSet)) {
+        Q_EMIT fontSizeChanged();
+        m_flags |= TextSizeSet;
+    }
+
+    if (m_textSize != size) {
+        m_textSize = size;
+        updatePixelSize();
+        Q_EMIT textSizeChanged();
+    }
+}
+
+/*!
+ * \qmlproperty string LabelBase::fontSize
+ * \deprecated
+ *
+ * This property holds an abstract size represented as a string that allows adaptive resizing based
+ * on the measurement unit (see Units). The default value is \c "medium".
+ *
+ * \note Use \l textSize instead.
+ *
+ * Here is the list of allowed strings from the smallest to the largest:
+ * \list
+ *  \li \b "xx-small" - extremely small font size
+ *  \li \b "x-small" - very small font size
+ *  \li \b "small" - small font size
+ *  \li \b "medium" - medium font size
+ *  \li \b "large" - large font size
+ *  \li \b "x-large" - very large font size
+ *  \endlist
+ */
+void UCLabel::setFontSize(const QString& fontSize)
+{
+    if (m_flags & TextSizeSet) {
+        return;
+    }
+    if (fontSize.size() < 4) {
+        return;
+    }
+
+    static bool logOnce = false;
+    if (!logOnce) {
+        logOnce = true;
+        if (QuickUtils::showDeprecationWarnings()) {
+            qmlInfo(this) << "'fontSize' is deprecated, use 'textSize' property instead.";
+        }
+    }
+
+    TextSize textSize;
+    switch (SCALE_CODE(fontSize)) {
+        case SCALE_MEDIUM: { textSize = Medium; break; }
+        case SCALE_LARGE: { textSize = Large; break; }
+        case SCALE_SMALL: { textSize = Small; break; }
+        case SCALE_XLARGE: { textSize = XLarge; break; }
+        case SCALE_XSMALL: { textSize = XSmall; break; }
+        case SCALE_XXSMALL: { textSize = XxSmall; break; }
+        default: { return; }
+    }
+
+    if (m_textSize != textSize) {
+        m_textSize = textSize;
+        updatePixelSize();
+        Q_EMIT fontSizeChanged();
+    }
+}

=== added file 'src/Ubuntu/Components/plugin/uclabel.h'
--- src/Ubuntu/Components/plugin/uclabel.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/uclabel.h	2015-09-24 05:10:37 +0000
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UCLABEL_H
+#define UCLABEL_H
+
+#include <QtQuick/private/qquicktext_p.h>
+#include "ucthemingextension.h"
+
+class UCLabel : public QQuickText, public UCThemingExtension
+{
+    Q_OBJECT
+
+    Q_ENUMS(TextSize)
+    Q_PROPERTY(TextSize textSize MEMBER m_textSize WRITE setTextSize NOTIFY textSizeChanged FINAL REVISION 1)
+
+    // Deprecated.
+    Q_PROPERTY(QString fontSize READ fontSize WRITE setFontSize NOTIFY fontSizeChanged)
+
+public:
+    UCLabel(QQuickItem* parent=0);
+
+    enum TextSize {
+        XxSmall = 0,
+        XSmall = 1,
+        Small = 2,
+        Medium = 3,
+        Large = 4,
+        XLarge = 5
+    };
+
+    void setTextSize(TextSize size);
+
+    // Deprecated.
+    QString fontSize() const
+    {
+        if (m_flags & TextSizeSet) {
+            return "";
+        }
+        const char* const sizes[] =
+            { "xx-small", "x-small", "small", "medium", "large", "x-large" };
+        return QString(sizes[m_textSize]);
+    }
+    void setFontSize(const QString& fontSize);
+
+protected:
+    // from QQuickItem
+    void classBegin();
+    void customEvent(QEvent *event);
+
+    // from UCItemExtension
+    void preThemeChanged(){}
+    void postThemeChanged();
+
+Q_SIGNALS:
+    Q_REVISION(1) void textSizeChanged();
+
+    // Deprecated.
+    void fontSizeChanged();
+
+private:
+    void updatePixelSize();
+    Q_SLOT void _q_updateFontFlag(const QFont &font);
+    Q_SLOT void _q_customColor();
+
+    enum {
+        TextSizeSet = 1,
+        PixelSizeSet = 2,
+        ColorSet = 4
+    };
+
+    QFont m_defaultFont;
+    TextSize m_textSize;
+    quint8 m_flags;
+
+    Q_DISABLE_COPY(UCLabel)
+};
+
+QML_DECLARE_TYPE(UCLabel)
+
+#endif  // UCLABEL_H

=== modified file 'src/Ubuntu/Components/qmldir'
--- src/Ubuntu/Components/qmldir	2015-09-03 10:42:34 +0000
+++ src/Ubuntu/Components/qmldir	2015-09-24 05:10:37 +0000
@@ -114,7 +114,6 @@
 Tab 1.3 1.3/Tab.qml
 TabBar 1.3 1.3/TabBar.qml
 Tabs 1.3 1.3/Tabs.qml
-Label 1.3 1.3/Label.qml
 ActivityIndicator 1.3 1.3/ActivityIndicator.qml
 ProgressBar 1.3 1.3/ProgressBar.qml
 TextField 1.3 1.3/TextField.qml

=== added file 'tests/unit/tst_components/tst_label13.qml'
--- tests/unit/tst_components/tst_label13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_components/tst_label13.qml	2015-09-24 05:10:37 +0000
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Components 1.3
+
+TestCase {
+    name: "Label13API"
+
+    function cleanup() {
+        textCustom.fontSize = "medium";
+        textCustom.font.weight = Font.Light;
+    }
+
+    function initTestCase() {
+        compare(textCustom.font.family, "Ubuntu", "Default font family");
+        compare(textCustom.font.weight, Font.Light, "Default font weight");
+        compare(textCustom.fontSize, "medium", "fontSize is 'medium' by default")
+        compare(textCustom.textSize, Label.Medium, "fontSize is 'medium' by default")
+    }
+
+    function test_fontSize_data() {
+        return [
+            {tag: "xx-small"},
+            {tag: "x-small"},
+            {tag: "small"},
+            {tag: "medium"},
+            {tag: "large"},
+            {tag: "x-large"},
+        ];
+    }
+    function test_fontSize(data) {
+        textCustom.fontSize = data.tag;
+        compare(textCustom.fontSize, data.tag, "Can set/get " + data.tag)
+    }
+
+    function test_textSize_data() {
+        return [
+            {tag: "XxSmall", size: Label.XxSmall},
+            {tag: "XSmall", size: Label.XSmall},
+            {tag: "Small", size: Label.Small},
+            {tag: "Medium", size: Label.Medium},
+            {tag: "Large", size: Label.Large},
+            {tag: "XLarge", size: Label.XLarge},
+        ];
+    }
+    function test_textSize(data) {
+        textCustom.textSize = data.tag;
+        compare(textCustom.textSize, data.size, "Can set/get " + data.tag)
+    }
+
+    // this must be executed on a Label which is tested only by this function
+    function test_textSize_suppresses_fontSize() {
+        textSizeTest.textSize = Label.XLarge;
+        textSizeTest.fontSize = "xx-small";
+        compare(textSizeTest.textSize, Label.XLarge, "fontSize overruled textSize!");
+    }
+
+    function test_fontSize_equals_textSize_data() {
+        return [
+            {tag: "xx-small", size: Label.XxSmall},
+            {tag: "x-small", size: Label.XSmall},
+            {tag: "small", size: Label.Small},
+            {tag: "medium", size: Label.Medium},
+            {tag: "large", size: Label.Large},
+            {tag: "x-large", size: Label.XLarge},
+        ];
+    }
+    function test_fontSize_equals_textSize(data) {
+        textCustom.textSize = data.size;
+        fuzzyCompare(textCustom.font.pixelSize, FontUtils.sizeToPixels(data.tag), 0.999, "pixelSize differs for " + data.tag);
+    }
+
+    function test_fontWeight_data() {
+        return [
+            {tag: "Light", weight: Font.Light},
+            {tag: "Normal", weight: Font.Normal},
+            {tag: "DemiBold", weight: Font.DemiBold},
+            {tag: "Bold", weight: Font.Bold},
+            {tag: "Black", weight: Font.Black},
+        ];
+    }
+    function test_fontWeight(data) {
+        textCustom.font.weight = data.weight
+        compare(textCustom.font.weight, data.weight, "can set/get " + data.weight);
+    }
+
+    function test_boldWeightConflict() {
+        compare(lightLabel.font.weight, Font.Light, "font.weight is not overriden by font.bold")
+    }
+
+    function test_weightPrecedence() {
+        compare(lightLabel2.font.weight, Font.Light, "font.weight takes precedence over font.bold")
+    }
+
+    Label {
+        id: textCustom
+    }
+
+    Label {
+        id: lightLabel
+        font.weight: Font.Light
+    }
+
+    Label {
+        id: lightLabel2
+        font.weight: Font.Light
+        font.bold: true
+    }
+
+    Label {
+        id: textSizeTest
+    }
+}

=== added file 'tests/unit/tst_performance/LabelGrid13.qml'
--- tests/unit/tst_performance/LabelGrid13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/LabelGrid13.qml	2015-09-24 05:10:37 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Grid {
+    width: 800
+    height: 600
+    rows: 16
+    columns: 16
+    Repeater {
+        model: 16*16
+        Label {}
+    }
+}

=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
--- tests/unit/tst_performance/tst_performance.cpp	2015-08-25 07:49:09 +0000
+++ tests/unit/tst_performance/tst_performance.cpp	2015-09-24 05:10:37 +0000
@@ -106,7 +106,8 @@
         QTest::newRow("AbstractButton 1.3") << "AbstractButton13Grid.qml" << QUrl();
         QTest::newRow("grid with Rectangle") << "RectangleGrid.qml" << QUrl();
         QTest::newRow("grid with Text") << "TextGrid.qml" << QUrl();
-        QTest::newRow("grid with Label") << "LabelGrid.qml" << QUrl();
+        QTest::newRow("grid with Label 1.2") << "LabelGrid.qml" << QUrl();
+        QTest::newRow("grid with Label 1.3") << "LabelGrid13.qml" << QUrl();
         QTest::newRow("grid with UbuntuShape") << "UbuntuShapeGrid.qml" << QUrl();
         QTest::newRow("grid with UbuntuShapePair") << "PairOfUbuntuShapeGrid.qml" << QUrl();
         QTest::newRow("grid with Button") << "ButtonGrid.qml" << QUrl();

=== modified file 'tests/unit/tst_performance/tst_performance.pro'
--- tests/unit/tst_performance/tst_performance.pro	2015-08-25 07:49:09 +0000
+++ tests/unit/tst_performance/tst_performance.pro	2015-09-24 05:10:37 +0000
@@ -32,4 +32,5 @@
     PaletteConfigurationAllColors.qml \
     StyledItemNewTheming.qml \
     AbstractButtonGrid.qml \
-    AbstractButton13Grid.qml
+    AbstractButton13Grid.qml \
+    LabelGrid13.qml

=== modified file 'tests/unit_x11/tst_components/tst_sections.qml'
--- tests/unit_x11/tst_components/tst_sections.qml	2015-06-17 12:17:09 +0000
+++ tests/unit_x11/tst_components/tst_sections.qml	2015-09-24 05:10:37 +0000
@@ -60,7 +60,7 @@
         Label {
             anchors.left: parent.left
             text: "actions in-line:"
-            fontSize: small
+            textSize: Label.Small
         }
         Sections {
             // Not used in the tests below, but added here to
@@ -74,7 +74,7 @@
         Label {
             anchors.left: parent.left
             text: "enabled:"
-            fontSize: "small"
+            textSize: Label.Small
         }
         Sections {
             id: enabledSections
@@ -82,7 +82,7 @@
         }
         Label {
             text: "disabled:"
-            fontSize: "small"
+            textSize: Label.Small
         }
         Sections {
             id: disabledSections
@@ -111,7 +111,7 @@
         Label {
             anchors.left: parent.left
             text: "enabled:"
-            fontSize: "small"
+            textSize: Label.Small
         }
         Sections {
             id: enabledStringSections
@@ -120,7 +120,7 @@
         Label {
             anchors.left: parent.left
             text: "disabled:"
-            fontSize: "small"
+            textSize: Label.Small
         }
         Sections {
             id: disabledStringSections