1
=== modified file 'plugins/Unity/Indicators/Network/qml/AccessPoint.qml'
2
--- plugins/Unity/Indicators/Network/qml/AccessPoint.qml	2013-08-20 19:50:07 +0000
3
+++ plugins/Unity/Indicators/Network/qml/AccessPoint.qml	2013-08-23 11:34:24 +0000
4
@@ -25,29 +25,39 @@
5
25
Indicators.FramedMenuItem {
25
Indicators.FramedMenuItem {
6
26
    id: accessPoint
26
    id: accessPoint
7
27
27
9
28
    readonly property bool checked: menu ? menu.isToggled : false
28
    property bool checked: false
10
29
    property bool secure: false
11
30
    property bool adHoc: false
12
31
    property int signalStrength: 0
13
32
14
33
    signal activate()
15
29
34
16
30
    onCheckedChanged: {
35
    onCheckedChanged: {
17
31
        // Can't rely on binding. Checked is assigned on click.
36
        // Can't rely on binding. Checked is assigned on click.
18
32
        checkBoxActive.checked = checked;
37
        checkBoxActive.checked = checked;
19
33
    }
38
    }
20
34
39
24
35
    // FIXME - we need to get the strength from menu.ext.xCanonicalWifiApStrengthAction
40
    icon: {
22
36
    // but UnityMenuModel doesnt support fetching actions not attached to menu item.
23
37
    function getNetworkIcon(data) {
25
38
        var imageName = "nm-signal-100"
41
        var imageName = "nm-signal-100"
26
39
42
28
40
        if (data.ext.xCanonicalWifiApIsAdhoc) {
43
        if (adHoc) {
29
41
            imageName = "nm-adhoc";
44
            imageName = "nm-adhoc";
30
45
        } else if (signalStrength == 0) {
31
46
            imageName = "nm-signal-00";
32
47
        } else if (signalStrength <= 25) {
33
48
            imageName = "nm-signal-25";
34
49
        } else if (signalStrength <= 50) {
35
50
            imageName = "nm-signal-50";
36
51
        } else if (signalStrength <= 75) {
37
52
            imageName = "nm-signal-75";
38
42
        }
53
        }
40
43
        if (data.ext.xCanonicalWifiApIsSecure) {
54
41
55
        if (secure) {
42
44
            imageName += "-secure";
56
            imageName += "-secure";
43
45
        }
57
        }
44
46
45
47
        return "image://gicon/" + imageName;
58
        return "image://gicon/" + imageName;
46
48
    }
59
    }
47
49
60
48
50
    icon: menu ? getNetworkIcon(menu) : "image://gicon/wifi-none"
49
51
    iconFrame: false
61
    iconFrame: false
50
52
    control: CheckBox {
62
    control: CheckBox {
51
53
        id: checkBoxActive
63
        id: checkBoxActive
52
54
64
53
=== modified file 'plugins/Unity/Indicators/Network/qml/PasswordPage.qml'
54
--- plugins/Unity/Indicators/Network/qml/PasswordPage.qml	2013-08-20 19:50:07 +0000
55
+++ plugins/Unity/Indicators/Network/qml/PasswordPage.qml	2013-08-23 11:34:24 +0000
56
@@ -38,7 +38,7 @@
57
38
        }
38
        }
58
39
39
59
40
        Indicators.SectionMenuItem {
40
        Indicators.SectionMenuItem {
61
41
            label: "Authentication"
41
            text: "Authentication"
62
42
        }
42
        }
63
43
43
64
44
        Indicators.FramedMenuItem {
44
        Indicators.FramedMenuItem {
65
45
45
66
=== removed file 'plugins/Unity/Indicators/Network/qml/WifiSection.qml'
67
--- plugins/Unity/Indicators/Network/qml/WifiSection.qml	2013-08-20 19:50:07 +0000
68
+++ plugins/Unity/Indicators/Network/qml/WifiSection.qml	1970-01-01 00:00:00 +0000
69
@@ -1,28 +0,0 @@
70
1
/*
71
2
 * Copyright 2013 Canonical Ltd.
72
3
 *
73
4
 * This program is free software; you can redistribute it and/or modify
74
5
 * it under the terms of the GNU Lesser General Public License as published by
75
6
 * the Free Software Foundation; version 3.
76
7
 *
77
8
 * This program is distributed in the hope that it will be useful,
78
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
79
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
80
11
 * GNU Lesser General Public License for more details.
81
12
 *
82
13
 * You should have received a copy of the GNU Lesser General Public License
83
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
84
15
 *
85
16
 * Authors:
86
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
87
18
 */
88
19
89
20
import QtQuick 2.0
90
21
import Ubuntu.Components 0.1
91
22
import Unity.Indicators 0.1 as Indicators
92
23
93
24
Indicators.SectionMenuItem {
94
25
    id: wifiSectionMenu
95
26
96
27
    busy: menu ? menu.ext.xCanonicalBusyAction : false
97
28
}
98
29
0
99
=== modified file 'plugins/Unity/Indicators/Network/qml/qmldir'
100
--- plugins/Unity/Indicators/Network/qml/qmldir	2013-08-20 19:50:07 +0000
101
+++ plugins/Unity/Indicators/Network/qml/qmldir	2013-08-23 11:34:24 +0000
102
@@ -5,5 +5,4 @@
103
5
NetworkPage 0.1 NetworkPage.qml
5
NetworkPage 0.1 NetworkPage.qml
104
6
AccessPoint 0.1 AccessPoint.qml
6
AccessPoint 0.1 AccessPoint.qml
105
7
PasswordPage 0.1 PasswordPage.qml
7
PasswordPage 0.1 PasswordPage.qml
106
8
PasswordTextField 0.1 PasswordTextField.qml
107
9
WifiSection 0.1 WifiSection.qml
108
10
\ No newline at end of file
8
\ No newline at end of file
109
9
PasswordTextField 0.1 PasswordTextField.qml
110
11
\ No newline at end of file
10
\ No newline at end of file
111
12
11
112
=== modified file 'plugins/Unity/Indicators/qml/BaseMenuItem.qml'
113
--- plugins/Unity/Indicators/qml/BaseMenuItem.qml	2013-08-14 09:07:45 +0000
114
+++ plugins/Unity/Indicators/qml/BaseMenuItem.qml	2013-08-23 11:34:24 +0000
115
@@ -25,14 +25,10 @@
116
25
    id: baseMenu
25
    id: baseMenu
117
26
26
118
27
    property bool menuActivated: false
27
    property bool menuActivated: false
119
28
    property QtObject menu
120
29
28
121
30
    signal selectMenu()
29
    signal selectMenu()
122
31
    signal deselectMenu()
30
    signal deselectMenu()
123
32
31
124
33
    signal activate()
125
34
    signal changeState(var value)
126
35
127
36
    showDivider: false
32
    showDivider: false
128
37
    __foregroundColor: "#e8e1d0" // FIXME not in palette yet
33
    __foregroundColor: "#e8e1d0" // FIXME not in palette yet
129
38
34
130
39
35
131
=== modified file 'plugins/Unity/Indicators/qml/ButtonMenuItem.qml'
132
--- plugins/Unity/Indicators/qml/ButtonMenuItem.qml	2013-08-14 09:07:45 +0000
133
+++ plugins/Unity/Indicators/qml/ButtonMenuItem.qml	2013-08-23 11:34:24 +0000
134
@@ -24,14 +24,14 @@
135
24
24
136
25
BaseMenuItem {
25
BaseMenuItem {
137
26
    id: menuItem
26
    id: menuItem
138
27
    objectName: menuAction.name
139
28
    implicitHeight: units.gu(7)
27
    implicitHeight: units.gu(7)
141
29
    enabled: menuAction.active
28
142
29
    property alias text: button.text
143
30
144
31
    signal activate()
145
30
32
146
31
    Button {
33
    Button {
147
32
        id: button
34
        id: button
148
33
        enabled: menuAction.enabled
149
34
        text: menu ? menu.label : ""
150
35
        anchors.centerIn: parent
35
        anchors.centerIn: parent
151
36
        height: units.gu(4)
36
        height: units.gu(4)
152
37
        width: units.gu(16)
37
        width: units.gu(16)
153
@@ -41,9 +41,4 @@
154
41
            menuItem.activate();
41
            menuItem.activate();
155
42
        }
42
        }
156
43
    }
43
    }
157
44
158
45
    Indicators.MenuAction {
159
46
        id: menuAction
160
47
        menu: menuItem.menu
161
48
    }
162
49
}
44
}
163
50
45
164
=== modified file 'plugins/Unity/Indicators/qml/FramedMenuItem.qml'
165
--- plugins/Unity/Indicators/qml/FramedMenuItem.qml	2013-08-14 09:07:45 +0000
166
+++ plugins/Unity/Indicators/qml/FramedMenuItem.qml	2013-08-23 11:34:24 +0000
167
@@ -23,10 +23,8 @@
168
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 0.1 as ListItem
169
24
24
170
25
BaseMenuItem {
25
BaseMenuItem {
171
26
    text: menu && menu.label ? menu.label : ""
172
27
    implicitHeight: units.gu(7)
26
    implicitHeight: units.gu(7)
173
28
27
174
29
    icon: menu ? menu.icon : ""
175
30
    iconFrame: false
28
    iconFrame: false
176
31
29
177
32
    HLine {
30
    HLine {
178
33
31
179
=== modified file 'plugins/Unity/Indicators/qml/IndicatorPage.qml'
180
--- plugins/Unity/Indicators/qml/IndicatorPage.qml	2013-08-14 09:07:45 +0000
181
+++ plugins/Unity/Indicators/qml/IndicatorPage.qml	2013-08-23 11:34:24 +0000
182
@@ -96,18 +96,13 @@
183
96
                    }
96
                    }
184
97
                    if (item.hasOwnProperty("menu")) {
97
                    if (item.hasOwnProperty("menu")) {
185
98
                        item.menu = Qt.binding(function() { return model; });
98
                        item.menu = Qt.binding(function() { return model; });
186
99
187
100
                        item.activate.connect(onActivateMenu);
188
101
                        item.changeState.connect(onChangeState);
189
102
                    }
99
                    }
190
103
                }
100
                }
191
104
101
198
105
                function onActivateMenu(value) {
102
                Binding {
199
106
                    mainMenu.model.activate(index, value);
103
                    target: item ? item : null
200
107
                }
104
                    property: "objectName"
201
108
105
                    value: model.action
196
109
                function onChangeState(value) {
197
110
                    mainMenu.model.changeState(index, value);
202
111
                }
106
                }
203
112
            }
107
            }
204
113
        }
108
        }
205
114
109
206
=== removed file 'plugins/Unity/Indicators/qml/MenuAction.qml'
207
--- plugins/Unity/Indicators/qml/MenuAction.qml	2013-08-14 09:07:45 +0000
208
+++ plugins/Unity/Indicators/qml/MenuAction.qml	1970-01-01 00:00:00 +0000
209
@@ -1,59 +0,0 @@
210
1
/*
211
2
 * Copyright 2013 Canonical Ltd.
212
3
 *
213
4
 * This program is free software; you can redistribute it and/or modify
214
5
 * it under the terms of the GNU Lesser General Public License as published by
215
6
 * the Free Software Foundation; version 3.
216
7
 *
217
8
 * This program is distributed in the hope that it will be useful,
218
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
219
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
220
11
 * GNU Lesser General Public License for more details.
221
12
 *
222
13
 * You should have received a copy of the GNU Lesser General Public License
223
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
224
15
 *
225
16
 * Authors:
226
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
227
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
228
19
 */
229
20
230
21
import QtQuick 2.0
231
22
232
23
/*!
233
24
    \qmltype MenuAction
234
25
    \inqmlmodule Indicators 0.1
235
26
    \brief Helper class to connect to a qmenumodel action
236
27
237
28
    Example:
238
29
    \qml
239
30
        BaseMenuItem {
240
31
            id: menuItem
241
32
242
33
            Switch {
243
34
                checked: menuAction.state
244
35
            }
245
36
246
37
            Indicators.MenuAction {
247
38
                id: menuAction
248
39
                menu: menuItem.menu
249
40
            }
250
41
        }
251
42
    \endqml
252
43
*/
253
44
254
45
Item {
255
46
    id: menuAction
256
47
257
48
    /*!
258
49
      \preliminary
259
50
      The dbus action group object
260
51
     */
261
52
    readonly property string name: menu ? menu.action : ""
262
53
263
54
    property QtObject menu: null
264
55
265
56
    readonly property var state: menu ? menu.actionState : undefined
266
57
267
58
    readonly property bool active: menu ? menu.sensitive : false
268
59
}
269
60
0
270
=== modified file 'plugins/Unity/Indicators/qml/MenuItemFactory.qml'
271
--- plugins/Unity/Indicators/qml/MenuItemFactory.qml	2013-08-20 19:50:07 +0000
272
+++ plugins/Unity/Indicators/qml/MenuItemFactory.qml	2013-08-23 11:34:24 +0000
273
@@ -20,6 +20,7 @@
274
20
import QtQuick 2.0
20
import QtQuick 2.0
275
21
import Unity.Indicators 0.1 as Indicators
21
import Unity.Indicators 0.1 as Indicators
276
22
import Unity.Indicators.Network 0.1 as ICNetwork
22
import Unity.Indicators.Network 0.1 as ICNetwork
277
23
import QMenuModel 0.1 as QMenuModel
278
23
24
279
24
Item {
25
Item {
280
25
    id: menuFactory
26
    id: menuFactory
281
@@ -47,35 +48,151 @@
282
47
    Component {
48
    Component {
283
48
        id: sliderMenu;
49
        id: sliderMenu;
284
49
        Indicators.SliderMenuItem {
50
        Indicators.SliderMenuItem {
285
51
            property QtObject menu: null
286
52
287
53
            text: menu && menu.label ? menu.label : ""
288
54
            icon: menu ? menu.icon : ""
289
55
            minIcon: menu.ext.minIcon
290
56
            maxIcon: menu.ext.maxIcon
291
57
292
58
            minimumValue: menu.ext.minValue ? menu.ext.minValue : 0.0
293
59
            maximumValue: {
294
60
                var maximum = menu.ext.maxValue ? menu.ext.maxValue : 1.0
295
61
                if (maximum <= minimumValue) {
296
62
                        return minimumValue + 1;
297
63
                }
298
64
                return maximum;
299
65
            }
300
66
            value: menu ? menu.actionState : 0.0
301
67
            enabled: menu ? menu.sensitive : false
302
68
303
50
            Component.onCompleted: {
69
            Component.onCompleted: {
304
51
                model.loadExtendedAttributes(modelIndex, {'min-value': 'double',
70
                model.loadExtendedAttributes(modelIndex, {'min-value': 'double',
305
52
                                                          'max-value': 'double',
71
                                                          'max-value': 'double',
306
53
                                                          'min-icon': 'icon',
72
                                                          'min-icon': 'icon',
307
54
                                                          'max-icon': 'icon'});
73
                                                          'max-icon': 'icon'});
308
55
            }
74
            }
309
75
310
76
            // FIXME: The interval should be [0.0 - 1.0]. Unfortunately, when
311
77
            // reaching the boundaries (0.0 or 1.0), the value is converted
312
78
            // to an integer when automatically wrapped in a variant when
313
79
            // passed to QStateAction::updateState(…). The server chokes on
314
80
            // those values, complaining that they’re not of the right type…
315
81
            onChangeState: {
316
82
                if (value == Math.round(value)) {
317
83
                    if (value >= maximumValue) {
318
84
                        model.changeState(modelIndex, maximumValue - 0.000001);
319
85
                    } else if (value <= minimumValue) {
320
86
                        model.changeState(modelIndex, minimumValue + 0.000001);
321
87
                    } else {
322
88
                        model.changeState(modelIndex, value * 1.000001);
323
89
                    }
324
90
                } else {
325
91
                    model.changeState(modelIndex, value);
326
92
                }
327
93
            }
328
56
        }
94
        }
329
57
    }
95
    }
331
58
    Component { id: buttonMenu; Indicators.ButtonMenuItem {} }
96
332
59
    Component { id: divMenu; Indicators.DivMenuItem {} }
97
    Component { id: divMenu; Indicators.DivMenuItem {} }
337
60
    Component { id: sectionMenu; Indicators.SectionMenuItem {} }
98
338
61
    Component { id: progressMenu; Indicators.ProgressMenuItem {} }
99
    Component {
339
62
    Component { id: standardMenu; Indicators.StandardMenuItem {} }
100
        id: buttonMenu;
340
63
    Component { id: switchMenu; Indicators.SwitchMenuItem {} }
101
        Indicators.ButtonMenuItem {
341
102
            property QtObject menu: null
342
103
343
104
            text: menu && menu.label ? menu.label : ""
344
105
            enabled: menu ? menu.sensitive : false
345
106
346
107
            onActivate: model.activate(modelIndex);
347
108
        }
348
109
    }
349
110
    Component {
350
111
        id: sectionMenu;
351
112
        Indicators.SectionMenuItem {
352
113
            property QtObject menu: null
353
114
354
115
            text: menu && menu.label ? menu.label : ""
355
116
        }
356
117
    }
357
118
358
119
    Component {
359
120
        id: progressMenu;
360
121
        Indicators.ProgressMenuItem {
361
122
            property QtObject menu: null
362
123
363
124
            text: menu && menu.label ? menu.label : ""
364
125
            icon: menu ? menu.icon : ""
365
126
            value : menu ? menu.actionState : 0.0
366
127
        }
367
128
    }
368
129
369
130
    Component {
370
131
        id: standardMenu;
371
132
        Indicators.StandardMenuItem {
372
133
            property QtObject menu: null
373
134
374
135
            text: menu && menu.label ? menu.label : ""
375
136
            icon: menu ? menu.icon : ""
376
137
            checkable: menu ? (menu.isCheck || menu.isRadio) : false
377
138
            checked: checkable ? menu.isToggled : false
378
139
            enabled: menu ? menu.sensitive : false
379
140
380
141
            onActivate: model.activate(modelIndex);
381
142
        }
382
143
    }
383
144
384
145
    Component {
385
146
        id: switchMenu;
386
147
        Indicators.SwitchMenuItem {
387
148
            property QtObject menu: null
388
149
389
150
            text: menu && menu.label ? menu.label : ""
390
151
            icon: menu ? menu.icon : ""
391
152
            checked: menu ? menu.isToggled : false
392
153
            enabled: menu ? menu.sensitive : false
393
154
394
155
            onActivate: model.activate(modelIndex);
395
156
        }
396
157
    }
397
158
398
64
    Component {
159
    Component {
399
65
        id: wifiSection;
160
        id: wifiSection;
401
66
        ICNetwork.WifiSection {
161
        Indicators.SectionMenuItem {
402
162
            property QtObject menu: null
403
163
404
164
            text: menu && menu.label ? menu.label : ""
405
165
            busy: menu ? menu.ext.xCanonicalBusyAction : false
406
166
407
67
            Component.onCompleted: {
167
            Component.onCompleted: {
408
68
                model.loadExtendedAttributes(modelIndex, {'x-canonical-busy-action': 'bool'});
168
                model.loadExtendedAttributes(modelIndex, {'x-canonical-busy-action': 'bool'});
409
69
            }
169
            }
410
70
        }
170
        }
411
71
    }
171
    }
412
172
413
72
    Component {
173
    Component {
414
73
        id: accessPoint;
174
        id: accessPoint;
415
74
        ICNetwork.AccessPoint {
175
        ICNetwork.AccessPoint {
416
176
            property QtObject menu: null
417
177
//            property var strenthAction: QMenuModel.UnityMenuAction {
418
178
//                model: menuFactory.model ? menuFactory.model : null
419
179
//                name: menu ? menu.ext.xCanonicalWifiApStrengthAction : ""
420
180
//            }
421
181
422
182
            text: menu && menu.label ? menu.label : ""
423
183
            icon: menu ? menu.icon : ""
424
184
            secure: menu ? menu.ext.xCanonicalWifiApIsSecure : false
425
185
            adHoc: menu ? menu.ext.xCanonicalWifiApIsAdhoc : false
426
186
            checked: menu ? menu.isToggled : false
427
187
//            signalStrength: strenthAction.valid ? strenthAction.state : 0
428
188
            enabled: menu ? menu.sensitive : false
429
189
430
75
            Component.onCompleted: {
190
            Component.onCompleted: {
431
76
                model.loadExtendedAttributes(modelIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
191
                model.loadExtendedAttributes(modelIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
433
77
                                                          'x-canonical-wifi-ap-is-secure': 'bool'});
192
                                                          'x-canonical-wifi-ap-is-secure': 'bool',
434
193
                                                          'x-canonical-wifi-ap-strength-action': 'string'});
435
78
            }
194
            }
436
195
            onActivate: model.activate(modelIndex);
437
79
        }
196
        }
438
80
    }
197
    }
