1
=== modified file 'CHANGES'
2
--- CHANGES	2014-04-16 11:51:47 +0000
3
+++ CHANGES	2014-04-21 22:45:54 +0000
4
@@ -93,6 +93,7 @@
5
93
- CHANGED IN Page/MainView: Only enable auto-hide behavior of header when the Page's flickable can be flicked vertically, so that manual setting of anchors is no longer needed for flickables that only flick horizontally
93
- CHANGED IN Page/MainView: Only enable auto-hide behavior of header when the Page's flickable can be flicked vertically, so that manual setting of anchors is no longer needed for flickables that only flick horizontally
6
94
- CHANGED IN Page: Automatic detection of flickable inside a Page to control the header is now limited to Flickables that are anchored to the top of the Page or fill the Page. Header automatically shows when flickable.contentHeight becomes <= flickable.height.
94
- CHANGED IN Page: Automatic detection of flickable inside a Page to control the header is now limited to Flickables that are anchored to the top of the Page or fill the Page. Header automatically shows when flickable.contentHeight becomes <= flickable.height.
7
95
- CHANGED IN Action, ActionItem, OptionSelectorDelegate: Setting iconName now always selects the requested icon from ubuntu-mobile theme, not the system icon theme.
95
- CHANGED IN Action, ActionItem, OptionSelectorDelegate: Setting iconName now always selects the requested icon from ubuntu-mobile theme, not the system icon theme.
8
96
- CHANGED IN TabBar: The model now needs to have a selectedIndex property.
9
96
97
10
97
SDK 0.1.46
98
SDK 0.1.46
11
98
##########
99
##########
12
99
100
13
=== modified file 'modules/Ubuntu/Components/TabBar.qml'
14
--- modules/Ubuntu/Components/TabBar.qml	2014-04-08 12:38:35 +0000
15
+++ modules/Ubuntu/Components/TabBar.qml	2014-04-21 22:45:54 +0000
16
@@ -63,8 +63,18 @@
17
63
63
18
64
    /*!
64
    /*!
19
65
      The property holds the index of the selected Tab item.
65
      The property holds the index of the selected Tab item.
20
66
      Note: Setting this property is DEPRECATED. Set the selectedIndex of the model instead.
21
66
      */
67
      */
23
67
    property int selectedIndex: (model && internal.modelChecked && model.count > 0) ? 0 : -1
68
    property int selectedIndex: (model && internal.modelChecked) ? model.selectedIndex : -1
24
69
25
70
    /*! \internal */
26
71
    onSelectedIndexChanged: {
27
72
        if (!model) return;
28
73
        if (tabBar.selectedIndex !== model.selectedIndex) {
29
74
            console.warn("Setting TabBar.selectedIndex is DEPRECATED. Set selectedIndex of the model instead");
30
75
            tabBar.selectedIndex = Qt.binding(function() { return (model && internal.modelChecked) ? model.selectedIndex : -1 });
31
76
        }
32
77
    }
