1
=== modified file 'modules/Ubuntu/Components/Action.qml'
2
--- modules/Ubuntu/Components/Action.qml	2014-04-23 08:50:20 +0000
3
+++ modules/Ubuntu/Components/Action.qml	2014-05-12 19:37:24 +0000
4
@@ -74,13 +74,9 @@
5
74
     */
74
     */
6
75
75
7
76
    /*!
76
    /*!
8
77
      \deprecated
9
78
      \b {visible is DEPRECATED. Use \l ActionItem to specify the representation of an \l Action.}
10
79
      The action is visible to the user
77
      The action is visible to the user
11
80
     */
78
     */
12
81
    property bool visible: true
79
    property bool visible: true
13
82
    /*! \internal */
14
83
    onVisibleChanged: print("Action.visible is a DEPRECATED property. Use ActionItems to specify the representation of an Action.")
15
84
80
16
85
    /*!
81
    /*!
17
86
      Enable the action. It may be visible, but disabled.
82
      Enable the action. It may be visible, but disabled.
18
87
83
19
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml'
20
--- modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml	2014-05-06 16:25:45 +0000
21
+++ modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml	2014-05-12 19:37:24 +0000
22
@@ -43,6 +43,14 @@
23
43
    property color textColor: Theme.palette.selected.backgroundText
43
    property color textColor: Theme.palette.selected.backgroundText
24
44
    property real textLeftMargin: units.gu(2)
44
    property real textLeftMargin: units.gu(2)
25
45
45
26
46
    /*!
27
47
      The number of slots for actions in the header, including the optional
28
48
      (custom or automatic) back button in the left side of the header.
29
49
      If the number of actions defined is larger than the numer of actions
30
50
      specified here, extra actions are put into an overflow.
31
51
     */
32
52
    property int maximumNumberOfActions: 3
33
53
34
46
    implicitHeight: headerStyle.contentHeight + separator.height + separatorBottom.height
54
    implicitHeight: headerStyle.contentHeight + separator.height + separatorBottom.height
35
47
55
36
48
    BorderImage {
56
    BorderImage {
37
@@ -79,7 +87,8 @@
38
79
            height: parent ? parent.height : undefined
87
            height: parent ? parent.height : undefined
39
80
            width: visible ? units.gu(5) : 0
88
            width: visible ? units.gu(5) : 0
40
81
            action: styledItem.__customBackAction
89
            action: styledItem.__customBackAction
42
82
            visible: null !== styledItem.__customBackAction
90
            visible: null !== styledItem.__customBackAction &&
43
91
                     styledItem.__customBackAction.visible
44
83
            style: Theme.createStyleComponent("HeaderButtonStyle.qml", backButton)
92
            style: Theme.createStyleComponent("HeaderButtonStyle.qml", backButton)
45
84
        }
93
        }
46
85
94
47
@@ -196,13 +205,24 @@
48
196
    Row {
205
    Row {
49
197
        id: actionsContainer
206
        id: actionsContainer
50
198
207
51
208
        property var visibleActions: getVisibleActions(styledItem.actions)
52
209
        function getVisibleActions(actions) {
53
210
            var visibleActionList = [];
54
211
            for (var i in actions) {
55
212
                var action = actions[i];
56
213
                if (action.visible) {
57
214
                    visibleActionList.push(action);
58
215
                }
59
216
            }
60
217
            return visibleActionList;
61
218
        }
62
219
63
199
        QtObject {
220
        QtObject {
64
200
            id: numberOfSlots
221
            id: numberOfSlots
67
201
            property int requested: styledItem.actions && styledItem.actions.hasOwnProperty("length") ?
222
            property int requested: actionsContainer.visibleActions.length
66
202
                                         styledItem.actions.length : 0
68
203
            property int left: tabsButton.visible || backButton.visible ||
223
            property int left: tabsButton.visible || backButton.visible ||
69
204
                               customBackButton.visible ? 1 : 0
224
                               customBackButton.visible ? 1 : 0
71
205
            property int right: 3 - left
225
            property int right: headerStyle.maximumNumberOfActions - left
72
206
            property int overflow: actionsOverflowButton.visible ? 1 : 0
226
            property int overflow: actionsOverflowButton.visible ? 1 : 0
73
207
            property int used: Math.min(right - overflow, requested)
227
            property int used: Math.min(right - overflow, requested)
74
208
        }
228
        }
75
@@ -219,7 +239,7 @@
76
219
            AbstractButton {
239
            AbstractButton {
77
220
                id: actionButton
240
                id: actionButton
78
221
                objectName: action.objectName + "_header_button"
241
                objectName: action.objectName + "_header_button"
80
222
                action: styledItem.actions[index]
242
                action: actionsContainer.visibleActions[index]
81
223
                style: Theme.createStyleComponent("HeaderButtonStyle.qml", actionButton)
243
                style: Theme.createStyleComponent("HeaderButtonStyle.qml", actionButton)
82
224
                width: units.gu(5)
244
                width: units.gu(5)
83
225
                height: actionsContainer.height
245
                height: actionsContainer.height
84
@@ -250,7 +270,7 @@
85
250
                    Repeater {
270
                    Repeater {
86
251
                        model: numberOfSlots.requested - numberOfSlots.used
271
                        model: numberOfSlots.requested - numberOfSlots.used
87
252
                        ListItem.Standard {
272
                        ListItem.Standard {
89
253
                            action: styledItem.actions[numberOfSlots.used + index]
273
                            action: actionsContainer.visibleActions[numberOfSlots.used + index]
90
254
                            objectName: action.objectName + "_header_overflow_button"
274
                            objectName: action.objectName + "_header_overflow_button"
91
255
                            onClicked: actionsOverflowPopover.hide()
275
                            onClicked: actionsOverflowPopover.hide()
92
256
                        }
276
                        }
93
257
277
94
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
95
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-05-02 11:04:44 +0000
96
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-05-12 19:37:24 +0000
97
@@ -43,12 +43,14 @@
98
43
        tools: ToolbarItems {
43
        tools: ToolbarItems {
99
44
            back: ToolbarButton {
44
            back: ToolbarButton {
100
45
                action: Action {
45
                action: Action {
101
46
                    id: cancelAction
102
46
                    iconName: "cancel"
47
                    iconName: "cancel"
103
47
                    text: "cancel"
48
                    text: "cancel"
104
48
                    onTriggered: label.text = "Cancel button clicked."
49
                    onTriggered: label.text = "Cancel button clicked."
105
49
                }
50
                }
106
50
            }
51
            }
107
51
            Repeater {
52
            Repeater {
108
53
                id: buttonRepeater
109
52
                model: 5
54
                model: 5
110
53
                ToolbarButton {
55
                ToolbarButton {
111
54
                    action: Action {
56
                    action: Action {
112
@@ -60,6 +62,22 @@
113
60
                }
62
                }
114
61
            }
63
            }
115
62
        }
64
        }
116
65
117
66
        Button {
118
67
            objectName: "hide_actions_button"
119
68
            anchors {
120
69
                bottom: parent.bottom
121
70
                horizontalCenter: parent.horizontalCenter
122
71
            }
123
72
            text: "Hide some actions"
124
73
            onClicked: {
125
74
                cancelAction.visible = false;
126
75
                for (var i=0; i < 3; i++) {
127
76
                    buttonRepeater.itemAt(i).action.visible = false;
128
77
                }
129
78
                // only three of five visible actions left
130
79
            }
131
80
        }
132
63
    }
81
    }
133
64
}
82
}
134
65
""")
83
""")
135
@@ -98,3 +116,18 @@
136
98
    def test_click_custom_back_button(self):
116
    def test_click_custom_back_button(self):
137
99
        self.header.click_custom_back_button()
117
        self.header.click_custom_back_button()
138
100
        self.assertEqual(self.label.text, 'Cancel button clicked.')
118
        self.assertEqual(self.label.text, 'Cancel button clicked.')
139
119
140
120
    def test_overflow_button(self):
141
121
        # there are 5 actions plus a custom back action
142
122
        overflow_button = self.header.select_single(
143
123
            'AbstractButton',
144
124
            objectName='actions_overflow_button')
145
125
        self.assertEqual(overflow_button.visible, True)
146
126
147
127
        hide_actions_button = self.main_view.select_single(
148
128
            'Button',
149
129
            objectName='hide_actions_button')
150
130
        self.pointing_device.click_object(hide_actions_button)
151
131
152
132
        # only three actions are visible
153
133
        self.assertEqual(overflow_button.visible, False)
154
101
134
155
=== modified file 'tests/resources/toolbar/headerTools.qml'
156
--- tests/resources/toolbar/headerTools.qml	2014-05-01 12:04:44 +0000
157
+++ tests/resources/toolbar/headerTools.qml	2014-05-12 19:37:24 +0000
158
@@ -60,6 +60,7 @@
159
60
            }
60
            }
160
61
            ToolbarButton {
61
            ToolbarButton {
161
62
                action: Action {
62
                action: Action {
162
63
                    id: action2
163
63
                    onTriggered: print("two!")
64
                    onTriggered: print("two!")
164
64
                    iconName: "contact"
65
                    iconName: "contact"
165
65
                    text: "Second action"
66
                    text: "Second action"
166
@@ -71,9 +72,11 @@
167
71
                action: Action {
72
                action: Action {
168
72
                    text: "cancel"
73
                    text: "cancel"
169
73
                    iconName: "cancel"
74
                    iconName: "cancel"
171
74
                    onTriggered: print("cancelled!")
75
                    onTriggered: {
172
76
                        action2.visible = false;
173
77
                        visible = false;
174
78
                    }
175
75
                }
79
                }
176
76
                anchors.verticalCenter: parent.verticalCenter
177
77
            }
80
            }
178
78
        }
81
        }
179
79
    }
82
    }
Reviewer	Review Type	Date Requested	Status
Zsombor Egri		2014-05-10	Approve on 2014-05-14
Nekhelesh Ramananthan (community)	testing		Approve on 2014-05-13
PS Jenkins bot	continuous-integration		Approve on 2014-05-12
Review via email: mp+219109@code.launchpad.net