1
=== modified file 'debian/control'
2
--- debian/control	2014-01-21 16:28:16 +0000
3
+++ debian/control	2014-01-29 14:36:17 +0000
4
@@ -37,6 +37,7 @@
5
37
               qtdeclarative5-private-dev,
37
               qtdeclarative5-private-dev,
6
38
               qtdeclarative5-qtquick2-plugin,
38
               qtdeclarative5-qtquick2-plugin,
7
39
               qtdeclarative5-test-plugin,
39
               qtdeclarative5-test-plugin,
8
40
               qtdeclarative5-ubuntu-settings-components,
9
40
               qtdeclarative5-ubuntu-ui-toolkit-plugin,
41
               qtdeclarative5-ubuntu-ui-toolkit-plugin,
10
41
               qtdeclarative5-xmllistmodel-plugin,
42
               qtdeclarative5-xmllistmodel-plugin,
11
42
               libqt5xmlpatterns5-dev,
43
               libqt5xmlpatterns5-dev,
12
@@ -76,6 +77,7 @@
13
76
         qmenumodel-qml (>= 0.2.7),
77
         qmenumodel-qml (>= 0.2.7),
14
77
         qtdeclarative5-dee-plugin,
78
         qtdeclarative5-dee-plugin,
15
78
         qtdeclarative5-gsettings1.0,
79
         qtdeclarative5-gsettings1.0,
16
80
         qtdeclarative5-ubuntu-settings-components,
17
79
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
81
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
18
80
         qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
82
         qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
19
81
         qtdeclarative5-xmllistmodel-plugin,
83
         qtdeclarative5-xmllistmodel-plugin,
