Ubuntu UI Toolkit

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

noBackButton
Merge into staging

Proposed by Tim Peeters on 2014-07-28

Status:	Superseded
Proposed branch:	lp:~tpeeters/ubuntu-ui-toolkit/noBackButton
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	264 lines (+197/-11) 6 files modified debian/control (+1/-0) modules/Ubuntu/Components/Icon.qml (+28/-8) modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+1/-1) tests/unit_x11/tst_components/tst_headActions.qml (+103/-0) tests/unit_x11/tst_components/tst_icon.qml (+62/-0)
To merge this branch:	bzr merge lp:~tpeeters/ubuntu-ui-toolkit/noBackButton
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-07-30
Cris Dywan		2014-07-28	Approve on 2014-07-29
Review via email: mp+228557@code.launchpad.net

This proposal has been superseded by a proposal from 2014-07-30.

Commit message

Allow app developers to disable the back button by setting an invisible back action for the page.

Description of the change

Allow app developers to disable the back button by setting an invisible back action for the page.

Use case: dialer app pushes call page on the pagestack when in a phone call, but the user cannot use the 'back' button to leave the call page. When the phone call is terminated, the call page is popped from the pagestack.

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-28:

why don't you put this

99 + pageStack.pop();

and this

117 + page2.head.backAction = null;

on the cleanup function?

I'm trying to learn more QML, so I'll put my nose on some of your new branches. Please bare with my questions while I get up to speed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-28:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-28:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-07-29:

QWARN : components::HeaderBackButton::test_custom_back_button() file:///tmp/buildd/ubuntu-ui-toolkit-0.1.50+14.10.20140724.2bzr1167pkg0utopic507/modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml:29:5: QML QQuickImage: Failed to get image from provider: image://theme/search

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-07-29:

Looks good.

I've seen the warning in another branch - I wonder if we're missing a dependency somewhere, though the package depends on suru-icon-theme already.

review: Approve

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-07-29:

> Looks good.
>
> I've seen the warning in another branch - I wonder if we're missing a
> dependency somewhere, though the package depends on suru-icon-theme already.

it may be this bug: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1349769

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-07-29:

Don't happrove this yet. I am abusing this MR to test whether the fix in the iconFix branch works.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-29:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-29:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-29:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-29:

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

review: Approve (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/noBackButton updated on 2014-07-30

1171. By Tim Peeters on 2014-07-30: merge iconFix

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-30:

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tim Peeters

Tom Mirmar

Ubuntu SDK team

 === modified file 'debian/control'
 --- debian/control	2014-07-28 15:09:00 +0000
 +++ debian/control	2014-07-30 11:48:25 +0000
@@ -26,6 +26,7 @@
                 qtdeclarative5-doc-html,
                 qtwebkit5-doc-html,
                 qtsvg5-doc-html,
++               libqt5svg5,
                 qtscript5-doc-html,
                 qtmultimedia5-doc-html,
                 unity-action-doc,
 === modified file 'modules/Ubuntu/Components/Icon.qml'
 --- modules/Ubuntu/Components/Icon.qml	2014-07-03 13:30:32 +0000
 +++ modules/Ubuntu/Components/Icon.qml	2014-07-30 11:48:25 +0000
@@ -84,17 +84,37 @@
      Image {
          id: image
++        anchors.fill: parent
          /* Necessary so that icons are not loaded before a size is set. */
--        property bool ready: false
--        Component.onCompleted: ready = true
--
--        anchors.fill: parent
--        source: ready && width > 0 && height > 0 && icon.name ? "image://theme/%1".arg(icon.name) : ""
++        source: ""
          sourceSize {
--            width: width
--            height: height
--        }
++            width: 0
++            height: 0
++        }
++
++        Component.onCompleted: update()
++        onWidthChanged: update()
++        onHeightChanged: update()
++        Connections {
++            target: icon
++            onNameChanged: image.update()
++        }
++
++        function update() {
++            // only set sourceSize.width, sourceSize.height and source when
++            // icon dimensions are valid, see bug #1349769.
++            if (width > 0 && height > 0 && icon.name) {
++                sourceSize.width = width;
++                sourceSize.height = height;
++                source = "image://theme/%1".arg(icon.name);
++            } else {
++                source = "";
++                sourceSize.width = 0;
++                sourceSize.height = 0;
++            }
++        }
++
          cache: true
          visible: !colorizedImage.active
+     }
 === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml'
 --- modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2014-07-22 15:11:03 +0000
 +++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2014-07-30 11:48:25 +0000