33
68
78
34
69
    /*!
79
    /*!
35
70
      Do not deactivate the tab bar after a specified idle time or when the user selects a new tab.
80
      Do not deactivate the tab bar after a specified idle time or when the user selects a new tab.
36
@@ -93,20 +103,24 @@
37
93
103
38
94
        property bool modelChecked: true;
104
        property bool modelChecked: true;
39
95
105
40
106
        // returns true if the roles are good, false otherwise.
41
96
        function checkRoles() {
107
        function checkRoles() {
42
97
            if (tabBar.model.count <= 0)
108
            if (tabBar.model.count <= 0)
44
98
                return;
109
                return false;
45
99
110
46
100
            modelChecked = true;
111
            modelChecked = true;
47
101
            var f = tabBar.model.get(0);
112
            var f = tabBar.model.get(0);
48
102
            if (f.tab === undefined && f.title === undefined) {
113
            if (f.tab === undefined && f.title === undefined) {
49
103
                console.error("TabBar model must provide either tab or title role.");
114
                console.error("TabBar model must provide either tab or title role.");
50
104
                tabBar.model = null;
115
                tabBar.model = null;
51
116
                return false;
52
105
            }
117
            }
53
106
            if (f.tab !== undefined && f.tab.title === undefined) {
118
            if (f.tab !== undefined && f.tab.title === undefined) {
54
107
                console.error("TabBar model's tab role must have title property.");
119
                console.error("TabBar model's tab role must have title property.");
55
108
                tabBar.model = null;
120
                tabBar.model = null;
56
121
                return false;
57
109
            }
122
            }
58
123
            return true;
59
110
        }
124
        }
60
111
    }
125
    }
61
112
126
62
@@ -117,6 +131,12 @@
63
117
        if (!model)
131
        if (!model)
64
118
            return;
132
            return;
65
119
133
66
134
        if (!model.hasOwnProperty("selectedIndex")) {
67
135
            console.error("TabBar model must have selectedIndex property defined.");
68
136
            tabBar.model = null;
69
137
            return;
70
138
        }
71
139
72
120
        if (!model.hasOwnProperty("count")) {
140
        if (!model.hasOwnProperty("count")) {
73
121
            console.error("TabBar model must have count property defined.");
141
            console.error("TabBar model must have count property defined.");
74
122
            tabBar.model = null;
142
            tabBar.model = null;
75
@@ -130,11 +150,11 @@
76
130
        }
150
        }
77
131
151
78
132
        if (model.count > 0) {
152
        if (model.count > 0) {
81
133
            internal.checkRoles();
153
            if (internal.checkRoles()) {
82
134
            tabBar.selectedIndex = Math.max(Math.min(tabBar.selectedIndex, model.count - 1), 0);
154
                model.selectedIndex = Math.max(Math.min(tabBar.selectedIndex, model.count - 1), 0);
83
155
            }
84
135
        } else {
156
        } else {
85
136
            internal.modelChecked = false;
157
            internal.modelChecked = false;
86
137
            tabBar.selectedIndex = Qt.binding(function() { return (model && internal.modelChecked && model.count > 0) ? 0 : -1 })
87
138
        }
158
        }
88
139
    }
159
    }
89
140
160
90
141
161
91
=== modified file 'modules/Ubuntu/Components/Tabs.qml'
92
--- modules/Ubuntu/Components/Tabs.qml	2014-04-16 11:51:47 +0000
93
+++ modules/Ubuntu/Components/Tabs.qml	2014-04-21 22:45:54 +0000
94
@@ -161,7 +161,7 @@
95
161
      The first tab is 0, and -1 means that no tab is selected.
161
      The first tab is 0, and -1 means that no tab is selected.
96
162
      The initial value is 0 if Tabs has contents, or -1 otherwise.
162
      The initial value is 0 if Tabs has contents, or -1 otherwise.
97
163
     */
163
     */
99
164
    property alias selectedTabIndex: bar.selectedIndex
164
    property alias selectedTabIndex: tabsModel.selectedIndex
100
165
165
101
166
    /*!
166
    /*!
102
167
      \preliminary
167
      \preliminary
103
@@ -212,6 +212,13 @@
104
212
    ListModel {
212
    ListModel {
105
213
        id: tabsModel
213
        id: tabsModel
106
214
214
107
215
        property bool updateDisabled: false
108
216
109
217
        /*!
110
218
          The index of the selected tab.
111
219
         */
112
220
        property int selectedIndex: tabsModel.count > 0 ? 0 : -1
113
221
114
215
        function listModel(tab) {
222
        function listModel(tab) {
115
216
            return {"title": tab.title, "tab": tab};
223
            return {"title": tab.title, "tab": tab};
116
217
        }
224
        }
117
218
225
118
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
119
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-16 11:51:47 +0000
120
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-21 22:45:54 +0000
121
@@ -212,7 +212,7 @@
122
212
                        if (mouseArea.enteringSelectionMode) {
212
                        if (mouseArea.enteringSelectionMode) {
123
213
                            mouseArea.enteringSelectionMode = false;
213
                            mouseArea.enteringSelectionMode = false;
124
214
                        } else if (opacity > 0.0) {
214
                        } else if (opacity > 0.0) {
126
215
                            styledItem.selectedIndex = index;
215
                            styledItem.model.selectedIndex = index;
127
216
                            if (!styledItem.alwaysSelectionMode) {
216
                            if (!styledItem.alwaysSelectionMode) {
128
217
                                styledItem.selectionMode = false;
217
                                styledItem.selectionMode = false;
129
218
                            }
218
                            }
130
219
219
131
=== modified file 'tests/resources/navigation/TabView.qml'
132
--- tests/resources/navigation/TabView.qml	2013-11-20 10:25:12 +0000
133
+++ tests/resources/navigation/TabView.qml	2014-04-21 22:45:54 +0000
134
@@ -25,6 +25,7 @@
135
25
25
136
26
    ListModel {
26
    ListModel {
137
27
        id: pages
27
        id: pages
138
28
        property int selectedIndex: 0
139
28
        ListElement {
29
        ListElement {
140
29
            title: "Tab 1"
30
            title: "Tab 1"
141
30
        }
31
        }
142
@@ -68,7 +69,7 @@
143
68
            color: Qt.rgba(Math.random(0.5), Math.random(1), Math.random(0.5), 1)
69
            color: Qt.rgba(Math.random(0.5), Math.random(1), Math.random(0.5), 1)
144
69
            MouseArea {
70
            MouseArea {
145
70
                anchors.fill: parent
71
                anchors.fill: parent
147
71
                onClicked: tabBar.selectedIndex = index
72
                onClicked: pages.selectedIndex = index
148
72
            }
73
            }
149
73
        }
74
        }
150
74
    }
75
    }
