Merge lp:~tpeeters/ubuntu-ui-toolkit/tabbar-closes-toolbar into lp:ubuntu-ui-toolkit

[Tim Peeters]

Close toolbar when user interacts with tabs header.

Close toolbar when user interacts with tabs header.

Note that the HideChrome TestCase will be extended in later MRs where the tabs are hidden when the user interacts with the toolbar.

[lp:~tpeeters/ubuntu-ui-toolkit/tabbar-closes-toolbar]

862. By Tim Peeters on 2013-11-25

don't state the obvious in comments

863. By Tim Peeters on 2013-11-25

better test name

[Tim Peeters (tpeeters)]

all unit tests and autopilot tests pass on my laptop.

[lp:~tpeeters/ubuntu-ui-toolkit/tabbar-closes-toolbar]

864. By Tim Peeters on 2013-11-25

don't close locked toolbar

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:862
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1299/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1086/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1069
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/247
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/247/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/967/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1086
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1086/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1069
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1069/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3647
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1756

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:864
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1301/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1089/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1072
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/249
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/249/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/970/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1089
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1089/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1072
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1072/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3650
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1759

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

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/tabbar-closes-toolbar]

865. By Tim Peeters on 2013-11-25

empty commit to trigger jenkins again

[Cris Dywan (kalikiana)]

Why is this handled in MainView instead of Page? The Page already has tabbar code and and closes the toolbar when interacting with it.

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:865
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1307/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/255
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/255/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/981
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1102
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1085
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1085/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3657
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1766

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

An app normally has one MainView and many Pages. So if we can handle something in the MainView, that is the better place to do it.

The question is, can we move the page contents interaction from the Page to the MainView? But if that is the case I don't want to do it in this MR.

[Tim Peeters (tpeeters)]

Tested on gallery-app on maguro, works fine.

[Tim Peeters (tpeeters)]

Ok, I'll move the detection of the contents interaction also to the MainView in this MR https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/hide-bars-mainview/+merge/196720 which is now a prerequisite of this one.

[lp:~tpeeters/ubuntu-ui-toolkit/tabbar-closes-toolbar]

866. By Tim Peeters on 2013-11-26

merge prerequisite branch

Unmerged revisions

866. By Tim Peeters on 2013-11-26

merge prerequisite branch

865. By Tim Peeters on 2013-11-25

empty commit to trigger jenkins again

864. By Tim Peeters on 2013-11-25

don't close locked toolbar

863. By Tim Peeters on 2013-11-25

better test name

862. By Tim Peeters on 2013-11-25

don't state the obvious in comments

861. By Tim Peeters on 2013-11-25

close toolbar when selectionMode becomes true

860. By Tim Peeters on 2013-11-25

edit copyright year

859. By Tim Peeters on 2013-11-25

add unit test

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2013-11-18 15:20:18 +0000
+++ modules/Ubuntu/Components/MainView.qml	2013-11-25 15:57:58 +0000
@@ -287,6 +287,26 @@
             objectName: "MainView_Header"
             id: headerItem
             property real bottomY: headerItem.y + headerItem.height
+
+            property var tabBar: null
+            Binding {
+                target: headerItem
+                property: "tabBar"
+                value: headerItem.contents
+                when: headerItem.contents &&
+                      headerItem.contents.hasOwnProperty("selectionMode") &&
+                      headerItem.contents.hasOwnProperty("model") &&
+                      headerItem.contents.hasOwnProperty("selectedIndex")
+            }
+            Connections {
+                // no connections are made when target is null
+                target: headerItem.tabBar
+                onSelectionModeChanged: {
+                    if (headerItem.tabBar.selectionMode) {
+                        if (!toolbar.locked) toolbarItem.close();
+                    }
+                }
+            }
         }
     }
 

=== added file 'tests/unit_x11/tst_components/tst_hide_chrome.qml'
--- tests/unit_x11/tst_components/tst_hide_chrome.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_hide_chrome.qml	2013-11-25 15:57:58 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2013 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 0.1
+
+Item {
+    width: units.gu(50)
+    height: units.gu(80)
+
+    MainView {
+        id: mainView
+        anchors.fill: parent
+        Tabs {
+            id: tabs
+            Tab {
+                id: tab1
+                title: "tab 1"
+                page: Page {
+                    id: page1
+                    Button {
+                        id: button
+                        anchors.centerIn: parent
+                        text: "click"
+                    }
+
+                    tools: ToolbarItems {
+                        ToolbarButton {
+                            text: "something"
+                        }
+                    }
+                }
+            }
+            Tab {
+                id: tab2
+                title: "tab 2"
+                page: Page {
+                    id: page2
+                }
+            }
+        }
+    }
+
+    TestCase {
+        name: "HideChrome"
+        when: windowShown
+        id: testCase
+
+        function openToolbar() {
+            var toolbar = mainView.__propagated.toolbar;
+            toolbar.open();
+            compare(toolbar.opened, true, "Cannot open toolbar using open()");
+            return toolbar;
+        }
+
+        function setTabBarSelectionMode(newSelectionMode) {
+            var tabBar = tabs.tabBar;
+            var header = mainView.__propagated.header;
+            compare(tabBar, header.contents, "TabBar is not the active header contents");
+            header.show();
+            tabBar.selectionMode = newSelectionMode;
+            return tabBar;
+        }
+
+        function test_tabBar_selectionMode_closes_toolbar_bug1223600() {
+            testCase.setTabBarSelectionMode(false);
+            var toolbar = testCase.openToolbar();
+            testCase.setTabBarSelectionMode(true);
+            compare(toolbar.opened, false, "Activating TabBar did not close toolbar");
+        }
+    }
+}