@@ -20,8 +20,8 @@
  AbstractButton {
      id: button
--    property int iconWidth: units.gu(2)
--    property int iconHeight: iconWidth
++    property real iconWidth: units.gu(2)
++    property real iconHeight: iconWidth
      width: visible ? units.gu(4) : 0
      height: parent ? parent.height : undefined
 === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
 --- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-07-28 10:38:00 +0000
 +++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-07-30 11:48:25 +0000
@@ -134,7 +134,7 @@
              visible: styledItem.pageStack !== null &&
                       styledItem.pageStack !== undefined &&
                       styledItem.pageStack.depth > 1 &&
--                     !customBackButton.visible
++                     !styledItem.config.backAction
              text: "back"
 === added file 'tests/unit_x11/tst_components/tst_headActions.qml'
 --- tests/unit_x11/tst_components/tst_headActions.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit_x11/tst_components/tst_headActions.qml	2014-07-30 11:48:25 +0000
@@ -0,0 +1,103 @@
++/*
++ * 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.2
++import Ubuntu.Test 1.0
++import Ubuntu.Components 1.1
++
++// NOTE: Other parts of the page head API are tested with autopilot in
++// ubuntuuitoolkit.tests.components.test_header
++
++Item {
++    width: units.gu(50)
++    height: units.gu(80)
++
++    MainView {
++        id: mainView
++        anchors.fill: parent
++        useDeprecatedToolbar: false
++
++        PageStack {
++            id: pageStack
++            Page {
++                id: page1
++                title: "First page"
++            }
++            Page {
++                id: page2
++                title: "Second page"
++
++                Action {
++                    id: customBackAction
++                    iconName: "search"
++                    text: "Search"
++                }
++                Action {
++                    id: invisibleAction
++                    visible: false
++                }
++            }
++        }
++        Component.onCompleted: {
++            pageStack.push(page1);
++        }
++    }
++
++    UbuntuTestCase {
++        name: "HeaderBackButton"
++        when: windowShown
++        id: testCase
++
++        property var app_header
++        property var back_button
++        property var custom_back_button
++
++        function initTestCase() {
++            testCase.app_header = findChild(mainView, "MainView_Header");
++            testCase.back_button = findChild(app_header, "backButton");
++            testCase.custom_back_button = findChild(app_header, "customBackButton");
++
++            compare(page2.head.backAction, null, "Back action set by default.");
++            compare(back_button.visible, false, "Back button visible with only 1 page on the stack.");
++            compare(custom_back_button.visible, false, "Custom back button visible without custom back action.")
++        }
++
++        function test_default_back_button() {
++            pageStack.push(page2);
++            compare(back_button.visible, true, "Back button not visible with 2 pages on stack.");
++            compare(custom_back_button.visible, false, "Showing custom back button without custom back action.");
++            pageStack.pop();
++        }
++
++        function test_custom_back_button() {
++            page2.head.backAction = customBackAction;
++            pageStack.push(page2);
++            compare(back_button.visible, false, "Default back button visible with custom back action.");
++            compare(custom_back_button.visible, true, "Custom back button invisible with back action.");
++            pageStack.pop();
++            page2.head.backAction = null;
++        }
++
++        function test_no_back_button() {
++            page2.head.backAction = invisibleAction;
++            pageStack.push(page2);
++            compare(back_button.visible, false, "Default back button visible with invisible custom back action.");
++            compare(custom_back_button.visible, false, "Custom back button visible with invisible custom back action.");
++            pageStack.pop();
++            page2.head.backAction = null;
++        }
++    }
++}
 === added file 'tests/unit_x11/tst_components/tst_icon.qml'
 --- tests/unit_x11/tst_components/tst_icon.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit_x11/tst_components/tst_icon.qml	2014-07-30 11:48:25 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright 2012 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 QtTest 1.0
++import Ubuntu.Components 1.1
++
++Item {
++    width: units.gu(50)
++    height: units.gu(50)
++
++    Row {
++        anchors.centerIn: parent
++        height: units.gu(10)
++        width: childrenRect.width
++
++        Icon {
++            // Fails to load the icon when suru-icon-theme or libqt5svg5 are
++            // not installed. This causes a warning and rejection
++            // by jenkins continuous integration.
++            name: "add"
++            height: parent.height
++            width: height
++        }
++        Icon {
++            // Fails when the icon is becoming invisible when non-atomic updates
++            // cause sourceSize.width or sourceSize.height to be 0 before other
++            // properties are updated.
++            id: icon
++            width: visible ? units.gu(10) : 0
++            height: width
++            name: "search"
++
++        }
++    }
++
++    TestCase {
++        name: "Icon"
++        when: windowShown
++
++        function test_updateIconSize_bug1349769() {
++            icon.visible = false;
++            // causes "QML Image: Failed to get image from provider: image://theme/search"
++            // warning and when sourceSize.width or sourceSize.height becomes 0 while
++            // while still trying to render the icon. Tests will pass with the warning, but
++            // the MR is rejected by jenkins continuous integration.
++        }
++    }
++}