Merge lp:~phablet-team/dialer-app/phone_settings into lp:dialer-app/staging
- phone_settings
- Merge into staging
Proposed by
Gustavo Pichorim Boiko
Status: | Merged |
---|---|
Approved by: | Renato Araujo Oliveira Filho |
Approved revision: | 574 |
Merged at revision: | 559 |
Proposed branch: | lp:~phablet-team/dialer-app/phone_settings |
Merge into: | lp:dialer-app/staging |
Prerequisite: | lp:~phablet-team/dialer-app/expand-dialer |
Diff against target: |
3554 lines (+2449/-153) 58 files modified
TODO (+1/-0) debian/dialer-app.install (+1/-0) po/dialer-app.pot (+253/-111) src/qml/AccountsModel.qml (+1/-1) src/qml/CMakeLists.txt (+1/-0) src/qml/ContactsPage/ContactsPage.qml (+1/-1) src/qml/ContactsPage/KeyboardRectagle.qml (+1/-1) src/qml/DialerPage/CallButton.qml (+1/-1) src/qml/DialerPage/CustomButton.qml (+1/-1) src/qml/DialerPage/DialerBottomEdge.qml (+1/-1) src/qml/DialerPage/DialerPage.qml (+12/-3) src/qml/DialerPage/KeypadButton.qml (+1/-1) src/qml/DialerPage/KeypadEntry.qml (+1/-1) src/qml/Dialogs/DisableFlightModeDialog.qml (+1/-1) src/qml/Dialogs/FlightModeProgressDialog.qml (+1/-1) src/qml/Dialogs/NoDefaultSIMCardDialog.qml (+1/-1) src/qml/Dialogs/NotificationDialog.qml (+1/-1) src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+1/-1) src/qml/Dialogs/SimLockedDialog.qml (+1/-1) src/qml/Dialogs/UssdErrorDialog.qml (+1/-1) src/qml/Dialogs/UssdProgressDialog.qml (+1/-1) src/qml/Dialogs/UssdResponseDialog.qml (+1/-1) src/qml/HistoryPage/ExpandableButton.qml (+1/-1) src/qml/HistoryPage/HistoryDelegate.qml (+1/-1) src/qml/HistoryPage/HistoryDetailsPage.qml (+1/-1) src/qml/HistoryPage/HistoryPage.qml (+1/-1) src/qml/HistoryPage/SwipeItemDemo.qml (+1/-1) src/qml/InputInfo.qml (+1/-1) src/qml/LiveCallPage/ConferenceCallDisplay.qml (+1/-1) src/qml/LiveCallPage/HangupButton.qml (+1/-1) src/qml/LiveCallPage/LiveCall.qml (+12/-4) src/qml/LiveCallPage/LiveCallKeypadButton.qml (+1/-1) src/qml/LiveCallPage/MultiCallDisplay.qml (+1/-1) src/qml/LiveCallPage/StopWatch.qml (+1/-1) src/qml/MMI/IMEI.qml (+1/-1) src/qml/MMI/IMEIDialog.qml (+1/-1) src/qml/SettingsPage/AccountSettings/CMakeLists.txt (+6/-0) src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml (+177/-0) src/qml/SettingsPage/AccountSettings/sip.qml (+30/-0) src/qml/SettingsPage/CMakeLists.txt (+8/-0) src/qml/SettingsPage/CallForwardItem.qml (+240/-0) src/qml/SettingsPage/CallForwarding.qml (+393/-0) src/qml/SettingsPage/CallWaiting.qml (+108/-0) src/qml/SettingsPage/KeyboardRectangle.qml (+77/-0) src/qml/SettingsPage/MultiSim.qml (+113/-0) src/qml/SettingsPage/NoSims.qml (+46/-0) src/qml/SettingsPage/Ofono.qml (+69/-0) src/qml/SettingsPage/OnlineAccountsHelper.qml (+96/-0) src/qml/SettingsPage/ServiceInfo.qml (+133/-0) src/qml/SettingsPage/Services.qml (+74/-0) src/qml/SettingsPage/SettingsItemTitle.qml (+44/-0) src/qml/SettingsPage/SettingsPage.qml (+158/-0) src/qml/SettingsPage/SettingsTextField.qml (+29/-0) src/qml/SettingsPage/SingleSim.qml (+69/-0) src/qml/SettingsPage/VCardParser.qml (+55/-0) src/qml/SettingsPage/callForwardingUtils.js (+126/-0) src/qml/SettingsPage/dateUtils.js (+69/-0) src/qml/dialer-app.qml (+19/-5) |
To merge this branch: | bzr merge lp:~phablet-team/dialer-app/phone_settings |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Renato Araujo Oliveira Filho (community) | Approve | ||
Review via email: mp+320669@code.launchpad.net |
This proposal supersedes a proposal from 2017-01-12.
Commit message
Move the phone settings from ubuntu-
Description of the change
Move the phone settings from ubuntu-
To post a comment you must log in.
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote : Posted in a previous version of this proposal | # |
review:
Needs Fixing
- 572. By Gustavo Pichorim Boiko
-
Remove unused file.
- 573. By Gustavo Pichorim Boiko
-
Update to QtQuick 2.4
- 574. By Gustavo Pichorim Boiko
-
Add a TODO file with the pending items.
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote : | # |
Regarding the ListItem usage, this code was imported from ubuntu-
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
looks good
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'TODO' | |||
2 | --- TODO 1970-01-01 00:00:00 +0000 | |||
3 | +++ TODO 2017-03-22 17:10:08 +0000 | |||
4 | @@ -0,0 +1,1 @@ | |||
5 | 1 | - port the settings page to use the new SDK ListItem to fix keyboard navigation | ||
6 | 0 | 2 | ||
7 | === modified file 'debian/dialer-app.install' | |||
8 | --- debian/dialer-app.install 2015-04-30 18:10:29 +0000 | |||
9 | +++ debian/dialer-app.install 2017-03-22 17:10:08 +0000 | |||
10 | @@ -8,6 +8,7 @@ | |||
11 | 8 | usr/share/dialer-app/ContactsPage | 8 | usr/share/dialer-app/ContactsPage |
12 | 9 | usr/share/dialer-app/ContactViewPage | 9 | usr/share/dialer-app/ContactViewPage |
13 | 10 | usr/share/dialer-app/ContactEditorPage | 10 | usr/share/dialer-app/ContactEditorPage |
14 | 11 | usr/share/dialer-app/SettingsPage | ||
15 | 11 | usr/share/dialer-app/Dialogs | 12 | usr/share/dialer-app/Dialogs |
16 | 12 | usr/share/dialer-app/assets | 13 | usr/share/dialer-app/assets |
17 | 13 | usr/share/dialer-app/MMI | 14 | usr/share/dialer-app/MMI |
18 | 14 | 15 | ||
19 | === modified file 'po/dialer-app.pot' | |||
20 | --- po/dialer-app.pot 2015-07-15 13:54:05 +0000 | |||
21 | +++ po/dialer-app.pot 2017-03-22 17:10:08 +0000 | |||
22 | @@ -8,7 +8,7 @@ | |||
23 | 8 | msgstr "" | 8 | msgstr "" |
24 | 9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
25 | 10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
27 | 11 | "POT-Creation-Date: 2015-07-15 10:53-0300\n" | 11 | "POT-Creation-Date: 2017-01-12 16:58-0200\n" |
28 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
29 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
30 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
31 | @@ -18,17 +18,25 @@ | |||
32 | 18 | "Content-Transfer-Encoding: 8bit\n" | 18 | "Content-Transfer-Encoding: 8bit\n" |
33 | 19 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" | 19 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" |
34 | 20 | 20 | ||
36 | 21 | #: ../src/qml/DialerPage/Keypad.qml:174 | 21 | #: ../src/qml/DialerPage/Keypad.qml:242 |
37 | 22 | msgid "#" | 22 | msgid "#" |
38 | 23 | msgstr "" | 23 | msgstr "" |
39 | 24 | 24 | ||
40 | 25 | #. TRANSLATORS: %1 is the call duration here. | 25 | #. TRANSLATORS: %1 is the call duration here. |
42 | 26 | #: ../src/qml/LiveCallPage/LiveCall.qml:443 | 26 | #: ../src/qml/LiveCallPage/LiveCall.qml:454 |
43 | 27 | #, qt-format | 27 | #, qt-format |
44 | 28 | msgid "%1 - on hold" | 28 | msgid "%1 - on hold" |
45 | 29 | msgstr "" | 29 | msgstr "" |
46 | 30 | 30 | ||
47 | 31 | #. TRANSLATORS: %1 is the name of the (network) carrier | ||
48 | 32 | #: ../src/qml/SettingsPage/Services.qml:34 | ||
49 | 33 | #: ../src/qml/SettingsPage/SingleSim.qml:51 | ||
50 | 34 | #, qt-format | ||
51 | 35 | msgid "%1 Services" | ||
52 | 36 | msgstr "" | ||
53 | 37 | |||
54 | 31 | #: ../src/qml/HistoryPage/dateUtils.js:92 | 38 | #: ../src/qml/HistoryPage/dateUtils.js:92 |
55 | 39 | #: ../src/qml/SettingsPage/dateUtils.js:61 | ||
56 | 32 | #, qt-format | 40 | #, qt-format |
57 | 33 | msgid "%1 hour" | 41 | msgid "%1 hour" |
58 | 34 | msgid_plural "%1 hours" | 42 | msgid_plural "%1 hours" |
59 | @@ -36,6 +44,7 @@ | |||
60 | 36 | msgstr[1] "" | 44 | msgstr[1] "" |
61 | 37 | 45 | ||
62 | 38 | #: ../src/qml/HistoryPage/dateUtils.js:94 | 46 | #: ../src/qml/HistoryPage/dateUtils.js:94 |
63 | 47 | #: ../src/qml/SettingsPage/dateUtils.js:63 | ||
64 | 39 | #, qt-format | 48 | #, qt-format |
65 | 40 | msgid "%1 min" | 49 | msgid "%1 min" |
66 | 41 | msgid_plural "%1 mins" | 50 | msgid_plural "%1 mins" |
67 | @@ -43,6 +52,7 @@ | |||
68 | 43 | msgstr[1] "" | 52 | msgstr[1] "" |
69 | 44 | 53 | ||
70 | 45 | #: ../src/qml/HistoryPage/dateUtils.js:96 | 54 | #: ../src/qml/HistoryPage/dateUtils.js:96 |
71 | 55 | #: ../src/qml/SettingsPage/dateUtils.js:65 | ||
72 | 46 | #, qt-format | 56 | #, qt-format |
73 | 47 | msgid "%1 sec" | 57 | msgid "%1 sec" |
74 | 48 | msgid_plural "%1 secs" | 58 | msgid_plural "%1 secs" |
75 | @@ -50,61 +60,62 @@ | |||
76 | 50 | msgstr[1] "" | 60 | msgstr[1] "" |
77 | 51 | 61 | ||
78 | 52 | #. TRANSLATORS: this is the count of events grouped into this single item | 62 | #. TRANSLATORS: this is the count of events grouped into this single item |
80 | 53 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:201 | 63 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:206 |
81 | 54 | #: ../src/qml/HistoryPage/SwipeItemDemo.qml:150 | 64 | #: ../src/qml/HistoryPage/SwipeItemDemo.qml:150 |
82 | 55 | #, qt-format | 65 | #, qt-format |
83 | 56 | msgid "(%1)" | 66 | msgid "(%1)" |
84 | 57 | msgstr "" | 67 | msgstr "" |
85 | 58 | 68 | ||
87 | 59 | #: ../src/qml/DialerPage/Keypad.qml:150 | 69 | #: ../src/qml/DialerPage/Keypad.qml:206 |
88 | 60 | msgid "*" | 70 | msgid "*" |
89 | 61 | msgstr "" | 71 | msgstr "" |
90 | 62 | 72 | ||
92 | 63 | #: ../src/qml/DialerPage/Keypad.qml:161 | 73 | #: ../src/qml/DialerPage/DialerBottomEdge.qml:26 |
93 | 74 | #: ../src/qml/DialerPage/Keypad.qml:223 | ||
94 | 64 | msgid "+" | 75 | msgid "+" |
95 | 65 | msgstr "" | 76 | msgstr "" |
96 | 66 | 77 | ||
98 | 67 | #: ../src/qml/DialerPage/Keypad.qml:160 | 78 | #: ../src/qml/DialerPage/Keypad.qml:222 |
99 | 68 | msgid "0" | 79 | msgid "0" |
100 | 69 | msgstr "" | 80 | msgstr "" |
101 | 70 | 81 | ||
103 | 71 | #: ../src/qml/DialerPage/Keypad.qml:49 | 82 | #: ../src/qml/DialerPage/Keypad.qml:51 |
104 | 72 | msgid "1" | 83 | msgid "1" |
105 | 73 | msgstr "" | 84 | msgstr "" |
106 | 74 | 85 | ||
108 | 75 | #: ../src/qml/DialerPage/Keypad.qml:60 | 86 | #: ../src/qml/DialerPage/Keypad.qml:68 |
109 | 76 | msgid "2" | 87 | msgid "2" |
110 | 77 | msgstr "" | 88 | msgstr "" |
111 | 78 | 89 | ||
113 | 79 | #: ../src/qml/DialerPage/Keypad.qml:71 | 90 | #: ../src/qml/DialerPage/Keypad.qml:85 |
114 | 80 | msgid "3" | 91 | msgid "3" |
115 | 81 | msgstr "" | 92 | msgstr "" |
116 | 82 | 93 | ||
118 | 83 | #: ../src/qml/DialerPage/Keypad.qml:82 | 94 | #: ../src/qml/DialerPage/Keypad.qml:102 |
119 | 84 | msgid "4" | 95 | msgid "4" |
120 | 85 | msgstr "" | 96 | msgstr "" |
121 | 86 | 97 | ||
123 | 87 | #: ../src/qml/DialerPage/Keypad.qml:93 | 98 | #: ../src/qml/DialerPage/Keypad.qml:119 |
124 | 88 | msgid "5" | 99 | msgid "5" |
125 | 89 | msgstr "" | 100 | msgstr "" |
126 | 90 | 101 | ||
128 | 91 | #: ../src/qml/DialerPage/Keypad.qml:104 | 102 | #: ../src/qml/DialerPage/Keypad.qml:136 |
129 | 92 | msgid "6" | 103 | msgid "6" |
130 | 93 | msgstr "" | 104 | msgstr "" |
131 | 94 | 105 | ||
133 | 95 | #: ../src/qml/DialerPage/Keypad.qml:115 | 106 | #: ../src/qml/DialerPage/Keypad.qml:153 |
134 | 96 | msgid "7" | 107 | msgid "7" |
135 | 97 | msgstr "" | 108 | msgstr "" |
136 | 98 | 109 | ||
138 | 99 | #: ../src/qml/DialerPage/Keypad.qml:126 | 110 | #: ../src/qml/DialerPage/Keypad.qml:170 |
139 | 100 | msgid "8" | 111 | msgid "8" |
140 | 101 | msgstr "" | 112 | msgstr "" |
141 | 102 | 113 | ||
143 | 103 | #: ../src/qml/DialerPage/Keypad.qml:137 | 114 | #: ../src/qml/DialerPage/Keypad.qml:187 |
144 | 104 | msgid "9" | 115 | msgid "9" |
145 | 105 | msgstr "" | 116 | msgstr "" |
146 | 106 | 117 | ||
148 | 107 | #: ../src/qml/DialerPage/Keypad.qml:61 | 118 | #: ../src/qml/DialerPage/Keypad.qml:69 |
149 | 108 | msgid "ABC" | 119 | msgid "ABC" |
150 | 109 | msgstr "" | 120 | msgstr "" |
151 | 110 | 121 | ||
152 | @@ -112,61 +123,94 @@ | |||
153 | 112 | msgid "Active" | 123 | msgid "Active" |
154 | 113 | msgstr "" | 124 | msgstr "" |
155 | 114 | 125 | ||
157 | 115 | #: ../src/qml/HistoryPage/HistoryPage.qml:49 | 126 | #: ../src/qml/HistoryPage/HistoryPage.qml:68 |
158 | 116 | msgctxt "All Calls" | 127 | msgctxt "All Calls" |
159 | 117 | msgid "All" | 128 | msgid "All" |
160 | 118 | msgstr "" | 129 | msgstr "" |
161 | 119 | 130 | ||
163 | 120 | #: ../src/qml/ContactsPage/ContactsPage.qml:92 | 131 | #: ../src/qml/ContactsPage/ContactsPage.qml:95 |
164 | 121 | msgctxt "All Contacts" | 132 | msgctxt "All Contacts" |
165 | 122 | msgid "All" | 133 | msgid "All" |
166 | 123 | msgstr "" | 134 | msgstr "" |
167 | 124 | 135 | ||
169 | 125 | #: ../src/qml/LiveCallPage/LiveCall.qml:326 | 136 | #: ../src/qml/SettingsPage/CallForwarding.qml:378 |
170 | 137 | msgid "All calls" | ||
171 | 138 | msgstr "" | ||
172 | 139 | |||
173 | 140 | #: ../src/qml/LiveCallPage/LiveCall.qml:341 | ||
174 | 126 | msgid "Bluetooth device" | 141 | msgid "Bluetooth device" |
175 | 127 | msgstr "" | 142 | msgstr "" |
176 | 128 | 143 | ||
178 | 129 | #: ../src/qml/dialer-app.qml:596 | 144 | #: ../src/qml/SettingsPage/ServiceInfo.qml:125 |
179 | 145 | msgid "Call" | ||
180 | 146 | msgstr "" | ||
181 | 147 | |||
182 | 148 | #: ../src/qml/dialer-app.qml:570 | ||
183 | 130 | msgid "Call Barring" | 149 | msgid "Call Barring" |
184 | 131 | msgstr "" | 150 | msgstr "" |
185 | 132 | 151 | ||
187 | 133 | #: ../src/qml/dialer-app.qml:607 | 152 | #: ../src/qml/dialer-app.qml:581 |
188 | 134 | msgid "Call Forwarding" | 153 | msgid "Call Forwarding" |
189 | 135 | msgstr "" | 154 | msgstr "" |
190 | 136 | 155 | ||
192 | 137 | #: ../src/qml/dialer-app.qml:618 | 156 | #: ../src/qml/dialer-app.qml:592 |
193 | 138 | msgid "Call Waiting" | 157 | msgid "Call Waiting" |
194 | 139 | msgstr "" | 158 | msgstr "" |
195 | 140 | 159 | ||
197 | 141 | #: ../src/qml/LiveCallPage/LiveCall.qml:134 | 160 | #: ../src/qml/LiveCallPage/LiveCall.qml:152 |
198 | 142 | msgid "Call ended" | 161 | msgid "Call ended" |
199 | 143 | msgstr "" | 162 | msgstr "" |
200 | 144 | 163 | ||
202 | 145 | #: ../src/qml/LiveCallPage/LiveCall.qml:283 | 164 | #: ../src/qml/LiveCallPage/LiveCall.qml:297 |
203 | 146 | msgid "Call failed" | 165 | msgid "Call failed" |
204 | 147 | msgstr "" | 166 | msgstr "" |
205 | 148 | 167 | ||
207 | 149 | #: ../src/qml/LiveCallPage/LiveCall.qml:142 | 168 | #: ../src/qml/SettingsPage/CallForwarding.qml:44 |
208 | 169 | #: ../src/qml/SettingsPage/MultiSim.qml:51 | ||
209 | 170 | #: ../src/qml/SettingsPage/NoSims.qml:28 | ||
210 | 171 | #: ../src/qml/SettingsPage/SingleSim.qml:39 | ||
211 | 172 | msgid "Call forwarding" | ||
212 | 173 | msgstr "" | ||
213 | 174 | |||
214 | 175 | #: ../src/qml/SettingsPage/CallForwardItem.qml:218 | ||
215 | 176 | msgid "Call forwarding can't be changed right now." | ||
216 | 177 | msgstr "" | ||
217 | 178 | |||
218 | 179 | #: ../src/qml/SettingsPage/CallForwarding.qml:154 | ||
219 | 180 | msgid "Call forwarding status can't be checked " | ||
220 | 181 | msgstr "" | ||
221 | 182 | |||
222 | 183 | #: ../src/qml/LiveCallPage/LiveCall.qml:160 | ||
223 | 150 | msgid "Call holding failure" | 184 | msgid "Call holding failure" |
224 | 151 | msgstr "" | 185 | msgstr "" |
225 | 152 | 186 | ||
228 | 153 | #: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:110 | 187 | #: ../src/qml/SettingsPage/CallWaiting.qml:31 |
229 | 154 | #: ../src/qml/LiveCallPage/LiveCall.qml:445 | 188 | #: ../src/qml/SettingsPage/CallWaiting.qml:86 |
230 | 189 | #: ../src/qml/SettingsPage/MultiSim.qml:41 | ||
231 | 190 | #: ../src/qml/SettingsPage/NoSims.qml:34 | ||
232 | 191 | #: ../src/qml/SettingsPage/SingleSim.qml:32 | ||
233 | 192 | msgid "Call waiting" | ||
234 | 193 | msgstr "" | ||
235 | 194 | |||
236 | 195 | #: ../src/qml/DialerPage/DialerPage.qml:509 | ||
237 | 196 | #: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:113 | ||
238 | 197 | #: ../src/qml/LiveCallPage/LiveCall.qml:456 | ||
239 | 155 | #: ../src/qml/LiveCallPage/MultiCallDisplay.qml:108 | 198 | #: ../src/qml/LiveCallPage/MultiCallDisplay.qml:108 |
240 | 156 | msgid "Calling" | 199 | msgid "Calling" |
241 | 157 | msgstr "" | 200 | msgstr "" |
242 | 158 | 201 | ||
244 | 159 | #: ../src/qml/dialer-app.qml:629 | 202 | #: ../src/qml/dialer-app.qml:603 |
245 | 160 | msgid "Calling Line Presentation" | 203 | msgid "Calling Line Presentation" |
246 | 161 | msgstr "" | 204 | msgstr "" |
247 | 162 | 205 | ||
249 | 163 | #: ../src/qml/dialer-app.qml:641 | 206 | #: ../src/qml/dialer-app.qml:615 |
250 | 164 | msgid "Calling Line Restriction" | 207 | msgid "Calling Line Restriction" |
251 | 165 | msgstr "" | 208 | msgstr "" |
252 | 166 | 209 | ||
253 | 167 | #: ../src/qml/ContactEditorPage/DialerContactEditorPage.qml:35 | 210 | #: ../src/qml/ContactEditorPage/DialerContactEditorPage.qml:35 |
255 | 168 | #: ../src/qml/ContactsPage/ContactsPage.qml:106 | 211 | #: ../src/qml/ContactsPage/ContactsPage.qml:145 |
256 | 169 | #: ../src/qml/Dialogs/DisableFlightModeDialog.qml:38 | 212 | #: ../src/qml/Dialogs/DisableFlightModeDialog.qml:38 |
257 | 213 | #: ../src/qml/SettingsPage/CallForwarding.qml:236 | ||
258 | 170 | msgid "Cancel" | 214 | msgid "Cancel" |
259 | 171 | msgstr "" | 215 | msgstr "" |
260 | 172 | 216 | ||
261 | @@ -176,49 +220,61 @@ | |||
262 | 176 | msgid "Change all Call associations to %1?" | 220 | msgid "Change all Call associations to %1?" |
263 | 177 | msgstr "" | 221 | msgstr "" |
264 | 178 | 222 | ||
266 | 179 | #: ../src/qml/DialerPage/DialerPage.qml:55 | 223 | #: ../src/qml/DialerPage/DialerPage.qml:78 |
267 | 180 | #: ../src/qml/Dialogs/NotificationDialog.qml:29 | 224 | #: ../src/qml/Dialogs/NotificationDialog.qml:29 |
268 | 181 | msgid "Close" | 225 | msgid "Close" |
269 | 182 | msgstr "" | 226 | msgstr "" |
270 | 183 | 227 | ||
272 | 184 | #: ../src/qml/LiveCallPage/LiveCall.qml:48 | 228 | #: ../src/qml/LiveCallPage/LiveCall.qml:52 |
273 | 185 | #: ../src/qml/LiveCallPage/MultiCallDisplay.qml:89 | 229 | #: ../src/qml/LiveCallPage/MultiCallDisplay.qml:89 |
274 | 186 | msgid "Conference" | 230 | msgid "Conference" |
275 | 187 | msgstr "" | 231 | msgstr "" |
276 | 188 | 232 | ||
278 | 189 | #: ../src/qml/LiveCallPage/LiveCall.qml:113 | 233 | #: ../src/qml/LiveCallPage/LiveCall.qml:131 |
279 | 190 | msgid "Conference call failure" | 234 | msgid "Conference call failure" |
280 | 191 | msgstr "" | 235 | msgstr "" |
281 | 192 | 236 | ||
283 | 193 | #: ../src/qml/dialer-app.qml:635 | 237 | #: ../src/qml/dialer-app.qml:609 |
284 | 194 | msgid "Connected Line Presentation" | 238 | msgid "Connected Line Presentation" |
285 | 195 | msgstr "" | 239 | msgstr "" |
286 | 196 | 240 | ||
288 | 197 | #: ../src/qml/dialer-app.qml:647 | 241 | #: ../src/qml/dialer-app.qml:621 |
289 | 198 | msgid "Connected Line Restriction" | 242 | msgid "Connected Line Restriction" |
290 | 199 | msgstr "" | 243 | msgstr "" |
291 | 200 | 244 | ||
294 | 201 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:54 | 245 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:66 |
295 | 202 | #: ../src/qml/HistoryPage/HistoryPage.qml:343 | 246 | #: ../src/qml/HistoryPage/HistoryPage.qml:369 |
296 | 203 | msgid "Contact Details" | 247 | msgid "Contact Details" |
297 | 204 | msgstr "" | 248 | msgstr "" |
298 | 205 | 249 | ||
301 | 206 | #: ../src/qml/ContactsPage/ContactsPage.qml:53 | 250 | #: ../src/qml/SettingsPage/CallForwarding.qml:299 |
302 | 207 | #: ../src/qml/DialerPage/DialerPage.qml:42 | 251 | msgid "Contact not associated with any phone number." |
303 | 252 | msgstr "" | ||
304 | 253 | |||
305 | 254 | #: ../src/qml/ContactsPage/ContactsPage.qml:77 | ||
306 | 255 | #: ../src/qml/DialerPage/DialerPage.qml:59 | ||
307 | 208 | msgid "Contacts" | 256 | msgid "Contacts" |
308 | 209 | msgstr "" | 257 | msgstr "" |
309 | 210 | 258 | ||
311 | 211 | #: ../src/qml/DialerPage/Keypad.qml:72 | 259 | #: ../src/qml/SettingsPage/CallForwarding.qml:223 |
312 | 260 | msgid "Contacts..." | ||
313 | 261 | msgstr "" | ||
314 | 262 | |||
315 | 263 | #: ../src/qml/SettingsPage/CallForwarding.qml:298 | ||
316 | 264 | msgid "Could not forward to this contact" | ||
317 | 265 | msgstr "" | ||
318 | 266 | |||
319 | 267 | #: ../src/qml/DialerPage/Keypad.qml:86 | ||
320 | 212 | msgid "DEF" | 268 | msgid "DEF" |
321 | 213 | msgstr "" | 269 | msgstr "" |
322 | 214 | 270 | ||
326 | 215 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:74 | 271 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:86 |
327 | 216 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:238 | 272 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:253 |
328 | 217 | #: ../src/qml/HistoryPage/HistoryPage.qml:315 | 273 | #: ../src/qml/HistoryPage/HistoryPage.qml:341 |
329 | 218 | msgid "Delete" | 274 | msgid "Delete" |
330 | 219 | msgstr "" | 275 | msgstr "" |
331 | 220 | 276 | ||
333 | 221 | #: ../src/qml/HistoryPage/HistoryPage.qml:324 | 277 | #: ../src/qml/HistoryPage/HistoryPage.qml:350 |
334 | 222 | msgid "Details" | 278 | msgid "Details" |
335 | 223 | msgstr "" | 279 | msgstr "" |
336 | 224 | 280 | ||
337 | @@ -226,12 +282,13 @@ | |||
338 | 226 | msgid "Disable" | 282 | msgid "Disable" |
339 | 227 | msgstr "" | 283 | msgstr "" |
340 | 228 | 284 | ||
342 | 229 | #: ../src/qml/dialer-app.qml:451 | 285 | #: ../src/qml/Dialogs/FlightModeProgressDialog.qml:29 |
343 | 230 | msgid "Disabling flight mode" | 286 | msgid "Disabling flight mode" |
344 | 231 | msgstr "" | 287 | msgstr "" |
345 | 232 | 288 | ||
348 | 233 | #: ../src/qml/MMI/IMEI.qml:48 ../src/qml/dialer-app.qml:514 | 289 | #: ../src/qml/Dialogs/UssdErrorDialog.qml:31 |
349 | 234 | #: ../src/qml/dialer-app.qml:528 | 290 | #: ../src/qml/Dialogs/UssdResponseDialog.qml:30 |
350 | 291 | #: ../src/qml/MMI/IMEIDialog.qml:40 | ||
351 | 235 | msgid "Dismiss" | 292 | msgid "Dismiss" |
352 | 236 | msgstr "" | 293 | msgstr "" |
353 | 237 | 294 | ||
354 | @@ -239,47 +296,64 @@ | |||
355 | 239 | msgid "Don't ask again" | 296 | msgid "Don't ask again" |
356 | 240 | msgstr "" | 297 | msgstr "" |
357 | 241 | 298 | ||
359 | 242 | #: ../src/qml/ContactViewPage/DialerContactViewPage.qml:69 | 299 | #: ../src/qml/ContactViewPage/DialerContactViewPage.qml:70 |
360 | 243 | msgid "Edit" | 300 | msgid "Edit" |
361 | 244 | msgstr "" | 301 | msgstr "" |
362 | 245 | 302 | ||
364 | 246 | #: ../src/qml/DialerPage/DialerPage.qml:72 | 303 | #: ../src/qml/DialerPage/DialerPage.qml:132 |
365 | 304 | #: ../src/qml/DialerPage/DialerPage.qml:142 | ||
366 | 247 | msgid "Emergency Calls" | 305 | msgid "Emergency Calls" |
367 | 248 | msgstr "" | 306 | msgstr "" |
368 | 249 | 307 | ||
370 | 250 | #: ../src/qml/DialerPage/DialerPage.qml:277 | 308 | #: ../src/qml/DialerPage/DialerPage.qml:467 |
371 | 309 | msgid "Emergency call" | ||
372 | 310 | msgstr "" | ||
373 | 311 | |||
374 | 312 | #: ../src/qml/DialerPage/DialerPage.qml:303 | ||
375 | 313 | #: ../src/qml/SettingsPage/CallForwardItem.qml:171 | ||
376 | 251 | msgid "Enter a number" | 314 | msgid "Enter a number" |
377 | 252 | msgstr "" | 315 | msgstr "" |
378 | 253 | 316 | ||
380 | 254 | #: ../src/qml/dialer-app.qml:511 | 317 | #: ../src/qml/Dialogs/UssdErrorDialog.qml:28 |
381 | 255 | msgid "Error" | 318 | msgid "Error" |
382 | 256 | msgstr "" | 319 | msgstr "" |
383 | 257 | 320 | ||
385 | 258 | #: ../src/qml/LiveCallPage/LiveCall.qml:143 | 321 | #: ../src/qml/LiveCallPage/LiveCall.qml:161 |
386 | 259 | msgid "Failed to activate the call." | 322 | msgid "Failed to activate the call." |
387 | 260 | msgstr "" | 323 | msgstr "" |
388 | 261 | 324 | ||
390 | 262 | #: ../src/qml/LiveCallPage/LiveCall.qml:114 | 325 | #: ../src/qml/LiveCallPage/LiveCall.qml:132 |
391 | 263 | msgid "Failed to create a conference call." | 326 | msgid "Failed to create a conference call." |
392 | 264 | msgstr "" | 327 | msgstr "" |
393 | 265 | 328 | ||
395 | 266 | #: ../src/qml/LiveCallPage/LiveCall.qml:144 | 329 | #: ../src/qml/LiveCallPage/LiveCall.qml:162 |
396 | 267 | msgid "Failed to place the active call on hold." | 330 | msgid "Failed to place the active call on hold." |
397 | 268 | msgstr "" | 331 | msgstr "" |
398 | 269 | 332 | ||
400 | 270 | #: ../src/qml/ContactsPage/ContactsPage.qml:92 | 333 | #: ../src/qml/ContactsPage/ContactsPage.qml:95 |
401 | 271 | msgid "Favorites" | 334 | msgid "Favorites" |
402 | 272 | msgstr "" | 335 | msgstr "" |
403 | 273 | 336 | ||
404 | 337 | #: ../src/qml/DialerPage/DialerPage.qml:137 | ||
405 | 274 | #: ../src/qml/Dialogs/DisableFlightModeDialog.qml:27 | 338 | #: ../src/qml/Dialogs/DisableFlightModeDialog.qml:27 |
406 | 275 | msgid "Flight Mode" | 339 | msgid "Flight Mode" |
407 | 276 | msgstr "" | 340 | msgstr "" |
408 | 277 | 341 | ||
414 | 278 | #: ../src/qml/DialerPage/DialerPage.qml:77 | 342 | #: ../src/qml/SettingsPage/CallForwarding.qml:127 |
415 | 279 | msgid "Flight mode" | 343 | msgid "Forward every incoming call" |
416 | 280 | msgstr "" | 344 | msgstr "" |
417 | 281 | 345 | ||
418 | 282 | #: ../src/qml/DialerPage/Keypad.qml:83 | 346 | #: ../src/qml/SettingsPage/CallForwarding.qml:162 |
419 | 347 | msgid "Forward incoming calls when:" | ||
420 | 348 | msgstr "" | ||
421 | 349 | |||
422 | 350 | #. TRANSLATORS: This string will be truncated on smaller displays. | ||
423 | 351 | #: ../src/qml/SettingsPage/CallForwardItem.qml:157 | ||
424 | 352 | #: ../src/qml/SettingsPage/CallForwardItem.qml:202 | ||
425 | 353 | msgid "Forward to" | ||
426 | 354 | msgstr "" | ||
427 | 355 | |||
428 | 356 | #: ../src/qml/DialerPage/Keypad.qml:103 | ||
429 | 283 | msgid "GHI" | 357 | msgid "GHI" |
430 | 284 | msgstr "" | 358 | msgstr "" |
431 | 285 | 359 | ||
432 | @@ -287,43 +361,62 @@ | |||
433 | 287 | msgid "Got it" | 361 | msgid "Got it" |
434 | 288 | msgstr "" | 362 | msgstr "" |
435 | 289 | 363 | ||
437 | 290 | #: ../src/qml/MMI/IMEI.qml:36 | 364 | #: ../src/qml/SettingsPage/CallForwarding.qml:182 |
438 | 365 | msgid "I don't answer" | ||
439 | 366 | msgstr "" | ||
440 | 367 | |||
441 | 368 | #: ../src/qml/SettingsPage/CallForwarding.qml:171 | ||
442 | 369 | msgid "I'm on another call" | ||
443 | 370 | msgstr "" | ||
444 | 371 | |||
445 | 372 | #: ../src/qml/MMI/IMEIDialog.qml:27 | ||
446 | 291 | msgid "IMEI" | 373 | msgid "IMEI" |
447 | 292 | msgstr "" | 374 | msgstr "" |
448 | 293 | 375 | ||
451 | 294 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:64 | 376 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:65 |
452 | 295 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:315 | 377 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:330 |
453 | 296 | #: ../src/qml/HistoryPage/SwipeItemDemo.qml:189 | 378 | #: ../src/qml/HistoryPage/SwipeItemDemo.qml:189 |
454 | 297 | msgid "Incoming" | 379 | msgid "Incoming" |
455 | 298 | msgstr "" | 380 | msgstr "" |
456 | 299 | 381 | ||
458 | 300 | #: ../src/qml/dialer-app.qml:512 | 382 | #: ../src/qml/DialerPage/DialerPage.qml:129 |
459 | 383 | msgid "Initializing..." | ||
460 | 384 | msgstr "" | ||
461 | 385 | |||
462 | 386 | #: ../src/qml/Dialogs/UssdErrorDialog.qml:29 | ||
463 | 301 | msgid "Invalid USSD code" | 387 | msgid "Invalid USSD code" |
464 | 302 | msgstr "" | 388 | msgstr "" |
465 | 303 | 389 | ||
467 | 304 | #: ../src/qml/DialerPage/Keypad.qml:94 | 390 | #: ../src/qml/DialerPage/Keypad.qml:120 |
468 | 305 | msgid "JKL" | 391 | msgid "JKL" |
469 | 306 | msgstr "" | 392 | msgstr "" |
470 | 307 | 393 | ||
473 | 308 | #: ../src/qml/DialerPage/DialerPage.qml:85 | 394 | #: ../src/qml/SettingsPage/ServiceInfo.qml:115 |
474 | 309 | msgid "Keypad" | 395 | #, qt-format |
475 | 396 | msgid "Last called %1" | ||
476 | 310 | msgstr "" | 397 | msgstr "" |
477 | 311 | 398 | ||
478 | 312 | #: ../src/qml/Dialogs/NoDefaultSIMCardDialog.qml:80 | 399 | #: ../src/qml/Dialogs/NoDefaultSIMCardDialog.qml:80 |
479 | 313 | msgid "Later" | 400 | msgid "Later" |
480 | 314 | msgstr "" | 401 | msgstr "" |
481 | 315 | 402 | ||
483 | 316 | #: ../src/qml/DialerPage/Keypad.qml:105 | 403 | #: ../src/qml/SettingsPage/CallWaiting.qml:101 |
484 | 404 | msgid "" | ||
485 | 405 | "Lets you answer or start a new call while on another call, and switch " | ||
486 | 406 | "between them" | ||
487 | 407 | msgstr "" | ||
488 | 408 | |||
489 | 409 | #: ../src/qml/DialerPage/Keypad.qml:137 | ||
490 | 317 | msgid "MNO" | 410 | msgid "MNO" |
491 | 318 | msgstr "" | 411 | msgstr "" |
492 | 319 | 412 | ||
494 | 320 | #: ../src/qml/LiveCallPage/LiveCall.qml:548 | 413 | #: ../src/qml/LiveCallPage/LiveCall.qml:573 |
495 | 321 | msgid "Merge calls" | 414 | msgid "Merge calls" |
496 | 322 | msgstr "" | 415 | msgstr "" |
497 | 323 | 416 | ||
501 | 324 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:62 | 417 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:63 |
502 | 325 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:313 | 418 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:328 |
503 | 326 | #: ../src/qml/HistoryPage/HistoryPage.qml:49 | 419 | #: ../src/qml/HistoryPage/HistoryPage.qml:68 |
504 | 327 | msgid "Missed" | 420 | msgid "Missed" |
505 | 328 | msgstr "" | 421 | msgstr "" |
506 | 329 | 422 | ||
507 | @@ -331,29 +424,45 @@ | |||
508 | 331 | msgid "Mobile" | 424 | msgid "Mobile" |
509 | 332 | msgstr "" | 425 | msgstr "" |
510 | 333 | 426 | ||
511 | 427 | #: ../src/qml/SettingsPage/CallForwarding.qml:193 | ||
512 | 428 | msgid "My phone is unreachable" | ||
513 | 429 | msgstr "" | ||
514 | 430 | |||
515 | 334 | #: ../src/qml/Dialogs/NoDefaultSIMCardDialog.qml:70 | 431 | #: ../src/qml/Dialogs/NoDefaultSIMCardDialog.qml:70 |
516 | 335 | #: ../src/qml/Dialogs/SetDefaultSIMCardDialog.qml:40 | 432 | #: ../src/qml/Dialogs/SetDefaultSIMCardDialog.qml:40 |
517 | 336 | msgid "No" | 433 | msgid "No" |
518 | 337 | msgstr "" | 434 | msgstr "" |
519 | 338 | 435 | ||
521 | 339 | #: ../src/qml/dialer-app.qml:316 | 436 | #: ../src/qml/dialer-app.qml:355 |
522 | 340 | msgid "No SIM card selected" | 437 | msgid "No SIM card selected" |
523 | 341 | msgstr "" | 438 | msgstr "" |
524 | 342 | 439 | ||
526 | 343 | #: ../src/qml/LiveCallPage/LiveCall.qml:104 | 440 | #: ../src/qml/LiveCallPage/LiveCall.qml:122 |
527 | 344 | msgid "No calls" | 441 | msgid "No calls" |
528 | 345 | msgstr "" | 442 | msgstr "" |
529 | 346 | 443 | ||
532 | 347 | #: ../src/qml/DialerPage/DialerPage.qml:87 ../src/qml/dialer-app.qml:337 | 444 | #: ../src/qml/DialerPage/DialerPage.qml:151 ../src/qml/dialer-app.qml:374 |
533 | 348 | #: ../src/qml/dialer-app.qml:342 | 445 | #: ../src/qml/dialer-app.qml:379 |
534 | 349 | msgid "No network" | 446 | msgid "No network" |
535 | 350 | msgstr "" | 447 | msgstr "" |
536 | 351 | 448 | ||
538 | 352 | #: ../src/qml/HistoryPage/HistoryPage.qml:219 | 449 | #: ../src/qml/HistoryPage/HistoryPage.qml:245 |
539 | 353 | msgid "No recent calls" | 450 | msgid "No recent calls" |
540 | 354 | msgstr "" | 451 | msgstr "" |
541 | 355 | 452 | ||
543 | 356 | #: ../src/qml/Dialogs/SimLockedDialog.qml:49 | 453 | #: ../src/qml/SettingsPage/CallForwarding.qml:279 |
544 | 454 | msgid "Numbers" | ||
545 | 455 | msgstr "" | ||
546 | 456 | |||
547 | 457 | #: ../src/qml/SettingsPage/CallForwarding.qml:301 | ||
548 | 458 | msgid "OK" | ||
549 | 459 | msgstr "" | ||
550 | 460 | |||
551 | 461 | #: ../src/qml/SettingsPage/CallForwarding.qml:382 | ||
552 | 462 | msgid "Off" | ||
553 | 463 | msgstr "" | ||
554 | 464 | |||
555 | 465 | #: ../src/qml/Dialogs/SimLockedDialog.qml:50 | ||
556 | 357 | msgid "Ok" | 466 | msgid "Ok" |
557 | 358 | msgstr "" | 467 | msgstr "" |
558 | 359 | 468 | ||
559 | @@ -361,15 +470,17 @@ | |||
560 | 361 | msgid "On hold" | 470 | msgid "On hold" |
561 | 362 | msgstr "" | 471 | msgstr "" |
562 | 363 | 472 | ||
565 | 364 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:66 | 473 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:67 |
566 | 365 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:317 | 474 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:332 |
567 | 366 | msgid "Outgoing" | 475 | msgid "Outgoing" |
568 | 367 | msgstr "" | 476 | msgstr "" |
569 | 368 | 477 | ||
571 | 369 | #: ../src/qml/DialerPage/Keypad.qml:116 | 478 | #: ../src/qml/DialerPage/Keypad.qml:154 |
572 | 370 | msgid "PQRS" | 479 | msgid "PQRS" |
573 | 371 | msgstr "" | 480 | msgstr "" |
574 | 372 | 481 | ||
575 | 482 | #: ../src/qml/DialerPage/DialerPage.qml:149 | ||
576 | 483 | #: ../src/qml/SettingsPage/SettingsPage.qml:29 | ||
577 | 373 | #: ../src/dialer-app.desktop.in.in.h:1 | 484 | #: ../src/dialer-app.desktop.in.in.h:1 |
578 | 374 | msgid "Phone" | 485 | msgid "Phone" |
579 | 375 | msgstr "" | 486 | msgstr "" |
580 | @@ -378,7 +489,7 @@ | |||
581 | 378 | msgid "Phone App" | 489 | msgid "Phone App" |
582 | 379 | msgstr "" | 490 | msgstr "" |
583 | 380 | 491 | ||
585 | 381 | #: ../src/qml/LiveCallPage/LiveCall.qml:330 | 492 | #: ../src/qml/LiveCallPage/LiveCall.qml:345 |
586 | 382 | msgid "Phone Speaker" | 493 | msgid "Phone Speaker" |
587 | 383 | msgstr "" | 494 | msgstr "" |
588 | 384 | 495 | ||
589 | @@ -390,36 +501,48 @@ | |||
590 | 390 | msgid "Phone;Dialer;Dial;Call;Keypad" | 501 | msgid "Phone;Dialer;Dial;Call;Keypad" |
591 | 391 | msgstr "" | 502 | msgstr "" |
592 | 392 | 503 | ||
594 | 393 | #: ../src/qml/Dialogs/SimLockedDialog.qml:37 | 504 | #: ../src/qml/SettingsPage/CallForwarding.qml:270 |
595 | 505 | msgid "Please select a phone number" | ||
596 | 506 | msgstr "" | ||
597 | 507 | |||
598 | 508 | #: ../src/qml/Dialogs/SimLockedDialog.qml:38 | ||
599 | 394 | msgid "" | 509 | msgid "" |
600 | 395 | "Please unlock your SIM card to call or send a message. You can unlock your " | 510 | "Please unlock your SIM card to call or send a message. You can unlock your " |
601 | 396 | "SIM card from the Network Indicator at the top of the screen or by visiting " | 511 | "SIM card from the Network Indicator at the top of the screen or by visiting " |
602 | 397 | "<a href=\"system_settings\">System Settings > Security & Privacy</a>." | 512 | "<a href=\"system_settings\">System Settings > Security & Privacy</a>." |
603 | 398 | msgstr "" | 513 | msgstr "" |
604 | 399 | 514 | ||
606 | 400 | #: ../src/qml/dialer-app.qml:491 | 515 | #: ../src/qml/Dialogs/UssdProgressDialog.qml:28 |
607 | 401 | msgid "Please wait" | 516 | msgid "Please wait" |
608 | 402 | msgstr "" | 517 | msgstr "" |
609 | 403 | 518 | ||
611 | 404 | #: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:138 | 519 | #: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:141 |
612 | 405 | msgid "Private" | 520 | msgid "Private" |
613 | 406 | msgstr "" | 521 | msgstr "" |
614 | 407 | 522 | ||
617 | 408 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:167 | 523 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:168 |
618 | 409 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:42 | 524 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:43 |
619 | 410 | msgid "Private number" | 525 | msgid "Private number" |
620 | 411 | msgstr "" | 526 | msgstr "" |
621 | 412 | 527 | ||
624 | 413 | #: ../src/qml/DialerPage/DialerPage.qml:122 | 528 | #: ../src/qml/DialerPage/DialerPage.qml:522 |
625 | 414 | #: ../src/qml/HistoryPage/HistoryPage.qml:45 | 529 | #: ../src/qml/HistoryPage/HistoryPage.qml:47 |
626 | 415 | msgid "Recent" | 530 | msgid "Recent" |
627 | 416 | msgstr "" | 531 | msgstr "" |
628 | 417 | 532 | ||
630 | 418 | #: ../src/qml/Dialogs/SimLockedDialog.qml:26 | 533 | #: ../src/qml/SettingsPage/CallForwarding.qml:142 |
631 | 534 | msgid "Redirects all phone calls to another number." | ||
632 | 535 | msgstr "" | ||
633 | 536 | |||
634 | 537 | #: ../src/qml/SettingsPage/SingleSim.qml:28 | ||
635 | 538 | msgid "SIM" | ||
636 | 539 | msgstr "" | ||
637 | 540 | |||
638 | 541 | #: ../src/qml/Dialogs/SimLockedDialog.qml:27 | ||
639 | 419 | msgid "SIM Card is locked" | 542 | msgid "SIM Card is locked" |
640 | 420 | msgstr "" | 543 | msgstr "" |
641 | 421 | 544 | ||
643 | 422 | #: ../src/qml/DialerPage/DialerPage.qml:79 | 545 | #: ../src/qml/DialerPage/DialerPage.qml:140 |
644 | 423 | msgid "SIM Locked" | 546 | msgid "SIM Locked" |
645 | 424 | msgstr "" | 547 | msgstr "" |
646 | 425 | 548 | ||
647 | @@ -427,15 +550,15 @@ | |||
648 | 427 | msgid "Save" | 550 | msgid "Save" |
649 | 428 | msgstr "" | 551 | msgstr "" |
650 | 429 | 552 | ||
652 | 430 | #: ../src/qml/ContactsPage/ContactsPage.qml:80 | 553 | #: ../src/qml/ContactsPage/ContactsPage.qml:119 |
653 | 431 | msgid "Search" | 554 | msgid "Search" |
654 | 432 | msgstr "" | 555 | msgstr "" |
655 | 433 | 556 | ||
657 | 434 | #: ../src/qml/ContactsPage/ContactsPage.qml:68 | 557 | #: ../src/qml/ContactsPage/ContactsPage.qml:67 |
658 | 435 | msgid "Search..." | 558 | msgid "Search..." |
659 | 436 | msgstr "" | 559 | msgstr "" |
660 | 437 | 560 | ||
662 | 438 | #: ../src/qml/HistoryPage/HistoryPage.qml:45 | 561 | #: ../src/qml/HistoryPage/HistoryPage.qml:47 |
663 | 439 | msgid "Select" | 562 | msgid "Select" |
664 | 440 | msgstr "" | 563 | msgstr "" |
665 | 441 | 564 | ||
666 | @@ -445,19 +568,32 @@ | |||
667 | 445 | "choice in <a href=\"system_settings\">System Settings</a>." | 568 | "choice in <a href=\"system_settings\">System Settings</a>." |
668 | 446 | msgstr "" | 569 | msgstr "" |
669 | 447 | 570 | ||
671 | 448 | #: ../src/qml/HistoryPage/HistoryPage.qml:334 | 571 | #: ../src/qml/HistoryPage/HistoryPage.qml:360 |
672 | 449 | msgid "Send message" | 572 | msgid "Send message" |
673 | 450 | msgstr "" | 573 | msgstr "" |
674 | 451 | 574 | ||
676 | 452 | #: ../src/qml/DialerPage/DialerPage.qml:47 | 575 | #: ../src/qml/SettingsPage/MultiSim.qml:62 |
677 | 576 | #: ../src/qml/SettingsPage/NoSims.qml:42 | ||
678 | 577 | msgid "Services" | ||
679 | 578 | msgstr "" | ||
680 | 579 | |||
681 | 580 | #: ../src/qml/SettingsPage/CallForwarding.qml:249 | ||
682 | 581 | msgid "Set" | ||
683 | 582 | msgstr "" | ||
684 | 583 | |||
685 | 584 | #: ../src/qml/DialerPage/DialerPage.qml:64 | ||
686 | 453 | msgid "Settings" | 585 | msgid "Settings" |
687 | 454 | msgstr "" | 586 | msgstr "" |
688 | 455 | 587 | ||
691 | 456 | #: ../src/qml/ContactViewPage/DialerContactViewPage.qml:60 | 588 | #: ../src/qml/ContactViewPage/DialerContactViewPage.qml:61 |
692 | 457 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:66 | 589 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:78 |
693 | 458 | msgid "Share" | 590 | msgid "Share" |
694 | 459 | msgstr "" | 591 | msgstr "" |
695 | 460 | 592 | ||
696 | 593 | #: ../src/qml/SettingsPage/CallForwarding.qml:380 | ||
697 | 594 | msgid "Some calls" | ||
698 | 595 | msgstr "" | ||
699 | 596 | |||
700 | 461 | #: ../src/qml/HistoryPage/SwipeItemDemo.qml:326 | 597 | #: ../src/qml/HistoryPage/SwipeItemDemo.qml:326 |
701 | 462 | msgid "Swipe to delete" | 598 | msgid "Swipe to delete" |
702 | 463 | msgstr "" | 599 | msgstr "" |
703 | @@ -466,11 +602,11 @@ | |||
704 | 466 | msgid "Swipe to reveal actions" | 602 | msgid "Swipe to reveal actions" |
705 | 467 | msgstr "" | 603 | msgstr "" |
706 | 468 | 604 | ||
708 | 469 | #: ../src/qml/LiveCallPage/LiveCall.qml:159 | 605 | #: ../src/qml/LiveCallPage/LiveCall.qml:177 |
709 | 470 | msgid "Switch audio source:" | 606 | msgid "Switch audio source:" |
710 | 471 | msgstr "" | 607 | msgstr "" |
711 | 472 | 608 | ||
713 | 473 | #: ../src/qml/LiveCallPage/LiveCall.qml:533 | 609 | #: ../src/qml/LiveCallPage/LiveCall.qml:558 |
714 | 474 | msgid "Switch calls" | 610 | msgid "Switch calls" |
715 | 475 | msgstr "" | 611 | msgstr "" |
716 | 476 | 612 | ||
717 | @@ -478,42 +614,47 @@ | |||
718 | 478 | msgid "Switch to default SIM:" | 614 | msgid "Switch to default SIM:" |
719 | 479 | msgstr "" | 615 | msgstr "" |
720 | 480 | 616 | ||
722 | 481 | #: ../src/qml/DialerPage/Keypad.qml:127 | 617 | #: ../src/qml/DialerPage/Keypad.qml:171 |
723 | 482 | msgid "TUV" | 618 | msgid "TUV" |
724 | 483 | msgstr "" | 619 | msgstr "" |
725 | 484 | 620 | ||
727 | 485 | #: ../src/qml/dialer-app.qml:343 | 621 | #: ../src/qml/dialer-app.qml:380 |
728 | 486 | #, qt-format | 622 | #, qt-format |
729 | 487 | msgid "There is currently no network on %1" | 623 | msgid "There is currently no network on %1" |
730 | 488 | msgstr "" | 624 | msgstr "" |
731 | 489 | 625 | ||
733 | 490 | #: ../src/qml/dialer-app.qml:337 ../src/qml/dialer-app.qml:344 | 626 | #: ../src/qml/dialer-app.qml:374 ../src/qml/dialer-app.qml:381 |
734 | 491 | msgid "There is currently no network." | 627 | msgid "There is currently no network." |
735 | 492 | msgstr "" | 628 | msgstr "" |
736 | 493 | 629 | ||
737 | 630 | #: ../src/qml/DialerPage/DialerPage.qml:467 | ||
738 | 631 | msgid "This is not an emergency number." | ||
739 | 632 | msgstr "" | ||
740 | 633 | |||
741 | 494 | #: ../src/qml/HistoryPage/dateUtils.js:45 | 634 | #: ../src/qml/HistoryPage/dateUtils.js:45 |
742 | 635 | #: ../src/qml/SettingsPage/dateUtils.js:41 | ||
743 | 495 | msgid "Today" | 636 | msgid "Today" |
744 | 496 | msgstr "" | 637 | msgstr "" |
745 | 497 | 638 | ||
747 | 498 | #: ../src/qml/LiveCallPage/LiveCall.qml:328 | 639 | #: ../src/qml/LiveCallPage/LiveCall.qml:343 |
748 | 499 | msgid "Ubuntu Phone" | 640 | msgid "Ubuntu Phone" |
749 | 500 | msgstr "" | 641 | msgstr "" |
750 | 501 | 642 | ||
752 | 502 | #: ../src/qml/LiveCallPage/LiveCall.qml:332 | 643 | #: ../src/qml/LiveCallPage/LiveCall.qml:347 |
753 | 503 | msgid "Unknown device" | 644 | msgid "Unknown device" |
754 | 504 | msgstr "" | 645 | msgstr "" |
755 | 505 | 646 | ||
758 | 506 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:169 | 647 | #: ../src/qml/HistoryPage/HistoryDelegate.qml:170 |
759 | 507 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:44 | 648 | #: ../src/qml/HistoryPage/HistoryDetailsPage.qml:45 |
760 | 508 | msgid "Unknown number" | 649 | msgid "Unknown number" |
761 | 509 | msgstr "" | 650 | msgstr "" |
762 | 510 | 651 | ||
764 | 511 | #: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:72 | 652 | #: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:73 |
765 | 512 | #: ../src/qml/LiveCallPage/MultiCallDisplay.qml:91 | 653 | #: ../src/qml/LiveCallPage/MultiCallDisplay.qml:91 |
766 | 513 | msgid "Voicemail" | 654 | msgid "Voicemail" |
767 | 514 | msgstr "" | 655 | msgstr "" |
768 | 515 | 656 | ||
770 | 516 | #: ../src/qml/DialerPage/Keypad.qml:138 | 657 | #: ../src/qml/DialerPage/Keypad.qml:188 |
771 | 517 | msgid "WXYZ" | 658 | msgid "WXYZ" |
772 | 518 | msgstr "" | 659 | msgstr "" |
773 | 519 | 660 | ||
774 | @@ -522,6 +663,7 @@ | |||
775 | 522 | msgstr "" | 663 | msgstr "" |
776 | 523 | 664 | ||
777 | 524 | #: ../src/qml/HistoryPage/dateUtils.js:47 | 665 | #: ../src/qml/HistoryPage/dateUtils.js:47 |
778 | 666 | #: ../src/qml/SettingsPage/dateUtils.js:43 | ||
779 | 525 | msgid "Yesterday" | 667 | msgid "Yesterday" |
780 | 526 | msgstr "" | 668 | msgstr "" |
781 | 527 | 669 | ||
782 | @@ -529,7 +671,7 @@ | |||
783 | 529 | msgid "You have to disable flight mode in order to make calls" | 671 | msgid "You have to disable flight mode in order to make calls" |
784 | 530 | msgstr "" | 672 | msgstr "" |
785 | 531 | 673 | ||
787 | 532 | #: ../src/qml/dialer-app.qml:316 | 674 | #: ../src/qml/dialer-app.qml:355 |
788 | 533 | msgid "You need to select a SIM card" | 675 | msgid "You need to select a SIM card" |
789 | 534 | msgstr "" | 676 | msgstr "" |
790 | 535 | 677 | ||
791 | 536 | 678 | ||
792 | === modified file 'src/qml/AccountsModel.qml' | |||
793 | --- src/qml/AccountsModel.qml 2016-10-19 11:45:45 +0000 | |||
794 | +++ src/qml/AccountsModel.qml 2017-03-22 17:10:08 +0000 | |||
795 | @@ -16,7 +16,7 @@ | |||
796 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
797 | 17 | */ | 17 | */ |
798 | 18 | 18 | ||
800 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
801 | 20 | import Ubuntu.Telephony 0.1 | 20 | import Ubuntu.Telephony 0.1 |
802 | 21 | 21 | ||
803 | 22 | Item { | 22 | Item { |
804 | 23 | 23 | ||
805 | === modified file 'src/qml/CMakeLists.txt' | |||
806 | --- src/qml/CMakeLists.txt 2015-04-30 15:42:48 +0000 | |||
807 | +++ src/qml/CMakeLists.txt 2017-03-22 17:10:08 +0000 | |||
808 | @@ -19,3 +19,4 @@ | |||
809 | 19 | add_subdirectory(ContactViewPage) | 19 | add_subdirectory(ContactViewPage) |
810 | 20 | add_subdirectory(ContactEditorPage) | 20 | add_subdirectory(ContactEditorPage) |
811 | 21 | add_subdirectory(Dialogs) | 21 | add_subdirectory(Dialogs) |
812 | 22 | add_subdirectory(SettingsPage) | ||
813 | 22 | 23 | ||
814 | === modified file 'src/qml/ContactsPage/ContactsPage.qml' | |||
815 | --- src/qml/ContactsPage/ContactsPage.qml 2016-07-27 23:51:39 +0000 | |||
816 | +++ src/qml/ContactsPage/ContactsPage.qml 2017-03-22 17:10:08 +0000 | |||
817 | @@ -16,7 +16,7 @@ | |||
818 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
819 | 17 | */ | 17 | */ |
820 | 18 | 18 | ||
822 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
823 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
824 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
825 | 22 | import Ubuntu.Components.Popups 1.3 | 22 | import Ubuntu.Components.Popups 1.3 |
826 | 23 | 23 | ||
827 | === modified file 'src/qml/ContactsPage/KeyboardRectagle.qml' | |||
828 | --- src/qml/ContactsPage/KeyboardRectagle.qml 2014-07-08 00:34:36 +0000 | |||
829 | +++ src/qml/ContactsPage/KeyboardRectagle.qml 2017-03-22 17:10:08 +0000 | |||
830 | @@ -16,7 +16,7 @@ | |||
831 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
832 | 17 | */ | 17 | */ |
833 | 18 | 18 | ||
835 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
836 | 20 | 20 | ||
837 | 21 | Item { | 21 | Item { |
838 | 22 | id: keyboardRect | 22 | id: keyboardRect |
839 | 23 | 23 | ||
840 | === modified file 'src/qml/DialerPage/CallButton.qml' | |||
841 | --- src/qml/DialerPage/CallButton.qml 2016-08-24 17:50:38 +0000 | |||
842 | +++ src/qml/DialerPage/CallButton.qml 2017-03-22 17:10:08 +0000 | |||
843 | @@ -16,7 +16,7 @@ | |||
844 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
845 | 17 | */ | 17 | */ |
846 | 18 | 18 | ||
848 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
849 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
850 | 21 | 21 | ||
851 | 22 | AbstractButton { | 22 | AbstractButton { |
852 | 23 | 23 | ||
853 | === modified file 'src/qml/DialerPage/CustomButton.qml' | |||
854 | --- src/qml/DialerPage/CustomButton.qml 2016-08-24 17:50:38 +0000 | |||
855 | +++ src/qml/DialerPage/CustomButton.qml 2017-03-22 17:10:08 +0000 | |||
856 | @@ -16,7 +16,7 @@ | |||
857 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
858 | 17 | */ | 17 | */ |
859 | 18 | 18 | ||
861 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
862 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
863 | 21 | 21 | ||
864 | 22 | Button { | 22 | Button { |
865 | 23 | 23 | ||
866 | === modified file 'src/qml/DialerPage/DialerBottomEdge.qml' | |||
867 | --- src/qml/DialerPage/DialerBottomEdge.qml 2016-08-24 17:53:12 +0000 | |||
868 | +++ src/qml/DialerPage/DialerBottomEdge.qml 2017-03-22 17:10:08 +0000 | |||
869 | @@ -16,7 +16,7 @@ | |||
870 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
871 | 17 | */ | 17 | */ |
872 | 18 | 18 | ||
874 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
875 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
876 | 21 | 21 | ||
877 | 22 | BottomEdge { | 22 | BottomEdge { |
878 | 23 | 23 | ||
879 | === modified file 'src/qml/DialerPage/DialerPage.qml' | |||
880 | --- src/qml/DialerPage/DialerPage.qml 2017-03-22 17:10:08 +0000 | |||
881 | +++ src/qml/DialerPage/DialerPage.qml 2017-03-22 17:10:08 +0000 | |||
882 | @@ -17,7 +17,7 @@ | |||
883 | 17 | */ | 17 | */ |
884 | 18 | 18 | ||
885 | 19 | import QtContacts 5.0 | 19 | import QtContacts 5.0 |
887 | 20 | import QtQuick 2.0 | 20 | import QtQuick 2.4 |
888 | 21 | import Ubuntu.Components 1.3 | 21 | import Ubuntu.Components 1.3 |
889 | 22 | import Ubuntu.Components.Popups 1.3 | 22 | import Ubuntu.Components.Popups 1.3 |
890 | 23 | import Ubuntu.Telephony 0.1 | 23 | import Ubuntu.Telephony 0.1 |
891 | @@ -38,6 +38,16 @@ | |||
892 | 38 | property var mmiPlugins: [] | 38 | property var mmiPlugins: [] |
893 | 39 | readonly property bool compactView: page.height <= units.gu(60) | 39 | readonly property bool compactView: page.height <= units.gu(60) |
894 | 40 | 40 | ||
895 | 41 | function selectAccount(accountId) { | ||
896 | 42 | for (var i in accountsModel.activeAccounts) { | ||
897 | 43 | var account = accountsModel.activeAccounts[i] | ||
898 | 44 | if (account.accountId === accountId) { | ||
899 | 45 | headerSections.selectedIndex = i | ||
900 | 46 | return | ||
901 | 47 | } | ||
902 | 48 | } | ||
903 | 49 | } | ||
904 | 50 | |||
905 | 41 | header: PageHeader { | 51 | header: PageHeader { |
906 | 42 | id: pageHeader | 52 | id: pageHeader |
907 | 43 | 53 | ||
908 | @@ -52,7 +62,7 @@ | |||
909 | 52 | Action { | 62 | Action { |
910 | 53 | iconName: "settings" | 63 | iconName: "settings" |
911 | 54 | text: i18n.tr("Settings") | 64 | text: i18n.tr("Settings") |
913 | 55 | onTriggered: Qt.openUrlExternally("settings:///system/phone") | 65 | onTriggered: pageStackNormalMode.push(Qt.resolvedUrl("../SettingsPage/SettingsPage.qml")) |
914 | 56 | } | 66 | } |
915 | 57 | 67 | ||
916 | 58 | ] | 68 | ] |
917 | @@ -120,7 +130,6 @@ | |||
918 | 120 | } | 130 | } |
919 | 121 | 131 | ||
920 | 122 | objectName: "dialerPage" | 132 | objectName: "dialerPage" |
921 | 123 | |||
922 | 124 | title: { | 133 | title: { |
923 | 125 | // avoid clearing the title when app is inactive | 134 | // avoid clearing the title when app is inactive |
924 | 126 | // under some states | 135 | // under some states |
925 | 127 | 136 | ||
926 | === modified file 'src/qml/DialerPage/KeypadButton.qml' | |||
927 | --- src/qml/DialerPage/KeypadButton.qml 2017-03-22 17:10:08 +0000 | |||
928 | +++ src/qml/DialerPage/KeypadButton.qml 2017-03-22 17:10:08 +0000 | |||
929 | @@ -16,7 +16,7 @@ | |||
930 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
931 | 17 | */ | 17 | */ |
932 | 18 | 18 | ||
934 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
935 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
936 | 21 | 21 | ||
937 | 22 | MouseArea { | 22 | MouseArea { |
938 | 23 | 23 | ||
939 | === modified file 'src/qml/DialerPage/KeypadEntry.qml' | |||
940 | --- src/qml/DialerPage/KeypadEntry.qml 2017-03-22 17:10:08 +0000 | |||
941 | +++ src/qml/DialerPage/KeypadEntry.qml 2017-03-22 17:10:08 +0000 | |||
942 | @@ -16,7 +16,7 @@ | |||
943 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
944 | 17 | */ | 17 | */ |
945 | 18 | 18 | ||
947 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
948 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
949 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItems | 21 | import Ubuntu.Components.ListItems 1.3 as ListItems |
950 | 22 | import Ubuntu.Components.Themes.Ambiance 1.3 | 22 | import Ubuntu.Components.Themes.Ambiance 1.3 |
951 | 23 | 23 | ||
952 | === modified file 'src/qml/Dialogs/DisableFlightModeDialog.qml' | |||
953 | --- src/qml/Dialogs/DisableFlightModeDialog.qml 2016-08-25 16:01:46 +0000 | |||
954 | +++ src/qml/Dialogs/DisableFlightModeDialog.qml 2017-03-22 17:10:08 +0000 | |||
955 | @@ -16,7 +16,7 @@ | |||
956 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
957 | 17 | */ | 17 | */ |
958 | 18 | 18 | ||
960 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
961 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
962 | 21 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
963 | 22 | import Ubuntu.Telephony 0.1 | 22 | import Ubuntu.Telephony 0.1 |
964 | 23 | 23 | ||
965 | === modified file 'src/qml/Dialogs/FlightModeProgressDialog.qml' | |||
966 | --- src/qml/Dialogs/FlightModeProgressDialog.qml 2016-08-24 17:52:19 +0000 | |||
967 | +++ src/qml/Dialogs/FlightModeProgressDialog.qml 2017-03-22 17:10:08 +0000 | |||
968 | @@ -16,7 +16,7 @@ | |||
969 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
970 | 17 | */ | 17 | */ |
971 | 18 | 18 | ||
973 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
974 | 20 | 20 | ||
975 | 21 | import Ubuntu.Components 1.3 | 21 | import Ubuntu.Components 1.3 |
976 | 22 | import Ubuntu.Components.Popups 1.3 | 22 | import Ubuntu.Components.Popups 1.3 |
977 | 23 | 23 | ||
978 | === modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml' | |||
979 | --- src/qml/Dialogs/NoDefaultSIMCardDialog.qml 2016-10-19 11:45:45 +0000 | |||
980 | +++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml 2017-03-22 17:10:08 +0000 | |||
981 | @@ -16,7 +16,7 @@ | |||
982 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
983 | 17 | */ | 17 | */ |
984 | 18 | 18 | ||
986 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
987 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
988 | 21 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
989 | 22 | import Ubuntu.Telephony 0.1 | 22 | import Ubuntu.Telephony 0.1 |
990 | 23 | 23 | ||
991 | === modified file 'src/qml/Dialogs/NotificationDialog.qml' | |||
992 | --- src/qml/Dialogs/NotificationDialog.qml 2015-09-07 15:40:45 +0000 | |||
993 | +++ src/qml/Dialogs/NotificationDialog.qml 2017-03-22 17:10:08 +0000 | |||
994 | @@ -16,7 +16,7 @@ | |||
995 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
996 | 17 | */ | 17 | */ |
997 | 18 | 18 | ||
999 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1000 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1001 | 21 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
1002 | 22 | 22 | ||
1003 | 23 | 23 | ||
1004 | === modified file 'src/qml/Dialogs/SetDefaultSIMCardDialog.qml' | |||
1005 | --- src/qml/Dialogs/SetDefaultSIMCardDialog.qml 2016-10-01 00:29:13 +0000 | |||
1006 | +++ src/qml/Dialogs/SetDefaultSIMCardDialog.qml 2017-03-22 17:10:08 +0000 | |||
1007 | @@ -16,7 +16,7 @@ | |||
1008 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1009 | 17 | */ | 17 | */ |
1010 | 18 | 18 | ||
1012 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1013 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1014 | 21 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
1015 | 22 | import Ubuntu.Telephony 0.1 | 22 | import Ubuntu.Telephony 0.1 |
1016 | 23 | 23 | ||
1017 | === modified file 'src/qml/Dialogs/SimLockedDialog.qml' | |||
1018 | --- src/qml/Dialogs/SimLockedDialog.qml 2016-04-29 21:29:29 +0000 | |||
1019 | +++ src/qml/Dialogs/SimLockedDialog.qml 2017-03-22 17:10:08 +0000 | |||
1020 | @@ -16,7 +16,7 @@ | |||
1021 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1022 | 17 | */ | 17 | */ |
1023 | 18 | 18 | ||
1025 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1026 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1027 | 21 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
1028 | 22 | 22 | ||
1029 | 23 | 23 | ||
1030 | === modified file 'src/qml/Dialogs/UssdErrorDialog.qml' | |||
1031 | --- src/qml/Dialogs/UssdErrorDialog.qml 2016-08-24 17:52:19 +0000 | |||
1032 | +++ src/qml/Dialogs/UssdErrorDialog.qml 2017-03-22 17:10:08 +0000 | |||
1033 | @@ -16,7 +16,7 @@ | |||
1034 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1035 | 17 | */ | 17 | */ |
1036 | 18 | 18 | ||
1038 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1039 | 20 | 20 | ||
1040 | 21 | import Ubuntu.Components 1.3 | 21 | import Ubuntu.Components 1.3 |
1041 | 22 | import Ubuntu.Components.Popups 1.3 | 22 | import Ubuntu.Components.Popups 1.3 |
1042 | 23 | 23 | ||
1043 | === modified file 'src/qml/Dialogs/UssdProgressDialog.qml' | |||
1044 | --- src/qml/Dialogs/UssdProgressDialog.qml 2016-08-24 17:52:19 +0000 | |||
1045 | +++ src/qml/Dialogs/UssdProgressDialog.qml 2017-03-22 17:10:08 +0000 | |||
1046 | @@ -16,7 +16,7 @@ | |||
1047 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1048 | 17 | */ | 17 | */ |
1049 | 18 | 18 | ||
1051 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1052 | 20 | 20 | ||
1053 | 21 | import Ubuntu.Components 1.3 | 21 | import Ubuntu.Components 1.3 |
1054 | 22 | import Ubuntu.Components.Popups 1.3 | 22 | import Ubuntu.Components.Popups 1.3 |
1055 | 23 | 23 | ||
1056 | === modified file 'src/qml/Dialogs/UssdResponseDialog.qml' | |||
1057 | --- src/qml/Dialogs/UssdResponseDialog.qml 2016-08-24 17:52:19 +0000 | |||
1058 | +++ src/qml/Dialogs/UssdResponseDialog.qml 2017-03-22 17:10:08 +0000 | |||
1059 | @@ -16,7 +16,7 @@ | |||
1060 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1061 | 17 | */ | 17 | */ |
1062 | 18 | 18 | ||
1064 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1065 | 20 | 20 | ||
1066 | 21 | import Ubuntu.Components 1.3 | 21 | import Ubuntu.Components 1.3 |
1067 | 22 | import Ubuntu.Components.Popups 1.3 | 22 | import Ubuntu.Components.Popups 1.3 |
1068 | 23 | 23 | ||
1069 | === modified file 'src/qml/HistoryPage/ExpandableButton.qml' | |||
1070 | --- src/qml/HistoryPage/ExpandableButton.qml 2016-08-24 17:50:38 +0000 | |||
1071 | +++ src/qml/HistoryPage/ExpandableButton.qml 2017-03-22 17:10:08 +0000 | |||
1072 | @@ -14,7 +14,7 @@ | |||
1073 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1074 | 15 | */ | 15 | */ |
1075 | 16 | 16 | ||
1077 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1078 | 18 | import Ubuntu.Components 1.3 | 18 | import Ubuntu.Components 1.3 |
1079 | 19 | import Ubuntu.Components.ListItems 1.3 as ListItem | 19 | import Ubuntu.Components.ListItems 1.3 as ListItem |
1080 | 20 | 20 | ||
1081 | 21 | 21 | ||
1082 | === modified file 'src/qml/HistoryPage/HistoryDelegate.qml' | |||
1083 | --- src/qml/HistoryPage/HistoryDelegate.qml 2016-07-27 16:18:56 +0000 | |||
1084 | +++ src/qml/HistoryPage/HistoryDelegate.qml 2017-03-22 17:10:08 +0000 | |||
1085 | @@ -16,7 +16,7 @@ | |||
1086 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1087 | 17 | */ | 17 | */ |
1088 | 18 | 18 | ||
1090 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1091 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1092 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
1093 | 22 | import Ubuntu.Components.Popups 1.3 | 22 | import Ubuntu.Components.Popups 1.3 |
1094 | 23 | 23 | ||
1095 | === modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml' | |||
1096 | --- src/qml/HistoryPage/HistoryDetailsPage.qml 2016-10-19 11:45:45 +0000 | |||
1097 | +++ src/qml/HistoryPage/HistoryDetailsPage.qml 2017-03-22 17:10:08 +0000 | |||
1098 | @@ -16,7 +16,7 @@ | |||
1099 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1100 | 17 | */ | 17 | */ |
1101 | 18 | 18 | ||
1103 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1104 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1105 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
1106 | 22 | import Ubuntu.Telephony 0.1 | 22 | import Ubuntu.Telephony 0.1 |
1107 | 23 | 23 | ||
1108 | === modified file 'src/qml/HistoryPage/HistoryPage.qml' | |||
1109 | --- src/qml/HistoryPage/HistoryPage.qml 2016-07-27 16:18:56 +0000 | |||
1110 | +++ src/qml/HistoryPage/HistoryPage.qml 2017-03-22 17:10:08 +0000 | |||
1111 | @@ -16,7 +16,7 @@ | |||
1112 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1113 | 17 | */ | 17 | */ |
1114 | 18 | 18 | ||
1116 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1117 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1118 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
1119 | 22 | import Ubuntu.History 0.1 | 22 | import Ubuntu.History 0.1 |
1120 | 23 | 23 | ||
1121 | === modified file 'src/qml/HistoryPage/SwipeItemDemo.qml' | |||
1122 | --- src/qml/HistoryPage/SwipeItemDemo.qml 2016-02-11 17:58:29 +0000 | |||
1123 | +++ src/qml/HistoryPage/SwipeItemDemo.qml 2017-03-22 17:10:08 +0000 | |||
1124 | @@ -16,7 +16,7 @@ | |||
1125 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1126 | 17 | */ | 17 | */ |
1127 | 18 | 18 | ||
1129 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1130 | 20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
1131 | 21 | import Qt.labs.settings 1.0 | 21 | import Qt.labs.settings 1.0 |
1132 | 22 | 22 | ||
1133 | 23 | 23 | ||
1134 | === modified file 'src/qml/InputInfo.qml' | |||
1135 | --- src/qml/InputInfo.qml 2016-03-08 02:27:36 +0000 | |||
1136 | +++ src/qml/InputInfo.qml 2017-03-22 17:10:08 +0000 | |||
1137 | @@ -16,7 +16,7 @@ | |||
1138 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1139 | 17 | */ | 17 | */ |
1140 | 18 | 18 | ||
1142 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1143 | 20 | import QtSystemInfo 5.5 | 20 | import QtSystemInfo 5.5 |
1144 | 21 | 21 | ||
1145 | 22 | Item { | 22 | Item { |
1146 | 23 | 23 | ||
1147 | === modified file 'src/qml/LiveCallPage/ConferenceCallDisplay.qml' | |||
1148 | --- src/qml/LiveCallPage/ConferenceCallDisplay.qml 2016-08-24 17:50:38 +0000 | |||
1149 | +++ src/qml/LiveCallPage/ConferenceCallDisplay.qml 2017-03-22 17:10:08 +0000 | |||
1150 | @@ -16,7 +16,7 @@ | |||
1151 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1152 | 17 | */ | 17 | */ |
1153 | 18 | 18 | ||
1155 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1156 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1157 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
1158 | 22 | import Ubuntu.Telephony 0.1 | 22 | import Ubuntu.Telephony 0.1 |
1159 | 23 | 23 | ||
1160 | === modified file 'src/qml/LiveCallPage/HangupButton.qml' | |||
1161 | --- src/qml/LiveCallPage/HangupButton.qml 2016-08-24 17:50:38 +0000 | |||
1162 | +++ src/qml/LiveCallPage/HangupButton.qml 2017-03-22 17:10:08 +0000 | |||
1163 | @@ -16,7 +16,7 @@ | |||
1164 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1165 | 17 | */ | 17 | */ |
1166 | 18 | 18 | ||
1168 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1169 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1170 | 21 | 21 | ||
1171 | 22 | AbstractButton { | 22 | AbstractButton { |
1172 | 23 | 23 | ||
1173 | === modified file 'src/qml/LiveCallPage/LiveCall.qml' | |||
1174 | --- src/qml/LiveCallPage/LiveCall.qml 2017-03-22 17:10:08 +0000 | |||
1175 | +++ src/qml/LiveCallPage/LiveCall.qml 2017-03-22 17:10:08 +0000 | |||
1176 | @@ -16,7 +16,7 @@ | |||
1177 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1178 | 17 | */ | 17 | */ |
1179 | 18 | 18 | ||
1181 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1182 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1183 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItems | 21 | import Ubuntu.Components.ListItems 1.3 as ListItems |
1184 | 22 | import Ubuntu.Components.Popups 1.3 | 22 | import Ubuntu.Components.Popups 1.3 |
1185 | @@ -52,8 +52,8 @@ | |||
1186 | 52 | return i18n.tr("Conference"); | 52 | return i18n.tr("Conference"); |
1187 | 53 | } else if (contactWatcher.alias !== "") { | 53 | } else if (contactWatcher.alias !== "") { |
1188 | 54 | return contactWatcher.alias; | 54 | return contactWatcher.alias; |
1191 | 55 | } else if (contactWatcher.identifier !== "") { | 55 | } else if (call && call.phoneNumber !== "") { |
1192 | 56 | return contactWatcher.identifier; | 56 | return call.phoneNumber; |
1193 | 57 | } else if (!call && initialNumber != "") { | 57 | } else if (!call && initialNumber != "") { |
1194 | 58 | return initialNumber | 58 | return initialNumber |
1195 | 59 | } else { | 59 | } else { |
1196 | @@ -387,7 +387,15 @@ | |||
1197 | 387 | ContactWatcher { | 387 | ContactWatcher { |
1198 | 388 | id: contactWatcher | 388 | id: contactWatcher |
1199 | 389 | // FIXME: handle conf calls | 389 | // FIXME: handle conf calls |
1201 | 390 | identifier: call ? call.phoneNumber : "" | 390 | identifier: { |
1202 | 391 | if (initialNumber != "") { | ||
1203 | 392 | return initialNumber | ||
1204 | 393 | } else if (call) { | ||
1205 | 394 | return call.phoneNumber | ||
1206 | 395 | } | ||
1207 | 396 | return "" | ||
1208 | 397 | } | ||
1209 | 398 | |||
1210 | 391 | onDetailPropertiesChanged: helper.updateSubTypeLabel() | 399 | onDetailPropertiesChanged: helper.updateSubTypeLabel() |
1211 | 392 | onIsUnknownChanged: helper.updateSubTypeLabel() | 400 | onIsUnknownChanged: helper.updateSubTypeLabel() |
1212 | 393 | // FIXME: if we implement VOIP, get the addressable fields from the account itself | 401 | // FIXME: if we implement VOIP, get the addressable fields from the account itself |
1213 | 394 | 402 | ||
1214 | === modified file 'src/qml/LiveCallPage/LiveCallKeypadButton.qml' | |||
1215 | --- src/qml/LiveCallPage/LiveCallKeypadButton.qml 2016-08-24 17:50:38 +0000 | |||
1216 | +++ src/qml/LiveCallPage/LiveCallKeypadButton.qml 2017-03-22 17:10:08 +0000 | |||
1217 | @@ -16,7 +16,7 @@ | |||
1218 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1219 | 17 | */ | 17 | */ |
1220 | 18 | 18 | ||
1222 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1223 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1224 | 21 | 21 | ||
1225 | 22 | AbstractButton { | 22 | AbstractButton { |
1226 | 23 | 23 | ||
1227 | === modified file 'src/qml/LiveCallPage/MultiCallDisplay.qml' | |||
1228 | --- src/qml/LiveCallPage/MultiCallDisplay.qml 2015-09-07 15:40:45 +0000 | |||
1229 | +++ src/qml/LiveCallPage/MultiCallDisplay.qml 2017-03-22 17:10:08 +0000 | |||
1230 | @@ -16,7 +16,7 @@ | |||
1231 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1232 | 17 | */ | 17 | */ |
1233 | 18 | 18 | ||
1235 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1236 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1237 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItems | 21 | import Ubuntu.Components.ListItems 1.3 as ListItems |
1238 | 22 | import Ubuntu.Contacts 0.1 | 22 | import Ubuntu.Contacts 0.1 |
1239 | 23 | 23 | ||
1240 | === modified file 'src/qml/LiveCallPage/StopWatch.qml' | |||
1241 | --- src/qml/LiveCallPage/StopWatch.qml 2015-09-07 15:40:45 +0000 | |||
1242 | +++ src/qml/LiveCallPage/StopWatch.qml 2017-03-22 17:10:08 +0000 | |||
1243 | @@ -16,7 +16,7 @@ | |||
1244 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1245 | 17 | */ | 17 | */ |
1246 | 18 | 18 | ||
1248 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1249 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1250 | 21 | 21 | ||
1251 | 22 | Item { | 22 | Item { |
1252 | 23 | 23 | ||
1253 | === modified file 'src/qml/MMI/IMEI.qml' | |||
1254 | --- src/qml/MMI/IMEI.qml 2016-08-24 17:52:19 +0000 | |||
1255 | +++ src/qml/MMI/IMEI.qml 2017-03-22 17:10:08 +0000 | |||
1256 | @@ -16,7 +16,7 @@ | |||
1257 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1258 | 17 | */ | 17 | */ |
1259 | 18 | 18 | ||
1261 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1262 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
1263 | 21 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
1264 | 22 | 22 | ||
1265 | 23 | 23 | ||
1266 | === modified file 'src/qml/MMI/IMEIDialog.qml' | |||
1267 | --- src/qml/MMI/IMEIDialog.qml 2016-10-18 09:28:54 +0000 | |||
1268 | +++ src/qml/MMI/IMEIDialog.qml 2017-03-22 17:10:08 +0000 | |||
1269 | @@ -16,7 +16,7 @@ | |||
1270 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1271 | 17 | */ | 17 | */ |
1272 | 18 | 18 | ||
1274 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
1275 | 20 | import Ubuntu.Telephony 0.1 | 20 | import Ubuntu.Telephony 0.1 |
1276 | 21 | import Ubuntu.Components 1.3 | 21 | import Ubuntu.Components 1.3 |
1277 | 22 | import Ubuntu.Components.Popups 1.3 | 22 | import Ubuntu.Components.Popups 1.3 |
1278 | 23 | 23 | ||
1279 | === added directory 'src/qml/SettingsPage' | |||
1280 | === added directory 'src/qml/SettingsPage/AccountSettings' | |||
1281 | === added file 'src/qml/SettingsPage/AccountSettings/CMakeLists.txt' | |||
1282 | --- src/qml/SettingsPage/AccountSettings/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
1283 | +++ src/qml/SettingsPage/AccountSettings/CMakeLists.txt 2017-03-22 17:10:08 +0000 | |||
1284 | @@ -0,0 +1,6 @@ | |||
1285 | 1 | file(GLOB ACCOUNT_SETTINGS_QML_JS_FILES *.qml *.js) | ||
1286 | 2 | |||
1287 | 3 | # make the files visible on qtcreator | ||
1288 | 4 | add_custom_target(dialer__account_settings_QMlFiles ALL SOURCES ${ACCOUNT_SETTINGS_QML_JS_FILES}) | ||
1289 | 5 | |||
1290 | 6 | install(FILES ${ACCOUNT_SETTINGS_QML_JS_FILES} DESTINATION ${DIALER_APP_DIR}/SettingsPage/AccountSettings) | ||
1291 | 0 | 7 | ||
1292 | === added file 'src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml' | |||
1293 | --- src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml 1970-01-01 00:00:00 +0000 | |||
1294 | +++ src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml 2017-03-22 17:10:08 +0000 | |||
1295 | @@ -0,0 +1,177 @@ | |||
1296 | 1 | /* | ||
1297 | 2 | * This file is part of dialer-app | ||
1298 | 3 | * | ||
1299 | 4 | * Copyright (C) 2017 Canonical Ltd. | ||
1300 | 5 | * | ||
1301 | 6 | * Authors: Gustavo Pichorim Boiko <gustavo.boiko@canonical.com> | ||
1302 | 7 | * | ||
1303 | 8 | * This program is free software: you can redistribute it and/or modify it | ||
1304 | 9 | * under the terms of the GNU General Public License version 3, as published | ||
1305 | 10 | * by the Free Software Foundation. | ||
1306 | 11 | * | ||
1307 | 12 | * This program is distributed in the hope that it will be useful, but | ||
1308 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
1309 | 14 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
1310 | 15 | * PURPOSE. See the GNU General Public License for more details. | ||
1311 | 16 | * | ||
1312 | 17 | * You should have received a copy of the GNU General Public License along | ||
1313 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1314 | 19 | */ | ||
1315 | 20 | |||
1316 | 21 | import QtQuick 2.4 | ||
1317 | 22 | import Ubuntu.Components 1.3 | ||
1318 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItems | ||
1319 | 24 | import Ubuntu.Components.Themes.Ambiance 0.1 | ||
1320 | 25 | import "../" | ||
1321 | 26 | |||
1322 | 27 | Page { | ||
1323 | 28 | id: page | ||
1324 | 29 | // TRANSLATORS: %1 is the displayname of the account | ||
1325 | 30 | title: i18n.tr("%1 Number Rewrite").arg(account.displayName) | ||
1326 | 31 | header: PageHeader { | ||
1327 | 32 | title: page.title | ||
1328 | 33 | flickable: contentFlickable | ||
1329 | 34 | } | ||
1330 | 35 | |||
1331 | 36 | property var account: null | ||
1332 | 37 | property bool updating: false | ||
1333 | 38 | onAccountChanged: { | ||
1334 | 39 | if (!account) { | ||
1335 | 40 | return | ||
1336 | 41 | } | ||
1337 | 42 | |||
1338 | 43 | |||
1339 | 44 | var props = account.accountProperties | ||
1340 | 45 | for (var i in props) { | ||
1341 | 46 | console.log(i + ": " + props[i]) | ||
1342 | 47 | console.log(props.defaultAreaCode) | ||
1343 | 48 | } | ||
1344 | 49 | |||
1345 | 50 | updating = true | ||
1346 | 51 | numberRewriteSwitch.checked = props.numberRewrite | ||
1347 | 52 | countryCodeField.text = props.defaultCountryCode | ||
1348 | 53 | areaCodeField.text = props.defaultAreaCode | ||
1349 | 54 | removeInputField.text = props.removeCharacters | ||
1350 | 55 | prefixInputField.text = props.prefix | ||
1351 | 56 | updating = false | ||
1352 | 57 | } | ||
1353 | 58 | |||
1354 | 59 | function setAccountProperty(prop, value) { | ||
1355 | 60 | if (updating) { | ||
1356 | 61 | return | ||
1357 | 62 | } | ||
1358 | 63 | |||
1359 | 64 | var properties = account.accountProperties | ||
1360 | 65 | properties[prop] = value | ||
1361 | 66 | account.accountProperties = properties | ||
1362 | 67 | } | ||
1363 | 68 | |||
1364 | 69 | Flickable { | ||
1365 | 70 | id: contentFlickable | ||
1366 | 71 | anchors.fill: parent | ||
1367 | 72 | Column { | ||
1368 | 73 | height: childrenRect.height | ||
1369 | 74 | spacing: units.gu(1) | ||
1370 | 75 | anchors { | ||
1371 | 76 | left: parent.left | ||
1372 | 77 | right: parent.right | ||
1373 | 78 | } | ||
1374 | 79 | |||
1375 | 80 | ListItems.Standard { | ||
1376 | 81 | control: Switch { | ||
1377 | 82 | id: numberRewriteSwitch | ||
1378 | 83 | objectName: "numberRewriteSwitch" | ||
1379 | 84 | onCheckedChanged: { | ||
1380 | 85 | setAccountProperty("numberRewrite", checked) | ||
1381 | 86 | } | ||
1382 | 87 | } | ||
1383 | 88 | text: i18n.tr("Number rewrite") | ||
1384 | 89 | showDivider: !numberRewriteSwitch.checked | ||
1385 | 90 | } | ||
1386 | 91 | |||
1387 | 92 | ListItems.Standard { | ||
1388 | 93 | id: countryCodeItem | ||
1389 | 94 | height: visible ? units.gu(6) : 0 | ||
1390 | 95 | visible: numberRewriteSwitch.checked | ||
1391 | 96 | text: i18n.tr("Default country code") | ||
1392 | 97 | control: SettingsTextField { | ||
1393 | 98 | id: countryCodeField | ||
1394 | 99 | objectName: "countryCodeField" | ||
1395 | 100 | placeholderText: i18n.tr("Enter a country code") | ||
1396 | 101 | onTextChanged: { | ||
1397 | 102 | setAccountProperty("defaultCountryCode", text) | ||
1398 | 103 | } | ||
1399 | 104 | } | ||
1400 | 105 | Behavior on height { | ||
1401 | 106 | NumberAnimation { | ||
1402 | 107 | duration: UbuntuAnimation.SnapDuration | ||
1403 | 108 | } | ||
1404 | 109 | } | ||
1405 | 110 | } | ||
1406 | 111 | |||
1407 | 112 | ListItems.Standard { | ||
1408 | 113 | id: areaCodeItem | ||
1409 | 114 | height: visible ? units.gu(6) : 0 | ||
1410 | 115 | // FIXME: re-enable the area code when we get libphonenumber detection fixed | ||
1411 | 116 | //visible: numberRewriteSwitch.checked | ||
1412 | 117 | visible: false | ||
1413 | 118 | text: i18n.tr("Default area code") | ||
1414 | 119 | control: SettingsTextField { | ||
1415 | 120 | id: areaCodeField | ||
1416 | 121 | objectName: "areaCodeField" | ||
1417 | 122 | placeholderText: i18n.tr("Enter an area code") | ||
1418 | 123 | onTextChanged: { | ||
1419 | 124 | setAccountProperty("defaultAreaCode", text) | ||
1420 | 125 | } | ||
1421 | 126 | } | ||
1422 | 127 | Behavior on height { | ||
1423 | 128 | NumberAnimation { | ||
1424 | 129 | duration: UbuntuAnimation.SnapDuration | ||
1425 | 130 | } | ||
1426 | 131 | } | ||
1427 | 132 | } | ||
1428 | 133 | |||
1429 | 134 | ListItems.Standard { | ||
1430 | 135 | id: removeInput | ||
1431 | 136 | visible: numberRewriteSwitch.checked | ||
1432 | 137 | height: visible ? units.gu(6) : 0 | ||
1433 | 138 | text: i18n.tr("Characters to remove") | ||
1434 | 139 | control: SettingsTextField { | ||
1435 | 140 | id: removeInputField | ||
1436 | 141 | objectName: "removeInputField" | ||
1437 | 142 | placeholderText: i18n.tr("Enter the characters to remove") | ||
1438 | 143 | onTextChanged: { | ||
1439 | 144 | setAccountProperty("removeCharacters", text) | ||
1440 | 145 | } | ||
1441 | 146 | } | ||
1442 | 147 | |||
1443 | 148 | Behavior on height { | ||
1444 | 149 | NumberAnimation { | ||
1445 | 150 | duration: UbuntuAnimation.SnapDuration | ||
1446 | 151 | } | ||
1447 | 152 | } | ||
1448 | 153 | } | ||
1449 | 154 | |||
1450 | 155 | ListItems.Standard { | ||
1451 | 156 | id: prefixInput | ||
1452 | 157 | visible: numberRewriteSwitch.checked | ||
1453 | 158 | height: visible ? units.gu(6) : 0 | ||
1454 | 159 | text: i18n.tr("Prefix") | ||
1455 | 160 | control: SettingsTextField { | ||
1456 | 161 | id: prefixInputField | ||
1457 | 162 | objectName: "prefixInputField" | ||
1458 | 163 | placeholderText: i18n.tr("Enter a prefix") | ||
1459 | 164 | onTextChanged: { | ||
1460 | 165 | setAccountProperty("prefix", text) | ||
1461 | 166 | } | ||
1462 | 167 | } | ||
1463 | 168 | |||
1464 | 169 | Behavior on height { | ||
1465 | 170 | NumberAnimation { | ||
1466 | 171 | duration: UbuntuAnimation.SnapDuration | ||
1467 | 172 | } | ||
1468 | 173 | } | ||
1469 | 174 | } | ||
1470 | 175 | } | ||
1471 | 176 | } | ||
1472 | 177 | } | ||
1473 | 0 | 178 | ||
1474 | === added file 'src/qml/SettingsPage/AccountSettings/sip.qml' | |||
1475 | --- src/qml/SettingsPage/AccountSettings/sip.qml 1970-01-01 00:00:00 +0000 | |||
1476 | +++ src/qml/SettingsPage/AccountSettings/sip.qml 2017-03-22 17:10:08 +0000 | |||
1477 | @@ -0,0 +1,30 @@ | |||
1478 | 1 | /* | ||
1479 | 2 | * This file is part of dialer-app | ||
1480 | 3 | * | ||
1481 | 4 | * Copyright (C) 2017 Canonical Ltd. | ||
1482 | 5 | * | ||
1483 | 6 | * Authors: Gustavo Pichorim Boiko <gustavo.boiko@canonical.com> | ||
1484 | 7 | * | ||
1485 | 8 | * This program is free software: you can redistribute it and/or modify it | ||
1486 | 9 | * under the terms of the GNU General Public License version 3, as published | ||
1487 | 10 | * by the Free Software Foundation. | ||
1488 | 11 | * | ||
1489 | 12 | * This program is distributed in the hope that it will be useful, but | ||
1490 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
1491 | 14 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
1492 | 15 | * PURPOSE. See the GNU General Public License for more details. | ||
1493 | 16 | * | ||
1494 | 17 | * You should have received a copy of the GNU General Public License along | ||
1495 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1496 | 19 | */ | ||
1497 | 20 | |||
1498 | 21 | import Ubuntu.Components 1.3 | ||
1499 | 22 | import Ubuntu.Components.ListItems 1.3 as ListItems | ||
1500 | 23 | |||
1501 | 24 | ListItems.SingleValue { | ||
1502 | 25 | property var account: null | ||
1503 | 26 | text: i18n.tr("%1 Number Rewrite").arg(account.displayName) | ||
1504 | 27 | progression: true | ||
1505 | 28 | value: account.accountProperties.numberRewrite ? i18n.tr("On") : i18n.tr("Off") | ||
1506 | 29 | onClicked: pageStackNormalMode.push(Qt.resolvedUrl("SipNumberRewrite.qml"), { "account": account }) | ||
1507 | 30 | } | ||
1508 | 0 | 31 | ||
1509 | === added file 'src/qml/SettingsPage/CMakeLists.txt' | |||
1510 | --- src/qml/SettingsPage/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
1511 | +++ src/qml/SettingsPage/CMakeLists.txt 2017-03-22 17:10:08 +0000 | |||
1512 | @@ -0,0 +1,8 @@ | |||
1513 | 1 | file(GLOB SETTINGS_QML_JS_FILES *.qml *.js) | ||
1514 | 2 | |||
1515 | 3 | # make the files visible on qtcreator | ||
1516 | 4 | add_custom_target(dialer_settings_QMlFiles ALL SOURCES ${SETTINGS_QML_JS_FILES}) | ||
1517 | 5 | |||
1518 | 6 | install(FILES ${SETTINGS_QML_JS_FILES} DESTINATION ${DIALER_APP_DIR}/SettingsPage) | ||
1519 | 7 | |||
1520 | 8 | add_subdirectory(AccountSettings) | ||
1521 | 0 | 9 | ||
1522 | === added file 'src/qml/SettingsPage/CallForwardItem.qml' | |||
1523 | --- src/qml/SettingsPage/CallForwardItem.qml 1970-01-01 00:00:00 +0000 | |||
1524 | +++ src/qml/SettingsPage/CallForwardItem.qml 2017-03-22 17:10:08 +0000 | |||
1525 | @@ -0,0 +1,240 @@ | |||
1526 | 1 | /* | ||
1527 | 2 | * This file is part of dialer-app | ||
1528 | 3 | * | ||
1529 | 4 | * Copyright (C) 2015-2017 Canonical Ltd. | ||
1530 | 5 | * | ||
1531 | 6 | * Contact: Jonas G. Drange <jonas.drange@canonical.com> | ||
1532 | 7 | * | ||
1533 | 8 | * This program is free software: you can redistribute it and/or modify it | ||
1534 | 9 | * under the terms of the GNU General Public License version 3, as published | ||
1535 | 10 | * by the Free Software Foundation. | ||
1536 | 11 | * | ||
1537 | 12 | * This program is distributed in the hope that it will be useful, but | ||
1538 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
1539 | 14 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
1540 | 15 | * PURPOSE. See the GNU General Public License for more details. | ||
1541 | 16 | * | ||
1542 | 17 | * You should have received a copy of the GNU General Public License along | ||
1543 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1544 | 19 | */ | ||
1545 | 20 | |||
1546 | 21 | import QtQuick 2.4 | ||
1547 | 22 | import Ubuntu.Components 1.3 | ||
1548 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
1549 | 24 | import Ubuntu.Components.Themes.Ambiance 0.1 | ||
1550 | 25 | import MeeGo.QOfono 0.2 | ||
1551 | 26 | import "callForwardingUtils.js" as Utils | ||
1552 | 27 | |||
1553 | 28 | Column { | ||
1554 | 29 | id: item | ||
1555 | 30 | |||
1556 | 31 | property OfonoCallForwarding callForwarding | ||
1557 | 32 | property bool enabled: true | ||
1558 | 33 | property string rule | ||
1559 | 34 | |||
1560 | 35 | property alias checked: check.checked | ||
1561 | 36 | property alias busy: d._pending | ||
1562 | 37 | property alias text: control.text | ||
1563 | 38 | property alias value: current.value | ||
1564 | 39 | property alias field: field | ||
1565 | 40 | |||
1566 | 41 | signal checked () | ||
1567 | 42 | signal failed () | ||
1568 | 43 | signal enteredEditMode () | ||
1569 | 44 | signal leftEditMode () | ||
1570 | 45 | |||
1571 | 46 | /** | ||
1572 | 47 | * Saves the rule. | ||
1573 | 48 | */ | ||
1574 | 49 | function save () { | ||
1575 | 50 | d._pending = true; | ||
1576 | 51 | if (!Utils.requestRule(field.text)) { | ||
1577 | 52 | d._pending = false; | ||
1578 | 53 | d._editing = false; | ||
1579 | 54 | checked: callForwarding[rule] !== ""; | ||
1580 | 55 | } | ||
1581 | 56 | } | ||
1582 | 57 | |||
1583 | 58 | /** | ||
1584 | 59 | * Cancels editing the rule. | ||
1585 | 60 | */ | ||
1586 | 61 | function cancel () { | ||
1587 | 62 | d._editing = false; | ||
1588 | 63 | check.checked = callForwarding[rule] !== ""; | ||
1589 | 64 | } | ||
1590 | 65 | |||
1591 | 66 | /** | ||
1592 | 67 | * Private object that keeps track of state of the UI. | ||
1593 | 68 | */ | ||
1594 | 69 | QtObject { | ||
1595 | 70 | id: d | ||
1596 | 71 | |||
1597 | 72 | /** | ||
1598 | 73 | * Server is working. | ||
1599 | 74 | */ | ||
1600 | 75 | property bool _pending: !callForwarding.ready | ||
1601 | 76 | |||
1602 | 77 | /** | ||
1603 | 78 | * Server failed to change/fetch setting. | ||
1604 | 79 | */ | ||
1605 | 80 | property bool _failed: false | ||
1606 | 81 | |||
1607 | 82 | /** | ||
1608 | 83 | * We're editing. | ||
1609 | 84 | */ | ||
1610 | 85 | property bool _editing: false | ||
1611 | 86 | on_EditingChanged: Utils.editingChanged() | ||
1612 | 87 | |||
1613 | 88 | /** | ||
1614 | 89 | * Whether or not the forwarding rule is active. | ||
1615 | 90 | */ | ||
1616 | 91 | property bool _active: callForwarding[rule] !== "" | ||
1617 | 92 | } | ||
1618 | 93 | |||
1619 | 94 | states: [ | ||
1620 | 95 | State { | ||
1621 | 96 | name: "failed" | ||
1622 | 97 | when: d._failed | ||
1623 | 98 | PropertyChanges { target: control; enabled: false; control: check } | ||
1624 | 99 | PropertyChanges { target: check; checked: false } | ||
1625 | 100 | PropertyChanges { target: failed; visible: true } | ||
1626 | 101 | PropertyChanges { target: activity; visible: false } | ||
1627 | 102 | }, | ||
1628 | 103 | State { | ||
1629 | 104 | name: "disabled" | ||
1630 | 105 | when: !enabled | ||
1631 | 106 | PropertyChanges { target: control; enabled: false } | ||
1632 | 107 | PropertyChanges { target: check; enabled: false } | ||
1633 | 108 | PropertyChanges { target: current; enabled: false } | ||
1634 | 109 | }, | ||
1635 | 110 | State { | ||
1636 | 111 | name: "requesting" | ||
1637 | 112 | when: d._editing && d._pending | ||
1638 | 113 | PropertyChanges { target: control; control: activity } | ||
1639 | 114 | PropertyChanges { target: check; enabled: false; visible: false } | ||
1640 | 115 | PropertyChanges { target: current; enabled: false; visible: true } | ||
1641 | 116 | }, | ||
1642 | 117 | State { | ||
1643 | 118 | name: "pending" | ||
1644 | 119 | when: d._pending | ||
1645 | 120 | PropertyChanges { target: control; control: activity } | ||
1646 | 121 | PropertyChanges { target: check; enabled: false; visible: false } | ||
1647 | 122 | PropertyChanges { target: current; enabled: false; visible: false } | ||
1648 | 123 | }, | ||
1649 | 124 | State { | ||
1650 | 125 | name: "editing" | ||
1651 | 126 | when: d._editing | ||
1652 | 127 | PropertyChanges { target: check; enabled: false } | ||
1653 | 128 | PropertyChanges { target: current; visible: false } | ||
1654 | 129 | PropertyChanges { target: input; visible: true } | ||
1655 | 130 | }, | ||
1656 | 131 | State { | ||
1657 | 132 | name: "active" | ||
1658 | 133 | when: d._active | ||
1659 | 134 | PropertyChanges { target: current; visible: true } | ||
1660 | 135 | } | ||
1661 | 136 | ] | ||
1662 | 137 | |||
1663 | 138 | ListItem.ThinDivider { anchors { left: parent.left; right: parent.right }} | ||
1664 | 139 | |||
1665 | 140 | ListItem.Standard { | ||
1666 | 141 | id: control | ||
1667 | 142 | onClicked: check.trigger(!check.checked) | ||
1668 | 143 | control: CheckBox { | ||
1669 | 144 | id: check | ||
1670 | 145 | objectName: "check_" + rule | ||
1671 | 146 | checked: callForwarding[rule] !== "" | ||
1672 | 147 | onTriggered: Utils.checked(checked) | ||
1673 | 148 | visible: !activity.running | ||
1674 | 149 | } | ||
1675 | 150 | } | ||
1676 | 151 | |||
1677 | 152 | ListItem.Standard { | ||
1678 | 153 | id: input | ||
1679 | 154 | visible: false | ||
1680 | 155 | height: visible ? units.gu(6) : 0 | ||
1681 | 156 | /* TRANSLATORS: This string will be truncated on smaller displays. */ | ||
1682 | 157 | text: i18n.tr("Forward to") | ||
1683 | 158 | control: TextField { | ||
1684 | 159 | id: field | ||
1685 | 160 | objectName: "field_" + rule | ||
1686 | 161 | horizontalAlignment: TextInput.AlignRight | ||
1687 | 162 | inputMethodHints: Qt.ImhDialableCharactersOnly | ||
1688 | 163 | text: callForwarding[rule] | ||
1689 | 164 | font.pixelSize: units.dp(18) | ||
1690 | 165 | font.weight: Font.Light | ||
1691 | 166 | font.family: "Ubuntu" | ||
1692 | 167 | color: "#AAAAAA" | ||
1693 | 168 | maximumLength: 20 | ||
1694 | 169 | focus: true | ||
1695 | 170 | cursorVisible: text === "" || text !== callForwarding[rule] | ||
1696 | 171 | placeholderText: i18n.tr("Enter a number") | ||
1697 | 172 | style: TextFieldStyle { | ||
1698 | 173 | overlaySpacing: units.gu(0.5) | ||
1699 | 174 | frameSpacing: 0 | ||
1700 | 175 | background: Rectangle { | ||
1701 | 176 | property bool error: (field.hasOwnProperty("errorHighlight") && | ||
1702 | 177 | field.errorHighlight && | ||
1703 | 178 | !field.acceptableInput) | ||
1704 | 179 | onErrorChanged: error ? theme.palette.normal.negative : color | ||
1705 | 180 | color: Theme.palette.normal.background | ||
1706 | 181 | anchors.fill: parent | ||
1707 | 182 | visible: field.activeFocus | ||
1708 | 183 | } | ||
1709 | 184 | } | ||
1710 | 185 | |||
1711 | 186 | onVisibleChanged: | ||
1712 | 187 | if (visible === true) forceActiveFocus() | ||
1713 | 188 | } | ||
1714 | 189 | |||
1715 | 190 | Behavior on height { | ||
1716 | 191 | NumberAnimation { | ||
1717 | 192 | duration: UbuntuAnimation.SnapDuration | ||
1718 | 193 | } | ||
1719 | 194 | } | ||
1720 | 195 | } | ||
1721 | 196 | |||
1722 | 197 | ListItem.SingleValue { | ||
1723 | 198 | id: current | ||
1724 | 199 | objectName: "current_" + rule | ||
1725 | 200 | visible: value | ||
1726 | 201 | /* TRANSLATORS: This string will be truncated on smaller displays. */ | ||
1727 | 202 | text: i18n.tr("Forward to") | ||
1728 | 203 | value: callForwarding[rule] | ||
1729 | 204 | onClicked: d._editing = true | ||
1730 | 205 | } | ||
1731 | 206 | |||
1732 | 207 | /* Error message shown when updating fails. */ | ||
1733 | 208 | Label { | ||
1734 | 209 | id: failed | ||
1735 | 210 | anchors { | ||
1736 | 211 | left: parent.left; right: parent.right; margins: units.gu(2); | ||
1737 | 212 | } | ||
1738 | 213 | visible: false | ||
1739 | 214 | height: contentHeight + units.gu(4) | ||
1740 | 215 | horizontalAlignment: Text.AlignHCenter | ||
1741 | 216 | verticalAlignment: Text.AlignVCenter | ||
1742 | 217 | color: theme.palette.normal.negative | ||
1743 | 218 | text: i18n.tr("Call forwarding can't be changed right now.") | ||
1744 | 219 | } | ||
1745 | 220 | |||
1746 | 221 | ActivityIndicator { | ||
1747 | 222 | id: activity | ||
1748 | 223 | running: d._pending | ||
1749 | 224 | visible: running | ||
1750 | 225 | } | ||
1751 | 226 | |||
1752 | 227 | Connections { | ||
1753 | 228 | target: item | ||
1754 | 229 | Component.onCompleted: { | ||
1755 | 230 | item.callForwarding[item.rule + 'Changed'].connect(Utils.ruleChanged); | ||
1756 | 231 | item.callForwarding[item.rule + 'Complete'].connect(Utils.ruleComplete); | ||
1757 | 232 | item.callForwarding.readyChanged.connect(Utils.ruleReadyChanged); | ||
1758 | 233 | } | ||
1759 | 234 | Component.onDestruction: { | ||
1760 | 235 | item.callForwarding[item.rule + 'Changed'].disconnect(Utils.ruleChanged); | ||
1761 | 236 | item.callForwarding[item.rule + 'Complete'].disconnect(Utils.ruleComplete); | ||
1762 | 237 | item.callForwarding.readyChanged.disconnect(Utils.ruleReadyChanged); | ||
1763 | 238 | } | ||
1764 | 239 | } | ||
1765 | 240 | } | ||
1766 | 0 | 241 | ||
1767 | === added file 'src/qml/SettingsPage/CallForwarding.qml' | |||
1768 | --- src/qml/SettingsPage/CallForwarding.qml 1970-01-01 00:00:00 +0000 | |||
1769 | +++ src/qml/SettingsPage/CallForwarding.qml 2017-03-22 17:10:08 +0000 | |||
1770 | @@ -0,0 +1,393 @@ | |||
1771 | 1 | /* | ||
1772 | 2 | * This file is part of dialer-app | ||
1773 | 3 | * | ||
1774 | 4 | * Copyright (C) 2013-2017 Canonical Ltd. | ||
1775 | 5 | * | ||
1776 | 6 | * Contact: | ||
1777 | 7 | * Sebastien Bacher <sebastien.bacher@canonical.com> | ||
1778 | 8 | * Jonas G. Drange <jonas.drange@canonical.com> | ||
1779 | 9 | * | ||
1780 | 10 | * This program is free software: you can redistribute it and/or modify it | ||
1781 | 11 | * under the terms of the GNU General Public License version 3, as published | ||
1782 | 12 | * by the Free Software Foundation. | ||
1783 | 13 | * | ||
1784 | 14 | * This program is distributed in the hope that it will be useful, but | ||
1785 | 15 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
1786 | 16 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
1787 | 17 | * PURPOSE. See the GNU General Public License for more details. | ||
1788 | 18 | * | ||
1789 | 19 | * You should have received a copy of the GNU General Public License along | ||
1790 | 20 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1791 | 21 | * | ||
1792 | 22 | * TODO: Add centrally stored setting for each call forwarding that describes a | ||
1793 | 23 | * contact. lp:1467816 | ||
1794 | 24 | * | ||
1795 | 25 | * TODO: If a setting failed to be set, the error text should be followed by | ||
1796 | 26 | * “Contact {carrier name} for more information.”. | ||
1797 | 27 | */ | ||
1798 | 28 | |||
1799 | 29 | import QtQuick 2.4 | ||
1800 | 30 | import QtContacts 5.0 | ||
1801 | 31 | import MeeGo.QOfono 0.2 | ||
1802 | 32 | import Ubuntu.Components 1.3 | ||
1803 | 33 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
1804 | 34 | import Ubuntu.Components.Popups 1.3 | ||
1805 | 35 | import Ubuntu.Components.Themes.Ambiance 0.1 | ||
1806 | 36 | import Ubuntu.Content 1.3 | ||
1807 | 37 | import "callForwardingUtils.js" as Utils | ||
1808 | 38 | |||
1809 | 39 | Page { | ||
1810 | 40 | id: page | ||
1811 | 41 | objectName: "callForwardingPage" | ||
1812 | 42 | title: headerTitle | ||
1813 | 43 | property var sim | ||
1814 | 44 | property string headerTitle: i18n.tr("Call forwarding") | ||
1815 | 45 | property QtObject editing: null | ||
1816 | 46 | property QtObject activeItem: null | ||
1817 | 47 | property var activeTransfer | ||
1818 | 48 | |||
1819 | 49 | header: PageHeader { | ||
1820 | 50 | id: pageHeader | ||
1821 | 51 | title: page.title | ||
1822 | 52 | flickable: flick | ||
1823 | 53 | } | ||
1824 | 54 | |||
1825 | 55 | states: [ | ||
1826 | 56 | State { | ||
1827 | 57 | name: "forwardBusy" | ||
1828 | 58 | PropertyChanges { target: fwdSomeTitle; enabled: false } | ||
1829 | 59 | PropertyChanges { target: fwdAll; enabled: false; } | ||
1830 | 60 | PropertyChanges { target: fwdBusy; enabled: false; } | ||
1831 | 61 | PropertyChanges { target: fwdLost; enabled: false; } | ||
1832 | 62 | PropertyChanges { target: fwdUnreachable; enabled: false; } | ||
1833 | 63 | when: fwdAll.busy || fwdBusy.busy || fwdLost.busy || fwdUnreachable.busy | ||
1834 | 64 | }, | ||
1835 | 65 | State { | ||
1836 | 66 | name: "forwardFailed" | ||
1837 | 67 | PropertyChanges { target: fwdSomeTitle; enabled: false } | ||
1838 | 68 | PropertyChanges { target: fwdFailedLabel; visible: true } | ||
1839 | 69 | PropertyChanges { target: fwdAll; enabled: false; } | ||
1840 | 70 | PropertyChanges { target: fwdBusy; enabled: false; } | ||
1841 | 71 | PropertyChanges { target: fwdLost; enabled: false; } | ||
1842 | 72 | PropertyChanges { target: fwdUnreachable; enabled: false; } | ||
1843 | 73 | }, | ||
1844 | 74 | State { | ||
1845 | 75 | name: "editing" | ||
1846 | 76 | PropertyChanges { target: fwdAll; enabled: false; explicit: true } | ||
1847 | 77 | PropertyChanges { target: fwdBusy; enabled: false; explicit: true } | ||
1848 | 78 | PropertyChanges { target: fwdLost; enabled: false; explicit: true } | ||
1849 | 79 | PropertyChanges { target: fwdUnreachable; enabled: false; explicit: true } | ||
1850 | 80 | PropertyChanges { target: fwdSomeTitle; enabled: false } | ||
1851 | 81 | StateChangeScript { | ||
1852 | 82 | name: "editingEnabled" | ||
1853 | 83 | script: { | ||
1854 | 84 | editing.opacity = 1; | ||
1855 | 85 | editing.enabled = true; | ||
1856 | 86 | } | ||
1857 | 87 | } | ||
1858 | 88 | when: editing !== null | ||
1859 | 89 | }, | ||
1860 | 90 | State { | ||
1861 | 91 | name: "forwardAll" | ||
1862 | 92 | PropertyChanges { target: fwdSomeTitle; } | ||
1863 | 93 | PropertyChanges { target: fwdBusy; enabled: false; value: ""; checked: false } | ||
1864 | 94 | PropertyChanges { target: fwdLost; enabled: false; value: ""; checked: false } | ||
1865 | 95 | PropertyChanges { target: fwdUnreachable; enabled: false; value: ""; checked: false } | ||
1866 | 96 | when: fwdAll.value !== "" | ||
1867 | 97 | } | ||
1868 | 98 | ] | ||
1869 | 99 | |||
1870 | 100 | Flickable { | ||
1871 | 101 | id: flick | ||
1872 | 102 | |||
1873 | 103 | // this is necessary to avoid the page to appear below the header | ||
1874 | 104 | clip: true | ||
1875 | 105 | flickableDirection: Flickable.VerticalFlick | ||
1876 | 106 | anchors { | ||
1877 | 107 | fill: parent | ||
1878 | 108 | bottomMargin: keyboardButtons.height + keyboard.height | ||
1879 | 109 | } | ||
1880 | 110 | contentHeight: contents.height + units.gu(2) | ||
1881 | 111 | contentWidth: parent.width | ||
1882 | 112 | |||
1883 | 113 | // after add a new field we need to wait for the contentHeight to | ||
1884 | 114 | // change to scroll to the correct position | ||
1885 | 115 | onContentHeightChanged: Utils.show(page.activeItem) | ||
1886 | 116 | |||
1887 | 117 | Column { | ||
1888 | 118 | id: contents | ||
1889 | 119 | anchors { left: parent.left; right: parent.right } | ||
1890 | 120 | spacing: units.gu(1) | ||
1891 | 121 | |||
1892 | 122 | CallForwardItem { | ||
1893 | 123 | id: fwdAll | ||
1894 | 124 | anchors { left: parent.left; right: parent.right } | ||
1895 | 125 | rule: "voiceUnconditional" | ||
1896 | 126 | callForwarding: callForwarding | ||
1897 | 127 | text: i18n.tr("Forward every incoming call") | ||
1898 | 128 | onEnteredEditMode: {page.editing = fwdAll; Utils.show(field)} | ||
1899 | 129 | onLeftEditMode: page.editing = null | ||
1900 | 130 | } | ||
1901 | 131 | |||
1902 | 132 | Label { | ||
1903 | 133 | id: fwdAllCaption | ||
1904 | 134 | anchors { | ||
1905 | 135 | left: parent.left; right: parent.right; margins: units.gu(1) | ||
1906 | 136 | } | ||
1907 | 137 | width: parent.width | ||
1908 | 138 | wrapMode: Text.WordWrap | ||
1909 | 139 | fontSize: "small" | ||
1910 | 140 | horizontalAlignment: Text.AlignHCenter | ||
1911 | 141 | verticalAlignment: Text.AlignVCenter | ||
1912 | 142 | text: i18n.tr("Redirects all phone calls to another number.") | ||
1913 | 143 | opacity: 0.8 | ||
1914 | 144 | } | ||
1915 | 145 | |||
1916 | 146 | Label { | ||
1917 | 147 | id: fwdFailedLabel | ||
1918 | 148 | anchors { | ||
1919 | 149 | left: parent.left; right: parent.right; margins: units.gu(2) | ||
1920 | 150 | } | ||
1921 | 151 | width: parent.width | ||
1922 | 152 | wrapMode: Text.WordWrap | ||
1923 | 153 | visible: false | ||
1924 | 154 | text: i18n.tr("Call forwarding status can't be checked " + | ||
1925 | 155 | "now. Try again later.") | ||
1926 | 156 | color: theme.palette.normal.negative | ||
1927 | 157 | horizontalAlignment: Text.AlignHCenter | ||
1928 | 158 | } | ||
1929 | 159 | |||
1930 | 160 | SettingsItemTitle { | ||
1931 | 161 | id: fwdSomeTitle | ||
1932 | 162 | text: i18n.tr("Forward incoming calls when:") | ||
1933 | 163 | } | ||
1934 | 164 | |||
1935 | 165 | CallForwardItem { | ||
1936 | 166 | id: fwdBusy | ||
1937 | 167 | objectName: "fwdBusy" | ||
1938 | 168 | anchors { left: parent.left; right: parent.right } | ||
1939 | 169 | callForwarding: callForwarding | ||
1940 | 170 | rule: "voiceBusy" | ||
1941 | 171 | text: i18n.tr("I'm on another call") | ||
1942 | 172 | onEnteredEditMode: {page.editing = fwdBusy; Utils.show(field)} | ||
1943 | 173 | onLeftEditMode: page.editing = null | ||
1944 | 174 | } | ||
1945 | 175 | |||
1946 | 176 | CallForwardItem { | ||
1947 | 177 | id: fwdLost | ||
1948 | 178 | objectName: "fwdLost" | ||
1949 | 179 | anchors { left: parent.left; right: parent.right } | ||
1950 | 180 | callForwarding: callForwarding | ||
1951 | 181 | rule: "voiceNoReply" | ||
1952 | 182 | text: i18n.tr("I don't answer") | ||
1953 | 183 | onEnteredEditMode: {page.editing = fwdLost; Utils.show(field)} | ||
1954 | 184 | onLeftEditMode: page.editing = null | ||
1955 | 185 | } | ||
1956 | 186 | |||
1957 | 187 | CallForwardItem { | ||
1958 | 188 | id: fwdUnreachable | ||
1959 | 189 | objectName: "fwdUnreachable" | ||
1960 | 190 | anchors { left: parent.left; right: parent.right } | ||
1961 | 191 | callForwarding: callForwarding | ||
1962 | 192 | rule: "voiceNotReachable" | ||
1963 | 193 | text: i18n.tr("My phone is unreachable") | ||
1964 | 194 | onEnteredEditMode: { | ||
1965 | 195 | page.editing = fwdUnreachable; | ||
1966 | 196 | Utils.show(field); | ||
1967 | 197 | } | ||
1968 | 198 | onLeftEditMode: page.editing = null | ||
1969 | 199 | } | ||
1970 | 200 | } | ||
1971 | 201 | } // Flickable | ||
1972 | 202 | |||
1973 | 203 | Rectangle { | ||
1974 | 204 | id: keyboardButtons | ||
1975 | 205 | anchors { | ||
1976 | 206 | left: parent.left | ||
1977 | 207 | right: parent.right | ||
1978 | 208 | bottom: keyboard.top | ||
1979 | 209 | } | ||
1980 | 210 | color: Theme.palette.selected.background | ||
1981 | 211 | visible: editing !== null | ||
1982 | 212 | height: units.gu(6) | ||
1983 | 213 | Button { | ||
1984 | 214 | id: kbdContacts | ||
1985 | 215 | objectName: "contactsButton" | ||
1986 | 216 | anchors { | ||
1987 | 217 | left: parent.left | ||
1988 | 218 | leftMargin: units.gu(1) | ||
1989 | 219 | verticalCenter: parent.verticalCenter | ||
1990 | 220 | } | ||
1991 | 221 | activeFocusOnPress: false | ||
1992 | 222 | enabled: editing && !editing.busy | ||
1993 | 223 | text: i18n.tr("Contacts...") | ||
1994 | 224 | onClicked: page.activeTransfer = contactPicker.request() | ||
1995 | 225 | } | ||
1996 | 226 | |||
1997 | 227 | Button { | ||
1998 | 228 | id: kbdCancel | ||
1999 | 229 | objectName: "cancelButton" | ||
2000 | 230 | anchors { | ||
2001 | 231 | right: kbdSet.left | ||
2002 | 232 | rightMargin: units.gu(1) | ||
2003 | 233 | verticalCenter: parent.verticalCenter | ||
2004 | 234 | } | ||
2005 | 235 | enabled: editing && !editing.busy | ||
2006 | 236 | text: i18n.tr("Cancel") | ||
2007 | 237 | onClicked: editing.cancel() | ||
2008 | 238 | } | ||
2009 | 239 | |||
2010 | 240 | Button { | ||
2011 | 241 | id: kbdSet | ||
2012 | 242 | objectName: "setButton" | ||
2013 | 243 | anchors { | ||
2014 | 244 | right: parent.right | ||
2015 | 245 | rightMargin: units.gu(1) | ||
2016 | 246 | verticalCenter: parent.verticalCenter | ||
2017 | 247 | } | ||
2018 | 248 | enabled: editing && !editing.busy && editing.field.text | ||
2019 | 249 | text: i18n.tr("Set") | ||
2020 | 250 | activeFocusOnPress: false | ||
2021 | 251 | onClicked: editing.save() | ||
2022 | 252 | } | ||
2023 | 253 | } | ||
2024 | 254 | |||
2025 | 255 | KeyboardRectangle { | ||
2026 | 256 | id: keyboard | ||
2027 | 257 | anchors.bottom: parent.bottom | ||
2028 | 258 | onHeightChanged: { | ||
2029 | 259 | if (page.activeItem) { | ||
2030 | 260 | Utils.show(page.activeItem); | ||
2031 | 261 | } | ||
2032 | 262 | } | ||
2033 | 263 | } | ||
2034 | 264 | |||
2035 | 265 | Component { | ||
2036 | 266 | id: chooseNumberDialog | ||
2037 | 267 | Dialog { | ||
2038 | 268 | id: dialog | ||
2039 | 269 | property var contact | ||
2040 | 270 | title: i18n.tr("Please select a phone number") | ||
2041 | 271 | |||
2042 | 272 | ListItem.ItemSelector { | ||
2043 | 273 | anchors { | ||
2044 | 274 | left: parent.left | ||
2045 | 275 | right: parent.right | ||
2046 | 276 | } | ||
2047 | 277 | activeFocusOnPress: false | ||
2048 | 278 | expanded: true | ||
2049 | 279 | text: i18n.tr("Numbers") | ||
2050 | 280 | model: contact.phoneNumbers | ||
2051 | 281 | selectedIndex: -1 | ||
2052 | 282 | delegate: OptionSelectorDelegate { | ||
2053 | 283 | text: modelData.number | ||
2054 | 284 | activeFocusOnPress: false | ||
2055 | 285 | } | ||
2056 | 286 | onDelegateClicked: { | ||
2057 | 287 | editing.field.text = contact.phoneNumbers[index].number; | ||
2058 | 288 | PopupUtils.close(dialog); | ||
2059 | 289 | } | ||
2060 | 290 | } | ||
2061 | 291 | } | ||
2062 | 292 | } | ||
2063 | 293 | |||
2064 | 294 | Component { | ||
2065 | 295 | id: hadNoNumberDialog | ||
2066 | 296 | Dialog { | ||
2067 | 297 | id: dialog | ||
2068 | 298 | title: i18n.tr("Could not forward to this contact") | ||
2069 | 299 | text: i18n.tr("Contact not associated with any phone number.") | ||
2070 | 300 | Button { | ||
2071 | 301 | text: i18n.tr("OK") | ||
2072 | 302 | activeFocusOnPress: false | ||
2073 | 303 | onClicked: PopupUtils.close(dialog) | ||
2074 | 304 | } | ||
2075 | 305 | } | ||
2076 | 306 | } | ||
2077 | 307 | |||
2078 | 308 | VCardParser { | ||
2079 | 309 | id: contactParser | ||
2080 | 310 | |||
2081 | 311 | function parseContact(vcardContact) { | ||
2082 | 312 | return vcardContact; | ||
2083 | 313 | } | ||
2084 | 314 | |||
2085 | 315 | onVcardParsed: { | ||
2086 | 316 | var contact; | ||
2087 | 317 | if (contacts.length === 0) { | ||
2088 | 318 | console.warn('no contacts parsed'); | ||
2089 | 319 | return; | ||
2090 | 320 | } else { | ||
2091 | 321 | contact = parseContact(contacts[0]); | ||
2092 | 322 | if (contact.phoneNumbers.length < 1) { | ||
2093 | 323 | PopupUtils.open(hadNoNumberDialog); | ||
2094 | 324 | } else if (contact.phoneNumbers.length > 1) { | ||
2095 | 325 | PopupUtils.open(chooseNumberDialog, page, { | ||
2096 | 326 | 'contact': contact | ||
2097 | 327 | }); | ||
2098 | 328 | } else { | ||
2099 | 329 | editing.field.text = contact.phoneNumber.number; | ||
2100 | 330 | } | ||
2101 | 331 | } | ||
2102 | 332 | } | ||
2103 | 333 | } | ||
2104 | 334 | |||
2105 | 335 | ContentTransferHint { | ||
2106 | 336 | id: importHint | ||
2107 | 337 | anchors.fill: parent | ||
2108 | 338 | activeTransfer: page.activeTransfer | ||
2109 | 339 | } | ||
2110 | 340 | |||
2111 | 341 | ContentPeer { | ||
2112 | 342 | id: contactPicker | ||
2113 | 343 | contentType: ContentType.Contacts | ||
2114 | 344 | handler: ContentHandler.Source | ||
2115 | 345 | selectionType: ContentTransfer.Single | ||
2116 | 346 | } | ||
2117 | 347 | |||
2118 | 348 | Connections { | ||
2119 | 349 | target: page.activeTransfer ? page.activeTransfer : null | ||
2120 | 350 | onStateChanged: { | ||
2121 | 351 | if (page.activeTransfer.state === ContentTransfer.Charged) { | ||
2122 | 352 | contactParser.vCardUrl = page.activeTransfer.items[0].url; | ||
2123 | 353 | } | ||
2124 | 354 | } | ||
2125 | 355 | } | ||
2126 | 356 | |||
2127 | 357 | Connections { | ||
2128 | 358 | target: callForwarding | ||
2129 | 359 | onGetPropertiesFailed: page.state = "forwardFailed"; | ||
2130 | 360 | } | ||
2131 | 361 | |||
2132 | 362 | OfonoCallForwarding { | ||
2133 | 363 | id: callForwarding | ||
2134 | 364 | modemPath: sim.path | ||
2135 | 365 | function updateSummary () { | ||
2136 | 366 | var val; | ||
2137 | 367 | |||
2138 | 368 | // Clear the summary and exit if any of the values are unknown. | ||
2139 | 369 | if (typeof voiceUnconditional === 'undefined' || | ||
2140 | 370 | typeof voiceBusy === 'undefined' || | ||
2141 | 371 | typeof voiceNoReply === 'undefined' || | ||
2142 | 372 | typeof voiceNotReachable === 'undefined') { | ||
2143 | 373 | sim.setCallForwardingSummary(''); | ||
2144 | 374 | return; | ||
2145 | 375 | } | ||
2146 | 376 | |||
2147 | 377 | if (voiceUnconditional) { | ||
2148 | 378 | val = i18n.tr("All calls"); | ||
2149 | 379 | } else if (voiceBusy || voiceNoReply || voiceNotReachable) { | ||
2150 | 380 | val = i18n.tr("Some calls") | ||
2151 | 381 | } else { | ||
2152 | 382 | val = i18n.tr("Off") | ||
2153 | 383 | } | ||
2154 | 384 | sim.setCallForwardingSummary(val); | ||
2155 | 385 | } | ||
2156 | 386 | |||
2157 | 387 | Component.onCompleted: updateSummary() | ||
2158 | 388 | onVoiceUnconditionalChanged: updateSummary() | ||
2159 | 389 | onVoiceBusyChanged: updateSummary() | ||
2160 | 390 | onVoiceNoReplyChanged: updateSummary() | ||
2161 | 391 | onVoiceNotReachableChanged: updateSummary() | ||
2162 | 392 | } | ||
2163 | 393 | } | ||
2164 | 0 | 394 | ||
2165 | === added file 'src/qml/SettingsPage/CallWaiting.qml' | |||
2166 | --- src/qml/SettingsPage/CallWaiting.qml 1970-01-01 00:00:00 +0000 | |||
2167 | +++ src/qml/SettingsPage/CallWaiting.qml 2017-03-22 17:10:08 +0000 | |||
2168 | @@ -0,0 +1,108 @@ | |||
2169 | 1 | /* | ||
2170 | 2 | * This file is part of dialer-app | ||
2171 | 3 | * | ||
2172 | 4 | * Copyright (C) 2013-2017 Canonical Ltd. | ||
2173 | 5 | * | ||
2174 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | ||
2175 | 7 | * | ||
2176 | 8 | * This program is free software: you can redistribute it and/or modify it | ||
2177 | 9 | * under the terms of the GNU General Public License version 3, as published | ||
2178 | 10 | * by the Free Software Foundation. | ||
2179 | 11 | * | ||
2180 | 12 | * This program is distributed in the hope that it will be useful, but | ||
2181 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
2182 | 14 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
2183 | 15 | * PURPOSE. See the GNU General Public License for more details. | ||
2184 | 16 | * | ||
2185 | 17 | * You should have received a copy of the GNU General Public License along | ||
2186 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2187 | 19 | */ | ||
2188 | 20 | |||
2189 | 21 | import QtQuick 2.4 | ||
2190 | 22 | import Ubuntu.Components 1.3 | ||
2191 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
2192 | 24 | import MeeGo.QOfono 0.2 | ||
2193 | 25 | |||
2194 | 26 | Page { | ||
2195 | 27 | id: page | ||
2196 | 28 | objectName: "callWaitingPage" | ||
2197 | 29 | title: headerTitle | ||
2198 | 30 | property var sim | ||
2199 | 31 | property string headerTitle: i18n.tr("Call waiting") | ||
2200 | 32 | property bool attached: sim.netReg.status === "registered" || sim.netReg.status === "roaming" | ||
2201 | 33 | |||
2202 | 34 | header: PageHeader { | ||
2203 | 35 | id: pageHeader | ||
2204 | 36 | title: page.title | ||
2205 | 37 | } | ||
2206 | 38 | |||
2207 | 39 | OfonoCallSettings { | ||
2208 | 40 | id: callSettings | ||
2209 | 41 | modemPath: sim.path | ||
2210 | 42 | onVoiceCallWaitingChanged: { | ||
2211 | 43 | callWaitingIndicator.running = false; | ||
2212 | 44 | } | ||
2213 | 45 | onGetPropertiesFailed: { | ||
2214 | 46 | console.warn('callSettings, onGetPropertiesFailed'); | ||
2215 | 47 | callWaitingIndicator.running = false; | ||
2216 | 48 | } | ||
2217 | 49 | onVoiceCallWaitingComplete: { | ||
2218 | 50 | //When the property change is complete, the value of checked should always be in sync with serverChecked | ||
2219 | 51 | callWaitingSwitch.checked = callWaitingSwitch.serverChecked | ||
2220 | 52 | /* Log some additional output to help debug when things don't work */ | ||
2221 | 53 | console.warn('callSettings, onVoiceCallWaitingComplete modem: ' + modemPath + ' success: ' + success + ' ' + voiceCallWaiting); | ||
2222 | 54 | callWaitingIndicator.running = false; | ||
2223 | 55 | } | ||
2224 | 56 | } | ||
2225 | 57 | |||
2226 | 58 | ActivityIndicator { | ||
2227 | 59 | id: callWaitingIndicator | ||
2228 | 60 | running: true | ||
2229 | 61 | visible: running && attached | ||
2230 | 62 | } | ||
2231 | 63 | |||
2232 | 64 | Switch { | ||
2233 | 65 | id: callWaitingSwitch | ||
2234 | 66 | objectName: "callWaitingSwitch" | ||
2235 | 67 | visible: !callWaitingIndicator.running | ||
2236 | 68 | enabled: callSettings.ready && attached | ||
2237 | 69 | property bool serverChecked: callSettings.voiceCallWaiting !== "disabled" | ||
2238 | 70 | onServerCheckedChanged: checked = serverChecked | ||
2239 | 71 | Component.onCompleted: checked = serverChecked | ||
2240 | 72 | onTriggered: { | ||
2241 | 73 | callWaitingIndicator.running = true; | ||
2242 | 74 | if (checked) | ||
2243 | 75 | callSettings.voiceCallWaiting = "enabled"; | ||
2244 | 76 | else | ||
2245 | 77 | callSettings.voiceCallWaiting = "disabled"; | ||
2246 | 78 | } | ||
2247 | 79 | } | ||
2248 | 80 | |||
2249 | 81 | Column { | ||
2250 | 82 | anchors.fill: parent | ||
2251 | 83 | |||
2252 | 84 | ListItem.Standard { | ||
2253 | 85 | id: callWaitingItem | ||
2254 | 86 | text: i18n.tr("Call waiting") | ||
2255 | 87 | control: callWaitingIndicator.running ? | ||
2256 | 88 | callWaitingIndicator : callWaitingSwitch | ||
2257 | 89 | } | ||
2258 | 90 | |||
2259 | 91 | ListItem.Base { | ||
2260 | 92 | height: textItem.height + units.gu(2) | ||
2261 | 93 | Label { | ||
2262 | 94 | id: textItem | ||
2263 | 95 | anchors { | ||
2264 | 96 | left: parent.left | ||
2265 | 97 | right: parent.right | ||
2266 | 98 | verticalCenter: parent.verticalCenter | ||
2267 | 99 | } | ||
2268 | 100 | |||
2269 | 101 | text: i18n.tr("Lets you answer or start a new call while on another call, and switch between them") | ||
2270 | 102 | horizontalAlignment: Text.AlignHCenter | ||
2271 | 103 | wrapMode: Text.WordWrap | ||
2272 | 104 | } | ||
2273 | 105 | showDivider: false | ||
2274 | 106 | } | ||
2275 | 107 | } | ||
2276 | 108 | } | ||
2277 | 0 | 109 | ||
2278 | === added file 'src/qml/SettingsPage/KeyboardRectangle.qml' | |||
2279 | --- src/qml/SettingsPage/KeyboardRectangle.qml 1970-01-01 00:00:00 +0000 | |||
2280 | +++ src/qml/SettingsPage/KeyboardRectangle.qml 2017-03-22 17:10:08 +0000 | |||
2281 | @@ -0,0 +1,77 @@ | |||
2282 | 1 | /* | ||
2283 | 2 | * Copyright (C) 2015-2017 Canonical, Ltd. | ||
2284 | 3 | * | ||
2285 | 4 | * This program is free software; you can redistribute it and/or modify | ||
2286 | 5 | * it under the terms of the GNU General Public License as published by | ||
2287 | 6 | * the Free Software Foundation; version 3. | ||
2288 | 7 | * | ||
2289 | 8 | * This program is distributed in the hope that it will be useful, | ||
2290 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2291 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2292 | 11 | * GNU General Public License for more details. | ||
2293 | 12 | * | ||
2294 | 13 | * You should have received a copy of the GNU General Public License | ||
2295 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2296 | 15 | */ | ||
2297 | 16 | |||
2298 | 17 | import QtQuick 2.4 | ||
2299 | 18 | |||
2300 | 19 | Item { | ||
2301 | 20 | id: keyboardRect | ||
2302 | 21 | anchors.left: parent.left | ||
2303 | 22 | anchors.right: parent.right | ||
2304 | 23 | anchors.bottom: parent.bottom | ||
2305 | 24 | height: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0 | ||
2306 | 25 | |||
2307 | 26 | Behavior on height { | ||
2308 | 27 | NumberAnimation { | ||
2309 | 28 | duration: 300 | ||
2310 | 29 | easing.type: Easing.InOutQuad | ||
2311 | 30 | } | ||
2312 | 31 | } | ||
2313 | 32 | |||
2314 | 33 | states: [ | ||
2315 | 34 | State { | ||
2316 | 35 | name: "hidden" | ||
2317 | 36 | when: keyboardRect.height == 0 | ||
2318 | 37 | }, | ||
2319 | 38 | State { | ||
2320 | 39 | name: "shown" | ||
2321 | 40 | when: keyboardRect.height == Qt.inputMethod.keyboardRectangle.height | ||
2322 | 41 | } | ||
2323 | 42 | ] | ||
2324 | 43 | |||
2325 | 44 | function recursiveFindFocusedItem(parent) { | ||
2326 | 45 | if (parent.activeFocus) { | ||
2327 | 46 | return parent; | ||
2328 | 47 | } | ||
2329 | 48 | |||
2330 | 49 | for (var i in parent.children) { | ||
2331 | 50 | var child = parent.children[i]; | ||
2332 | 51 | if (child.activeFocus) { | ||
2333 | 52 | return child; | ||
2334 | 53 | } | ||
2335 | 54 | |||
2336 | 55 | var item = recursiveFindFocusedItem(child); | ||
2337 | 56 | |||
2338 | 57 | if (item != null) { | ||
2339 | 58 | return item; | ||
2340 | 59 | } | ||
2341 | 60 | } | ||
2342 | 61 | |||
2343 | 62 | return null; | ||
2344 | 63 | } | ||
2345 | 64 | |||
2346 | 65 | Connections { | ||
2347 | 66 | target: Qt.inputMethod | ||
2348 | 67 | |||
2349 | 68 | onVisibleChanged: { | ||
2350 | 69 | if (!Qt.inputMethod.visible) { | ||
2351 | 70 | var focusedItem = recursiveFindFocusedItem(keyboardRect.parent); | ||
2352 | 71 | if (focusedItem != null) { | ||
2353 | 72 | focusedItem.focus = false; | ||
2354 | 73 | } | ||
2355 | 74 | } | ||
2356 | 75 | } | ||
2357 | 76 | } | ||
2358 | 77 | } | ||
2359 | 0 | 78 | ||
2360 | === added file 'src/qml/SettingsPage/MultiSim.qml' | |||
2361 | --- src/qml/SettingsPage/MultiSim.qml 1970-01-01 00:00:00 +0000 | |||
2362 | +++ src/qml/SettingsPage/MultiSim.qml 2017-03-22 17:10:08 +0000 | |||
2363 | @@ -0,0 +1,113 @@ | |||
2364 | 1 | /* | ||
2365 | 2 | * Copyright (C) 2014-2017 Canonical Ltd | ||
2366 | 3 | * | ||
2367 | 4 | * This program is free software: you can redistribute it and/or modify | ||
2368 | 5 | * it under the terms of the GNU General Public License version 3 as | ||
2369 | 6 | * published by the Free Software Foundation. | ||
2370 | 7 | * | ||
2371 | 8 | * This program is distributed in the hope that it will be useful, | ||
2372 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2373 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2374 | 11 | * GNU General Public License for more details. | ||
2375 | 12 | * | ||
2376 | 13 | * You should have received a copy of the GNU General Public License | ||
2377 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2378 | 15 | * | ||
2379 | 16 | * Authors: | ||
2380 | 17 | * Ken Vandine <ken.vandine@canonical.com> | ||
2381 | 18 | * Jonas G. Drange <jonas.drange@canonical.com> | ||
2382 | 19 | * | ||
2383 | 20 | */ | ||
2384 | 21 | import QtQuick 2.4 | ||
2385 | 22 | import GSettings 1.0 | ||
2386 | 23 | import Ubuntu.Components 1.3 | ||
2387 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
2388 | 25 | |||
2389 | 26 | Column { | ||
2390 | 27 | |||
2391 | 28 | property var sims | ||
2392 | 29 | |||
2393 | 30 | Repeater { | ||
2394 | 31 | model: sims | ||
2395 | 32 | |||
2396 | 33 | Column { | ||
2397 | 34 | |||
2398 | 35 | anchors { left: parent.left; right: parent.right } | ||
2399 | 36 | |||
2400 | 37 | SettingsItemTitle { text: sims[index].title } | ||
2401 | 38 | |||
2402 | 39 | ListItem.Standard { | ||
2403 | 40 | objectName: "callWaitSim" + index | ||
2404 | 41 | text: i18n.tr("Call waiting") | ||
2405 | 42 | progression: true | ||
2406 | 43 | onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), { | ||
2407 | 44 | sim: sims[index], | ||
2408 | 45 | headerTitle: sims[index].title | ||
2409 | 46 | }) | ||
2410 | 47 | } | ||
2411 | 48 | |||
2412 | 49 | ListItem.SingleValue { | ||
2413 | 50 | objectName: "callFwdSim" + index | ||
2414 | 51 | text: i18n.tr("Call forwarding") | ||
2415 | 52 | progression: true | ||
2416 | 53 | value: sims[index].getCallForwardingSummary() | ||
2417 | 54 | onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), { | ||
2418 | 55 | sim: sims[index], | ||
2419 | 56 | headerTitle: sims[index].title | ||
2420 | 57 | }) | ||
2421 | 58 | } | ||
2422 | 59 | |||
2423 | 60 | ListItem.Standard { | ||
2424 | 61 | objectName: "simServicesSim" + index | ||
2425 | 62 | text: i18n.tr("Services") | ||
2426 | 63 | progression: true | ||
2427 | 64 | enabled: { | ||
2428 | 65 | var num; | ||
2429 | 66 | var map = sims[index].simMng.serviceNumbers; | ||
2430 | 67 | var nums = false; | ||
2431 | 68 | for(num in map) { | ||
2432 | 69 | if (map.hasOwnProperty(num)) { | ||
2433 | 70 | nums = true; | ||
2434 | 71 | break; | ||
2435 | 72 | } | ||
2436 | 73 | } | ||
2437 | 74 | return sims[index].simMng.present && nums; | ||
2438 | 75 | } | ||
2439 | 76 | showDivider: false | ||
2440 | 77 | onClicked: pageStack.push(Qt.resolvedUrl("Services.qml"), { | ||
2441 | 78 | carrierString: sims[index].netReg.name, | ||
2442 | 79 | sim: sims[index], | ||
2443 | 80 | headerTitle: sims[index].title | ||
2444 | 81 | }) | ||
2445 | 82 | } | ||
2446 | 83 | |||
2447 | 84 | ListItem.Divider { | ||
2448 | 85 | visible: index !== (sims.length - 1) | ||
2449 | 86 | } | ||
2450 | 87 | |||
2451 | 88 | Binding { | ||
2452 | 89 | target: sims[index] | ||
2453 | 90 | property: "name" | ||
2454 | 91 | value: phoneSettings.simNames[sims[index]] | ||
2455 | 92 | } | ||
2456 | 93 | } | ||
2457 | 94 | } | ||
2458 | 95 | |||
2459 | 96 | GSettings { | ||
2460 | 97 | id: phoneSettings | ||
2461 | 98 | schema.id: "com.ubuntu.phone" | ||
2462 | 99 | Component.onCompleted: { | ||
2463 | 100 | // set default names | ||
2464 | 101 | var simNames = phoneSettings.simNames; | ||
2465 | 102 | var m0 = sims[0].path | ||
2466 | 103 | var m1 = sims[1].path | ||
2467 | 104 | if (!simNames[m0]) { | ||
2468 | 105 | simNames[m0] = "SIM 1"; | ||
2469 | 106 | } | ||
2470 | 107 | if (!simNames[m1]) { | ||
2471 | 108 | simNames[m1] = "SIM 2"; | ||
2472 | 109 | } | ||
2473 | 110 | phoneSettings.simNames = simNames; | ||
2474 | 111 | } | ||
2475 | 112 | } | ||
2476 | 113 | } | ||
2477 | 0 | 114 | ||
2478 | === added file 'src/qml/SettingsPage/NoSims.qml' | |||
2479 | --- src/qml/SettingsPage/NoSims.qml 1970-01-01 00:00:00 +0000 | |||
2480 | +++ src/qml/SettingsPage/NoSims.qml 2017-03-22 17:10:08 +0000 | |||
2481 | @@ -0,0 +1,46 @@ | |||
2482 | 1 | /* | ||
2483 | 2 | * Copyright (C) 2014-2017 Canonical Ltd | ||
2484 | 3 | * | ||
2485 | 4 | * This program is free software: you can redistribute it and/or modify | ||
2486 | 5 | * it under the terms of the GNU General Public License version 3 as | ||
2487 | 6 | * published by the Free Software Foundation. | ||
2488 | 7 | * | ||
2489 | 8 | * This program is distributed in the hope that it will be useful, | ||
2490 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2491 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2492 | 11 | * GNU General Public License for more details. | ||
2493 | 12 | * | ||
2494 | 13 | * You should have received a copy of the GNU General Public License | ||
2495 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2496 | 15 | * | ||
2497 | 16 | * Authors: | ||
2498 | 17 | * Ken Vandine <ken.vandine@canonical.com> | ||
2499 | 18 | * Jonas G. Drange <jonas.drange@canonical.com> | ||
2500 | 19 | * | ||
2501 | 20 | */ | ||
2502 | 21 | import QtQuick 2.4 | ||
2503 | 22 | import Ubuntu.Components 1.3 | ||
2504 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
2505 | 24 | |||
2506 | 25 | Column { | ||
2507 | 26 | |||
2508 | 27 | ListItem.Standard { | ||
2509 | 28 | text: i18n.tr("Call forwarding") | ||
2510 | 29 | progression: true | ||
2511 | 30 | enabled: false | ||
2512 | 31 | } | ||
2513 | 32 | |||
2514 | 33 | ListItem.Standard { | ||
2515 | 34 | text: i18n.tr("Call waiting") | ||
2516 | 35 | progression: true | ||
2517 | 36 | enabled: false | ||
2518 | 37 | } | ||
2519 | 38 | |||
2520 | 39 | ListItem.Divider {} | ||
2521 | 40 | |||
2522 | 41 | ListItem.Standard { | ||
2523 | 42 | text: i18n.tr("Services") | ||
2524 | 43 | progression: true | ||
2525 | 44 | enabled: false | ||
2526 | 45 | } | ||
2527 | 46 | } | ||
2528 | 0 | 47 | ||
2529 | === added file 'src/qml/SettingsPage/Ofono.qml' | |||
2530 | --- src/qml/SettingsPage/Ofono.qml 1970-01-01 00:00:00 +0000 | |||
2531 | +++ src/qml/SettingsPage/Ofono.qml 2017-03-22 17:10:08 +0000 | |||
2532 | @@ -0,0 +1,69 @@ | |||
2533 | 1 | /* | ||
2534 | 2 | * Copyright (C) 2014-2017 Canonical Ltd | ||
2535 | 3 | * | ||
2536 | 4 | * This program is free software: you can redistribute it and/or modify | ||
2537 | 5 | * it under the terms of the GNU General Public License version 3 as | ||
2538 | 6 | * published by the Free Software Foundation. | ||
2539 | 7 | * | ||
2540 | 8 | * This program is distributed in the hope that it will be useful, | ||
2541 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2542 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2543 | 11 | * GNU General Public License for more details. | ||
2544 | 12 | * | ||
2545 | 13 | * You should have received a copy of the GNU General Public License | ||
2546 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2547 | 15 | * | ||
2548 | 16 | * Authors: | ||
2549 | 17 | * Jonas G. Drange <jonas.drange@canonical.com> | ||
2550 | 18 | * | ||
2551 | 19 | */ | ||
2552 | 20 | import QtQuick 2.4 | ||
2553 | 21 | import GSettings 1.0 | ||
2554 | 22 | import MeeGo.QOfono 0.2 | ||
2555 | 23 | |||
2556 | 24 | Item { | ||
2557 | 25 | property alias netReg: netReg | ||
2558 | 26 | property alias simMng: simMng | ||
2559 | 27 | property alias present: simMng.present | ||
2560 | 28 | |||
2561 | 29 | property string path | ||
2562 | 30 | property string name | ||
2563 | 31 | property string title: { | ||
2564 | 32 | var number = simMng.subscriberNumbers[0] || simMng.subscriberIdentity; | ||
2565 | 33 | return name + (number ? " (" + number + ")" : ""); | ||
2566 | 34 | } | ||
2567 | 35 | |||
2568 | 36 | OfonoNetworkRegistration { | ||
2569 | 37 | id: netReg | ||
2570 | 38 | modemPath: path | ||
2571 | 39 | } | ||
2572 | 40 | |||
2573 | 41 | OfonoSimManager { | ||
2574 | 42 | id: simMng | ||
2575 | 43 | modemPath: path | ||
2576 | 44 | } | ||
2577 | 45 | |||
2578 | 46 | function setCallForwardingSummary (val) { | ||
2579 | 47 | var tmp = {}; | ||
2580 | 48 | var fwdSum = settings.callforwardingSummaries; | ||
2581 | 49 | for (var k in fwdSum){ | ||
2582 | 50 | if (fwdSum.hasOwnProperty(k)) { | ||
2583 | 51 | tmp[k] = fwdSum[k]; | ||
2584 | 52 | } | ||
2585 | 53 | } | ||
2586 | 54 | // Prefer IMSI to identify the SIM, use ICCID if IMSI is not available. | ||
2587 | 55 | tmp[simMng.subscriberIdentity || simMng.CardIdentifier] = val; | ||
2588 | 56 | settings.callforwardingSummaries = tmp; | ||
2589 | 57 | } | ||
2590 | 58 | |||
2591 | 59 | function getCallForwardingSummary () { | ||
2592 | 60 | // Use either IMSI or ICCID to identify the SIM. | ||
2593 | 61 | var sid = simMng.subscriberIdentity || simMng.CardIdentifier; | ||
2594 | 62 | return settings.callforwardingSummaries[sid] || ''; | ||
2595 | 63 | } | ||
2596 | 64 | |||
2597 | 65 | GSettings { | ||
2598 | 66 | id: settings | ||
2599 | 67 | schema.id: "com.ubuntu.touch.system-settings" | ||
2600 | 68 | } | ||
2601 | 69 | } | ||
2602 | 0 | 70 | ||
2603 | === added file 'src/qml/SettingsPage/OnlineAccountsHelper.qml' | |||
2604 | --- src/qml/SettingsPage/OnlineAccountsHelper.qml 1970-01-01 00:00:00 +0000 | |||
2605 | +++ src/qml/SettingsPage/OnlineAccountsHelper.qml 2017-03-22 17:10:08 +0000 | |||
2606 | @@ -0,0 +1,96 @@ | |||
2607 | 1 | /* | ||
2608 | 2 | * Copyright (C) 2014 Canonical, Ltd. | ||
2609 | 3 | * | ||
2610 | 4 | * This program is free software; you can redistribute it and/or modify | ||
2611 | 5 | * it under the terms of the GNU General Public License as published by | ||
2612 | 6 | * the Free Software Foundation; version 3. | ||
2613 | 7 | * | ||
2614 | 8 | * This program is distributed in the hope that it will be useful, | ||
2615 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2616 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2617 | 11 | * GNU General Public License for more details. | ||
2618 | 12 | * | ||
2619 | 13 | * You should have received a copy of the GNU General Public License | ||
2620 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2621 | 15 | */ | ||
2622 | 16 | |||
2623 | 17 | import QtQuick 2.4 | ||
2624 | 18 | import Ubuntu.Components 1.3 | ||
2625 | 19 | import Ubuntu.OnlineAccounts 0.1 | ||
2626 | 20 | import Ubuntu.OnlineAccounts.Client 0.1 | ||
2627 | 21 | import Ubuntu.Components.Popups 1.3 | ||
2628 | 22 | |||
2629 | 23 | Item { | ||
2630 | 24 | id: root | ||
2631 | 25 | |||
2632 | 26 | property var dialogInstance: null | ||
2633 | 27 | readonly property int count: accountsModel.count | ||
2634 | 28 | |||
2635 | 29 | function run(){ | ||
2636 | 30 | if (!root.dialogInstance) { | ||
2637 | 31 | root.dialogInstance = PopupUtils.open(dialog) | ||
2638 | 32 | } | ||
2639 | 33 | } | ||
2640 | 34 | |||
2641 | 35 | ProviderModel { | ||
2642 | 36 | id: accountsModel | ||
2643 | 37 | |||
2644 | 38 | applicationId: "dialer-app" | ||
2645 | 39 | } | ||
2646 | 40 | |||
2647 | 41 | Component { | ||
2648 | 42 | id: dialog | ||
2649 | 43 | Dialog { | ||
2650 | 44 | id: dialogue | ||
2651 | 45 | title: "Online Accounts" | ||
2652 | 46 | text: i18n.tr("Pick an account to create.") | ||
2653 | 47 | |||
2654 | 48 | ScrollView { | ||
2655 | 49 | width: dialog.width | ||
2656 | 50 | height: Math.min(listView.count, 3) * units.gu(7) | ||
2657 | 51 | |||
2658 | 52 | ListView { | ||
2659 | 53 | id: listView | ||
2660 | 54 | |||
2661 | 55 | anchors.fill: parent | ||
2662 | 56 | clip: true | ||
2663 | 57 | model: accountsModel | ||
2664 | 58 | delegate: ListItem { | ||
2665 | 59 | ListItemLayout { | ||
2666 | 60 | title.text: model.displayName | ||
2667 | 61 | |||
2668 | 62 | Image { | ||
2669 | 63 | SlotsLayout.position: SlotsLayout.First | ||
2670 | 64 | source: "image://theme/" + model.iconName | ||
2671 | 65 | width: units.gu(5) | ||
2672 | 66 | height: width | ||
2673 | 67 | } | ||
2674 | 68 | } | ||
2675 | 69 | onClicked: { | ||
2676 | 70 | listView.enabled = false | ||
2677 | 71 | setup.providerId = model.providerId | ||
2678 | 72 | setup.exec() | ||
2679 | 73 | } | ||
2680 | 74 | } | ||
2681 | 75 | } | ||
2682 | 76 | } | ||
2683 | 77 | Button { | ||
2684 | 78 | text: i18n.tr("Cancel") | ||
2685 | 79 | onClicked: PopupUtils.close(dialogue) | ||
2686 | 80 | } | ||
2687 | 81 | |||
2688 | 82 | Component.onDestruction: { | ||
2689 | 83 | root.dialogInstance = null | ||
2690 | 84 | } | ||
2691 | 85 | } | ||
2692 | 86 | } | ||
2693 | 87 | |||
2694 | 88 | Setup { | ||
2695 | 89 | id: setup | ||
2696 | 90 | applicationId: "dialer-app" | ||
2697 | 91 | providerId: "telephony-sip" | ||
2698 | 92 | onFinished: { | ||
2699 | 93 | PopupUtils.close(root.dialogInstance) | ||
2700 | 94 | } | ||
2701 | 95 | } | ||
2702 | 96 | } | ||
2703 | 0 | 97 | ||
2704 | === added file 'src/qml/SettingsPage/ServiceInfo.qml' | |||
2705 | --- src/qml/SettingsPage/ServiceInfo.qml 1970-01-01 00:00:00 +0000 | |||
2706 | +++ src/qml/SettingsPage/ServiceInfo.qml 2017-03-22 17:10:08 +0000 | |||
2707 | @@ -0,0 +1,133 @@ | |||
2708 | 1 | /* | ||
2709 | 2 | * This file is part of dialer-app | ||
2710 | 3 | * | ||
2711 | 4 | * Copyright (C) 2013-2017 Canonical Ltd. | ||
2712 | 5 | * | ||
2713 | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> | ||
2714 | 7 | * | ||
2715 | 8 | * This program is free software: you can redistribute it and/or modify it | ||
2716 | 9 | * under the terms of the GNU General Public License version 3, as published | ||
2717 | 10 | * by the Free Software Foundation. | ||
2718 | 11 | * | ||
2719 | 12 | * This program is distributed in the hope that it will be useful, but | ||
2720 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
2721 | 14 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
2722 | 15 | * PURPOSE. See the GNU General Public License for more details. | ||
2723 | 16 | * | ||
2724 | 17 | * You should have received a copy of the GNU General Public License along | ||
2725 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2726 | 19 | */ | ||
2727 | 20 | |||
2728 | 21 | import QtQuick 2.4 | ||
2729 | 22 | import Ubuntu.Components 1.3 | ||
2730 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
2731 | 24 | import Ubuntu.History 0.1 | ||
2732 | 25 | import "dateUtils.js" as DateUtils | ||
2733 | 26 | |||
2734 | 27 | Page { | ||
2735 | 28 | id: page | ||
2736 | 29 | property var sim | ||
2737 | 30 | property string serviceName | ||
2738 | 31 | property string serviceNumber | ||
2739 | 32 | property string lastTimestamp | ||
2740 | 33 | title: serviceName | ||
2741 | 34 | |||
2742 | 35 | header: PageHeader { | ||
2743 | 36 | id: pageHeader | ||
2744 | 37 | title: page.title | ||
2745 | 38 | } | ||
2746 | 39 | |||
2747 | 40 | HistoryEventModel { | ||
2748 | 41 | id: historyEventModel | ||
2749 | 42 | type: HistoryThreadModel.EventTypeVoice | ||
2750 | 43 | sort: HistorySort { | ||
2751 | 44 | sortField: "timestamp" | ||
2752 | 45 | sortOrder: HistorySort.DescendingOrder | ||
2753 | 46 | } | ||
2754 | 47 | |||
2755 | 48 | property string phoneNumber: serviceNumber | ||
2756 | 49 | onCountChanged: lastTimestamp = historyEventModel.get(0).timestamp | ||
2757 | 50 | |||
2758 | 51 | filter: HistoryUnionFilter { | ||
2759 | 52 | // FIXME: this is not the best API for this case, but will be changed later | ||
2760 | 53 | HistoryIntersectionFilter { | ||
2761 | 54 | HistoryFilter { | ||
2762 | 55 | property string threadId: historyEventModel.threadIdForParticipants("ofono/ofono/account0", | ||
2763 | 56 | HistoryThreadModel.EventTypeVoice, | ||
2764 | 57 | [historyEventModel.phoneNumber], | ||
2765 | 58 | HistoryThreadModel.MatchPhoneNumber); | ||
2766 | 59 | filterProperty: "threadId" | ||
2767 | 60 | filterValue: threadId != "" ? threadId : "something that won't match" | ||
2768 | 61 | } | ||
2769 | 62 | HistoryFilter { | ||
2770 | 63 | filterProperty: "accountId" | ||
2771 | 64 | filterValue: "ofono/ofono/account0" | ||
2772 | 65 | } | ||
2773 | 66 | } | ||
2774 | 67 | |||
2775 | 68 | HistoryIntersectionFilter { | ||
2776 | 69 | HistoryFilter { | ||
2777 | 70 | property string threadId: historyEventModel.threadIdForParticipants("ofono/ofono/account1", | ||
2778 | 71 | HistoryThreadModel.EventTypeVoice, | ||
2779 | 72 | [historyEventModel.phoneNumber], | ||
2780 | 73 | HistoryThreadModel.MatchPhoneNumber); | ||
2781 | 74 | filterProperty: "threadId" | ||
2782 | 75 | filterValue: threadId != "" ? threadId : "something that won't match" | ||
2783 | 76 | } | ||
2784 | 77 | HistoryFilter { | ||
2785 | 78 | filterProperty: "accountId" | ||
2786 | 79 | filterValue: "ofono/ofono/account1" | ||
2787 | 80 | } | ||
2788 | 81 | } | ||
2789 | 82 | } | ||
2790 | 83 | } | ||
2791 | 84 | |||
2792 | 85 | Column { | ||
2793 | 86 | anchors { | ||
2794 | 87 | left: parent.left | ||
2795 | 88 | right: parent.right | ||
2796 | 89 | verticalCenter: parent.verticalCenter | ||
2797 | 90 | } | ||
2798 | 91 | |||
2799 | 92 | ListItem.Base { | ||
2800 | 93 | anchors.left: parent.left | ||
2801 | 94 | anchors.right: parent.right | ||
2802 | 95 | height: lastCalledCol.height + units.gu(6) | ||
2803 | 96 | Column { | ||
2804 | 97 | id: lastCalledCol | ||
2805 | 98 | anchors.left: parent.left | ||
2806 | 99 | anchors.right: parent.right | ||
2807 | 100 | height: childrenRect.height | ||
2808 | 101 | spacing: units.gu(2) | ||
2809 | 102 | |||
2810 | 103 | Icon { | ||
2811 | 104 | anchors.horizontalCenter: parent.horizontalCenter | ||
2812 | 105 | name: "contact" | ||
2813 | 106 | width: 144 | ||
2814 | 107 | height: width | ||
2815 | 108 | } | ||
2816 | 109 | |||
2817 | 110 | Label { | ||
2818 | 111 | id: calledLabel | ||
2819 | 112 | objectName: "calledLabel" | ||
2820 | 113 | anchors.horizontalCenter: parent.horizontalCenter | ||
2821 | 114 | visible: lastTimestamp | ||
2822 | 115 | text: i18n.tr("Last called %1").arg(DateUtils.formatFriendlyDate(lastTimestamp)) | ||
2823 | 116 | } | ||
2824 | 117 | } | ||
2825 | 118 | } | ||
2826 | 119 | } | ||
2827 | 120 | |||
2828 | 121 | ListItem.SingleControl { | ||
2829 | 122 | anchors.bottom: parent.bottom | ||
2830 | 123 | control: Button { | ||
2831 | 124 | width: parent.width - units.gu(4) | ||
2832 | 125 | text: i18n.tr("Call") | ||
2833 | 126 | onClicked: { | ||
2834 | 127 | var account = mainView.accountForModem(sim.path) | ||
2835 | 128 | var accountId = account ? account.accountId : null | ||
2836 | 129 | mainView.populateDialpad(serviceNumber, accountId) | ||
2837 | 130 | } | ||
2838 | 131 | } | ||
2839 | 132 | } | ||
2840 | 133 | } | ||
2841 | 0 | 134 | ||
2842 | === added file 'src/qml/SettingsPage/Services.qml' | |||
2843 | --- src/qml/SettingsPage/Services.qml 1970-01-01 00:00:00 +0000 | |||
2844 | +++ src/qml/SettingsPage/Services.qml 2017-03-22 17:10:08 +0000 | |||
2845 | @@ -0,0 +1,74 @@ | |||
2846 | 1 | /* | ||
2847 | 2 | * This file is part of dialer-app | ||
2848 | 3 | * | ||
2849 | 4 | * Copyright (C) 2013 Canonical Ltd. | ||
2850 | 5 | * | ||
2851 | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> | ||
2852 | 7 | * | ||
2853 | 8 | * This program is free software: you can redistribute it and/or modify it | ||
2854 | 9 | * under the terms of the GNU General Public License version 3, as published | ||
2855 | 10 | * by the Free Software Foundation. | ||
2856 | 11 | * | ||
2857 | 12 | * This program is distributed in the hope that it will be useful, but | ||
2858 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
2859 | 14 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
2860 | 15 | * PURPOSE. See the GNU General Public License for more details. | ||
2861 | 16 | * | ||
2862 | 17 | * You should have received a copy of the GNU General Public License along | ||
2863 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2864 | 19 | */ | ||
2865 | 20 | |||
2866 | 21 | import QtQuick 2.4 | ||
2867 | 22 | import Ubuntu.Components 1.3 | ||
2868 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
2869 | 24 | |||
2870 | 25 | Page { | ||
2871 | 26 | id: root | ||
2872 | 27 | objectName: "servicesPage" | ||
2873 | 28 | title: headerTitle | ||
2874 | 29 | property string carrierString | ||
2875 | 30 | property variant sim | ||
2876 | 31 | property var names: [] | ||
2877 | 32 | |||
2878 | 33 | // TRANSLATORS: %1 is the name of the (network) carrier | ||
2879 | 34 | property string headerTitle: i18n.tr("%1 Services").arg(carrierString) | ||
2880 | 35 | |||
2881 | 36 | header: PageHeader { | ||
2882 | 37 | id: pageHeader | ||
2883 | 38 | title: root.title | ||
2884 | 39 | } | ||
2885 | 40 | |||
2886 | 41 | Component.onCompleted: { | ||
2887 | 42 | var keys = []; | ||
2888 | 43 | for (var x in sim.simMng.serviceNumbers) { | ||
2889 | 44 | keys.push(x); | ||
2890 | 45 | } | ||
2891 | 46 | names = keys; | ||
2892 | 47 | } | ||
2893 | 48 | |||
2894 | 49 | Flickable { | ||
2895 | 50 | anchors.fill: parent | ||
2896 | 51 | contentHeight: contentItem.childrenRect.height | ||
2897 | 52 | boundsBehavior: (contentHeight > root.height) ? | ||
2898 | 53 | Flickable.DragAndOvershootBounds : | ||
2899 | 54 | Flickable.StopAtBounds | ||
2900 | 55 | /* Set the direction to workaround | ||
2901 | 56 | https://bugreports.qt-project.org/browse/QTBUG-31905 otherwise the UI | ||
2902 | 57 | might end up in a situation where scrolling doesn't work */ | ||
2903 | 58 | flickableDirection: Flickable.VerticalFlick | ||
2904 | 59 | |||
2905 | 60 | Column { | ||
2906 | 61 | anchors.left: parent.left | ||
2907 | 62 | anchors.right: parent.right | ||
2908 | 63 | Repeater { | ||
2909 | 64 | model: names | ||
2910 | 65 | |||
2911 | 66 | ListItem.Standard { | ||
2912 | 67 | progression: true | ||
2913 | 68 | text: modelData | ||
2914 | 69 | onClicked: pageStack.push(Qt.resolvedUrl("ServiceInfo.qml"), {serviceName: modelData, serviceNumber: sim.simMng.serviceNumbers[modelData], sim: sim}) | ||
2915 | 70 | } | ||
2916 | 71 | } | ||
2917 | 72 | } | ||
2918 | 73 | } | ||
2919 | 74 | } | ||
2920 | 0 | 75 | ||
2921 | === added file 'src/qml/SettingsPage/SettingsItemTitle.qml' | |||
2922 | --- src/qml/SettingsPage/SettingsItemTitle.qml 1970-01-01 00:00:00 +0000 | |||
2923 | +++ src/qml/SettingsPage/SettingsItemTitle.qml 2017-03-22 17:10:08 +0000 | |||
2924 | @@ -0,0 +1,44 @@ | |||
2925 | 1 | /* | ||
2926 | 2 | * This file is part of system-settings | ||
2927 | 3 | * | ||
2928 | 4 | * Copyright (C) 2013-2017 Canonical Ltd. | ||
2929 | 5 | * | ||
2930 | 6 | * This program is free software: you can redistribute it and/or modify it | ||
2931 | 7 | * under the terms of the GNU General Public License version 3, as published | ||
2932 | 8 | * by the Free Software Foundation. | ||
2933 | 9 | * | ||
2934 | 10 | * This program is distributed in the hope that it will be useful, but | ||
2935 | 11 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
2936 | 12 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
2937 | 13 | * PURPOSE. See the GNU General Public License for more details. | ||
2938 | 14 | * | ||
2939 | 15 | * You should have received a copy of the GNU General Public License along | ||
2940 | 16 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2941 | 17 | */ | ||
2942 | 18 | |||
2943 | 19 | import QtQuick 2.4 | ||
2944 | 20 | import Ubuntu.Components 1.3 | ||
2945 | 21 | |||
2946 | 22 | Item { | ||
2947 | 23 | property alias text: label.text | ||
2948 | 24 | anchors { | ||
2949 | 25 | left: parent.left | ||
2950 | 26 | right: parent.right | ||
2951 | 27 | } | ||
2952 | 28 | height: units.gu(6) | ||
2953 | 29 | |||
2954 | 30 | Label { | ||
2955 | 31 | id: label | ||
2956 | 32 | anchors { | ||
2957 | 33 | top: parent.top | ||
2958 | 34 | topMargin: units.gu(3) | ||
2959 | 35 | right: parent.right | ||
2960 | 36 | rightMargin: units.gu(2) | ||
2961 | 37 | bottom: parent.bottom | ||
2962 | 38 | left: parent.left | ||
2963 | 39 | leftMargin: units.gu(2) | ||
2964 | 40 | } | ||
2965 | 41 | fontSize: "small" | ||
2966 | 42 | opacity: 0.75 | ||
2967 | 43 | } | ||
2968 | 44 | } | ||
2969 | 0 | 45 | ||
2970 | === added file 'src/qml/SettingsPage/SettingsPage.qml' | |||
2971 | --- src/qml/SettingsPage/SettingsPage.qml 1970-01-01 00:00:00 +0000 | |||
2972 | +++ src/qml/SettingsPage/SettingsPage.qml 2017-03-22 17:10:08 +0000 | |||
2973 | @@ -0,0 +1,158 @@ | |||
2974 | 1 | /* | ||
2975 | 2 | * This file is part of dialer-app | ||
2976 | 3 | * | ||
2977 | 4 | * Copyright (C) 2013-2017 Canonical Ltd. | ||
2978 | 5 | * | ||
2979 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | ||
2980 | 7 | * | ||
2981 | 8 | * This program is free software: you can redistribute it and/or modify it | ||
2982 | 9 | * under the terms of the GNU General Public License version 3, as published | ||
2983 | 10 | * by the Free Software Foundation. | ||
2984 | 11 | * | ||
2985 | 12 | * This program is distributed in the hope that it will be useful, but | ||
2986 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
2987 | 14 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
2988 | 15 | * PURPOSE. See the GNU General Public License for more details. | ||
2989 | 16 | * | ||
2990 | 17 | * You should have received a copy of the GNU General Public License along | ||
2991 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2992 | 19 | */ | ||
2993 | 20 | |||
2994 | 21 | import QtQuick 2.4 | ||
2995 | 22 | import Ubuntu.Components 1.3 | ||
2996 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
2997 | 24 | import Ubuntu.Telephony 0.1 | ||
2998 | 25 | |||
2999 | 26 | Page { | ||
3000 | 27 | id: settingsPage | ||
3001 | 28 | objectName: "phonePage" | ||
3002 | 29 | title: i18n.tr("Settings") | ||
3003 | 30 | flickable: flick | ||
3004 | 31 | |||
3005 | 32 | property var modemAccounts: telepathyHelper.phoneAccounts.displayed | ||
3006 | 33 | property var sims: [] | ||
3007 | 34 | |||
3008 | 35 | function updateSims() { | ||
3009 | 36 | var component = Qt.createComponent("Ofono.qml"); | ||
3010 | 37 | |||
3011 | 38 | // remove previous objects | ||
3012 | 39 | sims.forEach(function (sim) { | ||
3013 | 40 | sim.destroy(); | ||
3014 | 41 | }) | ||
3015 | 42 | |||
3016 | 43 | var result = [] | ||
3017 | 44 | for (var i in settingsPage.modemAccounts) { | ||
3018 | 45 | var sim = component.createObject(settingsPage, { | ||
3019 | 46 | path: settingsPage.modemAccounts[i].modemName | ||
3020 | 47 | }) | ||
3021 | 48 | result.push(sim) | ||
3022 | 49 | } | ||
3023 | 50 | sims = result | ||
3024 | 51 | } | ||
3025 | 52 | |||
3026 | 53 | header: PageHeader { | ||
3027 | 54 | id: pageHeader | ||
3028 | 55 | title: settingsPage.title | ||
3029 | 56 | flickable: flick | ||
3030 | 57 | } | ||
3031 | 58 | |||
3032 | 59 | states: [ | ||
3033 | 60 | State { | ||
3034 | 61 | name: "noSim" | ||
3035 | 62 | StateChangeScript { | ||
3036 | 63 | script: loader.setSource("NoSims.qml") | ||
3037 | 64 | } | ||
3038 | 65 | when: sims.length === 0 | ||
3039 | 66 | }, | ||
3040 | 67 | State { | ||
3041 | 68 | name: "singleSim" | ||
3042 | 69 | StateChangeScript { | ||
3043 | 70 | script: loader.setSource("SingleSim.qml", { | ||
3044 | 71 | sim: sims[0] | ||
3045 | 72 | }) | ||
3046 | 73 | } | ||
3047 | 74 | when: sims.length === 1 | ||
3048 | 75 | }, | ||
3049 | 76 | State { | ||
3050 | 77 | name: "multiSim" | ||
3051 | 78 | StateChangeScript { | ||
3052 | 79 | script: loader.setSource("MultiSim.qml", { | ||
3053 | 80 | sims: sims | ||
3054 | 81 | }) | ||
3055 | 82 | } | ||
3056 | 83 | when: sims.length > 1 | ||
3057 | 84 | } | ||
3058 | 85 | ] | ||
3059 | 86 | |||
3060 | 87 | onModemAccountsChanged: updateSims() | ||
3061 | 88 | |||
3062 | 89 | Flickable { | ||
3063 | 90 | id: flick | ||
3064 | 91 | anchors.fill: parent | ||
3065 | 92 | contentWidth: parent.width | ||
3066 | 93 | contentHeight: contentItem.childrenRect.height | ||
3067 | 94 | boundsBehavior: (contentHeight > settingsPage.height) ? | ||
3068 | 95 | Flickable.DragAndOvershootBounds : Flickable.StopAtBounds | ||
3069 | 96 | |||
3070 | 97 | Column { | ||
3071 | 98 | anchors { left: parent.left; right: parent.right } | ||
3072 | 99 | |||
3073 | 100 | Loader { | ||
3074 | 101 | id: loader | ||
3075 | 102 | anchors { left: parent.left; right: parent.right } | ||
3076 | 103 | } | ||
3077 | 104 | |||
3078 | 105 | ListItem.Standard { | ||
3079 | 106 | control: Switch { | ||
3080 | 107 | objectName: "dialpadSounds" | ||
3081 | 108 | property bool serverChecked: telepathyHelper.dialpadSoundsEnabled | ||
3082 | 109 | onServerCheckedChanged: checked = serverChecked | ||
3083 | 110 | Component.onCompleted: checked = serverChecked | ||
3084 | 111 | onTriggered: telepathyHelper.dialpadSoundsEnabled = checked | ||
3085 | 112 | } | ||
3086 | 113 | text: i18n.tr("Dialpad tones") | ||
3087 | 114 | } | ||
3088 | 115 | |||
3089 | 116 | ListItem.Standard { | ||
3090 | 117 | id: addAccount | ||
3091 | 118 | anchors { | ||
3092 | 119 | left: parent.left | ||
3093 | 120 | right: parent.right | ||
3094 | 121 | } | ||
3095 | 122 | text: i18n.tr("Add an online account") | ||
3096 | 123 | progression: true | ||
3097 | 124 | onClicked: onlineAccountHelper.item.run() | ||
3098 | 125 | enabled: (onlineAccountHelper.status === Loader.Ready) && (onlineAccountHelper.item.count > 0) | ||
3099 | 126 | } | ||
3100 | 127 | |||
3101 | 128 | Repeater { | ||
3102 | 129 | model: telepathyHelper.voiceAccounts.all | ||
3103 | 130 | |||
3104 | 131 | Loader { | ||
3105 | 132 | id: accountPropertiesLoader | ||
3106 | 133 | anchors { | ||
3107 | 134 | left: parent.left | ||
3108 | 135 | right: parent.right | ||
3109 | 136 | margins: units.gu(1) | ||
3110 | 137 | } | ||
3111 | 138 | height: childrenRect.height | ||
3112 | 139 | source: Qt.resolvedUrl("./AccountSettings/" + modelData.protocolInfo.name + ".qml") | ||
3113 | 140 | |||
3114 | 141 | onStatusChanged: { | ||
3115 | 142 | if (status == Loader.Ready) { | ||
3116 | 143 | item.account = modelData | ||
3117 | 144 | } | ||
3118 | 145 | } | ||
3119 | 146 | } | ||
3120 | 147 | } | ||
3121 | 148 | } | ||
3122 | 149 | } | ||
3123 | 150 | |||
3124 | 151 | Loader { | ||
3125 | 152 | id: onlineAccountHelper | ||
3126 | 153 | |||
3127 | 154 | anchors.fill: parent | ||
3128 | 155 | asynchronous: true | ||
3129 | 156 | source: Qt.resolvedUrl("OnlineAccountsHelper.qml") | ||
3130 | 157 | } | ||
3131 | 158 | } | ||
3132 | 0 | 159 | ||
3133 | === added file 'src/qml/SettingsPage/SettingsTextField.qml' | |||
3134 | --- src/qml/SettingsPage/SettingsTextField.qml 1970-01-01 00:00:00 +0000 | |||
3135 | +++ src/qml/SettingsPage/SettingsTextField.qml 2017-03-22 17:10:08 +0000 | |||
3136 | @@ -0,0 +1,29 @@ | |||
3137 | 1 | import QtQuick 2.4 | ||
3138 | 2 | import Ubuntu.Components 1.3 | ||
3139 | 3 | import Ubuntu.Components.Themes.Ambiance 0.1 | ||
3140 | 4 | |||
3141 | 5 | TextField { | ||
3142 | 6 | id: textField | ||
3143 | 7 | horizontalAlignment: TextInput.AlignRight | ||
3144 | 8 | font { | ||
3145 | 9 | pixelSize: units.dp(18) | ||
3146 | 10 | weight: Font.Light | ||
3147 | 11 | family: "Ubuntu" | ||
3148 | 12 | } | ||
3149 | 13 | color: "#AAAAAA" | ||
3150 | 14 | maximumLength: 20 | ||
3151 | 15 | focus: true | ||
3152 | 16 | style: TextFieldStyle { | ||
3153 | 17 | overlaySpacing: units.gu(0.5) | ||
3154 | 18 | frameSpacing: 0 | ||
3155 | 19 | background: Rectangle { | ||
3156 | 20 | property bool error: (textField.hasOwnProperty("errorHighlight") && | ||
3157 | 21 | textField.errorHighlight && | ||
3158 | 22 | !textField.acceptableInput) | ||
3159 | 23 | onErrorChanged: error ? theme.palette.normal.negative : color | ||
3160 | 24 | color: Theme.palette.normal.background | ||
3161 | 25 | anchors.fill: parent | ||
3162 | 26 | visible: textField.activeFocus | ||
3163 | 27 | } | ||
3164 | 28 | } | ||
3165 | 29 | } | ||
3166 | 0 | 30 | ||
3167 | === added file 'src/qml/SettingsPage/SingleSim.qml' | |||
3168 | --- src/qml/SettingsPage/SingleSim.qml 1970-01-01 00:00:00 +0000 | |||
3169 | +++ src/qml/SettingsPage/SingleSim.qml 2017-03-22 17:10:08 +0000 | |||
3170 | @@ -0,0 +1,69 @@ | |||
3171 | 1 | /* | ||
3172 | 2 | * Copyright (C) 2014-2017 Canonical Ltd | ||
3173 | 3 | * | ||
3174 | 4 | * This program is free software: you can redistribute it and/or modify | ||
3175 | 5 | * it under the terms of the GNU General Public License version 3 as | ||
3176 | 6 | * published by the Free Software Foundation. | ||
3177 | 7 | * | ||
3178 | 8 | * This program is distributed in the hope that it will be useful, | ||
3179 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
3180 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
3181 | 11 | * GNU General Public License for more details. | ||
3182 | 12 | * | ||
3183 | 13 | * You should have received a copy of the GNU General Public License | ||
3184 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
3185 | 15 | * | ||
3186 | 16 | * Authors: | ||
3187 | 17 | * Ken Vandine <ken.vandine@canonical.com> | ||
3188 | 18 | * Jonas G. Drange <jonas.drange@canonical.com> | ||
3189 | 19 | * | ||
3190 | 20 | */ | ||
3191 | 21 | import QtQuick 2.4 | ||
3192 | 22 | import Ubuntu.Components 1.3 | ||
3193 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
3194 | 24 | |||
3195 | 25 | Column { | ||
3196 | 26 | property var sim | ||
3197 | 27 | property string carrierName: sim ? sim.netReg.name : null | ||
3198 | 28 | property string carrierString: carrierName ? carrierName : i18n.tr("SIM") | ||
3199 | 29 | |||
3200 | 30 | ListItem.Standard { | ||
3201 | 31 | objectName: "callWait" | ||
3202 | 32 | text: i18n.tr("Call waiting") | ||
3203 | 33 | progression: true | ||
3204 | 34 | onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), {sim: sim}) | ||
3205 | 35 | } | ||
3206 | 36 | |||
3207 | 37 | ListItem.SingleValue { | ||
3208 | 38 | objectName: "callFwd" | ||
3209 | 39 | text: i18n.tr("Call forwarding") | ||
3210 | 40 | showDivider: false | ||
3211 | 41 | progression: true | ||
3212 | 42 | value: sim.getCallForwardingSummary() | ||
3213 | 43 | onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {sim: sim}) | ||
3214 | 44 | } | ||
3215 | 45 | |||
3216 | 46 | ListItem.Divider {} | ||
3217 | 47 | |||
3218 | 48 | ListItem.Standard { | ||
3219 | 49 | objectName: "simServices" | ||
3220 | 50 | // TRANSLATORS: %1 is the name of the (network) carrier | ||
3221 | 51 | text: i18n.tr("%1 Services").arg(carrierString) | ||
3222 | 52 | progression: true | ||
3223 | 53 | showDivider: false | ||
3224 | 54 | enabled: { | ||
3225 | 55 | var num; | ||
3226 | 56 | var map = sim.simMng.serviceNumbers; | ||
3227 | 57 | var nums = false; | ||
3228 | 58 | for(num in map) { | ||
3229 | 59 | if (map.hasOwnProperty(num)) { | ||
3230 | 60 | nums = true; | ||
3231 | 61 | break; | ||
3232 | 62 | } | ||
3233 | 63 | } | ||
3234 | 64 | return sim.simMng.present && nums; | ||
3235 | 65 | } | ||
3236 | 66 | onClicked: pageStack.push(Qt.resolvedUrl("Services.qml"), | ||
3237 | 67 | {carrierString: carrierString, sim: sim}) | ||
3238 | 68 | } | ||
3239 | 69 | } | ||
3240 | 0 | 70 | ||
3241 | === added file 'src/qml/SettingsPage/VCardParser.qml' | |||
3242 | --- src/qml/SettingsPage/VCardParser.qml 1970-01-01 00:00:00 +0000 | |||
3243 | +++ src/qml/SettingsPage/VCardParser.qml 2017-03-22 17:10:08 +0000 | |||
3244 | @@ -0,0 +1,55 @@ | |||
3245 | 1 | /* | ||
3246 | 2 | * Copyright (C) 2015-2017 Canonical, Ltd. | ||
3247 | 3 | * | ||
3248 | 4 | * This program is free software; you can redistribute it and/or modify | ||
3249 | 5 | * it under the terms of the GNU General Public License as published by | ||
3250 | 6 | * the Free Software Foundation; version 3. | ||
3251 | 7 | * | ||
3252 | 8 | * This program is distributed in the hope that it will be useful, | ||
3253 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
3254 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
3255 | 11 | * GNU General Public License for more details. | ||
3256 | 12 | * | ||
3257 | 13 | * You should have received a copy of the GNU General Public License | ||
3258 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
3259 | 15 | */ | ||
3260 | 16 | |||
3261 | 17 | import QtQuick 2.4 | ||
3262 | 18 | import QtContacts 5.0 | ||
3263 | 19 | |||
3264 | 20 | QtObject { | ||
3265 | 21 | id: root | ||
3266 | 22 | |||
3267 | 23 | property string vCardUrl | ||
3268 | 24 | property alias contacts: contactsModel.contacts | ||
3269 | 25 | property var _model | ||
3270 | 26 | |||
3271 | 27 | signal vcardParsed(int error) | ||
3272 | 28 | |||
3273 | 29 | function clearModel() | ||
3274 | 30 | { | ||
3275 | 31 | if (contactsModel.contacts.length === 0) | ||
3276 | 32 | return; | ||
3277 | 33 | |||
3278 | 34 | var ids = [] | ||
3279 | 35 | for(var i=0, iMax=contactsModel.contacts.length; i < iMax; i++) { | ||
3280 | 36 | ids.push(contactsModel.contacts[i].contactId) | ||
3281 | 37 | } | ||
3282 | 38 | contactsModel.removeContacts(ids) | ||
3283 | 39 | } | ||
3284 | 40 | |||
3285 | 41 | _model: ContactModel { | ||
3286 | 42 | id: contactsModel | ||
3287 | 43 | |||
3288 | 44 | manager: "memory" | ||
3289 | 45 | |||
3290 | 46 | onImportCompleted: vcardParsed(error) | ||
3291 | 47 | } | ||
3292 | 48 | |||
3293 | 49 | onVCardUrlChanged: { | ||
3294 | 50 | if (vCardUrl.length > 0) { | ||
3295 | 51 | clearModel() | ||
3296 | 52 | contactsModel.importContacts(vCardUrl) | ||
3297 | 53 | } | ||
3298 | 54 | } | ||
3299 | 55 | } | ||
3300 | 0 | 56 | ||
3301 | === added file 'src/qml/SettingsPage/callForwardingUtils.js' | |||
3302 | --- src/qml/SettingsPage/callForwardingUtils.js 1970-01-01 00:00:00 +0000 | |||
3303 | +++ src/qml/SettingsPage/callForwardingUtils.js 2017-03-22 17:10:08 +0000 | |||
3304 | @@ -0,0 +1,126 @@ | |||
3305 | 1 | |||
3306 | 2 | /** | ||
3307 | 3 | * Handle the user's intention when it checks the check mark | ||
3308 | 4 | * associated with this forwarding item. | ||
3309 | 5 | * | ||
3310 | 6 | * @param {Boolean} Value of check | ||
3311 | 7 | */ | ||
3312 | 8 | function checked (value) { | ||
3313 | 9 | if (value) { | ||
3314 | 10 | if (item.cachedRuleValue) { | ||
3315 | 11 | requestRule(item.cachedRuleValue); | ||
3316 | 12 | } else { | ||
3317 | 13 | d._editing = true; | ||
3318 | 14 | } | ||
3319 | 15 | } else { | ||
3320 | 16 | if (d._editing) { | ||
3321 | 17 | d._editing = false; | ||
3322 | 18 | } else { | ||
3323 | 19 | requestRule(''); | ||
3324 | 20 | } | ||
3325 | 21 | } | ||
3326 | 22 | } | ||
3327 | 23 | |||
3328 | 24 | /** | ||
3329 | 25 | * Request that the rule be changed on the backend. | ||
3330 | 26 | * | ||
3331 | 27 | * @param {String} new rule value | ||
3332 | 28 | * @return {Boolean} whether or not we requested a change | ||
3333 | 29 | */ | ||
3334 | 30 | function requestRule (value) { | ||
3335 | 31 | value = normalizePhoneNumber(value); | ||
3336 | 32 | if (value === item.callForwarding[item.rule]) { | ||
3337 | 33 | console.warn('Value did not change.'); | ||
3338 | 34 | return false; | ||
3339 | 35 | } | ||
3340 | 36 | |||
3341 | 37 | item.callForwarding[item.rule] = value; | ||
3342 | 38 | d._pending = true; | ||
3343 | 39 | return true; | ||
3344 | 40 | } | ||
3345 | 41 | |||
3346 | 42 | /** | ||
3347 | 43 | * Handler for when the component enter or leaves editing mode. | ||
3348 | 44 | */ | ||
3349 | 45 | function editingChanged () { | ||
3350 | 46 | if (d._editing) { | ||
3351 | 47 | item.enteredEditMode(); | ||
3352 | 48 | } else { | ||
3353 | 49 | item.leftEditMode(); | ||
3354 | 50 | } | ||
3355 | 51 | } | ||
3356 | 52 | |||
3357 | 53 | /** | ||
3358 | 54 | * Handler for when the rule changes on the backend. | ||
3359 | 55 | * | ||
3360 | 56 | * @param {String} the new property | ||
3361 | 57 | */ | ||
3362 | 58 | function ruleChanged (property) { | ||
3363 | 59 | check.checked = callForwarding[rule] !== ""; | ||
3364 | 60 | } | ||
3365 | 61 | |||
3366 | 62 | /** | ||
3367 | 63 | * Handler for when the backend responds. | ||
3368 | 64 | * | ||
3369 | 65 | * @param {Boolean} whether or not the backend succeeded | ||
3370 | 66 | */ | ||
3371 | 67 | function ruleComplete (success) { | ||
3372 | 68 | d._pending = false; | ||
3373 | 69 | d._editing = false; | ||
3374 | 70 | if (!success) { | ||
3375 | 71 | d._failed = true; | ||
3376 | 72 | } | ||
3377 | 73 | } | ||
3378 | 74 | |||
3379 | 75 | /** | ||
3380 | 76 | * Handler for when the rule ready changes. | ||
3381 | 77 | */ | ||
3382 | 78 | function ruleReadyChanged () { | ||
3383 | 79 | d._pending = !callForwarding.ready; | ||
3384 | 80 | } | ||
3385 | 81 | |||
3386 | 82 | /** | ||
3387 | 83 | * Scroll something into view. | ||
3388 | 84 | * | ||
3389 | 85 | * @param {QtObject} item to scroll to. | ||
3390 | 86 | */ | ||
3391 | 87 | function show(item) { | ||
3392 | 88 | if (!item) { | ||
3393 | 89 | return; | ||
3394 | 90 | } | ||
3395 | 91 | page.activeItem = item; | ||
3396 | 92 | |||
3397 | 93 | var position = flick.contentItem.mapFromItem(item, 0, page.activeItem.y); | ||
3398 | 94 | |||
3399 | 95 | // check if the item is already visible | ||
3400 | 96 | var bottomY = flick.contentY + flick.height; | ||
3401 | 97 | var itemBottom = position.y + item.height + units.gu(2); // extra margin | ||
3402 | 98 | if (position.y >= flick.contentY && itemBottom <= bottomY) { | ||
3403 | 99 | return; | ||
3404 | 100 | } | ||
3405 | 101 | |||
3406 | 102 | // if it is not, try to scroll and make it visible | ||
3407 | 103 | var targetY = itemBottom - flick.height; | ||
3408 | 104 | if (targetY >= 0 && position.y) { | ||
3409 | 105 | flick.contentY = targetY; | ||
3410 | 106 | } else if (position.y < flick.contentY) { | ||
3411 | 107 | // if it is hidden at the top, also show it | ||
3412 | 108 | flick.contentY = position.y; | ||
3413 | 109 | } | ||
3414 | 110 | flick.returnToBounds(); | ||
3415 | 111 | } | ||
3416 | 112 | |||
3417 | 113 | /** | ||
3418 | 114 | * Normalizes a phone number. | ||
3419 | 115 | * | ||
3420 | 116 | * TODO(jgdx): Remove this and replace it with libphonenumber | ||
3421 | 117 | * | ||
3422 | 118 | * @param {String} number to normalize | ||
3423 | 119 | * @return {String} normalized number | ||
3424 | 120 | */ | ||
3425 | 121 | function normalizePhoneNumber(identifier) { | ||
3426 | 122 | var regexp = new RegExp('[()/-]', 'g'); | ||
3427 | 123 | var finalNumber = identifier.replace(/\s+/g, ''); | ||
3428 | 124 | finalNumber = finalNumber.replace(regexp, ''); | ||
3429 | 125 | return finalNumber; | ||
3430 | 126 | } | ||
3431 | 0 | 127 | ||
3432 | === added file 'src/qml/SettingsPage/dateUtils.js' | |||
3433 | --- src/qml/SettingsPage/dateUtils.js 1970-01-01 00:00:00 +0000 | |||
3434 | +++ src/qml/SettingsPage/dateUtils.js 2017-03-22 17:10:08 +0000 | |||
3435 | @@ -0,0 +1,69 @@ | |||
3436 | 1 | /* | ||
3437 | 2 | * Copyright 2012-2013 Canonical Ltd. | ||
3438 | 3 | * | ||
3439 | 4 | * This file is part of dialer-app. | ||
3440 | 5 | * | ||
3441 | 6 | * dialer-app is free software; you can redistribute it and/or modify | ||
3442 | 7 | * it under the terms of the GNU General Public License as published by | ||
3443 | 8 | * the Free Software Foundation; version 3. | ||
3444 | 9 | * | ||
3445 | 10 | * dialer-app is distributed in the hope that it will be useful, | ||
3446 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
3447 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
3448 | 13 | * GNU General Public License for more details. | ||
3449 | 14 | * | ||
3450 | 15 | * You should have received a copy of the GNU General Public License | ||
3451 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
3452 | 17 | */ | ||
3453 | 18 | |||
3454 | 19 | function areSameDay(date1, date2) { | ||
3455 | 20 | return date1.getFullYear() == date2.getFullYear() | ||
3456 | 21 | && date1.getMonth() == date2.getMonth() | ||
3457 | 22 | && date1.getDate() == date2.getDate() | ||
3458 | 23 | } | ||
3459 | 24 | |||
3460 | 25 | function formatLogDate(timestamp) { | ||
3461 | 26 | var today = new Date() | ||
3462 | 27 | var date = new Date(timestamp) | ||
3463 | 28 | if (areSameDay(today, date)) { | ||
3464 | 29 | return Qt.formatTime(timestamp, Qt.DefaultLocaleShortDate) | ||
3465 | 30 | } else { | ||
3466 | 31 | return Qt.formatDateTime(timestamp, Qt.DefaultLocaleShortDate) | ||
3467 | 32 | } | ||
3468 | 33 | } | ||
3469 | 34 | |||
3470 | 35 | function friendlyDay(timestamp) { | ||
3471 | 36 | var date = new Date(timestamp); | ||
3472 | 37 | var today = new Date(); | ||
3473 | 38 | var yesterday = new Date(); | ||
3474 | 39 | yesterday.setDate(today.getDate()-1); | ||
3475 | 40 | if (areSameDay(today, date)) { | ||
3476 | 41 | return i18n.tr("Today"); | ||
3477 | 42 | } else if (areSameDay(yesterday, date)) { | ||
3478 | 43 | return i18n.tr("Yesterday"); | ||
3479 | 44 | } else { | ||
3480 | 45 | return Qt.formatDate(date, Qt.DefaultLocaleShortDate); | ||
3481 | 46 | } | ||
3482 | 47 | } | ||
3483 | 48 | |||
3484 | 49 | function formatFriendlyDate(timestamp) { | ||
3485 | 50 | return Qt.formatTime(timestamp, Qt.DefaultLocaleShortDate) + " - " + friendlyDay(timestamp); | ||
3486 | 51 | } | ||
3487 | 52 | |||
3488 | 53 | function formatFriendlyCallDuration(duration) { | ||
3489 | 54 | var text = ""; | ||
3490 | 55 | |||
3491 | 56 | var hours = parseInt(Qt.formatTime(duration, "hh")); | ||
3492 | 57 | var minutes = parseInt(Qt.formatTime(duration, "mm")); | ||
3493 | 58 | var seconds = parseInt(Qt.formatTime(duration, "ss")); | ||
3494 | 59 | |||
3495 | 60 | if (hours > 0) { | ||
3496 | 61 | text = i18n.tr("%1 hour", "%1 hours", hours).arg(hours) | ||
3497 | 62 | } else if (minutes > 0) { | ||
3498 | 63 | text = i18n.tr("%1 min", "%1 mins", minutes).arg(minutes) | ||
3499 | 64 | } else { | ||
3500 | 65 | text = i18n.tr("%1 sec", "%1 secs", seconds).arg(seconds) | ||
3501 | 66 | } | ||
3502 | 67 | |||
3503 | 68 | return text; | ||
3504 | 69 | } | ||
3505 | 0 | 70 | ||
3506 | === modified file 'src/qml/dialer-app.qml' | |||
3507 | --- src/qml/dialer-app.qml 2017-03-22 17:10:08 +0000 | |||
3508 | +++ src/qml/dialer-app.qml 2017-03-22 17:10:08 +0000 | |||
3509 | @@ -16,7 +16,7 @@ | |||
3510 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3511 | 17 | */ | 17 | */ |
3512 | 18 | 18 | ||
3514 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
3515 | 20 | import Qt.labs.settings 1.0 | 20 | import Qt.labs.settings 1.0 |
3516 | 21 | 21 | ||
3517 | 22 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
3518 | @@ -410,11 +410,15 @@ | |||
3519 | 410 | pageStackNormalMode.pop(); | 410 | pageStackNormalMode.pop(); |
3520 | 411 | } | 411 | } |
3521 | 412 | 412 | ||
3524 | 413 | if (pageStackNormalMode.currentPage && typeof(pageStackNormalMode.currentPage.dialNumber) != 'undefined') { | 413 | var dialerPage = pageStackNormalMode.currentPage |
3525 | 414 | pageStackNormalMode.currentPage.dialNumber = number; | 414 | if (dialerPage && typeof(dialerPage.dialNumber) != 'undefined') { |
3526 | 415 | dialerPage.dialNumber = number; | ||
3527 | 416 | if (accountId) { | ||
3528 | 417 | dialerPage.selectAccount(accountId) | ||
3529 | 418 | } | ||
3530 | 415 | 419 | ||
3533 | 416 | if (pageStackNormalMode.currentPage.bottomEdgeItem) { | 420 | if (dialerPage.bottomEdgeItem) { |
3534 | 417 | pageStackNormalMode.currentPage.bottomEdgeItem.collapse() | 421 | dialerPage.bottomEdgeItem.collapse() |
3535 | 418 | } | 422 | } |
3536 | 419 | } | 423 | } |
3537 | 420 | } | 424 | } |
3538 | @@ -481,6 +485,16 @@ | |||
3539 | 481 | PopupUtils.open(Qt.createComponent("Dialogs/SimLockedDialog.qml").createObject(mainView), mainView, properties) | 485 | PopupUtils.open(Qt.createComponent("Dialogs/SimLockedDialog.qml").createObject(mainView), mainView, properties) |
3540 | 482 | } | 486 | } |
3541 | 483 | 487 | ||
3542 | 488 | function accountForModem(modemName) { | ||
3543 | 489 | var modemAccounts = telepathyHelper.phoneAccounts.displayed | ||
3544 | 490 | for (var i in modemAccounts) { | ||
3545 | 491 | if (modemAccounts[i].modemName == modemName) { | ||
3546 | 492 | return modemAccounts[i] | ||
3547 | 493 | } | ||
3548 | 494 | } | ||
3549 | 495 | return null | ||
3550 | 496 | } | ||
3551 | 497 | |||
3552 | 484 | Component.onCompleted: { | 498 | Component.onCompleted: { |
3553 | 485 | i18n.domain = "dialer-app" | 499 | i18n.domain = "dialer-app" |
3554 | 486 | i18n.bindtextdomain("dialer-app", i18nDirectory) | 500 | i18n.bindtextdomain("dialer-app", i18nDirectory) |
Should we use the new ListItem to correct handle keyboard navigation and other theme related features?
Some small inline comments.