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
eafc4be0
Commit
eafc4be0
authored
Mar 07, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Assistant/AssistantCreateLinphoneSipAccount): view done
parent
9a3aa8e3
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
240 additions
and
70 deletions
+240
-70
en.ts
linphone-desktop/assets/languages/en.ts
+23
-4
fr.ts
linphone-desktop/assets/languages/fr.ts
+23
-4
resources.qrc
linphone-desktop/resources.qrc
+2
-0
AssistantAbstractView.qml
...-desktop/ui/views/App/Assistant/AssistantAbstractView.qml
+57
-1
AssistantCreateLinphoneSipAccount.qml
...views/App/Assistant/AssistantCreateLinphoneSipAccount.qml
+30
-0
AssistantFetchRemoteConfiguration.qml
...views/App/Assistant/AssistantFetchRemoteConfiguration.qml
+4
-1
AssistantHome.qml
linphone-desktop/ui/views/App/Assistant/AssistantHome.qml
+2
-2
AssistantUseOtherSipAccount.qml
...op/ui/views/App/Assistant/AssistantUseOtherSipAccount.qml
+47
-44
AssistantAbstractViewStyle.qml
...views/App/Styles/Assistant/AssistantAbstractViewStyle.qml
+22
-0
AssistantCreateLinphoneSipAccountStyle.qml
...yles/Assistant/AssistantCreateLinphoneSipAccountStyle.qml
+15
-0
qmldir
linphone-desktop/ui/views/App/Styles/qmldir
+15
-14
No files found.
linphone-desktop/assets/languages/en.ts
View file @
eafc4be0
...
...
@@ -35,6 +35,25 @@
<
translation
>
BACK
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
AssistantCreateLinphoneSipAccount
<
/name
>
<
message
>
<
source
>
createLinphoneSipAccountDescription
<
/source
>
<
translation
>
How
would
you
like
to
create
your
account
?
<
/translation
>
<
/message
>
<
message
>
<
source
>
createLinphoneSipAccountTitle
<
/source
>
<
translation
>
CREATE
A
LINPHONE
ACCOUNT
<
/translation
>
<
/message
>
<
message
>
<
source
>
withPhoneNumber
<
/source
>
<
translation
>
WITH
A
PHONE
NUMBER
<
/translation
>
<
/message
>
<
message
>
<
source
>
withEmailAddress
<
/source
>
<
translation
>
WITH
AN
EMAIL
ADDRESS
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
AssistantFetchRemoteConfiguration
<
/name
>
<
message
>
...
...
@@ -52,10 +71,6 @@
<
/context
>
<
context
>
<
name
>
AssistantHome
<
/name
>
<
message
>
<
source
>
createSipAccount
<
/source
>
<
translation
>
CREATE
A
LINPHONE
ACCOUNT
<
/translation
>
<
/message
>
<
message
>
<
source
>
useLinphoneSipAccount
<
/source
>
<
translation
>
USE
A
LINPHONE
ACCOUNT
<
/translation
>
...
...
@@ -76,6 +91,10 @@
<
source
>
homeDescription
<
/source
>
<
translation
>
This
assistant
will
help
you
to
configure
and
use
your
linphone
account
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
createLinphoneSipAccount
<
/source
>
<
translation
>
CREATE
A
LINPHONE
ACCOUNT
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
AssistantUseOtherSipAccount
<
/name
>
...
...
linphone-desktop/assets/languages/fr.ts
View file @
eafc4be0
...
...
@@ -35,6 +35,25 @@
<
translation
>
RETOUR
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
AssistantCreateLinphoneSipAccount
<
/name
>
<
message
>
<
source
>
createLinphoneSipAccountDescription
<
/source
>
<
translation
>
Comment
souhaitez
-
vous
cr
é
er
votre
compte
?
<
/translation
>
<
/message
>
<
message
>
<
source
>
createLinphoneSipAccountTitle
<
/source
>
<
translation
>
CR
É
ER
UN
COMPTE
LINPHONE
<
/translation
>
<
/message
>
<
message
>
<
source
>
withPhoneNumber
<
/source
>
<
translation
>
AVEC
UN
NUM
É
RO
DE
T
É
L
É
PHONE
<
/translation
>
<
/message
>
<
message
>
<
source
>
withEmailAddress
<
/source
>
<
translation
>
AVER
UNE
ADRESSE
E
-
MAIL
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
AssistantFetchRemoteConfiguration
<
/name
>
<
message
>
...
...
@@ -52,10 +71,6 @@
<
/context
>
<
context
>
<
name
>
AssistantHome
<
/name
>
<
message
>
<
source
>
createSipAccount
<
/source
>
<
translation
>
CR
É
ER
UN
COMPTE
LINPHONE
<
/translation
>
<
/message
>
<
message
>
<
source
>
useLinphoneSipAccount
<
/source
>
<
translation
>
UTILISER
UN
COMPTE
LINPHONE
<
/translation
>
...
...
@@ -76,6 +91,10 @@
<
source
>
homeDescription
<
/source
>
<
translation
>
Cet
assistant
va
vous
aider
à
configurer
et
utiliser
votre
compte
SIP
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
createLinphoneSipAccount
<
/source
>
<
translation
>
CR
É
ER
UN
COMPTE
LINPHONE
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
AssistantUseOtherSipAccount
<
/name
>
...
...
linphone-desktop/resources.qrc
View file @
eafc4be0
...
...
@@ -310,6 +310,7 @@
<file>
ui/scripts/Utils/uri-tools.js
</file>
<file>
ui/scripts/Utils/utils.js
</file>
<file>
ui/views/App/Assistant/AssistantAbstractView.qml
</file>
<file>
ui/views/App/Assistant/AssistantCreateLinphoneSipAccount.qml
</file>
<file>
ui/views/App/Assistant/AssistantFetchRemoteConfiguration.qml
</file>
<file>
ui/views/App/Assistant/AssistantHome.qml
</file>
<file>
ui/views/App/Assistant/AssistantUseOtherSipAccount.qml
</file>
...
...
@@ -337,6 +338,7 @@
<file>
ui/views/App/Settings/SettingsVideo.qml
</file>
<file>
ui/views/App/Settings/SettingsWindow.qml
</file>
<file>
ui/views/App/Styles/Assistant/AssistantAbstractViewStyle.qml
</file>
<file>
ui/views/App/Styles/Assistant/AssistantCreateLinphoneSipAccountStyle.qml
</file>
<file>
ui/views/App/Styles/Assistant/AssistantHomeStyle.qml
</file>
<file>
ui/views/App/Styles/AssistantWindowStyle.qml
</file>
<file>
ui/views/App/Styles/Calls/CallStyle.qml
</file>
...
...
linphone-desktop/ui/views/App/Assistant/AssistantAbstractView.qml
View file @
eafc4be0
...
...
@@ -16,17 +16,71 @@ ColumnLayout {
property
alias
mainActionLabel
:
mainActionButton
.
text
property
var
mainAction
property
alias
description
:
description
.
text
property
alias
title
:
title
.
text
default
property
alias
_content
:
content
.
data
// ---------------------------------------------------------------------------
height
:
stack
.
height
width
:
stack
.
width
spacing
:
AssistantAbstractViewStyle
.
spacing
// --------------------------------------------------------------------------
// Info.
// --------------------------------------------------------------------------
Column
{
Layout.fillWidth
:
true
spacing
:
AssistantAbstractViewStyle
.
info
.
spacing
Text
{
id
:
title
color
:
AssistantAbstractViewStyle
.
info
.
title
.
color
elide
:
Text
.
ElideRight
font
{
pointSize
:
AssistantAbstractViewStyle
.
info
.
title
.
fontSize
bold
:
true
}
horizontalAlignment
:
Text
.
AlignHCenter
width
:
parent
.
width
}
Text
{
id
:
description
color
:
AssistantAbstractViewStyle
.
info
.
description
.
color
elide
:
Text
.
ElideRight
font.pointSize
:
AssistantAbstractViewStyle
.
info
.
description
.
fontSize
horizontalAlignment
:
Text
.
AlignHCenter
visible
:
text
.
length
>
0
width
:
parent
.
width
}
}
// --------------------------------------------------------------------------
// Content.
// --------------------------------------------------------------------------
Item
{
id
:
content
Layout.alignment
:
Qt
.
AlignHCenter
Layout.fillHeight
:
true
Layout.
fillWidth
:
true
Layout.
preferredWidth
:
AssistantAbstractViewStyle
.
content
.
width
}
// --------------------------------------------------------------------------
// Nav buttons.
// --------------------------------------------------------------------------
Row
{
Layout.alignment
:
Qt
.
AlignHCenter
spacing
:
AssistantAbstractViewStyle
.
buttons
.
spacing
...
...
@@ -39,6 +93,8 @@ ColumnLayout {
TextButtonB
{
id
:
mainActionButton
visible
:
!!
view
.
mainAction
onClicked
:
view
.
mainAction
()
}
}
...
...
linphone-desktop/ui/views/App/Assistant/AssistantCreateLinphoneSipAccount.qml
0 → 100644
View file @
eafc4be0
import
QtQuick
2.7
import
Common
1.0
import
App
.
Styles
1.0
// =============================================================================
AssistantAbstractView
{
description
:
qsTr
(
'
createLinphoneSipAccountDescription
'
)
title
:
qsTr
(
'
createLinphoneSipAccountTitle
'
)
Column
{
anchors.centerIn
:
parent
spacing
:
AssistantCreateLinphoneSipAccountStyle
.
buttons
.
spacing
width
:
AssistantCreateLinphoneSipAccountStyle
.
buttons
.
button
.
width
TextButtonA
{
height
:
AssistantCreateLinphoneSipAccountStyle
.
buttons
.
button
.
height
width
:
parent
.
width
text
:
qsTr
(
'
withPhoneNumber
'
)
}
TextButtonA
{
height
:
AssistantCreateLinphoneSipAccountStyle
.
buttons
.
button
.
height
width
:
parent
.
width
text
:
qsTr
(
'
withEmailAddress
'
)
}
}
}
linphone-desktop/ui/views/App/Assistant/AssistantFetchRemoteConfiguration.qml
View file @
eafc4be0
...
...
@@ -10,10 +10,13 @@ AssistantAbstractView {
mainActionEnabled
:
url
.
text
.
length
>
0
mainActionLabel
:
qsTr
(
'
confirmAction
'
)
title
:
qsTr
(
'
fetchRemoteConfigurationTitle
'
)
// ---------------------------------------------------------------------------
Form
{
anchors.fill
:
parent
orientation
:
Qt
.
Vertical
title
:
qsTr
(
'
fetchRemoteConfigurationTitle
'
)
FormLine
{
FormGroup
{
...
...
linphone-desktop/ui/views/App/Assistant/AssistantHome.qml
View file @
eafc4be0
...
...
@@ -82,8 +82,8 @@ ColumnLayout {
model
:
ListModel
{
ListElement
{
$text
:
qsTr
(
'
createSipAccount
'
)
$view
:
'
AssistantCreateSipAccount
'
$text
:
qsTr
(
'
create
Linphone
SipAccount
'
)
$view
:
'
AssistantCreate
Linphone
SipAccount
'
}
ListElement
{
...
...
linphone-desktop/ui/views/App/Assistant/AssistantUseOtherSipAccount.qml
View file @
eafc4be0
...
...
@@ -8,62 +8,65 @@ AssistantAbstractView {
})
mainActionEnabled
:
username
.
text
.
length
&&
sipDomain
.
text
.
length
&&
password
.
text
.
length
sipDomain
.
text
.
length
&&
password
.
text
.
length
mainActionLabel
:
qsTr
(
'
confirmAction
'
)
title
:
qsTr
(
'
useOtherSipAccountTitle
'
)
// ---------------------------------------------------------------------------
Form
{
anchors.fill
:
parent
orientation
:
Qt
.
Vertical
title
:
qsTr
(
'
useOtherSipAccountTitle
'
)
FormLine
{
FormGroup
{
label
:
qsTr
(
'
usernameLabel
'
)
TextField
{
TextField
{
id
:
username
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
displayNameLabel
'
)
TextField
{}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
sipDomainLabel
'
)
TextField
{
id
:
sipDomain
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
passwordLabel
'
)
TextField
{
id
:
password
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
transportLabel
'
)
ExclusiveButtons
{
texts
:
[
'
UDP
'
,
'
TCP
'
,
'
TLS
'
]
}
}
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
displayNameLabel
'
)
TextField
{}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
sipDomainLabel
'
)
TextField
{
id
:
sipDomain
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
passwordLabel
'
)
TextField
{
id
:
password
}
}
}
FormLine
{
FormGroup
{
label
:
qsTr
(
'
transportLabel
'
)
ExclusiveButtons
{
texts
:
[
'
UDP
'
,
'
TCP
'
,
'
TLS
'
]
}
}
}
}
}
linphone-desktop/ui/views/App/Styles/Assistant/AssistantAbstractViewStyle.qml
View file @
eafc4be0
pragma
Singleton
import
QtQuick
2.7
import
Common
1.0
// =============================================================================
QtObject
{
property
int
spacing
:
20
property
QtObject
buttons
:
QtObject
{
property
int
spacing
:
10
}
property
QtObject
content
:
QtObject
{
property
int
width
:
340
}
property
QtObject
info
:
QtObject
{
property
int
spacing
:
20
property
QtObject
description
:
QtObject
{
property
color
color
:
Colors
.
g
property
int
fontSize
:
10
}
property
QtObject
title
:
QtObject
{
property
color
color
:
Colors
.
g
property
int
fontSize
:
11
}
}
}
linphone-desktop/ui/views/App/Styles/Assistant/AssistantCreateLinphoneSipAccountStyle.qml
0 → 100644
View file @
eafc4be0
pragma
Singleton
import
QtQuick
2.7
// =============================================================================
QtObject
{
property
QtObject
buttons
:
QtObject
{
property
int
spacing
:
10
property
QtObject
button
:
QtObject
{
property
int
height
:
40
property
int
width
:
258
}
}
}
linphone-desktop/ui/views/App/Styles/qmldir
View file @
eafc4be0
...
...
@@ -4,21 +4,22 @@ module App.Styles
# Views styles -----------------------------------------------------------------
singleton AssistantWindowStyle 1.0 AssistantWindowStyle.qml
singleton InviteFriendsWindowStyle 1.0 InviteFriendsWindowStyle.qml
singleton ManageAccountsWindowStyle 1.0 ManageAccountsWindowStyle.qml
singleton AssistantWindowStyle
1.0 AssistantWindowStyle.qml
singleton InviteFriendsWindowStyle
1.0 InviteFriendsWindowStyle.qml
singleton ManageAccountsWindowStyle
1.0 ManageAccountsWindowStyle.qml
singleton AssistantHomeStyle 1.0 Assistant/AssistantHomeStyle.qml
singleton AssistantAbstractViewStyle 1.0 Assistant/AssistantAbstractViewStyle.qml
singleton AssistantHomeStyle 1.0 Assistant/AssistantHomeStyle.qml
singleton AssistantAbstractViewStyle 1.0 Assistant/AssistantAbstractViewStyle.qml
singleton AssistantCreateLinphoneSipAccountStyle 1.0 Assistant/AssistantCreateLinphoneSipAccountStyle.qml
singleton CallStyle 1.0 Calls/CallStyle.qml
singleton CallsWindowStyle 1.0 Calls/CallsWindowStyle.qml
singleton CallStyle
1.0 Calls/CallStyle.qml
singleton CallsWindowStyle
1.0 Calls/CallsWindowStyle.qml
singleton ContactEditStyle 1.0 Main/ContactEditStyle.qml
singleton ContactsStyle 1.0 Main/ContactsStyle.qml
singleton ConversationStyle 1.0 Main/ConversationStyle.qml
singleton HomeStyle 1.0 Main/HomeStyle.qml
singleton MainWindowMenuBarStyle 1.0 Main/MainWindowMenuBarStyle.qml
singleton MainWindowStyle 1.0 Main/MainWindowStyle.qml
singleton ContactEditStyle
1.0 Main/ContactEditStyle.qml
singleton ContactsStyle
1.0 Main/ContactsStyle.qml
singleton ConversationStyle
1.0 Main/ConversationStyle.qml
singleton HomeStyle
1.0 Main/HomeStyle.qml
singleton MainWindowMenuBarStyle
1.0 Main/MainWindowMenuBarStyle.qml
singleton MainWindowStyle
1.0 Main/MainWindowStyle.qml
singleton SettingsWindowStyle 1.0 Settings/SettingsWindowStyle.qml
singleton SettingsWindowStyle
1.0 Settings/SettingsWindowStyle.qml
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