439
81
198
440
82
199
441
=== modified file 'plugins/Unity/Indicators/qml/ProgressMenuItem.qml'
442
--- plugins/Unity/Indicators/qml/ProgressMenuItem.qml	2013-08-14 09:07:45 +0000
443
+++ plugins/Unity/Indicators/qml/ProgressMenuItem.qml	2013-08-23 11:34:24 +0000
444
@@ -23,10 +23,8 @@
445
23
23
446
24
FramedMenuItem {
24
FramedMenuItem {
447
25
    id: menuItem
25
    id: menuItem
448
26
    objectName: menuAction.name
449
27
    enabled: menuAction.active
450
28
26
452
29
    property int value : menuAction.state
27
    property int value : 0.0
453
30
28
454
31
    control: Label {
29
    control: Label {
455
32
        id: progress
30
        id: progress
456
@@ -37,9 +35,4 @@
457
37
        fontSize: "medium"
35
        fontSize: "medium"
458
38
        color: "#e8e1d0"
36
        color: "#e8e1d0"
459
39
    }
37
    }
460
40
461
41
    Indicators.MenuAction {
462
42
        id: menuAction
463
43
        menu: menuItem.menu
464
44
    }
465
45
}
38
}
466
46
39
467
=== modified file 'plugins/Unity/Indicators/qml/SectionMenuItem.qml'
468
--- plugins/Unity/Indicators/qml/SectionMenuItem.qml	2013-08-14 09:07:45 +0000
469
+++ plugins/Unity/Indicators/qml/SectionMenuItem.qml	2013-08-23 11:34:24 +0000
470
@@ -22,15 +22,15 @@
471
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 0.1 as ListItem
472
23
23
473
24
BaseMenuItem {
24
BaseMenuItem {
475
25
    property string label: menu && menu.label ? menu.label : ""
25
    id: menuItem
476
26
    property alias text: header.text
477
26
    property bool busy: false
27
    property bool busy: false
478
27
28
480
28
    implicitHeight: label !== "" ? header.height : 0
29
    implicitHeight: text !== "" ? header.height : 0
481
29
30
482
30
    ListItem.Header {
31
    ListItem.Header {
483
31
        id: header
32
        id: header
484
32
33
485
33
        text: label
486
34
        height: units.gu(4)
34
        height: units.gu(4)
487
35
        anchors {
35
        anchors {
488
36
            left: parent.left
36
            left: parent.left
489
37
37
490
=== modified file 'plugins/Unity/Indicators/qml/SliderMenuItem.qml'
491
--- plugins/Unity/Indicators/qml/SliderMenuItem.qml	2013-08-14 09:07:45 +0000
492
+++ plugins/Unity/Indicators/qml/SliderMenuItem.qml	2013-08-23 11:34:24 +0000
493
@@ -24,17 +24,20 @@
494
24
24
495
25
FramedMenuItem {
25
FramedMenuItem {
496
26
    id: menuItem
26
    id: menuItem
497
27
    objectName: menuAction.name
498
28
    enabled: menuAction.active
499
29
27
500
30
    property alias minimumValue: slider.minimumValue
28
    property alias minimumValue: slider.minimumValue
501
31
    property alias maximumValue: slider.maximumValue
29
    property alias maximumValue: slider.maximumValue
503
32
    readonly property double value: menu ? menuAction.state : 0.0
30
    property double value: 0.0
504
31
505
32
    property alias minIcon: leftImage.source
506
33
    property alias maxIcon: rightImage.source
507
33
34
508
34
    property QtObject d: QtObject {
35
    property QtObject d: QtObject {
509
35
        property bool enableValueConnection: true
36
        property bool enableValueConnection: true
510
36
    }
37
    }
511
37
38
512
39
    signal changeState(real value)
513
40
514
38
    onValueChanged: {
41
    onValueChanged: {
515
39
        // TODO: look into adding a component to manage bi-directional bindings.
42
        // TODO: look into adding a component to manage bi-directional bindings.
516
40
        var oldEnable = d.enableValueConnection
43
        var oldEnable = d.enableValueConnection
517
@@ -58,7 +61,6 @@
518
58
            anchors.verticalCenter: row.verticalCenter
61
            anchors.verticalCenter: row.verticalCenter
519
59
            height: units.gu(4)
62
            height: units.gu(4)
520
60
            width: height
63
            width: height
521
61
            source: menu.ext.minIcon
522
62
        }
64
        }
523
63
65
524
64
        Components.Slider {
66
        Components.Slider {
525
@@ -75,19 +77,8 @@
526
75
                value = menuItem.value
77
                value = menuItem.value
527
76
            }
78
            }
528
77
79
542
78
            // FIXME: The interval should be [0.0 - 1.0]. Unfortunately, when
80
            minimumValue: 0.0
543
79
            // reaching the boundaries (0.0 or 1.0), the value is converted
81
            maximumValue: 0.1
531
80
            // to an integer when automatically wrapped in a variant when
532
81
            // passed to QStateAction::updateState(…). The server chokes on
533
82
            // those values, complaining that they’re not of the right type…
534
83
            minimumValue: menu.ext.minValue ? menu.ext.minValue * 1.000001 : 0.0000001
535
84
            maximumValue: {
536
85
                var maximum = menu.ext.maxValue ? menu.ext.maxValue * 1.000001 : 0.9999999
537
86
                if (maximum <= minimumValue) {
538
87
                        return minimumValue + 1;
539
88
                }
540
89
                return maximum;
541
90
            }
544
91
82
545
92
            // FIXME - to be deprecated in Ubuntu.Components.
83
            // FIXME - to be deprecated in Ubuntu.Components.
546
93
            // Use this to disable the label, since there is not way to do it on the component.
84
            // Use this to disable the label, since there is not way to do it on the component.
547
@@ -109,12 +100,6 @@
548
109
            anchors.verticalCenter: row.verticalCenter
100
            anchors.verticalCenter: row.verticalCenter
549
110
            height: units.gu(4)
101
            height: units.gu(4)
550
111
            width: height
102
            width: height
551
112
            source: menu.ext.maxIcon
552
113
        }
103
        }
553
114
    }
104
    }
554
115
555
116
    Indicators.MenuAction {
556
117
        id: menuAction
557
118
        menu: menuItem.menu
558
119
    }
559
120
}
105
}
560
121
106
561
=== modified file 'plugins/Unity/Indicators/qml/StandardMenuItem.qml'
562
--- plugins/Unity/Indicators/qml/StandardMenuItem.qml	2013-08-14 09:07:45 +0000
563
+++ plugins/Unity/Indicators/qml/StandardMenuItem.qml	2013-08-23 11:34:24 +0000
564
@@ -23,16 +23,16 @@
565
23
23
566
24
FramedMenuItem {
24
FramedMenuItem {
567
25
    id: menuItem
25
    id: menuItem
573
26
    objectName: menuAction.name
26
574
27
    enabled: menuAction.active
27
    property bool checkable: false
575
28
28
    property bool checked: false
576
29
    readonly property bool checkable: menu ? (menu.isCheck || menu.isRadio) : false
29
577
30
    readonly property bool checked: checkable ? menu.isToggled : false
30
    signal activate()
578
31
31
579
32
    // FIXME : need a radio button from sdk
32
    // FIXME : need a radio button from sdk
580
33
    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211866
33
    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211866
581
34
    onCheckableChanged: {
34
    onCheckableChanged: {
583
35
        if (menu && checkable) {
35
        if (checkable) {
584
36
            icon = checkComponent.createObject(menuItem);
36
            icon = checkComponent.createObject(menuItem);
585
37
        }
37
        }
586
38
    }
38
    }
587
@@ -68,9 +68,4 @@
588
68
            }
68
            }
589
69
        }
69
        }
