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

[Tim Peeters]

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

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

1164. By Tim Peeters on 2014-07-28

clean

1165. By Tim Peeters on 2014-07-28

clean

1166. By Tim Peeters on 2014-07-28

clean

1167. By Tim Peeters on 2014-07-29

merge iconFix branch

1168. By Tim Peeters on 2014-07-29

update type of iconWidth, iconHeight

1169. By Tim Peeters on 2014-07-29

testing icon fix

1170. By Tim Peeters on 2014-07-29

merge iconFix

1171. By Tim Peeters on 2014-07-30

merge iconFix

Unmerged revisions

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-07-22 15:15:28 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-07-28 18:35:34 +0000
@@ -117,7 +117,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-28 18:35:34 +0000
@@ -0,0 +1,104 @@
+/*
+ * 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 being 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(testCase.app_header, "backButton");
+            testCase.custom_back_button = findChild(testCase.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 set.");
+            compare(custom_back_button.visible, true, "Custom back button invisible with back action set.");
+            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 set.");
+            compare(custom_back_button.visible, false, "Custom back button visible with invisible custom back action.");
+            pageStack.pop();
+            page2.head.backAction = null;
+        }
+    }
+}