Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/galleryTweaksPage into lp:ubuntu-ui-toolkit

[Cris Dywan]

Add a page Tweaks to change theme and header style in the gallery

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1088
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2082/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/563
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1086
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1086/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7892
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/654
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/654/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2082/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

This should be proposed for merging into staging, not trunk.

Also I see changes here that make the header private (from another MR, that is being reverted in landing). Before we accept this we need to make sure that the revert of that is not being reverted again.

review: Needs Resubmitting

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/galleryTweaksPage]

1089. By Cris Dywan on 2014-06-17

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1090. By Cris Dywan on 2014-06-19

Rename Tweaks to Styles

1091. By Cris Dywan on 2014-06-19

Embrace selectedIndex

Unmerged revisions

=== modified file 'CHANGES'
--- CHANGES	2014-05-20 08:35:14 +0000
+++ CHANGES	2014-05-29 11:06:26 +0000
@@ -12,7 +12,7 @@
 
 Compatibility Breaks
 ********************
-
+* Header component API was made internal (as it was always documented)
 
 Ubuntu.Components 1.0
 #####################

=== modified file 'components.api'
--- components.api	2014-05-26 11:36:53 +0000
+++ components.api	2014-05-29 11:06:26 +0000
@@ -31,6 +31,7 @@
 AbstractButton
     property color color
     property Gradient gradient
+    property font font
     property string iconPosition
 CheckBox 0.1 1.0
 AbstractButton
@@ -61,19 +62,6 @@
     readonly property bool running
     property size sourceSize
     readonly property int status
-Header 0.1 1.0
-StyledItem
-    property bool animate
-    function show()
-    function hide()
-    property string title
-    property Item contents
-    property var tabsModel
-    property var pageStack
-    property var actions
-    property var __customBackAction
-    property Flickable flickable
-    property bool useDeprecatedToolbar
 Icon 0.1 1.0
 Item
     property string name
@@ -94,7 +82,7 @@
     property real __leftIconMargin
     property real __rightIconMargin
     property bool __iconIsItem
-    property internal children
+    default property internal children
 Caption 0.1 1.0
 Item
     property string text
@@ -140,6 +128,7 @@
     property bool expanded
     property bool multiSelection
     property bool colourImage
+    property Component delegate
     property real containerHeight
     property int selectedIndex
     property bool currentlyExpanded
@@ -204,12 +193,14 @@
 Object 0.1 1.0
 QtObject
     default property internal children
+    property list<QtObject> __defaultPropertyFix
 OptionSelector 0.1 1.0
 ListItem.Empty
     property var model
     property bool expanded
     property bool multiSelection
     property bool colourImage
+    property Component delegate
     property real containerHeight
     property int selectedIndex
     property bool currentlyExpanded
@@ -235,6 +226,7 @@
 Page 0.1 1.0
 PageTreeNode
     property string title
+    property Item tools
     property Item __customHeaderContents
     property Flickable flickable
     property list<Action> actions
@@ -355,6 +347,7 @@
 OrientationHelper
     property Item dismissArea
     property bool grabDismissAreaEvents
+    property PropertyAnimation fadingAnimation
     function show()
     function hide()
     function __closeIfHidden()

=== added file 'examples/ubuntu-ui-toolkit-gallery/Tweaks.qml'
--- examples/ubuntu-ui-toolkit-gallery/Tweaks.qml	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Tweaks.qml	2014-05-29 11:06:26 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2014 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.0
+import Ubuntu.Components 1.1
+
+Template {
+    objectName: "tweaksTemplate"
+
+    Label {
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        text: i18n.tr("Switch between old and new style header")
+    }
+
+    OptionSelector {
+        model: [ i18n.tr('Header with Toolbar'), i18n.tr('New Style Header') ]
+        expanded: true
+        onSelectedIndexChanged: gallery.useDeprecatedToolbar = selectedIndex == 0
+    }
+
+    Label {
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        text: i18n.tr("Switch between themes")
+    }
+
+    OptionSelector {
+        model: [ 'Ambiance', 'SuruDark' ]
+        expanded: true
+        onSelectedIndexChanged: Theme.name = 'Ubuntu.Components.Themes.%1'.arg(model[selectedIndex])
+    }
+}

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2014-04-30 10:26:35 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2014-05-29 11:06:26 +0000
@@ -23,6 +23,11 @@
         label: "Navigation"
         source: "Navigation.qml"
     }
