Commit 546d9761 authored by Ronan Abhamon's avatar Ronan Abhamon

fix(ui/views/App/Main/Assistant): refactoring

parent 419017bc
......@@ -35,90 +35,6 @@
<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>AssistantCreateLinphoneSipAccountWithEmail</name>
<message>
<source>createLinphoneSipAccountTitle</source>
<translation>CREATE A LINPHONE ACCOUNT</translation>
</message>
<message>
<source>confirmAction</source>
<translation>CREATE</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Username</translation>
</message>
<message>
<source>emailLabel</source>
<translation>Email</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Password</translation>
</message>
<message>
<source>passwordConfirmationLabel</source>
<translation>Password confirmation</translation>
</message>
<message>
<source>passwordConfirmationError</source>
<translation>The passwords you entered do not match.</translation>
</message>
</context>
<context>
<name>AssistantCreateLinphoneSipAccountWithPhoneNumber</name>
<message>
<source>createLinphoneSipAccountTitle</source>
<translation>CREATE A LINPHONE ACCOUNT</translation>
</message>
<message>
<source>countryLabel</source>
<translation>Your country</translation>
</message>
<message>
<source>phoneNumberLabel</source>
<translation>Phone number</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Username</translation>
</message>
</context>
<context>
<name>AssistantFetchRemoteConfiguration</name>
<message>
<source>fetchRemoteConfigurationTitle</source>
<translation>FETCH REMOTE CONFIGURATION</translation>
</message>
<message>
<source>urlLabel</source>
<translation>URL</translation>
</message>
<message>
<source>confirmAction</source>
<translation>DOWNLOAD</translation>
</message>
</context>
<context>
<name>AssistantHome</name>
<message>
......@@ -205,74 +121,6 @@
<translation>Account already exists.</translation>
</message>
</context>
<context>
<name>AssistantUseLinphoneSipAccount</name>
<message>
<source>confirmAction</source>
<translation>LOGIN</translation>
</message>
<message>
<source>useLinphoneSipAccountTitle</source>
<translation>USE A LINPHONE ACCOUNT</translation>
</message>
<message>
<source>useUsernameToLogin</source>
<translation>Use username and password rather than your phone number.</translation>
</message>
</context>
<context>
<name>AssistantUseLinphoneSipAccountWithPhoneNumber</name>
<message>
<source>countryLabel</source>
<translation>Your country</translation>
</message>
<message>
<source>phoneNumberLabel</source>
<translation>Phone number</translation>
</message>
</context>
<context>
<name>AssistantUseLinphoneSipAccountWithUsername</name>
<message>
<source>usernameLabel</source>
<translation>Username</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Password</translation>
</message>
</context>
<context>
<name>AssistantUseOtherSipAccount</name>
<message>
<source>confirmAction</source>
<translation>LOGIN</translation>
</message>
<message>
<source>useOtherSipAccountTitle</source>
<translation>USE A SIP ACCOUNT</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Username</translation>
</message>
<message>
<source>displayNameLabel</source>
<translation>Display name (optional)</translation>
</message>
<message>
<source>sipDomainLabel</source>
<translation>SIP Domain</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Password</translation>
</message>
<message>
<source>transportLabel</source>
<translation>Transport</translation>
</message>
</context>
<context>
<name>Calls</name>
<message>
......@@ -478,6 +326,75 @@ Server url not configured.</translation>
<translation>Are you sure you want to clean history?</translation>
</message>
</context>
<context>
<name>CreateLinphoneSipAccount</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>CreateLinphoneSipAccountWithEmail</name>
<message>
<source>createLinphoneSipAccountTitle</source>
<translation>CREATE A LINPHONE ACCOUNT</translation>
</message>
<message>
<source>confirmAction</source>
<translation>CREATE</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Username</translation>
</message>
<message>
<source>emailLabel</source>
<translation>Email</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Password</translation>
</message>
<message>
<source>passwordConfirmationLabel</source>
<translation>Password confirmation</translation>
</message>
<message>
<source>passwordConfirmationError</source>
<translation>The passwords you entered do not match.</translation>
</message>
</context>
<context>
<name>CreateLinphoneSipAccountWithPhoneNumber</name>
<message>
<source>createLinphoneSipAccountTitle</source>
<translation>CREATE A LINPHONE ACCOUNT</translation>
</message>
<message>
<source>countryLabel</source>
<translation>Your country</translation>
</message>
<message>
<source>phoneNumberLabel</source>
<translation>Phone number</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Username</translation>
</message>
</context>
<context>
<name>DroppableTextArea</name>
<message>
......@@ -524,6 +441,21 @@ Server url not configured.</translation>
<translation>Missed outgoing call</translation>
</message>
</context>
<context>
<name>FetchRemoteConfiguration</name>
<message>
<source>confirmAction</source>
<translation>FETCH</translation>
</message>
<message>
<source>fetchRemoteConfigurationTitle</source>
<translation>FETCH REMOTE CONFIGURATION</translation>
</message>
<message>
<source>urlLabel</source>
<translation>URL</translation>
</message>
</context>
<context>
<name>FileMessage</name>
<message>
......@@ -1106,4 +1038,72 @@ Server url not configured.</translation>
<translation>Previously</translation>
</message>
</context>
<context>
<name>UseLinphoneSipAccount</name>
<message>
<source>confirmAction</source>
<translation>USE</translation>
</message>
<message>
<source>useLinphoneSipAccountTitle</source>
<translation>USE A LINPHONE ACCOUNT</translation>
</message>
<message>
<source>useUsernameToLogin</source>
<translation>Use username and password rather than your phone number.</translation>
</message>
</context>
<context>
<name>UseLinphoneSipAccountWithPhoneNumber</name>
<message>
<source>countryLabel</source>
<translation>Your country</translation>
</message>
<message>
<source>phoneNumberLabel</source>
<translation>Phone number</translation>
</message>
</context>
<context>
<name>UseLinphoneSipAccountWithUsername</name>
<message>
<source>usernameLabel</source>
<translation>Username</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Password</translation>
</message>
</context>
<context>
<name>UseOtherSipAccount</name>
<message>
<source>confirmAction</source>
<translation>USE</translation>
</message>
<message>
<source>useOtherSipAccountTitle</source>
<translation>USE A SIP ACCOUNT</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Username</translation>
</message>
<message>
<source>displayNameLabel</source>
<translation>Display name (optional)</translation>
</message>
<message>
<source>sipDomainLabel</source>
<translation>SIP Domain</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Password</translation>
</message>
<message>
<source>transportLabel</source>
<translation>Transport</translation>
</message>
</context>
</TS>
......@@ -35,90 +35,6 @@
<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>AssistantCreateLinphoneSipAccountWithEmail</name>
<message>
<source>createLinphoneSipAccountTitle</source>
<translation>CRÉER UN COMPTE LINPHONE</translation>
</message>
<message>
<source>confirmAction</source>
<translation>CRÉER</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Nom d&apos;utilisateur</translation>
</message>
<message>
<source>emailLabel</source>
<translation>E-mail</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Mot de passe</translation>
</message>
<message>
<source>passwordConfirmationLabel</source>
<translation>Confirmation du mot de passe</translation>
</message>
<message>
<source>passwordConfirmationError</source>
<translation>Les mots de passe ne correspondent pas.</translation>
</message>
</context>
<context>
<name>AssistantCreateLinphoneSipAccountWithPhoneNumber</name>
<message>
<source>createLinphoneSipAccountTitle</source>
<translation>CRÉER UN COMPTE LINPHONE</translation>
</message>
<message>
<source>countryLabel</source>
<translation>Votre pays</translation>
</message>
<message>
<source>phoneNumberLabel</source>
<translation>Numéro de téléphone</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Nom d&apos;utilisateur</translation>
</message>
</context>
<context>
<name>AssistantFetchRemoteConfiguration</name>
<message>
<source>fetchRemoteConfigurationTitle</source>
<translation>TÉLÉCHARGER UNE CONFIGURATION</translation>
</message>
<message>
<source>urlLabel</source>
<translation>URL</translation>
</message>
<message>
<source>confirmAction</source>
<translation>TÉLÉCHARGER</translation>
</message>
</context>
<context>
<name>AssistantHome</name>
<message>
......@@ -205,74 +121,6 @@
<translation>Le compte existe déjà.</translation>
</message>
</context>
<context>
<name>AssistantUseLinphoneSipAccount</name>
<message>
<source>confirmAction</source>
<translation>CONNEXION</translation>
</message>
<message>
<source>useLinphoneSipAccountTitle</source>
<translation>UTILISER UN COMPTE LINPHONE</translation>
</message>
<message>
<source>useUsernameToLogin</source>
<translation>Utiliser un nom et mot de passe plutôt que votre numéro de téléphone.</translation>
</message>
</context>
<context>
<name>AssistantUseLinphoneSipAccountWithPhoneNumber</name>
<message>
<source>countryLabel</source>
<translation>Votre pays</translation>
</message>
<message>
<source>phoneNumberLabel</source>
<translation>Numéro de téléphone</translation>
</message>
</context>
<context>
<name>AssistantUseLinphoneSipAccountWithUsername</name>
<message>
<source>usernameLabel</source>
<translation>Nom d&apos;utilisateur</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Mot de passe</translation>
</message>
</context>
<context>
<name>AssistantUseOtherSipAccount</name>
<message>
<source>confirmAction</source>
<translation>CONNEXION</translation>
</message>
<message>
<source>useOtherSipAccountTitle</source>
<translation>UTILISER UN COMPTE SIP</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Nom d&apos;utilisateur</translation>
</message>
<message>
<source>displayNameLabel</source>
<translation>Nom d&apos;affichage (optionnel)</translation>
</message>
<message>
<source>sipDomainLabel</source>
<translation>Domaine SIP</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Mot de passe</translation>
</message>
<message>
<source>transportLabel</source>
<translation>Transport</translation>
</message>
</context>
<context>
<name>Calls</name>
<message>
......@@ -478,6 +326,75 @@ Url du serveur non configurée.</translation>
<translation>Êtes-vous sûr de vouloir supprimer cet historique ?</translation>
</message>
</context>
<context>
<name>CreateLinphoneSipAccount</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>CreateLinphoneSipAccountWithEmail</name>
<message>
<source>createLinphoneSipAccountTitle</source>
<translation>CRÉER UN COMPTE LINPHONE</translation>
</message>
<message>
<source>confirmAction</source>
<translation>CRÉER</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Nom d&apos;utilisateur</translation>
</message>
<message>
<source>emailLabel</source>
<translation>E-mail</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Mot de passe</translation>
</message>
<message>
<source>passwordConfirmationLabel</source>
<translation>Confirmation du mot de passe</translation>
</message>
<message>
<source>passwordConfirmationError</source>
<translation>Les mots de passe ne correspondent pas.</translation>
</message>
</context>
<context>
<name>CreateLinphoneSipAccountWithPhoneNumber</name>
<message>
<source>createLinphoneSipAccountTitle</source>
<translation>CRÉER UN COMPTE LINPHONE</translation>
</message>
<message>
<source>countryLabel</source>
<translation>Votre pays</translation>
</message>
<message>
<source>phoneNumberLabel</source>
<translation>Numéro de téléphone</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Nom d&apos;utilisateur</translation>
</message>
</context>
<context>
<name>DroppableTextArea</name>
<message>
......@@ -524,6 +441,21 @@ Url du serveur non configurée.</translation>
<translation>Appel sortant sans réponse</translation>
</message>
</context>
<context>
<name>FetchRemoteConfiguration</name>
<message>
<source>confirmAction</source>
<translation>TÉLÉCHARGER</translation>
</message>
<message>
<source>fetchRemoteConfigurationTitle</source>
<translation>TÉLÉCHARGER UNE CONFIGURATION</translation>
</message>
<message>
<source>urlLabel</source>
<translation>URL</translation>
</message>
</context>
<context>
<name>FileMessage</name>
<message>
......@@ -1106,4 +1038,72 @@ Url du serveur non configurée.</translation>
<translation>Précédemment</translation>
</message>
</context>
<context>
<name>UseLinphoneSipAccount</name>
<message>
<source>confirmAction</source>
<translation>UTILISER</translation>
</message>
<message>
<source>useLinphoneSipAccountTitle</source>
<translation>UTILISER UN COMPTE LINPHONE</translation>
</message>
<message>
<source>useUsernameToLogin</source>
<translation>Utiliser un nom et mot de passe plutôt que votre numéro de téléphone.</translation>
</message>
</context>
<context>
<name>UseLinphoneSipAccountWithPhoneNumber</name>
<message>
<source>countryLabel</source>
<translation>Votre pays</translation>
</message>
<message>
<source>phoneNumberLabel</source>
<translation>Numéro de téléphone</translation>
</message>
</context>
<context>
<name>UseLinphoneSipAccountWithUsername</name>
<message>
<source>usernameLabel</source>
<translation>Nom d&apos;utilisateur</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Mot de passe</translation>
</message>
</context>
<context>
<name>UseOtherSipAccount</name>
<message>
<source>confirmAction</source>
<translation>UTILISER</translation>
</message>
<message>
<source>useOtherSipAccountTitle</source>
<translation>UTILISER UN COMPTE SIP</translation>
</message>
<message>
<source>usernameLabel</source>
<translation>Nom d&apos;utilisateur</translation>
</message>
<message>
<source>displayNameLabel</source>
<translation>Nom d&apos;affichage (optionnel)</translation>
</message>
<message>
<source>sipDomainLabel</source>
<translation>Domaine SIP</translation>
</message>
<message>
<source>passwordLabel</source>
<translation>Mot de passe</translation>
</message>
<message>
<source>transportLabel</source>
<translation>Transport</translation>
</message>
</context>
</TS>
......@@ -334,16 +334,16 @@
<file>ui/views/App/Calls/IncomingCall.qml</file>
<file>ui/views/App/Calls/OutgoingCall.qml</file>
<file>ui/views/App/Main/Assistant/AssistantAbstractView.qml</file>
<file>ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml</file>
<file>ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithEmail.qml</file>
<file>ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithPhoneNumber.qml</file>
<file>ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml</file>
<file>ui/views/App/Main/Assistant/AssistantHome.qml</file>
<file>ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml</file>
<file>ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccountWithPhoneNumber.qml</file>
<file>ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccountWithUsername.qml</file>
<file>ui/views/App/Main/Assistant/AssistantUseOtherSipAccount.qml</file>
<file>ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml</file>
<file>ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml</file>
<file>ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml</file>
<file>ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml</file>
<file>ui/views/App/Main/Assistant.qml</file>
<file>ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml</file>
<file>ui/views/App/Main/Assistant/UseLinphoneSipAccountWithPhoneNumber.qml</file>
<file>ui/views/App/Main/Assistant/UseLinphoneSipAccountWithUsername.qml</file>
<file>ui/views/App/Main/Assistant/UseOtherSipAccount.qml</file>
<file>ui/views/App/Main/ContactEdit.js</file>
<file>ui/views/App/Main/ContactEdit.qml</file>
<file>ui/views/App/Main/Contacts.qml</file>
......@@ -369,10 +369,10 @@
<file>ui/views/App/Styles/Calls/CallStyle.qml</file>
<file>ui/views/App/Styles/Calls/CallsWindowStyle.qml</file>
<file>ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml</file>
<file>ui/views/App/Styles/Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml</file>
<file>ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml</file>
<file>ui/views/App/Styles/Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml</file>
<file>ui/views/App/Styles/Main/Assistant/CreateLinphoneSipAccountStyle.qml</file>
<file>ui/views/App/Styles/Main/AssistantStyle.qml</file>
<file>ui/views/App/Styles/Main/Assistant/UseLinphoneSipAccountStyle.qml</file>
<file>ui/views/App/Styles/Main/ContactEditStyle.qml</file>
<file>ui/views/App/Styles/Main/ContactsStyle.qml</file>
<file>ui/views/App/Styles/Main/ConversationStyle.qml</file>
......
......@@ -98,22 +98,22 @@ ColumnLayout {
model: ListModel {
ListElement {
$text: qsTr('createLinphoneSipAccount')
$view: 'AssistantCreateLinphoneSipAccount'
$view: 'CreateLinphoneSipAccount'
}
ListElement {
$text: qsTr('useLinphoneSipAccount')
$view: 'AssistantUseLinphoneSipAccount'
$view: 'UseLinphoneSipAccount'
}
ListElement {
$text: qsTr('useOtherSipAccount')
$view: 'AssistantUseOtherSipAccount'
$view: 'UseOtherSipAccount'
}
ListElement {
$text: qsTr('fetchRemoteConfiguration')
$view: 'AssistantFetchRemoteConfiguration'
$view: 'FetchRemoteConfiguration'
}
}
......
......@@ -16,25 +16,25 @@ AssistantAbstractView {
Column {
anchors.centerIn: parent
spacing: AssistantCreateLinphoneSipAccountStyle.buttons.spacing
width: AssistantCreateLinphoneSipAccountStyle.buttons.button.width
spacing: CreateLinphoneSipAccountStyle.buttons.spacing
width: CreateLinphoneSipAccountStyle.buttons.button.width
TextButtonA {
text: qsTr('withPhoneNumber')
height: AssistantCreateLinphoneSipAccountStyle.buttons.button.height
height: CreateLinphoneSipAccountStyle.buttons.button.height
width: parent.width
onClicked: assistant.pushView('AssistantCreateLinphoneSipAccountWithPhoneNumber')
onClicked: assistant.pushView('CreateLinphoneSipAccountWithPhoneNumber')
}
TextButtonA {
text: qsTr('withEmailAddress')
height: AssistantCreateLinphoneSipAccountStyle.buttons.button.height
height: CreateLinphoneSipAccountStyle.buttons.button.height
width: parent.width
onClicked: assistant.pushView('AssistantCreateLinphoneSipAccountWithEmail')
onClicked: assistant.pushView('CreateLinphoneSipAccountWithEmail')
}
}
}
......@@ -3,8 +3,6 @@ import QtQuick 2.7
import Common 1.0
import Linphone 1.0
import App.Styles 1.0
// =============================================================================
AssistantAbstractView {
......
......@@ -25,7 +25,7 @@ AssistantAbstractView {
Loader {
id: loader
source: 'AssistantUseLinphoneSipAccountWith' + (
source: 'UseLinphoneSipAccountWith' + (
checkBox.checked ? 'Username' : 'PhoneNumber'
) + '.qml'
width: parent.width
......@@ -35,7 +35,7 @@ AssistantAbstractView {
id: checkBox
text: qsTr('useUsernameToLogin')
width: AssistantUseLinphoneSipAccountStyle.checkBox.width
width: UseLinphoneSipAccountStyle.checkBox.width
onClicked: {
assistantModel.reset()
......
......@@ -8,9 +8,9 @@ singleton CallStyle 1.0 Calls/CallStyle.qml
singleton CallsWindowStyle 1.0 Calls/CallsWindowStyle.qml
singleton AssistantAbstractViewStyle 1.0 Main/Assistant/AssistantAbstractViewStyle.qml
singleton AssistantCreateLinphoneSipAccountStyle 1.0 Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml
singleton AssistantHomeStyle 1.0 Main/Assistant/AssistantHomeStyle.qml
singleton AssistantUseLinphoneSipAccountStyle 1.0 Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml
singleton CreateLinphoneSipAccountStyle 1.0 Main/Assistant/CreateLinphoneSipAccountStyle.qml
singleton UseLinphoneSipAccountStyle 1.0 Main/Assistant/UseLinphoneSipAccountStyle.qml
singleton AssistantStyle 1.0 Main/AssistantStyle.qml
singleton ContactEditStyle 1.0 Main/ContactEditStyle.qml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment