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
df1df560
Commit
df1df560
authored
Mar 30, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Settings/SettingsSipAccounts): in progress
parent
c08e7749
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
245 additions
and
2 deletions
+245
-2
file.png
linphone-desktop/assets/images/file.png
+0
-0
en.ts
linphone-desktop/assets/languages/en.ts
+43
-0
fr.ts
linphone-desktop/assets/languages/fr.ts
+43
-0
resources.qrc
linphone-desktop/resources.qrc
+2
-0
AccountSettingsModel.cpp
...-desktop/src/components/settings/AccountSettingsModel.cpp
+5
-0
AccountSettingsModel.hpp
...-desktop/src/components/settings/AccountSettingsModel.hpp
+1
-0
SettingsSipAccounts.js
...hone-desktop/ui/views/App/Settings/SettingsSipAccounts.js
+25
-0
SettingsSipAccounts.qml
...one-desktop/ui/views/App/Settings/SettingsSipAccounts.qml
+7
-1
SettingsSipAccountsEdit.qml
...desktop/ui/views/App/Settings/SettingsSipAccountsEdit.qml
+117
-0
SettingsWindowStyle.qml
...ktop/ui/views/App/Styles/Settings/SettingsWindowStyle.qml
+1
-0
belle-sip
submodules/belle-sip
+1
-1
No files found.
linphone-desktop/assets/images/file.png
deleted
100644 → 0
View file @
c08e7749
596 Bytes
linphone-desktop/assets/languages/en.ts
View file @
df1df560
...
@@ -817,6 +817,49 @@ Server url not configured.</translation>
...
@@ -817,6 +817,49 @@ Server url not configured.</translation>
<
source
>
deleteHeader
<
/source
>
<
source
>
deleteHeader
<
/source
>
<
translation
>
Delete
<
/translation
>
<
translation
>
Delete
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
source
>
deleteAccountDescription
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
SettingsSipAccountsEdit
<
/name
>
<
message
>
<
source
>
sipAddressLabel
<
/source
>
<
translation
>
SIP
address
<
/translation
>
<
/message
>
<
message
>
<
source
>
transportLabel
<
/source
>
<
translation
>
Transport
<
/translation
>
<
/message
>
<
message
>
<
source
>
serverAddressLabel
<
/source
>
<
translation
>
SIP
Server
address
<
/translation
>
<
/message
>
<
message
>
<
source
>
registrationDurationLabel
<
/source
>
<
translation
>
Registration
duration
(
sec
)
<
/translation
>
<
/message
>
<
message
>
<
source
>
routeLabel
<
/source
>
<
translation
>
Route
<
/translation
>
<
/message
>
<
message
>
<
source
>
contactParamsLabel
<
/source
>
<
translation
>
Contact
params
<
/translation
>
<
/message
>
<
message
>
<
source
>
registerLabel
<
/source
>
<
translation
>
Register
<
/translation
>
<
/message
>
<
message
>
<
source
>
publishPresenceLabel
<
/source
>
<
translation
>
Publish
presence
information
<
/translation
>
<
/message
>
<
message
>
<
source
>
enableAvpfLabel
<
/source
>
<
translation
>
AVPF
regular
RTCP
interval
(
sec
)
<
/translation
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
SettingsUi
<
/name
>
<
name
>
SettingsUi
<
/name
>
...
...
linphone-desktop/assets/languages/fr.ts
View file @
df1df560
...
@@ -817,6 +817,49 @@ Url du serveur non configurée.</translation>
...
@@ -817,6 +817,49 @@ Url du serveur non configurée.</translation>
<
source
>
deleteHeader
<
/source
>
<
source
>
deleteHeader
<
/source
>
<
translation
>
Supprimer
<
/translation
>
<
translation
>
Supprimer
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
source
>
deleteAccountDescription
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
SettingsSipAccountsEdit
<
/name
>
<
message
>
<
source
>
sipAddressLabel
<
/source
>
<
translation
>
Adresse
SIP
<
/translation
>
<
/message
>
<
message
>
<
source
>
transportLabel
<
/source
>
<
translation
>
Transport
<
/translation
>
<
/message
>
<
message
>
<
source
>
serverAddressLabel
<
/source
>
<
translation
>
Adresse
serveur
SIP
<
/translation
>
<
/message
>
<
message
>
<
source
>
registrationDurationLabel
<
/source
>
<
translation
>
Dur
é
e
d
&
apos
;
enregistrement
<
/translation
>
<
/message
>
<
message
>
<
source
>
routeLabel
<
/source
>
<
translation
>
Route
<
/translation
>
<
/message
>
<
message
>
<
source
>
contactParamsLabel
<
/source
>
<
translation
>
Param
è
tres
de
contact
<
/translation
>
<
/message
>
<
message
>
<
source
>
registerLabel
<
/source
>
<
translation
>
S
&
apos
;
enregistrer
<
/translation
>
<
/message
>
<
message
>
<
source
>
publishPresenceLabel
<
/source
>
<
translation
>
Publier
la
pr
é
sence
<
/translation
>
<
/message
>
<
message
>
<
source
>
enableAvpfLabel
<
/source
>
<
translation
>
Activer
AVPF
<
/translation
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
SettingsUi
<
/name
>
<
name
>
SettingsUi
<
/name
>
...
...
linphone-desktop/resources.qrc
View file @
df1df560
...
@@ -340,6 +340,8 @@
...
@@ -340,6 +340,8 @@
<file>
ui/views/App/Settings/SettingsAudio.qml
</file>
<file>
ui/views/App/Settings/SettingsAudio.qml
</file>
<file>
ui/views/App/Settings/SettingsCallsChat.qml
</file>
<file>
ui/views/App/Settings/SettingsCallsChat.qml
</file>
<file>
ui/views/App/Settings/SettingsNetwork.qml
</file>
<file>
ui/views/App/Settings/SettingsNetwork.qml
</file>
<file>
ui/views/App/Settings/SettingsSipAccountsEdit.qml
</file>
<file>
ui/views/App/Settings/SettingsSipAccounts.js
</file>
<file>
ui/views/App/Settings/SettingsSipAccounts.qml
</file>
<file>
ui/views/App/Settings/SettingsSipAccounts.qml
</file>
<file>
ui/views/App/Settings/SettingsUi.qml
</file>
<file>
ui/views/App/Settings/SettingsUi.qml
</file>
<file>
ui/views/App/Settings/SettingsVideo.qml
</file>
<file>
ui/views/App/Settings/SettingsVideo.qml
</file>
...
...
linphone-desktop/src/components/settings/AccountSettingsModel.cpp
View file @
df1df560
...
@@ -34,6 +34,11 @@ void AccountSettingsModel::setDefaultProxyConfig (const shared_ptr<linphone::Pro
...
@@ -34,6 +34,11 @@ void AccountSettingsModel::setDefaultProxyConfig (const shared_ptr<linphone::Pro
emit
accountSettingsUpdated
();
emit
accountSettingsUpdated
();
}
}
void
AccountSettingsModel
::
removeProxyConfig
(
const
shared_ptr
<
linphone
::
ProxyConfig
>
&
proxy_config
)
{
CoreManager
::
getInstance
()
->
getCore
()
->
removeProxyConfig
(
proxy_config
);
emit
accountSettingsUpdated
();
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
QString
AccountSettingsModel
::
getUsername
()
const
{
QString
AccountSettingsModel
::
getUsername
()
const
{
...
...
linphone-desktop/src/components/settings/AccountSettingsModel.hpp
View file @
df1df560
...
@@ -44,6 +44,7 @@ public:
...
@@ -44,6 +44,7 @@ public:
AccountSettingsModel
(
QObject
*
parent
=
Q_NULLPTR
)
:
QObject
(
parent
)
{}
AccountSettingsModel
(
QObject
*
parent
=
Q_NULLPTR
)
:
QObject
(
parent
)
{}
Q_INVOKABLE
void
setDefaultProxyConfig
(
const
std
::
shared_ptr
<
linphone
::
ProxyConfig
>
&
proxy_config
);
Q_INVOKABLE
void
setDefaultProxyConfig
(
const
std
::
shared_ptr
<
linphone
::
ProxyConfig
>
&
proxy_config
);
Q_INVOKABLE
void
removeProxyConfig
(
const
std
::
shared_ptr
<
linphone
::
ProxyConfig
>
&
proxy_config
);
signals:
signals:
void
accountSettingsUpdated
();
void
accountSettingsUpdated
();
...
...
linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.js
0 → 100644
View file @
df1df560
// =============================================================================
// `SettingsSipAccounts.qml` Logic.
// =============================================================================
.
import
Linphone
1.0
as
Linphone
.
import
'
qrc:/ui/scripts/Utils/utils.js
'
as
Utils
// =============================================================================
function
editAccount
(
account
)
{
window
.
attachVirtualWindow
(
Qt
.
resolvedUrl
(
'
SettingsSipAccountsEdit.qml
'
),
{
account
:
account
})
}
function
deleteAccount
(
account
)
{
window
.
attachVirtualWindow
(
Utils
.
buildDialogUri
(
'
ConfirmDialog
'
),
{
descriptionText
:
qsTr
(
'
deleteAccountDescription
'
),
},
function
(
status
)
{
if
(
status
)
{
Linphone
.
AccountSettingsModel
.
removeProxyConfig
(
account
.
proxyConfig
)
}
})
}
linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml
View file @
df1df560
...
@@ -6,6 +6,8 @@ import Linphone 1.0
...
@@ -6,6 +6,8 @@ import Linphone 1.0
import
App
.
Styles
1.0
import
App
.
Styles
1.0
import
'
SettingsSipAccounts.js
'
as
Logic
// =============================================================================
// =============================================================================
TabContainer
{
TabContainer
{
...
@@ -66,7 +68,7 @@ TabContainer {
...
@@ -66,7 +68,7 @@ TabContainer {
width
:
parent
.
width
width
:
parent
.
width
FormTable
{
FormTable
{
legendLineWidth
:
280
legendLineWidth
:
SettingsWindowStyle
.
sipAccounts
.
legendLineWidth
titles
:
[
titles
:
[
qsTr
(
'
registerHeader
'
),
qsTr
(
'
registerHeader
'
),
...
@@ -88,6 +90,8 @@ TabContainer {
...
@@ -88,6 +90,8 @@ TabContainer {
ActionButton
{
ActionButton
{
icon
:
'
edit
'
icon
:
'
edit
'
iconSize
:
SettingsWindowStyle
.
sipAccounts
.
iconSize
iconSize
:
SettingsWindowStyle
.
sipAccounts
.
iconSize
onClicked
:
Logic
.
editAccount
(
modelData
)
}
}
}
}
...
@@ -95,6 +99,8 @@ TabContainer {
...
@@ -95,6 +99,8 @@ TabContainer {
ActionButton
{
ActionButton
{
icon
:
'
delete
'
icon
:
'
delete
'
iconSize
:
SettingsWindowStyle
.
sipAccounts
.
iconSize
iconSize
:
SettingsWindowStyle
.
sipAccounts
.
iconSize
onClicked
:
Logic
.
deleteAccount
(
modelData
)
}
}
}
}
}
}
...
...
linphone-desktop/ui/views/App/Settings/SettingsSipAccountsEdit.qml
0 → 100644
View file @
df1df560
import
QtQuick
2.7
import
Common
1.0
import
Linphone
1.0
import
Utils
1.0
import
App
.
Styles
1.0
// =============================================================================
ConfirmDialog
{
property
var
account
height
:
500
width
:
600
// ---------------------------------------------------------------------------
Form
{
anchors
{
left
:
parent
.
left
leftMargin
:
ManageAccountsStyle
.
leftMargin
right
:
parent
.
right
rightMargin
:
ManageAccountsStyle
.
rightMargin
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
sipAddressLabel
'
)
+
'
*
'
TextField
{
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
serverAddressLabel
'
)
+
'
*
'
TextField
{
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
registrationDurationLabel
'
)
+
'
*
'
TextField
{
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
transportLabel
'
)
+
'
*
'
ComboBox
{
model
:
[
'
TCP
'
,
'
UDP
'
,
'
TLS
'
]
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
routeLabel
'
)
TextField
{
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
contactParamsLabel
'
)
TextField
{
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
registerLabel
'
)
Switch
{
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
publishPresenceLabel
'
)
Switch
{
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
enableAvpfLabel
'
)
Switch
{
}
}
}
}
}
linphone-desktop/ui/views/App/Styles/Settings/SettingsWindowStyle.qml
View file @
df1df560
...
@@ -20,5 +20,6 @@ QtObject {
...
@@ -20,5 +20,6 @@ QtObject {
property
QtObject
sipAccounts
:
QtObject
{
property
QtObject
sipAccounts
:
QtObject
{
property
int
buttonsSpacing
:
8
property
int
buttonsSpacing
:
8
property
int
iconSize
:
20
property
int
iconSize
:
20
property
int
legendLineWidth
:
280
}
}
}
}
belle-sip
@
114b5be3
Subproject commit
86673fbeadb2979540df3c929857faf037fdf39
c
Subproject commit
114b5be32a5b63ea68c8cf791230280981d2ec4
c
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