590
70
    }
70
    }
591
71
592
72
    Indicators.MenuAction {
593
73
        id: menuAction
594
74
        menu: menuItem.menu
595
75
    }
596
76
}
71
}
597
77
72
598
=== modified file 'plugins/Unity/Indicators/qml/SwitchMenuItem.qml'
599
--- plugins/Unity/Indicators/qml/SwitchMenuItem.qml	2013-08-14 09:07:45 +0000
600
+++ plugins/Unity/Indicators/qml/SwitchMenuItem.qml	2013-08-23 11:34:24 +0000
601
@@ -24,10 +24,10 @@
602
24
24
603
25
FramedMenuItem {
25
FramedMenuItem {
604
26
    id: menuItem
26
    id: menuItem
609
27
    objectName: menuAction.name
27
610
28
    enabled: menuAction.enabled
28
    property bool checked: false
611
29
29
612
30
    readonly property bool checked: menu ? menu.isToggled : false
30
    signal activate()
613
31
31
614
32
    onCheckedChanged: {
32
    onCheckedChanged: {
615
33
        // Can't rely on binding. Checked is assigned on click.
33
        // Can't rely on binding. Checked is assigned on click.
616
@@ -50,9 +50,4 @@
617
50
            menuItem.activate();
50
            menuItem.activate();
618
51
        }
51
        }
619
52
    }
52
    }
