diff --git a/tests/resources.qrc b/tests/resources.qrc index afb1ca09d..03ed9409e 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -148,6 +148,7 @@ ui/views/App/ManageAccounts.qml ui/views/App/NewCall.qml ui/views/App/qmldir + ui/views/App/Styles/Calls/CallsStyle.qml ui/views/App/Styles/MainWindow/ContactsStyle.qml ui/views/App/Styles/MainWindow/ConversationStyle.qml ui/views/App/Styles/MainWindow/MainWindowStyle.qml diff --git a/tests/ui/modules/Linphone/Call/CallControls.qml b/tests/ui/modules/Linphone/Call/CallControls.qml index 1a93692b5..167696b02 100644 --- a/tests/ui/modules/Linphone/Call/CallControls.qml +++ b/tests/ui/modules/Linphone/Call/CallControls.qml @@ -5,14 +5,23 @@ import QtQuick.Controls 2.0 import Linphone 1.0 import Common 1.0 +// =================================================================== + RowLayout { + property string sipAddress + + // TODO. + property var contact: ContactsListModel.mapSipAddressToContact( + sipAddress + ) + implicitHeight: contact.height spacing: 1 Rectangle { Layout.fillWidth: true color: '#434343' - implicitHeight: contact.height + implicitHeight: _contact.height Contact { id: contact diff --git a/tests/ui/modules/Linphone/Call/ConnectedCallsControl.qml b/tests/ui/modules/Linphone/Call/ConnectedCallsControl.qml new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/tests/ui/modules/Linphone/Call/ConnectedCallsControl.qml @@ -0,0 +1 @@ + diff --git a/tests/ui/modules/Linphone/Call/IncomingCallControls.qml b/tests/ui/modules/Linphone/Call/IncomingCallControls.qml new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/tests/ui/modules/Linphone/Call/IncomingCallControls.qml @@ -0,0 +1 @@ + diff --git a/tests/ui/modules/Linphone/Call/OutgoingCallControls.qml b/tests/ui/modules/Linphone/Call/OutgoingCallControls.qml new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/tests/ui/modules/Linphone/Call/OutgoingCallControls.qml @@ -0,0 +1 @@ + diff --git a/tests/ui/modules/Linphone/Call/PausedCallControls.qml b/tests/ui/modules/Linphone/Call/PausedCallControls.qml new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/tests/ui/modules/Linphone/Call/PausedCallControls.qml @@ -0,0 +1 @@ + diff --git a/tests/ui/views/App/Calls/Calls.qml b/tests/ui/views/App/Calls/Calls.qml index bb3cf0751..e289713a2 100644 --- a/tests/ui/views/App/Calls/Calls.qml +++ b/tests/ui/views/App/Calls/Calls.qml @@ -1,11 +1,15 @@ import QtQuick 2.7 +import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 import Common 1.0 import Linphone 1.0 +import App.Styles 1.0 + +// =================================================================== + Window { id: window @@ -18,7 +22,10 @@ Window { maximumLeftLimit: 300 minimumLeftLimit: 150 + // --------------------------------------------------------------- // Calls list. + // --------------------------------------------------------------- + childA: ColumnLayout { anchors.fill: parent spacing: 0 @@ -53,91 +60,14 @@ Window { width: parent.width } - model: ListModel { - ListElement { - $presence: 'do_not_disturb' - $sipAddress: 'charles.henri.sip.linphone.org' - } - ListElement { - $presence: 'disconnected' - $sipAddress: 'yesyes.nono.sip.linphone.org' - } - ListElement { - $presence: 'connected' - $sipAddress: 'nsa.sip.linphone.org' - } - ListElement { - $presence: 'do_not_disturb' - $sipAddress: 'charles.henri.sip.linphone.org' - } - ListElement { - $presence: 'disconnected' - $sipAddress: 'yesyes.nono.sip.linphone.org' - } - ListElement { - $presence: 'connected' - $sipAddress: 'nsa.sip.linphone.org' - } ListElement { - $presence: 'do_not_disturb' - $sipAddress: 'charles.henri.sip.linphone.org' - } - ListElement { - $presence: 'disconnected' - $sipAddress: 'yesyes.nono.sip.linphone.org' - } - ListElement { - $presence: 'connected' - $sipAddress: 'nsa.sip.linphone.org' - } ListElement { - $presence: 'do_not_disturb' - $sipAddress: 'charles.henri.sip.linphone.org' - } - ListElement { - $presence: 'disconnected' - $sipAddress: 'yesyes.nono.sip.linphone.org' - } - ListElement { - $presence: 'connected' - $sipAddress: 'nsa.sip.linphone.org' - } ListElement { - $presence: 'do_not_disturb' - $sipAddress: 'charles.henri.sip.linphone.org' - } - ListElement { - $presence: 'disconnected' - $sipAddress: 'yesyes.nono.sip.linphone.org' - } - ListElement { - $presence: 'connected' - $sipAddress: 'nsa.sip.linphone.org' - } ListElement { - $presence: 'do_not_disturb' - $sipAddress: 'charles.henri.sip.linphone.org' - } - ListElement { - $presence: 'disconnected' - $sipAddress: 'yesyes.nono.sip.linphone.org' - } - ListElement { - $presence: 'connected' - $sipAddress: 'nsa.sip.linphone.org' - } ListElement { - $presence: 'do_not_disturb' - $sipAddress: 'charles.henri.sip.linphone.org' - } - ListElement { - $presence: 'disconnected' - $sipAddress: 'yesyes.nono.sip.linphone.org' - } - ListElement { - $presence: 'connected' - $sipAddress: 'nsa.sip.linphone.org' - } - } + model: callsList } } - // Call / Chat. + // --------------------------------------------------------------- + // Content. + // --------------------------------------------------------------- + childB: Paned { anchors.fill: parent closingEdge: Qt.RightEdge @@ -148,7 +78,7 @@ Window { resizeAInPriority: true // Call. - childA: StartingOutgoingCall { + childA: Rectangle { anchors.fill: parent } @@ -158,4 +88,97 @@ Window { } } } + + // ----------------------------------------------------------------- + // TMP + // ----------------------------------------------------------------- + + ListModel { + id: callsList + + ListElement { + $presence: 'do_not_disturb' + $sipAddress: 'charles.henri.sip.linphone.org' + } + ListElement { + $presence: 'disconnected' + $sipAddress: 'yesyes.nono.sip.linphone.org' + } + ListElement { + $presence: 'connected' + $sipAddress: 'nsa.sip.linphone.org' + } + ListElement { + $presence: 'do_not_disturb' + $sipAddress: 'charles.henri.sip.linphone.org' + } + ListElement { + $presence: 'disconnected' + $sipAddress: 'yesyes.nono.sip.linphone.org' + } + ListElement { + $presence: 'connected' + $sipAddress: 'nsa.sip.linphone.org' + } + ListElement { + $presence: 'do_not_disturb' + $sipAddress: 'charles.henri.sip.linphone.org' + } + ListElement { + $presence: 'disconnected' + $sipAddress: 'yesyes.nono.sip.linphone.org' + } + ListElement { + $presence: 'connected' + $sipAddress: 'nsa.sip.linphone.org' + } + ListElement { + $presence: 'do_not_disturb' + $sipAddress: 'charles.henri.sip.linphone.org' + } + ListElement { + $presence: 'disconnected' + $sipAddress: 'yesyes.nono.sip.linphone.org' + } + ListElement { + $presence: 'connected' + $sipAddress: 'nsa.sip.linphone.org' + } + ListElement { + $presence: 'do_not_disturb' + $sipAddress: 'charles.henri.sip.linphone.org' + } + ListElement { + $presence: 'disconnected' + $sipAddress: 'yesyes.nono.sip.linphone.org' + } + ListElement { + $presence: 'connected' + $sipAddress: 'nsa.sip.linphone.org' + } + ListElement { + $presence: 'do_not_disturb' + $sipAddress: 'charles.henri.sip.linphone.org' + } + ListElement { + $presence: 'disconnected' + $sipAddress: 'yesyes.nono.sip.linphone.org' + } + ListElement { + $presence: 'connected' + $sipAddress: 'nsa.sip.linphone.org' + } + ListElement { + $presence: 'do_not_disturb' + $sipAddress: 'charles.henri.sip.linphone.org' + } + ListElement { + $presence: 'disconnected' + $sipAddress: 'yesyes.nono.sip.linphone.org' + } + ListElement { + $presence: 'connected' + $sipAddress: 'nsa.sip.linphone.org' + } + } } diff --git a/tests/ui/views/App/Styles/Calls/CallsStyle.qml b/tests/ui/views/App/Styles/Calls/CallsStyle.qml new file mode 100644 index 000000000..568b384f3 --- /dev/null +++ b/tests/ui/views/App/Styles/Calls/CallsStyle.qml @@ -0,0 +1,11 @@ +pragma Singleton +import QtQuick 2.7 + +import Common 1.0 + +// =================================================================== + +QtObject { + + +} diff --git a/tests/ui/views/App/Styles/qmldir b/tests/ui/views/App/Styles/qmldir index b777a2faf..3462d7a04 100644 --- a/tests/ui/views/App/Styles/qmldir +++ b/tests/ui/views/App/Styles/qmldir @@ -4,6 +4,8 @@ module App.Styles # Views styles ------------------------------------------------------- +singleton CallsStyle 1.0 Calls/CallsStyle.qml + singleton ContactsStyle 1.0 MainWindow/ContactsStyle.qml singleton ConversationStyle 1.0 MainWindow/ConversationStyle.qml singleton MainWindowStyle 1.0 MainWindow/MainWindowStyle.qml