1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2013-07-10 17:13:28 +0000
3
+++ CMakeLists.txt	2013-07-11 14:53:26 +0000
4
@@ -91,7 +91,8 @@
5
91
91
6
92
# Autopilot tests
92
# Autopilot tests
7
93
include(autopilot)
93
include(autopilot)
9
94
declare_autopilot_test(unity8 ${CMAKE_SOURCE_DIR}/tests/autopilot/)
94
declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
10
95
declare_autopilot_test(indicators_client unity8.indicators_client ${CMAKE_SOURCE_DIR}/tests/autopilot/)
11
95
96
12
96
set(SHELL_APP unity8)
97
set(SHELL_APP unity8)
13
97
98
14
@@ -132,6 +133,7 @@
15
132
# add subdirectories to build
133
# add subdirectories to build
16
133
add_subdirectory(tests)
134
add_subdirectory(tests)
17
134
add_subdirectory(plugins)
135
add_subdirectory(plugins)
18
136
add_subdirectory(src)
19
135
137
20
136
# install subdirectories
138
# install subdirectories
21
137
set(QML_DIRS
139
set(QML_DIRS
22
138
140
23
=== modified file 'Panel/IndicatorItem.qml'
24
--- Panel/IndicatorItem.qml	2013-06-05 22:03:08 +0000
25
+++ Panel/IndicatorItem.qml	2013-07-11 14:53:26 +0000
26
@@ -16,55 +16,42 @@
27
16
16
28
17
import QtQuick 2.0
17
import QtQuick 2.0
29
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
30
19
import Unity.Indicators 0.1 as Indicators
31
19
20
32
20
Item {
21
Item {
33
21
    id: indicatorItem
22
    id: indicatorItem
34
22
23
37
23
    property alias iconSource: itemImage.source
24
    property alias widgetSource: loader.source
36
24
    property alias label: itemLabel.text
38
25
    property bool highlighted: false
25
    property bool highlighted: false
39
26
    property bool dimmed: false
26
    property bool dimmed: false
40
27
    property var indicatorProperties: undefined
41
28
42
29
    opacity: dimmed ? 0.4 : 1
43
27
30
44
28
    // only visible when non-empty
31
    // only visible when non-empty
47
29
    visible: label != "" || iconSource != ""
32
    visible: loader.item != undefined && loader.status == Loader.Ready ? loader.item.enabled : false
48
30
    width: itemRow.width + units.gu(1)
33
    width: visible ? loader.item.width : 0
49
34
50
35
    Loader {
51
36
        id: loader
52
37
53
38
        onLoaded: {
54
39
            item.height = Qt.binding(function() { return indicatorItem.height; });
55
40
56
41
            for(var pName in indicatorProperties) {
57
42
                if (item.hasOwnProperty(pName)) {
58
43
                    item[pName] = indicatorProperties[pName];
59
44
                }
60
45
            }
61
46
        }
62
47
    }
63
31
48
64
32
    Rectangle {
49
    Rectangle {
65
33
        color: "#dd4814"
50
        color: "#dd4814"
66
51
        objectName: "highlight"
67
34
        height: units.dp(2)
52
        height: units.dp(2)
68
35
        width: parent.width
53
        width: parent.width
69
36
        anchors.top: parent.bottom
54
        anchors.top: parent.bottom
70
37
        visible: highlighted
55
        visible: highlighted
71
38
    }
56
    }
72
39
73
40
    Row {
74
41
        id: itemRow
75
42
        objectName: "itemRow"
76
43
        anchors {
77
44
            top: parent.top
78
45
            bottom: parent.bottom
79
46
            horizontalCenter: parent.horizontalCenter
80
47
        }
81
48
        spacing: units.gu(0.5)
82
49
        opacity: dimmed ? 0.4 : 1
83
50
84
51
        Image {
85
52
            id: itemImage
86
53
            objectName: "itemImage"
87
54
            visible: source != ""
88
55
            height: units.gu(2.5)
89
56
            width: units.gu(2.5)
90
57
            anchors.verticalCenter: parent.verticalCenter
91
58
        }
92
59
93
60
        Label {
94
61
            id: itemLabel
95
62
            objectName: "itemLabel"
96
63
            color: "#f3f3e7"
97
64
            opacity: 0.8
98
65
            font.family: "Ubuntu"
99
66
            fontSize: "medium"
100
67
            anchors.verticalCenter: parent.verticalCenter
101
68
        }
102
69
    }
103
70
}
57
}
104
71
58
105
=== modified file 'Panel/IndicatorRow.qml'
106
--- Panel/IndicatorRow.qml	2013-06-05 22:03:08 +0000
107
+++ Panel/IndicatorRow.qml	2013-07-11 14:53:26 +0000
108
@@ -21,7 +21,7 @@
109
21
    id: indicatorRow
21
    id: indicatorRow
110
22
22
111
23
    property QtObject currentItem : null
23
    property QtObject currentItem : null
113
24
    property int currentItemIndex: currentItem ? currentItem.ownIndex : -1
24
    readonly property int currentItemIndex: currentItem ? currentItem.ownIndex : -1
114
25
    property alias row: row
25
    property alias row: row
115
26
    property QtObject indicatorsModel: null
26
    property QtObject indicatorsModel: null
116
27
    property bool overviewActive: false // "state of the menu"
27
    property bool overviewActive: false // "state of the menu"
117
@@ -54,13 +54,15 @@
118
54
            id: rowRepeater
54
            id: rowRepeater
119
55
            objectName: "rowRepeater"
55
            objectName: "rowRepeater"
120
56
            model: indicatorsModel ? indicatorsModel : undefined
56
            model: indicatorsModel ? indicatorsModel : undefined
121
57
122
57
            IndicatorItem {
58
            IndicatorItem {
123
58
               id: indicatorItem
59
               id: indicatorItem
124
59
60
125
60
               property int ownIndex: index
61
               property int ownIndex: index
126
61
62
129
62
               label: model.label
63
               widgetSource: model.widgetSource
130
63
               iconSource: model.iconSource
64
131
65
               indicatorProperties : model.indicatorProperties
132
64
               highlighted: indicatorRow.state == "reveal" || indicatorRow.state == "locked" || indicatorRow.state == "commit" ? ownIndex == indicatorRow.currentItemIndex : false
66
               highlighted: indicatorRow.state == "reveal" || indicatorRow.state == "locked" || indicatorRow.state == "commit" ? ownIndex == indicatorRow.currentItemIndex : false
133
65
               dimmed: { //See FIXME in Indicators regarding the "states" change
67
               dimmed: { //See FIXME in Indicators regarding the "states" change
134
66
                   if (indicatorRow.state == "initial" || indicatorRow.state == "") {
68
                   if (indicatorRow.state == "initial" || indicatorRow.state == "") {
135
67
69
136
=== added directory 'Panel/Indicators'
137
=== modified file 'Panel/Indicators.qml'
138
--- Panel/Indicators.qml	2013-07-02 21:22:50 +0000
139
+++ Panel/Indicators.qml	2013-07-11 14:53:26 +0000
140
@@ -17,7 +17,6 @@
141
17
import QtQuick 2.0
17
import QtQuick 2.0
142
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
143
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
144
20
import Ubuntu.ChewieUI 0.1 as ChewieUI
145
21
20
146
22
import "../Components"
21
import "../Components"
147
23
import "../Components/ListItems"
22
import "../Components/ListItems"
148
@@ -70,8 +69,7 @@
149
70
                // we dont want to switch to a indicator menu until we hit reveal state.
69
                // we dont want to switch to a indicator menu until we hit reveal state.
150
71
                if (menuContent.overviewActive) {
70
                if (menuContent.overviewActive) {
151
72
                    menuContent.showOverview()
71
                    menuContent.showOverview()
154
73
                }
72
                } else {
153
74
                else {
155
75
                    menuContent.showMenu()
73
                    menuContent.showMenu()
156
76
                }
74
                }
157
77
                indicators.state = "locked"
75
                indicators.state = "locked"
158
@@ -272,9 +270,8 @@
159
272
270
160
273
    }
271
    }
161
274
272
163
275
    ChewieUI.PluginModel {
273
    IndicatorsDataModel {
164
276
        id: indicatorsModel
274
        id: indicatorsModel
165
277
        Component.onCompleted: load()
166
278
    }
275
    }
167
279
276
168
280
    Connections {
277
    Connections {
169
@@ -294,8 +291,7 @@
170
294
            if (showAnimation.running) {
291
            if (showAnimation.running) {
171
295
                if (indicators.state == "initial") {
292
                if (indicators.state == "initial") {
172
296
                    openOverview()
293
                    openOverview()
175
297
                }
294
                } else {
174
298
                else {
176
299
                    indicators.calculateCurrentItem(dragHandle.touchX, false)
295
                    indicators.calculateCurrentItem(dragHandle.touchX, false)
177
300
                    menuContent.showMenu()
296
                    menuContent.showMenu()
178
301
                }
297
                }
179
302
298
180
=== added file 'Panel/Indicators/DatetimeIndicatorPage.qml'
181
--- Panel/Indicators/DatetimeIndicatorPage.qml	1970-01-01 00:00:00 +0000
182
+++ Panel/Indicators/DatetimeIndicatorPage.qml	2013-07-11 14:53:26 +0000
183
@@ -0,0 +1,97 @@
184
1
/*
185
2
 * Copyright 2013 Canonical Ltd.
186
3
 *
187
4
 * This program is free software; you can redistribute it and/or modify
188
5
 * it under the terms of the GNU Lesser General Public License as published by
189
6
 * the Free Software Foundation; version 3.
190
7
 *
191
8
 * This program is distributed in the hope that it will be useful,
192
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
193
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
194
11
 * GNU Lesser General Public License for more details.
195
12
 *
196
13
 * You should have received a copy of the GNU Lesser General Public License
197
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
198
15
 *
199
16
 * Authors:
200
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
201
18
 *      Ubo Riboni <ugo.riboni@canonical.com>
202
19
 */
203
20
204
21
import QtQuick 2.0
205
22
import Ubuntu.Components 0.1
206
23
207
24
Flickable {
208
25
    id: page
209
26
210
27
    contentHeight: image.height
211
28
212
29
    Image {
213
30
        id: image
214
31
        anchors {
215
32
            left: parent.left
216
33
            right: parent.right
217
34
        }
218
35
        source: "../graphics/time_and_date@18.png"
219
36
        fillMode: Image.PreserveAspectFit
220
37
    }
221
38
222
39
    Item {
223
40
        anchors {
224
41
            top: parent.top
225
42
            topMargin: units.gu(5)
226
43
            left: parent.left
227
44
            right: parent.right
228
45
        }
229
46
230
47
        height: units.gu(30)
231
48
232
49
        Label {
233
50
            id: timeLabel
234
51
            anchors {
235
52
                horizontalCenter: parent.horizontalCenter
236
53
                verticalCenter: parent.verticalCenter
237
54
            }
238
55
239
56
            text: ""
240
57
            color: "#f3f3e7"
241
58
            font.weight: Font.Light
242
59
            font.pixelSize: units.gu(6)
243
60
        }
244
61
245
62
        Label {
246
63
            id: dateLabel
247
64
248
65
            anchors {
249
66
                left: parent.left
250
67
                leftMargin: units.gu(2)
251
68
                bottom: parent.bottom
252
69
                bottomMargin: units.gu(1.5)
253
70
            }
254
71
            text: ""
255
72
            color: "#f3f3e7"
256
73
            fontSize: "small"
257
74
        }
258
75
    }
259
76
260
77
    Timer {
261
78
        interval: 1000 * 10 // 10 seconds
262
79
        running: true
263
80
        repeat: true
264
81
        triggeredOnStart: true
265
82
        onTriggered: updateTime();
266
83
    }
267
84
268
85
    function updateTime() {
269
86
        var dt = new Date();
270
87
        var time = Qt.formatTime(dt);
271
88
        var space = time.indexOf(" ");
272
89
        timeLabel.text = time.substr(0, space > 0 ? space : 5);
273
90
        dateLabel.text = Qt.formatDateTime(dt, "dddd,\ndd MMMM");
274
91
    }
275
92
276
93
    // Make it compatible with the PluginItem interface
277
94
    function start() {}
278
95
    function stop() {}
279
96
    function reset() {}
280
97
}
281
0
98
282
=== added file 'Panel/Indicators/DatetimeIndicatorWidget.qml'
283
--- Panel/Indicators/DatetimeIndicatorWidget.qml	1970-01-01 00:00:00 +0000
284
+++ Panel/Indicators/DatetimeIndicatorWidget.qml	2013-07-11 14:53:26 +0000
285
@@ -0,0 +1,65 @@
286
1
/*
287
2
 * Copyright 2013 Canonical Ltd.
288
3
 *
289
4
 * This program is free software; you can redistribute it and/or modify
290
5
 * it under the terms of the GNU Lesser General Public License as published by
291
6
 * the Free Software Foundation; version 3.
292
7
 *
293
8
 * This program is distributed in the hope that it will be useful,
294
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
295
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
296
11
 * GNU Lesser General Public License for more details.
297
12
 *
298
13
 * You should have received a copy of the GNU Lesser General Public License
299
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
300
15
 *
301
16
 * Authors:
302
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
303
18
 */
304
19
305
20
import QtQuick 2.0
306
21
import Ubuntu.Components 0.1
307
22
import Unity.Indicators 0.1 as Indicators
308
23
309
24
Indicators.IndicatorWidget {
310
25
    id: indicatorWidget
311
26
312
27
    width: timeLabel.width + units.gu(1)
313
28
314
29
    property alias label: timeLabel.text
315
30
316
31
    Label {
317
32
        id: timeLabel
318
33
        objectName: "timeLabel"
319
34
        color: "#f3f3e7"
320
35
        opacity: 0.8
321
36
        font.family: "Ubuntu"
322
37
        fontSize: "medium"
323
38
        anchors.centerIn: parent
324
39
        text: Qt.formatTime(timer.dateNow)
325
40
    }
326
41
327
42
    Timer {
328
43
        id: timer
329
44
        interval: 1000 * 10
330
45
        running: indicatorWidget.visible
331
46
        repeat: true
332
47
        triggeredOnStart: true
333
48
        property date dateNow
334
49
335
50
        onTriggered: dateNow = new Date
336
51
    }
337
52
338
53
    onActionStateChanged: {
339
54
        if (action == undefined || !action.valid) {
340
55
            return;
341
56
        }
342
57
343
58
        if (action.state == undefined) {
344
59
            visible = false;
345
60
            return;
346
61
        }
347
62
348
63
        indicatorWidget.visible = action.state[3];
349
64
    }
350
65
}
351
0
66
352
=== added file 'Panel/Indicators/DefaultIndicatorPage.qml'
353
--- Panel/Indicators/DefaultIndicatorPage.qml	1970-01-01 00:00:00 +0000
354
+++ Panel/Indicators/DefaultIndicatorPage.qml	2013-07-11 14:53:26 +0000
355
@@ -0,0 +1,25 @@
356
1
/*
357
2
 * Copyright 2013 Canonical Ltd.
358
3
 *
359
4
 * This program is free software; you can redistribute it and/or modify
360
5
 * it under the terms of the GNU Lesser General Public License as published by
361
6
 * the Free Software Foundation; version 3.
362
7
 *
363
8
 * This program is distributed in the hope that it will be useful,
364
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
365
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
366
11
 * GNU Lesser General Public License for more details.
367
12
 *
368
13
 * You should have received a copy of the GNU Lesser General Public License
369
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
370
15
 *
371
16
 * Authors:
372
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
373
18
 */
374
19
375
20
import QtQuick 2.0
376
21
import Unity.Indicators 0.1 as Indicators
377
22
378
23
Indicators.IndicatorPage {
379
24
      anchors.fill: parent
380
25
}
381
0
26
382
=== added file 'Panel/Indicators/DefaultIndicatorWidget.qml'
383
--- Panel/Indicators/DefaultIndicatorWidget.qml	1970-01-01 00:00:00 +0000
384
+++ Panel/Indicators/DefaultIndicatorWidget.qml	2013-07-11 14:53:26 +0000
385
@@ -0,0 +1,80 @@
386
1
/*
387
2
 * Copyright 2013 Canonical Ltd.
388
3
 *
389
4
 * This program is free software; you can redistribute it and/or modify
390
5
 * it under the terms of the GNU Lesser General Public License as published by
391
6
 * the Free Software Foundation; version 3.
392
7
 *
393
8
 * This program is distributed in the hope that it will be useful,
394
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
395
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
396
11
 * GNU Lesser General Public License for more details.
397
12
 *
398
13
 * You should have received a copy of the GNU Lesser General Public License
399
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
400
15
 *
401
16
 * Authors:
402
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
403
18
 */
404
19
405
20
import QtQuick 2.0
406
21
import Ubuntu.Components 0.1
407
22
import Unity.Indicators 0.1 as Indicators
408
23
409
24
Indicators.IndicatorWidget {
410
25
    id: indicatorWidget
411
26
412
27
    width: itemRow.width + units.gu(1)
413
28
414
29
    property alias label: itemLabel.text
415
30
    property alias iconSource: itemImage.source
416
31
417
32
    Row {
418
33
        id: itemRow
419
34
        objectName: "itemRow"
420
35
        anchors {
421
36
            top: parent.top
422
37
            bottom: parent.bottom
423
38
            horizontalCenter: parent.horizontalCenter
424
39
        }
425
40
        spacing: units.gu(0.5)
426
41
427
42
        // FIXME : Should us Ubuntu.Icon . results in low res images
428
43
        Image {
429
44
            id: itemImage
430
45
            objectName: "itemImage"
431
46
            visible: source != ""
432
47
            height: indicatorWidget.iconSize
433
48
            width: indicatorWidget.iconSize
434
49
            anchors.verticalCenter: parent.verticalCenter
435
50
        }
436
51
437
52
        Label {
438
53
            id: itemLabel
439
54
            objectName: "itemLabel"
440
55
            color: "#f3f3e7"
441
56
            opacity: 0.8
442
57
            font.family: "Ubuntu"
443
58
            fontSize: "medium"
444
59
            anchors.verticalCenter: parent.verticalCenter
445
60
            visible: text != ""
446
61
        }
447
62
    }
448
63
449
64
    onActionStateChanged: {
450
65
        if (action == undefined || !action.valid) {
451
66
            return;
452
67
        }
453
68
454
69
        if (action.state == undefined) {
455
70
            label = "";
456
71
            iconSource = "";
457
72
            enabled = false;
458
73
            return;
459
74
        }
460
75
461
76
        label = action.state[Indicators.ActionState.Label];
462
77
        iconSource = "image://gicon/" + action.state[Indicators.ActionState.IconSource];
463
78
        enabled = action.state[Indicators.ActionState.Visible];
464
79
    }
465
80
}
466
0
81
467
=== added file 'Panel/Indicators/MessagingIndicatorPage.qml'
468
--- Panel/Indicators/MessagingIndicatorPage.qml	1970-01-01 00:00:00 +0000
469
+++ Panel/Indicators/MessagingIndicatorPage.qml	2013-07-11 14:53:26 +0000
470
@@ -0,0 +1,35 @@
471
1
/*
472
2
 * Copyright 2013 Canonical Ltd.
473
3
 *
474
4
 * This program is free software; you can redistribute it and/or modify
475
5
 * it under the terms of the GNU Lesser General Public License as published by
476
6
 * the Free Software Foundation; version 3.
477
7
 *
478
8
 * This program is distributed in the hope that it will be useful,
479
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
480
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
481
11
 * GNU Lesser General Public License for more details.
482
12
 *
483
13
 * You should have received a copy of the GNU Lesser General Public License
484
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
485
15
 *
486
16
 * Authors:
487
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
488
18
 */
489
19
490
20
import QtQuick 2.0
491
21
import Ubuntu.Components 0.1
492
22
import Unity.Indicators 0.1 as Indicators
493
23
494
24
Indicators.IndicatorPage {
495
25
    anchors.fill: parent
496
26
497
27
    highlightFollowsCurrentItem: false
498
28
    emptyText: "You have no more outstanding messages."
499
29
500
30
    function stop() {
501
31
        // never stops the service
502
32
        // this will keep all objects in memory, consume more memory
503
33
        // but will optimize the menu contruction on the screen
504
34
    }
505
35
}
506
0
36
507
=== added file 'Panel/Indicators/MessagingIndicatorWidget.qml'
508
--- Panel/Indicators/MessagingIndicatorWidget.qml	1970-01-01 00:00:00 +0000
509
+++ Panel/Indicators/MessagingIndicatorWidget.qml	2013-07-11 14:53:26 +0000
510
@@ -0,0 +1,25 @@
511
1
/*
512
2
 * Copyright 2013 Canonical Ltd.
513
3
 *
514
4
 * This program is free software; you can redistribute it and/or modify
515
5
 * it under the terms of the GNU Lesser General Public License as published by
516
6
 * the Free Software Foundation; version 3.
517
7
 *
518
8
 * This program is distributed in the hope that it will be useful,
519
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
520
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
521
11
 * GNU Lesser General Public License for more details.
522
12
 *
523
13
 * You should have received a copy of the GNU Lesser General Public License
524
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
525
15
 *
526
16
 * Authors:
527
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
528
18
 */
529
19
530
20
import QtQuick 2.0
531
21
532
22
DefaultIndicatorWidget {
533
23
    // default the icon so we have something to show when we don't have the bus.
534
24
    iconSource: "image://gicon/indicator-messages"
535
25
}
536
0
26
537
=== added file 'Panel/Indicators/NetworkIndicatorPage.qml'
538
--- Panel/Indicators/NetworkIndicatorPage.qml	1970-01-01 00:00:00 +0000
539
+++ Panel/Indicators/NetworkIndicatorPage.qml	2013-07-11 14:53:26 +0000
540
@@ -0,0 +1,80 @@
541
1
/*
542
2
 * Copyright 2013 Canonical Ltd.
543
3
 *
544
4
 * This program is free software; you can redistribute it and/or modify
545
5
 * it under the terms of the GNU Lesser General Public License as published by
546
6
 * the Free Software Foundation; version 3.
547
7
 *
548
8
 * This program is distributed in the hope that it will be useful,
549
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
550
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
551
11
 * GNU Lesser General Public License for more details.
552
12
 *
553
13
 * You should have received a copy of the GNU Lesser General Public License
554
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
555
15
 *
556
16
 * Authors:
557
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
558
18
 */
559
19
560
20
import QtQuick 2.0
561
21
import Unity.Indicators 0.1 as Indicators
562
22
import Unity.Indicators.Network 0.1 as ICNetwork
563
23
import Ubuntu.Components 0.1
564
24
565
25
PageStack {
566
26
    id: _network
567
27
568
28
    property alias title: _mainPage.title
569
29
    property alias emptyText: _pluginItem.emptyText
570
30
    property alias busType: _pluginItem.busType
571
31
    property alias busName: _pluginItem.busName
572
32
    property alias actionsObjectPath : _pluginItem.actionsObjectPath
573
33
    property alias menuObjectPaths : _pluginItem.menuObjectPaths
574
34
575
35
    __showHeader: false
576
36
    anchors.fill: parent
577
37
578
38
    Page {
579
39
        id: _mainPage
580
40
581
41
        Indicators.IndicatorPage {
582
42
            id: _pluginItem
583
43
            anchors.fill: parent
584
44
        }
585
45
    }
586
46
587
47
    Component {
588
48
        id: passwordPageComponent
589
49
590
50
        ICNetwork.PasswordPage {
591
51
            agent: networkAgent
592
52
            token: token
593
53
        }
594
54
    }
595
55
596
56
    ICNetwork.NetworkAgent {
597
57
        id: networkAgent
598
58
599
59
        onSecretRequested: {
600
60
            _network.push(passwordPageComponent);
601
61
        }
602
62
    }
603
63
604
64
    function start()
605
65
    {
606
66
        push(_mainPage);
607
67
        _pluginItem.start();
608
68
    }
609
69
610
70
    function stop()
611
71
    {
612
72
        clear();
613
73
        _pluginItem.stop();
614
74
    }
615
75
616
76
    function reset()
617
77
    {
618
78
        _pluginItem.reset();
619
79
    }
620
80
}
621
0
81
622
=== added file 'Panel/Indicators/NetworkIndicatorWidget.qml'
623
--- Panel/Indicators/NetworkIndicatorWidget.qml	1970-01-01 00:00:00 +0000
624
+++ Panel/Indicators/NetworkIndicatorWidget.qml	2013-07-11 14:53:26 +0000
625
@@ -0,0 +1,109 @@
626
1
/*
627
2
 * Copyright 2013 Canonical Ltd.
628
3
 *
629
4
 * This program is free software; you can redistribute it and/or modify
630
5
 * it under the terms of the GNU Lesser General Public License as published by
631
6
 * the Free Software Foundation; version 3.
632
7
 *
633
8
 * This program is distributed in the hope that it will be useful,
634
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
635
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
636
11
 * GNU Lesser General Public License for more details.
637
12
 *
638
13
 * You should have received a copy of the GNU Lesser General Public License
639
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
640
15
 *
641
16
 * Authors:
642
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
643
18
 */
644
19
645
20
import QtQuick 2.0
646
21
import Ubuntu.Components 0.1
647
22
import Unity.Indicators 0.1 as Indicators
648
23
649
24
Indicators.IndicatorWidget {
650
25
    id: indicatorWidget
651
26
652
27
    width: networkIcon.width + units.gu(1)
653
28
654
29
    property int signalStrength: 0
655
30
    property int connectionState: Indicators.NetworkConnection.Initial
656
31
    rootMenuType: "com.canonical.indicator.root.network"
657
32
658
33
    // FIXME : Should us Ubuntu.Icon . results in low res images
659
34
    Image {
660
35
        id: networkIcon
661
36
        objectName: "itemImage"
662
37
        source: get_icon_for_signal(connectionState, signalStrength)
663
38
        visible: source != ""
664
39
        height: indicatorWidget.iconSize
665
40
        width: indicatorWidget.iconSize
666
41
        anchors.centerIn: parent
667
42
    }
668
43
669
44
    onActionStateChanged: {
670
45
        if (action == undefined || !action.valid) {
671
46
            return;
672
47
        }
673
48
674
49
        if (action.state == undefined) {
675
50
            connectionState = 0;
676
51
            return;
677
52
        }
678
53
679
54
        connectionState = action.state[Indicators.NetworkActionState.Connection];
680
55
        if (connectionState == Indicators.NetworkConnection.Activated) {
681
56
            signalStrength = action.state[Indicators.NetworkActionState.SignalStrength];
682
57
        }
683
58
    }
684
59
685
60
    NumberAnimation {
686
61
        id: activation_animation
687
62
        target: indicatorWidget
688
63
        property: "signalStrength"
689
64
        from: 0
690
65
        to: 100
691
66
        duration: 2500  // 5 states in 2.5 seconds
692
67
        loops: Animation.Infinite
693
68
    }
694
69
695
70
    states: [
696
71
        State {
697
72
            name: "unknown"
698
73
            when: connectionState < Indicators.NetworkConnection.Activating || connectionState > Indicators.NetworkConnection.Deactivating
699
74
            PropertyChanges { target: activation_animation; running: false }
700
75
        },
701
76
        State {
702
77
            name: "activating"
703
78
            when: connectionState == Indicators.NetworkConnection.Activating
704
79
            PropertyChanges { target: activation_animation; running: true }
705
80
        },
706
81
        State {
707
82
            name: "activated"
708
83
            when: connectionState == Indicators.NetworkConnection.Activated
709
84
            PropertyChanges { target: activation_animation; running: false }
710
85
        },
711
86
        State {
712
87
            name: "deactivating"
713
88
            when: connectionState == Indicators.NetworkConnection.Deactivating
714
89
            PropertyChanges { target: activation_animation; running: true }
715
90
        }
716
91
    ]
717
92
718
93
719
94
    function get_icon_for_signal(con_state, value) {
720
95
        if (con_state >= Indicators.NetworkConnection.Activating && con_state <= Indicators.NetworkConnection.Deactivating) {
721
96
            if (value == 0) {
722
97
                return "image://gicon/nm-signal-00";
723
98
            } else if (value <= 25) {
724
99
                return "image://gicon/nm-signal-25";
725
100
            } else if (value <= 50) {
726
101
                return "image://gicon/nm-signal-50";
727
102
            } else if (value <= 75) {
728
103
                return "image://gicon/nm-signal-75";
729
104
            }
730
105
            return "image://gicon/nm-signal-100";
731
106
        }
732
107
        return "image://gicon/wifi-none";
733
108
    }
734
109
}
735
0
110
736
=== added file 'Panel/Indicators/SoundIndicatorWidget.qml'
737
--- Panel/Indicators/SoundIndicatorWidget.qml	1970-01-01 00:00:00 +0000
738
+++ Panel/Indicators/SoundIndicatorWidget.qml	2013-07-11 14:53:26 +0000
739
@@ -0,0 +1,25 @@
740
1
/*
741
2
 * Copyright 2013 Canonical Ltd.
742
3
 *
743
4
 * This program is free software; you can redistribute it and/or modify
744
5
 * it under the terms of the GNU Lesser General Public License as published by
745
6
 * the Free Software Foundation; version 3.
746
7
 *
747
8
 * This program is distributed in the hope that it will be useful,
748
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
749
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
750
11
 * GNU Lesser General Public License for more details.
751
12
 *
752
13
 * You should have received a copy of the GNU Lesser General Public License
753
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
754
15
 *
755
16
 * Authors:
756
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
757
18
 */
758
19
759
20
import QtQuick 2.0
760
21
761
22
DefaultIndicatorWidget {
762
23
    // default the icon so we have something to show when we don't have the bus.
763
24
    iconSource: "image://gicon/audio-volume-high"
764
25
}
765
0
26
766
=== added directory 'Panel/Indicators/client'
767
=== added file 'Panel/Indicators/client/IndicatorsClient.qml'
768
--- Panel/Indicators/client/IndicatorsClient.qml	1970-01-01 00:00:00 +0000
769
+++ Panel/Indicators/client/IndicatorsClient.qml	2013-07-11 14:53:26 +0000
770
@@ -0,0 +1,42 @@
771
1
/*
772
2
 * Copyright 2013 Canonical Ltd.
773
3
 *
774
4
 * This program is free software; you can redistribute it and/or modify
775
5
 * it under the terms of the GNU Lesser General Public License as published by
776
6
 * the Free Software Foundation; version 3.
777
7
 *
778
8
 * This program is distributed in the hope that it will be useful,
779
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
780
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
781
11
 * GNU Lesser General Public License for more details.
782
12
 *
783
13
 * You should have received a copy of the GNU Lesser General Public License
784
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
785
15
 *
786
16
 * Authors:
787
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
788
18
 */
789
19
790
20
import QtQuick 2.0
791
21
import Ubuntu.Components 0.1
792
22
import Ubuntu.Components.ListItems 0.1 as ListItem
793
23
794
24
Rectangle {
795
25
    color: "black"
796
26
    id: root
797
27
798
28
    PageStack {
799
29
        id: pages
800
30
801
31
        anchors.fill: parent
802
32
        Component.onCompleted: root.reset()
803
33
    }
804
34
805
35
    function reset() {
806
36
        pages.clear();
807
37
        var component = Qt.createComponent("IndicatorsList.qml");
808
38
        var page = component.createObject(pages);
809
39
        console.log(component.errorString());
810
40
        pages.push(page);
811
41
    }
812
42
}
813
0
43
814
=== added file 'Panel/Indicators/client/IndicatorsList.qml'
815
--- Panel/Indicators/client/IndicatorsList.qml	1970-01-01 00:00:00 +0000
816
+++ Panel/Indicators/client/IndicatorsList.qml	2013-07-11 14:53:26 +0000
817
@@ -0,0 +1,62 @@
818
1
/*
819
2
 * Copyright 2013 Canonical Ltd.
820
3
 *
821
4
 * This program is free software; you can redistribute it and/or modify
822
5
 * it under the terms of the GNU Lesser General Public License as published by
823
6
 * the Free Software Foundation; version 3.
824
7
 *
825
8
 * This program is distributed in the hope that it will be useful,
826
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
827
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
828
11
 * GNU Lesser General Public License for more details.
829
12
 *
830
13
 * You should have received a copy of the GNU Lesser General Public License
831
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
832
15
 *
833
16
 * Authors:
834
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
835
18
 */
836
19
837
20
import QtQuick 2.0
838
21
import Ubuntu.Components 0.1
839
22
import Ubuntu.Components.ListItems 0.1 as ListItem
840
23
import Unity.Indicators 0.1 as Indicators
841
24
import "../.."
842
25
843
26
Page {
844
27
    id: page
845
28
    anchors.fill: parent
846
29
    title: "Plugin list"
847
30
848
31
    IndicatorsDataModel {
849
32
        id: indicatorsModel
850
33
    }
851
34
852
35
    ListView {
853
36
        id: mainMenu
854
37
        objectName: "mainMenu"
855
38
        anchors.fill: parent
856
39
        model: indicatorsModel
857
40
858
41
        delegate: Indicators.MenuItem {
859
42
            anchors.left: parent.left
860
43
            anchors.right: parent.right
861
44
            progression: isValid
862
45
            objectName: identifier
863
46
864
47
            Label {
865
48
                anchors.left: parent.left
866
49
                anchors.leftMargin: units.gu(0.5)
867
50
                anchors.verticalCenter: parent.verticalCenter
868
51
                text: title
869
52
            }
870
53
871
54
            onClicked: {
872
55
                if (progression) {
873
56
                    var new_page = Qt.createComponent("IndicatorsPage.qml");
874
57
                    page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageSource" : model.pageSource});
875
58
                }
876
59
            }
877
60
        }
878
61
    }
879
62
}
880
0
63
881
=== added file 'Panel/Indicators/client/IndicatorsPage.qml'
882
--- Panel/Indicators/client/IndicatorsPage.qml	1970-01-01 00:00:00 +0000
883
+++ Panel/Indicators/client/IndicatorsPage.qml	2013-07-11 14:53:26 +0000
884
@@ -0,0 +1,49 @@
885
1
/*
886
2
 * Copyright 2013 Canonical Ltd.
887
3
 *
888
4
 * This program is free software; you can redistribute it and/or modify
889
5
 * it under the terms of the GNU Lesser General Public License as published by
890
6
 * the Free Software Foundation; version 3.
891
7
 *
892
8
 * This program is distributed in the hope that it will be useful,
893
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
894
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
895
11
 * GNU Lesser General Public License for more details.
896
12
 *
897
13
 * You should have received a copy of the GNU Lesser General Public License
898
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
899
15
 *
900
16
 * Authors:
901
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
902
18
 */
903
19
904
20
import QtQuick 2.0
905
21
import Ubuntu.Components 0.1
906
22
907
23
Page {
908
24
    id: _page
909
25
910
26
    title: indicatorProperties && indicatorProperties.title ?  indicatorProperties.title : ""
911
27
    property variant indicatorProperties
912
28
    property alias pageSource : page_loader.source
913
29
914
30
    anchors.fill: parent
915
31
916
32
    Loader {
917
33
        id: page_loader
918
34
        objectName: "page_loader"
919
35
920
36
        anchors.fill: parent
921
37
922
38
        onStatusChanged: {
923
39
            if (status == Loader.Ready) {
924
40
                for(var pName in indicatorProperties) {
925
41
                    if (item.hasOwnProperty(pName)) {
926
42
                        item[pName] = indicatorProperties[pName];
927
43
                    }
928
44
                }
929
45
                item.start();
930
46
            }
931
47
        }
932
48
    }
933
49
}
934
0
50
935
=== added file 'Panel/IndicatorsDataModel.qml'
936
--- Panel/IndicatorsDataModel.qml	1970-01-01 00:00:00 +0000
937
+++ Panel/IndicatorsDataModel.qml	2013-07-11 14:53:26 +0000
938
@@ -0,0 +1,66 @@
939
1
/*
940
2
 * Copyright 2013 Canonical Ltd.
941
3
 *
942
4
 * This program is free software; you can redistribute it and/or modify
943
5
 * it under the terms of the GNU Lesser General Public License as published by
944
6
 * the Free Software Foundation; version 3.
945
7
 *
946
8
 * This program is distributed in the hope that it will be useful,
947
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
948
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
949
11
 * GNU Lesser General Public License for more details.
950
12
 *
951
13
 * You should have received a copy of the GNU Lesser General Public License
952
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
953
15
 *
954
16
 * Authors:
955
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
956
18
 */
957
19
958
20
import QtQuick 2.0
959
21
import Unity.Indicators 0.1 as Indicators
960
22
import Utils 0.1
961
23
962
24
Indicators.IndicatorsModel {
963
25
    id: ic_model
964
26
965
27
    Component.onCompleted: load()
966
28
967
29
    indicatorData : {
968
30
        'indicator-messaging' : {
969
31
            'title': 'Messaging',
970
32
            'description' : '',
971
33
            'priority': 10,
972
34
            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorWidget.qml',
973
35
            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorPage.qml'
974
36
        },
975
37
        'indicator-sound' : {
976
38
            'title': 'Sound',
977
39
            'description' : '',
978
40
            'priority': 20,
979
41
            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/SoundIndicatorWidget.qml',
980
42
            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage.qml'
981
43
        },
982
44
        'indicator-network' : {
983
45
            'title': 'Networks',
984
46
            'description' : '',
985
47
            'priority': 30,
986
48
            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorWidget.qml',
987
49
            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage.qml'
988
50
        },
989
51
        'indicator-battery' : {
990
52
            'title': 'Battery',
991
53
            'description' : '',
992
54
            'priority': 40,
993
55
            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget.qml',
994
56
            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage.qml'
995
57
        },
996
58
        'indicator-time' : {
997
59
            'title': 'Date and Time',
998
60
            'description' : '',
999
61
            'priority': 100,
1000
62
            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DatetimeIndicatorWidget.qml',
1001
63
            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DatetimeIndicatorPage.qml'
1002
64
        }
1003
65
    }
1004
66
}
1005
0
67
1006
=== modified file 'Panel/MenuContent.qml'
1007
--- Panel/MenuContent.qml	2013-07-02 20:33:09 +0000
1008
+++ Panel/MenuContent.qml	2013-07-11 14:53:26 +0000
1009
@@ -16,6 +16,7 @@
1010
16
16
1011
17
import QtQuick 2.0
17
import QtQuick 2.0
1012
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
1013
19
import Unity.Indicators 0.1 as Indicators
1014
19
import "Menus"
20
import "Menus"
1015
20
import "../Components"
21
import "../Components"
1016
21
22
1017
@@ -29,7 +30,7 @@
1018
29
    property bool __contentActive: false
30
    property bool __contentActive: false
1019
30
    property alias currentIndex : menus.currentIndex
31
    property alias currentIndex : menus.currentIndex
1020
31
    property color backgroundColor: "#221e1c"
32
    property color backgroundColor: "#221e1c"
1022
32
    property int contentReleaseInterval: 5000
33
    property int contentReleaseInterval: 20000
1023
33
34
1024
34
    width: units.gu(40)
35
    width: units.gu(40)
1025
35
    height: units.gu(42)
36
    height: units.gu(42)
1026
@@ -94,7 +95,7 @@
1027
94
95
1028
95
            width: menus.width
96
            width: menus.width
1029
96
            height: menus.height
97
            height: menus.height
1031
97
            sourceComponent: component
98
            source: pageSource
1032
98
            visible: content.__shown
99
            visible: content.__shown
1033
99
            onVisibleChanged: {
100
            onVisibleChanged: {
1034
100
                // Reset the indicator states
101
                // Reset the indicator states
1035
@@ -104,25 +105,15 @@
1036
104
            }
105
            }
1037
105
            asynchronous: true
106
            asynchronous: true
1038
106
107
1058
107
            onStatusChanged: {
108
            onLoaded: {
1059
108
                if (status == Loader.Ready) {
109
                for(var pName in indicatorProperties) {
1060
109
                    if (indicatorsModel.widgetsMap && item.hasOwnProperty("widgetsMap")) {
110
                    if (item.hasOwnProperty(pName)) {
1061
110
                        item["widgetsMap"] = indicatorsModel.widgetsMap
111
                        item[pName] = indicatorProperties[pName]
1062
111
                    }
112
                    }
1063
112
                    for(var pName in initialProperties) {
113
                }
1064
113
                        if (item.hasOwnProperty(pName)) {
114
                if (contentActive && menus.visible) {
1065
114
                            item[pName] = initialProperties[pName]
115
                    item.start()
1066
115
                        }
116
                }
1048
116
                    }
1049
117
                    if (contentActive && menus.visible) {
1050
118
                        item.start()
1051
119
                    }
1052
120
                }
1053
121
            }
1054
122
1055
123
            // FIXME: QTBUG-30632 - asynchronous loader crashes when changing index quickly.
1056
124
            Component.onDestruction: {
1057
125
                active = false;
1067
126
            }
117
            }
1068
127
118
1069
128
            // Need to use a binding because the handle height changes.
119
            // Need to use a binding because the handle height changes.
1070
@@ -189,7 +180,13 @@
1071
189
                left: parent.left
180
                left: parent.left
1072
190
                right: parent.right
181
                right: parent.right
1073
191
            }
182
            }
1075
192
            text: content.overviewActive ? i18n.tr("Device") : (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count) ?  indicatorsModel.get(menus.currentIndex).title : ""
183
            text: {
1076
184
                if (content.overviewActive)
1077
185
                    return i18n.tr("Device");
1078
186
                if (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count)
1079
187
                    return indicatorsModel.data(menus.currentIndex, Indicators.IndicatorsModelRole.Title);
1080
188
                return "";
1081
189
            }
1082
193
            opacity: __shown ? 1 : 0
190
            opacity: __shown ? 1 : 0
1083
194
            Behavior on opacity {NumberAnimation{duration: 100}}
191
            Behavior on opacity {NumberAnimation{duration: 100}}
1084
195
        }
192
        }
1085
196
193
1086
=== modified file 'Panel/Menus/Overview/OverviewGrid.qml'
1087
--- Panel/Menus/Overview/OverviewGrid.qml	2013-06-05 22:03:08 +0000
1088
+++ Panel/Menus/Overview/OverviewGrid.qml	2013-07-11 14:53:26 +0000
1089
@@ -59,31 +59,22 @@
1090
59
                objectName: "overviewGridButton" + index
59
                objectName: "overviewGridButton" + index
1091
60
                width: grid.cellWidth
60
                width: grid.cellWidth
1092
61
                height: grid.cellHeight
61
                height: grid.cellHeight
1118
62
                Image {
62
1119
63
                    id: imageIcon
63
                Loader {
1120
64
                    objectName: "overviewGridButtonImage"
64
                    id: loader
1121
65
                    source: iconSource
65
                    source: widgetSource
1122
66
                    width: units.gu(4)
66
1123
67
                    height: units.gu(4)
67
                    width: units.gu(5)
1124
68
                    anchors {
68
                    height: units.gu(5)
1125
69
                        centerIn: parent
69
                    anchors.centerIn: parent
1126
70
                        verticalCenterOffset: -units.gu(1)
70
                    anchors.verticalCenterOffset: -units.gu(1)
1127
71
                    }
71
1128
72
                    sourceSize.width: width
72
                    onLoaded: {
1129
73
                    sourceSize.height: height
73
                        for(var pName in indicatorProperties) {
1130
74
                    visible: labelIcon.text === ""
74
                            if (item.hasOwnProperty(pName)) {
1131
75
                }
75
                                item[pName] = indicatorProperties[pName]
1132
76
76
                            }
1133
77
                Label {
77
                        }
1109
78
                    id: labelIcon
1110
79
                    text: label
1111
80
                    color: "#f3f3e7"
1112
81
                    opacity: 0.8
1113
82
                    font.family: "Ubuntu"
1114
83
                    fontSize: "large"
1115
84
                    anchors {
1116
85
                        centerIn: parent
1117
86
                        verticalCenterOffset: -units.gu(1)
1134
87
                    }
78
                    }
1135
88
                }
79
                }
1136
89
80
1137
90
81
1138
=== added file 'Panel/graphics/time_and_date@18.png'
1139
91
Binary files Panel/graphics/time_and_date@18.png	1970-01-01 00:00:00 +0000 and Panel/graphics/time_and_date@18.png	2013-07-11 14:53:26 +0000 differ
82
Binary files Panel/graphics/time_and_date@18.png	1970-01-01 00:00:00 +0000 and Panel/graphics/time_and_date@18.png	2013-07-11 14:53:26 +0000 differ
1140
=== modified file 'build'
1141
--- build	2013-07-03 10:33:48 +0000
1142
+++ build	2013-07-11 14:53:26 +0000
1143
@@ -43,10 +43,9 @@
1144
43
    echo "Installing Unity 8 dependencies.."
43
    echo "Installing Unity 8 dependencies.."
1145
44
    sudo apt-get install devscripts \
44
    sudo apt-get install devscripts \
1146
45
                         equivs \
45
                         equivs \
1147
46
                         qmenumodel-qml \
1148
46
                         qtdeclarative5-ubuntu-ui-toolkit-plugin \
47
                         qtdeclarative5-ubuntu-ui-toolkit-plugin \
1149
47
                         qtdeclarative5-dee-plugin \
48
                         qtdeclarative5-dee-plugin \
1150
48
                         indicators-client \
1151
49
                         indicators-client-plugin-* \
1152
50
                         ubuntu-mobile-icons \
49
                         ubuntu-mobile-icons \
1153
51
                         unity-notifications-impl-1 \
50
                         unity-notifications-impl-1 \
1154
52
                         unity-scope-home \
51
                         unity-scope-home \
1155
53
52
1156
=== modified file 'cmake/modules/autopilot.cmake'
1157
--- cmake/modules/autopilot.cmake	2013-06-05 22:03:08 +0000
1158
+++ cmake/modules/autopilot.cmake	2013-07-11 14:53:26 +0000
1159
@@ -1,7 +1,10 @@
1160
1
add_custom_target(autopilot)
1
add_custom_target(autopilot)
1161
2
2
1166
3
function(declare_autopilot_test TEST_NAME WORKING_DIR)
3
function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
1167
4
  add_custom_command(TARGET autopilot
4
    add_custom_target(autopilot-${TEST_NAME}
1168
5
  COMMAND autopilot run ${TEST_NAME}
5
        COMMAND autopilot run ${TEST_SUITE}
1169
6
  WORKING_DIRECTORY ${WORKING_DIR})
6
        WORKING_DIRECTORY ${WORKING_DIR}
1170
7
    )
1171
8
1172
9
    add_dependencies(autopilot autopilot-${TEST_NAME})
1173
7
endfunction()
10
endfunction()
1174
8
11
1175
=== modified file 'debian/control'
1176
--- debian/control	2013-07-11 13:49:23 +0000
1177
+++ debian/control	2013-07-11 14:53:26 +0000
1178
@@ -10,7 +10,10 @@
1179
10
               libgles2-mesa-dev[armhf],
10
               libgles2-mesa-dev[armhf],
1180
11
               libhud-client2-dev,
11
               libhud-client2-dev,
1181
12
               libjson-perl,
12
               libjson-perl,
1182
13
               libnm-glib-dev,
1183
14
               libnm-util-dev,
1184
13
               libpulse-dev,
15
               libpulse-dev,
1185
16
               libqmenumodel-dev,
1186
14
               libqt5v8-5-private-dev,
17
               libqt5v8-5-private-dev,
1187
15
               libunity-api-dev (>= 7.80.3),
18
               libunity-api-dev (>= 7.80.3),
1188
16
               libunity-core-6.0-dev (<< 7.80),
19
               libunity-core-6.0-dev (<< 7.80),
1189
@@ -41,9 +44,19 @@
1190
41
Vcs-Bzr: https://code.launchpad.net/unity8
44
Vcs-Bzr: https://code.launchpad.net/unity8
1191
42
Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk
45
Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk
1192
43
46
1193
47
Package: indicators-client
1194
48
Architecture: amd64 armhf i386
1195
49
Depends: qmenumodel-qml,
1196
50
         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
1197
51
         unity8 (= ${binary:Version}),
1198
52
         ${misc:Depends},
1199
53
         ${shlibs:Depends},
1200
54
Description: Indicators client test application
1201
55
 This package contains the client application for indicators used by autopilot
1202
56
1203
44
Package: unity8
57
Package: unity8
1204
45
Architecture: any
58
Architecture: any
1206
46
Depends: indicators-client (>= 0.6.1),
59
Depends: qmenumodel-qml,
1207
47
         qtdeclarative5-dee-plugin,
60
         qtdeclarative5-dee-plugin,
1208
48
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
61
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
1209
49
         qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
62
         qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
1210
@@ -55,18 +68,19 @@
1211
55
         unity8-private | unity-launcher-impl,
68
         unity8-private | unity-launcher-impl,
1212
56
         ${misc:Depends},
69
         ${misc:Depends},
1213
57
         ${shlibs:Depends},
70
         ${shlibs:Depends},
1219
58
Recommends: indicators-client-plugin-datetime (>= 0.6.1),
71
Recommends: indicator-battery,
1220
59
            indicators-client-plugin-messaging (>= 0.6.1),
72
            indicator-messages,
1221
60
            indicators-client-plugin-network (>= 0.6.1),
73
            indicator-network,
1222
61
            indicators-client-plugin-power (>= 0.6.1),
74
            indicator-sound,
1223
62
            indicators-client-plugin-sound (>= 0.6.1),
75
            indicator-time,
1224
63
            ${unity-default-masterscopes},
76
            ${unity-default-masterscopes},
1225
64
Description: Unity 8 shell
77
Description: Unity 8 shell
1226
65
 The Unity 8 shell is the primary user interface for Ubuntu devices.
78
 The Unity 8 shell is the primary user interface for Ubuntu devices.
1227
66
79
1228
67
Package: unity8-autopilot
80
Package: unity8-autopilot
1229
68
Architecture: all
81
Architecture: all
1231
69
Depends: libautopilot-qt,
82
Depends: indicators-client (>= ${source:Version}),
1232
83
         libautopilot-qt,
1233
70
         libqt5test5,
84
         libqt5test5,
1234
71
         libqt5widgets5,
85
         libqt5widgets5,
1235
72
         python-evdev,
86
         python-evdev,
1236
73
87
1237
=== added file 'debian/indicators-client.install'
1238
--- debian/indicators-client.install	1970-01-01 00:00:00 +0000
1239
+++ debian/indicators-client.install	2013-07-11 14:53:26 +0000
1240
@@ -0,0 +1,1 @@
1241
1
/usr/bin/indicators-client
1242
0
2
1243
=== modified file 'debian/unity8.install'
1244
--- debian/unity8.install	2013-07-02 14:44:34 +0000
1245
+++ debian/unity8.install	2013-07-11 14:53:26 +0000
1246
@@ -13,3 +13,4 @@
1247
13
usr/share/unity8/Shell.qml
13
usr/share/unity8/Shell.qml
1248
14
usr/share/unity8/SideStage
14
usr/share/unity8/SideStage
1249
15
usr/share/unity8/graphics
15
usr/share/unity8/graphics
1250
16
usr/share/unity8/unity/indicators/*
1251
16
17
1252
=== modified file 'main.cpp'
1253
--- main.cpp	2013-07-03 09:23:56 +0000
1254
+++ main.cpp	2013-07-11 14:53:26 +0000
1255
@@ -22,6 +22,7 @@
1256
22
#include <QtGui/QIcon>
22
#include <QtGui/QIcon>
1257
23
#include <QtGui/QGuiApplication>
23
#include <QtGui/QGuiApplication>
1258
24
#include <QtQml/QQmlEngine>
24
#include <QtQml/QQmlEngine>
1259
25
#include <QtQml/QQmlContext>
1260
25
#include <qpa/qplatformnativeinterface.h>
26
#include <qpa/qplatformnativeinterface.h>
1261
26
#include <QLibrary>
27
#include <QLibrary>
1262
27
#include <libintl.h>
28
#include <libintl.h>
1263
@@ -131,8 +132,6 @@
1264
131
    nativeInterface->setProperty("ubuntuSessionType", 1);
132
    nativeInterface->setProperty("ubuntuSessionType", 1);
1265
132
    view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
133
    view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
1266
133
134
1267
134
    QObject::connect(view->engine(), SIGNAL(quit()), qApp, SLOT(quit()));
1268
135
1269
136
    QUrl source("Shell.qml");
135
    QUrl source("Shell.qml");
1270
137
    prependImportPaths(view->engine(), ::overrideImportPaths());
136
    prependImportPaths(view->engine(), ::overrideImportPaths());
1271
138
    appendImportPaths(view->engine(), ::fallbackImportPaths());
137
    appendImportPaths(view->engine(), ::fallbackImportPaths());
1272
139
138
1273
=== modified file 'paths.h.in'
1274
--- paths.h.in	2013-06-28 13:14:29 +0000
1275
+++ paths.h.in	2013-07-11 14:53:26 +0000
1276
@@ -23,6 +23,7 @@
1277
23
// Qt
23
// Qt
1278
24
#include <QtCore/QCoreApplication>
24
#include <QtCore/QCoreApplication>
1279
25
#include <QtCore/QDir>
25
#include <QtCore/QDir>
1280
26
#include <QStandardPaths>
1281
26
27
1282
27
inline bool isRunningInstalled() {
28
inline bool isRunningInstalled() {
1283
28
    static bool installed = (QCoreApplication::applicationDirPath() ==
29
    static bool installed = (QCoreApplication::applicationDirPath() ==
1284
@@ -65,6 +66,20 @@
1285
65
    return paths;
66
    return paths;
1286
66
}
67
}
1287
67
68
1288
69
inline QStringList shellDataDirs() {
1289
70
    QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
1290
71
    if (!isRunningInstalled()) {
1291
72
        if (getenv("UNITY_TEST_ENV")==NULL) {
1292
73
            dirs.prepend("@CMAKE_BINARY_DIR@/share");
1293
74
        }
1294
75
    }
1295
76
    else {
1296
77
        // append so by default we use xdg files.
1297
78
        dirs.append(shellAppDirectory());
1298
79
    }
1299
80
    return dirs;
1300
81
}
1301
82
1302
68
inline QString sourceDirectory() {
83
inline QString sourceDirectory() {
1303
69
    return QString("@CMAKE_SOURCE_DIR@/");
84
    return QString("@CMAKE_SOURCE_DIR@/");
1304
70
}
85
}
1305
71
86
1306
=== modified file 'plugins/Unity/CMakeLists.txt'
1307
--- plugins/Unity/CMakeLists.txt	2013-07-11 08:19:10 +0000
1308
+++ plugins/Unity/CMakeLists.txt	2013-07-11 14:53:26 +0000
1309
@@ -1,6 +1,8 @@
1310
1
# export_qmlplugin macro
1
# export_qmlplugin macro
1311
2
include(Plugins)
2
include(Plugins)
1312
3
3
1313
4
add_subdirectory(Indicators)
1314
5
1315
4
# Dependencies
6
# Dependencies
1316
5
include(FindPkgConfig)
7
include(FindPkgConfig)
1317
6
pkg_check_modules(QTDEE REQUIRED libdee-qt5)
8
pkg_check_modules(QTDEE REQUIRED libdee-qt5)
1318
7
9
1319
=== added directory 'plugins/Unity/Indicators'
1320
=== added file 'plugins/Unity/Indicators/CMakeLists.txt'
1321
--- plugins/Unity/Indicators/CMakeLists.txt	1970-01-01 00:00:00 +0000
1322
+++ plugins/Unity/Indicators/CMakeLists.txt	2013-07-11 14:53:26 +0000
1323
@@ -0,0 +1,52 @@
1324
1
project(IndicatorsQml)
1325
2
1326
3
pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
1327
4
find_package(Qt5Core REQUIRED)
1328
5
find_package(Qt5Quick REQUIRED)
1329
6
1330
7
add_subdirectory(qml)
1331
8
add_subdirectory(Messaging)
1332
9
add_subdirectory(Network)
1333
10
1334
11
include_directories(
1335
12
    ${CMAKE_CURRENT_SOURCE_DIR}
1336
13
    ${CMAKE_CURRENT_BINARY_DIR}
1337
14
    ${QMENUMODEL_INCLUDE_DIRS}
1338
15
)
1339
16
1340
17
set(IndicatorsQML_SOURCES
1341
18
    flatmenuproxymodel.cpp
1342
19
    indicator.cpp
1343
20
    indicators.h
1344
21
    indicatorsmanager.cpp
1345
22
    indicatorsmodel.cpp
1346
23
    plugin.cpp
1347
24
)
1348
25
1349
26
set(IndicatorsQML_RESOURCES
1350
27
    resources/indicators.qrc
1351
28
)
1352
29
1353
30
qt5_add_resources(IndicatorsQML_RESOURCES_RCC
1354
31
    ${IndicatorsQML_RESOURCES}
1355
32
)
1356
33
1357
34
add_library(IndicatorsQml SHARED
1358
35
    ${IndicatorsQML_RESOURCES_RCC}
1359
36
    ${IndicatorsQML_SOURCES}
1360
37
)
1361
38
# Because this is an internal support library, we want
1362
39
# to expose all symbols in it. Consider changing this
1363
40
# either to a static library or just using the
1364
41
# files directly in targets.
1365
42
set_target_properties(IndicatorsQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
1366
43
1367
44
target_link_libraries(IndicatorsQml
1368
45
    ${QMENUMODEL_LDFLAGS}
1369
46
)
1370
47
1371
48
qt5_use_modules(IndicatorsQml Core Qml Quick)
1372
49
1373
50
install(TARGETS IndicatorsQml
1374
51
    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators
1375
52
    )
1376
0
53
1377
=== added directory 'plugins/Unity/Indicators/Messaging'
1378
=== added file 'plugins/Unity/Indicators/Messaging/CMakeLists.txt'
1379
--- plugins/Unity/Indicators/Messaging/CMakeLists.txt	1970-01-01 00:00:00 +0000
1380
+++ plugins/Unity/Indicators/Messaging/CMakeLists.txt	2013-07-11 14:53:26 +0000
1381
@@ -0,0 +1,1 @@
1382
1
add_subdirectory(qml)
1383
0
2
1384
=== added directory 'plugins/Unity/Indicators/Messaging/qml'
1385
=== added file 'plugins/Unity/Indicators/Messaging/qml/ActionButton.qml'
1386
--- plugins/Unity/Indicators/Messaging/qml/ActionButton.qml	1970-01-01 00:00:00 +0000
1387
+++ plugins/Unity/Indicators/Messaging/qml/ActionButton.qml	2013-07-11 14:53:26 +0000
1388
@@ -0,0 +1,43 @@
1389
1
/*
1390
2
 * Copyright 2013 Canonical Ltd.
1391
3
 *
1392
4
 * This program is free software; you can redistribute it and/or modify
1393
5
 * it under the terms of the GNU Lesser General Public License as published by
1394
6
 * the Free Software Foundation; version 3.
1395
7
 *
1396
8
 * This program is distributed in the hope that it will be useful,
1397
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1398
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1399
11
 * GNU Lesser General Public License for more details.
1400
12
 *
1401
13
 * You should have received a copy of the GNU Lesser General Public License
1402
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1403
15
 *
1404
16
 * Authors:
1405
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1406
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
1407
19
 */
1408
20
1409
21
import QtQuick 2.0
1410
22
import Ubuntu.Components 0.1
1411
23
import Unity.Indicators 0.1 as Indicators
1412
24
1413
25
Button {
1414
26
    id: button
1415
27
    property QtObject actionGroup: null
1416
28
    property string action
1417
29
1418
30
    property var actionParameter: null
1419
31
1420
32
    Indicators.MenuAction {
1421
33
        id: menuAction
1422
34
        actionGroup: button.actionGroup
1423
35
        action: button.action
1424
36
    }
1425
37
1426
38
    onClicked: {
1427
39
        if (menuAction.valid) {
1428
40
            menuAction.activate(actionParameter);
1429
41
        }
1430
42
    }
1431
43
}
1432
0
44
1433
=== added file 'plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml'
1434
--- plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml	1970-01-01 00:00:00 +0000
1435
+++ plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml	2013-07-11 14:53:26 +0000
1436
@@ -0,0 +1,66 @@
1437
1
/*
1438
2
 * Copyright 2013 Canonical Ltd.
1439
3
 *
1440
4
 * This program is free software; you can redistribute it and/or modify
1441
5
 * it under the terms of the GNU Lesser General Public License as published by
1442
6
 * the Free Software Foundation; version 3.
1443
7
 *
1444
8
 * This program is distributed in the hope that it will be useful,
1445
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1446
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1447
11
 * GNU Lesser General Public License for more details.
1448
12
 *
1449
13
 * You should have received a copy of the GNU Lesser General Public License
1450
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1451
15
 *
1452
16
 * Authors:
1453
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1454
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
1455
19
 */
1456
20
1457
21
import QtQuick 2.0
1458
22
import Ubuntu.Components 0.1
1459
23
1460
24
Item {
1461
25
    property alias actionGroup: sendButton.actionGroup
1462
26
    property alias action: sendButton.action
1463
27
1464
28
    property alias text: replyField.text
1465
29
    property alias buttonText: sendButton.text
1466
30
1467
31
    TextField {
1468
32
        id: replyField
1469
33
1470
34
        anchors {
1471
35
            top: parent.top
1472
36
            bottom: parent.bottom
1473
37
            left: parent.left
1474
38
            right: sendButton.left
1475
39
            rightMargin: units.gu(1)
1476
40
        }
1477
41
        placeholderText: "Reply"
1478
42
        hasClearButton: false
1479
43
1480
44
        onEnabledChanged: {
1481
45
            //Make sure that the component lost focus when enabled = false,
1482
46
            //otherwise it will get focus again when enable = true
1483
47
            if (!enabled) {
1484
48
                focus = false;
1485
49
            }
1486
50
        }
1487
51
    }
1488
52
1489
53
    ActionButton {
1490
54
        id: sendButton
1491
55
1492
56
        actionParameter: replyField.text
1493
57
        anchors {
1494
58
            top: parent.top
1495
59
            bottom: parent.bottom
1496
60
            right: parent.right
1497
61
        }
1498
62
        width: units.gu(9)
1499
63
        enabled: replyField.text !== ""
1500
64
        color: enabled ? "#c94212" : "#bababa"
1501
65
    }
1502
66
}
1503
0
67
1504
=== added file 'plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt'
1505
--- plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
1506
+++ plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt	2013-07-11 14:53:26 +0000
1507
@@ -0,0 +1,15 @@
1508
1
file(GLOB IndicatorsMessaging_QMLFILES
1509
2
    *.qml
1510
3
    *.js
1511
4
    qmldir
1512
5
)
1513
6
1514
7
# copy qml & qmldir files into build directory for shadow builds
1515
8
add_custom_target(UnityIndicatorsMessagingQmlFiles ALL
1516
9
    COMMAND cp ${IndicatorsMessaging_QMLFILES} ${CMAKE_BINARY_DIR}/plugins/Unity/Indicators/Messaging
1517
10
    DEPENDS ${IndicatorsMessaging_QMLFILES}
1518
11
)
1519
12
1520
13
install(FILES ${IndicatorsMessaging_QMLFILES}
1521
14
        DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Messaging
1522
15
)
1523
0
16
1524
=== added file 'plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml'
1525
--- plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml	1970-01-01 00:00:00 +0000
1526
+++ plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml	2013-07-11 14:53:26 +0000
1527
@@ -0,0 +1,96 @@
1528
1
/*
1529
2
 * Copyright 2013 Canonical Ltd.
1530
3
 *
1531
4
 * This program is free software; you can redistribute it and/or modify
1532
5
 * it under the terms of the GNU Lesser General Public License as published by
1533
6
 * the Free Software Foundation; version 3.
1534
7
 *
1535
8
 * This program is distributed in the hope that it will be useful,
1536
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1537
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1538
11
 * GNU Lesser General Public License for more details.
1539
12
 *
1540
13
 * You should have received a copy of the GNU Lesser General Public License
1541
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1542
15
 *
1543
16
 * Authors:
1544
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1545
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
1546
19
 */
1547
20
1548
21
import QtQuick 2.0
1549
22
import Ubuntu.Components 0.1
1550
23
import Unity.Indicators 0.1 as Indicators
1551
24
1552
25
Indicators.BasicMenuItem {
1553
26
    id: groupedMessage
1554
27
    property alias count: label.text
1555
28
1556
29
    color: "#221e1b"
1557
30
    implicitHeight: units.gu(10)
1558
31
1559
32
    Indicators.MenuAction {
1560
33
        id: menuAction
1561
34
        actionGroup: groupedMessage.actionGroup
1562
35
        action: menu ? menu.action : ""
1563
36
    }
1564
37
1565
38
    Row {
1566
39
        anchors.fill: parent
1567
40
        anchors.margins: units.gu(2)
1568
41
        spacing: units.gu(4)
1569
42
1570
43
        UbuntuShape {
1571
44
            height: units.gu(6)
1572
45
            width: units.gu(6)
1573
46
            image: Image {
1574
47
                source: menu && (menu.extra.canonical_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_app.svg"
1575
48
                fillMode: Image.PreserveAspectFit
1576
49
            }
1577
50
        }
1578
51
1579
52
        Label {
1580
53
            anchors.verticalCenter: parent.verticalCenter
1581
54
            color: "#e8e1d0"
1582
55
            font.weight: Font.DemiBold
1583
56
            fontSize: "medium"
1584
57
            text: menu && menu.label ? menu.label : ""
1585
58
        }
1586
59
1587
60
        Label {
1588
61
            id: label
1589
62
            anchors.verticalCenter: parent.verticalCenter
1590
63
            width: parent.width - x
1591
64
            horizontalAlignment: Text.AlignRight
1592
65
            color: "#e8e1d0"
1593
66
            font.weight: Font.DemiBold
1594
67
            fontSize: "medium"
1595
68
            text: menuAction.valid ? menuAction.state[0] : "0"
1596
69
        }
1597
70
    }
1598
71
1599
72
    Indicators.HLine {
1600
73
        anchors.top: parent.top
1601
74
        color: "#403b37"
1602
75
    }
1603
76
1604
77
    Indicators.HLine {
1605
78
        anchors.bottom: parent.bottom
1606
79
        color: "#060606"
1607
80
    }
1608
81
1609
82
    MouseArea {
1610
83
        anchors.fill: parent
1611
84
        onClicked: {
1612
85
            if (menuAction.valid) {
1613
86
                menuAction.activate(true);
1614
87
            }
1615
88
        }
1616
89
    }
1617
90
1618
91
    onItemRemoved: {
1619
92
        if (menuAction.valid) {
1620
93
            menuAction.activate(false);
1621
94
        }
1622
95
    }
1623
96
}
1624
0
97
1625
=== added file 'plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml'
1626
--- plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml	1970-01-01 00:00:00 +0000
1627
+++ plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml	2013-07-11 14:53:26 +0000
1628
@@ -0,0 +1,120 @@
1629
1
/*
1630
2
 * Copyright 2013 Canonical Ltd.
1631
3
 *
1632
4
 * This program is free software; you can redistribute it and/or modify
1633
5
 * it under the terms of the GNU Lesser General Public License as published by
1634
6
 * the Free Software Foundation; version 3.
1635
7
 *
1636
8
 * This program is distributed in the hope that it will be useful,
1637
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1638
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1639
11
 * GNU Lesser General Public License for more details.
1640
12
 *
1641
13
 * You should have received a copy of the GNU Lesser General Public License
1642
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1643
15
 *
1644
16
 * Authors:
1645
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1646
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
1647
19
 */
1648
20
1649
21
import QtQuick 2.0
1650
22
import Ubuntu.Components 0.1
1651
23
import Unity.Indicators 0.1 as Indicators
1652
24
1653
25
Indicators.BasicMenuItem {
1654
26
    id: heroMessage
1655
27
1656
28
    property variant actionsDescription: null
1657
29
    property alias heroMessageHeader: __heroMessageHeader
1658
30
    property real collapsedHeight: heroMessageHeader.y + heroMessageHeader.bodyBottom + units.gu(2)
1659
31
    property real expandedHeight: collapsedHeight
1660
32
1661
33
    color: "#221e1c"
1662
34
1663
35
    removable: state !== "expanded"
1664
36
    implicitHeight: collapsedHeight
1665
37
1666
38
    Indicators.MenuAction {
1667
39
        id: menuAction
1668
40
        actionGroup: heroMessage.actionGroup
1669
41
        action: menu ? menu.action : ""
1670
42
    }
1671
43
1672
44
    HeroMessageHeader {
1673
45
        id: __heroMessageHeader
1674
46
1675
47
        anchors.top: parent.top
1676
48
        anchors.left: parent.left
1677
49
        anchors.right: parent.right
1678
50
1679
51
        avatar: menu && (menu.extra.canonical_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_contact.png"
1680
52
        icon: menu && (menu.extra.canonical_app_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_app_icon) : ""
1681
53
        appIcon: icon
1682
54
1683
55
        state: heroMessage.state
1684
56
1685
57
        onAppIconClicked:  {
1686
58
            if (menuAction.valid) {
1687
59
                deactivateMenu();
1688
60
                action.activate(true);
1689
61
            }
1690
62
        }
1691
63
    }
1692
64
1693
65
    onClicked: {
1694
66
        if (menuActivated) {
1695
67
            deactivateMenu();
1696
68
        } else {
1697
69
            activateMenu();
1698
70
        }
1699
71
    }
1700
72
1701
73
    Indicators.HLine {
1702
74
        id: __topHLine
1703
75
        anchors.top: parent.top
1704
76
        color: "#403b37"
1705
77
    }
1706
78
1707
79
    Indicators.HLine {
1708
80
        id: __bottomHLine
1709
81
        anchors.bottom: parent.bottom
1710
82
        color: "#060606"
1711
83
    }
1712
84
1713
85
    states: State {
1714
86
        name: "expanded"
1715
87
        when: menuActivated
1716
88
1717
89
        PropertyChanges {
1718
90
            target: heroMessage
1719
91
            color: "#333130"
1720
92
            implicitHeight: heroMessage.expandedHeight
1721
93
        }
1722
94
        PropertyChanges {
1723
95
            target: __topHLine
1724
96
            opacity: 0.0
1725
97
        }
1726
98
        PropertyChanges {
1727
99
            target: __bottomHLine
1728
100
            opacity: 0.0
1729
101
        }
1730
102
    }
1731
103
1732
104
    transitions: Transition {
1733
105
        ParallelAnimation {
1734
106
            NumberAnimation {
1735
107
                properties: "opacity,implicitHeight"
1736
108
                duration: 200
1737
109
                easing.type: Easing.OutQuad
1738
110
            }
1739
111
            ColorAnimation {}
1740
112
        }
1741
113
    }
1742
114
1743
115
    onItemRemoved: {
1744
116
        if (menuAction.valid) {
1745
117
            menuAction.activate(false);
1746
118
        }
1747
119
    }
1748
120
}
1749
0
121
1750
=== added file 'plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml'
1751
--- plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml	1970-01-01 00:00:00 +0000
1752
+++ plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml	2013-07-11 14:53:26 +0000
1753
@@ -0,0 +1,161 @@
1754
1
/*
1755
2
 * Copyright 2013 Canonical Ltd.
1756
3
 *
1757
4
 * This program is free software; you can redistribute it and/or modify
1758
5
 * it under the terms of the GNU Lesser General Public License as published by
1759
6
 * the Free Software Foundation; version 3.
1760
7
 *
1761
8
 * This program is distributed in the hope that it will be useful,
1762
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1763
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1764
11
 * GNU Lesser General Public License for more details.
1765
12
 *
1766
13
 * You should have received a copy of the GNU Lesser General Public License
1767
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1768
15
 *
1769
16
 * Authors:
1770
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1771
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
1772
19
 */
1773
20
1774
21
import QtQuick 2.0
1775
22
import Ubuntu.Components 0.1
1776
23
1777
24
Item {
1778
25
    id: heroMessageHeader
1779
26
1780
27
    property alias avatar: avatarImage.source
1781
28
    property alias icon: iconImage.source
1782
29
    property alias appIcon: appIconImage.source
1783
30
    property alias titleText: __titleText
1784
31
    property alias subtitleText: __subtitleText
1785
32
    property alias bodyText: __bodyText
1786
33
    property real bodyBottom: bodyText.y + bodyText.height
1787
34
1788
35
    signal appIconClicked()
1789
36
1790
37
    height: units.gu(9)
1791
38
1792
39
    UbuntuShape {
1793
40
        id: avatarImageContainer
1794
41
        anchors {
1795
42
            top: parent.top
1796
43
            topMargin: units.gu(2)
1797
44
            left: parent.left
1798
45
            leftMargin: units.gu(2)
1799
46
        }
1800
47
        height: units.gu(6)
1801
48
        width: units.gu(6)
1802
49
        image: Image {
1803
50
            id: avatarImage
1804
51
            fillMode: Image.PreserveAspectFit
1805
52
        }
1806
53
    }
1807
54
1808
55
    Image {
1809
56
        id: iconImage
1810
57
        anchors {
1811
58
            top: parent.top
1812
59
            topMargin: units.gu(2)
1813
60
            left: avatarImageContainer.right
1814
61
            leftMargin: units.gu(1)
1815
62
        }
1816
63
        height: units.gu(1.5)
1817
64
        width: units.gu(2)
1818
65
        horizontalAlignment: Image.AlignHCenter
1819
66
        verticalAlignment: Image.AlignBottom
1820
67
        fillMode: Image.PreserveAspectFit
1821
68
    }
1822
69
1823
70
    Label {
1824
71
        id: __titleText
1825
72
        anchors {
1826
73
            baseline: iconImage.bottom
1827
74
            left: iconImage.right
1828
75
            leftMargin: units.gu(1)
1829
76
            right: __appIcon.left
1830
77
            rightMargin: units.gu(2)
1831
78
        }
1832
79
        elide: Text.ElideRight
1833
80
        color: "#e8e1d0"
1834
81
        font.weight: Font.DemiBold
1835
82
        fontSize: "medium"
1836
83
    }
1837
84
1838
85
    Label {
1839
86
        id: __subtitleText
1840
87
        anchors {
1841
88
            baseline: __titleText.baseline
1842
89
            baselineOffset: units.gu(2.5)
1843
90
            left: __titleText.left
1844
91
            right: __titleText.right
1845
92
        }
1846
93
        elide: Text.ElideRight
1847
94
        color: "#8f8f88"
1848
95
        fontSize: "small"
1849
96
    }
1850
97
1851
98
    Label {
1852
99
        id: __bodyText
1853
100
        anchors {
1854
101
            baseline: __subtitleText.baseline
1855
102
            baselineOffset: units.gu(2.5)
1856
103
            left: __titleText.left
1857
104
            right: parent.right
1858
105
            rightMargin: units.gu(2)
1859
106
        }
1860
107
        maximumLineCount: 2
1861
108
        wrapMode: Text.WordWrap
1862
109
        elide: Text.ElideRight
1863
110
        color: "#e8e1d0"
1864
111
        fontSize: "small"
1865
112
    }
1866
113
1867
114
    Item {
1868
115
        id: __appIcon
1869
116
        width: units.gu(7)
1870
117
        height: units.gu(7)
1871
118
        anchors {
1872
119
            top: parent.top
1873
120
            right: parent.right
1874
121
        }
1875
122
        opacity: 0.0
1876
123
        enabled: heroMessageHeader.state === "expanded"
1877
124
1878
125
        Image {
1879
126
            id: appIconImage
1880
127
            height: width
1881
128
            anchors {
1882
129
                left: parent.left
1883
130
                leftMargin: units.gu(2)
1884
131
                right: parent.right
1885
132
                rightMargin: units.gu(2)
1886
133
                topMargin: units.gu(1)
1887
134
                verticalCenter: parent.verticalCenter
1888
135
            }
1889
136
            fillMode: Image.PreserveAspectFit
1890
137
        }
1891
138
1892
139
        MouseArea {
1893
140
            anchors.fill: parent
1894
141
            onClicked: heroMessageHeader.appIconClicked()
1895
142
        }
1896
143
    }
1897
144
1898
145
    states: State {
1899
146
        name: "expanded"
1900
147
1901
148
        PropertyChanges {
1902
149
            target: __appIcon
1903
150
            opacity: 1.0
1904
151
        }
1905
152
    }
1906
153
1907
154
    transitions: Transition {
1908
155
        NumberAnimation {
1909
156
            property: "opacity"
1910
157
            duration: 200
1911
158
            easing.type: Easing.OutQuad
1912
159
        }
1913
160
    }
1914
161
}
1915
0
162
1916
=== added file 'plugins/Unity/Indicators/Messaging/qml/MessageMenuItem.qml'
1917
--- plugins/Unity/Indicators/Messaging/qml/MessageMenuItem.qml	1970-01-01 00:00:00 +0000
1918
+++ plugins/Unity/Indicators/Messaging/qml/MessageMenuItem.qml	2013-07-11 14:53:26 +0000
1919
@@ -0,0 +1,96 @@
1920
1
/*
1921
2
 * Copyright 2013 Canonical Ltd.
1922
3
 *
1923
4
 * This program is free software; you can redistribute it and/or modify
1924
5
 * it under the terms of the GNU Lesser General Public License as published by
1925
6
 * the Free Software Foundation; version 3.
1926
7
 *
1927
8
 * This program is distributed in the hope that it will be useful,
1928
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1929
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1930
11
 * GNU Lesser General Public License for more details.
1931
12
 *
1932
13
 * You should have received a copy of the GNU Lesser General Public License
1933
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1934
15
 *
1935
16
 * Authors:
1936
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1937
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
1938
19
 */
1939
20
1940
21
import QtQuick 2.0
1941
22
import Ubuntu.Components 0.1
1942
23
import Unity.Indicators 0.1 as Indicators
1943
24
1944
25
Indicators.BasicMenuItem {
1945
26
    property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined
1946
27
1947
28
    onActionGroupChanged: loadItem()
1948
29
    onActionsDescriptionChanged: loadItem()
1949
30
    implicitHeight: contents.status == Loader.Ready ? contents.item.implicitHeight : 0
1950
31
1951
32
    Loader {
1952
33
        id: contents
1953
34
1954
35
        anchors.fill: parent
1955
36
        // Binding all properties for the item, to make sure that any change in the
1956
37
        // property will be propagated to the contents.item at any time
1957
38
        Binding {
1958
39
            target: contents.item
1959
40
            property: "menuActivated"
1960
41
            value: menuActivated
1961
42
            when: (contents.status == Loader.Ready)
1962
43
        }
1963
44
1964
45
        Binding {
1965
46
            target: contents.item
1966
47
            property: "actionGroup"
1967
48
            value: actionGroup
1968
49
            when: (contents.status == Loader.Ready)
1969
50
        }
1970
51
1971
52
        Binding {
1972
53
            target: contents.item
1973
54
            property: "menu"
1974
55
            value: menu
1975
56
            when: (contents.status == Loader.Ready)
1976
57
        }
1977
58
1978
59
        Binding {
1979
60
            target: contents.item
1980
61
            property: "actionsDescription"
1981
62
            value: actionsDescription
1982
63
            when: (contents.status == Loader.Ready)
1983
64
        }
1984
65
1985
66
        Connections {
1986
67
            target: contents.item ? contents.item : null
1987
68
            onActivateMenu: activateMenu()
1988
69
            onDeactivateMenu: deactivateMenu()
1989
70
        }
1990
71
    }
1991
72
1992
73
1993
74
    function loadItem()
1994
75
    {
1995
76
        var parameterType = ""
1996
77
        for (var actIndex in actionsDescription) {
1997
78
            var desc = actionsDescription[actIndex];
1998
79
            if (desc["parameter-type"] !== undefined) {
1999
80
                parameterType += desc["parameter-type"];
2000
81
            } else {
2001
82
                parameterType += "_";
2002
83
            }
2003
84
        }
2004
85
2005
86
        if (parameterType === "") {
2006
87
            contents.source = "SimpleTextMessage.qml";
2007
88
        } else if (parameterType === "s") {
2008
89
            contents.source = "TextMessage.qml";
2009
90
        } else if (parameterType === "_s") {
2010
91
            contents.source = "SnapDecision.qml";
2011
92
        } else {
2012
93
            console.debug("Unknown paramater type: " + parameterType);
2013
94
        }
2014
95
    }
2015
96
}
2016
0
97
2017
=== added file 'plugins/Unity/Indicators/Messaging/qml/QuickReply.qml'
2018
--- plugins/Unity/Indicators/Messaging/qml/QuickReply.qml	1970-01-01 00:00:00 +0000
2019
+++ plugins/Unity/Indicators/Messaging/qml/QuickReply.qml	2013-07-11 14:53:26 +0000
2020
@@ -0,0 +1,160 @@
2021
1
/*
2022
2
 * Copyright 2013 Canonical Ltd.
2023
3
 *
2024
4
 * This program is free software; you can redistribute it and/or modify
2025
5
 * it under the terms of the GNU Lesser General Public License as published by
2026
6
 * the Free Software Foundation; version 3.
2027
7
 *
2028
8
 * This program is distributed in the hope that it will be useful,
2029
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2030
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2031
11
 * GNU Lesser General Public License for more details.
2032
12
 *
2033
13
 * You should have received a copy of the GNU Lesser General Public License
2034
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2035
15
 *
2036
16
 * Authors:
2037
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
2038
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
2039
19
 */
2040
20
2041
21
import QtQuick 2.0
2042
22
import Ubuntu.Components 0.1
2043
23
import Unity.Indicators 0.1 as Indicators
2044
24
2045
25
Item {
2046
26
    property alias actionGroup: actionTextField.actionGroup
2047
27
    property alias action: actionTextField.action
2048
28
2049
29
    property alias buttonText: actionTextField.buttonText
2050
30
    property real expandedHeight: childrenRect.height
2051
31
    property alias messages : messagelistRepeater.model
2052
32
2053
33
    Item {
2054
34
        id: header
2055
35
        anchors.top: parent.top
2056
36
        anchors.left: parent.left
2057
37
        anchors.right: parent.right
2058
38
        height: units.gu(4)
2059
39
2060
40
        Row {
2061
41
            anchors {
2062
42
                fill: parent
2063
43
                leftMargin: units.gu(2)
2064
44
                rightMargin: units.gu(2)
2065
45
                topMargin: units.gu(1)
2066
46
                bottomMargin: units.gu(1)
2067
47
            }
2068
48
            spacing: units.gu(1)
2069
49
2070
50
            Image {
2071
51
                width: units.gu(2)
2072
52
                height: width
2073
53
                fillMode: Image.PreserveAspectFit
2074
54
                source: "qrc:/indicators/artwork/messaging/message_sms01_54px.png"
2075
55
            }
2076
56
2077
57
            Label {
2078
58
                height: parent.height
2079
59
                verticalAlignment: Text.AlignVCenter
2080
60
                fontSize: "small"
2081
61
                color: "#8f8f88"
2082
62
                text: "Quick reply with:"
2083
63
            }
2084
64
        }
2085
65
2086
66
        Indicators.HLine {
2087
67
            anchors.bottom: parent.bottom
2088
68
            color: "#20201F"
2089
69
        }
2090
70
    }
2091
71
2092
72
    Column {
2093
73
        id: messagelist
2094
74
        anchors {
2095
75
            left: parent.left
2096
76
            right: parent.right
2097
77
            top: header.bottom
2098
78
        }
2099
79
        height: childrenRect.height
2100
80
2101
81
        Repeater {
2102
82
            id: messagelistRepeater
2103
83
2104
84
            height: childrenRect.height
2105
85
2106
86
            Rectangle {
2107
87
                width: messagelist.width
2108
88
                height: units.gu(5)
2109
89
                color: "#333230"
2110
90
2111
91
                Label {
2112
92
                    id: __label
2113
93
2114
94
                    anchors {
2115
95
                        fill: parent
2116
96
                        leftMargin: units.gu(2)
2117
97
                        rightMargin: units.gu(2)
2118
98
                    }
2119
99
                    verticalAlignment: Text.AlignVCenter
2120
100
                    fontSize: "medium"
2121
101
                    color: "#e8e1d0"
2122
102
                    text: modelData
2123
103
                }
2124
104
2125
105
                Indicators.HLine {
2126
106
                    anchors.top: parent.top
2127
107
                    color: "#464543"
2128
108
                }
2129
109
2130
110
                Indicators.HLine {
2131
111
                    anchors.bottom: parent.bottom
2132
112
                    color: "#20201F"
2133
113
                }
2134
114
2135
115
                MouseArea {
2136
116
                    id: __mouseArea
2137
117
2138
118
                    anchors.fill: parent
2139
119
                    onClicked: {
2140
120
                        actionTextField.text = modelData;
2141
121
                    }
2142
122
                }
2143
123
2144
124
                Rectangle {
2145
125
                    id: __mask
2146
126
2147
127
                    anchors.fill: parent
2148
128
                    color: "black"
2149
129
                    opacity: __mouseArea.pressed ? 0.3 : 0.0
2150
130
                    Behavior on opacity {
2151
131
                        NumberAnimation {
2152
132
                            duration: 200
2153
133
                            easing.type: Easing.OutQuad
2154
134
                        }
2155
135
                    }
2156
136
                }
2157
137
            }
2158
138
2159
139
        }
2160
140
    }
2161
141
2162
142
    Item {
2163
143
        anchors.top: messagelist.bottom
2164
144
        anchors.left: parent.left
2165
145
        anchors.right: parent.right
2166
146
        height: units.gu(6)
2167
147
2168
148
        ActionTextField {
2169
149
            id: actionTextField
2170
150
2171
151
            anchors.fill: parent
2172
152
            anchors.margins: units.gu(1)
2173
153
        }
2174
154
2175
155
        Indicators.HLine {
2176
156
            anchors.top: parent.top
2177
157
            color: "#464543"
2178
158
        }
2179
159
    }
2180
160
}
2181
0
161
2182
=== added file 'plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml'
2183
--- plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml	1970-01-01 00:00:00 +0000
2184
+++ plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml	2013-07-11 14:53:26 +0000
2185
@@ -0,0 +1,97 @@
2186
1
/*
2187
2
 * Copyright 2013 Canonical Ltd.
2188
3
 *
2189
4
 * This program is free software; you can redistribute it and/or modify
2190
5
 * it under the terms of the GNU Lesser General Public License as published by
2191
6
 * the Free Software Foundation; version 3.
2192
7
 *
2193
8
 * This program is distributed in the hope that it will be useful,
2194
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2195
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2196
11
 * GNU Lesser General Public License for more details.
2197
12
 *
2198
13
 * You should have received a copy of the GNU Lesser General Public License
2199
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2200
15
 *
2201
16
 * Authors:
2202
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
2203
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
2204
19
 */
2205
20
2206
21
import QtQuick 2.0
2207
22
import Ubuntu.Components 0.1
2208
23
import "utils.js" as Utils
2209
24
2210
25
HeroMessage {
2211
26
    id: __heroMessage
2212
27
2213
28
    property alias footer: footerLoader.sourceComponent
2214
29
2215
30
    expandedHeight: fullMessage.y + fullMessage.height + units.gu(2)
2216
31
    heroMessageHeader.titleText.text: menu ? menu.label : ""
2217
32
    heroMessageHeader.subtitleText.text: menu ? Utils.formatDate(menu.extra.canonical_time) : ""
2218
33
    heroMessageHeader.bodyText.text: menu ? menu.extra.canonical_text : ""
2219
34
2220
35
    Item {
2221
36
        id: fullMessage
2222
37
2223
38
        anchors {
2224
39
            left: parent.left
2225
40
            leftMargin: units.gu(2)
2226
41
            right: parent.right
2227
42
            rightMargin: units.gu(2)
2228
43
            top: heroMessageHeader.bottom
2229
44
        }
2230
45
        height: childrenRect.height
2231
46
        opacity: 0.0
2232
47
        enabled: false
2233
48
2234
49
        Label {
2235
50
            id: bodyText
2236
51
            anchors {
2237
52
                top: parent.top
2238
53
                left: parent.left
2239
54
                right: parent.right
2240
55
            }
2241
56
            wrapMode: Text.WordWrap
2242
57
            elide: Text.ElideRight
2243
58
            color: "#e8e1d0"
2244
59
            fontSize: "medium"
2245
60
            text: heroMessageHeader.bodyText.text
2246
61
        }
2247
62
2248
63
        Loader {
2249
64
            id: footerLoader
2250
65
2251
66
            anchors {
2252
67
                top: bodyText.bottom
2253
68
                topMargin: units.gu(2)
2254
69
                left: parent.left
2255
70
                right: parent.right
2256
71
            }
2257
72
            height: item != undefined ? units.gu(4) : 0
2258
73
        }
2259
74
2260
75
        states: State {
2261
76
            name: "expanded"
2262
77
            when: __heroMessage.state === "expanded"
2263
78
2264
79
            PropertyChanges {
2265
80
                target: heroMessageHeader.bodyText
2266
81
                opacity: 0.0
2267
82
            }
2268
83
2269
84
            PropertyChanges {
2270
85
                target: fullMessage
2271
86
                opacity: 1.0
2272
87
                enabled: true
2273
88
            }
2274
89
        }
2275
90
        transitions: Transition {
2276
91
            NumberAnimation {
2277
92
                property: "opacity"
2278
93
                duration: 200
2279
94
            }
2280
95
        }
2281
96
    }
2282
97
}
2283
0
98
2284
=== added file 'plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml'
2285
--- plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml	1970-01-01 00:00:00 +0000
2286
+++ plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml	2013-07-11 14:53:26 +0000
2287
@@ -0,0 +1,142 @@
2288
1
/*
2289
2
 * Copyright 2013 Canonical Ltd.
2290
3
 *
2291
4
 * This program is free software; you can redistribute it and/or modify
2292
5
 * it under the terms of the GNU Lesser General Public License as published by
2293
6
 * the Free Software Foundation; version 3.
2294
7
 *
2295
8
 * This program is distributed in the hope that it will be useful,
2296
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2297
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2298
11
 * GNU Lesser General Public License for more details.
2299
12
 *
2300
13
 * You should have received a copy of the GNU Lesser General Public License
2301
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2302
15
 *
2303
16
 * Authors:
2304
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
2305
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
2306
19
 */
2307
20
2308
21
import QtQuick 2.0
2309
22
import Ubuntu.Components 0.1
2310
23
import Unity.Indicators 0.1 as Indicators
2311
24
import "utils.js" as Utils
2312
25
2313
26
HeroMessage {
2314
27
    id: snapDecision
2315
28
2316
29
    expandedHeight: buttons.y + buttons.height + quickreply.height + units.gu(2)
2317
30
    heroMessageHeader.titleText.text:  menu ? menu.label : ""
2318
31
    heroMessageHeader.subtitleText.text: menu ? menu.extra.canonical_text : ""
2319
32
    heroMessageHeader.subtitleText.color: "#e8e1d0"
2320
33
    heroMessageHeader.bodyText.text: menu ? Utils.formatDate(menu.extra.canonical_time) : ""
2321
34
    heroMessageHeader.bodyText.color: "#8f8f88"
2322
35
2323
36
    Item {
2324
37
        id: buttons
2325
38
2326
39
        anchors.left: parent.left
2327
40
        anchors.leftMargin: units.gu(2)
2328
41
        anchors.right: parent.right
2329
42
        anchors.rightMargin: units.gu(2)
2330
43
        anchors.top: heroMessageHeader.bottom
2331
44
        anchors.topMargin: units.gu(1)
2332
45
        height: units.gu(4)
2333
46
        opacity: 0.0
2334
47
2335
48
        Button {
2336
49
            text: "Message"
2337
50
            color: "#bababa"
2338
51
            anchors.left: parent.left
2339
52
            anchors.top: parent.top
2340
53
            anchors.bottom: parent.bottom
2341
54
            width: (parent.width - units.gu(1)) / 2
2342
55
2343
56
            onClicked: {
2344
57
                if (quickreply.state === "") {
2345
58
                    quickreply.state = "expanded";
2346
59
                } else {
2347
60
                    quickreply.state = "";
2348
61
                }
2349
62
            }
2350
63
        }
2351
64
2352
65
        ActionButton {
2353
66
            actionGroup: snapDecision.actionGroup
2354
67
            action: actionsDescription[0].name
2355
68
2356
69
            text: actionsDescription ?  actionsDescription[0].label : "Call back"
2357
70
            color: "#c94212"
2358
71
            anchors.right: parent.right
2359
72
            anchors.top: parent.top
2360
73
            anchors.bottom: parent.bottom
2361
74
            width: (parent.width - units.gu(1)) / 2
2362
75
        }
2363
76
2364
77
        states: State {
2365
78
            name: "expanded"
2366
79
            when: snapDecision.state === "expanded"
2367
80
2368
81
            PropertyChanges {
2369
82
                target: buttons
2370
83
                opacity: 1.0
2371
84
            }
2372
85
        }
2373
86
        transitions: Transition {
2374
87
            NumberAnimation {
2375
88
                property: "opacity"
2376
89
                duration: 200
2377
90
                easing.type: Easing.OutQuad
2378
91
            }
2379
92
        }
2380
93
    }
2381
94
2382
95
    QuickReply {
2383
96
        id: quickreply
2384
97
2385
98
        actionGroup: snapDecision.actionGroup
2386
99
        action: actionsDescription[1].name
2387
100
2388
101
        messages: actionsDescription ? actionsDescription[1]["parameter-hint"] : ""
2389
102
        buttonText: actionsDescription ? actionsDescription[1].label : "send"
2390
103
        anchors {
2391
104
            top: buttons.bottom
2392
105
            topMargin: units.gu(2)
2393
106
            left: parent.left
2394
107
            right: parent.right
2395
108
        }
2396
109
        height: 0
2397
110
        opacity: 0.0
2398
111
        enabled: false
2399
112
2400
113
        states: State {
2401
114
            name: "expanded"
2402
115
2403
116
            PropertyChanges {
2404
117
                target: quickreply
2405
118
                height: expandedHeight
2406
119
                opacity: 1.0
2407
120
            }
2408
121
2409
122
            PropertyChanges {
2410
123
                target: quickreply
2411
124
                enabled: true
2412
125
            }
2413
126
        }
2414
127
2415
128
        transitions: Transition {
2416
129
            NumberAnimation {
2417
130
                properties: "opacity,height"
2418
131
                duration: 200
2419
132
                easing.type: Easing.OutQuad
2420
133
            }
2421
134
        }
2422
135
    }
2423
136
2424
137
    onStateChanged: {
2425
138
        if (state === "") {
2426
139
            quickreply.state = "";
2427
140
        }
2428
141
    }
2429
142
}
2430
0
143
2431
=== added file 'plugins/Unity/Indicators/Messaging/qml/TextMessage.qml'
2432
--- plugins/Unity/Indicators/Messaging/qml/TextMessage.qml	1970-01-01 00:00:00 +0000
2433
+++ plugins/Unity/Indicators/Messaging/qml/TextMessage.qml	2013-07-11 14:53:26 +0000
2434
@@ -0,0 +1,35 @@
2435
1
/*
2436
2
 * Copyright 2013 Canonical Ltd.
2437
3
 *
2438
4
 * This program is free software; you can redistribute it and/or modify
2439
5
 * it under the terms of the GNU Lesser General Public License as published by
2440
6
 * the Free Software Foundation; version 3.
2441
7
 *
2442
8
 * This program is distributed in the hope that it will be useful,
2443
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2444
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2445
11
 * GNU Lesser General Public License for more details.
2446
12
 *
2447
13
 * You should have received a copy of the GNU Lesser General Public License
2448
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2449
15
 *
2450
16
 * Authors:
2451
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
2452
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
2453
19
 */
2454
20
2455
21
import QtQuick 2.0
2456
22
import Ubuntu.Components 0.1
2457
23
import Unity.Indicators 0.1 as Indicators
2458
24
2459
25
SimpleTextMessage {
2460
26
    id: simpleMessage
2461
27
2462
28
    footer: ActionTextField {
2463
29
        anchors.fill:  parent
2464
30
        actionGroup: simpleMessage.actionGroup
2465
31
        action: actionsDescription[0].name
2466
32
2467
33
        buttonText: actionsDescription ? actionsDescription[0].label : "Send"
2468
34
    }
2469
35
}
2470
0
36
2471
=== added file 'plugins/Unity/Indicators/Messaging/qml/qmldir'
2472
--- plugins/Unity/Indicators/Messaging/qml/qmldir	1970-01-01 00:00:00 +0000
2473
+++ plugins/Unity/Indicators/Messaging/qml/qmldir	2013-07-11 14:53:26 +0000
2474
@@ -0,0 +1,12 @@
2475
1
module Unity.Indicators.Messaging
2476
2
2477
3
ActionButton 0.1 ActionButton.qml
2478
4
ActionTextField 0.1 ActionTextField.qml
2479
5
GroupedMessage 0.1 GroupedMessage.qml
2480
6
HeroMessage 0.1 HeroMessage.qml
2481
7
HeroMessageHeader 0.1 HeroMessageHeader.qml
2482
8
MessageMenuItem 0.1 MessageMenuItem.qml
2483
9
QuickReply 0.1 QuickReply.qml
2484
10
SimpleTextMessage 0.1 SimpleTextMessage.qml
2485
11
SnapDecision 0.1 SnapDecision.qml
2486
12
TextMessage 0.1 TextMessage.qml
2487
0
\ No newline at end of file
13
\ No newline at end of file
2488
1
14
2489
=== added file 'plugins/Unity/Indicators/Messaging/qml/utils.js'
2490
--- plugins/Unity/Indicators/Messaging/qml/utils.js	1970-01-01 00:00:00 +0000
2491
+++ plugins/Unity/Indicators/Messaging/qml/utils.js	2013-07-11 14:53:26 +0000
2492
@@ -0,0 +1,27 @@
2493
1
/*
2494
2
 * Copyright 2013 Canonical Ltd.
2495
3
 *
2496
4
 * This program is free software; you can redistribute it and/or modify
2497
5
 * it under the terms of the GNU Lesser General Public License as published by
2498
6
 * the Free Software Foundation; version 3.
2499
7
 *
2500
8
 * This program is distributed in the hope that it will be useful,
2501
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2502
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2503
11
 * GNU Lesser General Public License for more details.
2504
12
 *
2505
13
 * You should have received a copy of the GNU Lesser General Public License
2506
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2507
15
 *
2508
16
 * Authors:
2509
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
2510
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
2511
19
 */
2512
20
2513
21
.pragma library
2514
22
2515
23
function formatDate(timestamp) {
2516
24
    // timestamp is in microseconds since epoch
2517
25
    var date = new Date(timestamp / 1000);
2518
26
    return Qt.formatDateTime(date, "hh:mm - MMM dd");
2519
27
}
2520
0
28
2521
=== added directory 'plugins/Unity/Indicators/Network'
2522
=== added file 'plugins/Unity/Indicators/Network/CMakeLists.txt'
2523
--- plugins/Unity/Indicators/Network/CMakeLists.txt	1970-01-01 00:00:00 +0000
2524
+++ plugins/Unity/Indicators/Network/CMakeLists.txt	2013-07-11 14:53:26 +0000
2525
@@ -0,0 +1,42 @@
2526
1
project(IndicatorsNetworkQml)
2527
2
2528
3
pkg_check_modules(GLIB glib-2.0>=2.32)
2529
4
pkg_check_modules(LIBNM_GLIB libnm-glib>=0.9.6)
2530
5
pkg_check_modules(LIBNM_UTIL libnm-util>=0.9.6)
2531
6
2532
7
if(LIBNM_GLIB_FOUND AND LIBNM_UTIL_FOUND AND GLIB_FOUND)
2533
8
    set(INDICATORS_NETWORK_SRC
2534
9
        networkagent.cpp
2535
10
        plugin.cpp
2536
11
        secret-agent.c
2537
12
    )
2538
13
2539
14
    add_library(IndicatorsNetworkQml MODULE
2540
15
        ${INDICATORS_NETWORK_SRC}
2541
16
    )
2542
17
2543
18
    qt5_use_modules(IndicatorsNetworkQml Core Qml Widgets)
2544
19
2545
20
    set_target_properties(IndicatorsNetworkQml PROPERTIES COMPILE_FLAGS -fPIC)
2546
21
2547
22
    include_directories(
2548
23
        ${CMAKE_CURRENT_SOURCE_DIR}
2549
24
        ${GLIB_INCLUDE_DIRS}
2550
25
        ${LIBNM_GLIB_INCLUDE_DIRS}
2551
26
        ${LIBNM_UTIL_INCLUDE_DIRS}
2552
27
    )
2553
28
2554
29
    target_link_libraries(IndicatorsNetworkQml
2555
30
        ${GLIB_LIBRARIES}
2556
31
        ${LIBNM_GLIB_LIBRARIES}
2557
32
        ${LIBNM_UTIL_LIBRARIES}
2558
33
    )
2559
34
2560
35
    install(TARGETS IndicatorsNetworkQml
2561
36
        DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Network
2562
37
    )
2563
38
else()
2564
39
    message(WARNING "Missing glib or libnm dependency for the network plugin, not building")
2565
40
endif()
2566
41
2567
42
add_subdirectory(qml)
2568
0
43
2569
=== added file 'plugins/Unity/Indicators/Network/networkagent.cpp'
2570
--- plugins/Unity/Indicators/Network/networkagent.cpp	1970-01-01 00:00:00 +0000
2571
+++ plugins/Unity/Indicators/Network/networkagent.cpp	2013-07-11 14:53:26 +0000
2572
@@ -0,0 +1,146 @@
2573
1
/*
2574
2
 * Copyright 2013 Canonical Ltd.
2575
3
 *
2576
4
 * This program is free software; you can redistribute it and/or modify
2577
5
 * it under the terms of the GNU Lesser General Public License as published by
2578
6
 * the Free Software Foundation; version 3.
2579
7
 *
2580
8
 * This program is distributed in the hope that it will be useful,
2581
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2582
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2583
11
 * GNU Lesser General Public License for more details.
2584
12
 *
2585
13
 * You should have received a copy of the GNU Lesser General Public License
2586
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2587
15
 *
2588
16
 * Authors:
2589
17
 *     Alberto Ruiz <alberto.ruiz@canonical.com>
2590
18
 *     Renato Araujo Oliveira Filho <renato@canonical.com>
2591
19
 */
2592
20
2593
21
#include "networkagent.h"
2594
22
2595
23
#include <QVariant>
2596
24
#include <QApplication>
2597
25
#include <QDebug>
2598
26
2599
27
class NetworkAgentToken
2600
28
{
2601
29
public:
2602
30
    NMConnection *connection;
2603
31
    NMSettingWirelessSecurity *wisec;
2604
32
    guint id;
2605
33
    QByteArray keyMgmt;
2606
34
2607
35
    NetworkAgentToken(NMConnection *connection,
2608
36
                      NMSettingWirelessSecurity *wisec,
2609
37
                      guint id,
2610
38
                      QByteArray keyMgmt)
2611
39
        : connection(connection),
2612
40
          wisec(wisec),
2613
41
          id(id),
2614
42
          keyMgmt(keyMgmt)
2615
43
    {
2616
44
        if (connection) {
2617
45
            g_object_ref(connection);
2618
46
        } else {
2619
47
            qWarning() << "invalid connection object";
2620
48
        }
2621
49
    }
2622
50
2623
51
    ~NetworkAgentToken()
2624
52
    {
2625
53
        if (connection) {
2626
54
            g_object_unref(connection);
2627
55
        }
2628
56
    }
2629
57
};
2630
58
2631
59
NetworkAgent::NetworkAgent(QObject *parent)
2632
60
    : QObject(parent)
2633
61
{
2634
62
    m_agent = unity_settings_secret_agent_new();
2635
63
    g_signal_connect(G_OBJECT(m_agent),
2636
64
                     UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED,
2637
65
                     G_CALLBACK(onSecretRequested),
2638
66
                     this);
2639
67
2640
68
    g_signal_connect(G_OBJECT(m_agent),
2641
69
                     UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED,
2642
70
                     G_CALLBACK(onSecretRequestCancelled),
2643
71
                     this);
2644
72
}
2645
73
2646
74
NetworkAgent::~NetworkAgent()
2647
75
{
2648
76
    nm_secret_agent_unregister(NM_SECRET_AGENT(m_agent));
2649
77
    g_object_unref(m_agent);
2650
78
}
2651
79
2652
80
void NetworkAgent::authenticate(const QVariant &token, const QString &key)
2653
81
{
2654
82
    NetworkAgentToken *pToken = (NetworkAgentToken *) token.value<void *>();
2655
83
    if (pToken == NULL) {
2656
84
        return;
2657
85
    }
2658
86
2659
87
    if ((pToken->keyMgmt == "wpa-none") || (pToken->keyMgmt == "wpa-psk")) {
2660
88
        g_object_set(G_OBJECT(pToken->wisec),
2661
89
                     NM_SETTING_WIRELESS_SECURITY_PSK, qPrintable(key),
2662
90
                     NULL);
2663
91
    } else if (pToken->keyMgmt == "none") {
2664
92
        g_object_set(G_OBJECT(pToken->wisec),
2665
93
                     NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, qPrintable(key),
2666
94
                     NULL);
2667
95
    }
2668
96
2669
97
    GHashTable *settings = nm_connection_to_hash(pToken->connection,
2670
98
                                                 NM_SETTING_HASH_FLAG_ALL);
2671
99
2672
100
    unity_settings_secret_agent_provide_secret(m_agent,
2673
101
                                               pToken->id, settings);
2674
102
    g_hash_table_unref(settings);
2675
103
    delete pToken;
2676
104
}
2677
105
2678
106
void NetworkAgent::cancel(const QVariant &token)
2679
107
{
2680
108
    NetworkAgentToken *pToken = (NetworkAgentToken *) token.value<void *>();
2681
109
    if (pToken != NULL) {
2682
110
        unity_settings_secret_agent_cancel_request(m_agent, pToken->id);
2683
111
        delete pToken;
2684
112
    }
2685
113
}
2686
114
2687
115
void NetworkAgent::onSecretRequested(UnitySettingsSecretAgent* /*agent*/,
2688
116
                                     guint         id,
2689
117
                                     NMConnection* connection,
2690
118
                                     const char* /*setting_name*/,
2691
119
                                     const char** /*hints*/,
2692
120
                                     NMSecretAgentGetSecretsFlags /*flags*/,
2693
121
                                     NetworkAgent* self)
2694
122
{
2695
123
    NetworkAgentToken *token = new NetworkAgentToken(connection,
2696
124
                                                     NULL,
2697
125
                                                     id,
2698
126
                                                     NULL);
2699
127
2700
128
    token->wisec = nm_connection_get_setting_wireless_security(connection);
2701
129
    if (token->wisec) {
2702
130
        token->keyMgmt = nm_setting_wireless_security_get_key_mgmt(token->wisec);
2703
131
    }
2704
132
2705
133
    QVariant varToken = qVariantFromValue((void *) token);
2706
134
    Q_EMIT self->secretRequested(varToken);
2707
135
}
2708
136
2709
137
void NetworkAgent::onSecretRequestCancelled(UnitySettingsSecretAgent* /*agent*/,
2710
138
                                            guint         /*id*/,
2711
139
                                            NMConnection* /*connection*/,
2712
140
                                            const char* /*setting_name*/,
2713
141
                                            const char** /*hints*/,
2714
142
                                            NMSecretAgentGetSecretsFlags /*flags*/,
2715
143
                                            NetworkAgent* /*self*/)
2716
144
{
2717
145
    //Do nothing for now
2718
146
}
2719
0
147
2720
=== added file 'plugins/Unity/Indicators/Network/networkagent.h'
2721
--- plugins/Unity/Indicators/Network/networkagent.h	1970-01-01 00:00:00 +0000
2722
+++ plugins/Unity/Indicators/Network/networkagent.h	2013-07-11 14:53:26 +0000
2723
@@ -0,0 +1,65 @@
2724
1
/*
2725
2
 * Copyright 2013 Canonical Ltd.
2726
3
 *
2727
4
 * This program is free software; you can redistribute it and/or modify
2728
5
 * it under the terms of the GNU Lesser General Public License as published by
2729
6
 * the Free Software Foundation; version 3.
2730
7
 *
2731
8
 * This program is distributed in the hope that it will be useful,
2732
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2733
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2734
11
 * GNU Lesser General Public License for more details.
2735
12
 *
2736
13
 * You should have received a copy of the GNU Lesser General Public License
2737
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2738
15
 *
2739
16
 * Authors:
2740
17
 *     Alberto Ruiz <alberto.ruiz@canonical.com>
2741
18
 *     Renato Araujo Oliveira Filho <renato@canonical.com>
2742
19
 */
2743
20
2744
21
#ifndef NETWORKAGENT_H
2745
22
#define NETWORKAGENT_H
2746
23
2747
24
#include "secret-agent.h"
2748
25
2749
26
#include <QObject>
2750
27
2751
28
class NetworkAgentToken;
2752
29
2753
30
class NetworkAgent : public QObject
2754
31
{
2755
32
    Q_OBJECT
2756
33
public:
2757
34
    NetworkAgent(QObject *parent=0);
2758
35
    ~NetworkAgent();
2759
36
2760
37
    Q_INVOKABLE void authenticate(const QVariant &token, const QString &key);
2761
38
    Q_INVOKABLE void cancel(const QVariant &token);
2762
39
2763
40
Q_SIGNALS:
2764
41
    void secretRequested(const QVariant &token);
2765
42
    void secretRequestCancelled();
2766
43
2767
44
private:
2768
45
    UnitySettingsSecretAgent *m_agent;
2769
46
2770
47
    static void onSecretRequested(UnitySettingsSecretAgent *agent,
2771
48
                                  guint   id,
2772
49
                                  NMConnection *connection,
2773
50
                                  const char *setting_name,
2774
51
                                  const char **hints,
2775
52
                                  NMSecretAgentGetSecretsFlags flags,
2776
53
                                  NetworkAgent *self);
2777
54
2778
55
    static void onSecretRequestCancelled(UnitySettingsSecretAgent *agent,
2779
56
                                         guint          id,
2780
57
                                         NMConnection *connection,
2781
58
                                         const char *setting_name,
2782
59
                                         const char **hints,
2783
60
                                         NMSecretAgentGetSecretsFlags flags,
2784
61
                                         NetworkAgent *self);
2785
62
2786
63
};
2787
64
2788
65
#endif
2789
0
66
2790
=== added file 'plugins/Unity/Indicators/Network/plugin.cpp'
2791
--- plugins/Unity/Indicators/Network/plugin.cpp	1970-01-01 00:00:00 +0000
2792
+++ plugins/Unity/Indicators/Network/plugin.cpp	2013-07-11 14:53:26 +0000
2793
@@ -0,0 +1,31 @@
2794
1
/*
2795
2
 * Copyright (C) 2012 Canonical, Ltd.
2796
3
 *
2797
4
 * This program is free software; you can redistribute it and/or modify
2798
5
 * it under the terms of the GNU General Public License as published by
2799
6
 * the Free Software Foundation; version 3.
2800
7
 *
2801
8
 * This program is distributed in the hope that it will be useful,
2802
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2803
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2804
11
 * GNU General Public License for more details.
2805
12
 *
2806
13
 * You should have received a copy of the GNU General Public License
2807
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2808
15
 *
2809
16
 * Author: Nick Dedekind <nick.dedekind@canonical.com>
2810
17
 */
2811
18
2812
19
// Qt
2813
20
#include <QtQml>
2814
21
2815
22
// self
2816
23
#include "plugin.h"
2817
24
2818
25
// local
2819
26
#include "networkagent.h"
2820
27
2821
28
void IndicatorsNetworkPlugin::registerTypes(const char *uri)
2822
29
{
2823
30
    qmlRegisterType<NetworkAgent>(uri, 0, 1, "NetworkAgent");
2824
31
}
2825
0
32
2826
=== added file 'plugins/Unity/Indicators/Network/plugin.h'
2827
--- plugins/Unity/Indicators/Network/plugin.h	1970-01-01 00:00:00 +0000
2828
+++ plugins/Unity/Indicators/Network/plugin.h	2013-07-11 14:53:26 +0000
2829
@@ -0,0 +1,32 @@
2830
1
/*
2831
2
 * Copyright (C) 2012 Canonical, Ltd.
2832
3
 *
2833
4
 * This program is free software; you can redistribute it and/or modify
2834
5
 * it under the terms of the GNU General Public License as published by
2835
6
 * the Free Software Foundation; version 3.
2836
7
 *
2837
8
 * This program is distributed in the hope that it will be useful,
2838
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2839
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2840
11
 * GNU General Public License for more details.
2841
12
 *
2842
13
 * You should have received a copy of the GNU General Public License
2843
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2844
15
 *
2845
16
 * Author: Nick Dedekind <nick.dedekind@canonical.com>
2846
17
 */
2847
18
2848
19
#ifndef INDICATORS_NETWORK_PLUGIN_H
2849
20
#define INDICATORS_NETWORK_PLUGIN_H
2850
21
2851
22
#include <QtQml/QQmlExtensionPlugin>
2852
23
2853
24
class IndicatorsNetworkPlugin : public QQmlExtensionPlugin
2854
25
{
2855
26
    Q_OBJECT
2856
27
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2857
28
public:
2858
29
    void registerTypes(const char *uri);
2859
30
};
2860
31
2861
32
#endif // INDICATORS_NETWORK_PLUGIN_H
2862
0
33
2863
=== added directory 'plugins/Unity/Indicators/Network/qml'
2864
=== added file 'plugins/Unity/Indicators/Network/qml/AccessPoint.qml'
2865
--- plugins/Unity/Indicators/Network/qml/AccessPoint.qml	1970-01-01 00:00:00 +0000
2866
+++ plugins/Unity/Indicators/Network/qml/AccessPoint.qml	2013-07-11 14:53:26 +0000
2867
@@ -0,0 +1,68 @@
2868
1
/*
2869
2
 * Copyright 2013 Canonical Ltd.
2870
3
 *
2871
4
 * This program is free software; you can redistribute it and/or modify
2872
5
 * it under the terms of the GNU Lesser General Public License as published by
2873
6
 * the Free Software Foundation; version 3.
2874
7
 *
2875
8
 * This program is distributed in the hope that it will be useful,
2876
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2877
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2878
11
 * GNU Lesser General Public License for more details.
2879
12
 *
2880
13
 * You should have received a copy of the GNU Lesser General Public License
2881
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2882
15
 *
2883
16
 * Authors:
2884
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
2885
18
 */
2886
19
2887
20
import QtQuick 2.0
2888
21
import Ubuntu.Components 0.1
2889
22
import Ubuntu.Components.ListItems 0.1 as ListItem
2890
23
import Unity.Indicators 0.1 as Indicators
2891
24
2892
25
Indicators.MenuItem {
2893
26
    id: accessPoint
2894
27
    property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
2895
28
    property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
2896
29
2897
30
    function getNetworkIcon(data) {
2898
31
        var imageName = "nm-signal-100"
2899
32
        var signalStrength = parseInt(wifiApStrength)
2900
33
2901
34
        if (data.extra.canonical_wifi_ap_is_adhoc) {
2902
35
            imageName = "nm-adhoc";
2903
36
        } else if (signalStrength == 0) {
2904
37
            imageName = "nm-signal-00";
2905
38
        } else if (signalStrength <= 25) {
2906
39
            imageName = "nm-signal-25";
2907
40
        } else if (signalStrength <= 50) {
2908
41
            imageName = "nm-signal-50";
2909
42
        } else if (signalStrength <= 75) {
2910
43
            imageName = "nm-signal-75";
2911
44
        }
2912
45
2913
46
        if (data.extra.canonical_wifi_ap_is_secure) {
2914
47
            imageName += "-secure";
2915
48
        }
2916
49
2917
50
        return "image://gicon/" + imageName;
2918
51
    }
2919
52
2920
53
    icon: menu && wifiApStrength ? getNetworkIcon(menu) : "image://gicon/wifi-none"
2921
54
    iconFrame: false
2922
55
    control: CheckBox {
2923
56
        id: checkBoxActive
2924
57
        height: units.gu(4)
2925
58
        width: units.gu(4)
2926
59
        anchors.centerIn: parent
2927
60
    }
2928
61
2929
62
    Indicators.MenuActionBinding {
2930
63
        actionGroup: accessPoint.actionGroup
2931
64
        action: menu ? menu.action : ""
2932
65
        target: checkBoxActive
2933
66
        property: "checked"
2934
67
    }
2935
68
}
2936
0
69
2937
=== added file 'plugins/Unity/Indicators/Network/qml/CMakeLists.txt'
2938
--- plugins/Unity/Indicators/Network/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
2939
+++ plugins/Unity/Indicators/Network/qml/CMakeLists.txt	2013-07-11 14:53:26 +0000
2940
@@ -0,0 +1,15 @@
2941
1
file(GLOB IndicatorsNetwork_QMLFILES
2942
2
    *.qml
2943
3
    *.js
2944
4
    qmldir
2945
5
)
2946
6
2947
7
# copy qml & qmldir files into build directory for shadow builds
2948
8
add_custom_target(UnityIndicatorsNetworkQmlFiles ALL
2949
9
    COMMAND cp ${IndicatorsNetwork_QMLFILES} ${CMAKE_BINARY_DIR}/plugins/Unity/Indicators/Network
2950
10
    DEPENDS ${IndicatorsNetwork_QMLFILES}
2951
11
)
2952
12
2953
13
install(FILES ${IndicatorsNetwork_QMLFILES}
2954
14
        DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Network
2955
15
)
2956
0
16
2957
=== added file 'plugins/Unity/Indicators/Network/qml/PasswordPage.qml'
2958
--- plugins/Unity/Indicators/Network/qml/PasswordPage.qml	1970-01-01 00:00:00 +0000
2959
+++ plugins/Unity/Indicators/Network/qml/PasswordPage.qml	2013-07-11 14:53:26 +0000
2960
@@ -0,0 +1,88 @@
2961
1
/*
2962
2
 * Copyright 2013 Canonical Ltd.
2963
3
 *
2964
4
 * This program is free software; you can redistribute it and/or modify
2965
5
 * it under the terms of the GNU Lesser General Public License as published by
2966
6
 * the Free Software Foundation; version 3.
2967
7
 *
2968
8
 * This program is distributed in the hope that it will be useful,
2969
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2970
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2971
11
 * GNU Lesser General Public License for more details.
2972
12
 *
2973
13
 * You should have received a copy of the GNU Lesser General Public License
2974
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2975
15
 *
2976
16
 * Authors:
2977
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
2978
18
 */
2979
19
2980
20
import QtQuick 2.0
2981
21
import Ubuntu.Components 0.1
2982
22
import Ubuntu.Components.ListItems 0.1 as ListItem
2983
23
import Unity.Indicators 0.1 as Indicators
2984
24
2985
25
Page {
2986
26
    id: pagePassword
2987
27
2988
28
    property variant agent
2989
29
    property variant token
2990
30
2991
31
    anchors.fill: parent
2992
32
    title: "Network Authentication"
2993
33
2994
34
    Column {
2995
35
        anchors {
2996
36
            left: parent.left
2997
37
            right: parent.right
2998
38
        }
2999
39
3000
40
        Indicators.SectionMenuItem {
3001
41
            label: "Authentication"
3002
42
        }
3003
43
3004
44
        Indicators.MenuItem {
3005
45
            implicitHeight: password.height + units.gu(1)
3006
46
3007
47
            PasswordTextField {
3008
48
                id: password
3009
49
                anchors {
3010
50
                    left: parent.left
3011
51
                    right: parent.right
3012
52
                    margins: units.gu(3)
3013
53
                    verticalCenter: parent.verticalCenter
3014
54
                }
3015
55
            }
3016
56
        }
3017
57
3018
58
        Indicators.MenuItem {
3019
59
            Row {
3020
60
                anchors {
3021
61
                    right: parent.right
3022
62
                    verticalCenter: parent.verticalCenter
3023
63
                    margins: units.gu(3)
3024
64
                }
3025
65
3026
66
                spacing: units.gu(1)
3027
67
3028
68
                Button {
3029
69
                    text: "Cancel"
3030
70
                    width: units.gu(10)
3031
71
                    onClicked: {
3032
72
                        agent.cancel(token);
3033
73
                        pageStack.pop();
3034
74
                    }
3035
75
                }
3036
76
3037
77
                Button {
3038
78
                    text: "Ok"
3039
79
                    width: units.gu(10)
3040
80
                    onClicked: {
3041
81
                        agent.authenticate(token, password.text);
3042
82
                        pageStack.pop();
3043
83
                    }
3044
84
                }
3045
85
            }
3046
86
        }
3047
87
    }
3048
88
}
3049
0
89
3050
=== added file 'plugins/Unity/Indicators/Network/qml/PasswordTextField.qml'
3051
--- plugins/Unity/Indicators/Network/qml/PasswordTextField.qml	1970-01-01 00:00:00 +0000
3052
+++ plugins/Unity/Indicators/Network/qml/PasswordTextField.qml	2013-07-11 14:53:26 +0000
3053
@@ -0,0 +1,68 @@
3054
1
/*
3055
2
 * Copyright 2013 Canonical Ltd.
3056
3
 *
3057
4
 * This program is free software; you can redistribute it and/or modify
3058
5
 * it under the terms of the GNU Lesser General Public License as published by
3059
6
 * the Free Software Foundation; version 3.
3060
7
 *
3061
8
 * This program is distributed in the hope that it will be useful,
3062
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3063
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3064
11
 * GNU Lesser General Public License for more details.
3065
12
 *
3066
13
 * You should have received a copy of the GNU Lesser General Public License
3067
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3068
15
 *
3069
16
 * Authors:
3070
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
3071
18
 */
3072
19
3073
20
import QtQuick 2.0
3074
21
import Ubuntu.Components 0.1
3075
22
3076
23
Item {
3077
24
    id: textMenu
3078
25
3079
26
    property alias text: textField.text
3080
27
3081
28
    height: contentColumn.height
3082
29
3083
30
    Column {
3084
31
        id: contentColumn
3085
32
        spacing: units.gu(0.5)
3086
33
        anchors {
3087
34
            left: parent.left
3088
35
            right: parent.right
3089
36
        }
3090
37
3091
38
        TextField {
3092
39
            id: textField
3093
40
3094
41
            anchors {
3095
42
                left: parent.left
3096
43
                right: parent.right
3097
44
            }
3098
45
3099
46
            placeholderText: "Password"
3100
47
            echoMode: showPassword.checked ? TextInput.Normal : TextInput.Password
3101
48
        }
3102
49
3103
50
        Row {
3104
51
            anchors {
3105
52
                left: parent.left
3106
53
                right: parent.right
3107
54
            }
3108
55
3109
56
            spacing: units.gu(1)
3110
57
3111
58
            CheckBox {
3112
59
                id: showPassword
3113
60
            }
3114
61
3115
62
            Label {
3116
63
                text: "Show password"
3117
64
                anchors.verticalCenter: showPassword.verticalCenter
3118
65
            }
3119
66
        }
3120
67
    }
3121
68
}
3122
0
69
3123
=== added file 'plugins/Unity/Indicators/Network/qml/WifiSection.qml'
3124
--- plugins/Unity/Indicators/Network/qml/WifiSection.qml	1970-01-01 00:00:00 +0000
3125
+++ plugins/Unity/Indicators/Network/qml/WifiSection.qml	2013-07-11 14:53:26 +0000
3126
@@ -0,0 +1,34 @@
3127
1
/*
3128
2
 * Copyright 2013 Canonical Ltd.
3129
3
 *
3130
4
 * This program is free software; you can redistribute it and/or modify
3131
5
 * it under the terms of the GNU Lesser General Public License as published by
3132
6
 * the Free Software Foundation; version 3.
3133
7
 *
3134
8
 * This program is distributed in the hope that it will be useful,
3135
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3136
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3137
11
 * GNU Lesser General Public License for more details.
3138
12
 *
3139
13
 * You should have received a copy of the GNU Lesser General Public License
3140
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3141
15
 *
3142
16
 * Authors:
3143
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
3144
18
 */
3145
19
3146
20
import QtQuick 2.0
3147
21
import Ubuntu.Components 0.1
3148
22
import Unity.Indicators 0.1 as Indicators
3149
23
3150
24
Indicators.SectionMenuItem {
3151
25
    id: wifiSectionMenu
3152
26
3153
27
    Indicators.MenuAction {
3154
28
        id: busyAction
3155
29
        actionGroup: wifiSectionMenu.actionGroup
3156
30
        action: menu ? menu.extra.canonical_busy_action : ""
3157
31
    }
3158
32
3159
33
    busy: busyAction.valid ? busyAction.state : false
3160
34
}
3161
0
35
3162
=== added file 'plugins/Unity/Indicators/Network/qml/qmldir'
3163
--- plugins/Unity/Indicators/Network/qml/qmldir	1970-01-01 00:00:00 +0000
3164
+++ plugins/Unity/Indicators/Network/qml/qmldir	2013-07-11 14:53:26 +0000
3165
@@ -0,0 +1,8 @@
3166
1
module Unity.Indicators.Network
3167
2
plugin IndicatorsNetworkQml
3168
3
3169
4
NetworkPage 0.1 NetworkPage.qml
3170
5
AccessPoint 0.1 AccessPoint.qml
3171
6
PasswordPage 0.1 PasswordPage.qml
3172
7
PasswordTextField 0.1 PasswordTextField.qml
3173
8
WifiSection 0.1 WifiSection.qml
3174
0
\ No newline at end of file
9
\ No newline at end of file
3175
1
10
3176
=== added file 'plugins/Unity/Indicators/Network/secret-agent.c'
3177
--- plugins/Unity/Indicators/Network/secret-agent.c	1970-01-01 00:00:00 +0000
3178
+++ plugins/Unity/Indicators/Network/secret-agent.c	2013-07-11 14:53:26 +0000
3179
@@ -0,0 +1,382 @@
3180
1
/*
3181
2
 * Copyright 2013 Canonical Ltd.
3182
3
 *
3183
4
 * This program is free software; you can redistribute it and/or modify
3184
5
 * it under the terms of the GNU Lesser General Public License as published by
3185
6
 * the Free Software Foundation; version 3.
3186
7
 *
3187
8
 * This program is distributed in the hope that it will be useful,
3188
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3189
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3190
11
 * GNU Lesser General Public License for more details.
3191
12
 *
3192
13
 * You should have received a copy of the GNU Lesser General Public License
3193
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3194
15
 *
3195
16
 * Authors:
3196
17
 *     Alberto Ruiz <alberto.ruiz@canonical.com>
3197
18
 *     Renato Araujo Oliveira Filho <renato@canonical.com>
3198
19
 */
3199
20
3200
21
3201
22
#include <glib.h>
3202
23
#include <glib-object.h>
3203
24
#include <nm-secret-agent.h>
3204
25
#include "secret-agent.h"
3205
26
3206
27
#define UNITY_SETTINGS_TYPE_SECRET_AGENT (unity_settings_secret_agent_get_type ())
3207
28
#define UNITY_SETTINGS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgent))
3208
29
#define UNITY_SETTINGS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
3209
30
#define UNITY_SETTINGS_IS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT))
3210
31
#define UNITY_SETTINGS_IS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT))
3211
32
#define UNITY_SETTINGS_SECRET_AGENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
3212
33
#define UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentPrivate))
3213
34
3214
35
#define AGENT_ID "com.canonical.settings.network.nm-agent"
3215
36
3216
37
static gpointer unity_settings_secret_agent_parent_class = NULL;
3217
38
3218
39
typedef struct _UnitySettingsSecretAgentPrivate UnitySettingsSecretAgentPrivate;
3219
40
3220
41
struct _UnitySettingsSecretAgentPrivate {
3221
42
  GQueue  *requests;
3222
43
};
3223
44
3224
45
typedef struct _SecretRequest {
3225
46
  gint                           id;
3226
47
  NMSecretAgent                 *agent;
3227
48
  NMConnection                  *connection;
3228
49
  const char                    *connection_path;
3229
50
  const char                    *setting_name;
3230
51
  const char                   **hints;
3231
52
  NMSecretAgentGetSecretsFlags   flags;
3232
53
  NMSecretAgentGetSecretsFunc    callback;
3233
54
  gpointer                       callback_data;
3234
55
} SecretRequest;
3235
56
3236
57
GType unity_settings_secret_agent_get_type (void) G_GNUC_CONST;
3237
58
enum  {
3238
59
    UNITY_SETTINGS_SECRET_AGENT_DUMMY_PROPERTY
3239
60
};
3240
61
3241
62
enum {
3242
63
  SECRET_REQUESTED,
3243
64
  REQUEST_CANCELLED,
3244
65
  LAST_SIGNAL
3245
66
};
3246
67
3247
68
static guint signals[LAST_SIGNAL] = { 0 };
3248
69
3249
70
UnitySettingsSecretAgent* unity_settings_secret_agent_new       (void);
3250
71
UnitySettingsSecretAgent* unity_settings_secret_agent_construct (GType object_type);
3251
72
3252
73
int
3253
74
secret_request_find (SecretRequest  *req,
3254
75
                     guint          *id)
3255
76
{
3256
77
  if (req->id > *id)
3257
78
      return -1;
3258
79
3259
80
  if (req->id < *id)
3260
81
      return 1;
3261
82
3262
83
  return 0;
3263
84
}
3264
85
3265
86
void
3266
87
unity_settings_secret_agent_provide_secret (UnitySettingsSecretAgent *agent,
3267
88
                                            guint                     request,
3268
89
                                            GHashTable               *secrets)
3269
90
{
3270
91
  GList                           *iter;
3271
92
  SecretRequest                   *req;
3272
93
  UnitySettingsSecretAgentPrivate *priv = agent->priv;
3273
94
3274
95
  iter = g_queue_find_custom (priv->requests,
3275
96
                              &request,
3276
97
                              (GCompareFunc)secret_request_find);
3277
98
3278
99
  if (iter == NULL || iter->data == NULL)
3279
100
    {
3280
101
      g_warning ("Secret request with id <%d> was not found", (int)request);
3281
102
      return;
3282
103
    }
3283
104
3284
105
  req = iter->data;
3285
106
3286
107
  req->callback (NM_SECRET_AGENT (agent),
3287
108
                 req->connection,
3288
109
                 secrets,
3289
110
                 NULL,
3290
111
                 req->callback_data);
3291
112
3292
113
  g_queue_remove_all (priv->requests, req);
3293
114
  g_free (req);
3294
115
  return;
3295
116
}
3296
117
3297
118
void
3298
119
free_request (SecretRequest *req)
3299
120
{
3300
121
  g_object_unref (req->connection);
3301
122
  g_free (req);
3302
123
}
3303
124
3304
125
void
3305
126
unity_settings_secret_agent_cancel_request (UnitySettingsSecretAgent *agent,
3306
127
                                            guint                     request)
3307
128
{
3308
129
  GList                           *iter;
3309
130
  SecretRequest                   *req;
3310
131
  UnitySettingsSecretAgentPrivate *priv = agent->priv;
3311
132
  GError *error;
3312
133
3313
134
  iter = g_queue_find_custom (priv->requests,
3314
135
                              &request,
3315
136
                              (GCompareFunc)secret_request_find);
3316
137
3317
138
  if (iter == NULL || iter->data == NULL)
3318
139
    {
3319
140
      g_warning ("Secret request with id <%d> was not found", (int)request);
3320
141
      return;
3321
142
    }
3322
143
3323
144
  req = iter->data;
3324
145
  error = g_error_new (NM_SECRET_AGENT_ERROR,
3325
146
                       NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
3326
147
                       "This secret request was canceled by the user.");
3327
148
3328
149
  req->callback (NM_SECRET_AGENT (agent),
3329
150
                 req->connection,
3330
151
                 NULL,
3331
152
                 error,
3332
153
                 req->callback_data);
3333
154
3334
155
  g_queue_remove_all (priv->requests, req);
3335
156
  free_request (req);
3336
157
  return;
3337
158
}
3338
159
3339
160
static void
3340
161
delete_secrets (NMSecretAgent *agent,
3341
162
                NMConnection *connection,
3342
163
                const char *connection_path,
3343
164
                NMSecretAgentDeleteSecretsFunc callback,
3344
165
                gpointer callback_data)
3345
166
{
3346
167
  g_debug ("delete secrets");
3347
168
}
3348
169
3349
170
/* If it returns G_MAXUINT it's considered an error */
3350
171
static guint
3351
172
find_available_id (UnitySettingsSecretAgentPrivate *priv)
3352
173
{
3353
174
  guint i         = 0;
3354
175
  guint candidate = 0;
3355
176
3356
177
  if (g_queue_get_length (priv->requests) == G_MAXUINT)
3357
178
    return G_MAXUINT;
3358
179
3359
180
  while (i < g_queue_get_length (priv->requests))
3360
181
    {
3361
182
      SecretRequest *req = (SecretRequest*)g_queue_peek_nth (priv->requests, i);
3362
183
3363
184
      if (req->id == candidate)
3364
185
      {
3365
186
        candidate++;
3366
187
        i = 0;
3367
188
      }
3368
189
      else
3369
190
      {
3370
191
        i++;
3371
192
      }
3372
193
    }
3373
194
3374
195
  return i;
3375
196
}
3376
197
3377
198
static void
3378
199
get_secrets (NMSecretAgent                 *agent,
3379
200
             NMConnection                  *connection,
3380
201
             const char                    *connection_path,
3381
202
             const char                    *setting_name,
3382
203
             const char                   **hints,
3383
204
             NMSecretAgentGetSecretsFlags   flags,
3384
205
             NMSecretAgentGetSecretsFunc    callback,
3385
206
             gpointer                       callback_data)
3386
207
{
3387
208
  guint   id;
3388
209
  UnitySettingsSecretAgentPrivate *priv = UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE (agent);
3389
210
  SecretRequest *req = NULL;
3390
211
3391
212
  if (flags == NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE)
3392
213
    {
3393
214
      GError *error = g_error_new (NM_SECRET_AGENT_ERROR,
3394
215
                                   NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
3395
216
                                   "No password found for this connection.");
3396
217
      callback (agent, connection, NULL, error, callback_data);
3397
218
      g_error_free (error);
3398
219
      return;
3399
220
    }
3400
221
3401
222
  id = find_available_id (priv);
3402
223
  if (id == G_MAXUINT)
3403
224
    {
3404
225
      GError *error = g_error_new (NM_SECRET_AGENT_ERROR,
3405
226
                                   NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
3406
227
                                   "Reached maximum number of requests.");
3407
228
      callback (agent, connection, NULL, error, callback_data);
3408
229
      g_error_free (error);
3409
230
      return;
3410
231
    }
3411
232
3412
233
  /* Adding a request */
3413
234
  req = (SecretRequest*) g_malloc0 (sizeof (SecretRequest));
3414
235
  *req = ((SecretRequest)
3415
236
          { id,
3416
237
            agent,
3417
238
            connection,
3418
239
            connection_path,
3419
240
            setting_name,
3420
241
            hints,
3421
242
            flags,
3422
243
            callback,
3423
244
            callback_data });
3424
245
3425
246
  g_object_ref (connection);
3426
247
3427
248
  g_queue_push_tail (priv->requests, req);
3428
249
3429
250
  g_signal_emit_by_name (agent,
3430
251
                         UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED,
3431
252
                         id,
3432
253
                         connection,
3433
254
                         setting_name,
3434
255
                         hints,
3435
256
                         flags);
3436
257
}
3437
258
3438
259
static void
3439
260
save_secrets (NMSecretAgent                *agent,
3440
261
              NMConnection                 *connection,
3441
262
              const char                   *connection_path,
3442
263
              NMSecretAgentSaveSecretsFunc  callback,
3443
264
              gpointer                      callback_data)
3444
265
{
3445
266
  g_debug ("save secrets");
3446
267
}
3447
268
3448
269
static void
3449
270
cancel_get_secrets (NMSecretAgent *agent,
3450
271
                    const char *connection_path,
3451
272
                    const char *setting_name)
3452
273
{
3453
274
  g_debug ("cancel get secrets");
3454
275
}
3455
276
3456
277
UnitySettingsSecretAgent*
3457
278
unity_settings_secret_agent_construct (GType object_type)
3458
279
{
3459
280
  UnitySettingsSecretAgent * self = NULL;
3460
281
  self = (UnitySettingsSecretAgent*) g_object_new (object_type,
3461
282
                                                   NM_SECRET_AGENT_IDENTIFIER, AGENT_ID,
3462
283
                                                   NULL);
3463
284
  return self;
3464
285
}
3465
286
3466
287
3467
288
UnitySettingsSecretAgent*
3468
289
unity_settings_secret_agent_new (void)
3469
290
{
3470
291
  return unity_settings_secret_agent_construct (UNITY_SETTINGS_TYPE_SECRET_AGENT);
3471
292
}
3472
293
3473
294
static void
3474
295
destroy_pending_request (gpointer data)
3475
296
{
3476
297
  SecretRequest* req = (SecretRequest*)data;
3477
298
  /* Reporting the cancellation of all pending requests */
3478
299
  g_signal_emit_by_name (req->agent,
3479
300
                         UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED,
3480
301
                         req->id);
3481
302
3482
303
  free_request (req);
3483
304
}
3484
305
3485
306
static void
3486
307
unity_settings_secret_agent_finalize (GObject *agent)
3487
308
{
3488
309
  UnitySettingsSecretAgentPrivate *priv = UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE (agent);
3489
310
3490
311
  g_queue_free_full (priv->requests, destroy_pending_request);
3491
312
}
3492
313
3493
314
static void
3494
315
unity_settings_secret_agent_class_init (UnitySettingsSecretAgentClass *klass)
3495
316
{
3496
317
  unity_settings_secret_agent_parent_class = g_type_class_peek_parent (klass);
3497
318
  NMSecretAgentClass         *parent_class = NM_SECRET_AGENT_CLASS (klass);
3498
319
  parent_class->get_secrets = get_secrets;
3499
320
  parent_class->save_secrets = save_secrets;
3500
321
  parent_class->delete_secrets = delete_secrets;
3501
322
  parent_class->cancel_get_secrets = cancel_get_secrets;
3502
323
3503
324
  g_type_class_add_private (klass, sizeof(UnitySettingsSecretAgentPrivate));
3504
325
  G_OBJECT_CLASS (klass)->finalize = unity_settings_secret_agent_finalize;
3505
326
3506
327
3507
328
  signals[SECRET_REQUESTED] = g_signal_new (UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED,
3508
329
                                            G_OBJECT_CLASS_TYPE (G_OBJECT_CLASS (klass)),
3509
330
                                            G_SIGNAL_RUN_FIRST,
3510
331
                                            G_STRUCT_OFFSET (UnitySettingsSecretAgentClass, secret_requested),
3511
332
                                            NULL, NULL, NULL,
3512
333
                                            G_TYPE_NONE, 5,
3513
334
                                            G_TYPE_UINT, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_UINT);
3514
335
3515
336
  signals[REQUEST_CANCELLED] = g_signal_new (UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED,
3516
337
                                             G_OBJECT_CLASS_TYPE (G_OBJECT_CLASS (klass)),
3517
338
                                             G_SIGNAL_RUN_FIRST,
3518
339
                                             G_STRUCT_OFFSET (UnitySettingsSecretAgentClass, request_cancelled),
3519
340
                                             NULL, NULL, NULL,
3520
341
                                             G_TYPE_NONE, 1,
3521
342
                                             G_TYPE_UINT);
3522
343
}
3523
344
3524
345
3525
346
static void
3526
347
unity_settings_secret_agent_instance_init (UnitySettingsSecretAgent *self)
3527
348
{
3528
349
  self->priv = UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE (self);
3529
350
  self->priv->requests = g_queue_new ();
3530
351
}
3531
352
3532
353
GType
3533
354
unity_settings_secret_agent_get_type (void)
3534
355
{
3535
356
  static volatile gsize unity_settings_secret_agent_type_id__volatile = 0;
3536
357
  if (g_once_init_enter (&unity_settings_secret_agent_type_id__volatile))
3537
358
    {
3538
359
      static const GTypeInfo g_define_type_info =
3539
360
        {
3540
361
          sizeof (UnitySettingsSecretAgentClass),
3541
362
          (GBaseInitFunc) NULL,
3542
363
          (GBaseFinalizeFunc) NULL,
3543
364
          (GClassInitFunc) unity_settings_secret_agent_class_init,
3544
365
          (GClassFinalizeFunc) NULL,
3545
366
          NULL,
3546
367
          sizeof (UnitySettingsSecretAgent),
3547
368
          0,
3548
369
          (GInstanceInitFunc) unity_settings_secret_agent_instance_init,
3549
370
          NULL
3550
371
        };
3551
372
      GType unity_settings_secret_agent_type_id;
3552
373
      unity_settings_secret_agent_type_id = g_type_register_static (NM_TYPE_SECRET_AGENT,
3553
374
                                                                    "UnitySettingsSecretAgent",
3554
375
                                                                    &g_define_type_info,
3555
376
                                                                    0);
3556
377
      g_once_init_leave (&unity_settings_secret_agent_type_id__volatile,
3557
378
                         unity_settings_secret_agent_type_id);
3558
379
    }
3559
380
3560
381
  return unity_settings_secret_agent_type_id__volatile;
3561
382
}
3562
0
383
3563
=== added file 'plugins/Unity/Indicators/Network/secret-agent.h'
3564
--- plugins/Unity/Indicators/Network/secret-agent.h	1970-01-01 00:00:00 +0000
3565
+++ plugins/Unity/Indicators/Network/secret-agent.h	2013-07-11 14:53:26 +0000
3566
@@ -0,0 +1,102 @@
3567
1
/*
3568
2
 * Copyright 2013 Canonical Ltd.
3569
3
 *
3570
4
 * This program is free software; you can redistribute it and/or modify
3571
5
 * it under the terms of the GNU Lesser General Public License as published by
3572
6
 * the Free Software Foundation; version 3.
3573
7
 *
3574
8
 * This program is distributed in the hope that it will be useful,
3575
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3576
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3577
11
 * GNU Lesser General Public License for more details.
3578
12
 *
3579
13
 * You should have received a copy of the GNU Lesser General Public License
3580
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3581
15
 *
3582
16
 * Authors:
3583
17
 *     Alberto Ruiz <alberto.ruiz@canonical.com>
3584
18
 *     Renato Araujo Oliveira Filho <renato@canonical.com>
3585
19
 */
3586
20
3587
21
#ifndef __SECRET_AGENT_H__
3588
22
#define __SECRET_AGENT_H__
3589
23
3590
24
#include <glib.h>
3591
25
#include <glib-object.h>
3592
26
#include <nm-secret-agent.h>
3593
27
3594
28
/*
3595
29
 * This class is a basic implementation of the NetworkManager SecretAgent base class.
3596
30
 *
3597
31
 * The purpose of this class is to handle credential requests from the network,
3598
32
 * for example, from a WiFi hotspot or a VPN network.
3599
33
 *
3600
34
 * It queues requests objects (SecretRequest) on a GQueue in the private struct
3601
35
 * of the class. And notifies the consumer of the class through the "secret-request"
3602
36
 * and the "request-cancelled" signals with the following callback prototypes:
3603
37
 *
3604
38
 * void  (*secret_requested) (UnitySettingsSecretAgent      *self,
3605
39
 *                            guint                        id,
3606
40
 *                            NMConnection                  *connection,
3607
41
 *                            const char                    *setting_name,
3608
42
 *                            const char                   **hints,
3609
43
 *                            NMSecretAgentGetSecretsFlags   flags,
3610
44
 *                            gpointer                       user_data);
3611
45
 *
3612
46
 * void  (*request_cancelled) (UnitySettingsSecretAgent      *self,
3613
47
 *                             guint                        id,
3614
48
 *                             gpointer                       user_data);
3615
49
 *
3616
50
 */
3617
51
3618
52
3619
53
G_BEGIN_DECLS
3620
54
3621
55
3622
56
#define UNITY_SETTINGS_TYPE_SECRET_AGENT (unity_settings_secret_agent_get_type ())
3623
57
#define UNITY_SETTINGS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgent))
3624
58
#define UNITY_SETTINGS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
3625
59
#define UNITY_SETTINGS_IS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT))
3626
60
#define UNITY_SETTINGS_IS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT))
3627
61
#define UNITY_SETTINGS_SECRET_AGENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
3628
62
3629
63
#define UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED  "secret-requested"
3630
64
#define UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED "request-cancelled"
3631
65
3632
66
typedef struct _UnitySettingsSecretAgent UnitySettingsSecretAgent;
3633
67
typedef struct _UnitySettingsSecretAgentClass UnitySettingsSecretAgentClass;
3634
68
typedef struct _UnitySettingsSecretAgentPrivate UnitySettingsSecretAgentPrivate;
3635
69
3636
70
struct _UnitySettingsSecretAgent {
3637
71
  NMSecretAgent parent_instance;
3638
72
  UnitySettingsSecretAgentPrivate * priv;
3639
73
};
3640
74
3641
75
struct _UnitySettingsSecretAgentClass {
3642
76
  NMSecretAgentClass parent_class;
3643
77
3644
78
  void  (*secret_requested) (UnitySettingsSecretAgent      *self,
3645
79
                             guint                          id,
3646
80
                             NMConnection                  *connection,
3647
81
                             const char                    *setting_name,
3648
82
                             const char                   **hints,
3649
83
                             NMSecretAgentGetSecretsFlags   flags);
3650
84
3651
85
  void  (*request_cancelled) (UnitySettingsSecretAgent      *self,
3652
86
                              guint                          id);
3653
87
};
3654
88
3655
89
3656
90
GType                     unity_settings_secret_agent_get_type  (void) G_GNUC_CONST;
3657
91
UnitySettingsSecretAgent* unity_settings_secret_agent_new       (void);
3658
92
UnitySettingsSecretAgent* unity_settings_secret_agent_construct (GType object_type);
3659
93
3660
94
void unity_settings_secret_agent_provide_secret (UnitySettingsSecretAgent *agent,
3661
95
                                                 guint                     request,
3662
96
                                                 GHashTable               *secrets);
3663
97
void unity_settings_secret_agent_cancel_request (UnitySettingsSecretAgent *agent,
3664
98
                                                 guint                     request);
3665
99
3666
100
G_END_DECLS
3667
101
3668
102
#endif
3669
0
103
3670
=== added file 'plugins/Unity/Indicators/flatmenuproxymodel.cpp'
3671
--- plugins/Unity/Indicators/flatmenuproxymodel.cpp	1970-01-01 00:00:00 +0000
3672
+++ plugins/Unity/Indicators/flatmenuproxymodel.cpp	2013-07-11 14:53:26 +0000
3673
@@ -0,0 +1,272 @@
3674
1
/*
3675
2
 * Copyright 2012 Canonical Ltd.
3676
3
 *
3677
4
 * This program is free software; you can redistribute it and/or modify
3678
5
 * it under the terms of the GNU Lesser General Public License as published by
3679
6
 * the Free Software Foundation; version 3.
3680
7
 *
3681
8
 * This program is distributed in the hope that it will be useful,
3682
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3683
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3684
11
 * GNU Lesser General Public License for more details.
3685
12
 *
3686
13
 * You should have received a copy of the GNU Lesser General Public License
3687
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3688
15
 *
3689
16
 * Authors:
3690
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
3691
18
 */
3692
19
3693
20
extern "C" {
3694
21
#include <gio/gio.h>
3695
22
}
3696
23
3697
24
#include "flatmenuproxymodel.h"
3698
25
#include <QString>
3699
26
#include <QStringList>
3700
27
3701
28
FlatMenuProxyModel::FlatMenuProxyModel(QAbstractItemModel *source)
3702
29
    : QAbstractProxyModel(source),
3703
30
      m_rowCount(0)
3704
31
{
3705
32
    m_model = new QDBusMenuModel;
3706
33
    setSourceModel(m_model);
3707
34
}
3708
35
3709
36
/*! \internal */
3710
37
FlatMenuProxyModel::~FlatMenuProxyModel()
3711
38
{
3712
39
    delete m_model;
3713
40
}
3714
41
3715
42
void FlatMenuProxyModel::setSourceModel(QAbstractItemModel *source)
3716
43
{
3717
44
    if (sourceModel()) {
3718
45
        QAbstractItemModel *oldSource = sourceModel();
3719
46
        if (oldSource == source) {
3720
47
            return;
3721
48
        }
3722
49
3723
50
        oldSource->disconnect(this);
3724
51
    }
3725
52
3726
53
    QAbstractProxyModel::setSourceModel(source);
3727
54
3728
55
    if (source) {
3729
56
3730
57
        // FIXME - not working correctly with dynamic inserts/removes
3731
58
3732
59
        connect(source,
3733
60
                SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
3734
61
                SLOT(onModelAboutToBeReset()));
3735
62
        connect(source,
3736
63
                SIGNAL(rowsInserted(QModelIndex,int,int)),
3737
64
                SLOT(onModelReset()));
3738
65
3739
66
        connect(source,
3740
67
                SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
3741
68
                SLOT(onModelAboutToBeReset()));
3742
69
        connect(source,
3743
70
                SIGNAL(rowsRemoved(QModelIndex,int,int)),
3744
71
                SLOT(onModelReset()));
3745
72
3746
73
        connect(source,
3747
74
                SIGNAL(modelAboutToBeReset()),
3748
75
                SLOT(onModelAboutToBeReset()));
3749
76
        connect(source,
3750
77
                SIGNAL(modelReset()),
3751
78
                SLOT(onModelReset()));
3752
79
3753
80
        connect(source,
3754
81
                SIGNAL(statusChanged(DBusEnums::ConnectionStatus)),
3755
82
                SIGNAL(statusChanged()));
3756
83
3757
84
        // initiliaze rowCount
3758
85
        QModelIndex lastItem = source->index(source->rowCount() - 1, 0);
3759
86
        m_rowCount = recursiveRowCount(lastItem);
3760
87
    } else {
3761
88
        m_rowCount = 0;
3762
89
    }
3763
90
3764
91
    Q_EMIT countChanged();
3765
92
}
3766
93
3767
94
void FlatMenuProxyModel::setBusName(const QString &busName)
3768
95
{
3769
96
    m_model->setBusName(busName);
3770
97
}
3771
98
3772
99
QString FlatMenuProxyModel::busName() const
3773
100
{
3774
101
    return m_model->busName();
3775
102
}
3776
103
3777
104
void FlatMenuProxyModel::setObjectPath(const QString &busPath)
3778
105
{
3779
106
    m_model->setObjectPath(busPath);
3780
107
}
3781
108
3782
109
QString FlatMenuProxyModel::objectPath() const
3783
110
{
3784
111
    return m_model->objectPath();
3785
112
}
3786
113
3787
114
int FlatMenuProxyModel::status() const
3788
115
{
3789
116
    return m_model->status();
3790
117
}
3791
118
3792
119
DBusEnums::BusType FlatMenuProxyModel::busType() const
3793
120
{
3794
121
    return m_model->busType();
3795
122
}
3796
123
3797
124
void FlatMenuProxyModel::setIntBusType(int type)
3798
125
{
3799
126
    m_model->setBusType((DBusEnums::BusType) type);
3800
127
}
3801
128
3802
129
void FlatMenuProxyModel::start()
3803
130
{
3804
131
    m_model->start();
3805
132
}
3806
133
3807
134
void FlatMenuProxyModel::stop()
3808
135
{
3809
136
    m_model->stop();
3810
137
}
3811
138
3812
139
QModelIndex FlatMenuProxyModel::mapFromSource(const QModelIndex &index) const
3813
140
{
3814
141
    if (!index.isValid()) {
3815
142
        return QModelIndex();
3816
143
    }
3817
144
3818
145
    QModelIndex result = createIndex(rowOffsetOf(index, index.row()), 0);
3819
146
    return result;
3820
147
}
3821
148
3822
149
QModelIndex FlatMenuProxyModel::mapToSource(const QModelIndex &index) const
3823
150
{
3824
151
    if (sourceModel() && m_indexCache.contains(index.row())) {
3825
152
        QString key = m_indexCache.value(index.row());
3826
153
        QStringList sections = key.split('.', QString::SkipEmptyParts);
3827
154
        QModelIndex sourceIndex = QModelIndex();
3828
155
        for(int i=0; i < sections.size(); i++) {
3829
156
            sourceIndex = sourceModel()->index(sections.at(i).toInt(), 9, sourceIndex);
3830
157
        }
3831
158
        return sourceIndex;
3832
159
    } else {
3833
160
        return QModelIndex();
3834
161
    }
3835
162
}
3836
163
3837
164
QModelIndex FlatMenuProxyModel::index(int row, int sectionRow, const QModelIndex &parent, const QString &key) const
3838
165
{
3839
166
    for (int i = 0, count = 0; i < sourceModel()->rowCount(parent); i++) {
3840
167
        QModelIndex sourceIndex = sourceModel()->index(i, 0, parent);
3841
168
        int indexCount = recursiveRowCount(sourceIndex);
3842
169
3843
170
        if (count == sectionRow) {
3844
171
            QString sectionKey = key + "." + QString::number(i);
3845
172
            m_indexCache.insert(row, sectionKey);
3846
173
            return createIndex(row, 0);
3847
174
        } else if ((count + indexCount) >= sectionRow) {
3848
175
            count++;
3849
176
            return index(row, sectionRow - count, sourceIndex, key + "." + QString::number(i));
3850
177
        }
3851
178
3852
179
        count += indexCount + 1;
3853
180
    }
3854
181
    return QModelIndex();
3855
182
}
3856
183
3857
184
QModelIndex FlatMenuProxyModel::index(int row, int, const QModelIndex &) const
3858
185
{
3859
186
    return index(row, row, QModelIndex(), "");
3860
187
}
3861
188
3862
189
QModelIndex FlatMenuProxyModel::parent(const QModelIndex &) const
3863
190
{
3864
191
    return QModelIndex();
3865
192
}
3866
193
3867
194
int FlatMenuProxyModel::columnCount(const QModelIndex &) const
3868
195
{
3869
196
    return 1;
3870
197
}
3871
198
3872
199
int FlatMenuProxyModel::rowCount(const QModelIndex &) const
3873
200
{
3874
201
    return m_rowCount;
3875
202
}
3876
203
3877
204
int FlatMenuProxyModel::count() const
3878
205
{
3879
206
    return rowCount(QModelIndex());
3880
207
}
3881
208
3882
209
void FlatMenuProxyModel::onModelAboutToBeReset()
3883
210
{
3884
211
   beginResetModel();
3885
212
}
3886
213
3887
214
void FlatMenuProxyModel::onModelReset()
3888
215
{
3889
216
    // initiliaze rowCount
3890
217
    m_rowCount = 0;
3891
218
    for (int i = 0, iMax = sourceModel()->rowCount(); i < iMax; i++) {
3892
219
        QModelIndex index = sourceModel()->index(i, 0);
3893
220
        m_rowCount += recursiveRowCount(index) + 1;
3894
221
    }
3895
222
    m_indexCache.clear();
3896
223
    endResetModel();
3897
224
    Q_EMIT countChanged();
3898
225
}
3899
226
3900
227
int FlatMenuProxyModel::recursiveRowCount(const QModelIndex &index) const
3901
228
{
3902
229
    int size = sourceModel()->rowCount(index);
3903
230
    for (int i=0, iMax=size; i < iMax; i++) {
3904
231
        QModelIndex currentIndex = sourceModel()->index(i, 0, index);
3905
232
        size += recursiveRowCount(currentIndex);
3906
233
    }
3907
234
3908
235
    return size;
3909
236
}
3910
237
3911
238
int FlatMenuProxyModel::rowOffsetOf(const QModelIndex &index, int row, bool inclusive) const
3912
239
{
3913
240
    int offset = 0;
3914
241
3915
242
    QModelIndex parent = index.parent();
3916
243
3917
244
    // Check row 0 offset
3918
245
    while(parent.isValid()) {
3919
246
        offset += 1;
3920
247
        for (int i = 0; i < parent.row(); i++) {
3921
248
            QModelIndex currentIndex = sourceModel()->index(i, 0, parent);
3922
249
            offset += recursiveRowCount(currentIndex) + 1;
3923
250
        }
3924
251
        parent = parent.parent();
3925
252
    }
3926
253
3927
254
    // Check index.row() offset
3928
255
    for(int i = 0; i < row; i++) {
3929
256
        QModelIndex currentIndex = sourceModel()->index(i, 0, index.parent());
3930
257
        offset += recursiveRowCount(currentIndex) + 1;
3931
258
    }
3932
259
3933
260
    if (inclusive) {
3934
261
        // itself
3935
262
        QModelIndex currentIndex = sourceModel()->index(row, 0, index.parent());
3936
263
        offset += recursiveRowCount(currentIndex);
3937
264
    }
3938
265
3939
266
    return offset;
3940
267
}
3941
268
3942
269
QVariant FlatMenuProxyModel::data(int row, int role) const
3943
270
{
3944
271
    return QAbstractProxyModel::data(index(row, 0), role);
3945
272
}
3946
0
\ No newline at end of file
273
\ No newline at end of file
3947
1
274
3948
=== added file 'plugins/Unity/Indicators/flatmenuproxymodel.h'
3949
--- plugins/Unity/Indicators/flatmenuproxymodel.h	1970-01-01 00:00:00 +0000
3950
+++ plugins/Unity/Indicators/flatmenuproxymodel.h	2013-07-11 14:53:26 +0000
3951
@@ -0,0 +1,91 @@
3952
1
/*
3953
2
 * Copyright 2012 Canonical Ltd.
3954
3
 *
3955
4
 * This program is free software; you can redistribute it and/or modify
3956
5
 * it under the terms of the GNU Lesser General Public License as published by
3957
6
 * the Free Software Foundation; version 3.
3958
7
 *
3959
8
 * This program is distributed in the hope that it will be useful,
3960
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3961
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3962
11
 * GNU Lesser General Public License for more details.
3963
12
 *
3964
13
 * You should have received a copy of the GNU Lesser General Public License
3965
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3966
15
 *
3967
16
 * Authors:
3968
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
3969
18
 */
3970
19
3971
20
#ifndef FLATMENUPROXYMODEL_H
3972
21
#define FLATMENUPROXYMODEL_H
3973
22
3974
23
#include <QAbstractProxyModel>
3975
24
#include <qdbusmenumodel.h>
3976
25
3977
26
class SectionInfo;
3978
27
3979
28
class FlatMenuProxyModel : public QAbstractProxyModel
3980
29
{
3981
30
    Q_OBJECT
3982
31
    Q_PROPERTY(int count READ count NOTIFY countChanged)
3983
32
    Q_PROPERTY(int busType READ busType WRITE setIntBusType NOTIFY busTypeChanged)
3984
33
    Q_PROPERTY(QString busName READ busName WRITE setBusName NOTIFY busNameChanged)
3985
34
    Q_PROPERTY(QString objectPath READ objectPath WRITE setObjectPath NOTIFY objectPathChanged)
3986
35
    Q_PROPERTY(int status READ status NOTIFY statusChanged)
3987
36
3988
37
    Q_ENUMS(Roles)
3989
38
public:
3990
39
    FlatMenuProxyModel(QAbstractItemModel *source=0);
3991
40
    ~FlatMenuProxyModel();
3992
41
3993
42
    void setSourceModel(QAbstractItemModel * sourceModel);
3994
43
3995
44
    Q_INVOKABLE QVariant data(int row, int role = Qt::DisplayRole) const;
3996
45
3997
46
    QModelIndex mapFromSource(const QModelIndex &index) const;
3998
47
    QModelIndex mapToSource(const QModelIndex &index) const;
3999
48
4000
49
    QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
4001
50
    QModelIndex parent(const QModelIndex &index) const;
4002
51
    int rowCount(const QModelIndex &parent = QModelIndex()) const;
4003
52
    int count() const;
4004
53
    int columnCount(const QModelIndex &parent) const;
4005
54
4006
55
    void setBusName(const QString &busName);
4007
56
    QString busName() const;
4008
57
4009
58
    void setObjectPath(const QString &busName);
4010
59
    QString objectPath() const;
4011
60
4012
61
    DBusEnums::BusType busType() const;
4013
62
    void setIntBusType(int type);
4014
63
4015
64
    int status() const;
4016
65
4017
66
public Q_SLOTS:
4018
67
    void onModelAboutToBeReset();
4019
68
    void onModelReset();
4020
69
4021
70
    void start();
4022
71
    void stop();
4023
72
4024
73
Q_SIGNALS:
4025
74
    void countChanged();
4026
75
4027
76
    void busTypeChanged();
4028
77
    void busNameChanged();
4029
78
    void objectPathChanged();
4030
79
    void statusChanged();
4031
80
4032
81
private:
4033
82
    QDBusMenuModel *m_model;
4034
83
    mutable QMap<int, QString> m_indexCache;
4035
84
    int m_rowCount;
4036
85
4037
86
    int rowOffsetOf(const QModelIndex &index, int row, bool inclusive = false) const;
4038
87
    int recursiveRowCount(const QModelIndex &index) const;
4039
88
    QModelIndex index(int row, int rowCount, const QModelIndex &parent, const QString &key) const;
4040
89
};
4041
90
4042
91
#endif
4043
0
92
4044
=== added file 'plugins/Unity/Indicators/indicator.cpp'
4045
--- plugins/Unity/Indicators/indicator.cpp	1970-01-01 00:00:00 +0000
4046
+++ plugins/Unity/Indicators/indicator.cpp	2013-07-11 14:53:26 +0000
4047
@@ -0,0 +1,88 @@
4048
1
/*
4049
2
 * Copyright 2013 Canonical Ltd.
4050
3
 *
4051
4
 * This program is free software; you can redistribute it and/or modify
4052
5
 * it under the terms of the GNU Lesser General Public License as published by
4053
6
 * the Free Software Foundation; version 3.
4054
7
 *
4055
8
 * This program is distributed in the hope that it will be useful,
4056
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4057
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4058
11
 * GNU Lesser General Public License for more details.
4059
12
 *
4060
13
 * You should have received a copy of the GNU Lesser General Public License
4061
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4062
15
 *
4063
16
 * Authors:
4064
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
4065
18
 */
4066
19
4067
20
#include "indicator.h"
4068
21
4069
22
#include <QStringList>
4070
23
4071
24
Indicator::Indicator(QObject *parent)
4072
25
    : QObject(parent)
4073
26
{
4074
27
}
4075
28
4076
29
Indicator::~Indicator()
4077
30
{
4078
31
}
4079
32
4080
33
void Indicator::init(const QString& busName, const QSettings& settings)
4081
34
{
4082
35
    setId(settings.value("Indicator Service/Name").toString());
4083
36
4084
37
    QString actionObjectPath = settings.value("Indicator Service/ObjectPath").toString();
4085
38
4086
39
    QVariantMap mapMenuObjectPaths;
4087
40
    Q_FOREACH(const QString& childGroup, settings.childGroups())
4088
41
    {
4089
42
        if (childGroup == "Indicator Service")
4090
43
            continue;
4091
44
4092
45
        QString menuPath = childGroup+"/ObjectPath";
4093
46
        if (settings.contains(menuPath))
4094
47
        {
4095
48
            mapMenuObjectPaths[childGroup] = settings.value(menuPath).toString();
4096
49
        }
4097
50
    }
4098
51
4099
52
4100
53
    QVariantMap properties;
4101
54
    properties.clear();
4102
55
    properties.insert("busType", 1);
4103
56
    properties.insert("busName", busName);
4104
57
    properties.insert("actionsObjectPath", actionObjectPath);
4105
58
    properties.insert("menuObjectPaths", mapMenuObjectPaths);
4106
59
    setIndicatorProperties(properties);
4107
60
}
4108
61
4109
62
QString Indicator::identifier() const
4110
63
{
4111
64
    return m_identifier;
4112
65
}
4113
66
4114
67
void Indicator::setId(const QString &identifier)
4115
68
{
4116
69
    if (identifier != m_identifier) {
4117
70
        m_identifier = identifier;
4118
71
        Q_EMIT identifierChanged(m_identifier);
4119
72
    }
4120
73
}
4121
74
4122
75
4123
76
QVariant Indicator::indicatorProperties() const
4124
77
{
4125
78
    return m_properties;
4126
79
}
4127
80
4128
81
void Indicator::setIndicatorProperties(const QVariant &properties)
4129
82
{
4130
83
    if (m_properties != properties)
4131
84
    {
4132
85
        m_properties = properties;
4133
86
        Q_EMIT indicatorPropertiesChanged(m_properties);
4134
87
    }
4135
88
}
4136
0
89
4137
=== added file 'plugins/Unity/Indicators/indicator.h'
4138
--- plugins/Unity/Indicators/indicator.h	1970-01-01 00:00:00 +0000
4139
+++ plugins/Unity/Indicators/indicator.h	2013-07-11 14:53:26 +0000
4140
@@ -0,0 +1,57 @@
4141
1
/*
4142
2
 * Copyright 2013 Canonical Ltd.
4143
3
 *
4144
4
 * This program is free software; you can redistribute it and/or modify
4145
5
 * it under the terms of the GNU Lesser General Public License as published by
4146
6
 * the Free Software Foundation; version 3.
4147
7
 *
4148
8
 * This program is distributed in the hope that it will be useful,
4149
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4150
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4151
11
 * GNU Lesser General Public License for more details.
4152
12
 *
4153
13
 * You should have received a copy of the GNU Lesser General Public License
4154
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4155
15
 *
4156
16
 * Authors:
4157
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
4158
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
4159
19
 */
4160
20
4161
21
#ifndef INDICATOR_H
4162
22
#define INDICATOR_H
4163
23
4164
24
#include <QObject>
4165
25
#include <QSettings>
4166
26
4167
27
class Indicator : public QObject
4168
28
{
4169
29
    Q_OBJECT
4170
30
    Q_PROPERTY(QString identifier READ identifier NOTIFY identifierChanged)
4171
31
    Q_PROPERTY(QVariant indicatorProperties READ indicatorProperties NOTIFY indicatorPropertiesChanged)
4172
32
4173
33
public:
4174
34
    typedef QSharedPointer<Indicator> Ptr;
4175
35
4176
36
    Indicator(QObject *parent = 0);
4177
37
    virtual ~Indicator();
4178
38
4179
39
    void init(const QString& busName, const QSettings& settings);
4180
40
4181
41
    QString identifier() const;
4182
42
    QVariant indicatorProperties() const;
4183
43
4184
44
Q_SIGNALS:
4185
45
    void identifierChanged(const QString &identifier);
4186
46
    void indicatorPropertiesChanged(const QVariant &properties);
4187
47
4188
48
protected:
4189
49
    void setId(const QString &id);
4190
50
    void setIndicatorProperties(const QVariant &properties);
4191
51
4192
52
private:
4193
53
    QString m_identifier;
4194
54
    QVariant m_properties;
4195
55
};
4196
56
4197
57
#endif // INDICATOR_H
4198
0
58
4199
=== added file 'plugins/Unity/Indicators/indicators.h'
4200
--- plugins/Unity/Indicators/indicators.h	1970-01-01 00:00:00 +0000
4201
+++ plugins/Unity/Indicators/indicators.h	2013-07-11 14:53:26 +0000
4202
@@ -0,0 +1,103 @@
4203
1
/*
4204
2
 * Copyright (C) 2012 Canonical, Ltd.
4205
3
 *
4206
4
 * This program is free software; you can redistribute it and/or modify
4207
5
 * it under the terms of the GNU General Public License as published by
4208
6
 * the Free Software Foundation; version 3.
4209
7
 *
4210
8
 * This program is distributed in the hope that it will be useful,
4211
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4212
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4213
11
 * GNU General Public License for more details.
4214
12
 *
4215
13
 * You should have received a copy of the GNU General Public License
4216
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4217
15
 *
4218
16
 * Author: Nick Dedekind <nick.dedekind@canonical.com>
4219
17
 */
4220
18
4221
19
#ifndef INDICATORS_H
4222
20
#define INDICATORS_H
4223
21
4224
22
#include <QObject>
4225
23
4226
24
class ActionState : public QObject
4227
25
{
4228
26
    Q_OBJECT
4229
27
public:
4230
28
    Q_ENUMS(ActionStates)
4231
29
    enum ActionStates {
4232
30
      Label           = 0x00,
4233
31
      IconSource      = 0x01,
4234
32
      AccessableName  = 0x02,
4235
33
      Visible         = 0x03,
4236
34
    };
4237
35
4238
36
    ActionState(QObject*parent=0):QObject(parent) {}
4239
37
};
4240
38
4241
39
class NetworkActionState : public QObject
4242
40
{
4243
41
    Q_OBJECT
4244
42
public:
4245
43
    Q_ENUMS(NetworkActionStates)
4246
44
    enum NetworkActionStates {
4247
45
      Connection      = 0x01,
4248
46
      SignalStrength  = 0x02,
4249
47
    };
4250
48
4251
49
    NetworkActionState(QObject*parent=0):QObject(parent) {}
4252
50
};
4253
51
4254
52
class NetworkConnection : public QObject
4255
53
{
4256
54
    Q_OBJECT
4257
55
public:
4258
56
    Q_ENUMS(NetworkConnectionStates)
4259
57
    enum NetworkConnectionStates {
4260
58
      Initial         = 0x00,
4261
59
      Activating      = 0x01,
4262
60
      Activated       = 0x02,
4263
61
      Deactivating    = 0x03,
4264
62
    };
4265
63
4266
64
    NetworkConnection(QObject*parent=0):QObject(parent) {}
4267
65
};
4268
66
4269
67
class IndicatorsModelRole : public QObject
4270
68
{
4271
69
    Q_OBJECT
4272
70
public:
4273
71
    Q_ENUMS(Roles)
4274
72
    enum Roles {
4275
73
        Identifier = 0,
4276
74
        Priority,
4277
75
        Title,
4278
76
        Description,
4279
77
        WidgetSource,
4280
78
        PageSource,
4281
79
        IndicatorProperties,
4282
80
        IsValid
4283
81
    };
4284
82
4285
83
    IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
4286
84
};
4287
85
4288
86
class FlatMenuProxyModelRole : public QObject
4289
87
{
4290
88
    Q_OBJECT
4291
89
public:
4292
90
    Q_ENUMS(Roles)
4293
91
    enum Roles {
4294
92
        Action  = Qt::DisplayRole + 1,
4295
93
        Label,
4296
94
        Extra,
4297
95
        Depth,
4298
96
        hasSection,
4299
97
        hasSubMenu
4300
98
    };
4301
99
4302
100
    FlatMenuProxyModelRole(QObject*parent=0):QObject(parent) {}
4303
101
};
4304
102
4305
103
#endif // INDICATORS_H
4306
0
104
4307
=== added file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
4308
--- plugins/Unity/Indicators/indicatorsmanager.cpp	1970-01-01 00:00:00 +0000
4309
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2013-07-11 14:53:26 +0000
4310
@@ -0,0 +1,285 @@
4311
1
/*
4312
2
 * Copyright (C) 2013 Canonical, Ltd.
4313
3
 *
4314
4
 * This program is free software; you can redistribute it and/or modify
4315
5
 * it under the terms of the GNU General Public License as published by
4316
6
 * the Free Software Foundation; version 3.
4317
7
 *
4318
8
 * This program is distributed in the hope that it will be useful,
4319
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4320
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4321
11
 * GNU General Public License for more details.
4322
12
 *
4323
13
 * You should have received a copy of the GNU General Public License
4324
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4325
15
 *
4326
16
 * Author: Nick Dedekind <nick.dedekind@canonical.com>
4327
17
 */
4328
18
4329
19
#include "indicatorsmanager.h"
4330
20
4331
21
#include <QSettings>
4332
22
#include <QDebug>
4333
23
4334
24
#include "paths.h"
4335
25
4336
26
4337
27
class IndicatorsManager::IndicatorData
4338
28
{
4339
29
public:
4340
30
    IndicatorData(const QString& name, const QFileInfo& fileInfo)
4341
31
        : m_name(name)
4342
32
        , m_fileInfo(fileInfo)
4343
33
        , m_verified (true)
4344
34
    {}
4345
35
4346
36
    QString m_name;
4347
37
    QFileInfo m_fileInfo;
4348
38
4349
39
    bool m_verified;
4350
40
    Indicator::Ptr m_indicator;
4351
41
};
4352
42
4353
43
IndicatorsManager::IndicatorsManager(QObject* parent)
4354
44
    : QObject(parent)
4355
45
    , m_loaded(false)
4356
46
{
4357
47
}
4358
48
4359
49
IndicatorsManager::~IndicatorsManager()
4360
50
{
4361
51
    unload();
4362
52
}
4363
53
4364
54
void IndicatorsManager::load()
4365
55
{
4366
56
    unload();
4367
57
    QStringList xdgLocations = shellDataDirs();//QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
4368
58
4369
59
    m_fsWatcher.reset(new QFileSystemWatcher(this));
4370
60
4371
61
    Q_FOREACH(const QString& xdgLocation, xdgLocations)
4372
62
    {
4373
63
        QString indicator_path = QDir::cleanPath(xdgLocation + "/unity/indicators");
4374
64
        QDir indicator_dir(indicator_path);
4375
65
        if (indicator_dir.exists())
4376
66
        {
4377
67
            // watch folder for changes.
4378
68
            m_fsWatcher->addPath(indicator_path);
4379
69
4380
70
            loadDir(indicator_dir);
4381
71
        }
4382
72
    }
4383
73
4384
74
    QObject::connect(m_fsWatcher.data(), SIGNAL(directoryChanged(const QString&)), this, SLOT(onDirectoryChanged(const QString&)));
4385
75
    QObject::connect(m_fsWatcher.data(), SIGNAL(fileChanged(const QString&)), this, SLOT(onFileChanged(const QString&)));
4386
76
    setLoaded(true);
4387
77
}
4388
78
4389
79
void IndicatorsManager::onDirectoryChanged(const QString& directory)
4390
80
{
4391
81
    loadDir(QDir(directory));
4392
82
}
4393
83
4394
84
void IndicatorsManager::onFileChanged(const QString& file)
4395
85
{
4396
86
    QFileInfo file_info(file);
4397
87
    if (!file_info.exists())
4398
88
    {
4399
89
        unloadFile(file_info);
4400
90
        return;
4401
91
    }
4402
92
    else
4403
93
    {
4404
94
        loadFile(QFileInfo(file));
4405
95
    }
4406
96
}
4407
97
4408
98
void IndicatorsManager::loadDir(const QDir& dir)
4409
99
{
4410
100
    startVerify(dir.canonicalPath());
4411
101
4412
102
    QFileInfoList indicator_files = dir.entryInfoList(QStringList(), QDir::Files|QDir::NoDotAndDotDot);
4413
103
    Q_FOREACH(const QFileInfo& indicator_file, indicator_files)
4414
104
    {
4415
105
        loadFile(indicator_file);
4416
106
    }
4417
107
4418
108
    endVerify(dir.canonicalPath());
4419
109
}
4420
110
4421
111
void IndicatorsManager::loadFile(const QFileInfo& file_info)
4422
112
{
4423
113
    QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
4424
114
    QString name = indicator_settings.value("Indicator Service/Name").toString();
4425
115
4426
116
    auto iter = m_indicatorsData.find(name);
4427
117
    if (iter != m_indicatorsData.end())
4428
118
    {
4429
119
        QString newFileInfoDir = QDir::cleanPath(file_info.canonicalPath());
4430
120
        IndicatorData* currentData = (*iter);
4431
121
        currentData->m_verified = true;
4432
122
4433
123
        int file_info_location = -1;
4434
124
        int current_data_location = -1;
4435
125
4436
126
        QString currentDataDir = QDir::cleanPath(currentData->m_fileInfo.canonicalPath());
4437
127
4438
128
        // if we've already got this indicator, we need to make sure we're not overwriting data which is
4439
129
        // from a lower priority standard path
4440
130
        QStringList xdgLocations = shellDataDirs();
4441
131
        for (int i = 0; i < xdgLocations.size(); i++)
4442
132
        {
4443
133
            QString indicatorDir = QDir::cleanPath(xdgLocations[i] + "/unity/indicators");
4444
134
4445
135
            if (newFileInfoDir == indicatorDir)
4446
136
            {
4447
137
                file_info_location = i;
4448
138
            }
4449
139
            if (currentDataDir == indicatorDir)
4450
140
            {
4451
141
                current_data_location = i;
4452
142
            }
4453
143
4454
144
            if (file_info_location != -1 && current_data_location != -1)
4455
145
            {
4456
146
                break;
4457
147
            }
4458
148
        }
4459
149
4460
150
        // file location is higher (or of equal) priority. overwrite.
4461
151
        if (file_info_location <= current_data_location &&
4462
152
            file_info != currentData->m_fileInfo)
4463
153
        {
4464
154
            currentData->m_fileInfo = file_info;
4465
155
            Q_EMIT indicatorLoaded(name);
4466
156
        }
4467
157
    }
4468
158
    else
4469
159
    {
4470
160
        IndicatorData* data = new IndicatorData(name, file_info);
4471
161
        data->m_verified = true;
4472
162
        m_indicatorsData[name]= data;
4473
163
        Q_EMIT indicatorLoaded(name);
4474
164
    }
4475
165
}
4476
166
4477
167
void IndicatorsManager::unload()
4478
168
{
4479
169
    QHashIterator<QString, IndicatorData*> iter(m_indicatorsData);
4480
170
    while(iter.hasNext())
4481
171
    {
4482
172
        iter.next();
4483
173
        Q_EMIT indicatorAboutToBeUnloaded(iter.key());
4484
174
    }
4485
175
4486
176
    qDeleteAll(m_indicatorsData);
4487
177
    m_indicatorsData.clear();
4488
178
4489
179
    setLoaded(false);
4490
180
}
4491
181
4492
182
void IndicatorsManager::unloadFile(const QFileInfo& file)
4493
183
{
4494
184
    QMutableHashIterator<QString, IndicatorData*> iter(m_indicatorsData);
4495
185
    while(iter.hasNext())
4496
186
    {
4497
187
        iter.next();
4498
188
        IndicatorData* data = iter.value();
4499
189
        if (data->m_fileInfo.absoluteFilePath() == file.absoluteFilePath())
4500
190
        {
4501
191
            if (!data->m_verified)
4502
192
            {
4503
193
                QString name = data->m_name;
4504
194
                Q_EMIT indicatorAboutToBeUnloaded(name);
4505
195
4506
196
                delete data;
4507
197
                iter.remove();
4508
198
            }
4509
199
        }
4510
200
    }
4511
201
4512
202
    setLoaded(m_indicatorsData.size() > 0);
4513
203
}
4514
204
4515
205
void IndicatorsManager::setLoaded(bool loaded)
4516
206
{
4517
207
    if (loaded != m_loaded)
4518
208
    {
4519
209
        m_loaded = loaded;
4520
210
        Q_EMIT loadedChanged(m_loaded);
4521
211
    }
4522
212
}
4523
213
4524
214
void IndicatorsManager::startVerify(const QString& path)
4525
215
{
4526
216
    QHashIterator<QString, IndicatorData*> iter(m_indicatorsData);
4527
217
    while(iter.hasNext())
4528
218
    {
4529
219
        iter.next();
4530
220
        IndicatorData* data = iter.value();
4531
221
        if (data->m_fileInfo.canonicalPath() == path)
4532
222
        {
4533
223
           data->m_verified = false;
4534
224
        }
4535
225
    }
4536
226
}
4537
227
4538
228
void IndicatorsManager::endVerify(const QString& path)
4539
229
{
4540
230
    QMutableHashIterator<QString, IndicatorData*> iter(m_indicatorsData);
4541
231
    while(iter.hasNext())
4542
232
    {
4543
233
        iter.next();
4544
234
        IndicatorData* data = iter.value();
4545
235
        if (data->m_fileInfo.canonicalPath() == path)
4546
236
        {
4547
237
            if (!data->m_verified)
4548
238
            {
4549
239
                QString name = data->m_name;
4550
240
                Q_EMIT indicatorAboutToBeUnloaded(name);
4551
241
4552
242
                delete data;
4553
243
                iter.remove();
4554
244
            }
4555
245
        }
4556
246
    }
4557
247
}
4558
248
4559
249
Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
4560
250
{
4561
251
    if (!m_indicatorsData.contains(indicator_name))
4562
252
    {
4563
253
        qWarning() << Q_FUNC_INFO << "Invalid indicator name: " <<  indicator_name;
4564
254
        return Indicator::Ptr();
4565
255
    }
4566
256
4567
257
    IndicatorData *data = m_indicatorsData[indicator_name];
4568
258
    if (data->m_indicator)
4569
259
    {
4570
260
        return data->m_indicator;
4571
261
    }
4572
262
4573
263
    Indicator::Ptr new_indicator(new Indicator(this));
4574
264
    data->m_indicator = new_indicator;
4575
265
    QSettings settings(data->m_fileInfo.absoluteFilePath(), QSettings::IniFormat, this);
4576
266
    new_indicator->init(data->m_fileInfo.fileName(), settings);
4577
267
    return new_indicator;
4578
268
}
4579
269
4580
270
QList<Indicator::Ptr> IndicatorsManager::indicators()
4581
271
{
4582
272
    QList<Indicator::Ptr> list;
4583
273
    Q_FOREACH(IndicatorData* data, m_indicatorsData)
4584
274
    {
4585
275
        Indicator::Ptr ret = indicator(data->m_name);
4586
276
        if (ret)
4587
277
            list.append(ret);
4588
278
    }
4589
279
    return list;
4590
280
}
4591
281
4592
282
bool IndicatorsManager::isLoaded() const
4593
283
{
4594
284
    return m_loaded;
4595
285
}
4596
0
286
4597
=== added file 'plugins/Unity/Indicators/indicatorsmanager.h'
4598
--- plugins/Unity/Indicators/indicatorsmanager.h	1970-01-01 00:00:00 +0000
4599
+++ plugins/Unity/Indicators/indicatorsmanager.h	2013-07-11 14:53:26 +0000
4600
@@ -0,0 +1,73 @@
4601
1
/*
4602
2
 * Copyright (C) 2013 Canonical, Ltd.
4603
3
 *
4604
4
 * This program is free software; you can redistribute it and/or modify
4605
5
 * it under the terms of the GNU General Public License as published by
4606
6
 * the Free Software Foundation; version 3.
4607
7
 *
4608
8
 * This program is distributed in the hope that it will be useful,
4609
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4610
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4611
11
 * GNU General Public License for more details.
4612
12
 *
4613
13
 * You should have received a copy of the GNU General Public License
4614
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4615
15
 *
4616
16
 * Author: Nick Dedekind <nick.dedekind@canonical.com>
4617
17
 */
4618
18
4619
19
#ifndef INDICATORS_MANAGER_H
4620
20
#define INDICATORS_MANAGER_H
4621
21
4622
22
#include <QObject>
4623
23
#include <QFileSystemWatcher>
4624
24
#include <QDir>
4625
25
#include <QHash>
4626
26
#include <QSharedPointer>
4627
27
4628
28
#include "indicator.h"
4629
29
4630
30
class IndicatorsManager : public QObject
4631
31
{
4632
32
    Q_OBJECT
4633
33
    Q_PROPERTY(bool loaded READ isLoaded NOTIFY loadedChanged)
4634
34
public:
4635
35
    explicit IndicatorsManager(QObject* parent = 0);
4636
36
    ~IndicatorsManager();
4637
37
4638
38
    Q_INVOKABLE void load();
4639
39
    Q_INVOKABLE void unload();
4640
40
4641
41
    Indicator::Ptr indicator(const QString& indicator_name);
4642
42
4643
43
    QList<Indicator::Ptr> indicators();
4644
44
4645
45
    bool isLoaded() const;
4646
46
4647
47
Q_SIGNALS:
4648
48
    void loadedChanged(bool);
4649
49
4650
50
    void indicatorLoaded(const QString& indicator_name);
4651
51
    void indicatorAboutToBeUnloaded(const QString& indicator_name);
4652
52
4653
53
private Q_SLOTS:
4654
54
    void onDirectoryChanged(const QString& directory);
4655
55
    void onFileChanged(const QString& file);
4656
56
4657
57
private:
4658
58
    void loadDir(const QDir& dir);
4659
59
    void loadFile(const QFileInfo& file);
4660
60
    void unloadFile(const QFileInfo& dir);
4661
61
4662
62
    void startVerify(const QString& path);
4663
63
    void endVerify(const QString& path);
4664
64
4665
65
    void setLoaded(bool);
4666
66
4667
67
    class IndicatorData;
4668
68
    QHash<QString, IndicatorData*> m_indicatorsData;
4669
69
    QSharedPointer<QFileSystemWatcher> m_fsWatcher;
4670
70
    bool m_loaded;
4671
71
};
4672
72
4673
73
#endif // INDICATORS_MANAGER_H
4674
0
74
4675
=== added file 'plugins/Unity/Indicators/indicatorsmodel.cpp'
4676
--- plugins/Unity/Indicators/indicatorsmodel.cpp	1970-01-01 00:00:00 +0000
4677
+++ plugins/Unity/Indicators/indicatorsmodel.cpp	2013-07-11 14:53:26 +0000
4678
@@ -0,0 +1,321 @@
4679
1
/*
4680
2
 * Copyright 2012 Canonical Ltd.
4681
3
 *
4682
4
 * This program is free software; you can redistribute it and/or modify
4683
5
 * it under the terms of the GNU Lesser General Public License as published by
4684
6
 * the Free Software Foundation; version 3.
4685
7
 *
4686
8
 * This program is distributed in the hope that it will be useful,
4687
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4688
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4689
11
 * GNU Lesser General Public License for more details.
4690
12
 *
4691
13
 * You should have received a copy of the GNU Lesser General Public License
4692
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4693
15
 *
4694
16
 * Authors:
4695
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
4696
18
 */
4697
19
4698
20
#include "indicatorsmodel.h"
4699
21
#include "indicatorsmanager.h"
4700
22
#include "indicator.h"
4701
23
#include "indicators.h"
4702
24
#include "paths.h"
4703
25
4704
26
#include <QQmlContext>
4705
27
#include <QQmlEngine>
4706
28
#include <QDebug>
4707
29
4708
30
/*!
4709
31
    \qmltype IndicatorsModel
4710
32
    \inherits QAbstractListModel
4711
33
4712
34
    \brief The IndicatorsModel class defines the list model for indicators
4713
35
4714
36
    \b {This component is under heavy development.}
4715
37
4716
38
    This class expose the available indicators.
4717
39
4718
40
    \code
4719
41
    IndicatorsModel {
4720
42
        id: menuModel
4721
43
    }
4722
44
4723
45
    ListView {
4724
46
        id: view
4725
47
        model: menuModel
4726
48
        Component.onCompleted: menuModel.load()
4727
49
    }
4728
50
    \endcode
4729
51
*/
4730
52
IndicatorsModel::IndicatorsModel(QObject *parent)
4731
53
    : QAbstractListModel(parent)
4732
54
{
4733
55
    m_manager = new IndicatorsManager(this);
4734
56
    QObject::connect(m_manager, SIGNAL(indicatorLoaded(const QString&)), this, SLOT(onIndicatorLoaded(const QString&)));
4735
57
    QObject::connect(m_manager, SIGNAL(indicatorAboutToBeUnloaded(const QString&)), this, SLOT(onIndicatorAboutToBeUnloaded(const QString&)));
4736
58
4737
59
    QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
4738
60
    QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
4739
61
    QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));
4740
62
}
4741
63
4742
64
/*! \internal */
4743
65
IndicatorsModel::~IndicatorsModel()
4744
66
{
4745
67
    disconnect(m_manager, 0, 0, 0);
4746
68
    m_manager->deleteLater();
4747
69
}
4748
70
4749
71
/*!
4750
72
    \qmlproperty IndicatorsModel::count
4751
73
    The number of data entries in the model.
4752
74
4753
75
    \b Note: methods should only be called after the Component has completed.
4754
76
*/
4755
77
int IndicatorsModel::count() const
4756
78
{
4757
79
    return rowCount();
4758
80
}
4759
81
4760
82
/*!
4761
83
    \qmlmethod IndicatorsModel::unload()
4762
84
4763
85
    Load all indicators.
4764
86
*/
4765
87
void IndicatorsModel::load()
4766
88
{
4767
89
    m_indicators.clear();
4768
90
    m_manager->load();
4769
91
}
4770
92
4771
93
/*!
4772
94
    \qmlmethod IndicatorsModel::unload()
4773
95
4774
96
    Unload all indicators.
4775
97
*/
4776
98
void IndicatorsModel::unload()
4777
99
{
4778
100
    m_manager->unload();
4779
101
}
4780
102
4781
103
/*! \internal */
4782
104
void IndicatorsModel::onIndicatorLoaded(const QString& indicator_name)
4783
105
{
4784
106
    Indicator::Ptr indicator = m_manager->indicator(indicator_name);
4785
107
    if (!indicator)
4786
108
    {
4787
109
        return;
4788
110
    }
4789
111
4790
112
    if (m_indicators.indexOf(indicator) >= 0)
4791
113
    {
4792
114
        return;
4793
115
    }
4794
116
4795
117
    // find the insert position
4796
118
    int pos = 0;
4797
119
    while (pos < count())
4798
120
    {
4799
121
        // keep going while the existing priority is less.
4800
122
        if (indicatorData(indicator, IndicatorsModelRole::Priority).toInt() < data(index(pos), IndicatorsModelRole::Priority).toInt())
4801
123
            break;
4802
124
        pos++;
4803
125
    }
4804
126
4805
127
    QObject::connect(indicator.data(), SIGNAL(identifierChanged(const QString&)), this, SLOT(onIdentifierChanged()));
4806
128
    QObject::connect(indicator.data(), SIGNAL(indicatorPropertiesChanged(const QVariant&)), this, SLOT(onIndicatorPropertiesChanged()));
4807
129
4808
130
    beginInsertRows(QModelIndex(), pos, pos);
4809
131
4810
132
    m_indicators.insert(pos, indicator);
4811
133
    endInsertRows();
4812
134
}
4813
135
4814
136
/*! \internal */
4815
137
void IndicatorsModel::onIndicatorAboutToBeUnloaded(const QString& indicator_name)
4816
138
{
4817
139
    Indicator::Ptr indicator = m_manager->indicator(indicator_name);
4818
140
    if (!indicator)
4819
141
    {
4820
142
        return;
4821
143
    }
4822
144
4823
145
    int i = 0;
4824
146
    QMutableListIterator<Indicator::Ptr> iter(m_indicators);
4825
147
    while(iter.hasNext())
4826
148
    {
4827
149
        if (indicator == iter.next())
4828
150
        {
4829
151
            beginRemoveRows(QModelIndex(), i, i);
4830
152
            iter.remove();
4831
153
            endRemoveRows();
4832
154
            break;
4833
155
        }
4834
156
        i++;
4835
157
    }
4836
158
4837
159
}
4838
160
4839
161
/*! \internal */
4840
162
void IndicatorsModel::onIdentifierChanged()
4841
163
{
4842
164
    notifyDataChanged(QObject::sender(), IndicatorsModelRole::Identifier);
4843
165
}
4844
166
4845
167
/*! \internal */
4846
168
void IndicatorsModel::onIndicatorPropertiesChanged()
4847
169
{
4848
170
    notifyDataChanged(QObject::sender(), IndicatorsModelRole::IndicatorProperties);
4849
171
}
4850
172
4851
173
/*! \internal */
4852
174
void IndicatorsModel::notifyDataChanged(QObject *sender, int role)
4853
175
{
4854
176
    Indicator* indicator = qobject_cast<Indicator*>(sender);
4855
177
    if (!indicator)
4856
178
    {
4857
179
        return;
4858
180
    }
4859
181
4860
182
    int index = 0;
4861
183
    QMutableListIterator<Indicator::Ptr> iter(m_indicators);
4862
184
    while(iter.hasNext())
4863
185
    {
4864
186
        if (indicator == iter.next())
4865
187
        {
4866
188
            QModelIndex changedIndex = this->index(index);
4867
189
            dataChanged(changedIndex, changedIndex, QVector<int>() << role);
4868
190
            break;
4869
191
        }
4870
192
        index++;
4871
193
    }
4872
194
}
4873
195
4874
196
/*! \internal */
4875
197
QHash<int, QByteArray> IndicatorsModel::roleNames() const
4876
198
{
4877
199
    static QHash<int, QByteArray> roles;
4878
200
    if (roles.isEmpty())
4879
201
    {
4880
202
        roles[IndicatorsModelRole::Identifier] = "identifier";
4881
203
        roles[IndicatorsModelRole::Priority] = "priority";
4882
204
        roles[IndicatorsModelRole::Title] = "title";
4883
205
        roles[IndicatorsModelRole::Description] = "description";
4884
206
        roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
4885
207
        roles[IndicatorsModelRole::PageSource] = "pageSource";
4886
208
        roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
4887
209
        roles[IndicatorsModelRole::IsValid] = "isValid";
4888
210
    }
4889
211
    return roles;
4890
212
}
4891
213
4892
214
/*! \internal */
4893
215
int IndicatorsModel::columnCount(const QModelIndex &) const
4894
216
{
4895
217
    return 1;
4896
218
}
4897
219
4898
220
/*! \internal */
4899
221
QVariant IndicatorsModel::defaultData(Indicator::Ptr indicator, int role)
4900
222
{
4901
223
    switch (role)
4902
224
    {
4903
225
        case IndicatorsModelRole::Priority:
4904
226
            return 0;
4905
227
        case IndicatorsModelRole::Title:
4906
228
            return indicator ? indicator->identifier() : "Unknown";
4907
229
        case IndicatorsModelRole::Description:
4908
230
            return "";
4909
231
        case IndicatorsModelRole::WidgetSource:
4910
232
            return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";
4911
233
        case IndicatorsModelRole::PageSource:
4912
234
            return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorPage.qml";
4913
235
    }
4914
236
    return QVariant();
4915
237
}
4916
238
4917
239
Q_INVOKABLE QVariant IndicatorsModel::data(int row, int role) const
4918
240
{
4919
241
    return data(index(row, 0), role);
4920
242
}
4921
243
4922
244
/*! \internal */
4923
245
QVariant IndicatorsModel::data(const QModelIndex &index, int role) const
4924
246
{
4925
247
    if (!index.isValid() || index.row() >= m_indicators.size())
4926
248
        return QVariant();
4927
249
4928
250
    Indicator::Ptr indicator = m_indicators[index.row()];
4929
251
4930
252
    switch (role)
4931
253
    {
4932
254
        case IndicatorsModelRole::Identifier:
4933
255
            if (indicator)
4934
256
            {
4935
257
                return QVariant(indicator->identifier());
4936
258
            }
4937
259
            break;
4938
260
        case IndicatorsModelRole::IndicatorProperties:
4939
261
            if (indicator)
4940
262
            {
4941
263
                return QVariant(indicator->indicatorProperties());
4942
264
            }
4943
265
            break;
4944
266
        case IndicatorsModelRole::IsValid:
4945
267
            return (indicator ? true : false);
4946
268
        case IndicatorsModelRole::Priority:
4947
269
        case IndicatorsModelRole::Title:
4948
270
        case IndicatorsModelRole::Description:
4949
271
        case IndicatorsModelRole::WidgetSource:
4950
272
        case IndicatorsModelRole::PageSource:
4951
273
            return indicatorData(indicator, role);
4952
274
        default:
4953
275
            break;
4954
276
    }
4955
277
    return QVariant();
4956
278
}
4957
279
4958
280
QVariant IndicatorsModel::indicatorData(const Indicator::Ptr& indicator, int role) const
4959
281
{
4960
282
    if (indicator && m_parsed_indicator_data.contains(indicator->identifier()))
4961
283
    {
4962
284
        QVariantMap data = m_parsed_indicator_data[indicator->identifier()];
4963
285
        return data.value(roleNames()[role], QVariant());
4964
286
    }
4965
287
    return defaultData(indicator, role);
4966
288
}
4967
289
4968
290
/*! \internal */
4969
291
QModelIndex IndicatorsModel::parent(const QModelIndex&) const
4970
292
{
4971
293
    return QModelIndex();
4972
294
}
4973
295
4974
296
/*! \internal */
4975
297
int IndicatorsModel::rowCount(const QModelIndex&) const
4976
298
{
4977
299
    return m_indicators.count();
4978
300
}
4979
301
4980
302
void IndicatorsModel::setIndicatorData(const QVariant& data)
4981
303
{
4982
304
    m_indicator_data = data;
4983
305
4984
306
    m_parsed_indicator_data.clear();
4985
307
    QMap<QString, QVariant> map = data.toMap();
4986
308
    QMapIterator<QString, QVariant> iter(map);
4987
309
    while(iter.hasNext())
4988
310
    {
4989
311
        iter.next();
4990
312
        m_parsed_indicator_data[iter.key()] = iter.value().toMap();
4991
313
    }
4992
314
4993
315
    Q_EMIT indicatorDataChanged(m_indicator_data);
4994
316
}
4995
317
4996
318
QVariant IndicatorsModel::indicatorData() const
4997
319
{
4998
320
    return m_indicator_data;
4999
321
}
5000
0
322
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2013-07-02	Approve on 2013-07-11
Michał Sawicz			Approve on 2013-07-11
Nicolas d'Offay (community)			Approve on 2013-07-05
Review via email: mp+172582@code.launchpad.net