1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
|
diff --git a/jami-qt.pro b/jami-qt.pro
index 57df532..a205896 100644
--- a/jami-qt.pro
+++ b/jami-qt.pro
@@ -102,12 +102,12 @@ unix {
INCLUDEPATH += $${LRC}/include/libringclient
LIBDIR = $${LRC}/lib
} else {
- INCLUDEPATH += $${LRC}/src
- isEmpty(LRCBUILD) {
- LIBDIR = $${LRC}/build
- } else {
- LIBDIR = $${LRCBUILD}
- }
+ INCLUDEPATH += $${LRC}
+ isEmpty(LRCBUILD) {
+ LIBDIR = $${LRC}
+ } else {
+ LIBDIR = $${LRCBUILD}
+ }
}
QMAKE_RPATHDIR += $${LIBDIR}
diff --git a/resources.qrc b/resources.qrc
index 5e7aab5..d71a17d 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -1,141 +1,141 @@
<RCC>
<qresource prefix="/">
- <file>images/icons/outline-info-24px.svg</file>
- <file>images/icons/baseline-camera_alt-24px.svg</file>
- <file>images/icons/baseline-refresh-24px.svg</file>
- <file>images/jami_rolling_spinner.gif</file>
- <file>images/icons/baseline-close-24px.svg</file>
- <file>images/icons/baseline-done-24px.svg</file>
- <file>images/icons/baseline-error_outline-24px.svg</file>
- <file>projectcredits.html</file>
- <file>images/ajax-loader.gif</file>
- <file>images/default_avatar_overlay.svg</file>
- <file>images/FontAwesome.otf</file>
- <file>images/qrcode.png</file>
- <file>images/jami.ico</file>
- <file>images/jami.png</file>
- <file>images/spike.png</file>
- <file>images/waiting.gif</file>
- <file>images/icons/ic_add_black_18dp_2x.png</file>
- <file>images/icons/info-24px.svg</file>
- <file>images/icons/backup-24px.svg</file>
- <file>images/icons/check_box_outline_blank-24px.svg</file>
- <file>images/icons/check_box-24px.svg</file>
- <file>images/icons/devices-24px.svg</file>
- <file>images/icons/ic_arrow_back_24px.svg</file>
- <file>images/icons/ic_arrow_back_white_24dp.png</file>
- <file>images/icons/ic_arrow_drop_down_black_9dp_2x.png</file>
- <file>images/icons/ic_arrow_drop_down_black_18dp_2x.png</file>
- <file>images/icons/ic_arrow_drop_up_black_9dp_2x.png</file>
- <file>images/icons/ic_arrow_drop_up_black_18dp_2x.png</file>
- <file>images/icons/ic_arrow_forward_white_48dp_2x.png</file>
- <file>images/icons/ic_arrow_tab_next_black_9dp_2x.png</file>
- <file>images/icons/ic_arrow_tab_previous_black_9dp_2x.png</file>
- <file>images/icons/ic_block_24px.svg</file>
- <file>images/icons/delete_forever-24px.svg</file>
- <file>images/icons/phone_forwarded-24px.svg</file>
- <file>images/icons/ic_chat_black_24dp_2x.png</file>
- <file>images/icons/ic_chat_white_24dp.png</file>
- <file>images/icons/more_vert-24px.svg</file>
- <file>images/icons/ic_check_white_18dp_2x.png</file>
- <file>images/icons/ic_clear_24px.svg</file>
- <file>images/icons/ic_close_white_24dp.png</file>
- <file>images/icons/ic_content_copy.svg</file>
- <file>images/icons/ic_delete_black_18dp_2x.png</file>
- <file>images/icons/ic_done_white_24dp.png</file>
- <file>images/icons/ic_keypad.svg</file>
- <file>images/icons/open_in_full-24px.svg</file>
- <file>images/icons/close_fullscreen-24px.svg</file>
- <file>images/icons/ic_group_add_white_24dp.png</file>
- <file>images/icons/ic_mic_off_white_24dp.png</file>
- <file>images/icons/pause_circle_outline-24px.svg</file>
- <file>images/icons/play_circle_outline-24px.svg</file>
- <file>images/icons/ic_pause_white_100px.png</file>
- <file>images/icons/ic_phone_24px.svg</file>
- <file>images/icons/groups-24px.svg</file>
- <file>images/icons/ic_photo_camera_white_24dp_2x.png</file>
- <file>images/icons/ic_baseline-search-24px.svg</file>
- <file>images/icons/ic_send_24px.svg</file>
- <file>images/icons/ic_send_white_24dp.png</file>
- <file>images/icons/ic_settings_white_48dp_2x.png</file>
- <file>images/icons/ic_share_black_48dp_2x.png</file>
- <file>images/icons/ic_video_call_24px.svg</file>
- <file>images/icons/ic_videocam_off_white_24dp.png</file>
- <file>images/icons/ic_videocam_white.png</file>
- <file>images/icons/ic_voicemail_white_24dp_2x.png</file>
- <file>images/icons/ic_call_end_white_24px.svg</file>
- <file>images/icons/round-add-24px.svg</file>
- <file>images/icons/round-arrow_drop_down-24px.svg</file>
- <file>images/icons/round-arrow_drop_up-24px.svg</file>
- <file>images/icons/round-arrow_right-24px.svg</file>
- <file>images/icons/round-close-24px.svg</file>
- <file>images/icons/round-edit-24px.svg</file>
- <file>images/icons/round-folder-24px.svg</file>
- <file>images/icons/round-remove_circle-24px.svg</file>
- <file>images/icons/round-settings-24px.svg</file>
- <file>images/icons/round-undo-24px.svg</file>
- <file alias="chatview.css">../lrc/src/web-chatview/chatview.css</file>
- <file alias="chatview.html">../lrc/src/web-chatview/chatview.html</file>
- <file alias="chatview.js">../lrc/src/web-chatview/chatview.js</file>
- <file alias="linkify.js">../lrc/src/web-chatview/linkify.js</file>
- <file alias="linkify-html.js">../lrc/src/web-chatview/linkify-html.js</file>
- <file alias="linkify-string.js">../lrc/src/web-chatview/linkify-string.js</file>
- <file alias="qwebchannel.js">../lrc/src/web-chatview/qwebchannel.js</file>
- <file alias="chatview-windows.css">../lrc/src/web-chatview/chatview-windows.css</file>
- <file>images/icons/round-check_circle-24px.svg</file>
- <file>images/icons/round-error-24px.svg</file>
- <file>images/icons/round-save_alt-24px.svg</file>
- <file>images/jami_eclipse_spinner.gif</file>
- <file>images/icons/ic_hide_password.png</file>
- <file>images/icons/ic_show_password.png</file>
- <file>images/icons/baseline-desktop_windows-24px.svg</file>
- <file>images/icons/baseline-people-24px.svg</file>
- <file>images/icons/ic_high_quality_24px.svg</file>
- <file>images/icons/insert_photo-24px.svg</file>
- <file>images/icons/screen_share-24px.svg</file>
- <file>images/icons/round-add_a_photo-24px.svg</file>
- <file>images/icons/ic_mic_white_24dp.png</file>
- <file>images/icons/ic_play_white_24dp.png</file>
- <file>images/icons/ic_voicemail_black_24dp_2x_.png</file>
- <file>images/icons/av_icons/delete-24px.svg</file>
- <file>images/icons/av_icons/fiber_manual_record-24px.svg</file>
- <file>images/icons/av_icons/play_circle_outline-24px.svg</file>
- <file>images/icons/av_icons/re-record-24px.svg</file>
- <file>images/icons/av_icons/stop-24px-red.svg</file>
- <file>images/icons/av_icons/pause-24px.svg</file>
- <file>images/icons/av_icons/send-24px.svg</file>
- <file>images/icons/av_icons/stop-24px.svg</file>
- <file>images/icons/av_icons/mic-24px.svg</file>
- <file>images/icons/ic_close_black_24dp.png</file>
- <file>images/icons/extension_24dp.svg</file>
- <file>images/icons/settings_backup_restore-black-18dp.svg</file>
- <file>images/icons/person-24px.svg</file>
- <file>images/icons/drafts-24px.svg</file>
- <file>images/icons/person_add-24px.svg</file>
- <file>images/icons/router-24px.svg</file>
- <file>images/icons/insert_drive_file-24dp.svg</file>
- <file>images/icons/arrow_back-white-24dp.svg</file>
- <file>images/icons/keyboard_voice-24px.svg</file>
- <file>images/icons/videocam-24px.svg</file>
- <file>images/icons/qr_code-24px.svg</file>
- <file>images/icons/content_copy-24px.svg</file>
- <file>images/icons/videocam_off-24px.svg</file>
- <file>images/icons/check-24px.svg</file>
- <file>images/icons/mic_off-24px.svg</file>
- <file>images/icons/mic-24px.svg</file>
- <file>images/icons/group_add-24px.svg</file>
- <file>images/icons/chat-24px.svg</file>
- <file>images/icons/phone_paused-24px.svg</file>
- <file>images/icons/pause-24px.svg</file>
- <file>images/icons/arrow_drop_up-24px.svg</file>
- <file>images/icons/arrow_drop_down-24px.svg</file>
- <file>images/icons/expand_less-24px.svg</file>
- <file>images/icons/expand_more-24px.svg</file>
- <file>images/icons/delete-24px.svg</file>
- <file>images/icons/settings_backup_restore-24px.svg</file>
- <file>images/logo-jami-standard-coul.svg</file>
- <file>images/logo-jami-standard-coul-white.svg</file>
- <file>images/icons/moderator.svg</file>
- <file>images/icons/star_outline-24px.svg</file>
+ <file>images/icons/outline-info-24px.svg</file>
+ <file>images/icons/baseline-camera_alt-24px.svg</file>
+ <file>images/icons/baseline-refresh-24px.svg</file>
+ <file>images/jami_rolling_spinner.gif</file>
+ <file>images/icons/baseline-close-24px.svg</file>
+ <file>images/icons/baseline-done-24px.svg</file>
+ <file>images/icons/baseline-error_outline-24px.svg</file>
+ <file>projectcredits.html</file>
+ <file>images/ajax-loader.gif</file>
+ <file>images/default_avatar_overlay.svg</file>
+ <file>images/FontAwesome.otf</file>
+ <file>images/qrcode.png</file>
+ <file>images/jami.ico</file>
+ <file>images/jami.png</file>
+ <file>images/spike.png</file>
+ <file>images/waiting.gif</file>
+ <file>images/icons/ic_add_black_18dp_2x.png</file>
+ <file>images/icons/info-24px.svg</file>
+ <file>images/icons/backup-24px.svg</file>
+ <file>images/icons/check_box_outline_blank-24px.svg</file>
+ <file>images/icons/check_box-24px.svg</file>
+ <file>images/icons/devices-24px.svg</file>
+ <file>images/icons/ic_arrow_back_24px.svg</file>
+ <file>images/icons/ic_arrow_back_white_24dp.png</file>
+ <file>images/icons/ic_arrow_drop_down_black_9dp_2x.png</file>
+ <file>images/icons/ic_arrow_drop_down_black_18dp_2x.png</file>
+ <file>images/icons/ic_arrow_drop_up_black_9dp_2x.png</file>
+ <file>images/icons/ic_arrow_drop_up_black_18dp_2x.png</file>
+ <file>images/icons/ic_arrow_forward_white_48dp_2x.png</file>
+ <file>images/icons/ic_arrow_tab_next_black_9dp_2x.png</file>
+ <file>images/icons/ic_arrow_tab_previous_black_9dp_2x.png</file>
+ <file>images/icons/ic_block_24px.svg</file>
+ <file>images/icons/delete_forever-24px.svg</file>
+ <file>images/icons/phone_forwarded-24px.svg</file>
+ <file>images/icons/ic_chat_black_24dp_2x.png</file>
+ <file>images/icons/ic_chat_white_24dp.png</file>
+ <file>images/icons/more_vert-24px.svg</file>
+ <file>images/icons/ic_check_white_18dp_2x.png</file>
+ <file>images/icons/ic_clear_24px.svg</file>
+ <file>images/icons/ic_close_white_24dp.png</file>
+ <file>images/icons/ic_content_copy.svg</file>
+ <file>images/icons/ic_delete_black_18dp_2x.png</file>
+ <file>images/icons/ic_done_white_24dp.png</file>
+ <file>images/icons/ic_keypad.svg</file>
+ <file>images/icons/open_in_full-24px.svg</file>
+ <file>images/icons/close_fullscreen-24px.svg</file>
+ <file>images/icons/ic_group_add_white_24dp.png</file>
+ <file>images/icons/ic_mic_off_white_24dp.png</file>
+ <file>images/icons/pause_circle_outline-24px.svg</file>
+ <file>images/icons/play_circle_outline-24px.svg</file>
+ <file>images/icons/ic_pause_white_100px.png</file>
+ <file>images/icons/ic_phone_24px.svg</file>
+ <file>images/icons/groups-24px.svg</file>
+ <file>images/icons/ic_photo_camera_white_24dp_2x.png</file>
+ <file>images/icons/ic_baseline-search-24px.svg</file>
+ <file>images/icons/ic_send_24px.svg</file>
+ <file>images/icons/ic_send_white_24dp.png</file>
+ <file>images/icons/ic_settings_white_48dp_2x.png</file>
+ <file>images/icons/ic_share_black_48dp_2x.png</file>
+ <file>images/icons/ic_video_call_24px.svg</file>
+ <file>images/icons/ic_videocam_off_white_24dp.png</file>
+ <file>images/icons/ic_videocam_white.png</file>
+ <file>images/icons/ic_voicemail_white_24dp_2x.png</file>
+ <file>images/icons/ic_call_end_white_24px.svg</file>
+ <file>images/icons/round-add-24px.svg</file>
+ <file>images/icons/round-arrow_drop_down-24px.svg</file>
+ <file>images/icons/round-arrow_drop_up-24px.svg</file>
+ <file>images/icons/round-arrow_right-24px.svg</file>
+ <file>images/icons/round-close-24px.svg</file>
+ <file>images/icons/round-edit-24px.svg</file>
+ <file>images/icons/round-folder-24px.svg</file>
+ <file>images/icons/round-remove_circle-24px.svg</file>
+ <file>images/icons/round-settings-24px.svg</file>
+ <file>images/icons/round-undo-24px.svg</file>
+ <file alias="chatview.css">/usr/include/libringclient/web-chatview/chatview.css</file>
+ <file alias="chatview.html">/usr/include/libringclient/web-chatview/chatview.html</file>
+ <file alias="chatview.js">/usr/include/libringclient/web-chatview/chatview.js</file>
+ <file alias="linkify.js">/usr/include/libringclient/web-chatview/linkify.js</file>
+ <file alias="linkify-html.js">/usr/include/libringclient/web-chatview/linkify-html.js</file>
+ <file alias="linkify-string.js">/usr/include/libringclient/web-chatview/linkify-string.js</file>
+ <file alias="qwebchannel.js">/usr/include/libringclient/web-chatview/qwebchannel.js</file>
+ <file alias="chatview-gnome.css">/usr/include/libringclient/web-chatview/chatview-gnome.css</file>
+ <file>images/icons/round-check_circle-24px.svg</file>
+ <file>images/icons/round-error-24px.svg</file>
+ <file>images/icons/round-save_alt-24px.svg</file>
+ <file>images/jami_eclipse_spinner.gif</file>
+ <file>images/icons/ic_hide_password.png</file>
+ <file>images/icons/ic_show_password.png</file>
+ <file>images/icons/baseline-desktop_windows-24px.svg</file>
+ <file>images/icons/baseline-people-24px.svg</file>
+ <file>images/icons/ic_high_quality_24px.svg</file>
+ <file>images/icons/insert_photo-24px.svg</file>
+ <file>images/icons/screen_share-24px.svg</file>
+ <file>images/icons/round-add_a_photo-24px.svg</file>
+ <file>images/icons/ic_mic_white_24dp.png</file>
+ <file>images/icons/ic_play_white_24dp.png</file>
+ <file>images/icons/ic_voicemail_black_24dp_2x_.png</file>
+ <file>images/icons/av_icons/delete-24px.svg</file>
+ <file>images/icons/av_icons/fiber_manual_record-24px.svg</file>
+ <file>images/icons/av_icons/play_circle_outline-24px.svg</file>
+ <file>images/icons/av_icons/re-record-24px.svg</file>
+ <file>images/icons/av_icons/stop-24px-red.svg</file>
+ <file>images/icons/av_icons/pause-24px.svg</file>
+ <file>images/icons/av_icons/send-24px.svg</file>
+ <file>images/icons/av_icons/stop-24px.svg</file>
+ <file>images/icons/av_icons/mic-24px.svg</file>
+ <file>images/icons/ic_close_black_24dp.png</file>
+ <file>images/icons/extension_24dp.svg</file>
+ <file>images/icons/settings_backup_restore-black-18dp.svg</file>
+ <file>images/icons/person-24px.svg</file>
+ <file>images/icons/drafts-24px.svg</file>
+ <file>images/icons/person_add-24px.svg</file>
+ <file>images/icons/router-24px.svg</file>
+ <file>images/icons/insert_drive_file-24dp.svg</file>
+ <file>images/icons/arrow_back-white-24dp.svg</file>
+ <file>images/icons/keyboard_voice-24px.svg</file>
+ <file>images/icons/videocam-24px.svg</file>
+ <file>images/icons/qr_code-24px.svg</file>
+ <file>images/icons/content_copy-24px.svg</file>
+ <file>images/icons/videocam_off-24px.svg</file>
+ <file>images/icons/check-24px.svg</file>
+ <file>images/icons/mic_off-24px.svg</file>
+ <file>images/icons/mic-24px.svg</file>
+ <file>images/icons/group_add-24px.svg</file>
+ <file>images/icons/chat-24px.svg</file>
+ <file>images/icons/phone_paused-24px.svg</file>
+ <file>images/icons/pause-24px.svg</file>
+ <file>images/icons/arrow_drop_up-24px.svg</file>
+ <file>images/icons/arrow_drop_down-24px.svg</file>
+ <file>images/icons/expand_less-24px.svg</file>
+ <file>images/icons/expand_more-24px.svg</file>
+ <file>images/icons/delete-24px.svg</file>
+ <file>images/icons/settings_backup_restore-24px.svg</file>
+ <file>images/logo-jami-standard-coul.svg</file>
+ <file>images/logo-jami-standard-coul-white.svg</file>
+ <file>images/icons/moderator.svg</file>
+ <file>images/icons/star_outline-24px.svg</file>
</qresource>
</RCC>
diff --git a/src/accountadapter.cpp b/src/accountadapter.cpp
index bb1bb7c..e200832 100644
--- a/src/accountadapter.cpp
+++ b/src/accountadapter.cpp
@@ -28,7 +28,6 @@
#include <QtConcurrent/QtConcurrent>
#undef REGISTERED
-#include "../daemon/src/dring/account_const.h"
AccountAdapter::AccountAdapter(QObject* parent)
: QmlAdapterBase(parent)
@@ -131,10 +130,8 @@ AccountAdapter::createJamiAccount(QString registeredName,
QtConcurrent::run([settings] {
QMap<QString, QString> additionalAccountConfig;
- additionalAccountConfig.insert(DRing::Account::ConfProperties::Ringtone::PATH,
- Utils::GetRingtonePath());
- additionalAccountConfig.insert(DRing::Account::ConfProperties::ISRENDEZVOUS,
- settings["isRendezVous"].toString());
+ additionalAccountConfig.insert("Account.ringtonePath", Utils::GetRingtonePath());
+ additionalAccountConfig.insert("Account.rendezVous", settings["isRendezVous"].toString());
LRCInstance::accountModel().createNewAccount(lrc::api::profile::Type::RING,
settings["alias"].toString(),
@@ -172,8 +169,7 @@ AccountAdapter::createSIPAccount(const QVariantMap& settings)
QtConcurrent::run([settings] {
QMap<QString, QString> additionalAccountConfig;
- additionalAccountConfig.insert(DRing::Account::ConfProperties::Ringtone::PATH,
- Utils::GetRingtonePath());
+ additionalAccountConfig.insert("Account.ringtonePath", Utils::GetRingtonePath());
LRCInstance::accountModel().createNewAccount(lrc::api::profile::Type::SIP,
settings["alias"].toString(),
@@ -205,8 +201,7 @@ AccountAdapter::createJAMSAccount(const QVariantMap& settings)
QtConcurrent::run([settings] {
QMap<QString, QString> additionalAccountConfig;
- additionalAccountConfig.insert(DRing::Account::ConfProperties::Ringtone::PATH,
- Utils::GetRingtonePath());
+ additionalAccountConfig.insert("Account.ringtonePath", Utils::GetRingtonePath());
LRCInstance::accountModel().connectToAccountManager(settings["username"].toString(),
settings["password"].toString(),
diff --git a/src/lrcinstance.h b/src/lrcinstance.h
index fc0efe9..e06d9d1 100644
--- a/src/lrcinstance.h
+++ b/src/lrcinstance.h
@@ -30,7 +30,7 @@
#include "appsettingsmanager.h"
#include "utils.h"
-#include "api/account.h"
+#include <api/account.h>
#include "api/avmodel.h"
#include "api/pluginmodel.h"
#include "api/behaviorcontroller.h"
diff --git a/src/messagesadapter.cpp b/src/messagesadapter.cpp
index 819285b..08b20b2 100644
--- a/src/messagesadapter.cpp
+++ b/src/messagesadapter.cpp
@@ -27,6 +27,7 @@
#include "qtutils.h"
#include "utils.h"
#include "webchathelpers.h"
+#include "api/chatview.h"
#include <QApplication>
#include <QClipboard>
|