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
a19bc4f3
Commit
a19bc4f3
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
c0673e5e
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
136 additions
and
4 deletions
+136
-4
en.ts
linphone-desktop/assets/languages/en.ts
+28
-0
fr.ts
linphone-desktop/assets/languages/fr.ts
+28
-0
resources.qrc
linphone-desktop/resources.qrc
+0
-1
FormTable.qml
...e-desktop/ui/modules/Common/Form/Placements/FormTable.qml
+7
-1
FormTableLine.qml
...sktop/ui/modules/Common/Form/Placements/FormTableLine.qml
+5
-1
IncallFullscreenWindow.qml
...one-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml
+1
-1
SettingsSipAccounts.qml
...one-desktop/ui/views/App/Settings/SettingsSipAccounts.qml
+62
-0
SettingsWindowStyle.qml
...ktop/ui/views/App/Styles/Settings/SettingsWindowStyle.qml
+5
-0
No files found.
linphone-desktop/assets/languages/en.ts
View file @
a19bc4f3
...
@@ -789,6 +789,34 @@ Server url not configured.</translation>
...
@@ -789,6 +789,34 @@ Server url not configured.</translation>
<
source
>
defaultSipAddressLabel
<
/source
>
<
source
>
defaultSipAddressLabel
<
/source
>
<
translation
>
SIP
address
<
/translation
>
<
translation
>
SIP
address
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
source
>
proxyAccountsTitle
<
/source
>
<
translation
>
Proxy
accounts
<
/translation
>
<
/message
>
<
message
>
<
source
><
/source
>
<
translation
><
/translation
>
<
/message
>
<
message
>
<
source
>
registerHeader
<
/source
>
<
translation
>
Register
<
/translation
>
<
/message
>
<
message
>
<
source
>
eraseAllPasswords
<
/source
>
<
translation
>
ERASE
PASSWORDS
<
/translation
>
<
/message
>
<
message
>
<
source
>
addAccount
<
/source
>
<
translation
>
ADD
ACCOUNT
<
/translation
>
<
/message
>
<
message
>
<
source
>
editionHeader
<
/source
>
<
translation
>
Edit
<
/translation
>
<
/message
>
<
message
>
<
source
>
deleteHeader
<
/source
>
<
translation
>
Delete
<
/translation
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
SettingsUi
<
/name
>
<
name
>
SettingsUi
<
/name
>
...
...
linphone-desktop/assets/languages/fr.ts
View file @
a19bc4f3
...
@@ -789,6 +789,34 @@ Url du serveur non configurée.</translation>
...
@@ -789,6 +789,34 @@ Url du serveur non configurée.</translation>
<
source
>
defaultSipAddressLabel
<
/source
>
<
source
>
defaultSipAddressLabel
<
/source
>
<
translation
>
Adresse
SIP
<
/translation
>
<
translation
>
Adresse
SIP
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
source
>
proxyAccountsTitle
<
/source
>
<
translation
>
Comptes
SIP
<
/translation
>
<
/message
>
<
message
>
<
source
><
/source
>
<
translation
><
/translation
>
<
/message
>
<
message
>
<
source
>
registerHeader
<
/source
>
<
translation
>
S
&
apos
;
enregistrer
<
/translation
>
<
/message
>
<
message
>
<
source
>
eraseAllPasswords
<
/source
>
<
translation
>
EFFACER
MOTS
DE
PASSE
<
/translation
>
<
/message
>
<
message
>
<
source
>
addAccount
<
/source
>
<
translation
>
AJOUTER
COMPTE
<
/translation
>
<
/message
>
<
message
>
<
source
>
editionHeader
<
/source
>
<
translation
>
É
diter
<
/translation
>
<
/message
>
<
message
>
<
source
>
deleteHeader
<
/source
>
<
translation
>
Supprimer
<
/translation
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
SettingsUi
<
/name
>
<
name
>
SettingsUi
<
/name
>
...
...
linphone-desktop/resources.qrc
View file @
a19bc4f3
...
@@ -69,7 +69,6 @@
...
@@ -69,7 +69,6 @@
<file>
assets/images/edit_normal.svg
</file>
<file>
assets/images/edit_normal.svg
</file>
<file>
assets/images/edit_pressed.svg
</file>
<file>
assets/images/edit_pressed.svg
</file>
<file>
assets/images/ended_call.svg
</file>
<file>
assets/images/ended_call.svg
</file>
<file>
assets/images/file.png
</file>
<file>
assets/images/file_sign.svg
</file>
<file>
assets/images/file_sign.svg
</file>
<file>
assets/images/filter.svg
</file>
<file>
assets/images/filter.svg
</file>
<file>
assets/images/fullscreen_hovered.svg
</file>
<file>
assets/images/fullscreen_hovered.svg
</file>
...
...
linphone-desktop/ui/modules/Common/Form/Placements/FormTable.qml
View file @
a19bc4f3
...
@@ -8,6 +8,10 @@ Column {
...
@@ -8,6 +8,10 @@ Column {
id
:
formTable
id
:
formTable
property
alias
titles
:
header
.
model
property
alias
titles
:
header
.
model
property
bool
disableLineTitle
:
false
property
int
legendLineWidth
:
FormTableStyle
.
entry
.
width
readonly
property
double
maxItemWidth
:
{
readonly
property
double
maxItemWidth
:
{
var
n
=
titles
.
length
var
n
=
titles
.
length
var
curWidth
=
(
width
-
FormTableStyle
.
entry
.
width
)
/
n
-
(
n
-
1
)
*
FormTableLineStyle
.
spacing
var
curWidth
=
(
width
-
FormTableStyle
.
entry
.
width
)
/
n
-
(
n
-
1
)
*
FormTableLineStyle
.
spacing
...
@@ -30,7 +34,9 @@ Column {
...
@@ -30,7 +34,9 @@ Column {
// No title for the titles column.
// No title for the titles column.
Item
{
Item
{
height
:
FormTableStyle
.
entry
.
height
height
:
FormTableStyle
.
entry
.
height
width
:
FormTableStyle
.
entry
.
width
width
:
formTable
.
legendLineWidth
visible
:
!
formTable
.
disableLineTitle
}
}
Repeater
{
Repeater
{
...
...
linphone-desktop/ui/modules/Common/Form/Placements/FormTableLine.qml
View file @
a19bc4f3
...
@@ -6,6 +6,8 @@ import Common.Styles 1.0
...
@@ -6,6 +6,8 @@ import Common.Styles 1.0
// =============================================================================
// =============================================================================
Row
{
Row
{
id
:
formTableLine
property
alias
title
:
title
.
text
property
alias
title
:
title
.
text
readonly
property
double
maxItemWidth
:
parent
.
maxItemWidth
readonly
property
double
maxItemWidth
:
parent
.
maxItemWidth
...
@@ -26,11 +28,13 @@ Row {
...
@@ -26,11 +28,13 @@ Row {
verticalAlignment
:
Text
.
AlignVCenter
verticalAlignment
:
Text
.
AlignVCenter
height
:
FormTableStyle
.
entry
.
height
height
:
FormTableStyle
.
entry
.
height
width
:
FormTableStyle
.
entry
.
w
idth
width
:
formTableLine
.
parent
.
legendLineW
idth
font
{
font
{
bold
:
false
bold
:
false
pointSize
:
FormTableStyle
.
entry
.
text
.
fontSize
pointSize
:
FormTableStyle
.
entry
.
text
.
fontSize
}
}
visible
:
!
formTableLine
.
parent
.
disableLineTitle
}
}
}
}
linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml
View file @
a19bc4f3
...
@@ -39,7 +39,7 @@ Window {
...
@@ -39,7 +39,7 @@ Window {
Shortcut
{
Shortcut
{
sequence
:
StandardKey
.
Close
sequence
:
StandardKey
.
Close
onActivated
:
window
.
hide
()
onActivated
:
_exit
()
}
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
...
...
linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml
View file @
a19bc4f3
import
QtQuick
2.7
import
QtQuick
2.7
import
QtQuick
.
Layouts
1.3
import
Common
1.0
import
Common
1.0
import
Linphone
1.0
import
Linphone
1.0
...
@@ -55,5 +56,66 @@ TabContainer {
...
@@ -55,5 +56,66 @@ TabContainer {
}
}
}
}
}
}
// -------------------------------------------------------------------------
// Proxy accounts.
// -------------------------------------------------------------------------
Form
{
title
:
qsTr
(
'
proxyAccountsTitle
'
)
width
:
parent
.
width
FormTable
{
legendLineWidth
:
280
titles
:
[
qsTr
(
'
registerHeader
'
),
qsTr
(
'
editionHeader
'
),
qsTr
(
'
deleteHeader
'
)
]
Repeater
{
model
:
AccountSettingsModel
.
accounts
delegate
:
FormTableLine
{
title
:
modelData
.
sipAddress
FormTableEntry
{
Switch
{}
}
FormTableEntry
{
ActionButton
{
icon
:
'
edit
'
iconSize
:
SettingsWindowStyle
.
sipAccounts
.
iconSize
}
}
FormTableEntry
{
ActionButton
{
icon
:
'
delete
'
iconSize
:
SettingsWindowStyle
.
sipAccounts
.
iconSize
}
}
}
}
}
FormEmptyLine
{}
}
Row
{
anchors.right
:
parent
.
right
spacing
:
SettingsWindowStyle
.
sipAccounts
.
buttonsSpacing
TextButtonB
{
text
:
qsTr
(
'
eraseAllPasswords
'
)
}
TextButtonB
{
text
:
qsTr
(
'
addAccount
'
)
}
}
}
}
}
}
linphone-desktop/ui/views/App/Styles/Settings/SettingsWindowStyle.qml
View file @
a19bc4f3
...
@@ -16,4 +16,9 @@ QtObject {
...
@@ -16,4 +16,9 @@ QtObject {
property
int
rightMargin
:
30
property
int
rightMargin
:
30
property
int
topMargin
:
30
property
int
topMargin
:
30
}
}
property
QtObject
sipAccounts
:
QtObject
{
property
int
buttonsSpacing
:
8
property
int
iconSize
:
20
}
}
}
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