20
82
84
21
=== modified file 'plugins/Unity/Indicators/CMakeLists.txt'
22
--- plugins/Unity/Indicators/CMakeLists.txt	2013-10-23 14:22:27 +0000
23
+++ plugins/Unity/Indicators/CMakeLists.txt	2014-01-29 14:36:17 +0000
24
@@ -12,8 +12,6 @@
25
12
find_package(Qt5Quick REQUIRED)
12
find_package(Qt5Quick REQUIRED)
26
13
13
27
14
add_subdirectory(qml)
14
add_subdirectory(qml)
28
15
add_subdirectory(Messaging)
29
16
add_subdirectory(Network)
30
17
15
31
18
include_directories(
16
include_directories(
32
19
    ${CMAKE_CURRENT_SOURCE_DIR}
17
    ${CMAKE_CURRENT_SOURCE_DIR}
33
20
18
34
=== removed directory 'plugins/Unity/Indicators/Messaging'
35
=== removed file 'plugins/Unity/Indicators/Messaging/CMakeLists.txt'
36
--- plugins/Unity/Indicators/Messaging/CMakeLists.txt	2013-06-28 10:54:46 +0000
37
+++ plugins/Unity/Indicators/Messaging/CMakeLists.txt	1970-01-01 00:00:00 +0000
38
@@ -1,1 +0,0 @@
39
1
add_subdirectory(qml)
40
2
0
41
=== removed directory 'plugins/Unity/Indicators/Messaging/qml'
42
=== removed file 'plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml'
43
--- plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml	2013-08-30 18:21:21 +0000
44
+++ plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml	1970-01-01 00:00:00 +0000
45
@@ -1,69 +0,0 @@
46
1
/*
47
2
 * Copyright 2013 Canonical Ltd.
48
3
 *
49
4
 * This program is free software; you can redistribute it and/or modify
50
5
 * it under the terms of the GNU Lesser General Public License as published by
51
6
 * the Free Software Foundation; version 3.
52
7
 *
53
8
 * This program is distributed in the hope that it will be useful,
54
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
55
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
56
11
 * GNU Lesser General Public License for more details.
57
12
 *
58
13
 * You should have received a copy of the GNU Lesser General Public License
59
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
60
15
 *
61
16
 * Authors:
62
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
63
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
64
19
 */
65
20
66
21
import QtQuick 2.0
67
22
import Ubuntu.Components 0.1
68
23
69
24
Item {
70
25
    id: textField
71
26
    property alias text: replyField.text
72
27
    property alias buttonText: sendButton.text
73
28
    property bool activateEnabled: false
74
29
75
30
    signal activate(var value)
76
31
77
32
    TextField {
78
33
        id: replyField
79
34
80
35
        anchors {
81
36
            top: parent.top
82
37
            bottom: parent.bottom
83
38
            left: parent.left
84
39
            right: sendButton.left
85
40
            rightMargin: units.gu(1)
86
41
        }
87
42
        placeholderText: "Reply"
88
43
        hasClearButton: false
89
44
90
45
        onEnabledChanged: {
91
46
            //Make sure that the component lost focus when enabled = false,
92
47
            //otherwise it will get focus again when enable = true
93
48
            if (!enabled) {
94
49
                focus = false;
95
50
            }
96
51
        }
97
52
    }
98
53
99
54
    Button {
100
55
        id: sendButton
101
56
        anchors {
102
57
            top: parent.top
103
58
            bottom: parent.bottom
104
59
            right: parent.right
105
60
        }
106
61
        width: units.gu(9)
107
62
        enabled: replyField.text !== "" && textField.activateEnabled
108
63
        color: enabled ? "#c94212" : "#bababa"
109
64
110
65
        onClicked: {
111
66
            textField.activate(replyField.text);
112
67
        }
113
68
    }
114
69
}
115
70
0
116
=== removed file 'plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt'
117
--- plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt	2013-08-22 13:05:57 +0000
118
+++ plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
119
@@ -1,5 +0,0 @@
120
1
# export_qmlfiles macro
121
2
include(Plugins)
122
3
123
4
# export the qmldir, *.qml files.
124
5
export_qmlfiles(Unity.Indicators.Messaging Unity/Indicators/Messaging)
125
6
0
126
=== removed file 'plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml'
127
--- plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml	2013-09-16 07:37:30 +0000
128
+++ plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml	1970-01-01 00:00:00 +0000
129
@@ -1,91 +0,0 @@
130
1
/*
131
2
 * Copyright 2013 Canonical Ltd.
132
3
 *
133
4
 * This program is free software; you can redistribute it and/or modify
134
5
 * it under the terms of the GNU Lesser General Public License as published by
135
6
 * the Free Software Foundation; version 3.
136
7
 *
137
8
 * This program is distributed in the hope that it will be useful,
138
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
139
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
140
11
 * GNU Lesser General Public License for more details.
141
12
 *
142
13
 * You should have received a copy of the GNU Lesser General Public License
143
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
144
15
 *
145
16
 * Authors:
146
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
147
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
148
19
 */
149
20
150
21
import QtQuick 2.0
151
22
import Ubuntu.Components 0.1
152
23
import Unity.Indicators 0.1 as Indicators
153
24
154
25
Indicators.BaseMenuItem {
155
26
    id: groupedMessage
156
27
157
28
    property alias title: __title.text
158
29
    property alias count: label.text
159
30
    property string appIcon: "qrc:/indicators/artwork/messaging/default_app.svg"
160
31
161
32
    signal activateApp()
162
33
    signal dismiss()
163
34
164
35
    implicitHeight: units.gu(10)
165
36
166
37
    Row {
167
38
        anchors.fill: parent
168
39
        anchors.margins: units.gu(2)
169
40
        spacing: units.gu(4)
170
41
171
42
        UbuntuShape {
172
43
            height: units.gu(6)
173
44
            width: units.gu(6)
174
45
            image: Image {
175
46
                source: groupedMessage.appIcon
176
47
                fillMode: Image.PreserveAspectFit
177
48
            }
178
49
        }
179
50
180
51
        Label {
181
52
            id: __title
182
53
            anchors.verticalCenter: parent.verticalCenter
183
54
            color: "#e8e1d0"
184
55
            font.weight: Font.DemiBold
185
56
            fontSize: "medium"
186
57
        }
187
58
188
59
        Label {
189
60
            id: label
190
61
            anchors.verticalCenter: parent.verticalCenter
191
62
            width: parent.width - x
192
63
            horizontalAlignment: Text.AlignRight
193
64
            color: "#e8e1d0"
194
65
            font.weight: Font.DemiBold
195
66
            fontSize: "medium"
196
67
            text: "0"
197
68
        }
198
69
    }
199
70
200
71
    Indicators.HLine {
201
72
        anchors.top: parent.top
202
73
        color: "#403b37"
203
74
    }
204
75
205
76
    Indicators.HLine {
206
77
        anchors.bottom: parent.bottom
207
78
        color: "#060606"
208
79
    }
209
80
210
81
    MouseArea {
211
82
        anchors.fill: parent
212
83
        onClicked: {
213
84
            groupedMessage.activateApp();
214
85
        }
215
86
    }
216
87
217
88
    onItemRemoved: {
218
89
        groupedMessage.dismiss();
219
90
    }
220
91
}
221
92
0
222
=== removed file 'plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml'
223
--- plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml	2013-09-26 11:00:33 +0000
224
+++ plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml	1970-01-01 00:00:00 +0000
225
@@ -1,123 +0,0 @@
226
1
/*
227
2
 * Copyright 2013 Canonical Ltd.
228
3
 *
229
4
 * This program is free software; you can redistribute it and/or modify
230
5
 * it under the terms of the GNU Lesser General Public License as published by
231
6
 * the Free Software Foundation; version 3.
232
7
 *
233
8
 * This program is distributed in the hope that it will be useful,
234
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
235
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
236
11
 * GNU Lesser General Public License for more details.
237
12
 *
238
13
 * You should have received a copy of the GNU Lesser General Public License
239
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
240
15
 *
241
16
 * Authors:
242
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
243
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
244
19
 */
245
20
246
21
import QtQuick 2.0
247
22
import Ubuntu.Components 0.1
248
23
import Unity.Indicators 0.1 as Indicators
249
24
250
25
Indicators.BaseMenuItem {
251
26
    id: heroMessage
252
27
253
28
    property alias heroMessageHeader: __heroMessageHeader
254
29
    property real collapsedHeight: heroMessageHeader.y + heroMessageHeader.bodyBottom + units.gu(2)
255
30
    property real expandedHeight: collapsedHeight
256
31
257
32
    property alias avatar: __heroMessageHeader.avatar
258
33
    property alias appIcon: __heroMessageHeader.icon
259
34
260
35
    signal activateApp
261
36
    signal dismiss
262
37
263
38
    removable: state !== "expanded"
264
39
    implicitHeight: collapsedHeight
265
40
266
41
    Rectangle {
267
42
        id: background
268
43
        property real alpha: 0.0
269
44
        anchors.fill: parent
270
45
        color: Qt.rgba(1.0, 1.0, 1.0, alpha)
271
46
        z: -1
272
47
    }
273
48
274
49
    HeroMessageHeader {
275
50
        id: __heroMessageHeader
276
51
277
52
        anchors.top: parent.top
278
53
        anchors.left: parent.left
279
54
        anchors.right: parent.right
280
55
281
56
        avatar: "qrc:/indicators/artwork/messaging/default_contact.png"
282
57
        appIcon: icon
283
58
284
59
        state: heroMessage.state
285
60
286
61
        onAppIconClicked:  {
287
62
            deselectMenu();
288
63
            heroMessage.activateApp();
289
64
        }
290
65
    }
291
66
292
67
    onClicked: {
293
68
        if (menuSelected) {
294
69
            deselectMenu();
295
70
        } else {
296
71
            selectMenu();
297
72
        }
298
73
    }
299
74
300
75
    Indicators.HLine {
301
76
        id: __topHLine
302
77
        anchors.top: parent.top
303
78
        color: "#403b37"
304
79
    }
305
80
306
81
    Indicators.HLine {
307
82
        id: __bottomHLine
308
83
        anchors.bottom: parent.bottom
309
84
        color: "#060606"
310
85
    }
311
86
312
87
    states: State {
313
88
        name: "expanded"
314
89
        when: menuSelected
315
90
316
91
        PropertyChanges {
317
92
            target: heroMessage
318
93
            implicitHeight: heroMessage.expandedHeight
319
94
        }
320
95
        PropertyChanges {
321
96
            target: background
322
97
            alpha: 0.05
323
98
        }
324
99
        PropertyChanges {
325
100
            target: __topHLine
326
101
            opacity: 0.0
327
102
        }
328
103
        PropertyChanges {
329
104
            target: __bottomHLine
330
105
            opacity: 0.0
331
106
        }
332
107
    }
333
108
334
109
    transitions: Transition {
335
110
        ParallelAnimation {
336
111
            NumberAnimation {
337
112
                properties: "opacity,implicitHeight"
338
113
                duration: 200
339
114
                easing.type: Easing.OutQuad
340
115
            }
341
116
            ColorAnimation {}
342
117
        }
343
118
    }
344
119
345
120
    onItemRemoved: {
346
121
        heroMessage.dismiss();
347
122
    }
348
123
}
349
124
0
350
=== removed file 'plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml'
351
--- plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml	2013-07-03 10:39:22 +0000
352
+++ plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml	1970-01-01 00:00:00 +0000
353
@@ -1,161 +0,0 @@
354
1
/*
355
2
 * Copyright 2013 Canonical Ltd.
356
3
 *
357
4
 * This program is free software; you can redistribute it and/or modify
358
5
 * it under the terms of the GNU Lesser General Public License as published by
359
6
 * the Free Software Foundation; version 3.
360
7
 *
361
8
 * This program is distributed in the hope that it will be useful,
362
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
363
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
364
11
 * GNU Lesser General Public License for more details.
365
12
 *
366
13
 * You should have received a copy of the GNU Lesser General Public License
367
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
368
15
 *
369
16
 * Authors:
370
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
371
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
372
19
 */
373
20
374
21
import QtQuick 2.0
375
22
import Ubuntu.Components 0.1
376
23
377
24
Item {
378
25
    id: heroMessageHeader
379
26
380
27
    property alias avatar: avatarImage.source
381
28
    property alias icon: iconImage.source
382
29
    property alias appIcon: appIconImage.source
383
30
    property alias titleText: __titleText
384
31
    property alias subtitleText: __subtitleText
385
32
    property alias bodyText: __bodyText
386
33
    property real bodyBottom: bodyText.y + bodyText.height
387
34
388
35
    signal appIconClicked()
389
36
390
37
    height: units.gu(9)
391
38
392
39
    UbuntuShape {
393
40
        id: avatarImageContainer
394
41
        anchors {
395
42
            top: parent.top
396
43
            topMargin: units.gu(2)
397
44
            left: parent.left
398
45
            leftMargin: units.gu(2)
399
46
        }
400
47
        height: units.gu(6)
401
48
        width: units.gu(6)
402
49
        image: Image {
403
50
            id: avatarImage
404
51
            fillMode: Image.PreserveAspectFit
405
52
        }
406
53
    }
407
54
408
55
    Image {
409
56
        id: iconImage
410
57
        anchors {
411
58
            top: parent.top
412
59
            topMargin: units.gu(2)
413
60
            left: avatarImageContainer.right
414
61
            leftMargin: units.gu(1)
415
62
        }
416
63
        height: units.gu(1.5)
417
64
        width: units.gu(2)
418
65
        horizontalAlignment: Image.AlignHCenter
419
66
        verticalAlignment: Image.AlignBottom
420
67
        fillMode: Image.PreserveAspectFit
421
68
    }
422
69
423
70
    Label {
424
71
        id: __titleText
425
72
        anchors {
426
73
            baseline: iconImage.bottom
427
74
            left: iconImage.right
428
75
            leftMargin: units.gu(1)
429
76
            right: __appIcon.left
430
77
            rightMargin: units.gu(2)
431
78
        }
432
79
        elide: Text.ElideRight
433
80
        color: "#e8e1d0"
434
81
        font.weight: Font.DemiBold
435
82
        fontSize: "medium"
436
83
    }
437
84
438
85
    Label {
439
86
        id: __subtitleText
440
87
        anchors {
441
88
            baseline: __titleText.baseline
442
89
            baselineOffset: units.gu(2.5)
443
90
            left: __titleText.left
444
91
            right: __titleText.right
445
92
        }
446
93
        elide: Text.ElideRight
447
94
        color: "#8f8f88"
448
95
        fontSize: "small"
449
96
    }
450
97
451
98
    Label {
452
99
        id: __bodyText
453
100
        anchors {
454
101
            baseline: __subtitleText.baseline
455
102
            baselineOffset: units.gu(2.5)
456
103
            left: __titleText.left
457
104
            right: parent.right
458
105
            rightMargin: units.gu(2)
459
106
        }
460
107
        maximumLineCount: 2
461
108
        wrapMode: Text.WordWrap
462
109
        elide: Text.ElideRight
463
110
        color: "#e8e1d0"
464
111
        fontSize: "small"
465
112
    }
466
113
467
114
    Item {
468
115
        id: __appIcon
469
116
        width: units.gu(7)
470
117
        height: units.gu(7)
471
118
        anchors {
472
119
            top: parent.top
473
120
            right: parent.right
474
121
        }
475
122
        opacity: 0.0
476
123
        enabled: heroMessageHeader.state === "expanded"
477
124
478
125
        Image {
479
126
            id: appIconImage
480
127
            height: width
481
128
            anchors {
482
129
                left: parent.left
483
130
                leftMargin: units.gu(2)
484
131
                right: parent.right
485
132
                rightMargin: units.gu(2)
486
133
                topMargin: units.gu(1)
487
134
                verticalCenter: parent.verticalCenter
488
135
            }
489
136
            fillMode: Image.PreserveAspectFit
490
137
        }
491
138
492
139
        MouseArea {
493
140
            anchors.fill: parent
494
141
            onClicked: heroMessageHeader.appIconClicked()
495
142
        }
496
143
    }
497
144
498
145
    states: State {
499
146
        name: "expanded"
500
147
501
148
        PropertyChanges {
502
149
            target: __appIcon
503
150
            opacity: 1.0
504
151
        }
505
152
    }
506
153
507
154
    transitions: Transition {
508
155
        NumberAnimation {
509
156
            property: "opacity"
510
157
            duration: 200
511
158
            easing.type: Easing.OutQuad
512
159
        }
513
160
    }
514
161
}
515
162
0
516
=== removed file 'plugins/Unity/Indicators/Messaging/qml/QuickReply.qml'
517
--- plugins/Unity/Indicators/Messaging/qml/QuickReply.qml	2013-10-01 19:26:10 +0000
518
+++ plugins/Unity/Indicators/Messaging/qml/QuickReply.qml	1970-01-01 00:00:00 +0000
519
@@ -1,165 +0,0 @@
520
1
/*
521
2
 * Copyright 2013 Canonical Ltd.
522
3
 *
523
4
 * This program is free software; you can redistribute it and/or modify
524
5
 * it under the terms of the GNU Lesser General Public License as published by
525
6
 * the Free Software Foundation; version 3.
526
7
 *
527
8
 * This program is distributed in the hope that it will be useful,
528
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
529
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
530
11
 * GNU Lesser General Public License for more details.
531
12
 *
532
13
 * You should have received a copy of the GNU Lesser General Public License
533
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
534
15
 *
535
16
 * Authors:
536
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
537
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
538
19
 */
539
20
540
21
import QtQuick 2.0
541
22
import Ubuntu.Components 0.1
542
23
import Unity.Indicators 0.1 as Indicators
543
24
544
25
Item {
545
26
    id: quickReply
546
27
    property alias buttonText: actionTextField.buttonText
547
28
    property real expandedHeight: childrenRect.height
548
29
    property alias messages : messagelistRepeater.model
549
30
    property alias replyEnabled: actionTextField.activateEnabled
550
31
551
32
    signal reply(var value)
552
33
553
34
    Item {
554
35
        id: header
555
36
        anchors.top: parent.top
556
37
        anchors.left: parent.left
557
38
        anchors.right: parent.right
558
39
        height: units.gu(4)
559
40
560
41
        Row {
561
42
            anchors {
562
43
                fill: parent
563
44
                leftMargin: units.gu(2)
564
45
                rightMargin: units.gu(2)
565
46
                topMargin: units.gu(1)
566
47
                bottomMargin: units.gu(1)
567
48
            }
568
49
            spacing: units.gu(1)
569
50
570
51
            Image {
571
52
                width: units.gu(2)
572
53
                height: width
573
54
                fillMode: Image.PreserveAspectFit
574
55
                source: "qrc:/indicators/artwork/messaging/message_sms01_54px.png"
575
56
            }
576
57
577
58
            Label {
578
59
                height: parent.height
579
60
                verticalAlignment: Text.AlignVCenter
580
61
                fontSize: "small"
581
62
                color: "#8f8f88"
582
63
                text: "Quick reply with:"
583
64
            }
584
65
        }
585
66
586
67
        Indicators.HLine {
587
68
            anchors.bottom: parent.bottom
588
69
            color: "#20201F"
589
70
        }
590
71
    }
591
72
592
73
    Column {
593
74
        id: messagelist
594
75
        anchors {
595
76
            left: parent.left
596
77
            right: parent.right
597
78
            top: header.bottom
598
79
        }
599
80
        height: childrenRect.height
600
81
601
82
        Repeater {
602
83
            id: messagelistRepeater
603
84
604
85
            height: childrenRect.height
605
86
606
87
            Item {
607
88
                width: messagelist.width
608
89
                height: units.gu(5)
609
90
610
91
                Label {
611
92
                    id: __label
612
93
613
94
                    anchors {
614
95
                        fill: parent
615
96
                        leftMargin: units.gu(2)
616
97
                        rightMargin: units.gu(2)
617
98
                    }
618
99
                    verticalAlignment: Text.AlignVCenter
619
100
                    fontSize: "medium"
620
101
                    color: "#e8e1d0"
621
102
                    text: modelData
622
103
                }
623
104
624
105
                Indicators.HLine {
625
106
                    anchors.top: parent.top
626
107
                    color: "#464543"
627
108
                }
628
109
629
110
                Indicators.HLine {
630
111
                    anchors.bottom: parent.bottom
631
112
                    color: "#20201F"
632
113
                }
633
114
634
115
                MouseArea {
635
116
                    id: __mouseArea
636
117
637
118
                    anchors.fill: parent
638
119
                    onClicked: {
639
120
                        actionTextField.text = modelData;
640
121
                    }
641
122
                }
642
123
643
124
                Rectangle {
644
125
                    id: __mask
645
126
646
127
                    anchors.fill: parent
647
128
                    color: "black"
648
129
                    opacity: __mouseArea.pressed ? 0.3 : 0.0
649
130
                    Behavior on opacity {
650
131
                        NumberAnimation {
651
132
                            duration: 200
652
133
                            easing.type: Easing.OutQuad
653
134
                        }
654
135
                    }
655
136
                }
656
137
            }
657
138
658
139
        }
659
140
    }
660
141
661
142
    Item {
662
143
        anchors.top: messagelist.bottom
663
144
        anchors.left: parent.left
664
145
        anchors.right: parent.right
665
146
        height: units.gu(6)
666
147
667
148
        ActionTextField {
668
149
            id: actionTextField
669
150
670
151
            anchors.fill: parent
671
152
            anchors.margins: units.gu(1)
672
153
            activateEnabled: replyEnabled
673
154
674
155
            onActivate: {
675
156
                quickReply.reply(value)
676
157
            }
677
158
        }
678
159
679
160
        Indicators.HLine {
680
161
            anchors.top: parent.top
681
162
            color: "#464543"
682
163
        }
683
164
    }
684
165
}
685
166
0
686
=== removed file 'plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml'
687
--- plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml	2013-10-23 14:26:51 +0000
688
+++ plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml	1970-01-01 00:00:00 +0000
689
@@ -1,108 +0,0 @@
690
1
/*
691
2
 * Copyright 2013 Canonical Ltd.
692
3
 *
693
4
 * This program is free software; you can redistribute it and/or modify
694
5
 * it under the terms of the GNU Lesser General Public License as published by
695
6
 * the Free Software Foundation; version 3.
696
7
 *
697
8
 * This program is distributed in the hope that it will be useful,
698
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
699
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
700
11
 * GNU Lesser General Public License for more details.
701
12
 *
702
13
 * You should have received a copy of the GNU Lesser General Public License
703
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
704
15
 *
705
16
 * Authors:
706
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
707
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
708
19
 */
709
20
710
21
import QtQuick 2.0
711
22
import Ubuntu.Components 0.1
712
23
import Unity.Indicators 0.1
713
24
import Utils 0.1 as Utils
714
25
715
26
HeroMessage {
716
27
    id: __heroMessage
717
28
718
29
    property string title: ""
719
30
    property var time
720
31
    property string message: ""
721
32
722
33
    property alias footer: footerLoader.sourceComponent
723
34
724
35
    expandedHeight: fullMessage.y + fullMessage.height + units.gu(2)
725
36
    heroMessageHeader.titleText.text: title
726
37
    heroMessageHeader.subtitleText.text: timeFormatter.timeString
727
38
    heroMessageHeader.bodyText.text: message
728
39
729
40
    Item {
730
41
        id: fullMessage
731
42
732
43
        anchors {
733
44
            left: parent.left
734
45
            leftMargin: units.gu(2)
735
46
            right: parent.right
736
47
            rightMargin: units.gu(2)
737
48
            top: heroMessageHeader.bottom
738
49
        }
739
50
        height: childrenRect.height
740
51
        opacity: 0.0
741
52
        enabled: false
742
53
743
54
        Utils.TimeFormatter {
744
55
            id: timeFormatter
745
56
            time: __heroMessage.time
746
57
            format: "hh:mm - MMM dd"
747
58
        }
748
59
749
60
        Label {
750
61
            id: bodyText
751
62
            anchors {
752
63
                top: parent.top
753
64
                left: parent.left
754
65
                right: parent.right
755
66
            }
756
67
            wrapMode: Text.WordWrap
757
68
            elide: Text.ElideRight
758
69
            color: "#e8e1d0"
759
70
            fontSize: "medium"
760
71
            text: heroMessageHeader.bodyText.text
761
72
        }
762
73
763
74
        Loader {
764
75
            id: footerLoader
765
76
766
77
            anchors {
767
78
                top: bodyText.bottom
768
79
                topMargin: units.gu(2)
769
80
                left: parent.left
770
81
                right: parent.right
771
82
            }
772
83
            height: item != undefined ? units.gu(4) : 0
773
84
        }
774
85
775
86
        states: State {
776
87
            name: "expanded"
777
88
            when: __heroMessage.state === "expanded"
778
89
779
90
            PropertyChanges {
780
91
                target: heroMessageHeader.bodyText
781
92
                opacity: 0.0
782
93
            }
783
94
784
95
            PropertyChanges {
785
96
                target: fullMessage
786
97
                opacity: 1.0
787
98
                enabled: true
788
99
            }
789
100
        }
790
101
        transitions: Transition {
791
102
            NumberAnimation {
792
103
                property: "opacity"
793
104
                duration: 200
794
105
            }
795
106
        }
796
107
    }
797
108
}
798
109
0
799
=== removed file 'plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml'
800
--- plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml	2013-10-23 14:26:51 +0000
801
+++ plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml	1970-01-01 00:00:00 +0000
802
@@ -1,167 +0,0 @@
803
1
/*
804
2
 * Copyright 2013 Canonical Ltd.
805
3
 *
806
4
 * This program is free software; you can redistribute it and/or modify
807
5
 * it under the terms of the GNU Lesser General Public License as published by
808
6
 * the Free Software Foundation; version 3.
809
7
 *
810
8
 * This program is distributed in the hope that it will be useful,
811
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
812
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
813
11
 * GNU Lesser General Public License for more details.
814
12
 *
815
13
 * You should have received a copy of the GNU Lesser General Public License
816
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
817
15
 *
818
16
 * Authors:
819
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
820
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
821
19
 */
822
20
823
21
import QtQuick 2.0
824
22
import Ubuntu.Components 0.1
825
23
import Unity.Indicators 0.1
826
24
import Utils 0.1 as Utils
827
25
828
26
HeroMessage {
829
27
    id: snapDecision
830
28
831
29
    property string title: ""
832
30
    property var time
833
31
    property string message: ""
834
32
835
33
    property bool activateEnabled: true
836
34
    property alias actionButtonText: actionButton.text
837
35
838
36
    property bool replyEnabled: true
839
37
    property alias replyMessages: quickreply.messages
840
38
    property alias replyButtonText: quickreply.buttonText
841
39
842
40
    expandedHeight: buttons.y + buttons.height + quickreply.height + units.gu(2)
843
41
    heroMessageHeader.titleText.text:  title
844
42
    heroMessageHeader.subtitleText.text: message
845
43
    heroMessageHeader.subtitleText.color: "#e8e1d0"
846
44
    heroMessageHeader.bodyText.text: timeFormatter.timeString
847
45
    heroMessageHeader.bodyText.color: "#8f8f88"
848
46
849
47
    signal activate
850
48
    signal reply(string value)
851
49
852
50
    Item {
853
51
        id: buttons
854
52
855
53
        anchors.left: parent.left
856
54
        anchors.leftMargin: units.gu(2)
857
55
        anchors.right: parent.right
858
56
        anchors.rightMargin: units.gu(2)
859
57
        anchors.top: heroMessageHeader.bottom
860
58
        anchors.topMargin: units.gu(1)
861
59
        height: units.gu(4)
862
60
        opacity: 0.0
863
61
864
62
        Utils.TimeFormatter {
865
63
            id: timeFormatter
866
64
            time: snapDecision.time
867
65
            format: "hh:mm - MMM dd"
868
66
        }
869
67
870
68
        Button {
871
69
            text: "Message"
872
70
            color: "#bababa"
873
71
            anchors.left: parent.left
874
72
            anchors.top: parent.top
875
73
            anchors.bottom: parent.bottom
876
74
            width: (parent.width - units.gu(1)) / 2
877
75
878
76
            onClicked: {
879
77
                if (quickreply.state === "") {
880
78
                    quickreply.state = "expanded";
881
79
                } else {
882
80
                    quickreply.state = "";
883
81
                }
884
82
            }
885
83
        }
886
84
887
85
        Button {
888
86
            id: actionButton
889
87
            text: "Call back"
890
88
            color: enabled ? "#c94212" : "#bababa"
891
89
            anchors.right: parent.right
892
90
            anchors.top: parent.top
893
91
            anchors.bottom: parent.bottom
894
92
            width: (parent.width - units.gu(1)) / 2
895
93
            enabled: snapDecision.activateEnabled
896
94
897
95
            onClicked: {
898
96
                snapDecision.activate();
899
97
            }
900
98
        }
901
99
902
100
        states: State {
903
101
            name: "expanded"
904
102
            when: snapDecision.state === "expanded"
905
103
906
104
            PropertyChanges {
907
105
                target: buttons
908
106
                opacity: 1.0
909
107
            }
910
108
        }
911
109
        transitions: Transition {
912
110
            NumberAnimation {
913
111
                property: "opacity"
914
112
                duration: 200
915
113
                easing.type: Easing.OutQuad
916
114
            }
917
115
        }
918
116
    }
919
117
920
118
    QuickReply {
921
119
        id: quickreply
922
120
923
121
        onReply: {
924
122
            snapDecision.reply(value);
925
123
        }
926
124
927
125
        messages: ""
928
126
        buttonText: "Send"
929
127
        anchors {
930
128
            top: buttons.bottom
931
129
            topMargin: units.gu(2)
932
130
            left: parent.left
933
131
            right: parent.right
934
132
        }
935
133
        height: 0
936
134
        opacity: 0.0
937
135
        enabled: false
938
136
        replyEnabled: snapDecision.replyEnabled
939
137
940
138
        states: State {
941
139
            name: "expanded"
942
140
943
141
            PropertyChanges {
944
142
                target: quickreply
945
143
                height: expandedHeight
946
144
                opacity: 1.0
947
145
            }
948
146
949
147
            PropertyChanges {
950
148
                target: quickreply
951
149
                enabled: true
952
150
            }
953
151
        }
954
152
955
153
        transitions: Transition {
956
154
            NumberAnimation {
957
155
                properties: "opacity,height"
958
156
                duration: 200
959
157
                easing.type: Easing.OutQuad
960
158
            }
961
159
        }
962
160
    }
963
161
964
162
    onStateChanged: {
965
163
        if (state === "") {
966
164
            quickreply.state = "";
967
165
        }
968
166
    }
969
167
}
970
168
0
971
=== removed file 'plugins/Unity/Indicators/Messaging/qml/TextMessage.qml'
972
--- plugins/Unity/Indicators/Messaging/qml/TextMessage.qml	2013-08-30 18:21:21 +0000
973
+++ plugins/Unity/Indicators/Messaging/qml/TextMessage.qml	1970-01-01 00:00:00 +0000
974
@@ -1,43 +0,0 @@
975
1
/*
976
2
 * Copyright 2013 Canonical Ltd.
977
3
 *
978
4
 * This program is free software; you can redistribute it and/or modify
979
5
 * it under the terms of the GNU Lesser General Public License as published by
980
6
 * the Free Software Foundation; version 3.
981
7
 *
982
8
 * This program is distributed in the hope that it will be useful,
983
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
984
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
985
11
 * GNU Lesser General Public License for more details.
986
12
 *
987
13
 * You should have received a copy of the GNU Lesser General Public License
988
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
989
15
 *
990
16
 * Authors:
991
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
992
18
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
993
19
 */
994
20
995
21
import QtQuick 2.0
996
22
import Ubuntu.Components 0.1
997
23
import Unity.Indicators 0.1 as Indicators
998
24
999
25
SimpleTextMessage {
1000
26
    id: simpleMessage
1001
27
1002
28
    property bool replyEnabled: false
1003
29
    property string replyButtonText: "Send"
1004
30
1005
31
    signal reply(string value)
1006
32
1007
33
    footer: ActionTextField {
1008
34
        anchors.fill:  parent
1009
35
1010
36
        activateEnabled: simpleMessage.replyEnabled
1011
37
        buttonText: simpleMessage.replyButtonText
1012
38
1013
39
        onActivate: {
1014
40
            simpleMessage.reply(value);
1015
41
        }
1016
42
    }
1017
43
}
1018
44
0
1019
=== removed file 'plugins/Unity/Indicators/Messaging/qml/qmldir'
1020
--- plugins/Unity/Indicators/Messaging/qml/qmldir	2013-08-22 13:05:57 +0000
1021
+++ plugins/Unity/Indicators/Messaging/qml/qmldir	1970-01-01 00:00:00 +0000
1022
@@ -1,12 +0,0 @@
1023
1
module Unity.Indicators.Messaging
1024
2
1025
3
ActionButton 0.1 ActionButton.qml
1026
4
ActionTextField 0.1 ActionTextField.qml
1027
5
GroupedMessage 0.1 GroupedMessage.qml
1028
6
HeroMessage 0.1 HeroMessage.qml
1029
7
HeroMessageHeader 0.1 HeroMessageHeader.qml
1030
8
MessageMenuItemFactory 0.1 MessageMenuItemFactory.qml
1031
9
QuickReply 0.1 QuickReply.qml
1032
10
SimpleTextMessage 0.1 SimpleTextMessage.qml
1033
11
SnapDecision 0.1 SnapDecision.qml
1034
12
TextMessage 0.1 TextMessage.qml
1035
13
\ No newline at end of file
0
\ No newline at end of file
1036
14
1
1037
=== removed directory 'plugins/Unity/Indicators/Network'
1038
=== removed file 'plugins/Unity/Indicators/Network/CMakeLists.txt'
1039
--- plugins/Unity/Indicators/Network/CMakeLists.txt	2013-09-30 20:22:18 +0000
1040
+++ plugins/Unity/Indicators/Network/CMakeLists.txt	1970-01-01 00:00:00 +0000
1041
@@ -1,1 +0,0 @@
1042
1
add_subdirectory(qml)
1043
2
0
1044
=== removed directory 'plugins/Unity/Indicators/Network/qml'
1045
=== removed file 'plugins/Unity/Indicators/Network/qml/AccessPoint.qml'
1046
--- plugins/Unity/Indicators/Network/qml/AccessPoint.qml	2013-12-12 16:32:20 +0000
1047
+++ plugins/Unity/Indicators/Network/qml/AccessPoint.qml	1970-01-01 00:00:00 +0000
1048
@@ -1,117 +0,0 @@
1049
1
/*
1050
2
 * Copyright 2013 Canonical Ltd.
1051
3
 *
1052
4
 * This program is free software; you can redistribute it and/or modify
1053
5
 * it under the terms of the GNU Lesser General Public License as published by
1054
6
 * the Free Software Foundation; version 3.
1055
7
 *
1056
8
 * This program is distributed in the hope that it will be useful,
1057
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1058
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1059
11
 * GNU Lesser General Public License for more details.
1060
12
 *
1061
13
 * You should have received a copy of the GNU Lesser General Public License
1062
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1063
15
 *
1064
16
 * Authors:
1065
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1066
18
 */
1067
19
1068
20
import QtQuick 2.0
1069
21
import Ubuntu.Components 0.1
1070
22
import Ubuntu.Components.ListItems 0.1 as ListItem
1071
23
import Unity.Indicators 0.1 as Indicators
1072
24
1073
25
Indicators.BaseMenuItem {
1074
26
    id: menuItem
1075
27
    implicitHeight: units.gu(5.5)
1076
28
1077
29
    property bool checked: false
1078
30
    property bool secure: false
1079
31
    property bool adHoc: false
1080
32
    property int signalStrength: 0
1081
33
    property alias label: _label.text
1082
34
1083
35
    signal activate()
1084
36
1085
37
    onCheckedChanged: {
1086
38
        // Can't rely on binding. Checked is assigned on click.
1087
39
        checkBoxActive.checked = checked;
1088
40
    }
1089
41
1090
42
    onClicked: {
1091
43
        checkBoxActive.clicked();
1092
44
    }
1093
45
1094
46
    CheckBox {
1095
47
        id: checkBoxActive
1096
48
        height: units.gu(3)
1097
49
        width: units.gu(3)
1098
50
1099
51
        anchors {
1100
52
            left: parent.left
1101
53
            leftMargin: menuItem.__contentsMargins
1102
54
            verticalCenter: parent.verticalCenter
1103
55
        }
1104
56
1105
57
        onClicked: {
1106
58
            menuItem.activate();
1107
59
        }
1108
60
    }
1109
61
1110
62
    Image {
1111
63
        id: iconSignal
1112
64
1113
65
        width: height
1114
66
        height: Math.min(units.gu(5), parent.height - units.gu(1))
1115
67
        anchors {
1116
68
            left: checkBoxActive.right
1117
69
            leftMargin: units.gu(1)
1118
70
            verticalCenter: parent.verticalCenter
1119
71
        }
1120
72
1121
73
        source: {
1122
74
            var imageName = "nm-signal-100"
1123
75
1124
76
            if (adHoc) {
1125
77
                imageName = "nm-adhoc";
1126
78
            } else if (signalStrength == 0) {
1127
79
                imageName = "nm-signal-00";
1128
80
            } else if (signalStrength <= 25) {
1129
81
                imageName = "nm-signal-25";
1130
82
            } else if (signalStrength <= 50) {
1131
83
                imageName = "nm-signal-50";
1132
84
            } else if (signalStrength <= 75) {
1133
85
                imageName = "nm-signal-75";
1134
86
            }
1135
87
            return "image://theme/" + imageName;
1136
88
        }
1137
89
    }
1138
90
1139
91
    Label {
1140
92
        id: _label
1141
93
        anchors {
1142
94
            left: iconSignal.right
1143
95
            leftMargin: units.gu(1)
1144
96
            verticalCenter: parent.verticalCenter
1145
97
            right: iconSecure.visible ? iconSecure.left : parent.right
1146
98
            rightMargin: menuItem.__contentsMargins
1147
99
        }
1148
100
        elide: Text.ElideRight
1149
101
        opacity: label.enabled ? 1.0 : 0.5
1150
102
    }
1151
103
1152
104
    Image {
1153
105
        id: iconSecure
1154
106
        visible: secure
1155
107
        source: "qrc:/indicators/artwork/network/secure.svg"
1156
108
1157
109
        width: height
1158
110
        height: Math.min(units.gu(4), parent.height - units.gu(1))
1159
111
        anchors {
1160
112
            right: parent.right
1161
113
            rightMargin: units.gu(1)
1162
114
            verticalCenter: parent.verticalCenter
1163
115
        }
1164
116
    }
1165
117
}
1166
118
0
1167
=== removed file 'plugins/Unity/Indicators/Network/qml/CMakeLists.txt'
1168
--- plugins/Unity/Indicators/Network/qml/CMakeLists.txt	2013-08-20 19:50:07 +0000
1169
+++ plugins/Unity/Indicators/Network/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
1170
@@ -1,5 +0,0 @@
1171
1
# export_qmlplugin macro
1172
2
include(Plugins)
1173
3
1174
4
# export the qmldir, *.qml files.
1175
5
export_qmlfiles(Unity.Indicators.Network Unity/Indicators/Network)
1176
6
0
1177
=== removed file 'plugins/Unity/Indicators/Network/qml/qmldir'
1178
--- plugins/Unity/Indicators/Network/qml/qmldir	2013-10-03 10:59:32 +0000
1179
+++ plugins/Unity/Indicators/Network/qml/qmldir	1970-01-01 00:00:00 +0000
1180
@@ -1,3 +0,0 @@
1181
1
module Unity.Indicators.Network
1182
2
1183
3
AccessPoint 0.1 AccessPoint.qml
1184
4
0
1185
=== removed file 'plugins/Unity/Indicators/qml/BaseMenuItem.qml'
1186
--- plugins/Unity/Indicators/qml/BaseMenuItem.qml	2013-08-22 13:05:57 +0000
1187
+++ plugins/Unity/Indicators/qml/BaseMenuItem.qml	1970-01-01 00:00:00 +0000
1188
@@ -1,38 +0,0 @@
1189
1
/*
1190
2
 * Copyright 2013 Canonical Ltd.
1191
3
 *
1192
4
 * This program is free software; you can redistribute it and/or modify
1193
5
 * it under the terms of the GNU Lesser General Public License as published by
1194
6
 * the Free Software Foundation; version 3.
1195
7
 *
1196
8
 * This program is distributed in the hope that it will be useful,
1197
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1198
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1199
11
 * GNU Lesser General Public License for more details.
1200
12
 *
1201
13
 * You should have received a copy of the GNU Lesser General Public License
1202
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1203
15
 *
1204
16
 * Authors:
1205
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1206
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
1207
19
 */
1208
20
1209
21
import QtQuick 2.0
1210
22
import Ubuntu.Components.ListItems 0.1 as ListItem
1211
23
1212
24
ListItem.Standard {
1213
25
    id: baseMenu
1214
26
1215
27
    property bool menuSelected: false
1216
28
1217
29
    signal selectMenu()
1218
30
    signal deselectMenu()
1219
31
1220
32
    showDivider: false
1221
33
    __foregroundColor: "#e8e1d0" // FIXME not in palette yet
1222
34
1223
35
    backgroundIndicator: RemoveBackground {
1224
36
        state: baseMenu.swipingState
1225
37
    }
1226
38
}
1227
39
0
1228
=== removed file 'plugins/Unity/Indicators/qml/ButtonMenuItem.qml'
1229
--- plugins/Unity/Indicators/qml/ButtonMenuItem.qml	2013-12-12 16:32:20 +0000
1230
+++ plugins/Unity/Indicators/qml/ButtonMenuItem.qml	1970-01-01 00:00:00 +0000
1231
@@ -1,44 +0,0 @@
1232
1
/*
1233
2
 * Copyright 2013 Canonical Ltd.
1234
3
 *
1235
4
 * This program is free software; you can redistribute it and/or modify
1236
5
 * it under the terms of the GNU Lesser General Public License as published by
1237
6
 * the Free Software Foundation; version 3.
1238
7
 *
1239
8
 * This program is distributed in the hope that it will be useful,
1240
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1241
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1242
11
 * GNU Lesser General Public License for more details.
1243
12
 *
1244
13
 * You should have received a copy of the GNU Lesser General Public License
1245
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1246
15
 *
1247
16
 * Authors:
1248
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1249
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
1250
19
 */
1251
20
1252
21
import QtQuick 2.0
1253
22
import Ubuntu.Components 0.1
1254
23
import Unity.Indicators 0.1 as Indicators
1255
24
1256
25
BaseMenuItem {
1257
26
    id: menuItem
1258
27
    implicitHeight: units.gu(7)
1259
28
1260
29
    property alias buttonText: button.text
1261
30
1262
31
    signal activate()
1263
32
1264
33
    Button {
1265
34
        id: button
1266
35
        anchors.centerIn: parent
1267
36
        height: units.gu(4)
1268
37
        width: units.gu(16)
1269
38
        color: "#1b1817"
1270
39
1271
40
        onClicked: {
1272
41
            menuItem.activate();
1273
42
        }
1274
43
    }
1275
44
}
1276
45
0
1277
=== removed file 'plugins/Unity/Indicators/qml/DivMenuItem.qml'
1278
--- plugins/Unity/Indicators/qml/DivMenuItem.qml	2013-08-14 09:07:45 +0000
1279
+++ plugins/Unity/Indicators/qml/DivMenuItem.qml	1970-01-01 00:00:00 +0000
1280
@@ -1,26 +0,0 @@
1281
1
/*
1282
2
 * Copyright 2013 Canonical Ltd.
1283
3
 *
1284
4
 * This program is free software; you can redistribute it and/or modify
1285
5
 * it under the terms of the GNU Lesser General Public License as published by
1286
6
 * the Free Software Foundation; version 3.
1287
7
 *
1288
8
 * This program is distributed in the hope that it will be useful,
1289
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1290
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1291
11
 * GNU Lesser General Public License for more details.
1292
12
 *
1293
13
 * You should have received a copy of the GNU Lesser General Public License
1294
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1295
15
 *
1296
16
 * Authors:
1297
17
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
1298
18
 */
1299
19
1300
20
import QtQuick 2.0
1301
21
import Ubuntu.Components 0.1
1302
22
1303
23
Rectangle {
1304
24
    color: "#181514" // FIXME not in palette yet
1305
25
    implicitHeight: units.gu(1)
1306
26
}
1307
27
0
1308
=== removed file 'plugins/Unity/Indicators/qml/FramedMenuItem.qml'
1309
--- plugins/Unity/Indicators/qml/FramedMenuItem.qml	2013-08-23 11:17:06 +0000
1310
+++ plugins/Unity/Indicators/qml/FramedMenuItem.qml	1970-01-01 00:00:00 +0000
1311
@@ -1,39 +0,0 @@
1312
1
/*
1313
2
 * Copyright 2013 Canonical Ltd.
1314
3
 *
1315
4
 * This program is free software; you can redistribute it and/or modify
1316
5
 * it under the terms of the GNU Lesser General Public License as published by
1317
6
 * the Free Software Foundation; version 3.
1318
7
 *
1319
8
 * This program is distributed in the hope that it will be useful,
1320
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1321
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1322
11
 * GNU Lesser General Public License for more details.
1323
12
 *
1324
13
 * You should have received a copy of the GNU Lesser General Public License
1325
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1326
15
 *
1327
16
 * Authors:
1328
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1329
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
1330
19
 */
1331
20
1332
21
import QtQuick 2.0
1333
22
import Ubuntu.Components 0.1
1334
23
import Ubuntu.Components.ListItems 0.1 as ListItem
1335
24
1336
25
BaseMenuItem {
1337
26
    implicitHeight: units.gu(7)
1338
27
1339
28
    iconFrame: false
1340
29
1341
30
    HLine {
1342
31
        anchors.top: parent.top
1343
32
        color: "#403b37" // FIXME not in palette yet
1344
33
    }
1345
34
1346
35
    HLine {
1347
36
        anchors.bottom: parent.bottom
1348
37
        color: "#060606" // FIXME not in palette yet
1349
38
    }
1350
39
}
1351
40
0
1352
=== removed file 'plugins/Unity/Indicators/qml/HLine.qml'
1353
--- plugins/Unity/Indicators/qml/HLine.qml	2013-07-01 10:14:46 +0000
1354
+++ plugins/Unity/Indicators/qml/HLine.qml	1970-01-01 00:00:00 +0000
1355
@@ -1,29 +0,0 @@
1356
1
/*
1357
2
 * Copyright 2013 Canonical Ltd.
1358
3
 *
1359
4
 * This program is free software; you can redistribute it and/or modify
1360
5
 * it under the terms of the GNU Lesser General Public License as published by
1361
6
 * the Free Software Foundation; version 3.
1362
7
 *
1363
8
 * This program is distributed in the hope that it will be useful,
1364
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1365
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1366
11
 * GNU Lesser General Public License for more details.
1367
12
 *
1368
13
 * You should have received a copy of the GNU Lesser General Public License
1369
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1370
15
 *
1371
16
 * Authors:
1372
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1373
18
 */
1374
19
1375
20
import QtQuick 2.0
1376
21
import Ubuntu.Components 0.1
1377
22
1378
23
Rectangle {
1379
24
    height: units.dp(1)
1380
25
    anchors {
1381
26
        left: parent.left
1382
27
        right: parent.right
1383
28
    }
1384
29
}
1385
30
0
1386
=== modified file 'plugins/Unity/Indicators/qml/MenuItemFactory.qml'
1387
--- plugins/Unity/Indicators/qml/MenuItemFactory.qml	2013-12-12 16:32:20 +0000
1388
+++ plugins/Unity/Indicators/qml/MenuItemFactory.qml	2014-01-29 14:36:17 +0000
1389
@@ -18,11 +18,10 @@
1390
18
 */
18
 */
1391
19
19
1392
20
import QtQuick 2.0
20
import QtQuick 2.0
1396
21
import Unity.Indicators 0.1 as Indicators
21
import Ubuntu.Settings.Menus 0.1 as Menus
1394
22
import Unity.Indicators.Network 0.1 as ICNetwork
1395
23
import Unity.Indicators.Messaging 0.1 as ICMessaging
1397
24
import QMenuModel 0.1 as QMenuModel
22
import QMenuModel 0.1 as QMenuModel
1399
25
import Ubuntu.Components 0.1
23
import Utils 0.1 as Utils
1400
24
import Ubuntu.Components.ListItems 0.1 as ListItems
1401
26
25
1402
27
Item {
26
Item {
1403
28
    id: menuFactory
27
    id: menuFactory
1404
@@ -33,12 +32,14 @@
1405
33
        "unity.widgets.systemsettings.tablet.volumecontrol" : sliderMenu,
32
        "unity.widgets.systemsettings.tablet.volumecontrol" : sliderMenu,
1406
34
        "unity.widgets.systemsettings.tablet.switch"        : switchMenu,
33
        "unity.widgets.systemsettings.tablet.switch"        : switchMenu,
1407
35
34
1414
36
        "com.canonical.indicator.button"    : buttonMenu,
35
        "com.canonical.indicator.button"        : buttonMenu,
1415
37
        "com.canonical.indicator.div"       : divMenu,
36
        "com.canonical.indicator.div"           : separatorMenu,
1416
38
        "com.canonical.indicator.section"   : sectionMenu,
37
        "com.canonical.indicator.section"       : sectionMenu,
1417
39
        "com.canonical.indicator.progress"  : progressMenu,
38
        "com.canonical.indicator.progress"      : progressMenu,
1418
40
        "com.canonical.indicator.slider"    : sliderMenu,
39
        "com.canonical.indicator.slider"        : sliderMenu,
1419
41
        "com.canonical.indicator.switch"    : switchMenu,
40
        "com.canonical.indicator.switch"        : switchMenu,
1420
41
        "com.canonical.indicator.alarm"         : alarmMenu,
1421
42
        "com.canonical.indicator.appointment"   : appointmentMenu,
1422
42
43
1423
43
        "com.canonical.indicator.messages.messageitem"  : messageItem,
44
        "com.canonical.indicator.messages.messageitem"  : messageItem,
1424
44
        "com.canonical.indicator.messages.sourceitem"   : groupedMessage,
45
        "com.canonical.indicator.messages.sourceitem"   : groupedMessage,
1425
@@ -46,6 +47,9 @@
1426
46
        "com.canonical.unity.slider"    : sliderMenu,
47
        "com.canonical.unity.slider"    : sliderMenu,
1427
47
        "com.canonical.unity.switch"    : switchMenu,
48
        "com.canonical.unity.switch"    : switchMenu,
1428
48
49
1429
50
        "com.canonical.unity.media-player"    : mediaPayerMenu,
1430
51
        "com.canonical.unity.playback-item"   : playbackItemMenu,
1431
52
1432
49
        "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,
53
        "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,
1433
50
        "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
54
        "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
1434
51
    }
55
    }
1435
@@ -58,15 +62,15 @@
1436
58
    }
62
    }
