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

[Tim Peeters]

Close the toolbar when user activates tabbar.

Close the toolbar when user activates tabbar.

"HideChrome" was used as a name for the tests, because in following MRs I will add more tests there that hide the chrome (when user interacts with toolbar, tabs in tabbar will hide).

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

869. By Tim Peeters on 2013-11-27

merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:868
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1331/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/279
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/279/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1042
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1170
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1153
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3715
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1827

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

Tested apps and autopilot on maguro, all fine.

[Cris Dywan (kalikiana)]

Nice!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:869
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1335/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1179
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1162/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/283
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/283/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1050
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1179
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1162
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1162/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3723/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1835

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2013-11-26 14:58:13 +0000
+++ modules/Ubuntu/Components/MainView.qml	2013-11-27 12:25:45 +0000
@@ -318,6 +318,16 @@
                       headerItem.contents.hasOwnProperty("alwaysSelectionMode") &&
                       headerItem.contents.hasOwnProperty("selectedIndex")
             }
+
+            Connections {
+                // no connections are made when target is null
+                target: headerItem.tabBar
+                onSelectionModeChanged: {
+                    if (headerItem.tabBar.selectionMode) {
+                        if (!toolbarItem.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-27 12:25:45 +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");
+        }
+    }
+}