1
=== modified file 'debian/dialer-app.install'
2
--- debian/dialer-app.install	2014-01-14 04:04:23 +0000
3
+++ debian/dialer-app.install	2014-02-21 21:36:06 +0000
4
@@ -5,7 +5,6 @@
5
5
usr/share/dialer-app/LiveCallPage
5
usr/share/dialer-app/LiveCallPage
6
6
usr/share/dialer-app/HistoryPage
6
usr/share/dialer-app/HistoryPage
7
7
usr/share/dialer-app/DialerPage
7
usr/share/dialer-app/DialerPage
8
8
usr/share/dialer-app/VoicemailPage
9
9
usr/share/dialer-app/ContactsPage
8
usr/share/dialer-app/ContactsPage
10
10
usr/share/dialer-app/assets
9
usr/share/dialer-app/assets
11
11
usr/bin/*dialer-app*
10
usr/bin/*dialer-app*
12
12
11
13
=== modified file 'src/qml/CMakeLists.txt'
14
--- src/qml/CMakeLists.txt	2013-07-31 17:27:42 +0000
15
+++ src/qml/CMakeLists.txt	2014-02-21 21:36:06 +0000
16
@@ -11,5 +11,4 @@
17
11
add_subdirectory(DialerPage)
11
add_subdirectory(DialerPage)
18
12
add_subdirectory(HistoryPage)
12
add_subdirectory(HistoryPage)
19
13
add_subdirectory(LiveCallPage)
13
add_subdirectory(LiveCallPage)
20
14
add_subdirectory(VoicemailPage)
21
15
add_subdirectory(ContactsPage)
14
add_subdirectory(ContactsPage)
22
16
15
23
=== modified file 'src/qml/DialerPage/DialerPage.qml'
24
--- src/qml/DialerPage/DialerPage.qml	2013-10-08 13:21:55 +0000
25
+++ src/qml/DialerPage/DialerPage.qml	2014-02-21 21:36:06 +0000
26
@@ -29,10 +29,6 @@
27
29
    property alias dialNumber: keypadEntry.value
29
    property alias dialNumber: keypadEntry.value
28
30
    property alias input: keypadEntry.input
30
    property alias input: keypadEntry.input
29
31
31
30
32
    function isVoicemailActive() {
31
33
        return mainView.isVoicemailActive();
32
34
    }
33
35
34
36
    tools: ToolbarItems {
32
    tools: ToolbarItems {
35
37
        opened: false
33
        opened: false
36
38
        locked: true
34
        locked: true
37
39
35
38
=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
39
--- src/qml/LiveCallPage/LiveCall.qml	2014-01-16 20:27:58 +0000
40
+++ src/qml/LiveCallPage/LiveCall.qml	2014-02-21 21:36:06 +0000
41
@@ -36,9 +36,16 @@
42
36
    property bool onHold: call ? call.held : false
36
    property bool onHold: call ? call.held : false
43
37
    property bool isSpeaker: call ? call.speaker : false
37
    property bool isSpeaker: call ? call.speaker : false
44
38
    property bool isMuted: call ? call.muted : false
38
    property bool isMuted: call ? call.muted : false
46
39
    property bool dtmfVisible: false
39
    property bool dtmfVisible: call ? call.voicemail : false
47
40
    property bool isVoicemail: call ? call.voicemail : false
48
40
    property string phoneNumberSubTypeLabel: ""
41
    property string phoneNumberSubTypeLabel: ""
49
41
    Component.onDestruction: mainView.switchToCallLogView()
42
    Component.onDestruction: mainView.switchToCallLogView()
50
43
51
44
    onCallChanged: {
52
45
        // reset the DTMF keypad visibility status
53
46
        dtmfVisible = (call && call.voicemail);
54
47
    }
55
48
56
42
    Timer {
49
    Timer {
57
43
        id: callWatcher
50
        id: callWatcher
58
44
        interval: 10000
51
        interval: 10000
59
@@ -96,8 +103,18 @@
60
96
        when: liveCall.header && liveCall.active
103
        when: liveCall.header && liveCall.active
61
97
    }
104
    }
62
98
105
65
99
    // TRANSLATORS: %1 is the duration of the call
106
    title: {
66
100
    title: dtmfLabelHelper.text !== "" ? dtmfLabelHelper.text : contactWatcher.alias != "" ? contactWatcher.alias : contactWatcher.phoneNumber
107
        if (dtmfLabelHelper.text !== "") {
67
108
            return dtmfLabelHelper.text;
68
109
        } else if (isVoicemail) {
69
110
            return i18n.tr("Voicemail");
70
111
        } else if (contactWatcher.alias != "") {
71
112
            return contactWatcher.alias;
72
113
        } else {
73
114
            return contactWatcher.phoneNumber;
74
115
        }
75
116
    }
76
117
77
101
    tools: ToolbarItems {
118
    tools: ToolbarItems {
78
102
        opened: false
119
        opened: false
79
103
        locked: true
120
        locked: true
80
@@ -170,7 +187,7 @@
81
170
187
82
171
        fillMode: Image.PreserveAspectCrop
188
        fillMode: Image.PreserveAspectCrop
83
172
        // FIXME: use something different than a hardcoded path of a unity8 asset
189
        // FIXME: use something different than a hardcoded path of a unity8 asset
85
173
        source: contactWatcher.avatar != "" ? contactWatcher.avatar : "../assets/live_call_background.png"
190
        source: (isVoicemail || contactWatcher.avatar == "") ? "../assets/live_call_background.png" : contactWatcher.avatar
86
174
        anchors {
191
        anchors {
87
175
            top: topPanel.bottom
192
            top: topPanel.bottom
88
176
            left: parent.left
193
            left: parent.left
89
@@ -193,7 +210,11 @@
90
193
    Item {
210
    Item {
91
194
        id: topPanel
211
        id: topPanel
92
195
        clip: true
212
        clip: true
94
196
        height: contactWatcher.isUnknown ? 0 : units.gu(5)
213
        height: (isVoicemail || contactWatcher.isUnknown) ? 0 : units.gu(5)
95
214
        Behavior on height {
96
215
            UbuntuNumberAnimation { }
97
216
        }
98
217
99
197
        anchors {
218
        anchors {
100
198
            top: parent.top
219
            top: parent.top
101
199
            left: parent.left
220
            left: parent.left
102
@@ -229,17 +250,6 @@
103
229
            bottom: buttonsArea.top
250
            bottom: buttonsArea.top
104
230
        }
251
        }
105
231
252
106
232
        // FIXME: re-enable the keypad entry once design decides where to place it
107
233
        /*KeypadEntry {
108
234
            id: keypadEntry
109
235
110
236
            anchors.centerIn: parent
111
237
            placeHolder: liveCall.number
112
238
            placeHolderPixelFontSize: units.dp(43)
113
239
            focus: true
114
240
            input.readOnly: true
115
241
        }*/