+    ListElement {
+        objectName: "tweaksElement"
+        label: "Tweaks"
+        source: "Tweaks.qml"
+    }
 
     ListElement {
         objectName: "togglesElement"

=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
--- modules/Ubuntu/Components/AnimatedItem.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/AnimatedItem.qml	2014-05-29 11:06:26 +0000
@@ -30,45 +30,8 @@
     id: root
     /*!
       \preliminary
+      \deprecated
       Specifies whether the component is on the visible area of the Flickable or not.
     */
     property bool onScreen: true
-
-    QtObject {
-        id: internal
-        property Flickable flickable
-
-        // returns whether the component is in the visible area of the flickable
-        function checkOnScreen()
-        {
-            var pos = root.mapToItem(flickable, 0, 0)
-            root.onScreen = (pos.y + root.height >= 0) && (pos.y <= internal.flickable.height) &&
-                            (pos.x + root.width >= 0) && (pos.x <= internal.flickable.width)
-        }
-        // lookup for a flickable parent
-        function updateFlickableParent()
-        {
-            var flickable = root.parent
-            while (flickable) {
-                if (flickable.hasOwnProperty("flicking") && flickable.hasOwnProperty("flickableDirection")) {
-                    // non-interactive flickables must be skipped as those do not provide
-                    // on-screen detection support
-                    if (flickable.interactive)
-                        break
-                }
-                flickable = flickable.parent
-            }
-            internal.flickable = flickable
-        }
-    }
-
-    Connections {
-        target: internal.flickable
-
-        onContentXChanged: internal.checkOnScreen()
-        onContentYChanged: internal.checkOnScreen()
-    }
-
-    Component.onCompleted: internal.updateFlickableParent()
-    onParentChanged: internal.updateFlickableParent()
 }

=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
--- modules/Ubuntu/Components/ListItems/Base.qml	2014-04-28 19:24:56 +0000
+++ modules/Ubuntu/Components/ListItems/Base.qml	2014-05-29 11:06:26 +0000
@@ -159,7 +159,7 @@
     /*!
       \internal
      */
