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
d84149ef
Commit
d84149ef
authored
Jun 23, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(SettingsAdvanced): send logs in progress
parent
3a0dbaf9
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
68 additions
and
9 deletions
+68
-9
en.ts
assets/languages/en.ts
+8
-0
fr.ts
assets/languages/fr.ts
+8
-0
linphonerc-factory
assets/linphonerc-factory
+1
-0
Logger.cpp
src/app/logger/Logger.cpp
+1
-1
CoreManager.cpp
src/components/core/CoreManager.cpp
+4
-1
SettingsModel.cpp
src/components/settings/SettingsModel.cpp
+16
-0
SettingsModel.hpp
src/components/settings/SettingsModel.hpp
+5
-0
MainWindow.qml
ui/views/App/Main/MainWindow.qml
+0
-1
SettingsAdvanced.qml
ui/views/App/Settings/SettingsAdvanced.qml
+25
-4
SettingsWindow.qml
ui/views/App/Settings/SettingsWindow.qml
+0
-2
No files found.
assets/languages/en.ts
View file @
d84149ef
...
@@ -977,6 +977,14 @@ your friend's SIP address or username.</translation>
...
@@ -977,6 +977,14 @@ your friend's SIP address or username.</translation>
<
source
>
logsFolderLabel
<
/source
>
<
source
>
logsFolderLabel
<
/source
>
<
translation
>
Logs
folder
<
/translation
>
<
translation
>
Logs
folder
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
source
>
sendLogs
<
/source
>
<
translation
>
SEND
LOGS
<
/translation
>
<
/message
>
<
message
>
<
source
>
logsUploadUrlLabel
<
/source
>
<
translation
>
Logs
upload
server
url
<
/translation
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
SettingsAudio
<
/name
>
<
name
>
SettingsAudio
<
/name
>
...
...
assets/languages/fr.ts
View file @
d84149ef
...
@@ -975,6 +975,14 @@ Cliquez ici : <a href="%1">%1</a>
...
@@ -975,6 +975,14 @@ Cliquez ici : <a href="%1">%1</a>
<
source
>
logsFolderLabel
<
/source
>
<
source
>
logsFolderLabel
<
/source
>
<
translation
>
Dossier
des
logs
<
/translation
>
<
translation
>
Dossier
des
logs
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
source
>
sendLogs
<
/source
>
<
translation
>
ENVOYER
LOGS
<
/translation
>
<
/message
>
<
message
>
<
source
>
logsUploadUrlLabel
<
/source
>
<
translation
>
Url
du
serveur
de
logs
<
/translation
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
SettingsAudio
<
/name
>
<
name
>
SettingsAudio
<
/name
>
...
...
assets/linphonerc-factory
View file @
d84149ef
[misc]
[misc]
version_check_url_root=https://linphone.org/releases
version_check_url_root=https://linphone.org/releases
log_collection_upload_server_url=https://www.linphone.org:444/lft.php
[sound]
[sound]
ec_filter=MSWebRTCAEC
ec_filter=MSWebRTCAEC
src/app/logger/Logger.cpp
View file @
d84149ef
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
#define QT_DOMAIN "qt"
#define QT_DOMAIN "qt"
#define MAX_LOGS_COLLECTION_SIZE 10485760
0
/* 10
0MB. */
#define MAX_LOGS_COLLECTION_SIZE 10485760
/* 1
0MB. */
#define SRC_PATTERN "/linphone-desktop/src/"
#define SRC_PATTERN "/linphone-desktop/src/"
...
...
src/components/core/CoreManager.cpp
View file @
d84149ef
...
@@ -101,7 +101,10 @@ void CoreManager::forceRefreshRegisters () {
...
@@ -101,7 +101,10 @@ void CoreManager::forceRefreshRegisters () {
void
CoreManager
::
sendLogs
()
const
{
void
CoreManager
::
sendLogs
()
const
{
Q_CHECK_PTR
(
mCore
);
Q_CHECK_PTR
(
mCore
);
// TODO.
qInfo
()
<<
QStringLiteral
(
"Send logs to: `%1`."
)
.
arg
(
::
Utils
::
coreStringToAppString
(
mCore
->
getLogCollectionUploadServerUrl
()));
mCore
->
uploadLogCollection
();
}
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
...
...
src/components/settings/SettingsModel.cpp
View file @
d84149ef
...
@@ -730,6 +730,22 @@ void SettingsModel::setLogsFolder (const QString &folder) {
...
@@ -730,6 +730,22 @@ void SettingsModel::setLogsFolder (const QString &folder) {
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
QString
SettingsModel
::
getLogsUploadUrl
()
const
{
return
::
Utils
::
coreStringToAppString
(
CoreManager
::
getInstance
()
->
getCore
()
->
getLogCollectionUploadServerUrl
()
);
}
void
SettingsModel
::
setLogsUploadUrl
(
const
QString
&
url
)
{
CoreManager
::
getInstance
()
->
getCore
()
->
setLogCollectionUploadServerUrl
(
::
Utils
::
appStringToCoreString
(
url
)
);
emit
logsUploadUrlChanged
(
getLogsUploadUrl
());
}
// -----------------------------------------------------------------------------
QString
SettingsModel
::
getLogsFolder
(
const
shared_ptr
<
linphone
::
Config
>
&
config
)
{
QString
SettingsModel
::
getLogsFolder
(
const
shared_ptr
<
linphone
::
Config
>
&
config
)
{
return
::
Utils
::
coreStringToAppString
(
return
::
Utils
::
coreStringToAppString
(
config
->
getString
(
UI_SECTION
,
"logs_folder"
,
Paths
::
getLogsDirPath
())
config
->
getString
(
UI_SECTION
,
"logs_folder"
,
Paths
::
getLogsDirPath
())
...
...
src/components/settings/SettingsModel.hpp
View file @
d84149ef
...
@@ -123,6 +123,7 @@ class SettingsModel : public QObject {
...
@@ -123,6 +123,7 @@ class SettingsModel : public QObject {
// Advanced. -----------------------------------------------------------------
// Advanced. -----------------------------------------------------------------
Q_PROPERTY
(
QString
logsFolder
READ
getLogsFolder
WRITE
setLogsFolder
NOTIFY
logsFolderChanged
);
Q_PROPERTY
(
QString
logsFolder
READ
getLogsFolder
WRITE
setLogsFolder
NOTIFY
logsFolderChanged
);
Q_PROPERTY
(
QString
logsUploadUrl
READ
getLogsUploadUrl
WRITE
setLogsUploadUrl
NOTIFY
logsUploadUrlChanged
);
public:
public:
enum
MediaEncryption
{
enum
MediaEncryption
{
...
@@ -287,6 +288,9 @@ public:
...
@@ -287,6 +288,9 @@ public:
QString
getLogsFolder
()
const
;
QString
getLogsFolder
()
const
;
void
setLogsFolder
(
const
QString
&
folder
);
void
setLogsFolder
(
const
QString
&
folder
);
QString
getLogsUploadUrl
()
const
;
void
setLogsUploadUrl
(
const
QString
&
url
);
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
static
QString
getLogsFolder
(
const
std
::
shared_ptr
<
linphone
::
Config
>
&
config
);
static
QString
getLogsFolder
(
const
std
::
shared_ptr
<
linphone
::
Config
>
&
config
);
...
@@ -371,6 +375,7 @@ signals:
...
@@ -371,6 +375,7 @@ signals:
// Advanced. -----------------------------------------------------------------
// Advanced. -----------------------------------------------------------------
void
logsFolderChanged
(
const
QString
&
folder
);
void
logsFolderChanged
(
const
QString
&
folder
);
void
logsUploadUrlChanged
(
const
QString
&
url
);
private:
private:
std
::
shared_ptr
<
linphone
::
Config
>
mConfig
;
std
::
shared_ptr
<
linphone
::
Config
>
mConfig
;
...
...
ui/views/App/Main/MainWindow.qml
View file @
d84149ef
...
@@ -38,7 +38,6 @@ ApplicationWindow {
...
@@ -38,7 +38,6 @@ ApplicationWindow {
minimumHeight
:
MainWindowStyle
.
minimumHeight
minimumHeight
:
MainWindowStyle
.
minimumHeight
minimumWidth
:
MainWindowStyle
.
minimumWidth
minimumWidth
:
MainWindowStyle
.
minimumWidth
width
:
MainWindowStyle
.
width
title
:
MainWindowStyle
.
title
title
:
MainWindowStyle
.
title
...
...
ui/views/App/Settings/SettingsAdvanced.qml
View file @
d84149ef
...
@@ -32,10 +32,31 @@ TabContainer {
...
@@ -32,10 +32,31 @@ TabContainer {
}
}
}
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
logsUploadUrlLabel
'
)
TextField
{
text
:
SettingsModel
.
logsUploadUrl
onEditingFinished
:
SettingsModel
.
logsUploadUrl
=
text
}
}
}
FormEmptyLine
{}
}
TextButtonB
{
anchors.right
:
parent
.
right
text
:
qsTr
(
'
sendLogs
'
)
onClicked
:
CoreManager
.
sendLogs
()
}
}
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
// Internal feature
s.
// Internal setting
s.
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
// Nothing for the moment.
// Nothing for the moment.
...
...
ui/views/App/Settings/SettingsWindow.qml
View file @
d84149ef
...
@@ -12,8 +12,6 @@ import App.Styles 1.0
...
@@ -12,8 +12,6 @@ import App.Styles 1.0
ApplicationWindow
{
ApplicationWindow
{
id
:
window
id
:
window
height
:
SettingsWindowStyle
.
height
width
:
SettingsWindowStyle
.
width
minimumHeight
:
SettingsWindowStyle
.
height
minimumHeight
:
SettingsWindowStyle
.
height
minimumWidth
:
SettingsWindowStyle
.
width
minimumWidth
:
SettingsWindowStyle
.
width
...
...
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