diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts index a3168416a..6e0848d97 100644 --- a/linphone-desktop/assets/languages/en.ts +++ b/linphone-desktop/assets/languages/en.ts @@ -28,6 +28,13 @@ Start in the system tray, do not show the main interface. + + Assistant + + assistantTitle + Linphone - Assistant + + AssistantAbstractView @@ -86,7 +93,7 @@ AssistantFetchRemoteConfiguration fetchRemoteConfigurationTitle - Fetch remote configuration + FETCH REMOTE CONFIGURATION urlLabel @@ -190,7 +197,7 @@ AssistantWindow assistantTitle - Linphone - Assistant + Linphone - Assistant @@ -607,54 +614,54 @@ Server url not configured. InviteFriends enterEmailLabel - Enter your friend's email address + Enter your friend's email address messageLabel - You can modify the invitation that will be sent + You can modify the invitation that will be sent cancel - CANCEL + CANCEL confirm - CONFIRM + CONFIRM inviteFriendsTitle - Linphone - Invite Friends + Invite Friends + + + defaultMessage + + + + defaultSubject + InviteFriendsWindow cancel - CANCEL + CANCEL confirm - CONFIRM - - - defaultSubject - + CONFIRM inviteFriendsTitle - Linphone - Invite Friends + Linphone - Invite Friends enterEmailLabel - Enter your friend's email address + Enter your friend's email address messageLabel - You can modify the invitation that will be sent - - - defaultMessage - + You can modify the invitation that will be sent diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts index 572ee9212..28c636773 100644 --- a/linphone-desktop/assets/languages/fr.ts +++ b/linphone-desktop/assets/languages/fr.ts @@ -28,6 +28,13 @@ + + Assistant + + assistantTitle + Linphone - Assistant + + AssistantAbstractView @@ -86,7 +93,7 @@ AssistantFetchRemoteConfiguration fetchRemoteConfigurationTitle - Télécharger une configuration + TÉLÉCHARGER UNE CONFIGURATION urlLabel @@ -190,7 +197,7 @@ AssistantWindow assistantTitle - Linphone - Assistant + Linphone - Assistant @@ -606,54 +613,54 @@ Url du serveur non configurée. InviteFriends enterEmailLabel - Entrer l'adresse email de votre ami + Entrer l'adresse email de votre ami messageLabel - Modifier l'invitation qui sera envoyée + Modifier l'invitation qui sera envoyée cancel - ANNULER + ANNULER confirm - CONFIRMER + CONFIRMER inviteFriendsTitle - Linphone - Inviter des amis + Inviter des amis + + + defaultMessage + + + + defaultSubject + InviteFriendsWindow cancel - ANNULER + ANNULER confirm - CONFIRMER - - - defaultSubject - + CONFIRMER inviteFriendsTitle - Linphone - Inviter des amis + Linphone - Inviter des amis enterEmailLabel - Entrer l'adresse email de votre ami + Entrer l'adresse email de votre ami messageLabel - Modifier l'invitation qui sera envoyée - - - defaultMessage - + Modifier l'invitation qui sera envoyée diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc index 36d12e900..fafaa6ecc 100644 --- a/linphone-desktop/resources.qrc +++ b/linphone-desktop/resources.qrc @@ -311,24 +311,24 @@ ui/scripts/Utils/qmldir 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/AssistantUseLinphoneSipAccount.qml - ui/views/App/Assistant/AssistantUseOtherSipAccount.qml - ui/views/App/AssistantWindow.qml ui/views/App/Calls/AbstractStartingCall.qml ui/views/App/Calls/CallsWindow.qml ui/views/App/Calls/Incall.qml ui/views/App/Calls/IncomingCall.qml ui/views/App/Calls/OutgoingCall.qml ui/views/App/IncallFullscreenWindow.qml - ui/views/App/InviteFriendsWindow.qml + ui/views/App/Main/Assistant/AssistantAbstractView.qml + ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml + ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml + ui/views/App/Main/Assistant/AssistantHome.qml + ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml + ui/views/App/Main/Assistant/AssistantUseOtherSipAccount.qml + ui/views/App/Main/Assistant.qml ui/views/App/Main/ContactEdit.qml ui/views/App/Main/Contacts.qml ui/views/App/Main/Conversation.qml ui/views/App/Main/Home.qml + ui/views/App/Main/InviteFriends.qml ui/views/App/Main/MainWindowMenuBar.qml ui/views/App/Main/MainWindow.qml ui/views/App/ManageAccountsWindow.qml @@ -340,18 +340,18 @@ ui/views/App/Settings/SettingsUi.qml 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/Assistant/AssistantUseLinphoneSipAccountStyle.qml - ui/views/App/Styles/AssistantWindowStyle.qml ui/views/App/Styles/Calls/CallStyle.qml ui/views/App/Styles/Calls/CallsWindowStyle.qml - ui/views/App/Styles/InviteFriendsWindowStyle.qml + ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml + ui/views/App/Styles/Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml + ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml + ui/views/App/Styles/Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml + ui/views/App/Styles/Main/AssistantStyle.qml ui/views/App/Styles/Main/ContactEditStyle.qml ui/views/App/Styles/Main/ContactsStyle.qml ui/views/App/Styles/Main/ConversationStyle.qml ui/views/App/Styles/Main/HomeStyle.qml + ui/views/App/Styles/Main/InviteFriendsStyle.qml ui/views/App/Styles/Main/MainWindowMenuBarStyle.qml ui/views/App/Styles/Main/MainWindowStyle.qml ui/views/App/Styles/ManageAccountsWindowStyle.qml diff --git a/linphone-desktop/ui/views/App/AssistantWindow.qml b/linphone-desktop/ui/views/App/AssistantWindow.qml deleted file mode 100644 index b218e477a..000000000 --- a/linphone-desktop/ui/views/App/AssistantWindow.qml +++ /dev/null @@ -1,115 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Window 2.2 - -import Utils 1.0 - -import App.Styles 1.0 - -// ============================================================================= - -Window { - id: window - - // --------------------------------------------------------------------------- - - readonly property string viewsPath: 'qrc:/ui/views/App/Assistant/' - - // --------------------------------------------------------------------------- - - function pushView (view) { - stack.push( - Utils.isString(view) - ? viewsPath + view + '.qml' - : view - ) - } - - function popView () { - stack.pop() - } - - // --------------------------------------------------------------------------- - - modality: Qt.WindowModal - title: qsTr('assistantTitle') - visible: true - - height: AssistantWindowStyle.height - width: AssistantWindowStyle.width - - maximumHeight: AssistantWindowStyle.height - maximumWidth: AssistantWindowStyle.width - - minimumHeight: AssistantWindowStyle.height - minimumWidth: AssistantWindowStyle.width - - // --------------------------------------------------------------------------- - - Shortcut { - sequence: StandardKey.Close - onActivated: close() - } - - // --------------------------------------------------------------------------- - - Rectangle { - anchors.fill: parent - color: AssistantWindowStyle.color - } - - // --------------------------------------------------------------------------- - - StackView { - id: stack - - anchors { - fill: parent - - bottomMargin: AssistantWindowStyle.bottomMargin - leftMargin: AssistantWindowStyle.leftMargin - rightMargin: AssistantWindowStyle.rightMargin - topMargin: AssistantWindowStyle.topMargin - } - - initialItem: window.viewsPath + 'AssistantHome.qml' - - // ------------------------------------------------------------------------- - - popEnter: Transition { - XAnimator { - duration: AssistantWindowStyle.stackAnimation.duration - easing.type: Easing.OutBack - from: -stack.width - AssistantWindowStyle.leftMargin - to: 0 - } - } - - popExit: Transition { - XAnimator { - duration: AssistantWindowStyle.stackAnimation.duration - easing.type: Easing.OutBack - from: 0 - to: stack.width + AssistantWindowStyle.rightMargin - } - } - - pushEnter: Transition { - XAnimator { - duration: AssistantWindowStyle.stackAnimation.duration - easing.type: Easing.OutBack - from: stack.width + AssistantWindowStyle.rightMargin - to: 0 - } - } - - pushExit: Transition { - XAnimator { - duration: AssistantWindowStyle.stackAnimation.duration - easing.type: Easing.OutBack - from: 0 - to: -stack.width - AssistantWindowStyle.leftMargin - } - } - } -} diff --git a/linphone-desktop/ui/views/App/InviteFriendsWindow.qml b/linphone-desktop/ui/views/App/InviteFriendsWindow.qml deleted file mode 100644 index 17177b1c8..000000000 --- a/linphone-desktop/ui/views/App/InviteFriendsWindow.qml +++ /dev/null @@ -1,81 +0,0 @@ -import QtQuick 2.7 - -import Common 1.0 - -import App.Styles 1.0 - -// ============================================================================= - -DialogPlus { - buttons: [ - TextButtonA { - text: qsTr('cancel') - - onClicked: exit(-1) - }, - TextButtonB { - enabled: email.length && message.length - text: qsTr('confirm') - - onClicked: { - Qt.openUrlExternally( - 'mailto:' + encodeURIComponent(email.text) + - '?subject=' + encodeURIComponent(qsTr('defaultSubject')) + - '&body=' + encodeURIComponent(message.text) - ) - - exit(0) - } - } - ] - - centeredButtons: true - title: qsTr('inviteFriendsTitle') - - height: InviteFriendsWindowStyle.height - width: InviteFriendsWindowStyle.width - - maximumHeight: InviteFriendsWindowStyle.height - maximumWidth: InviteFriendsWindowStyle.width - - minimumHeight: InviteFriendsWindowStyle.height - minimumWidth: InviteFriendsWindowStyle.width - - // --------------------------------------------------------------------------- - - Form { - anchors { - fill: parent - leftMargin: InviteFriendsWindowStyle.leftMargin - rightMargin: InviteFriendsWindowStyle.rightMargin - } - - orientation: Qt.Vertical - - FormLine { - FormGroup { - label: qsTr('enterEmailLabel') - - TextField { - id: email - - inputMethodHints: Qt.ImhEmailCharactersOnly - width: parent.width - } - } - } - - FormLine { - FormGroup { - label: qsTr('messageLabel') - - TextAreaField { - id: message - - height: InviteFriendsWindowStyle.message.height - text: qsTr('defaultMessage') - } - } - } - } -} diff --git a/linphone-desktop/ui/views/App/Main/Assistant.qml b/linphone-desktop/ui/views/App/Main/Assistant.qml new file mode 100644 index 000000000..34956c9da --- /dev/null +++ b/linphone-desktop/ui/views/App/Main/Assistant.qml @@ -0,0 +1,89 @@ +import QtQuick 2.7 +import QtQuick.Controls 2.0 +import QtQuick.Window 2.2 + +import Utils 1.0 + +import App.Styles 1.0 + +// ============================================================================= + +Item { + id: assistant + + readonly property string viewsPath: 'qrc:/ui/views/App/Main/Assistant/' + + // --------------------------------------------------------------------------- + + function pushView (view) { + stack.push( + Utils.isString(view) ? viewsPath + view + '.qml' : view + ) + } + + function popView () { + stack.pop() + } + + // --------------------------------------------------------------------------- + + Rectangle { + anchors.fill: parent + color: AssistantStyle.color + } + + // --------------------------------------------------------------------------- + + StackView { + id: stack + + anchors { + fill: parent + + bottomMargin: AssistantStyle.bottomMargin + leftMargin: AssistantStyle.leftMargin + rightMargin: AssistantStyle.rightMargin + topMargin: AssistantStyle.topMargin + } + + initialItem: assistant.viewsPath + 'AssistantHome.qml' + + // ------------------------------------------------------------------------- + + popEnter: Transition { + YAnimator { + duration: AssistantStyle.stackAnimation.duration + easing.type: Easing.OutBack + from: stack.height + AssistantStyle.bottomMargin + to: 0 + } + } + + popExit: Transition { + XAnimator { + duration: AssistantStyle.stackAnimation.duration + easing.type: Easing.OutBack + from: 0 + to: stack.width + AssistantStyle.rightMargin + } + } + + pushEnter: Transition { + XAnimator { + duration: AssistantStyle.stackAnimation.duration + easing.type: Easing.OutBack + from: stack.width + AssistantStyle.rightMargin + to: 0 + } + } + + pushExit: Transition { + YAnimator { + duration: AssistantStyle.stackAnimation.duration + easing.type: Easing.OutBack + from: 0 + to: stack.height + AssistantStyle.bottomMargin + } + } + } +} diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantAbstractView.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml similarity index 73% rename from linphone-desktop/ui/views/App/Assistant/AssistantAbstractView.qml rename to linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml index 4130ed844..240923536 100644 --- a/linphone-desktop/ui/views/App/Assistant/AssistantAbstractView.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml @@ -7,7 +7,7 @@ import App.Styles 1.0 // ============================================================================= -ColumnLayout { +Item { id: view // --------------------------------------------------------------------------- @@ -26,15 +26,15 @@ ColumnLayout { height: stack.height width: stack.width - spacing: AssistantAbstractViewStyle.spacing - - // -------------------------------------------------------------------------- + // --------------------------------------------------------------------------- // Info. - // -------------------------------------------------------------------------- + // --------------------------------------------------------------------------- Column { - Layout.fillWidth: true + anchors.centerIn: parent + spacing: AssistantAbstractViewStyle.info.spacing + width: parent.width Text { id: title @@ -60,34 +60,39 @@ ColumnLayout { font.pointSize: AssistantAbstractViewStyle.info.description.fontSize horizontalAlignment: Text.AlignHCenter - visible: text.length > 0 width: parent.width } + + // ------------------------------------------------------------------------- + // Content. + // ------------------------------------------------------------------------- + + Item { + id: content + + anchors.horizontalCenter: parent.horizontalCenter + height: AssistantAbstractViewStyle.content.height + width: AssistantAbstractViewStyle.content.width + } } - // -------------------------------------------------------------------------- - // Content. - // -------------------------------------------------------------------------- - - Item { - id: content - - Layout.alignment: Qt.AlignHCenter - Layout.fillHeight: true - Layout.preferredWidth: AssistantAbstractViewStyle.content.width - } - - // -------------------------------------------------------------------------- + // --------------------------------------------------------------------------- // Nav buttons. - // -------------------------------------------------------------------------- + // --------------------------------------------------------------------------- Row { - Layout.alignment: Qt.AlignHCenter + id: buttons + + anchors { + bottom: parent.bottom + horizontalCenter: parent.horizontalCenter + } + spacing: AssistantAbstractViewStyle.buttons.spacing TextButtonA { text: qsTr('back') - onClicked: window.popView() + onClicked: assistant.popView() } TextButtonB { diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantCreateLinphoneSipAccount.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml similarity index 96% rename from linphone-desktop/ui/views/App/Assistant/AssistantCreateLinphoneSipAccount.qml rename to linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml index 33f5ef031..fb772958f 100644 --- a/linphone-desktop/ui/views/App/Assistant/AssistantCreateLinphoneSipAccount.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml @@ -147,7 +147,7 @@ AssistantAbstractView { height: AssistantCreateLinphoneSipAccountStyle.buttons.button.height width: parent.width - onClicked: window.pushView(phoneNumberView) + onClicked: assistant.pushView(phoneNumberView) } TextButtonA { @@ -156,7 +156,7 @@ AssistantAbstractView { height: AssistantCreateLinphoneSipAccountStyle.buttons.button.height width: parent.width - onClicked: window.pushView(emailAddressView) + onClicked: assistant.pushView(emailAddressView) } } } diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantFetchRemoteConfiguration.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml similarity index 100% rename from linphone-desktop/ui/views/App/Assistant/AssistantFetchRemoteConfiguration.qml rename to linphone-desktop/ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantHome.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml similarity index 55% rename from linphone-desktop/ui/views/App/Assistant/AssistantHome.qml rename to linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml index 607a8d1f0..6d659d7af 100644 --- a/linphone-desktop/ui/views/App/Assistant/AssistantHome.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml @@ -14,41 +14,54 @@ ColumnLayout { // Info. // --------------------------------------------------------------------------- - Icon { - Layout.alignment: Qt.AlignHCenter - - icon: 'home_account_assistant' - iconSize: AssistantHomeStyle.info.iconSize - } - - Text { + Item { + Layout.fillHeight: true Layout.fillWidth: true - Layout.preferredHeight: AssistantHomeStyle.info.title.height - color: AssistantHomeStyle.info.title.color - elide: Text.ElideRight - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter + Column { + anchors.verticalCenter: parent.verticalCenter + spacing: 0 - font { - bold: true - pointSize: AssistantHomeStyle.info.title.fontSize + height: AssistantHomeStyle.info.height + width: parent.width + + Icon { + anchors.horizontalCenter: parent.horizontalCenter + + icon: 'home_account_assistant' + iconSize: AssistantHomeStyle.info.iconSize + } + + Text { + height: AssistantHomeStyle.info.title.height + width: parent.width + + color: AssistantHomeStyle.info.title.color + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + + font { + bold: true + pointSize: AssistantHomeStyle.info.title.fontSize + } + + text: qsTr('homeTitle') + } + + Text { + height: AssistantHomeStyle.info.description.height + width: parent.width + + color: AssistantHomeStyle.info.description.color + elide: Text.ElideRight + font.pointSize: AssistantHomeStyle.info.description.fontSize + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + + text: qsTr('homeDescription') + } } - - text: qsTr('homeTitle') - } - - Text { - Layout.fillWidth: true - Layout.preferredHeight: AssistantHomeStyle.info.description.height - - color: AssistantHomeStyle.info.description.color - elide: Text.ElideRight - font.pointSize: AssistantHomeStyle.info.description.fontSize - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - - text: qsTr('homeDescription') } // --------------------------------------------------------------------------- @@ -58,7 +71,9 @@ ColumnLayout { GridView { id: buttons + Layout.alignment: Qt.AlignHCenter Layout.fillWidth: true + Layout.maximumWidth: AssistantHomeStyle.buttons.maxWidth Layout.preferredHeight: AssistantHomeStyle.buttons.height cellHeight: height / 2 @@ -76,7 +91,7 @@ ColumnLayout { text: $text - onClicked: window.pushView($view) + onClicked: assistant.pushView($view) } } diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantUseLinphoneSipAccount.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml similarity index 100% rename from linphone-desktop/ui/views/App/Assistant/AssistantUseLinphoneSipAccount.qml rename to linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml diff --git a/linphone-desktop/ui/views/App/Assistant/AssistantUseOtherSipAccount.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseOtherSipAccount.qml similarity index 100% rename from linphone-desktop/ui/views/App/Assistant/AssistantUseOtherSipAccount.qml rename to linphone-desktop/ui/views/App/Main/Assistant/AssistantUseOtherSipAccount.qml diff --git a/linphone-desktop/ui/views/App/Main/Home.qml b/linphone-desktop/ui/views/App/Main/Home.qml index ff39bf5a6..3c713bca3 100644 --- a/linphone-desktop/ui/views/App/Main/Home.qml +++ b/linphone-desktop/ui/views/App/Main/Home.qml @@ -36,7 +36,7 @@ Rectangle { $component: 'button' $componentText: qsTr('inviteButton') $description: qsTr('inviteDescription') - $window: 'InviteFriendsWindow' + $view: 'InviteFriends' $icon: 'home_invite_friends' $title: qsTr('inviteTitle') } @@ -47,7 +47,7 @@ Rectangle { $description: qsTr('accountAssistantDescription') $icon: 'home_account_assistant' $title: qsTr('accountAssistantTitle') - $window: 'AssistantWindow' + $view: 'Assistant' } } @@ -64,7 +64,7 @@ Rectangle { TextButtonB { text: $componentText - onClicked: Utils.openWindow($window, window) + onClicked: window.setView($view) } } diff --git a/linphone-desktop/ui/views/App/Main/InviteFriends.qml b/linphone-desktop/ui/views/App/Main/InviteFriends.qml new file mode 100644 index 000000000..04f8a07c5 --- /dev/null +++ b/linphone-desktop/ui/views/App/Main/InviteFriends.qml @@ -0,0 +1,91 @@ +import QtQuick 2.7 +import QtQuick.Layouts 1.3 + +import Common 1.0 + +import App.Styles 1.0 + +// ============================================================================= + +Rectangle { + color: InviteFriendsStyle.color + + ColumnLayout { + anchors.fill: parent + spacing: 0 + + Item { + id: content + + Layout.fillHeight: true + Layout.fillWidth: true + + Form { + anchors.centerIn: parent + orientation: Qt.Vertical + title: qsTr('inviteFriendsTitle') + width: InviteFriendsStyle.width + + FormLine { + FormGroup { + label: qsTr('enterEmailLabel') + + TextField { + id: email + + inputMethodHints: Qt.ImhEmailCharactersOnly + width: parent.width + } + } + } + + FormLine { + FormGroup { + label: qsTr('messageLabel') + + TextAreaField { + id: message + + height: InviteFriendsStyle.message.height + text: qsTr('defaultMessage') + } + } + } + } + } + + // ------------------------------------------------------------------------- + // Buttons. + // ------------------------------------------------------------------------- + + Row { + id: buttons + + Layout.alignment: Qt.AlignHCenter + Layout.bottomMargin: InviteFriendsStyle.buttons.bottomMargin + + spacing: InviteFriendsStyle.buttons.spacing + + TextButtonA { + text: qsTr('cancel') + + onClicked: window.setView('Home') + } + + TextButtonB { + enabled: email.length && message.length + text: qsTr('confirm') + + onClicked: { + Qt.openUrlExternally( + 'mailto:' + encodeURIComponent(email.text) + + '?subject=' + encodeURIComponent(qsTr('defaultSubject')) + + '&body=' + encodeURIComponent(message.text) + ) + + window.setView('Home') + } + } + } + } +} diff --git a/linphone-desktop/ui/views/App/Styles/Assistant/AssistantAbstractViewStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml similarity index 91% rename from linphone-desktop/ui/views/App/Styles/Assistant/AssistantAbstractViewStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml index 173a26d19..9a5430f4f 100644 --- a/linphone-desktop/ui/views/App/Styles/Assistant/AssistantAbstractViewStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml @@ -6,14 +6,13 @@ import Common 1.0 // ============================================================================= QtObject { - property int spacing: 30 - property QtObject buttons: QtObject { property int spacing: 10 } property QtObject content: QtObject { - property int width: 340 + property int height: 375 + property int width: 400 } property QtObject info: QtObject { diff --git a/linphone-desktop/ui/views/App/Styles/Assistant/AssistantCreateLinphoneSipAccountStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Assistant/AssistantCreateLinphoneSipAccountStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Assistant/AssistantHomeStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml similarity index 91% rename from linphone-desktop/ui/views/App/Styles/Assistant/AssistantHomeStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml index e04e73436..5760465a0 100644 --- a/linphone-desktop/ui/views/App/Styles/Assistant/AssistantHomeStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml @@ -7,6 +7,7 @@ import Common 1.0 QtObject { property QtObject info: QtObject { + property int height: 245 property int iconSize: 150 property QtObject description: QtObject { @@ -23,6 +24,7 @@ QtObject { } property QtObject buttons: QtObject { + property int maxWidth: 690 property int height: 90 property int spacing: 5 } diff --git a/linphone-desktop/ui/views/App/Styles/Assistant/AssistantUseLinphoneSipAccountStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Assistant/AssistantUseLinphoneSipAccountStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/AssistantWindowStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/AssistantStyle.qml similarity index 81% rename from linphone-desktop/ui/views/App/Styles/AssistantWindowStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/AssistantStyle.qml index d0d1624ab..af1b54367 100644 --- a/linphone-desktop/ui/views/App/Styles/AssistantWindowStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/AssistantStyle.qml @@ -10,9 +10,7 @@ QtObject { property int bottomMargin: 35 property int leftMargin: 90 property int rightMargin: 90 - property int topMargin: 35 - property int height: 480 - property int width: 700 + property int topMargin: 50 property QtObject stackAnimation: QtObject { property int duration: 400 diff --git a/linphone-desktop/ui/views/App/Styles/InviteFriendsWindowStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/InviteFriendsStyle.qml similarity index 57% rename from linphone-desktop/ui/views/App/Styles/InviteFriendsWindowStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/InviteFriendsStyle.qml index 27b49ba84..b9afc8537 100644 --- a/linphone-desktop/ui/views/App/Styles/InviteFriendsWindowStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/InviteFriendsStyle.qml @@ -6,12 +6,15 @@ import Common 1.0 // ============================================================================= QtObject { - property int height: 316 - property int leftMargin: 35 - property int rightMargin: 35 - property int width: 480 + property color color: Colors.k + property int width: 400 property QtObject message: QtObject { property int height: 140 } + + property QtObject buttons: QtObject { + property int bottomMargin: 35 + property int spacing: 10 + } } diff --git a/linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml index e3fcb1cd4..4fd570d90 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml @@ -7,8 +7,8 @@ import Linphone.Styles 1.0 // ============================================================================= QtObject { - property int minimumHeight: 480 - property int minimumWidth: 680 + property int minimumHeight: 610 + property int minimumWidth: 950 property int width: 950 property string title: 'Linphone' diff --git a/linphone-desktop/ui/views/App/Styles/qmldir b/linphone-desktop/ui/views/App/Styles/qmldir index c1b4b336b..6ab14a939 100644 --- a/linphone-desktop/ui/views/App/Styles/qmldir +++ b/linphone-desktop/ui/views/App/Styles/qmldir @@ -4,22 +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 AssistantAbstractViewStyle 1.0 Assistant/AssistantAbstractViewStyle.qml -singleton AssistantCreateLinphoneSipAccountStyle 1.0 Assistant/AssistantCreateLinphoneSipAccountStyle.qml -singleton AssistantHomeStyle 1.0 Assistant/AssistantHomeStyle.qml -singleton AssistantUseLinphoneSipAccountStyle 1.0 Assistant/AssistantUseLinphoneSipAccountStyle.qml - 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 AssistantStyle 1.0 Main/AssistantStyle.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 InviteFriendsStyle 1.0 Main/InviteFriendsStyle.qml singleton MainWindowMenuBarStyle 1.0 Main/MainWindowMenuBarStyle.qml singleton MainWindowStyle 1.0 Main/MainWindowStyle.qml diff --git a/linphone-desktop/ui/views/App/qmldir b/linphone-desktop/ui/views/App/qmldir index bef2b0541..4c5f4c586 100644 --- a/linphone-desktop/ui/views/App/qmldir +++ b/linphone-desktop/ui/views/App/qmldir @@ -6,7 +6,5 @@ module App # Views ------------------------------------------------------------------------ -Assistant 1.0 AssistantWindow.qml IncallFullscreenWindow 1.0 IncallFullscreenWindow.qml -InviteFriendsWindow 1.0 InviteFriendsWindow.qml ManageAccountsWindow 1.0 ManageAccountsWindow.qml