1437
59
63
1438
60
    Component {
64
    Component {
1442
61
        id: divMenu;
65
        id: separatorMenu;
1443
62
        Indicators.DivMenuItem {
66
        Menus.SeparatorMenu {
1444
63
            objectName: "divMenu"
67
            objectName: "separatorMenu"
1445
64
        }
68
        }
1446
65
    }
69
    }
1447
66
70
1448
67
    Component {
71
    Component {
1449
68
        id: sliderMenu;
72
        id: sliderMenu;
1451
69
        Indicators.SliderMenuItem {
73
        Menus.SliderMenu {
1452
70
            objectName: "sliderMenu"
74
            objectName: "sliderMenu"
1453
71
            property QtObject menuData: null
75
            property QtObject menuData: null
1454
72
            property var menuModel: menuFactory.menuModel
76
            property var menuModel: menuFactory.menuModel
1455
@@ -95,12 +99,12 @@
1456
95
            onMenuIndexChanged: {
99
            onMenuIndexChanged: {
1457
96
                loadAttributes();
100
                loadAttributes();
1458
97
            }
101
            }
1460
98
            onChangeState: {
102
            onUpdated: {
1461
99
                menuModel.changeState(menuIndex, value);
103
                menuModel.changeState(menuIndex, value);
1462
100
            }
104
            }
1463
101
105
1464
102
            function loadAttributes() {
106
            function loadAttributes() {
1466
103
                if (!menuModel || menuIndex == undefined) return;
107
                if (!menuModel || menuIndex == -1) return;
1467
104
                menuModel.loadExtendedAttributes(menuIndex, {'min-value': 'double',
108
                menuModel.loadExtendedAttributes(menuIndex, {'min-value': 'double',
1468
105
                                                             'max-value': 'double',
109
                                                             'max-value': 'double',
1469
106
                                                             'min-icon': 'icon',
110
                                                             'min-icon': 'icon',
1470
@@ -111,7 +115,7 @@
1471
111
115
1472
112
    Component {
116
    Component {
1473
113
        id: buttonMenu;
117
        id: buttonMenu;
1475
114
        Indicators.ButtonMenuItem {
118
        Menus.ButtonMenu {
1476
115
            objectName: "buttonMenu"
119
            objectName: "buttonMenu"
1477
116
            property QtObject menuData: null
120
            property QtObject menuData: null
1478
117
            property var menuModel: menuFactory.menuModel
121
            property var menuModel: menuFactory.menuModel
1479
@@ -120,7 +124,7 @@
1480
120
            buttonText: menuData && menuData.label || ""
124
            buttonText: menuData && menuData.label || ""
1481
121
            enabled: menuData && menuData.sensitive || false
125
            enabled: menuData && menuData.sensitive || false
1482
122
126
1484
123
            onActivate: {
127
            onTriggered: {
1485
124
                menuModel.activate(menuIndex);
128
                menuModel.activate(menuIndex);
1486
125
                shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
129
                shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
1487
126
            }
130
            }
1488
@@ -128,18 +132,19 @@
1489
128
    }
132
    }
1490
129
    Component {
133
    Component {
1491
130
        id: sectionMenu;
134
        id: sectionMenu;
1493
131
        Indicators.SectionMenuItem {
135
        Menus.SectionMenu {
1494
132
            objectName: "sectionMenu"
136
            objectName: "sectionMenu"
1495
133
            property QtObject menuData: null
137
            property QtObject menuData: null
1496
134
            property var menuIndex: undefined
138
            property var menuIndex: undefined
1497
135
139
1498
136
            text: menuData && menuData.label || ""
140
            text: menuData && menuData.label || ""
1499
141
            busy: false
1500
137
        }
142
        }
1501
138
    }
143
    }
1502
139
144
1503
140
    Component {
145
    Component {
1504
141
        id: progressMenu;
146
        id: progressMenu;
1506
142
        Indicators.ProgressMenuItem {
147
        Menus.ProgressValueMenu {
1507
143
            objectName: "progressMenu"
148
            objectName: "progressMenu"
1508
144
            property QtObject menuData: null
149
            property QtObject menuData: null
1509
145
            property int menuIndex: -1
150
            property int menuIndex: -1
1510
@@ -153,7 +158,7 @@
1511
153
158
1512
154
    Component {
159
    Component {
1513
155
        id: standardMenu;
160
        id: standardMenu;
1515
156
        Indicators.StandardMenuItem {
161
        ListItems.Standard {
1516
157
            objectName: "standardMenu"
162
            objectName: "standardMenu"
1517
158
            property QtObject menuData: null
163
            property QtObject menuData: null
1518
159
            property int menuIndex: -1
164
            property int menuIndex: -1
1519
@@ -161,19 +166,36 @@
1520
161
            text: menuData && menuData.label || ""
166
            text: menuData && menuData.label || ""
1521
162
            iconSource: menuData && menuData.icon || ""
167
            iconSource: menuData && menuData.icon || ""
1522
163
            enabled: menuData && menuData.sensitive || false
168
            enabled: menuData && menuData.sensitive || false
1532
164
            checkable: menuData ? (menuData.isCheck || menuData.isRadio) : false
169
1533
165
            checked: checkable ? menuData.isToggled : false
170
            onTriggered: {
1534
166
171
                menuModel.activate(menuIndex);
1535
167
            onActivate: {
172
                shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
1536
168
                menuModel.activate(menuIndex);
173
            }
1537
169
                shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
174
        }
1538
170
            }
175
    }
1539
171
        }
176
1540
172
    }
177
    Component {
1541
178
        id: checkableMenu;
1542
179
        Menus.CheckableMenu {
1543
180
            objectName: "checkableMenu"
1544
181
            property QtObject menuData: null
1545
182
            property int menuIndex: -1
1546
183
1547
184
            text: menuData && menuData.label || ""
1548
185
            enabled: menuData && menuData.sensitive || false
1549
186
            checked: menuData && menuData.isToggled || false
1550
187
1551
188
            onTriggered: {
1552
189
                menuModel.activate(menuIndex);
1553
190
                shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
1554
191
            }
1555
192
        }
1556
193
    }
1557
194
1558
173
195
1559
174
    Component {
196
    Component {
1560
175
        id: switchMenu;
197
        id: switchMenu;
1562
176
        Indicators.SwitchMenuItem {
198
        Menus.SwitchMenu {
1563
177
            objectName: "switchMenu"
199
            objectName: "switchMenu"
1564
178
            property QtObject menuData: null
200
            property QtObject menuData: null
1565
179
            property int menuIndex: -1
201
            property int menuIndex: -1
1566
@@ -181,9 +203,9 @@
1567
181
            text: menuData && menuData.label || ""
203
            text: menuData && menuData.label || ""
1568
182
            iconSource: menuData && menuData.icon || ""
204
            iconSource: menuData && menuData.icon || ""
1569
183
            enabled: menuData && menuData.sensitive || false
205
            enabled: menuData && menuData.sensitive || false
1571
184
            checked: menuData ? menuData.isToggled : false
206
            checked: menuData && menuData.isToggled || false
1572
185
207
1574
186
            onActivate: {
208
            onTriggered: {
1575
187
                menuModel.activate(menuIndex);
209
                menuModel.activate(menuIndex);
1576
188
                shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
210
                shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
1577
189
            }
211
            }
1578
@@ -191,8 +213,84 @@
1579
191
    }
213
    }
1580
192
214
1581
193
    Component {
215
    Component {
1582
216
        id: alarmMenu;
1583
217
        Menus.EventMenu {
1584
218
            objectName: "alarmMenu"
1585
219
            property QtObject menuData: null
1586
220
            property var menuModel: menuFactory.menuModel
1587
221
            property int menuIndex: -1
1588
222
            property var extendedData: menuData && menuData.ext || undefined
1589
223
            // TODO - bug #1260728
1590
224
            property var timeFormatter: Utils.GDateTimeFormatter {
1591
225
                time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
1592
226
                format: getExtendedProperty(extendedData, "xCanonicalTimeFormat", "")
1593
227
            }
1594
228
1595
229
            text: menuData && menuData.label || ""
1596
230
            iconSource: menuData && menuData.icon || "image://theme/alarm-clock"
1597
231
            time: timeFormatter.timeString
1598
232
            enabled: menuData && menuData.sensitive || false
1599
233
1600
234
            onMenuModelChanged: {
1601
235
                loadAttributes();
1602
236
            }
1603
237
            onMenuIndexChanged: {
1604
238
                loadAttributes();
1605
239
            }
1606
240
            onTriggered: {
1607
241
                menuModel.activate(menuIndex);
1608
242
            }
1609
243
1610
244
            function loadAttributes() {
1611
245
                if (!menuModel || menuIndex == -1) return;
1612
246
                menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-time': 'int64',
1613
247
                                                             'x-canonical-time-format': 'string'});
1614
248
            }
1615
249
        }
1616
250
    }
1617
251
1618
252
    Component {
1619
253
        id: appointmentMenu;
1620
254
        Menus.EventMenu {
1621
255
            objectName: "appointmentMenu"
1622
256
            property QtObject menuData: null
1623
257
            property var menuModel: menuFactory.menuModel
1624
258
            property int menuIndex: -1
1625
259
            property var extendedData: menuData && menuData.ext || undefined
1626
260
            // TODO - bug #1260728
1627
261
            property var timeFormatter: Utils.GDateTimeFormatter {
1628
262
                time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
1629
263
                format: getExtendedProperty(extendedData, "xCanonicalTimeFormat", "")
1630
264
            }
1631
265
1632
266
            text: menuData && menuData.label || ""
1633
267
            iconSource: menuData && menuData.icon || "image://theme/calendar"
1634
268
            time: timeFormatter.timeString
1635
269
            eventColor: menu && menu.ext.hasOwnProperty("xCanonicalColor") ? menu.ext.xCanonicalColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)
1636
270
            enabled: menuData && menuData.sensitive || false
1637
271
1638
272
            onMenuModelChanged: {
1639
273
                loadAttributes();
1640
274
            }
1641
275
            onMenuIndexChanged: {
1642
276
                loadAttributes();
1643
277
            }
1644
278
            onTriggered: {
1645
279
                menuModel.activate(menuIndex);
1646
280
            }
1647
281
1648
282
            function loadAttributes() {
1649
283
                if (!menuModel || menuIndex == -1) return;
1650
284
                menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-color': 'string',
1651
285
                                                             'x-canonical-time': 'int64',
1652
286
                                                             'x-canonical-time-format': 'string'});
1653
287
            }
1654
288
        }
1655
289
    }
1656
290
1657
291
    Component {
1658
194
        id: wifiSection;
292
        id: wifiSection;
1660
195
        Indicators.SectionMenuItem {
293
        Menus.SectionMenu {
1661
196
            objectName: "wifiSection"
294
            objectName: "wifiSection"
1662
197
            property QtObject menuData: null
295
            property QtObject menuData: null
1663
198
            property var menuModel: menuFactory.menuModel
296
            property var menuModel: menuFactory.menuModel
1664
@@ -210,7 +308,7 @@
1665
210
            }
308
            }
1666
211
309
1667
212
            function loadAttributes() {
310
            function loadAttributes() {
1669
213
                if (!menuModel || menuIndex == undefined) return;
311
                if (!menuModel || menuIndex == -1) return;
1670
214
                menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-busy-action': 'bool'})
312
                menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-busy-action': 'bool'})
1671
215
            }
313
            }
1672
216
        }
314
        }
1673
@@ -218,7 +316,7 @@
1674
218
316
1675
219
    Component {
317
    Component {
1676
220
        id: accessPoint;
318
        id: accessPoint;
1678
221
        ICNetwork.AccessPoint {
319
        Menus.AccessPointMenu {
1679
222
            objectName: "accessPoint"
320
            objectName: "accessPoint"
1680
223
            property QtObject menuData: null
321
            property QtObject menuData: null
1681
224
            property var menuModel: menuFactory.menuModel
322
            property var menuModel: menuFactory.menuModel
1682
@@ -231,11 +329,11 @@
1683
231
                name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
329
                name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
1684
232
            }
330
            }
1685
233
331
1687
234
            label: menuData && menuData.label || ""
332
            text: menuData && menuData.label || ""
1688
235
            enabled: menuData && menuData.sensitive || false
333
            enabled: menuData && menuData.sensitive || false
1689
334
            checked: menuData && menuData.isToggled || false
1690
236
            secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
335
            secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
1691
237
            adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
336
            adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
1692
238
            checked: menuData ? menuData.isToggled : false
1693
239
            signalStrength: strengthAction.valid ? strengthAction.state : 0
337
            signalStrength: strengthAction.valid ? strengthAction.state : 0
1694
240
338
1695
241
            onMenuModelChanged: {
339
            onMenuModelChanged: {
1696
@@ -244,13 +342,13 @@
1697
244
            onMenuIndexChanged: {
342
            onMenuIndexChanged: {
1698
245
                loadAttributes();
343
                loadAttributes();
1699
246
            }
344
            }
1701
247
            onActivate: {
345
            onTriggered: {
1702
248
                menuModel.activate(menuIndex);
346
                menuModel.activate(menuIndex);
1703
249
                shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
347
                shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
1704
250
            }
348
            }
1705
251
349
1706
252
            function loadAttributes() {
350
            function loadAttributes() {
1708
253
                if (!menuModel || menuIndex == undefined) return;
351
                if (!menuModel || menuIndex == -1) return;
1709
254
                menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
352
                menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
1710
255
                                                             'x-canonical-wifi-ap-is-secure': 'bool',
353
                                                             'x-canonical-wifi-ap-is-secure': 'bool',
1711
256
                                                             'x-canonical-wifi-ap-strength-action': 'string'});
354
                                                             'x-canonical-wifi-ap-strength-action': 'string'});
1712
@@ -260,7 +358,7 @@
1713
260
358
1714
261
    Component {
359
    Component {
1715
262
        id: messageItem
360
        id: messageItem
1717
263
        ICMessaging.MessageMenuItemFactory {
361
        MessageMenuItemFactory {
1718
264
            objectName: "messageItem"
362
            objectName: "messageItem"
1719
265
            menuModel: menuFactory.menuModel
363
            menuModel: menuFactory.menuModel
1720
266
        }
364
        }
1721
@@ -268,17 +366,18 @@
1722
268
366
1723
269
    Component {
367
    Component {
1724
270
        id: groupedMessage
368
        id: groupedMessage
1726
271
        ICMessaging.GroupedMessage {
369
        Menus.GroupedMessageMenu {
1727
272
            objectName: "groupedMessage"
370
            objectName: "groupedMessage"
1728
273
            property QtObject menuData: null
371
            property QtObject menuData: null
1729
274
            property var menuModel: menuFactory.menuModel
372
            property var menuModel: menuFactory.menuModel
1730
275
            property int menuIndex: -1
373
            property int menuIndex: -1
1731
276
            property var extendedData: menuData && menuData.ext || undefined
374
            property var extendedData: menuData && menuData.ext || undefined
1732
277
375
1735
278
            title: menuData && menuData.label || ""
376
            text: menuData && menuData.label || ""
1736
279
            appIcon: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_app.svg")
377
            iconSource: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_app.svg")
1737
280
            count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
378
            count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
1738
281
            enabled: menuData && menuData.sensitive || false
379
            enabled: menuData && menuData.sensitive || false
1739
380
            removable: true
1740
282
381
1741
283
            onMenuModelChanged: {
382
            onMenuModelChanged: {
1742
284
                loadAttributes();
383
                loadAttributes();
1743
@@ -286,21 +385,103 @@
1744
286
            onMenuIndexChanged: {
385
            onMenuIndexChanged: {
1745
287
                loadAttributes();
386
                loadAttributes();
1746
288
            }
387
            }
1748
289
            onActivateApp: {
388
            onClicked: {
1749
290
                menuModel.activate(menuIndex, true);
389
                menuModel.activate(menuIndex, true);
1750
291
                shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
390
                shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
1751
292
            }
391
            }
1753
293
            onDismiss: {
392
            onDismissed: {
1754
294
                menuModel.activate(menuIndex, false);
393
                menuModel.activate(menuIndex, false);
1755
295
            }
394
            }
1756
296
395
1757
297
            function loadAttributes() {
396
            function loadAttributes() {
1759
298
                if (!menuModel || menuIndex == undefined) return;
397
                if (!menuModel || menuIndex == -1) return;
1760
299
                menuModel.loadExtendedAttributes(modelIndex, {'icon': 'icon'});
398
                menuModel.loadExtendedAttributes(modelIndex, {'icon': 'icon'});
1761
300
            }
399
            }
1762
301
        }
400
        }
1763
302
    }
401
    }
1764
303
402
1765
403
    Component {
1766
404
        id: mediaPayerMenu;
1767
405
        Menus.MediaPlayerMenu {
1768
406
            objectName: "mediaPayerMenu"
1769
407
            property QtObject menuData: null
1770
408
            property var menuModel: menuFactory.menuModel
1771
409
            property int menuIndex: -1
1772
410
            property var actionState: menuData && menuData.actionState || undefined
1773
411
1774
412
            playerIcon: menuData && menuData.icon || ""
1775
413
            playerName: menuData && menuData.label || ""
1776
414
1777
415
            albumArt: getExtendedProperty(actionState, "art-url", "")
1778
416
            song: getExtendedProperty(actionState, "title", "unknown")
1779
417
            artist: getExtendedProperty(actionState, "artist", "unknown")
1780
418
            album: getExtendedProperty(actionState, "album", "unknown")
1781
419
            running: getExtendedProperty(actionState, "running", false)
1782
420
            state: getExtendedProperty(actionState, "state", "")
1783
421
            enabled: menuData && menuData.sensitive || false
1784
422
1785
423
            onTriggered: {
1786
424
                model.activate(modelIndex);
1787
425
            }
1788
426
        }
1789
427
    }
1790
428
1791
429
    Component {
1792
430
        id: playbackItemMenu;
1793
431
        Menus.PlaybackItemMenu {
1794
432
            objectName: "playbackItemMenu"
1795
433
            property QtObject menuData: null
1796
434
            property var menuModel: menuFactory.menuModel
1797
435
            property int menuIndex: -1
1798
436
            property var extendedData: menuData && menuData.ext || undefined
1799
437
1800
438
            property var playAction: QMenuModel.UnityMenuAction {
1801
439
                model: menuModel
1802
440
                index: menuIndex
1803
441
                name: getExtendedProperty(extendedData, "xCanonicalPlayAction", "")
1804
442
            }
1805
443
            property var nextAction: QMenuModel.UnityMenuAction {
1806
444
                model: menuModel
1807
445
                index: menuIndex
1808
446
                name: getExtendedProperty(extendedData, "xCanonicalNextAction", "")
1809
447
            }
1810
448
            property var previousAction: QMenuModel.UnityMenuAction {
1811
449
                model: menuModel
1812
450
                index: menuIndex
1813
451
                name: getExtendedProperty(extendedData, "xCanonicalPreviousAction", "")
1814
452
            }
1815
453
1816
454
            playing: playAction.state === "Playing"
1817
455
            canPlay: playAction.valid
1818
456
            canGoNext: nextAction.valid
1819
457
            canGoPrevious: previousAction.valid
1820
458
            enabled: menuData && menuData.sensitive || false
1821
459
1822
460
            onPlay: {
1823
461
                playAction.activate();
1824
462
            }
1825
463
            onNext: {
1826
464
                nextAction.activate();
1827
465
            }
1828
466
            onPrevious: {
1829
467
                previousAction.activate();
1830
468
            }
1831
469
            onMenuModelChanged: {
1832
470
                loadAttributes();
1833
471
            }
1834
472
            onMenuIndexChanged: {
1835
473
                loadAttributes();
1836
474
            }
1837
475
1838
476
            function loadAttributes() {
1839
477
                if (!menuModel || menuIndex == -1) return;
1840
478
                menuModel.loadExtendedAttributes(modelIndex, {'x-canonical-play-action': 'string',
1841
479
                                                              'x-canonical-next-action': 'string',
1842
480
                                                              'x-canonical-previous-action': 'string'});
1843
481
            }
1844
482
        }
1845
483
    }
1846
484
1847
304
    function load(modelData) {
485
    function load(modelData) {
1848
305
        if (modelData.type !== undefined) {
486
        if (modelData.type !== undefined) {
1849
306
            var component = _map[modelData.type];
487
            var component = _map[modelData.type];
1850
@@ -308,8 +489,11 @@
1851
308
                return component;
489
                return component;
1852
309
            }
490
            }
1853
310
        }
491
        }
1854
492
        if (modelData.isCheck || modelData.isRadio) {
1855
493
            return checkableMenu;
1856
494
        }
1857
311
        if (modelData.isSeparator) {
495
        if (modelData.isSeparator) {
1859
312
            return divMenu;
496
            return separatorMenu;
1860
313
        }
497
        }
1861
314
        return standardMenu;
498
        return standardMenu;
1862
315
    }
499
    }
1863
316
500
1864
=== renamed file 'plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml' => 'plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml'
1865
--- plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml	2013-12-12 16:36:10 +0000
1866
+++ plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml	2014-01-29 14:36:17 +0000
1867
@@ -20,18 +20,29 @@
1868
20
20
1869
21
import QtQuick 2.0
21
import QtQuick 2.0
1870
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
1872
23
import Unity.Indicators 0.1 as Indicators
23
import Ubuntu.Settings.Menus 0.1 as Menus
1873
24
import QMenuModel 0.1 as QMenuModel
24
import QMenuModel 0.1 as QMenuModel
1874
25
import Utils 0.1 as Utils
1875
25
26
1877
26
Indicators.BaseMenuItem {
27
Item {
1878
27
    id: messageFactoryItem
28
    id: messageFactoryItem
1879
28
    property var menuModel: null
29
    property var menuModel: null
1880
29
    property QtObject menuData: null
30
    property QtObject menuData: null
1881
30
    property int menuIndex: -1
31
    property int menuIndex: -1
1882
31
32
1883
33
    property bool selected: false
1884
34
    signal menuSelected
1885
35
    signal menuDeselected
1886
36
1887
32
    property var extendedData: menuData && menuData.ext || undefined
37
    property var extendedData: menuData && menuData.ext || undefined
1888
33
    property var actionsDescription: getExtendedProperty(extendedData, "xCanonicalMessageActions", undefined)
38
    property var actionsDescription: getExtendedProperty(extendedData, "xCanonicalMessageActions", undefined)
1889
34
39
1890
40
    // TODO - bug #1260728
1891
41
    property var timeFormatter: Utils.TimeFormatter {
1892
42
        time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
1893
43
        format: "hh:mm - MMM dd"
1894
44
    }
1895
45
1896
35
    onMenuModelChanged: {
46
    onMenuModelChanged: {
1897
36
        loadAttributes();
47
        loadAttributes();
1898
37
    }
48
    }
1899
@@ -40,8 +51,7 @@
1900
40
    }
51
    }
1901
41
52
1902
42
    function loadAttributes() {
53
    function loadAttributes() {
1905
43
        if (!menuModel || menuIndex == undefined) return;
54
        if (!menuModel || menuIndex == -1) return;
1904
44
1906
45
        menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-time': 'int64',
55
        menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-time': 'int64',
1907
46
                                                     'x-canonical-text': 'string',
56
                                                     'x-canonical-text': 'string',
1908
47
                                                     'x-canonical-message-actions': 'variant',
57
                                                     'x-canonical-message-actions': 'variant',
1909
@@ -67,34 +77,46 @@
1910
67
77
1911
68
        Component {
78
        Component {
1912
69
            id: simpleTextMessage
79
            id: simpleTextMessage
1914
70
            SimpleTextMessage {
80
            Menus.SimpleTextMessageMenu {
1915
81
                id: message
1916
71
                objectName: "simpleTextMessage"
82
                objectName: "simpleTextMessage"
1917
72
                // text
83
                // text
1918
73
                title: menuData && menuData.label || ""
84
                title: menuData && menuData.label || ""
1920
74
                time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
85
                time: timeFormatter.timeString
1921
75
                message: getExtendedProperty(extendedData, "xCanonicalText", "")
86
                message: getExtendedProperty(extendedData, "xCanonicalText", "")
1922
76
                // icons
87
                // icons
1923
77
                avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
88
                avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
1924
78
                appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
89
                appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
1925
79
                // actions
90
                // actions
1926
80
                enabled: menuData && menuData.sensitive || false
91
                enabled: menuData && menuData.sensitive || false
1927
92
                removable: !selected
1928
93
                selected: messageFactoryItem.selected
1929
81
94
1931
82
                onActivateApp: {
95
                onAppActivated: {
1932
83
                    menuModel.activate(menuIndex, true);
96
                    menuModel.activate(menuIndex, true);
1933
84
                    shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
97
                    shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
1934
85
                }
98
                }
1936
86
                onDismiss: {
99
                onDismissed: {
1937
87
                    menuModel.activate(menuIndex, false);
100
                    menuModel.activate(menuIndex, false);
1938
88
                }
101
                }
1939
102
                onClicked: {
1940
103
                    if (selected) {
1941
104
                        menuDeselected();
1942
105
                    } else {
1943
106
                        menuSelected();
1944
107
                    }
1945
108
                }
1946
89
109
1950
90
                menuSelected: messageFactoryItem.menuSelected
110
                backgroundIndicator: RemoveBackground {
1951
91
                onSelectMenu: messageFactoryItem.selectMenu()
111
                    state: message.swipingState
1952
92
                onDeselectMenu: messageFactoryItem.deselectMenu()
112
                }
1953
93
            }
113
            }
1954
94
        }
114
        }
1955
115
1956
95
        Component {
116
        Component {
1957
96
            id: textMessage
117
            id: textMessage
1959
97
            TextMessage {
118
            Menus.TextMessageMenu {
1960
119
                id: message
1961
98
                objectName: "textMessage"
120
                objectName: "textMessage"
1962
99
                property var replyActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
121
                property var replyActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
1963
100
122
1964
@@ -106,7 +128,7 @@
1965
106
128
1966
107
                // text
129
                // text
1967
108
                title: menuData && menuData.label || ""
130
                title: menuData && menuData.label || ""
1969
109
                time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
131
                time: timeFormatter.timeString
1970
110
                message: getExtendedProperty(extendedData, "xCanonicalText", "")
132
                message: getExtendedProperty(extendedData, "xCanonicalText", "")
1971
111
                replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
133
                replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
1972
112
                // icons
134
                // icons
1973
@@ -115,26 +137,36 @@
1974
115
                // actions
137
                // actions
1975
116
                replyEnabled: replyAction.valid && replyAction.enabled
138
                replyEnabled: replyAction.valid && replyAction.enabled
1976
117
                enabled: menuData && menuData.sensitive || false
139
                enabled: menuData && menuData.sensitive || false
1977
140
                removable: !selected
1978
141
                selected: messageFactoryItem.selected
1979
118
142
1981
119
                onActivateApp: {
143
                onAppActivated: {
1982
120
                    menuModel.activate(menuIndex, true);
144
                    menuModel.activate(menuIndex, true);
1983
121
                    shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
145
                    shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
1984
122
                }
146
                }
1986
123
                onDismiss: {
147
                onDismissed: {
1987
124
                    menuModel.activate(menuIndex, false);
148
                    menuModel.activate(menuIndex, false);
1988
125
                }
149
                }
1990
126
                onReply: {
150
                onReplied: {
1991
127
                    replyAction.activate(value);
151
                    replyAction.activate(value);
1992
128
                }
152
                }
1993
153
                onClicked: {
1994
154
                    if (selected) {
1995
155
                        menuDeselected();
1996
156
                    } else {
1997
157
                        menuSelected();
1998
158
                    }
1999
159
                }
2000
129
160
2004
130
                menuSelected: messageFactoryItem.menuSelected
161
                backgroundIndicator: RemoveBackground {
2005
131
                onSelectMenu: messageFactoryItem.selectMenu()
162
                    state: message.swipingState
2006
132
                onDeselectMenu: messageFactoryItem.deselectMenu()
163
                }
2007
133
            }
164
            }
2008
134
        }
165
        }
2009
135
        Component {
166
        Component {
2010
136
            id: snapDecision
167
            id: snapDecision
2012
137
            SnapDecision {
168
            Menus.SnapDecisionMenu {
2013
169
                id: message
2014
138
                objectName: "snapDecision"
170
                objectName: "snapDecision"
2015
139
                property var activateActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
171
                property var activateActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
2016
140
                property var replyActionDescription: actionsDescription && actionsDescription.length > 1 ? actionsDescription[1] : undefined
172
                property var replyActionDescription: actionsDescription && actionsDescription.length > 1 ? actionsDescription[1] : undefined
2017
@@ -152,7 +184,7 @@
2018
152
184
2019
153
                // text
185
                // text
2020
154
                title: menuData && menuData.label || ""
186
                title: menuData && menuData.label || ""
2022
155
                time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
187
                time: timeFormatter.timeString
2023
156
                message: getExtendedProperty(extendedData, "xCanonicalText", "")
188
                message: getExtendedProperty(extendedData, "xCanonicalText", "")
2024
157
                actionButtonText: getExtendedProperty(activateActionDescription, "label", "Call back")
189
                actionButtonText: getExtendedProperty(activateActionDescription, "label", "Call back")
2025
158
                replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
190
                replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
2026
@@ -164,24 +196,33 @@
2027
164
                activateEnabled: activateAction.valid && activateAction.enabled
196
                activateEnabled: activateAction.valid && activateAction.enabled
2028
165
                replyEnabled: replyAction.valid && replyAction.enabled
197
                replyEnabled: replyAction.valid && replyAction.enabled
2029
166
                enabled: menuData && menuData.sensitive || false
198
                enabled: menuData && menuData.sensitive || false
2030
199
                removable: !selected
2031
200
                selected: messageFactoryItem.selected
2032
167
201
2034
168
                onActivateApp: {
202
                onAppActivated: {
2035
169
                    menuModel.activate(menuIndex, true);
203
                    menuModel.activate(menuIndex, true);
2036
170
                    shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
204
                    shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
2037
171
                }
205
                }
2039
172
                onDismiss: {
206
                onDismissed: {
2040
173
                    menuModel.activate(menuIndex, false);
207
                    menuModel.activate(menuIndex, false);
2041
174
                }
208
                }
2043
175
                onActivate: {
209
                onActivated: {
2044
176
                    activateAction.activate();
210
                    activateAction.activate();
2045
177
                }
211
                }
2047
178
                onReply: {
212
                onReplied: {
2048
179
                    replyAction.activate(value);
213
                    replyAction.activate(value);
2049
180
                }
214
                }
2050
215
                onClicked: {
2051
216
                    if (selected) {
2052
217
                        menuDeselected();
2053
218
                    } else {
2054
219
                        menuSelected();
2055
220
                    }
2056
221
                }
2057
181
222
2061
182
                menuSelected: messageFactoryItem.menuSelected
223
                backgroundIndicator: RemoveBackground {
2062
183
                onSelectMenu: messageFactoryItem.selectMenu()
224
                    state: message.swipingState
2063
184
                onDeselectMenu: messageFactoryItem.deselectMenu()
225
                }
2064
185
            }
226
            }
2065
186
        }
227
        }
2066
187
    }
228
    }
2067
188
229
2068
=== removed file 'plugins/Unity/Indicators/qml/ProgressMenuItem.qml'
2069
--- plugins/Unity/Indicators/qml/ProgressMenuItem.qml	2013-08-21 21:00:17 +0000
2070
+++ plugins/Unity/Indicators/qml/ProgressMenuItem.qml	1970-01-01 00:00:00 +0000
2071
@@ -1,38 +0,0 @@
2072
1
/*
2073
2
 * Copyright 2013 Canonical Ltd.
2074
3
 *
2075
4
 * This program is free software; you can redistribute it and/or modify
2076
5
 * it under the terms of the GNU Lesser General Public License as published by
2077
6
 * the Free Software Foundation; version 3.
2078
7
 *
2079
8
 * This program is distributed in the hope that it will be useful,
2080
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2081
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2082
11
 * GNU Lesser General Public License for more details.
2083
12
 *
2084
13
 * You should have received a copy of the GNU Lesser General Public License
2085
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2086
15
 *
2087
16
 * Authors:
2088
17
 *      Michael Zanetti <michael.zanetti@canonical.com>
2089
18
 */
2090
19
2091
20
import QtQuick 2.0
2092
21
import Ubuntu.Components 0.1
2093
22
import Unity.Indicators 0.1 as Indicators
2094
23
2095
24
FramedMenuItem {
2096
25
    id: menuItem
2097
26
2098
27
    property int value : 0.0
2099
28
2100
29
    control: Label {
2101
30
        id: progress
2102
31
        anchors.verticalCenter: parent.verticalCenter
2103
32
        anchors.right: parent.right
2104
33
2105
34
        text: menuItem.value + " %"
2106
35
        fontSize: "medium"
2107
36
        color: "#e8e1d0"
2108
37
    }
2109
38
}
2110
39
0
2111
=== removed file 'plugins/Unity/Indicators/qml/SectionMenuItem.qml'
2112
--- plugins/Unity/Indicators/qml/SectionMenuItem.qml	2013-08-21 21:00:17 +0000
2113
+++ plugins/Unity/Indicators/qml/SectionMenuItem.qml	1970-01-01 00:00:00 +0000
2114
@@ -1,54 +0,0 @@
2115
1
/*
2116
2
 * Copyright 2013 Canonical Ltd.
2117
3
 *
2118
4
 * This program is free software; you can redistribute it and/or modify
2119
5
 * it under the terms of the GNU Lesser General Public License as published by
2120
6
 * the Free Software Foundation; version 3.
2121
7
 *
2122
8
 * This program is distributed in the hope that it will be useful,
2123
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2124
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2125
11
 * GNU Lesser General Public License for more details.
2126
12
 *
2127
13
 * You should have received a copy of the GNU Lesser General Public License
2128
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2129
15
 *
2130
16
 * Authors:
2131
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
2132
18
 */
2133
19
2134
20
import QtQuick 2.0
2135
21
import Ubuntu.Components 0.1
2136
22
import Ubuntu.Components.ListItems 0.1 as ListItem
2137
23
2138
24
BaseMenuItem {
2139
25
    id: menuItem
2140
26
    property alias text: header.text
2141
27
    property bool busy: false
2142
28
2143
29
    implicitHeight: text !== "" ? header.height : 0
2144
30
2145
31
    ListItem.Header {
2146
32
        id: header
2147
33
2148
34
        height: units.gu(4)
2149
35
        anchors {
2150
36
            left: parent.left
2151
37
            right: parent.right
2152
38
            top: parent.top
2153
39
        }
2154
40
        visible: text != ""
2155
41
2156
42
        ActivityIndicator {
2157
43
            id: indicator
2158
44
            running: busy
2159
45
            anchors {
2160
46
                margins: units.gu(0.5)
2161
47
                right: parent.right
2162
48
            }
2163
49
            height: parent.height - (anchors.margins * 2)
2164
50
            width: height
2165
51
            anchors.verticalCenter: parent.verticalCenter
2166
52
        }
2167
53
    }
2168
54
}
2169
55
0
2170
=== removed file 'plugins/Unity/Indicators/qml/SliderMenuItem.qml'
2171
--- plugins/Unity/Indicators/qml/SliderMenuItem.qml	2013-10-29 19:01:15 +0000
2172
+++ plugins/Unity/Indicators/qml/SliderMenuItem.qml	1970-01-01 00:00:00 +0000
2173
@@ -1,106 +0,0 @@
2174
1
/*
2175
2
 * Copyright 2013 Canonical Ltd.
2176
3
 *
2177
4
 * This program is free software; you can redistribute it and/or modify
2178
5
 * it under the terms of the GNU Lesser General Public License as published by
2179
6
 * the Free Software Foundation; version 3.
2180
7
 *
2181
8
 * This program is distributed in the hope that it will be useful,
2182
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2183
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2184
11
 * GNU Lesser General Public License for more details.
2185
12
 *
2186
13
 * You should have received a copy of the GNU Lesser General Public License
2187
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2188
15
 *
2189
16
 * Authors:
2190
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
2191
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
2192
19
 */
2193
20
2194
21
import QtQuick 2.0
2195
22
import Ubuntu.Components 0.1 as Components
2196
23
import Unity.Indicators 0.1 as Indicators
2197
24
2198
25
FramedMenuItem {
2199
26
    id: menuItem
2200
27
2201
28
    property alias minimumValue: slider.minimumValue
2202
29
    property alias maximumValue: slider.maximumValue
2203
30
    property double value: 0.0
2204
31
2205
32
    property alias minIcon: leftImage.source
2206
33
    property alias maxIcon: rightImage.source
2207
34
2208
35
    property QtObject d: QtObject {
2209
36
        property bool enableValueConnection: true
2210
37
    }
2211
38
2212
39
    signal changeState(real value)
2213
40
2214
41
    onValueChanged: {
2215
42
        // TODO: look into adding a component to manage bi-directional bindings.
2216
43
        var oldEnable = d.enableValueConnection
2217
44
        d.enableValueConnection = false;
2218
45
2219
46
        // Can't rely on binding. Slider value is assigned by user slide.
2220
47
        slider.value = value;
2221
48
2222
49
        d.enableValueConnection = oldEnable;
2223
50
    }
2224
51
2225
52
    control: Item {
2226
53
        id: row
2227
54
        width: menuItem.text ? units.gu(20) : menuItem.width - (2 * menuItem.__contentsMargins)
2228
55
        height: slider.height
2229
56
2230
57
        Image {
2231
58
            id: leftImage
2232
59
            visible: status === Image.Ready
2233
60
            anchors.left: row.left
2234
61
            anchors.verticalCenter: row.verticalCenter
2235
62
            height: units.gu(4)
2236
63
            width: height
2237
64
        }
2238
65
2239
66
        Components.Slider {
2240
67
            id: slider
2241
68
            anchors {
2242
69
                left: leftImage.visible ? leftImage.right : row.left
2243
70
                right: rightImage.visible ? rightImage.left : row.right
2244
71
                leftMargin: leftImage.visible ? units.gu(0.5) : 0
2245
72
                rightMargin: rightImage.visible ? units.gu(0.5) : 0
2246
73
            }
2247
74
            live: true
2248
75
2249
76
            Component.onCompleted: {
2250
77
                value = menuItem.value
2251
78
            }
2252
79
2253
80
            minimumValue: 0.0
2254
81
            maximumValue: 0.1
2255
82
2256
83
            // FIXME - to be deprecated in Ubuntu.Components.
2257
84
            // Use this to disable the label, since there is not way to do it on the component.
2258
85
            function formatValue(v) {
2259
86
                return "";
2260
87
            }
2261
88
2262
89
            Connections {
2263
90
                target: d.enableValueConnection ? slider : null
2264
91
                onValueChanged: {
2265
92
                    menuItem.changeState(slider.value);
2266
93
                }
2267
94
            }
2268
95
        }
2269
96
2270
97
        Image {
2271
98
            id: rightImage
2272
99
            visible: status === Image.Ready
2273
100
            anchors.right: row.right
2274
101
            anchors.verticalCenter: row.verticalCenter
2275
102
            height: units.gu(4)
2276
103
            width: height
2277
104
        }
2278
105
    }
2279
106
}
2280
107
0
2281
=== removed file 'plugins/Unity/Indicators/qml/StandardMenuItem.qml'
2282
--- plugins/Unity/Indicators/qml/StandardMenuItem.qml	2013-08-21 21:00:17 +0000
2283
+++ plugins/Unity/Indicators/qml/StandardMenuItem.qml	1970-01-01 00:00:00 +0000
2284
@@ -1,71 +0,0 @@
2285
1
/*
2286
2
 * Copyright 2013 Canonical Ltd.
2287
3
 *
2288
4
 * This program is free software; you can redistribute it and/or modify
2289
5
 * it under the terms of the GNU Lesser General Public License as published by
2290
6
 * the Free Software Foundation; version 3.
2291
7
 *
2292
8
 * This program is distributed in the hope that it will be useful,
2293
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2294
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2295
11
 * GNU Lesser General Public License for more details.
2296
12
 *
2297
13
 * You should have received a copy of the GNU Lesser General Public License
2298
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2299
15
 *
2300
16
 * Authors:
2301
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
2302
18
 */
2303
19
2304
20
import QtQuick 2.0
2305
21
import Ubuntu.Components 0.1 as Components
2306
22
import Unity.Indicators 0.1 as Indicators
2307
23
2308
24
FramedMenuItem {
2309
25
    id: menuItem
2310
26
2311
27
    property bool checkable: false
2312
28
    property bool checked: false
2313
29
2314
30
    signal activate()
2315
31
2316
32
    // FIXME : need a radio button from sdk
2317
33
    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211866
2318
34
    onCheckableChanged: {
2319
35
        if (checkable) {
2320
36
            icon = checkComponent.createObject(menuItem);
2321
37
        }
2322
38
    }
2323
39
2324
40
    onCheckedChanged: {
2325
41
        // Can't rely on binding. Checked is assigned on click.
2326
42
        if (icon) {
2327
43
            icon.checked = checked;
2328
44
        }
2329
45
    }
2330
46
2331
47
    onClicked: {
2332
48
        if (checkable && icon) {
2333
49
            icon.clicked();
2334
50
        } else {
2335
51
            menuItem.activate();
2336
52
        }
2337
53
    }
2338
54
2339
55
    property var checkComponent: Component {
2340
56
        Components.CheckBox {
2341
57
            anchors.verticalCenter: parent.verticalCenter
2342
58
            anchors.left: parent.left
2343
59
2344
60
            Component.onCompleted: {
2345
61
                checked = menuItem.checked;
2346
62
            }
2347
63
2348
64
            // FIXME : should use Checkbox.toggled signal
2349
65
            // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
2350
66
            onClicked: {
2351
67
                menuItem.activate();
2352
68
            }
2353
69
        }
2354
70
    }
2355
71
}
2356
72
0
2357
=== removed file 'plugins/Unity/Indicators/qml/SwitchMenuItem.qml'
2358
--- plugins/Unity/Indicators/qml/SwitchMenuItem.qml	2013-08-21 21:00:17 +0000
2359
+++ plugins/Unity/Indicators/qml/SwitchMenuItem.qml	1970-01-01 00:00:00 +0000
2360
@@ -1,53 +0,0 @@
2361
1
/*
2362
2
 * Copyright 2013 Canonical Ltd.
2363
3
 *
2364
4
 * This program is free software; you can redistribute it and/or modify
2365
5
 * it under the terms of the GNU Lesser General Public License as published by
2366
6
 * the Free Software Foundation; version 3.
2367
7
 *
2368
8
 * This program is distributed in the hope that it will be useful,
2369
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2370
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2371
11
 * GNU Lesser General Public License for more details.
2372
12
 *
2373
13
 * You should have received a copy of the GNU Lesser General Public License
2374
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2375
15
 *
2376
16
 * Authors:
2377
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
2378
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
2379
19
 */
2380
20
2381
21
import QtQuick 2.0
2382
22
import Ubuntu.Components 0.1
2383
23
import Unity.Indicators 0.1 as Indicators
2384
24
2385
25
FramedMenuItem {
2386
26
    id: menuItem
2387
27
2388
28
    property bool checked: false
2389
29
2390
30
    signal activate()
2391
31
2392
32
    onCheckedChanged: {
2393
33
        // Can't rely on binding. Checked is assigned on click.
2394
34
        switcher.checked = checked;
2395
35
    }
2396
36
2397
37
    control: Switch {
2398
38
        id: switcher
2399
39
2400
40
        Component.onCompleted: {
2401
41
            checked = menuItem.checked;
2402
42
        }
2403
43
2404
44
        anchors.verticalCenter: parent.verticalCenter
2405
45
        anchors.right: parent.right
2406
46
2407
47
        // FIXME : should use Checkbox.toggled signal
2408
48
        // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
2409
49
        onClicked: {
2410
50
            menuItem.activate();
2411
51
        }
2412
52
    }
2413
53
}
2414
54
0
2415
=== modified file 'plugins/Unity/Indicators/qml/qmldir'
2416
--- plugins/Unity/Indicators/qml/qmldir	2013-12-12 09:55:17 +0000
2417
+++ plugins/Unity/Indicators/qml/qmldir	2014-01-29 14:36:17 +0000
2418
@@ -2,20 +2,9 @@
2419
2
plugin IndicatorsQml
2
plugin IndicatorsQml
2420
3
typeinfo plugin.qmltypes
3
typeinfo plugin.qmltypes
2421
4
4
2422
5
BaseMenuItem 0.1 BaseMenuItem.qml
2423
6
ButtonMenuItem 0.1 ButtonMenuItem.qml
2424
7
CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
5
CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
2425
8
DivMenuItem 0.1 DivMenuItem.qml
2426
9
FramedMenuItem 0.1 FramedMenuItem.qml
2427
10
HLine 0.1 HLine.qml
2428
11
IndicatorBase 0.1 IndicatorBase.qml
6
IndicatorBase 0.1 IndicatorBase.qml
2429
12
MenuActionBinding 0.1 MenuActionBinding.qml
2430
13
MenuItemFactory 0.1 MenuItemFactory.qml
7
MenuItemFactory 0.1 MenuItemFactory.qml
2437
14
ProgressMenuItem 0.1 ProgressMenuItem.qml
8
MessageMenuItemFactory 0.1 MessageMenuItemFactory.qml
2432
15
SectionMenuItem 0.1 SectionMenuItem.qml
2433
16
SliderMenuItem 0.1 SliderMenuItem.qml
2434
17
StandardMenuItem 0.1 StandardMenuItem.qml
2435
18
SwitchMenuItem 0.1 SwitchMenuItem.qml
2436
19
2438
20
9
2439
21
internal RemoveBackground RemoveBackground.qml
10
internal RemoveBackground RemoveBackground.qml
2440
22
11
2441
=== removed file 'plugins/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.png'
2442
23
Binary files plugins/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.png	2013-06-07 12:51:15 +0000 and plugins/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.png	1970-01-01 00:00:00 +0000 differ
12
Binary files plugins/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.png	2013-06-07 12:51:15 +0000 and plugins/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.png	1970-01-01 00:00:00 +0000 differ
2443
=== removed directory 'plugins/Unity/Indicators/resources/artwork/network'
2444
=== removed file 'plugins/Unity/Indicators/resources/artwork/network/secure.svg'
2445
--- plugins/Unity/Indicators/resources/artwork/network/secure.svg	2013-09-02 10:59:11 +0000
2446
+++ plugins/Unity/Indicators/resources/artwork/network/secure.svg	1970-01-01 00:00:00 +0000
2447
@@ -1,71 +0,0 @@
2448
1
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2449
2
<!-- Created with Inkscape (http://www.inkscape.org/) -->
2450
3
2451
4
<svg
2452
5
   xmlns:dc="http://purl.org/dc/elements/1.1/"
2453
6
   xmlns:cc="http://creativecommons.org/ns#"
2454
7
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
2455
8
   xmlns:svg="http://www.w3.org/2000/svg"
2456
9
   xmlns="http://www.w3.org/2000/svg"
2457
10
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
2458
11
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
2459
12
   width="64"
2460
13
   height="64"
2461
14
   id="svg2986"
2462
15
   version="1.1"
2463
16
   inkscape:version="0.48.4 r9939"
2464
17
   sodipodi:docname="secure.svg">
2465
18
  <defs
2466
19
     id="defs2988" />
2467
20
  <sodipodi:namedview
2468
21
     id="base"
2469
22
     pagecolor="#ffffff"
2470
23
     bordercolor="#666666"
2471
24
     borderopacity="1.0"
2472
25
     inkscape:pageopacity="0.0"
2473
26
     inkscape:pageshadow="2"
2474
27
     inkscape:zoom="7.9180415"
2475
28
     inkscape:cx="7.5048745"
2476
29
     inkscape:cy="29.401628"
2477
30
     inkscape:current-layer="layer1"
2478
31
     showgrid="true"
2479
32
     inkscape:grid-bbox="true"
2480
33
     inkscape:document-units="px"
2481
34
     inkscape:snap-grids="false"
2482
35
     inkscape:window-width="1549"
2483
36
     inkscape:window-height="876"
2484
37
     inkscape:window-x="51"
2485
38
     inkscape:window-y="24"
2486
39
     inkscape:window-maximized="1">
2487
40
    <inkscape:grid
2488
41
       type="xygrid"
2489
42
       id="grid3012"
2490
43
       empspacing="5"
2491
44
       visible="true"
2492
45
       enabled="true"
2493
46
       snapvisiblegridlinesonly="true" />
2494
47
  </sodipodi:namedview>
2495
48
  <metadata
2496
49
     id="metadata2991">
2497
50
    <rdf:RDF>
2498
51
      <cc:Work
2499
52
         rdf:about="">
2500
53
        <dc:format>image/svg+xml</dc:format>
2501
54
        <dc:type
2502
55
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
2503
56
        <dc:title />
2504
57
      </cc:Work>
2505
58
    </rdf:RDF>
2506
59
  </metadata>
2507
60
  <g
2508
61
     id="layer1"
2509
62
     inkscape:label="Layer 1"
2510
63
     inkscape:groupmode="layer"
2511
64
     transform="translate(0,32)">
2512
65
    <path
2513
66
       inkscape:connector-curvature="0"
2514
67
       d="M 29.999999,-18 C 25.568001,-18 22,-14.432 22,-10 v 6 h -2 c -1.107999,0 -2,0.892 -2,2 v 18 c 0,1.108 0.892001,2 2,2 h 24 c 1.108,0 2,-0.892 2,-2 V -2 c 0,-1.108 -0.892,-2 -2,-2 h -2 v -6 c 0,-4.432 -3.568001,-8 -8.000001,-8 h -4 z m 0,4 h 4 c 2.216,0 4,1.784 4,4 v 6 H 26.000001 v -6 c 0,-2.216 1.784,-4 3.999998,-4 z"
2515
68
       style="fill:#dfdbd2;fill-rule:evenodd"
2516
69
       id="path8" />
2517
70
  </g>
2518
71
</svg>
2519
72
0
2520
=== modified file 'plugins/Unity/Indicators/resources/indicators.qrc'
2521
--- plugins/Unity/Indicators/resources/indicators.qrc	2013-09-09 09:23:15 +0000
2522
+++ plugins/Unity/Indicators/resources/indicators.qrc	2014-01-29 14:36:17 +0000
2523
@@ -1,8 +1,6 @@
2524
1
<RCC>
1
<RCC>
2525
2
    <qresource prefix="/indicators">
2
    <qresource prefix="/indicators">
2526
3
        <file>artwork/network/secure.svg</file>
2527
4
        <file>artwork/messaging/default_contact.png</file>
3
        <file>artwork/messaging/default_contact.png</file>
2528
5
        <file>artwork/messaging/default_app.svg</file>
4
        <file>artwork/messaging/default_app.svg</file>
2529
6
        <file>artwork/messaging/message_sms01_54px.png</file>
2530
7
    </qresource>
5
    </qresource>
2531
8
</RCC>
6
</RCC>
2532
9
7
2533
=== modified file 'qml/Panel/Indicators/DefaultIndicatorPage.qml'
2534
--- qml/Panel/Indicators/DefaultIndicatorPage.qml	2013-12-13 11:18:25 +0000
2535
+++ qml/Panel/Indicators/DefaultIndicatorPage.qml	2014-01-29 14:36:17 +0000
2536
@@ -138,10 +138,14 @@
2537
138
            sourceComponent: factory.load(model)
138
            sourceComponent: factory.load(model)
2538
139
139
2539
140
            onLoaded: {
140
            onLoaded: {
2540
141
                if (item.hasOwnProperty("selected")) {
2541
142
                    item.selected = mainMenu.selectedIndex == index;
2542
143
                }
2543
141
                if (item.hasOwnProperty("menuSelected")) {
144
                if (item.hasOwnProperty("menuSelected")) {
2547
142
                    item.menuSelected = mainMenu.selectedIndex == index;
145
                    item.menuSelected.connect(function() { mainMenu.selectedIndex = index; });
2548
143
                    item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });
146
                }
2549
144
                    item.deselectMenu.connect(function() { mainMenu.selectedIndex = -1; });
147
                if (item.hasOwnProperty("menuDeselected")) {
2550
148
                    item.menuDeselected.connect(function() { mainMenu.selectedIndex = -1; });
2551
145
                }
149
                }
2552
146
                if (item.hasOwnProperty("menuData")) {
150
                if (item.hasOwnProperty("menuData")) {
2553
147
                    item.menuData = Qt.binding(function() { return model; });
151
                    item.menuData = Qt.binding(function() { return model; });
2554
@@ -162,8 +166,8 @@
2555
162
            Connections {
166
            Connections {
2556
163
                target: mainMenu
167
                target: mainMenu
2557
164
                onSelectedIndexChanged: {
168
                onSelectedIndexChanged: {
2560
165
                    if (loader.item && loader.item.hasOwnProperty("menuSelected")) {
169
                    if (loader.item && loader.item.hasOwnProperty("selected")) {
2561
166
                        loader.item.menuSelected = mainMenu.selectedIndex == index;
170
                        loader.item.selected = mainMenu.selectedIndex == index;
2562
167
                    }
171
                    }
2563
168
                }
172
                }
2564
169
            }
173
            }
2565
170
174
2566
=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
2567
--- qml/Panel/Indicators/client/IndicatorsList.qml	2013-10-11 08:21:59 +0000
2568
+++ qml/Panel/Indicators/client/IndicatorsList.qml	2014-01-29 14:36:17 +0000
2569
@@ -40,24 +40,25 @@
2570
40
        anchors.fill: parent
40
        anchors.fill: parent
2571
41
        model: indicatorsModel
41
        model: indicatorsModel
2572
42
42
2574
43
        delegate: Indicators.FramedMenuItem {
43
        delegate: Rectangle {
2575
44
            color: "#221e1c"
2576
45
2577
44
            anchors.left: parent.left
46
            anchors.left: parent.left
2578
45
            anchors.right: parent.right
47
            anchors.right: parent.right
2594
46
            objectName: identifier
48
            height: menuItem.height
2595
47
49
2596
48
            text: identifier
50
            ListItem.Standard {
2597
49
51
                id: menuItem
2598
50
            onClicked: {
52
                anchors.left: parent.left
2599
51
                var new_page = Qt.createComponent("IndicatorsPage.qml");
53
                anchors.right: parent.right
2600
52
                page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageSource" : model.pageSource});
54
                objectName: identifier
2601
53
            }
55
2602
54
56
                text: identifier
2603
55
            Rectangle {
57
2604
56
                id: background
58
                onClicked: {
2605
57
59
                    var new_page = Qt.createComponent("IndicatorsPage.qml");
2606
58
                anchors.fill: parent
60
                    page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageSource" : model.pageSource});
2607
59
                color: "#221e1c"
61
                }
2593
60
                z: -1
2608
61
            }
62
            }
2609
62
        }
63
        }
2610
63
    }
64
    }
2611
64
65
2612
=== modified file 'tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml'
2613
--- tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml	2014-01-06 16:18:08 +0000
2614
+++ tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml	2014-01-29 14:36:17 +0000
2615
@@ -129,14 +129,10 @@
2616
129
        function test_reloadData() {
129
        function test_reloadData() {
2617
130
            var mainMenu = findChild(page, "mainMenu");
130
            var mainMenu = findChild(page, "mainMenu");
2618
131
131
2619
132
            console.log("setting empty data");
2620
133
            page.menuModel.modelData = [];
132
            page.menuModel.modelData = [];
2621
134
            tryCompare(mainMenu, "count", 0);
133
            tryCompare(mainMenu, "count", 0);
2622
135
            console.log("set empty data");
2623
136
134
2624
137
            console.log("setting full data");
2625
138
            page.menuModel.modelData = fullMenuData;
135
            page.menuModel.modelData = fullMenuData;
2626
139
            console.log("set full data");
2627
140
            tryCompare(mainMenu, "count", 3);
136
            tryCompare(mainMenu, "count", 3);
2628
141
137
2629
142
            page.menuModel.modelData = [];
138
            page.menuModel.modelData = [];
2630
143
139
2631
=== modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
2632
--- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-01-06 10:41:54 +0000
2633
+++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-01-29 14:36:17 +0000
2634
@@ -84,11 +84,13 @@
2635
84
                { tag: 'switch1', type: "unity.widgets.systemsettings.tablet.switch", objectName: "switchMenu" },
84
                { tag: 'switch1', type: "unity.widgets.systemsettings.tablet.switch", objectName: "switchMenu" },
2636
85
85
2637
86
                { tag: 'button', type: "com.canonical.indicator.button", objectName: "buttonMenu" },
86
                { tag: 'button', type: "com.canonical.indicator.button", objectName: "buttonMenu" },
2639
87
                { tag: 'separator', type: "com.canonical.indicator.div", objectName: "divMenu" },
87
                { tag: 'separator', type: "com.canonical.indicator.div", objectName: "separatorMenu" },
2640
88
                { tag: 'section', type: "com.canonical.indicator.section", objectName: "sectionMenu" },
88
                { tag: 'section', type: "com.canonical.indicator.section", objectName: "sectionMenu" },
2641
89
                { tag: 'progress', type: "com.canonical.indicator.progress", objectName: "progressMenu" },
89
                { tag: 'progress', type: "com.canonical.indicator.progress", objectName: "progressMenu" },
2642
90
                { tag: 'slider1', type: "com.canonical.indicator.slider", objectName: "sliderMenu" },
90
                { tag: 'slider1', type: "com.canonical.indicator.slider", objectName: "sliderMenu" },
2643
91
                { tag: 'switch2', type: "com.canonical.indicator.switch", objectName: "switchMenu" },
91
                { tag: 'switch2', type: "com.canonical.indicator.switch", objectName: "switchMenu" },
2644
92
                { tag: 'alarm', type: "com.canonical.indicator.alarm", objectName: "alarmMenu" },
2645
93
                { tag: 'appointment', type: "com.canonical.indicator.appointment", objectName: "appointmentMenu" },
2646
92
94
2647
93
                { tag: 'messageItem', type: "com.canonical.indicator.messages.messageitem", objectName: "messageItem" },
95
                { tag: 'messageItem', type: "com.canonical.indicator.messages.messageitem", objectName: "messageItem" },
2648
94
                { tag: 'sourceItem', type: "com.canonical.indicator.messages.sourceitem", objectName: "groupedMessage" },
96
                { tag: 'sourceItem', type: "com.canonical.indicator.messages.sourceitem", objectName: "groupedMessage" },
2649
@@ -96,8 +98,8 @@
2650
96
                { tag: 'slider2', type: "com.canonical.unity.slider", objectName: "sliderMenu" },
98
                { tag: 'slider2', type: "com.canonical.unity.slider", objectName: "sliderMenu" },
2651
97
                { tag: 'switch3', type: "com.canonical.unity.switch", objectName: "switchMenu" },
99
                { tag: 'switch3', type: "com.canonical.unity.switch", objectName: "switchMenu" },
2652
98
100
2655
99
                { tag: 'mediaplayer', type: "com.canonical.unity.media-player", objectName: "standardMenu" },
101
                { tag: 'mediaplayer', type: "com.canonical.unity.media-player", objectName: "mediaPayerMenu" },
2656
100
                { tag: 'playbackitem', type: "com.canonical.unity.playback-item", objectName: "standardMenu" },
102
                { tag: 'playbackitem', type: "com.canonical.unity.playback-item", objectName: "playbackItemMenu" },
2657
101
103
2658
102
                { tag: 'wifisection', type: "unity.widgets.systemsettings.tablet.wifisection", objectName: "wifiSection" },
104
                { tag: 'wifisection', type: "unity.widgets.systemsettings.tablet.wifisection", objectName: "wifiSection" },
2659
103
                { tag: 'accesspoint', type: "unity.widgets.systemsettings.tablet.accesspoint", objectName: "accessPoint" },
105
                { tag: 'accesspoint', type: "unity.widgets.systemsettings.tablet.accesspoint", objectName: "accessPoint" },
2660
@@ -115,6 +117,16 @@
2661
115
            compare(loader.item.objectName, data.objectName, "Created object name does not match intended object (" + loader.item.objectName + " != " + data.objectName + ")");
117
            compare(loader.item.objectName, data.objectName, "Created object name does not match intended object (" + loader.item.objectName + " != " + data.objectName + ")");
2662
116
        }
118
        }
2663
117
119
2664
120
        function test_create_checkable() {
2665
121
            var tmpData = menuData;
2666
122
            tmpData.isCheck = true;
2667
123
2668
124
            loader.data = tmpData;
2669
125
            loader.sourceComponent = factory.load(tmpData);
2670
126
            tryCompareFunction(function() { return loader.item != undefined; }, true);
2671
127
            compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");
2672
128
        }
2673
129
2674
118
        function test_create_radio() {
130
        function test_create_radio() {
2675
119
            skip("No radio component");
131
            skip("No radio component");
2676
120
            menuData.isRadio = true;
132
            menuData.isRadio = true;
2677
@@ -131,7 +143,7 @@
2678
131
            loader.data = menuData;
143
            loader.data = menuData;
2679
132
            loader.sourceComponent = factory.load(menuData);
144
            loader.sourceComponent = factory.load(menuData);
2680
133
            tryCompareFunction(function() { return loader.item != undefined; }, true);
145
            tryCompareFunction(function() { return loader.item != undefined; }, true);
2682
134
            compare(loader.item.objectName, "divMenu", "Should have created a separator menu");
146
            compare(loader.item.objectName, "separatorMenu", "Should have created a separator menu");
2683
135
        }
147
        }
2684
136
148
2685
137
        function test_create_sliderMenu_data() {
149
        function test_create_sliderMenu_data() {
2686
@@ -145,13 +157,13 @@
2687
145
            menuData.type = "com.canonical.indicator.slider"
157
            menuData.type = "com.canonical.indicator.slider"
2688
146
            menuData.label = data.label;
158
            menuData.label = data.label;
2689
147
            menuData.sensitive = data.enabled;
159
            menuData.sensitive = data.enabled;
2690
148
            menuData.actionState = data.value;
2691
149
            menuData.ext = {
160
            menuData.ext = {
2692
150
                'minIcon': "file:///testMinIcon",
161
                'minIcon': "file:///testMinIcon",
2693
151
                'maxIcon': "file:///testMaxIcon",
162
                'maxIcon': "file:///testMaxIcon",
2694
152
                'minValue': data.minValue,
163
                'minValue': data.minValue,
2695
153
                'maxValue': data.maxValue
164
                'maxValue': data.maxValue
2696
154
            };
165
            };
2697
166
            menuData.actionState = data.value;
2698
155
167
2699
156
            loader.data = menuData;
168
            loader.data = menuData;
2700
157
            loader.sourceComponent = factory.load(menuData);
169
            loader.sourceComponent = factory.load(menuData);
2701
@@ -163,7 +175,7 @@
2702
163
            compare(loader.item.maxIcon, "file:///testMaxIcon", "MaxIcon does not match data");
175
            compare(loader.item.maxIcon, "file:///testMaxIcon", "MaxIcon does not match data");
2703
164
            compare(loader.item.minimumValue, data.minValue, "MinValue does not match data");
176
            compare(loader.item.minimumValue, data.minValue, "MinValue does not match data");
2704
165
            compare(loader.item.maximumValue, data.maxValue, "MaxValue does not match data");
177
            compare(loader.item.maximumValue, data.maxValue, "MaxValue does not match data");
2706
166
            compare(loader.item.value, data.value, "Calue does not match data");
178
            compare(loader.item.value, data.value, "Value does not match data");
2707
167
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
179
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
2708
168
        }
180
        }
2709
169
181
2710
@@ -232,7 +244,7 @@
2711
232
244
2712
233
        function test_create_standardMenu_data() {
245
        function test_create_standardMenu_data() {
2713
234
            return [
246
            return [
2715
235
                {label: "testLabel1", enabled: true, icon: "file:///testIcon" },
247
                {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
2716
236
                {label: "testLabel2", enabled: false, icon: "file:///testIcon2"},
248
                {label: "testLabel2", enabled: false, icon: "file:///testIcon2"},
2717
237
            ];
249
            ];
2718
238
        }
250
        }
2719
@@ -253,31 +265,101 @@
2720
253
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
265
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
2721
254
        }
266
        }
2722
255
267
2724
256
        function test_create_switchMenu_data() {
268
        function test_create_checkableMenu_data() {
2725
257
            return [
269
            return [
2726
258
                {label: "testLabel1", enabled: true, checked: false },
270
                {label: "testLabel1", enabled: true, checked: false },
2727
259
                {label: "testLabel2", enabled: false, checked: true },
271
                {label: "testLabel2", enabled: false, checked: true },
2728
260
            ];
272
            ];
2729
261
        }
273
        }
2730
262
274
2731
275
        function test_create_checkableMenu(data) {
2732
276
            menuData.type = "";
2733
277
            menuData.label = data.label;
2734
278
            menuData.sensitive = data.enabled;
2735
279
            menuData.isCheck = true;
2736
280
            menuData.isToggled = data.checked;
2737
281
2738
282
            loader.data = menuData;
2739
283
            loader.sourceComponent = factory.load(menuData);
2740
284
            tryCompareFunction(function() { return loader.item != undefined; }, true);
2741
285
            compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");
2742
286
2743
287
            compare(loader.item.text, data.label, "Label does not match data");
2744
288
            compare(loader.item.checked, data.checked, "Checked does not match data");
2745
289
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
2746
290
        }
2747
291
2748
292
        function test_create_switchMenu_data() {
2749
293
            return [
2750
294
                {label: "testLabel1", enabled: true, checked: false, icon: "file:///testIcon1" },
2751
295
                {label: "testLabel2", enabled: false, checked: true, icon: "file:///testIcon2" },
2752
296
            ];
2753
297
        }
2754
298
2755
263
        function test_create_switchMenu(data) {
299
        function test_create_switchMenu(data) {
2756
264
            menuData.type = "com.canonical.indicator.switch";
300
            menuData.type = "com.canonical.indicator.switch";
2757
265
            menuData.label = data.label;
301
            menuData.label = data.label;
2758
266
            menuData.sensitive = data.enabled;
302
            menuData.sensitive = data.enabled;
2760
267
            menuData.icon = "file:///testIcon";
303
            menuData.icon = data.icon;
2761
268
            menuData.isToggled = data.checked;
304
            menuData.isToggled = data.checked;
2762
269
305
2763
270
            loader.data = menuData;
306
            loader.data = menuData;
2764
271
            loader.sourceComponent = factory.load(menuData);
307
            loader.sourceComponent = factory.load(menuData);
2765
272
            tryCompareFunction(function() { return loader.item != undefined; }, true);
308
            tryCompareFunction(function() { return loader.item != undefined; }, true);
2767
273
            compare(loader.item.objectName, "switchMenu", "Should have created a standard menu");
309
            compare(loader.item.objectName, "switchMenu", "Should have created a switch menu");
2768
274
310
2769
275
            compare(loader.item.text, data.label, "Label does not match data");
311
            compare(loader.item.text, data.label, "Label does not match data");
2771
276
            compare(loader.item.icon, "file:///testIcon", "MaxIcon does not match data");
312
            compare(loader.item.iconSource, data.icon, "Icon does not match data");
2772
277
            compare(loader.item.checked, data.checked, "Checked does not match data");
313
            compare(loader.item.checked, data.checked, "Checked does not match data");
2773
278
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
314
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
2774
279
        }
315
        }
2775
280
316
2776
317
        function test_create_alarmMenu_data() {
2777
318
            return [
2778
319
                {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
2779
320
                {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },
2780
321
            ];
2781
322
        }
2782
323
2783
324
        function test_create_alarmMenu(data) {
2784
325
            menuData.type = "com.canonical.indicator.alarm";
2785
326
            menuData.label = data.label;
2786
327
            menuData.sensitive = data.enabled;
2787
328
            menuData.icon = data.icon;
2788
329
2789
330
            loader.data = menuData;
2790
331
            loader.sourceComponent = factory.load(menuData);
2791
332
            tryCompareFunction(function() { return loader.item != undefined; }, true);
2792
333
            compare(loader.item.objectName, "alarmMenu", "Should have created a alarm menu");
2793
334
2794
335
            compare(loader.item.text, data.label, "Label does not match data");
2795
336
            compare(loader.item.iconSource, data.icon, "Icon does not match data");
2796
337
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
2797
338
        }
2798
339
2799
340
        function test_create_appointmentMenu_data() {
2800
341
            return [
2801
342
                {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
2802
343
                {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },
2803
344
            ];
2804
345
        }
2805
346
2806
347
        function test_create_appointmentMenu(data) {
2807
348
            menuData.type = "com.canonical.indicator.appointment";
2808
349
            menuData.label = data.label;
2809
350
            menuData.sensitive = data.enabled;
2810
351
            menuData.icon = data.icon;
2811
352
2812
353
            loader.data = menuData;
2813
354
            loader.sourceComponent = factory.load(menuData);
2814
355
            tryCompareFunction(function() { return loader.item != undefined; }, true);
2815
356
            compare(loader.item.objectName, "appointmentMenu", "Should have created a appointment menu");
2816
357
2817
358
            compare(loader.item.text, data.label, "Label does not match data");
2818
359
            compare(loader.item.iconSource, data.icon, "Icon does not match data");
2819
360
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
2820
361
        }
2821
362
2822
281
        function test_create_wifiSection_data() {
363
        function test_create_wifiSection_data() {
2823
282
            return [
364
            return [
2824
283
                {label: "testLabel1", busy: false },
365
                {label: "testLabel1", busy: false },
2825
@@ -322,7 +404,7 @@
2826
322
            tryCompareFunction(function() { return loader.item != undefined; }, true);
404
            tryCompareFunction(function() { return loader.item != undefined; }, true);
2827
323
            compare(loader.item.objectName, "accessPoint", "Should have created a access point menu");
405
            compare(loader.item.objectName, "accessPoint", "Should have created a access point menu");
2828
324
406
2830
325
            compare(loader.item.label, data.label, "Label does not match data");
407
            compare(loader.item.text, data.label, "Label does not match data");
2831
326
            compare(loader.item.strengthAction.name, "action::strength", "Strength action incorrect");
408
            compare(loader.item.strengthAction.name, "action::strength", "Strength action incorrect");
2832
327
            compare(loader.item.secure, data.secure, "Secure does not match data");
409
            compare(loader.item.secure, data.secure, "Secure does not match data");
2833
328
            compare(loader.item.adHoc, data.adHoc, "AdHoc does not match data");
410
            compare(loader.item.adHoc, data.adHoc, "AdHoc does not match data");
2834
@@ -341,8 +423,8 @@
2835
341
423
2836
342
        function test_create_groupedMessage_data() {
424
        function test_create_groupedMessage_data() {
2837
343
            return [
425
            return [
2840
344
                {label: "testLabel1", enabled: true, count: "5", appIcon: "file:///testIcon" },
426
                {label: "testLabel1", enabled: true, count: "5", icon: "file:///testIcon" },
2841
345
                {label: "testLabel2", enabled: false, count: "10", appIcon: "file:///testIcon2" },
427
                {label: "testLabel2", enabled: false, count: "10", icon: "file:///testIcon2" },
2842
346
            ];
428
            ];
2843
347
        }
429
        }
2844
348
430
2845
@@ -350,8 +432,8 @@
2846
350
            menuData.type = "com.canonical.indicator.messages.sourceitem";
432
            menuData.type = "com.canonical.indicator.messages.sourceitem";
2847
351
            menuData.label = data.label;
433
            menuData.label = data.label;
2848
352
            menuData.sensitive = data.enabled;
434
            menuData.sensitive = data.enabled;
2851
353
            menuData.icon = data.appIcon;
435
            menuData.icon = data.icon;
2852
354
            menuData.ext = { 'icon': data.appIcon };
436
            menuData.ext = { 'icon': data.icon };
2853
355
            menuData.actionState = [data.count];
437
            menuData.actionState = [data.count];
2854
356
            menuData.isToggled = true;
438
            menuData.isToggled = true;
2855
357
439
2856
@@ -360,9 +442,103 @@
2857
360
            tryCompareFunction(function() { return loader.item != undefined; }, true);
442
            tryCompareFunction(function() { return loader.item != undefined; }, true);
2858
361
            compare(loader.item.objectName, "groupedMessage", "Should have created a group message menu");
443
            compare(loader.item.objectName, "groupedMessage", "Should have created a group message menu");
2859
362
444
2861
363
            compare(loader.item.title, data.label, "Label does not match data");
445
            compare(loader.item.text, data.label, "Label does not match data");
2862
364
            compare(loader.item.count, data.count, "Count does not match data");
446
            compare(loader.item.count, data.count, "Count does not match data");
2864
365
            compare(loader.item.appIcon, data.appIcon, "App Icon does not match data");
447
            compare(loader.item.iconSource, data.icon, "Icon does not match data");
2865
448
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
2866
449
        }
2867
450
2868
451
        function test_create_mediaPayerMenu_data() {
2869
452
            return [{
2870
453
                    label: "player1",
2871
454
                    icon: "file:://icon1",
2872
455
                    albumArt: "file:://art1",
2873
456
                    song: "song1",
2874
457
                    artist: "artist1",
2875
458
                    album: "album1",
2876
459
                    running: true,
2877
460
                    state: "Playing",
2878
461
                    enabled: true
2879
462
                },{
2880
463
                    label: "player2",
2881
464
                    icon: "file:://icon2",
2882
465
                    albumArt: "file:://art2",
2883
466
                    song: "song2",
2884
467
                    artist: "artist2",
2885
468
                    album: "album2",
2886
469
                    running: false,
2887
470
                    state: "Paused",
2888
471
                    enabled: false
2889
472
                }
2890
473
            ];
2891
474
        }
2892
475
2893
476
        function test_create_mediaPayerMenu(data) {
2894
477
            menuData.type = "com.canonical.unity.media-player";
2895
478
            menuData.label = data.label;
2896
479
            menuData.sensitive = data.enabled;
2897
480
            menuData.icon = data.icon;
2898
481
            menuData.actionState = {
2899
482
                'art-url': data.albumArt,
2900
483
                'title': data.song,
2901
484
                'artist': data.artist,
2902
485
                'album': data.album,
2903
486
                'running': data.running,
2904
487
                'state': data.state,
2905
488
            };
2906
489
2907
490
            loader.data = menuData;
2908
491
            loader.sourceComponent = factory.load(menuData);
2909
492
            tryCompareFunction(function() { return loader.item != undefined; }, true);
2910
493
            compare(loader.item.objectName, "mediaPayerMenu", "Should have created a media player menu");
2911
494
2912
495
            compare(loader.item.playerIcon, data.icon, "Album art does not match data");
2913
496
            compare(loader.item.playerName, data.label, "Album art does not match data");
2914
497
            compare(loader.item.albumArt, data.albumArt, "Album art does not match data");
2915
498
            compare(loader.item.song, data.song, "Song does not match data");
2916
499
            compare(loader.item.artist, data.artist, "Artist does not match data");
2917
500
            compare(loader.item.album, data.album, "Album does not match data");
2918
501
            compare(loader.item.running, data.running, "Running does not match data");
2919
502
            compare(loader.item.state, data.state, "State does not match data");
2920
503
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
2921
504
        }
2922
505
2923
506
        function test_create_playbackItemMenu_data() {
2924
507
            return [{
2925
508
                    playAction: "action::play",
2926
509
                    nextAction: "action::next",
2927
510
                    previousAction: "action::previous",
2928
511
                    enabled: true
2929
512
                },{
2930
513
                    playAction: "action::play2",
2931
514
                    nextAction: "action::next2",
2932
515
                    previousAction: "action::previous2",
2933
516
                    enabled: false
2934
517
                }
2935
518
            ];
2936
519
        }
2937
520
2938
521
        function test_create_playbackItemMenu(data) {
2939
522
            menuData.type = "com.canonical.unity.playback-item";
2940
523
            menuData.sensitive = data.enabled;
2941
524
            menuData.ext = {
2942
525
                'xCanonicalPlayAction': data.playAction,
2943
526
                'xCanonicalNextAction': data.nextAction,
2944
527
                'xCanonicalPreviousAction': data.previousAction
2945
528
            };
2946
529
2947
530
            loader.data = menuData;
2948
531
            loader.sourceComponent = factory.load(menuData);
2949
532
            tryCompareFunction(function() { return loader.item != undefined; }, true);
2950
533
            compare(loader.item.objectName, "playbackItemMenu", "Should have created a playback menu");
2951
534
2952
535
            compare(loader.item.playing, false, "Playing does not match data");
2953
536
            compare(loader.item.playAction.name, data.playAction, "Play action incorrect");
2954
537
            compare(loader.item.nextAction.name, data.nextAction, "Next action incorrect");
2955
538
            compare(loader.item.previousAction.name, data.previousAction, "Previous action incorrect");
2956
539
            compare(loader.item.canPlay, false, "CanPlay should be false");
2957
540
            compare(loader.item.canGoNext, false, "CanGoNext should be false");
2958
541
            compare(loader.item.canGoPrevious, false, "CanGoPrevious should be false");
2959
366
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
542
            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
2960
367
        }
543
        }
2961
368
    }
544
    }
2962
369
545
2963
=== modified file 'tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml'
2964
--- tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2013-12-12 16:32:20 +0000
2965
+++ tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2014-01-29 14:36:17 +0000
2966
@@ -18,7 +18,8 @@
2967
18
import QtTest 1.0
18
import QtTest 1.0
2968
19
import Unity.Test 0.1 as UT
19
import Unity.Test 0.1 as UT
2969
20
import QMenuModel 0.1
20
import QMenuModel 0.1
2971
21
import Unity.Indicators.Messaging 0.1 as Indicators
21
import Unity.Indicators 0.1 as Indicators
2972
22
import Utils 0.1 as Utils
2973
22
23
2974
23
Item {
24
Item {
2975
24
    id: testView
25
    id: testView
2976
@@ -31,6 +32,11 @@
2977
31
        menuIndex: 0
32
        menuIndex: 0
2978
32
    }
33
    }
2979
33
34
2980
35
    Utils.TimeFormatter {
2981
36
        id: timeFormatter
2982
37
        format: "hh:mm - MMM dd"
2983
38
    }
2984
39
2985
34
    UT.UnityTestCase {
40
    UT.UnityTestCase {
2986
35
        name: "MessageMenuItemFactory"
41
        name: "MessageMenuItemFactory"
2987
36
42
2988
@@ -82,13 +88,14 @@
2989
82
                'xCanonicalAppIcon': data.appIcon,
88
                'xCanonicalAppIcon': data.appIcon,
2990
83
            };
89
            };
2991
84
            factory.menuData = menuData;
90
            factory.menuData = menuData;
2992
91
            timeFormatter.time = data.time;
2993
85
92
2994
86
            var loader = findChild(factory, "loader");
93
            var loader = findChild(factory, "loader");
2995
87
            verify(loader !== undefined);
94
            verify(loader !== undefined);
2996
88
95
2997
89
            tryCompare(loader.item, "objectName", "simpleTextMessage");
96
            tryCompare(loader.item, "objectName", "simpleTextMessage");
2998
90
            compare(loader.item.title, data.title, "Title does not match data");
97
            compare(loader.item.title, data.title, "Title does not match data");
3000
91
            compare(loader.item.time, data.time, "Time does not match data");
98
            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
3001
92
            compare(loader.item.message, data.message, "Message does not match data");
99
            compare(loader.item.message, data.message, "Message does not match data");
3002
93
            compare(loader.item.avatar, data.avatar, "Avatar does not match data");
100
            compare(loader.item.avatar, data.avatar, "Avatar does not match data");
3003
94
            compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
101
            compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
3004
@@ -119,13 +126,14 @@
3005
119
                ]
126
                ]
3006
120
            };
127
            };
3007
121
            factory.menuData = menuData;
128
            factory.menuData = menuData;
3008
129
            timeFormatter.time = data.time;
3009
122
130
3010
123
            var loader = findChild(factory, "loader");
131
            var loader = findChild(factory, "loader");
3011
124
            verify(loader !== undefined);
132
            verify(loader !== undefined);
3012
125
133
3013
126
            tryCompare(loader.item, "objectName", "textMessage");
134
            tryCompare(loader.item, "objectName", "textMessage");
3014
127
            compare(loader.item.title, data.title, "Title does not match data");
135
            compare(loader.item.title, data.title, "Title does not match data");
3016
128
            compare(loader.item.time, data.time, "Time does not match data");
136
            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
3017
129
            compare(loader.item.message, data.message, "Message does not match data");
137
            compare(loader.item.message, data.message, "Message does not match data");
3018
130
            compare(loader.item.avatar, data.avatar, "Avatar does not match data");
138
            compare(loader.item.avatar, data.avatar, "Avatar does not match data");
3019
131
            compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
139
            compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
3020
@@ -160,13 +168,14 @@
3021
160
                ]
168
                ]
3022
161
            };
169
            };
3023
162
            factory.menuData = menuData;
170
            factory.menuData = menuData;
3024
171
            timeFormatter.time = data.time;
3025
163
172
3026
164
            var loader = findChild(factory, "loader");
173
            var loader = findChild(factory, "loader");
3027
165
            verify(loader !== undefined);
174
            verify(loader !== undefined);
3028
166
175
3029
167
            tryCompare(loader.item, "objectName", "snapDecision");
176
            tryCompare(loader.item, "objectName", "snapDecision");
3030
168
            compare(loader.item.title, data.title, "Title does not match data");
177
            compare(loader.item.title, data.title, "Title does not match data");
3032
169
            compare(loader.item.time, data.time, "Time does not match data");
178
            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
3033
170
            compare(loader.item.message, data.message, "Message does not match data");
179
            compare(loader.item.message, data.message, "Message does not match data");
3034
171
            compare(loader.item.avatar, data.avatar, "Avatar does not match data");
180
            compare(loader.item.avatar, data.avatar, "Avatar does not match data");
3035
172
            compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
181
            compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
Status:	Merged
Approved by:	Albert Astals Cid on 2014-01-29
Approved revision:	614
Merged at revision:	670
Proposed branch:	lp:~nick-dedekind/unity8/indicator.ubuntu-settings-components
Merge into:	lp:unity8
Prerequisite:	lp:~nick-dedekind/unity8/indicator-page-factory-tests
Diff against target:	3035 lines (+537/-1779) 37 files modified debian/control (+2/-0) plugins/Unity/Indicators/CMakeLists.txt (+0/-2) plugins/Unity/Indicators/Messaging/CMakeLists.txt (+0/-1) plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml (+0/-69) plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt (+0/-5) plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml (+0/-91) plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml (+0/-123) plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml (+0/-161) plugins/Unity/Indicators/Messaging/qml/QuickReply.qml (+0/-165) plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml (+0/-108) plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml (+0/-167) plugins/Unity/Indicators/Messaging/qml/TextMessage.qml (+0/-43) plugins/Unity/Indicators/Messaging/qml/qmldir (+0/-12) plugins/Unity/Indicators/Network/CMakeLists.txt (+0/-1) plugins/Unity/Indicators/Network/qml/AccessPoint.qml (+0/-117) plugins/Unity/Indicators/Network/qml/CMakeLists.txt (+0/-5) plugins/Unity/Indicators/Network/qml/qmldir (+0/-3) plugins/Unity/Indicators/qml/BaseMenuItem.qml (+0/-38) plugins/Unity/Indicators/qml/ButtonMenuItem.qml (+0/-44) plugins/Unity/Indicators/qml/DivMenuItem.qml (+0/-26) plugins/Unity/Indicators/qml/FramedMenuItem.qml (+0/-39) plugins/Unity/Indicators/qml/HLine.qml (+0/-29) plugins/Unity/Indicators/qml/MenuItemFactory.qml (+232/-48) plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml (+69/-28) plugins/Unity/Indicators/qml/ProgressMenuItem.qml (+0/-38) plugins/Unity/Indicators/qml/SectionMenuItem.qml (+0/-54) plugins/Unity/Indicators/qml/SliderMenuItem.qml (+0/-106) plugins/Unity/Indicators/qml/StandardMenuItem.qml (+0/-71) plugins/Unity/Indicators/qml/SwitchMenuItem.qml (+0/-53) plugins/Unity/Indicators/qml/qmldir (+1/-12) plugins/Unity/Indicators/resources/artwork/network/secure.svg (+0/-71) plugins/Unity/Indicators/resources/indicators.qrc (+0/-2) qml/Panel/Indicators/DefaultIndicatorPage.qml (+9/-5) qml/Panel/Indicators/client/IndicatorsList.qml (+17/-16) tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml (+0/-4) tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml (+194/-18) tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml (+13/-4)
To merge this branch:	bzr merge lp:~nick-dedekind/unity8/indicator.ubuntu-settings-components
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Sebastien Bacher	changes to the packaging		Approve on 2014-01-29
Albert Astals Cid (community)			Approve on 2014-01-29
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-01-29
Michał Sawicz		2013-12-17	Needs Fixing on 2013-12-17
Ubuntu Unity PS integration team	packaging	2014-01-29	Pending
Review via email: mp+199311@code.launchpad.net