151
@@ -83,6 +84,6 @@
152
83
        orientation: Qt.Horizontal
84
        orientation: Qt.Horizontal
153
84
        model: pages
85
        model: pages
154
85
        delegate: tabComponent
86
        delegate: tabComponent
156
86
        currentIndex: tabBar.selectedIndex
87
        currentIndex: pages.selectedIndex
157
87
    }
88
    }
158
88
}
89
}
159
89
90
160
=== modified file 'tests/unit_x11/tst_components/tst_tabbar.qml'
161
--- tests/unit_x11/tst_components/tst_tabbar.qml	2014-04-08 12:38:35 +0000
162
+++ tests/unit_x11/tst_components/tst_tabbar.qml	2014-04-21 22:45:54 +0000
163
@@ -60,6 +60,7 @@
164
60
60
165
61
    ListModel {
61
    ListModel {
166
62
        id: pages
62
        id: pages
167
63
        property int selectedIndex: 0
168
63
        ListElement {
64
        ListElement {
169
64
            title: "Tab 1"
65
            title: "Tab 1"
170
65
        }
66
        }
171
@@ -79,6 +80,7 @@
172
79
80
173
80
    ListModel {
81
    ListModel {
174
81
        id: invalidModel
82
        id: invalidModel
175
83
        property int selectedIndex: 0
176
82
        ListElement {
84
        ListElement {
177
83
            fruit: "Pear"
85
            fruit: "Pear"
178
84
        }
86
        }
179
@@ -86,6 +88,7 @@
180
86
88
181
87
    ListModel {
89
    ListModel {
182
88
        id: invalidModelTab
90
        id: invalidModelTab
183
91
        property int selectedIndex: 0
184
89
        ListElement {
92
        ListElement {
185
90
            tab: "Pear"
93
            tab: "Pear"
186
91
        }
94
        }
187
@@ -98,18 +101,22 @@
188
98
101
189
99
    ListModel {
102
    ListModel {
190
100
        id: validModelTab
103
        id: validModelTab
191
104
        property int selectedIndex: count > 0 ? 0 : -1
192
101
    }
105
    }
193
102
106
194
103
    ListModel {
107
    ListModel {
195
104
        id: emptyModelWillBeInvalid
108
        id: emptyModelWillBeInvalid
196
109
        property int selectedIndex: count > 0 ? 0 : -1
197
105
    }
110
    }
198
106
111
199
107
    ListModel {
112
    ListModel {
200
108
        id: emptyModel
113
        id: emptyModel
201
114
        property int selectedIndex: count > 0 ? 0 : -1
202
109
    }
115
    }
203
110
116
204
111
    TabsModel {
117
    TabsModel {
205
112
        id: pagesCpp
118
        id: pagesCpp
206
119
        property int selectedIndex: count > 0 ? 0 : -1
207
113
    }
120
    }
208
114
121
209
115
    Label {
122
    Label {
Status:	Merged
Approved by:	Zsombor Egri on 2014-04-22
Approved revision:	991
Merged at revision:	1012
Proposed branch:	lp:~tpeeters/ubuntu-ui-toolkit/10-tabsModelIndex
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	209 lines (+45/-9) 6 files modified CHANGES (+1/-0) modules/Ubuntu/Components/TabBar.qml (+25/-5) modules/Ubuntu/Components/Tabs.qml (+8/-1) modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml (+1/-1) tests/resources/navigation/TabView.qml (+3/-2) tests/unit_x11/tst_components/tst_tabbar.qml (+7/-0)
To merge this branch:	bzr merge lp:~tpeeters/ubuntu-ui-toolkit/10-tabsModelIndex
Related bugs:	Link a bug report
Related blueprints:	New header and bottom edge (Essential)
Reviewer	Review Type	Date Requested	Status
Zsombor Egri		2014-04-10	Approve on 2014-04-22
PS Jenkins bot	continuous-integration		Approve on 2014-04-21
Review via email: mp+215278@code.launchpad.net