diff --git a/tests/assets/languages/en.ts b/tests/assets/languages/en.ts index e51ffde24..45e73f5de 100644 --- a/tests/assets/languages/en.ts +++ b/tests/assets/languages/en.ts @@ -418,11 +418,11 @@ NewCall newCallTitle - New call + New call cancel - CANCEL + CANCEL @@ -483,7 +483,7 @@ SelectContact contactSearch - Search contact or enter SIP address + Search contact or enter SIP address diff --git a/tests/assets/languages/fr.ts b/tests/assets/languages/fr.ts index e8b858334..be7564282 100644 --- a/tests/assets/languages/fr.ts +++ b/tests/assets/languages/fr.ts @@ -406,11 +406,11 @@ NewCall newCallTitle - Nouvel appel + Nouvel appel cancel - ANNULER + ANNULER @@ -471,7 +471,7 @@ SelectContact contactSearch - Rechercher un contact ou entrer une adresse SIP + Rechercher un contact ou entrer une adresse SIP diff --git a/tests/resources.qrc b/tests/resources.qrc index 14bb2d260..37d1c5e4d 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -213,7 +213,6 @@ ui/modules/Linphone/Presence/PresenceLevel.qml ui/modules/Linphone/Presence/PresenceString.qml ui/modules/Linphone/qmldir - ui/modules/Linphone/Select/SelectContact.qml ui/modules/Linphone/SmartSearchBar.qml ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml ui/modules/Linphone/Styles/ChatStyle.qml @@ -242,7 +241,6 @@ ui/views/App/MainWindow/Home.qml ui/views/App/MainWindow/MainWindow.qml ui/views/App/ManageAccounts.qml - ui/views/App/NewCall.qml ui/views/App/qmldir ui/views/App/Styles/Calls/StartingCallStyle.qml ui/views/App/Styles/MainWindow/ContactEditStyle.qml diff --git a/tests/ui/modules/Linphone/Select/SelectContact.qml b/tests/ui/modules/Linphone/Select/SelectContact.qml deleted file mode 100644 index 112da4a70..000000000 --- a/tests/ui/modules/Linphone/Select/SelectContact.qml +++ /dev/null @@ -1,123 +0,0 @@ -import QtGraphicalEffects 1.0 -import QtQuick 2.7 -import QtQuick.Controls 2.0 - -import Common 1.0 -import Linphone 1.0 - -// TODO: Contacts list. -Item { - function setPopupVisibility (visibility) { - popup.visible = true - } - - function filterContacts (text) { - console.log(text) - } - - TextField { - placeholderText: qsTr('contactSearch') - background: Rectangle { - implicitHeight: 40 - border.color: '#CBCBCB' - border.width: 2 - color: '#FFFFFF' - } - id: textField - width: parent.width - - onFocusChanged: setPopupVisibility(focus) - onTextChanged: filterContacts(text) - } - - Rectangle { - anchors.top: textField.bottom - anchors.topMargin: 2 - border.color: '#9B9B9B' - color: '#EAEAEA' - height: parent.height - textField.height // Avoid overflow. - id: popup - visible: false - width: parent.width - - ScrollableListView { - anchors.fill: parent - id: contactsList - - // TODO: Remove, use C++ model instead. - model: ListModel { - ListElement { - $presence: 'connected' - $sipAddress: 'jim.williams.zzzz.yyyy.kkkk.sip.linphone.org' - $username: 'Toto' - } - ListElement { - $presence: 'connected' - $sipAddress: 'toto.lala.sip.linphone.org' - $username: 'Toto' - } - ListElement { - $presence: 'disconnected' - $sipAddress: 'machin.truc.sip.linphone.org' - $username: 'Toto' - } - ListElement { - $presence: 'absent' - $sipAddress: 'hey.listen.sip.linphone.org' - $username: 'Toto' - } - ListElement { - $presence: 'do_not_disturb' - $sipAddress: 'valentin.cognito.sip.linphone.org' - $username: 'Toto' - } - ListElement { - $presence: 'do_not_disturb' - $sipAddress: 'charles.henri.sip.linphone.org' - $username: 'Toto' - } - ListElement { - $presence: 'disconnected' - $sipAddress: 'yesyes.nono.sip.linphone.org' - $username: 'Toto' - } - ListElement { - $presence: 'connected' - $sipAddress: 'nsa.sip.linphone.org' - $username: 'Toto' - } - } - - delegate: Contact { - presenceLevel: $presence - sipAddress: $sipAddress - username: $username - width: parent.width - - actions: [ - ActionButton { - icon: 'call' - onClicked: console.log('clicked') - }, - - ActionButton { - icon: 'cam' - onClicked: console.log('cam clicked') - } - ] - } - } - } - - DropShadow { - anchors.fill: popup - color: "#80000000" - horizontalOffset: 0 - id: popupShadow - radius: 8.0 - samples: 15 - source: popup - verticalOffset: 2 - visible: false - } -} diff --git a/tests/ui/modules/Linphone/qmldir b/tests/ui/modules/Linphone/qmldir index 54dda1f0b..1c3b0321d 100644 --- a/tests/ui/modules/Linphone/qmldir +++ b/tests/ui/modules/Linphone/qmldir @@ -1,10 +1,10 @@ -# ==================================================================== +# ============================================================================== # Linphone's components to export. -# ==================================================================== +# ============================================================================== module Linphone -# Components --------------------------------------------------------- +# Components ------------------------------------------------------------------- # Account AccountStatus 1.0 Account/AccountStatus.qml @@ -24,9 +24,6 @@ ContactDescription 1.0 Contact/ContactDescription.qml PresenceLevel 1.0 Presence/PresenceLevel.qml PresenceString 1.0 Presence/PresenceString.qml -# Select -SelectContact 1.0 Select/SelectContact.qml - # SmartSearchBar SmartSearchBar 1.0 SmartSearchBar.qml diff --git a/tests/ui/views/App/NewCall.qml b/tests/ui/views/App/NewCall.qml deleted file mode 100644 index c02ad3c13..000000000 --- a/tests/ui/views/App/NewCall.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.0 - -import Common 1.0 -import Linphone 1.0 - -DialogPlus { - centeredButtons: true - minimumHeight: 300 - minimumWidth: 420 - title: qsTr('newCallTitle') - - buttons: TextButtonA { - text: qsTr('cancel') - } - - Item { - anchors.fill: parent - anchors.leftMargin: 25 - anchors.rightMargin: 25 - - SelectContact { - anchors.fill: parent - } - } -} diff --git a/tests/ui/views/App/Styles/Calls/StartingCallStyle.qml b/tests/ui/views/App/Styles/Calls/StartingCallStyle.qml index 304ab21eb..1e1bbf00e 100644 --- a/tests/ui/views/App/Styles/Calls/StartingCallStyle.qml +++ b/tests/ui/views/App/Styles/Calls/StartingCallStyle.qml @@ -3,7 +3,7 @@ import QtQuick 2.7 import Common 1.0 -// =================================================================== +// ============================================================================= QtObject { property color backgroundColor: Colors.f diff --git a/tests/ui/views/App/Styles/MainWindow/ContactEditStyle.qml b/tests/ui/views/App/Styles/MainWindow/ContactEditStyle.qml index 9fbbc29d2..65e6ecdc5 100644 --- a/tests/ui/views/App/Styles/MainWindow/ContactEditStyle.qml +++ b/tests/ui/views/App/Styles/MainWindow/ContactEditStyle.qml @@ -7,7 +7,7 @@ import Common 1.0 QtObject { property QtObject infoBar: QtObject { - property color color: '#F4F4F4' + property color color: Colors.e property int avatarSize: 60 property int height: 80 property int leftMargin: 40 @@ -20,7 +20,7 @@ QtObject { } property QtObject username: QtObject { - property color color: '#4B5964' + property color color: Colors.j property int fontSize: 13 } } @@ -37,7 +37,7 @@ QtObject { property int topMargin: 20 property QtObject separator: QtObject { - property color color: '#E8E8E8' + property color color: Colors.f property int height: 1 } } diff --git a/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml b/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml index 9da48b4b4..77e7e10c6 100644 --- a/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml +++ b/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml @@ -3,7 +3,7 @@ import QtQuick 2.7 import Common 1.0 -// =================================================================== +// ============================================================================= QtObject { property color backgroundColor: Colors.k diff --git a/tests/ui/views/App/Styles/MainWindow/ConversationStyle.qml b/tests/ui/views/App/Styles/MainWindow/ConversationStyle.qml index 1f82f9e0e..bbefd2413 100644 --- a/tests/ui/views/App/Styles/MainWindow/ConversationStyle.qml +++ b/tests/ui/views/App/Styles/MainWindow/ConversationStyle.qml @@ -3,7 +3,7 @@ import QtQuick 2.7 import Common 1.0 -// =================================================================== +// ============================================================================= QtObject { property QtObject bar: QtObject { diff --git a/tests/ui/views/App/qmldir b/tests/ui/views/App/qmldir index 8009d313b..3f7cdbfdf 100644 --- a/tests/ui/views/App/qmldir +++ b/tests/ui/views/App/qmldir @@ -1,10 +1,9 @@ -# ==================================================================== +# ============================================================================== # Linphone's views. -# ==================================================================== +# ============================================================================== module App -# Views -------------------------------------------------------------- +# Views ------------------------------------------------------------------------ ManageAccounts 1.0 ManageAccounts.qml -NewCall 1.0 NewCall.qml