diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts index c281e0ac4..88e8a9ca1 100644 --- a/linphone-desktop/assets/languages/en.ts +++ b/linphone-desktop/assets/languages/en.ts @@ -35,6 +35,25 @@ BACK + + AssistantCreateLinphoneSipAccount + + createLinphoneSipAccountDescription + How would you like to create your account? + + + createLinphoneSipAccountTitle + CREATE A LINPHONE ACCOUNT + + + withPhoneNumber + WITH A PHONE NUMBER + + + withEmailAddress + WITH AN EMAIL ADDRESS + + AssistantFetchRemoteConfiguration @@ -52,10 +71,6 @@ AssistantHome - - createSipAccount - CREATE A LINPHONE ACCOUNT - useLinphoneSipAccount USE A LINPHONE ACCOUNT @@ -76,6 +91,10 @@ homeDescription This assistant will help you to configure and use your linphone account. + + createLinphoneSipAccount + CREATE A LINPHONE ACCOUNT + AssistantUseOtherSipAccount diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts index 6b5e1ad74..19a9eee40 100644 --- a/linphone-desktop/assets/languages/fr.ts +++ b/linphone-desktop/assets/languages/fr.ts @@ -35,6 +35,25 @@ RETOUR + + AssistantCreateLinphoneSipAccount + + createLinphoneSipAccountDescription + Comment souhaitez-vous créer votre compte ? + + + createLinphoneSipAccountTitle + CRÉER UN COMPTE LINPHONE + + + withPhoneNumber + AVEC UN NUMÉRO DE TÉLÉPHONE + + + withEmailAddress + AVER UNE ADRESSE E-MAIL + + AssistantFetchRemoteConfiguration @@ -52,10 +71,6 @@ AssistantHome - - createSipAccount - CRÉER UN COMPTE LINPHONE - useLinphoneSipAccount UTILISER UN COMPTE LINPHONE @@ -76,6 +91,10 @@ homeDescription Cet assistant va vous aider à configurer et utiliser votre compte SIP. + + createLinphoneSipAccount + CRÉER UN COMPTE LINPHONE + AssistantUseOtherSipAccount diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc index 87c168e93..4b319c458 100644 --- a/linphone-desktop/resources.qrc +++ b/linphone-desktop/resources.qrc @@ -310,6 +310,7 @@ ui/scripts/Utils/uri-tools.js ui/scripts/Utils/utils.js ui/views/App/Assistant/AssistantAbstractView.qml + ui/views/App/Assistant/AssistantCreateLinphoneSipAccount.qml ui/views/App/Assistant/AssistantFetchRemoteConfiguration.qml ui/views/App/Assistant/AssistantHome.qml ui/views/App/Assistant/AssistantUseOtherSipAccount.qml @@ -337,6 +338,7 @@ ui/views/App/Settings/SettingsVideo.qml ui/views/App/Settings/SettingsWindow.qml ui/views/App/Styles/Assistant/AssistantAbstractViewStyle.qml + ui/views/App/Styles/Assistant/AssistantCreateLinphoneSipAccountStyle.qml ui/views/App/Styles/Assistant/AssistantHomeStyle.qml ui/views/App/Styles/AssistantWindowStyle.qml ui/views/App/Styles/Calls/CallStyle.qml diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantAbstractView.qml b/linphone-desktop/ui/views/App/Assistant/AssistantAbstractView.qml index b68372ff9..4130ed844 100644 --- a/linphone-desktop/ui/views/App/Assistant/AssistantAbstractView.qml +++ b/linphone-desktop/ui/views/App/Assistant/AssistantAbstractView.qml @@ -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() } } diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantCreateLinphoneSipAccount.qml b/linphone-desktop/ui/views/App/Assistant/AssistantCreateLinphoneSipAccount.qml new file mode 100644 index 000000000..54b58d319 --- /dev/null +++ b/linphone-desktop/ui/views/App/Assistant/AssistantCreateLinphoneSipAccount.qml @@ -0,0 +1,30 @@ +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') + } + } +} diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantFetchRemoteConfiguration.qml b/linphone-desktop/ui/views/App/Assistant/AssistantFetchRemoteConfiguration.qml index ce2dd1086..be5e64610 100644 --- a/linphone-desktop/ui/views/App/Assistant/AssistantFetchRemoteConfiguration.qml +++ b/linphone-desktop/ui/views/App/Assistant/AssistantFetchRemoteConfiguration.qml @@ -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 { diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantHome.qml b/linphone-desktop/ui/views/App/Assistant/AssistantHome.qml index 50a816f2a..607a8d1f0 100644 --- a/linphone-desktop/ui/views/App/Assistant/AssistantHome.qml +++ b/linphone-desktop/ui/views/App/Assistant/AssistantHome.qml @@ -82,8 +82,8 @@ ColumnLayout { model: ListModel { ListElement { - $text: qsTr('createSipAccount') - $view: 'AssistantCreateSipAccount' + $text: qsTr('createLinphoneSipAccount') + $view: 'AssistantCreateLinphoneSipAccount' } ListElement { diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantUseOtherSipAccount.qml b/linphone-desktop/ui/views/App/Assistant/AssistantUseOtherSipAccount.qml index 4e385b154..edc7e1869 100644 --- a/linphone-desktop/ui/views/App/Assistant/AssistantUseOtherSipAccount.qml +++ b/linphone-desktop/ui/views/App/Assistant/AssistantUseOtherSipAccount.qml @@ -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') + FormLine { + FormGroup { + label: qsTr('displayNameLabel') - TextField {} - } - } + TextField {} + } + } - FormLine { - FormGroup { - label: qsTr('sipDomainLabel') + FormLine { + FormGroup { + label: qsTr('sipDomainLabel') - TextField { - id: sipDomain - } - } - } + TextField { + id: sipDomain + } + } + } - FormLine { - FormGroup { - label: qsTr('passwordLabel') + FormLine { + FormGroup { + label: qsTr('passwordLabel') - TextField { - id: password - } - } - } + TextField { + id: password + } + } + } - FormLine { - FormGroup { - label: qsTr('transportLabel') + FormLine { + FormGroup { + label: qsTr('transportLabel') - ExclusiveButtons { - texts: [ 'UDP', 'TCP', 'TLS' ] - } - } - } - } + ExclusiveButtons { + texts: [ 'UDP', 'TCP', 'TLS' ] + } + } + } + } } diff --git a/linphone-desktop/ui/views/App/Styles/Assistant/AssistantAbstractViewStyle.qml b/linphone-desktop/ui/views/App/Styles/Assistant/AssistantAbstractViewStyle.qml index baa115eb8..3cdfc3a28 100644 --- a/linphone-desktop/ui/views/App/Styles/Assistant/AssistantAbstractViewStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Assistant/AssistantAbstractViewStyle.qml @@ -1,10 +1,32 @@ 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 + } + } } diff --git a/linphone-desktop/ui/views/App/Styles/Assistant/AssistantCreateLinphoneSipAccountStyle.qml b/linphone-desktop/ui/views/App/Styles/Assistant/AssistantCreateLinphoneSipAccountStyle.qml new file mode 100644 index 000000000..caff6887a --- /dev/null +++ b/linphone-desktop/ui/views/App/Styles/Assistant/AssistantCreateLinphoneSipAccountStyle.qml @@ -0,0 +1,15 @@ +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 + } + } +} diff --git a/linphone-desktop/ui/views/App/Styles/qmldir b/linphone-desktop/ui/views/App/Styles/qmldir index 1abab53b8..43c4e6cec 100644 --- a/linphone-desktop/ui/views/App/Styles/qmldir +++ b/linphone-desktop/ui/views/App/Styles/qmldir @@ -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