116
242
117
243
        Keypad {
253
        Keypad {
118
244
            id: keypad
254
            id: keypad
119
245
255
120
@@ -248,7 +258,6 @@
121
248
            anchors.bottomMargin: units.gu(2)
258
            anchors.bottomMargin: units.gu(2)
122
249
            anchors.horizontalCenter: parent.horizontalCenter
259
            anchors.horizontalCenter: parent.horizontalCenter
123
250
            onKeyPressed: {
260
            onKeyPressed: {
124
251
                //keypadEntry.value += label
125
252
                if (call) {
261
                if (call) {
126
253
                    dtmfEntry += label
262
                    dtmfEntry += label
127
254
                    call.sendDTMF(label)
263
                    call.sendDTMF(label)
128
@@ -331,6 +340,7 @@
129
331
            LiveCallKeypadButton {
340
            LiveCallKeypadButton {
130
332
                objectName: "muteButton"
341
                objectName: "muteButton"
131
333
                iconSource: selected ? "microphone-mute" : "microphone"
342
                iconSource: selected ? "microphone-mute" : "microphone"
132
343
                enabled: !isVoicemail
133
334
                selected: liveCall.isMuted
344
                selected: liveCall.isMuted
134
335
                iconWidth: units.gu(3)
345
                iconWidth: units.gu(3)
135
336
                iconHeight: units.gu(3)
346
                iconHeight: units.gu(3)
136
@@ -344,6 +354,7 @@
137
344
            LiveCallKeypadButton {
354
            LiveCallKeypadButton {
138
345
                objectName: "pauseStartButton"
355
                objectName: "pauseStartButton"
139
346
                iconSource: selected ? "media-playback-start" : "media-playback-pause"
356
                iconSource: selected ? "media-playback-start" : "media-playback-pause"
140
357
                enabled: !isVoicemail
141
347
                selected: liveCall.onHold
358
                selected: liveCall.onHold
142
348
                iconWidth: units.gu(3)
359
                iconWidth: units.gu(3)
143
349
                iconHeight: units.gu(3)
360
                iconHeight: units.gu(3)
144
@@ -382,7 +393,9 @@
145
382
            iconSource: "contact"
393
            iconSource: "contact"
146
383
            iconWidth: units.gu(4)
394
            iconWidth: units.gu(4)
147
384
            iconHeight: units.gu(4)
395
            iconHeight: units.gu(4)
149
385
            opacity: 0.2
396
            // this button is fully disabled for now, but when it gets enabled again, we need to remember
150
397
            // to still disable it while calling the voicemail
151
398
            enabled: false //!isVoicemail
152
386
399
153
387
            anchors {
400
            anchors {
154
388
                verticalCenter: hangupButton.verticalCenter
401
                verticalCenter: hangupButton.verticalCenter
155
@@ -406,6 +419,7 @@
156
406
            iconSource: "keypad"
419
            iconSource: "keypad"
157
407
            iconWidth: units.gu(4)
420
            iconWidth: units.gu(4)
158
408
            iconHeight: units.gu(4)
421
            iconHeight: units.gu(4)
159
422
            enabled: !isVoicemail
160
409
423
161
410
            anchors {
424
            anchors {
162
411
                verticalCenter: hangupButton.verticalCenter
425
                verticalCenter: hangupButton.verticalCenter
163
412
426
164
=== modified file 'src/qml/LiveCallPage/LiveCallKeypadButton.qml'
165
--- src/qml/LiveCallPage/LiveCallKeypadButton.qml	2013-09-27 17:35:35 +0000
166
+++ src/qml/LiveCallPage/LiveCallKeypadButton.qml	2014-02-21 21:36:06 +0000
167
@@ -27,15 +27,15 @@
168
27
27
169
28
    width: units.gu(7)
28
    width: units.gu(7)
170
29
    height: units.gu(7)
29
    height: units.gu(7)
171
30
    opacity: enabled ? 1.0 : 0.2
172
31
173
32
    Behavior on opacity {
174
33
        UbuntuNumberAnimation { }
175
34
    }
176
30
35
177
31
    property int iconWidth: 0
36
    property int iconWidth: 0
178
32
    property int iconHeight: 0
37
    property int iconHeight: 0
179
33
38
180
34
    /*BorderImage {
181
35
        anchors.fill: parent
182
36
        source: (selected || pressed) ? "../assets/dialer_pad_bg_pressed.png" : "../assets/dialer_pad_bg.png"
183
37
    }*/
184
38
185
39
    Icon {
39
    Icon {
186
40
        id: icon
40
        id: icon
187
41
        anchors.centerIn: parent
41
        anchors.centerIn: parent
188
42
42
189
=== removed directory 'src/qml/VoicemailPage'
190
=== removed file 'src/qml/VoicemailPage/CMakeLists.txt'
191
--- src/qml/VoicemailPage/CMakeLists.txt	2013-07-31 17:27:42 +0000
192
+++ src/qml/VoicemailPage/CMakeLists.txt	1970-01-01 00:00:00 +0000
193
@@ -1,7 +0,0 @@
194
1
file(GLOB VOICEMAIL_QML_JS_FILES *.qml *.js)
195
2
196
3
# make the files visible on qtcreator
197
4
add_custom_target(dialer_voicemail_QMlFiles ALL SOURCES ${VOICEMAIL_QML_JS_FILES})
198
5
199
6
install(FILES ${VOICEMAIL_QML_JS_FILES} DESTINATION ${DIALER_APP_DIR}/VoicemailPage)
200
7
201
8
0
202
=== removed file 'src/qml/VoicemailPage/VoicemailPage.qml'
203
--- src/qml/VoicemailPage/VoicemailPage.qml	2013-09-26 21:39:16 +0000
204
+++ src/qml/VoicemailPage/VoicemailPage.qml	1970-01-01 00:00:00 +0000
205
@@ -1,150 +0,0 @@
206
1
/*
207
2
 * Copyright 2012-2013 Canonical Ltd.
208
3
 *
209
4
 * This file is part of phone-app.
210
5
 *
211
6
 * phone-app is free software; you can redistribute it and/or modify
212
7
 * it under the terms of the GNU General Public License as published by
213
8
 * the Free Software Foundation; version 3.
214
9
 *
215
10
 * phone-app is distributed in the hope that it will be useful,
216
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
217
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
218
13
 * GNU General Public License for more details.
219
14
 *
220
15
 * You should have received a copy of the GNU General Public License
221
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
222
17
 */
223
18
224
19
import QtQuick 2.0
225
20
import Ubuntu.Components 0.1
226
21
import "../DialerPage"
227
22
import "../LiveCallPage"
228
23
229
24
Page {
230
25
    id: voicemail
231
26
232
27
    property variant contact
233
28
    property QtObject call: callManager.foregroundCall
234
29
    property string number: callManager.voicemailNumber
235
30
    Component.onDestruction: mainView.switchToCallLogView()
236
31
    Timer {
237
32
        id: callWatcher
238
33
        interval: 10000
239
34
        repeat: false
240
35
        running: true
241
36
        onTriggered: {
242
37
            if (!call) {
243
38
                // TODO: notify about failed call
244
39
                pageStack.pop()
245
40
            }
246
41
        }
247
42
    }
248
43
249
44
    title: i18n.tr("Voicemail")
250
45
251
46
    function isVoicemailActive() {
252
47
        return mainView.isVoicemailActive();
253
48
    }
254
49
255
50
    function endCall() {
256
51
        if (call) {
257
52
            call.endCall();
258
53
        }
259
54
    }
260
55
261
56
    Item {
262
57
        id: container
263
58
264
59
        anchors.fill: parent
265
60
266
61
        Item {
267
62
            id: body
268
63
269
64
            anchors.fill: parent
270
65
271
66
            Label {
272
67
                id: number
273
68
274
69
                anchors.horizontalCenter: parent.horizontalCenter
275
70
                anchors.bottom: stopWatch.top
276
71
                anchors.topMargin: units.gu(0.5)
277
72
                text: voicemail.number
278
73
                color: "#a0a0a2"
279
74
                style: Text.Sunken
280
75
                styleColor: Qt.rgba(0.0, 0.0, 0.0, 0.5)
281
76
                fontSize: "medium"
282
77
            }
283
78
284
79
            Label {
285
80
                id: dialing
286
81
287
82
                anchors.horizontalCenter: parent.horizontalCenter
288
83
                anchors.topMargin: units.gu(2)
289
84
                anchors.top: number.bottom
290
85
291
86
                text: i18n.tr("Dialing")
292
87
                color: "#a0a0a2"
293
88
                style: Text.Sunken
294
89
                styleColor: Qt.rgba(0.0, 0.0, 0.0, 0.5)
295
90
                fontSize: "medium"
296
91
                opacity: (call && call.voicemail && call.dialing) ? 1.0 : 0.0
297
92
            }
298
93
299
94
            StopWatch {
300
95
                id: stopWatch
301
96
                time: call && call.voicemail ? call.elapsedTime : 0
302
97
303
98
                anchors.horizontalCenter: parent.horizontalCenter
304
99
                anchors.topMargin: units.gu(2)
305
100
                anchors.bottom: keypad.top
306
101
                opacity: (call && call.voicemail && !call.dialing) ? 1.0 : 0.0
307
102
            }
308
103
309
104
            Keypad {
310
105
                id: keypad
311
106
312
107
                anchors.horizontalCenter: parent.horizontalCenter
313
108
                anchors.verticalCenter: parent.verticalCenter
314
109
                onKeyPressed: {
315
110
                    if (call) {
316
111
                        call.sendDTMF(label)
317
112
                    }
318
113
                }
319
114
            }
320
115
321
116
            Row {
322
117
                anchors.top: keypad.bottom
323
118
                anchors.topMargin: units.gu(3)
324
119
                anchors.horizontalCenter: parent.horizontalCenter
325
120
                spacing: units.gu(0.5)
326
121
                Button {
327
122
                    id: dialhangupButton
328
123
                    iconSource: "../assets/incall_hangup.png"
329
124
                    width: isVoicemailActive() ? units.gu(8) : units.gu(16)
330
125
                    color: isVoicemailActive() ? "#bf400c" : "#268bd2"
331
126
                    onClicked: {
332
127
                        if(isVoicemailActive())
333
128
                            endCall()
334
129
                        else
335
130
                            mainView.callNumber(voicemail.number)
336
131
                    }
337
132
                }
338
133
339
134
                Button {
340
135
                    id: speakerButton
341
136
                    width: units.gu(8)
342
137
                    visible: isVoicemailActive()
343
138
                    iconSource: call && call.speaker ? "../assets/speaker.png" : "../assets/speaker-mute.png"
344
139
                    color: "#565656"
345
140
                    state: call && call.speaker ? "pressed" : ""
346
141
                    onClicked: {
347
142
                        if (call) {
348
143
                            call.speaker = !call.speaker
349
144
                        }
350
145
                    }
351
146
                }
352
147
            }
353
148
        }
354
149
    }
355
150
}
356
151
0
357
=== modified file 'src/qml/dialer-app.qml'
358
--- src/qml/dialer-app.qml	2014-01-29 19:29:32 +0000
359
+++ src/qml/dialer-app.qml	2014-02-21 21:36:06 +0000
360
@@ -55,22 +55,13 @@
361
55
    }
55
    }
362
56
56
363
57
    function callVoicemail() {
57
    function callVoicemail() {
371
58
        if (!telepathyHelper.connected || callManager.voicemailNumber === "") {
58
        call(callManager.voicemailNumber);
365
59
            return
366
60
        }
367
61
        if (pageStack.depth === 1 && !callManager.hasCalls) {
368
62
            pageStack.push(Qt.resolvedUrl("VoicemailPage/VoicemailPage.qml"))
369
63
        }
370
64
        callManager.startCall(callManager.voicemailNumber);
372
65
    }
59
    }
373
66
60
374
67
    function call(number) {
61
    function call(number) {
376
68
        if (!telepathyHelper.connected) {
62
        if (!telepathyHelper.connected  || number === "") {
377
69
            return
63
            return
378
70
        }
64
        }
379
71
        if (number === callManager.voicemailNumber) {
380
72
            callVoicemail()
381
73
        }
382
74
        if (pageStack.depth === 1 && !callManager.hasCalls)  {
65
        if (pageStack.depth === 1 && !callManager.hasCalls)  {
383
75
            pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"))
66
            pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"))
384
76
        }
67
        }
385
@@ -81,17 +72,14 @@
386
81
        pageStack.currentPage.currentTab = 2;
72
        pageStack.currentPage.currentTab = 2;
387
82
    }
73
    }
388
83
74
389
84
    function isVoicemailActive() {
390
85
        if (callManager.foregroundCall) {
391
86
            return callManager.foregroundCall.voicemail;
392
87
        } else {
393
88
            return false
394
89
        }
395
90
    }
396
91
397
92
    Component.onCompleted: {
75
    Component.onCompleted: {
398
93
        Theme.name = "Ubuntu.Components.Themes.SuruGradient";
76
        Theme.name = "Ubuntu.Components.Themes.SuruGradient";
399
94
        pageStack.push(Qt.createComponent("MainPage.qml"))
77
        pageStack.push(Qt.createComponent("MainPage.qml"))
400
78
401
79
        // if there are calls, even if we don't have info about them yet, push the livecall view
402
80
        if (callManager.hasCalls) {
403
81
            pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"));
404
82
        }
405
95
    }
83
    }
406
96
84
407
97
    Connections {
85
    Connections {
408
@@ -112,12 +100,7 @@
409
112
            }
100
            }
410
113
            // if there are no calls, or if the views are already loaded, do not continue processing
101
            // if there are no calls, or if the views are already loaded, do not continue processing
411
114
            if ((callManager.foregroundCall || callManager.backgroundCall) && pageStack.depth === 1) {
102
            if ((callManager.foregroundCall || callManager.backgroundCall) && pageStack.depth === 1) {
418
115
                if ((callManager.foregroundCall && callManager.foregroundCall.voicemail)
103
                pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"));
413
116
                        || (callManager.backgroundCall && callManager.backgroundCall.voicemail)) {
414
117
                    pageStack.push(Qt.resolvedUrl("VoicemailPage/VoicemailPage.qml"))
415
118
                } else  {
416
119
                    pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"));
417
120
                }
419
121
                application.activateWindow();
104
                application.activateWindow();
420
122
            }
105
            }
421
123
        }
106
        }
Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2014-02-21	Approve on 2014-02-21
PS Jenkins bot	continuous-integration	2014-02-21	Approve on 2014-02-21
Review via email: mp+207733@code.launchpad.net