620
53
621
54
    Indicators.MenuAction {
622
55
        id: menuAction
623
56
        menu: menuItem.menu
624
57
    }
625
58
}
53
}
626
59
54
627
=== modified file 'plugins/Unity/Indicators/qml/qmldir'
628
--- plugins/Unity/Indicators/qml/qmldir	2013-08-14 09:07:45 +0000
629
+++ plugins/Unity/Indicators/qml/qmldir	2013-08-23 11:34:24 +0000
630
@@ -11,7 +11,6 @@
631
11
IndicatorBase 0.1 IndicatorBase.qml
11
IndicatorBase 0.1 IndicatorBase.qml
632
12
IndicatorPage 0.1 IndicatorPage.qml
12
IndicatorPage 0.1 IndicatorPage.qml
633
13
IndicatorWidget 0.1 IndicatorWidget.qml
13
IndicatorWidget 0.1 IndicatorWidget.qml
634
14
MenuAction 0.1 MenuAction.qml
635
15
MenuActionBinding 0.1 MenuActionBinding.qml
14
MenuActionBinding 0.1 MenuActionBinding.qml
636
16
MenuItemFactory 0.1 MenuItemFactory.qml
15
MenuItemFactory 0.1 MenuItemFactory.qml
637
17
ProgressMenuItem 0.1 ProgressMenuItem.qml
16
ProgressMenuItem 0.1 ProgressMenuItem.qml
Status:	Merged
Approved by:	Michael Zanetti on 2013-08-26
Approved revision:	233
Merged at revision:	249
Proposed branch:	lp:~nick-dedekind/unity8/indicators.menu-items-cleaning
Merge into:	lp:unity8
Diff against target:	637 lines (+174/-184) 16 files modified plugins/Unity/Indicators/Network/qml/AccessPoint.qml (+18/-8) plugins/Unity/Indicators/Network/qml/PasswordPage.qml (+1/-1) plugins/Unity/Indicators/Network/qml/WifiSection.qml (+0/-28) plugins/Unity/Indicators/Network/qml/qmldir (+1/-2) plugins/Unity/Indicators/qml/BaseMenuItem.qml (+0/-4) plugins/Unity/Indicators/qml/ButtonMenuItem.qml (+4/-9) plugins/Unity/Indicators/qml/FramedMenuItem.qml (+0/-2) plugins/Unity/Indicators/qml/IndicatorPage.qml (+4/-9) plugins/Unity/Indicators/qml/MenuAction.qml (+0/-59) plugins/Unity/Indicators/qml/MenuItemFactory.qml (+124/-7) plugins/Unity/Indicators/qml/ProgressMenuItem.qml (+1/-8) plugins/Unity/Indicators/qml/SectionMenuItem.qml (+3/-3) plugins/Unity/Indicators/qml/SliderMenuItem.qml (+8/-23) plugins/Unity/Indicators/qml/StandardMenuItem.qml (+6/-11) plugins/Unity/Indicators/qml/SwitchMenuItem.qml (+4/-9) plugins/Unity/Indicators/qml/qmldir (+0/-1)
To merge this branch:	bzr merge lp:~nick-dedekind/unity8/indicators.menu-items-cleaning
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-08-26
Albert Astals Cid (community)		2013-08-21	Approve on 2013-08-23
Review via email: mp+181410@code.launchpad.net