Merge lp:~tpeeters/ubuntu-ui-toolkit/fontSize into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Update font sizes.

Reviewed by Jouni.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1777
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2656/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1387
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1387/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1383

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

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Could you also update the Gallery page pls?

review: Needs Fixing

[lp:~tpeeters/ubuntu-ui-toolkit/fontSize]

1778. By Tim Peeters on 2015-12-17

re-trigger CI

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1778
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2664/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1390
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1390/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1388

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

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/fontSize]

1779. By Tim Peeters on 2015-12-18

sync trunk

1780. By Tim Peeters on 2015-12-21

sync staging

1781. By Tim Peeters on 2015-12-21

update gallery

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1780
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2674/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1400
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1400/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1398

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1781
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2675/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1401
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1401/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1399

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

review: Approve (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/fontSize]

1782. By Tim Peeters on 2015-12-21

link bug

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1782
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2676/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1401
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1402
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1402/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1400

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

I attached screenshots with the updated font sizes to the linked bug.

[Jouni Helminen (jounihelminen)]

looks good - let's go with it

[lp:~tpeeters/ubuntu-ui-toolkit/fontSize]

1783. By Tim Peeters on 2015-12-22

sync staging

[Zsombor Egri (zsombi)]

All good and shiny now :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1783
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2680/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1405
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1406
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1406/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1404

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

review: Approve (continuous-integration)

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Label.qml'
--- examples/ubuntu-ui-toolkit-gallery/Label.qml	2015-09-21 14:44:13 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Label.qml	2015-12-22 11:37:15 +0000
@@ -28,27 +28,27 @@
 
             Label {
                 textSize: Label.XxSmall
-                text: "xx-small"
+                text: "Label.XxSmall"
             }
             Label {
                 textSize: Label.XSmall
-                text: "x-small"
+                text: "Label.XSmall"
             }
             Label {
                 textSize: Label.Small
-                text: "small"
+                text: "Label.Small"
             }
             Label {
                 textSize: Label.Medium
-                text: "medium"
+                text: "Label.Medium"
             }
             Label {
                 textSize: Label.Large
-                text: "large"
+                text: "Label.Large"
             }
             Label {
                 textSize: Label.XLarge
-                text: "x-large"
+                text: "Label.XLarge"
             }
         }
     }

=== modified file 'src/Ubuntu/Components/plugin/ucfontutils.h'
--- src/Ubuntu/Components/plugin/ucfontutils.h	2015-09-22 14:39:47 +0000
+++ src/Ubuntu/Components/plugin/ucfontutils.h	2015-12-22 11:37:15 +0000
@@ -26,12 +26,12 @@
 
 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 constexpr float xxSmallScale = 0.606f;
+    static constexpr float xSmallScale = 0.707f;
+    static constexpr float smallScale = 0.857f;
+    static constexpr float mediumScale = 1.0f;
+    static constexpr float largeScale = 1.414f;
+    static constexpr float xLargeScale = 1.905f;
 
     static UCFontUtils& instance()
     {

=== modified file 'tests/unit/tst_components/tst_fontutils.qml'
--- tests/unit/tst_components/tst_fontutils.qml	2015-03-03 13:20:06 +0000
+++ tests/unit/tst_components/tst_fontutils.qml	2015-12-22 11:37:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2012-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
@@ -22,12 +22,12 @@
     name: "FontUtilsAPI"
 
     function test_modularScale() {
-        compare(FontUtils.modularScale("xx-small"), 0.677, "xx-small scale");
-        compare(FontUtils.modularScale("x-small"), 0.804, "x-small scale");
-        compare(FontUtils.modularScale("small"), 0.931, "small scale");
-        compare(FontUtils.modularScale("medium"), 1.079, "medium scale");
-        compare(FontUtils.modularScale("large"), 1.291, "large scale");
-        compare(FontUtils.modularScale("x-large"), 1.714, "x-large scale");
+        compare(FontUtils.modularScale("xx-small"), 0.606, "xx-small scale");
+        compare(FontUtils.modularScale("x-small"), 0.707, "x-small scale");
+        compare(FontUtils.modularScale("small"), 0.857, "small scale");
+        compare(FontUtils.modularScale("medium"), 1.0, "medium scale");
+        compare(FontUtils.modularScale("large"), 1.414, "large scale");
+        compare(FontUtils.modularScale("x-large"), 1.905, "x-large scale");
     }
 
     function test_modularScale_failures() {
@@ -36,17 +36,16 @@
     }
 
     function test_sizeToPixels() {
-        compare(FontUtils.sizeToPixels("xx-small"), 0.677 * units.dp(14), "xx-small scale");
-        compare(FontUtils.sizeToPixels("x-small"), 0.804 * units.dp(14), "x-small scale");
-        compare(FontUtils.sizeToPixels("small"), 0.931 * units.dp(14), "small scale");
-        compare(FontUtils.sizeToPixels("medium"), 1.079 * units.dp(14), "medium scale");
-        compare(FontUtils.sizeToPixels("large"), 1.291 * units.dp(14), "large scale");
-        compare(FontUtils.sizeToPixels("x-large"), 1.714 * units.dp(14), "x-large scale");
+        compare(FontUtils.sizeToPixels("xx-small"), 0.606 * units.dp(14), "xx-small scale");
+        compare(FontUtils.sizeToPixels("x-small"), 0.707 * units.dp(14), "x-small scale");
+        compare(FontUtils.sizeToPixels("small"), 0.857 * units.dp(14), "small scale");
+        compare(FontUtils.sizeToPixels("medium"), 1.0 * units.dp(14), "medium scale");
+        compare(FontUtils.sizeToPixels("large"), 1.414 * units.dp(14), "large scale");
+        compare(FontUtils.sizeToPixels("x-large"), 1.905 * units.dp(14), "x-large scale");
     }
 
     function test_sizeToPixels_failures() {
         compare(FontUtils.sizeToPixels("xxsmall"), 0.0, "xxsmall not defined");
         compare(FontUtils.sizeToPixels("undefined"), 0.0, "undefined scale");
     }
-
 }