-    property alias children: middle.data
+    default property alias children: middle.data
     Item {
         id: middle
         property bool anchorToIconHelper: !__iconIsItem && iconHelper.source != ""

=== modified file 'modules/Ubuntu/Components/PageStack.qml'
--- modules/Ubuntu/Components/PageStack.qml	2014-05-13 09:09:35 +0000
+++ modules/Ubuntu/Components/PageStack.qml	2014-05-29 11:06:26 +0000
@@ -192,6 +192,7 @@
      */
     default property alias data: inactiveNode.data
     PageTreeNode {
+        anchors.fill: parent
         id: inactiveNode
         active: false
     }

=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-05-07 10:42:31 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-05-29 11:06:26 +0000
@@ -523,7 +523,8 @@
         function updatePickers() {
             if (completed) {
                 // check mode flags first
-                var modes = datePicker.mode.split(/\W/g);
+                // FIXME: The js split(/\W/g) terminates the process on armhf with Qt 5.3 (v4 js) (https://bugreports.qt-project.org/browse/QTBUG-39255)
+                var modes = datePicker.mode.match(/\w+/g);
 
                 showYearPicker = showMonthPicker = showDayPicker =
                 showHoursPicker = showMinutesPicker = showSecondsPicker = false;
@@ -607,7 +608,8 @@
             completed = false;
 
             // use short format to exclude any extra characters
-            var format = datePicker.locale.dateFormat(Locale.ShortFormat).split(/\W/g);
+            // FIXME: The js split(/\W/g) terminates the process on armhf with Qt 5.3 (v4 js) (https://bugreports.qt-project.org/browse/QTBUG-39255)
+            var format = datePicker.locale.dateFormat(Locale.ShortFormat).match(/\w+/g);
             // loop through the format to decide the position of the tumbler
             var formatIndex = 0;
             for (var i in format) {

=== modified file 'modules/Ubuntu/Components/plugin/i18n.cpp'
--- modules/Ubuntu/Components/plugin/i18n.cpp	2014-05-22 15:54:13 +0000
+++ modules/Ubuntu/Components/plugin/i18n.cpp	2014-05-29 11:06:26 +0000
@@ -103,13 +103,14 @@
     /*
      The default is /usr/share/locale if we don't set a folder
      For click we use APP_DIR/share/locale
-     eg. /usr/share/click/preinstalled/com.example.foo/current/share/locale
+     e.g. /usr/share/click/preinstalled/com.example.foo/current/share/locale
      */
-    QDir appDir(getenv("APP_DIR"));
-    if (appDir.exists()) {
-        QString localePath(appDir.filePath("share/locale"));
-        C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
+    QString appDir(getenv("APP_DIR"));
+    if (!QDir::isAbsolutePath (appDir)) {
+        appDir = "/usr";
     }
+    QString localePath(QDir(appDir).filePath("share/locale"));
+    C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
     Q_EMIT domainChanged();
 }
 

=== modified file 'modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp'
--- modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp	2014-02-25 09:14:23 +0000
+++ modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp	2014-05-29 11:06:26 +0000
@@ -43,12 +43,15 @@
      * is the only way around the issue for now. */
     std::string src_path(QUrl(id).path().toUtf8().data());
     std::string tgt_path;
+    const int xlarge_cutoff = 512;
+    const int large_cutoff = 256;
+    const int small_cutoff = 128;
     try {
         ThumbnailSize desiredSize;
-        const int large_cutoff = 256;
-        const int small_cutoff = 128;
-        if(requestedSize.width() > large_cutoff || requestedSize.height() > large_cutoff) {
+        if(requestedSize.width() > xlarge_cutoff || requestedSize.height() > xlarge_cutoff) {
             desiredSize = TN_SIZE_ORIGINAL;
+        } else if(requestedSize.width() > large_cutoff || requestedSize.height() > large_cutoff) {
+            desiredSize = TN_SIZE_XLARGE;
         } else if(requestedSize.width() > small_cutoff || requestedSize.height() > small_cutoff) {
             desiredSize = TN_SIZE_LARGE;
         } else {

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/qmldir	2014-05-29 11:06:26 +0000
@@ -29,7 +29,7 @@
 internal PageTreeNode PageTreeNode.qml
 PageStack 0.1 PageStack.qml
 internal Toolbar Toolbar.qml
-Header 0.1 Header.qml
+internal Header Header.qml
 internal AnimatedItem AnimatedItem.qml
 internal PageWrapper PageWrapper.qml
 UbuntuShape 0.1 UbuntuShape.qml
@@ -76,7 +76,6 @@
 OptionSelectorDelegate 1.0 OptionSelectorDelegate.qml
 Page 1.0 Page.qml
 PageStack 1.0 PageStack.qml
-Header 1.0 Header.qml
 UbuntuShape 1.0 UbuntuShape.qml
 CrossFadeImage 1.0 CrossFadeImage.qml
 Icon 1.0 Icon.qml

=== modified file 'tests/qmlapicheck.py'
--- tests/qmlapicheck.py	2014-04-24 09:18:38 +0000
+++ tests/qmlapicheck.py	2014-05-29 11:06:26 +0000
@@ -130,10 +130,10 @@
     if '{' in line and '}' in line:
         if filetype == 'qmltypes' and not in_builtin_type:
             print('    ' + line.strip())
-        continue
+            continue
 
     # End of function/ signal/ Item block
-    if '}' in line:
+    if '}' in line and not '{' in line:
         in_block -= 1
         block_meta = {}
         if in_block == 1 and in_builtin_type:
@@ -143,7 +143,7 @@
     # Only root "Item {" is inspected for QML, otherwise all children
     if in_block == 1 or filetype == 'qmltypes':
         # Left hand side specifies a keyword, a type and a variable name
-        declaration = line.split(':')[0]
+        declaration = line.split(':', 1)[0]
         words = declaration.strip().split(' ')
         # Skip types with prefixes considered builtin
         if filetype == 'qmltypes' and words[0] == 'name':
@@ -175,7 +175,8 @@
         for word in words:
             if word in keywords:
                 if filetype == 'qml':
-                    signature = declaration.split('{')[0].strip()
+                    separator = '{' if 'function' in declaration else ':'
+                    signature = declaration.split(separator, 1)[0].strip()
                     if 'alias' in line:
                         no_mods = signature
                         for mod in ['readonly', 'default']:
@@ -198,7 +199,7 @@
                 break
 
     # Start of function/ signal/ Item block
-    if '{' in line:
+    if '{' in line and not '}' in line:
         in_block += 1
         block_meta = {}
         # The parent type can affect API