Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
7e0d1726
Commit
7e0d1726
authored
Jun 26, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(SettingsModel): provide an email for logs
parent
6ebc8033
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
1 deletion
+20
-1
SettingsModel.cpp
src/components/settings/SettingsModel.cpp
+13
-0
SettingsModel.hpp
src/components/settings/SettingsModel.hpp
+5
-0
SettingsAdvanced.js
ui/views/App/Settings/SettingsAdvanced.js
+2
-1
No files found.
src/components/settings/SettingsModel.cpp
View file @
7e0d1726
...
...
@@ -759,6 +759,19 @@ void SettingsModel::setLogsEnabled (bool status) {
// ---------------------------------------------------------------------------
QString
SettingsModel
::
getLogsEmail
()
const
{
return
::
Utils
::
coreStringToAppString
(
mConfig
->
getString
(
UI_SECTION
,
"logs_email"
,
""
)
);
}
void
SettingsModel
::
setLogsEmail
(
const
QString
&
email
)
{
mConfig
->
setString
(
UI_SECTION
,
"logs_email"
,
::
Utils
::
appStringToCoreString
(
email
));
emit
logsEmailChanged
(
email
);
}
// ---------------------------------------------------------------------------
QString
SettingsModel
::
getLogsFolder
(
const
shared_ptr
<
linphone
::
Config
>
&
config
)
{
return
::
Utils
::
coreStringToAppString
(
config
->
getString
(
UI_SECTION
,
"logs_folder"
,
Paths
::
getLogsDirPath
())
...
...
src/components/settings/SettingsModel.hpp
View file @
7e0d1726
...
...
@@ -125,6 +125,7 @@ class SettingsModel : public QObject {
Q_PROPERTY
(
QString
logsFolder
READ
getLogsFolder
WRITE
setLogsFolder
NOTIFY
logsFolderChanged
);
Q_PROPERTY
(
QString
logsUploadUrl
READ
getLogsUploadUrl
WRITE
setLogsUploadUrl
NOTIFY
logsUploadUrlChanged
);
Q_PROPERTY
(
bool
logsEnabled
READ
getLogsEnabled
WRITE
setLogsEnabled
NOTIFY
logsEnabledChanged
);
Q_PROPERTY
(
QString
logsEmail
READ
getLogsEmail
WRITE
setLogsEmail
NOTIFY
logsEmailChanged
);
public:
enum
MediaEncryption
{
...
...
@@ -295,6 +296,9 @@ public:
bool
getLogsEnabled
()
const
;
void
setLogsEnabled
(
bool
status
);
QString
getLogsEmail
()
const
;
void
setLogsEmail
(
const
QString
&
email
);
// ---------------------------------------------------------------------------
static
QString
getLogsFolder
(
const
std
::
shared_ptr
<
linphone
::
Config
>
&
config
);
...
...
@@ -382,6 +386,7 @@ signals:
void
logsFolderChanged
(
const
QString
&
folder
);
void
logsUploadUrlChanged
(
const
QString
&
url
);
void
logsEnabledChanged
(
bool
status
);
void
logsEmailChanged
(
const
QString
&
email
);
private:
std
::
shared_ptr
<
linphone
::
Config
>
mConfig
;
...
...
ui/views/App/Settings/SettingsAdvanced.js
View file @
7e0d1726
...
...
@@ -22,7 +22,8 @@ function handleLogsUploaded (url) {
if
(
url
.
length
)
{
sendLogsBlock
.
stop
(
''
)
Qt
.
openUrlExternally
(
'
mailto:?subject=
'
+
encodeURIComponent
(
'
Desktop Linphone Log
'
)
+
'
mailto:
'
+
encodeURIComponent
(
Linphone
.
SettingsModel
.
logsEmail
)
+
'
?subject=
'
+
encodeURIComponent
(
'
Desktop Linphone Log
'
)
+
'
&body=
'
+
encodeURIComponent
(
url
)
)
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment