1
=== modified file 'modules/Ubuntu/Components/MainView.qml'
2
--- modules/Ubuntu/Components/MainView.qml	2013-09-24 06:22:16 +0000
3
+++ modules/Ubuntu/Components/MainView.qml	2013-10-25 10:37:15 +0000
4
@@ -271,6 +271,10 @@
5
271
            }
271
            }
6
272
        }
272
        }
7
273
273
8
274
        Toolbar {
9
275
            id: toolbarItem
10
276
        }
11
277
12
274
        /*!
278
        /*!
13
275
          The header of the MainView. Can be used to obtain the height of the header
279
          The header of the MainView. Can be used to obtain the height of the header
14
276
          in \l Page to determine the area for the \l Page to fill.
280
          in \l Page to determine the area for the \l Page to fill.
15
@@ -283,10 +287,6 @@
16
283
            id: headerItem
287
            id: headerItem
17
284
            property real bottomY: headerItem.y + headerItem.height
288
            property real bottomY: headerItem.y + headerItem.height
18
285
        }
289
        }
19
286
20
287
        Toolbar {
21
288
            id: toolbarItem
22
289
        }
23
290
    }
290
    }
24
291
291
25
292
    /*!
292
    /*!
26
293
293
27
=== modified file 'modules/Ubuntu/Components/TabBar.qml'
28
--- modules/Ubuntu/Components/TabBar.qml	2013-08-14 21:28:43 +0000
29
+++ modules/Ubuntu/Components/TabBar.qml	2013-10-25 10:37:15 +0000
30
@@ -43,7 +43,14 @@
31
43
      An inactive tab bar only displays the currently selected tab,
43
      An inactive tab bar only displays the currently selected tab,
32
44
      and an active tab bar can be interacted with to select a tab.
44
      and an active tab bar can be interacted with to select a tab.
33
45
     */
45
     */
35
46
    property bool selectionMode: alwaysSelectionMode
46
    property bool selectionMode: false
36
47
37
48
    /*!
38
49
      When all components are completed, enable selection mode
39
50
     */
40
51
    Component.onCompleted: {
41
52
        tabBar.selectionMode = true;
42
53
    }
43
47
54
44
48
    /*!
55
    /*!
45
49
      Do not deactivate the tab bar after a specified idle time or when the user selects a new tab.
56
      Do not deactivate the tab bar after a specified idle time or when the user selects a new tab.
46
50
57
47
=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
48
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2013-10-18 09:37:13 +0000
49
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2013-10-25 10:37:15 +0000
50
@@ -205,8 +205,6 @@
51
205
        tab_bar = self.select_single(TabBar)
205
        tab_bar = self.select_single(TabBar)
52
206
        assert tab_bar is not None, _NO_TABS_ERROR
206
        assert tab_bar is not None, _NO_TABS_ERROR
53
207
        tab_bar.switch_to_next_tab()
207
        tab_bar.switch_to_next_tab()
54
208
55
209
        # Sleep while the animation finishes.
56
210
        self._get_animating().wait_for(False)
208
        self._get_animating().wait_for(False)
57
211
209
58
212
210
59
@@ -262,16 +260,18 @@
60
262
260
61
263
    def switch_to_next_tab(self):
261
    def switch_to_next_tab(self):
62
264
        """Open the next tab."""
262
        """Open the next tab."""
70
265
        # Click the tab bar to switch to selection mode.
263
        self._activate_tab_bar()
64
266
        logger.debug('Click the tab bar to enable selection mode.')
65
267
        self.pointing_device.click_object(self)
66
268
        if not self.selectionMode:
67
269
            logger.debug('Selection mode not enabled, try again.')
68
270
            # in case someone stole the click, like the open toolbar
69
271
            self.pointing_device.click_object(self)
71
272
        logger.debug('Click the next tab bar button.')
264
        logger.debug('Click the next tab bar button.')
72
273
        self.pointing_device.click_object(self._get_next_tab_button())
265
        self.pointing_device.click_object(self._get_next_tab_button())
73
274
266
74
267
    def _activate_tab_bar(self):
75
268
        if self.selectionMode:
76
269
            logger.debug('Already in selection mode.')
77
270
        else:
78
271
            # Click the tab bar to switch to selection mode.
79
272
            logger.debug('Click the tab bar to enable selection mode.')
80
273
            self.pointing_device.click_object(self)
81
274
82
275
    def _get_next_tab_button(self):
275
    def _get_next_tab_button(self):
83
276
        current_index = self._get_selected_button_index()
276
        current_index = self._get_selected_button_index()
84
277
        next_index = (current_index + 1) % self._get_number_of_tab_buttons()
277
        next_index = (current_index + 1) % self._get_number_of_tab_buttons()
85
278
278
86
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
87
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-10-18 14:41:53 +0000
88
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-10-25 10:37:15 +0000
89
@@ -193,7 +193,7 @@
90
193
import Ubuntu.Components.ListItems 0.1 as ListItem
193
import Ubuntu.Components.ListItems 0.1 as ListItem
91
194
194
92
195
MainView {
195
MainView {
94
196
    width: units.gu(48)
196
    width: units.gu(70)
95
197
    height: units.gu(60)
197
    height: units.gu(60)
96
198
198
97
199
    Tabs {
199
    Tabs {
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-10-25
Tim Peeters			Approve on 2013-10-25
Zsombor Egri		2013-09-11	Approve on 2013-09-17
Review via email: mp+185046@code.launchpad.net