diff --git a/tests/linphone.pro b/tests/linphone.pro index c9e1a22b8..96515e41f 100644 --- a/tests/linphone.pro +++ b/tests/linphone.pro @@ -34,18 +34,20 @@ TRANSLATIONS = \ lupdate_only{ SOURCES = \ + ui/modules/Common/*.qml \ + ui/modules/Common/Dialog/*.qml \ + ui/modules/Common/Form/*.qml \ + ui/modules/Common/Image/*.qml \ + ui/modules/Common/Popup/*.qml \ + ui/modules/Common/Styles/*.qml \ + ui/modules/Common/Styles/Form/*.qml \ + ui/modules/Common/View/*.qml \ ui/modules/Linphone/*.qml \ ui/modules/Linphone/Chat/*.qml \ ui/modules/Linphone/Contact/*.qml \ - ui/modules/Linphone/Dialog/*.qml \ - ui/modules/Linphone/Form/*.qml \ - ui/modules/Linphone/Image/*.qml \ - ui/modules/Linphone/Popup/*.qml \ ui/modules/Linphone/Select/*.qml \ ui/modules/Linphone/Styles/*.qml \ ui/modules/Linphone/Styles/Contact/*.qml \ - ui/modules/Linphone/Styles/Form/*.qml \ - ui/modules/Linphone/View/*.qml \ ui/views/*.qml \ ui/views/Calls/*.qml \ ui/views/MainWindow/*.qml \ diff --git a/tests/resources.qrc b/tests/resources.qrc index 1a5ebe4fa..006cb433a 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -28,68 +28,70 @@ imgs/valid.svg languages/en.qm languages/fr.qm - ui/modules/Linphone/Borders.qml + ui/modules/Common/Borders.qml + ui/modules/Common/Collapse.qml + ui/modules/Common/Colors.qml + ui/modules/Common/Constants.qml + ui/modules/Common/Dialog/ConfirmDialog.qml + ui/modules/Common/Dialog/DialogDescription.qml + ui/modules/Common/Dialog/DialogPlus.qml + ui/modules/Common/DroppableTextArea.qml + ui/modules/Common/DropZone.qml + ui/modules/Common/ForceScrollBar.qml + ui/modules/Common/Form/AbstractTextButton.qml + ui/modules/Common/Form/ActionBar.qml + ui/modules/Common/Form/ActionButton.qml + ui/modules/Common/Form/CheckBoxText.qml + ui/modules/Common/Form/ExclusiveButtons.qml + ui/modules/Common/Form/ListForm.qml + ui/modules/Common/Form/SmallButton.qml + ui/modules/Common/Form/TextButtonA.qml + ui/modules/Common/Form/TextButtonB.qml + ui/modules/Common/Form/TransparentComboBox.qml + ui/modules/Common/Image/Icon.qml + ui/modules/Common/Image/RoundedImage.qml + ui/modules/Common/InvertedMouseArea.qml + ui/modules/Common/Menu.qml + ui/modules/Common/Paned.qml + ui/modules/Common/Popup/DropDownMenu.qml + ui/modules/Common/Popup/PopupShadow.qml + ui/modules/Common/qmldir + ui/modules/Common/SearchBox.qml + ui/modules/Common/Styles/CollapseStyle.qml + ui/modules/Common/Styles/DialogStyle.qml + ui/modules/Common/Styles/ForceScrollBarStyle.qml + ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml + ui/modules/Common/Styles/Form/ActionBarStyle.qml + ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml + ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml + ui/modules/Common/Styles/Form/ListFormStyle.qml + ui/modules/Common/Styles/Form/SmallButtonStyle.qml + ui/modules/Common/Styles/Form/TextButtonAStyle.qml + ui/modules/Common/Styles/Form/TextButtonBStyle.qml + ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml + ui/modules/Common/Styles/MenuStyle.qml + ui/modules/Common/Styles/PanedStyle.qml + ui/modules/Common/Styles/PopupStyle.qml + ui/modules/Common/Styles/qmldir + ui/modules/Common/Styles/SearchBoxStyle.qml + ui/modules/Common/View/ScrollableListView.qml ui/modules/Linphone/Chat/Chat.qml ui/modules/Linphone/Chat/Event.qml ui/modules/Linphone/Chat/IncomingMessage.qml ui/modules/Linphone/Chat/Message.qml ui/modules/Linphone/Chat/OutgoingMessage.qml - ui/modules/Linphone/Collapse.qml - ui/modules/Linphone/Colors.qml - ui/modules/Linphone/Constants.qml ui/modules/Linphone/Contact/Avatar.qml ui/modules/Linphone/Contact/ContactDescription.qml ui/modules/Linphone/Contact/Contact.qml ui/modules/Linphone/Contact/PresenceLevel.qml - ui/modules/Linphone/Dialog/ConfirmDialog.qml - ui/modules/Linphone/Dialog/DialogDescription.qml - ui/modules/Linphone/Dialog/DialogPlus.qml - ui/modules/Linphone/DroppableTextArea.qml - ui/modules/Linphone/DropZone.qml - ui/modules/Linphone/ForceScrollBar.qml - ui/modules/Linphone/Form/AbstractTextButton.qml - ui/modules/Linphone/Form/ActionBar.qml - ui/modules/Linphone/Form/ActionButton.qml - ui/modules/Linphone/Form/CheckBoxText.qml - ui/modules/Linphone/Form/ExclusiveButtons.qml - ui/modules/Linphone/Form/ListForm.qml - ui/modules/Linphone/Form/SmallButton.qml - ui/modules/Linphone/Form/TextButtonA.qml - ui/modules/Linphone/Form/TextButtonB.qml - ui/modules/Linphone/Form/TransparentComboBox.qml - ui/modules/Linphone/Image/Icon.qml - ui/modules/Linphone/Image/RoundedImage.qml - ui/modules/Linphone/InvertedMouseArea.qml - ui/modules/Linphone/Menu.qml - ui/modules/Linphone/Paned.qml - ui/modules/Linphone/Popup/DropDownMenu.qml - ui/modules/Linphone/Popup/PopupShadow.qml ui/modules/Linphone/qmldir - ui/modules/Linphone/SearchBox.qml ui/modules/Linphone/Select/SelectContact.qml - ui/modules/Linphone/Styles/CollapseStyle.qml ui/modules/Linphone/Styles/Contact/AvatarStyle.qml ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml ui/modules/Linphone/Styles/Contact/ContactStyle.qml - ui/modules/Linphone/Styles/DialogStyle.qml - ui/modules/Linphone/Styles/ForceScrollBarStyle.qml - ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml - ui/modules/Linphone/Styles/Form/ActionBarStyle.qml - ui/modules/Linphone/Styles/Form/CheckBoxTextStyle.qml - ui/modules/Linphone/Styles/Form/ExclusiveButtonsStyle.qml - ui/modules/Linphone/Styles/Form/ListFormStyle.qml - ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml - ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml - ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml - ui/modules/Linphone/Styles/Form/TransparentComboBoxStyle.qml - ui/modules/Linphone/Styles/MenuStyle.qml - ui/modules/Linphone/Styles/PanedStyle.qml - ui/modules/Linphone/Styles/PopupStyle.qml ui/modules/Linphone/Styles/qmldir - ui/modules/Linphone/Styles/SearchBoxStyle.qml ui/modules/Linphone/Styles/TimelineStyle.qml ui/modules/Linphone/Timeline.qml - ui/modules/Linphone/View/ScrollableListView.qml ui/scripts/Utils/qmldir ui/scripts/Utils/utils.js ui/views/Calls/Calls.qml diff --git a/tests/src/main.cpp b/tests/src/main.cpp index c5c624ae1..854363449 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -1,12 +1,12 @@ - #include #include +#include #include #include #include #include #include - #include + #include "app.hpp" #include "components/contacts/ContactsListProxyModel.hpp" #include "components/notification/Notification.hpp" diff --git a/tests/ui/modules/Linphone/Borders.qml b/tests/ui/modules/Common/Borders.qml similarity index 100% rename from tests/ui/modules/Linphone/Borders.qml rename to tests/ui/modules/Common/Borders.qml diff --git a/tests/ui/modules/Linphone/Collapse.qml b/tests/ui/modules/Common/Collapse.qml similarity index 97% rename from tests/ui/modules/Linphone/Collapse.qml rename to tests/ui/modules/Common/Collapse.qml index 27dd18d4f..375411124 100644 --- a/tests/ui/modules/Linphone/Collapse.qml +++ b/tests/ui/modules/Common/Collapse.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== // A simple component to build collapsed item. diff --git a/tests/ui/modules/Linphone/Colors.qml b/tests/ui/modules/Common/Colors.qml similarity index 100% rename from tests/ui/modules/Linphone/Colors.qml rename to tests/ui/modules/Common/Colors.qml diff --git a/tests/ui/modules/Linphone/Constants.qml b/tests/ui/modules/Common/Constants.qml similarity index 100% rename from tests/ui/modules/Linphone/Constants.qml rename to tests/ui/modules/Common/Constants.qml diff --git a/tests/ui/modules/Linphone/Dialog/ConfirmDialog.qml b/tests/ui/modules/Common/Dialog/ConfirmDialog.qml similarity index 92% rename from tests/ui/modules/Linphone/Dialog/ConfirmDialog.qml rename to tests/ui/modules/Common/Dialog/ConfirmDialog.qml index 4e371bf19..c39240faf 100644 --- a/tests/ui/modules/Linphone/Dialog/ConfirmDialog.qml +++ b/tests/ui/modules/Common/Dialog/ConfirmDialog.qml @@ -1,5 +1,5 @@ -import Linphone 1.0 -import Linphone.Styles 1.0 +import Common 1.0 +import Common.Styles 1.0 // =================================================================== // A dialog with OK/Cancel buttons. diff --git a/tests/ui/modules/Linphone/Dialog/DialogDescription.qml b/tests/ui/modules/Common/Dialog/DialogDescription.qml similarity index 96% rename from tests/ui/modules/Linphone/Dialog/DialogDescription.qml rename to tests/ui/modules/Common/Dialog/DialogDescription.qml index 1ef707b99..9d4c8ef28 100644 --- a/tests/ui/modules/Linphone/Dialog/DialogDescription.qml +++ b/tests/ui/modules/Common/Dialog/DialogDescription.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== // Description content used by dialogs. diff --git a/tests/ui/modules/Linphone/Dialog/DialogPlus.qml b/tests/ui/modules/Common/Dialog/DialogPlus.qml similarity index 98% rename from tests/ui/modules/Linphone/Dialog/DialogPlus.qml rename to tests/ui/modules/Common/Dialog/DialogPlus.qml index 8b595c1ee..fdff109e9 100644 --- a/tests/ui/modules/Linphone/Dialog/DialogPlus.qml +++ b/tests/ui/modules/Common/Dialog/DialogPlus.qml @@ -2,7 +2,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 import QtQuick.Window 2.2 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== // Helper to build quickly dialogs. diff --git a/tests/ui/modules/Linphone/DropZone.qml b/tests/ui/modules/Common/DropZone.qml similarity index 100% rename from tests/ui/modules/Linphone/DropZone.qml rename to tests/ui/modules/Common/DropZone.qml diff --git a/tests/ui/modules/Linphone/DroppableTextArea.qml b/tests/ui/modules/Common/DroppableTextArea.qml similarity index 100% rename from tests/ui/modules/Linphone/DroppableTextArea.qml rename to tests/ui/modules/Common/DroppableTextArea.qml diff --git a/tests/ui/modules/Linphone/ForceScrollBar.qml b/tests/ui/modules/Common/ForceScrollBar.qml similarity index 95% rename from tests/ui/modules/Linphone/ForceScrollBar.qml rename to tests/ui/modules/Common/ForceScrollBar.qml index 4a7505fb1..2d537f8fe 100644 --- a/tests/ui/modules/Linphone/ForceScrollBar.qml +++ b/tests/ui/modules/Common/ForceScrollBar.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/Form/AbstractTextButton.qml b/tests/ui/modules/Common/Form/AbstractTextButton.qml similarity index 97% rename from tests/ui/modules/Linphone/Form/AbstractTextButton.qml rename to tests/ui/modules/Common/Form/AbstractTextButton.qml index e344f6462..290a72881 100644 --- a/tests/ui/modules/Linphone/Form/AbstractTextButton.qml +++ b/tests/ui/modules/Common/Form/AbstractTextButton.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/Form/ActionBar.qml b/tests/ui/modules/Common/Form/ActionBar.qml similarity index 90% rename from tests/ui/modules/Linphone/Form/ActionBar.qml rename to tests/ui/modules/Common/Form/ActionBar.qml index 7d0133aab..d476100ab 100644 --- a/tests/ui/modules/Linphone/Form/ActionBar.qml +++ b/tests/ui/modules/Common/Form/ActionBar.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== // Bar which can contains ActionButtons. diff --git a/tests/ui/modules/Linphone/Form/ActionButton.qml b/tests/ui/modules/Common/Form/ActionButton.qml similarity index 96% rename from tests/ui/modules/Linphone/Form/ActionButton.qml rename to tests/ui/modules/Common/Form/ActionButton.qml index 8a621b591..0cfa3dc21 100644 --- a/tests/ui/modules/Linphone/Form/ActionButton.qml +++ b/tests/ui/modules/Common/Form/ActionButton.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import Linphone 1.0 +import Common 1.0 // =================================================================== // An animated small button with an image. diff --git a/tests/ui/modules/Linphone/Form/CheckBoxText.qml b/tests/ui/modules/Common/Form/CheckBoxText.qml similarity index 98% rename from tests/ui/modules/Linphone/Form/CheckBoxText.qml rename to tests/ui/modules/Common/Form/CheckBoxText.qml index 7baeb0944..de8435b0c 100644 --- a/tests/ui/modules/Linphone/Form/CheckBoxText.qml +++ b/tests/ui/modules/Common/Form/CheckBoxText.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== // Checkbox with clickable text. diff --git a/tests/ui/modules/Linphone/Form/ExclusiveButtons.qml b/tests/ui/modules/Common/Form/ExclusiveButtons.qml similarity index 96% rename from tests/ui/modules/Linphone/Form/ExclusiveButtons.qml rename to tests/ui/modules/Common/Form/ExclusiveButtons.qml index bf14d071b..9780a1849 100644 --- a/tests/ui/modules/Linphone/Form/ExclusiveButtons.qml +++ b/tests/ui/modules/Common/Form/ExclusiveButtons.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/Form/ListForm.qml b/tests/ui/modules/Common/Form/ListForm.qml similarity index 98% rename from tests/ui/modules/Linphone/Form/ListForm.qml rename to tests/ui/modules/Common/Form/ListForm.qml index 832c0e6c8..e7402aa51 100644 --- a/tests/ui/modules/Linphone/Form/ListForm.qml +++ b/tests/ui/modules/Common/Form/ListForm.qml @@ -1,8 +1,8 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 -import Linphone 1.0 -import Linphone.Styles 1.0 +import Common 1.0 +import Common.Styles 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/Form/SmallButton.qml b/tests/ui/modules/Common/Form/SmallButton.qml similarity index 96% rename from tests/ui/modules/Linphone/Form/SmallButton.qml rename to tests/ui/modules/Common/Form/SmallButton.qml index e7d84ab6f..eb1431168 100644 --- a/tests/ui/modules/Linphone/Form/SmallButton.qml +++ b/tests/ui/modules/Common/Form/SmallButton.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/Form/TextButtonA.qml b/tests/ui/modules/Common/Form/TextButtonA.qml similarity index 94% rename from tests/ui/modules/Linphone/Form/TextButtonA.qml rename to tests/ui/modules/Common/Form/TextButtonA.qml index 99c81deb8..e07d31786 100644 --- a/tests/ui/modules/Linphone/Form/TextButtonA.qml +++ b/tests/ui/modules/Common/Form/TextButtonA.qml @@ -1,4 +1,4 @@ -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/Form/TextButtonB.qml b/tests/ui/modules/Common/Form/TextButtonB.qml similarity index 94% rename from tests/ui/modules/Linphone/Form/TextButtonB.qml rename to tests/ui/modules/Common/Form/TextButtonB.qml index 8d5d29184..aacaf6c22 100644 --- a/tests/ui/modules/Linphone/Form/TextButtonB.qml +++ b/tests/ui/modules/Common/Form/TextButtonB.qml @@ -1,4 +1,4 @@ -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/Form/TransparentComboBox.qml b/tests/ui/modules/Common/Form/TransparentComboBox.qml similarity index 96% rename from tests/ui/modules/Linphone/Form/TransparentComboBox.qml rename to tests/ui/modules/Common/Form/TransparentComboBox.qml index 1308080a1..aa446d29d 100644 --- a/tests/ui/modules/Linphone/Form/TransparentComboBox.qml +++ b/tests/ui/modules/Common/Form/TransparentComboBox.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== // Discrete ComboBox that can be integrated in text. diff --git a/tests/ui/modules/Linphone/Image/Icon.qml b/tests/ui/modules/Common/Image/Icon.qml similarity index 100% rename from tests/ui/modules/Linphone/Image/Icon.qml rename to tests/ui/modules/Common/Image/Icon.qml diff --git a/tests/ui/modules/Linphone/Image/RoundedImage.qml b/tests/ui/modules/Common/Image/RoundedImage.qml similarity index 100% rename from tests/ui/modules/Linphone/Image/RoundedImage.qml rename to tests/ui/modules/Common/Image/RoundedImage.qml diff --git a/tests/ui/modules/Linphone/InvertedMouseArea.qml b/tests/ui/modules/Common/InvertedMouseArea.qml similarity index 99% rename from tests/ui/modules/Linphone/InvertedMouseArea.qml rename to tests/ui/modules/Common/InvertedMouseArea.qml index 547072c9c..011c0bd73 100644 --- a/tests/ui/modules/Linphone/InvertedMouseArea.qml +++ b/tests/ui/modules/Common/InvertedMouseArea.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 import Utils 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/Menu.qml b/tests/ui/modules/Common/Menu.qml similarity index 98% rename from tests/ui/modules/Linphone/Menu.qml rename to tests/ui/modules/Common/Menu.qml index 96de4d149..e82526f03 100644 --- a/tests/ui/modules/Linphone/Menu.qml +++ b/tests/ui/modules/Common/Menu.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== // Responsive flat menu with visual indicators. diff --git a/tests/ui/modules/Linphone/Paned.qml b/tests/ui/modules/Common/Paned.qml similarity index 99% rename from tests/ui/modules/Linphone/Paned.qml rename to tests/ui/modules/Common/Paned.qml index 43dcb9482..b15938e80 100644 --- a/tests/ui/modules/Linphone/Paned.qml +++ b/tests/ui/modules/Common/Paned.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 -import Linphone.Styles 1.0 +import Common.Styles 1.0 import Utils 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/Popup/DropDownMenu.qml b/tests/ui/modules/Common/Popup/DropDownMenu.qml similarity index 94% rename from tests/ui/modules/Linphone/Popup/DropDownMenu.qml rename to tests/ui/modules/Common/Popup/DropDownMenu.qml index 5e4922301..44b1262a7 100644 --- a/tests/ui/modules/Linphone/Popup/DropDownMenu.qml +++ b/tests/ui/modules/Common/Popup/DropDownMenu.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 -import Linphone 1.0 -import Linphone.Styles 1.0 +import Common 1.0 +import Common.Styles 1.0 // =================================================================== // Low component to display a list/menu in a popup. diff --git a/tests/ui/modules/Linphone/Popup/PopupShadow.qml b/tests/ui/modules/Common/Popup/PopupShadow.qml similarity index 92% rename from tests/ui/modules/Linphone/Popup/PopupShadow.qml rename to tests/ui/modules/Common/Popup/PopupShadow.qml index 21fa0d3c2..42078ba1c 100644 --- a/tests/ui/modules/Linphone/Popup/PopupShadow.qml +++ b/tests/ui/modules/Common/Popup/PopupShadow.qml @@ -1,6 +1,6 @@ import QtGraphicalEffects 1.0 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/SearchBox.qml b/tests/ui/modules/Common/SearchBox.qml similarity index 98% rename from tests/ui/modules/Linphone/SearchBox.qml rename to tests/ui/modules/Common/SearchBox.qml index ec61fcc7b..0414bf390 100644 --- a/tests/ui/modules/Linphone/SearchBox.qml +++ b/tests/ui/modules/Common/SearchBox.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import Linphone.Styles 1.0 +import Common.Styles 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/Styles/CollapseStyle.qml b/tests/ui/modules/Common/Styles/CollapseStyle.qml similarity index 100% rename from tests/ui/modules/Linphone/Styles/CollapseStyle.qml rename to tests/ui/modules/Common/Styles/CollapseStyle.qml diff --git a/tests/ui/modules/Linphone/Styles/DialogStyle.qml b/tests/ui/modules/Common/Styles/DialogStyle.qml similarity index 96% rename from tests/ui/modules/Linphone/Styles/DialogStyle.qml rename to tests/ui/modules/Common/Styles/DialogStyle.qml index e6d57acd6..f83b7cb1a 100644 --- a/tests/ui/modules/Linphone/Styles/DialogStyle.qml +++ b/tests/ui/modules/Common/Styles/DialogStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property int leftMargin: 50 diff --git a/tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml b/tests/ui/modules/Common/Styles/ForceScrollBarStyle.qml similarity index 95% rename from tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml rename to tests/ui/modules/Common/Styles/ForceScrollBarStyle.qml index 4f03c16d8..423aa73f8 100644 --- a/tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml +++ b/tests/ui/modules/Common/Styles/ForceScrollBarStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property Rectangle background: Rectangle { diff --git a/tests/ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml b/tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml similarity index 100% rename from tests/ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml rename to tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml diff --git a/tests/ui/modules/Linphone/Styles/Form/ActionBarStyle.qml b/tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml similarity index 100% rename from tests/ui/modules/Linphone/Styles/Form/ActionBarStyle.qml rename to tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml diff --git a/tests/ui/modules/Linphone/Styles/Form/CheckBoxTextStyle.qml b/tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml similarity index 92% rename from tests/ui/modules/Linphone/Styles/Form/CheckBoxTextStyle.qml rename to tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml index 8bdf06121..1c5bda498 100644 --- a/tests/ui/modules/Linphone/Styles/Form/CheckBoxTextStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property int radius: 3 diff --git a/tests/ui/modules/Linphone/Styles/Form/ExclusiveButtonsStyle.qml b/tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml similarity index 94% rename from tests/ui/modules/Linphone/Styles/Form/ExclusiveButtonsStyle.qml rename to tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml index 286202737..5f0c14519 100644 --- a/tests/ui/modules/Linphone/Styles/Form/ExclusiveButtonsStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property int buttonsSpacing: 8 diff --git a/tests/ui/modules/Linphone/Styles/Form/ListFormStyle.qml b/tests/ui/modules/Common/Styles/Form/ListFormStyle.qml similarity index 97% rename from tests/ui/modules/Linphone/Styles/Form/ListFormStyle.qml rename to tests/ui/modules/Common/Styles/Form/ListFormStyle.qml index 1dee356b6..a7d320853 100644 --- a/tests/ui/modules/Linphone/Styles/Form/ListFormStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/ListFormStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property int lineHeight: 30 diff --git a/tests/ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml b/tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml similarity index 95% rename from tests/ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml rename to tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml index d1daf2b01..73f1adf43 100644 --- a/tests/ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property QtObject background: QtObject { diff --git a/tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml b/tests/ui/modules/Common/Styles/Form/TextButtonAStyle.qml similarity index 94% rename from tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml rename to tests/ui/modules/Common/Styles/Form/TextButtonAStyle.qml index 26e527822..1f8d1ece3 100644 --- a/tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/TextButtonAStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property QtObject backgroundColor: QtObject { diff --git a/tests/ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml b/tests/ui/modules/Common/Styles/Form/TextButtonBStyle.qml similarity index 94% rename from tests/ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml rename to tests/ui/modules/Common/Styles/Form/TextButtonBStyle.qml index 7dfe9ebe2..56953bcab 100644 --- a/tests/ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/TextButtonBStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property QtObject backgroundColor: QtObject { diff --git a/tests/ui/modules/Linphone/Styles/Form/TransparentComboBoxStyle.qml b/tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml similarity index 92% rename from tests/ui/modules/Linphone/Styles/Form/TransparentComboBoxStyle.qml rename to tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml index 08e2c70ec..953344f2b 100644 --- a/tests/ui/modules/Linphone/Styles/Form/TransparentComboBoxStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property QtObject item: QtObject { diff --git a/tests/ui/modules/Linphone/Styles/MenuStyle.qml b/tests/ui/modules/Common/Styles/MenuStyle.qml similarity index 96% rename from tests/ui/modules/Linphone/Styles/MenuStyle.qml rename to tests/ui/modules/Common/Styles/MenuStyle.qml index 188cd0ec8..f22c08d81 100644 --- a/tests/ui/modules/Linphone/Styles/MenuStyle.qml +++ b/tests/ui/modules/Common/Styles/MenuStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property int spacing: 2 diff --git a/tests/ui/modules/Linphone/Styles/PanedStyle.qml b/tests/ui/modules/Common/Styles/PanedStyle.qml similarity index 94% rename from tests/ui/modules/Linphone/Styles/PanedStyle.qml rename to tests/ui/modules/Common/Styles/PanedStyle.qml index d9a8de52a..0ed181f37 100644 --- a/tests/ui/modules/Linphone/Styles/PanedStyle.qml +++ b/tests/ui/modules/Common/Styles/PanedStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property int transitionDuration: 200 diff --git a/tests/ui/modules/Linphone/Styles/PopupStyle.qml b/tests/ui/modules/Common/Styles/PopupStyle.qml similarity index 93% rename from tests/ui/modules/Linphone/Styles/PopupStyle.qml rename to tests/ui/modules/Common/Styles/PopupStyle.qml index 25291384b..fc9fafac6 100644 --- a/tests/ui/modules/Linphone/Styles/PopupStyle.qml +++ b/tests/ui/modules/Common/Styles/PopupStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property color backgroundColor: Colors.k diff --git a/tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml b/tests/ui/modules/Common/Styles/SearchBoxStyle.qml similarity index 89% rename from tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml rename to tests/ui/modules/Common/Styles/SearchBoxStyle.qml index 3f53bf58a..876277357 100644 --- a/tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml +++ b/tests/ui/modules/Common/Styles/SearchBoxStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property color shadowColor: Colors.f diff --git a/tests/ui/modules/Common/Styles/qmldir b/tests/ui/modules/Common/Styles/qmldir new file mode 100644 index 000000000..2e74365b2 --- /dev/null +++ b/tests/ui/modules/Common/Styles/qmldir @@ -0,0 +1,22 @@ +# See: https://wiki.qt.io/Qml_Styling + +module Common.Styles + +# Components styles. +singleton CollapseStyle 1.0 CollapseStyle.qml +singleton DialogStyle 1.0 DialogStyle.qml +singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml +singleton MenuStyle 1.0 MenuStyle.qml +singleton PanedStyle 1.0 PanedStyle.qml +singleton PopupStyle 1.0 PopupStyle.qml +singleton SearchBoxStyle 1.0 SearchBoxStyle.qml + +singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml +singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml +singleton CheckBoxTextStyle 1.0 Form/CheckBoxTextStyle.qml +singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml +singleton ListFormStyle 1.0 Form/ListFormStyle.qml +singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml +singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml +singleton TextButtonBStyle 1.0 Form/TextButtonBStyle.qml +singleton TransparentComboBoxStyle 1.0 Form/TransparentComboBoxStyle.qml diff --git a/tests/ui/modules/Linphone/View/ScrollableListView.qml b/tests/ui/modules/Common/View/ScrollableListView.qml similarity index 92% rename from tests/ui/modules/Linphone/View/ScrollableListView.qml rename to tests/ui/modules/Common/View/ScrollableListView.qml index 0feb4bce8..9c1157200 100644 --- a/tests/ui/modules/Linphone/View/ScrollableListView.qml +++ b/tests/ui/modules/Common/View/ScrollableListView.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import Linphone 1.0 +import Common 1.0 // =================================================================== diff --git a/tests/ui/modules/Common/qmldir b/tests/ui/modules/Common/qmldir new file mode 100644 index 000000000..8801f26a8 --- /dev/null +++ b/tests/ui/modules/Common/qmldir @@ -0,0 +1,65 @@ +# ==================================================================== +# Common's components to export. +# ==================================================================== + +module Common + +# Constants ---------------------------------------------------------- + +singleton Colors 1.0 Colors.qml +singleton Constants 1.0 Constants.qml + +# Components --------------------------------------------------------- + +# Chat +Borders 1.0 Borders.qml + +# Collapse +Collapse 1.0 Collapse.qml + +# Dialog +ConfirmDialog 1.0 Dialog/ConfirmDialog.qml +DialogPlus 1.0 Dialog/DialogPlus.qml + +# DropZone +DropZone 1.0 DropZone.qml + +# DroppableTextArea +DroppableTextArea 1.0 DroppableTextArea.qml + +# ForceScrollBar +ForceScrollBar 1.0 ForceScrollBar.qml + +# Form +ActionBar 1.0 Form/ActionBar.qml +ActionButton 1.0 Form/ActionButton.qml +CheckBoxText 1.0 Form/CheckBoxText.qml +ExclusiveButtons 1.0 Form/ExclusiveButtons.qml +LightButton 1.0 Form/LightButton.qml +ListForm 1.0 Form/ListForm.qml +TextButtonA 1.0 Form/TextButtonA.qml +TextButtonB 1.0 Form/TextButtonB.qml +TransparentComboBox 1.0 Form/TransparentComboBox.qml + +# Image +Icon 1.0 Image/Icon.qml +RoundedImage 1.0 Image/RoundedImage.qml + +# InvertedMouseArea +InvertedMouseArea 1.0 InvertedMouseArea.qml + +# Menu +Menu 1.0 Menu.qml + +# Paned +Paned 1.0 Paned.qml + +# Popup +DropDownMenu 1.0 Popup/DropDownMenu.qml +PopupShadow 1.0 Popup/PopupShadow.qml + +# SearchBox +SearchBox 1.0 SearchBox.qml + +# View +ScrollableListView 1.0 View/ScrollableListView.qml diff --git a/tests/ui/modules/Linphone/Chat/Chat.qml b/tests/ui/modules/Linphone/Chat/Chat.qml index 2471cf92e..2df728fea 100644 --- a/tests/ui/modules/Linphone/Chat/Chat.qml +++ b/tests/ui/modules/Linphone/Chat/Chat.qml @@ -2,6 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 ScrollableListView { diff --git a/tests/ui/modules/Linphone/Chat/OutgoingMessage.qml b/tests/ui/modules/Linphone/Chat/OutgoingMessage.qml index 605c0bde3..5945811bd 100644 --- a/tests/ui/modules/Linphone/Chat/OutgoingMessage.qml +++ b/tests/ui/modules/Linphone/Chat/OutgoingMessage.qml @@ -1,6 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 Message { diff --git a/tests/ui/modules/Linphone/Contact/Contact.qml b/tests/ui/modules/Linphone/Contact/Contact.qml index a7a8fb32d..c689ab502 100644 --- a/tests/ui/modules/Linphone/Contact/Contact.qml +++ b/tests/ui/modules/Linphone/Contact/Contact.qml @@ -1,6 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 import Linphone.Styles 1.0 diff --git a/tests/ui/modules/Linphone/Contact/PresenceLevel.qml b/tests/ui/modules/Linphone/Contact/PresenceLevel.qml index 3441f3f68..31988b7e2 100644 --- a/tests/ui/modules/Linphone/Contact/PresenceLevel.qml +++ b/tests/ui/modules/Linphone/Contact/PresenceLevel.qml @@ -1,6 +1,7 @@ import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 +import Linphone 1.0 /* It contains `Presence`. */ // =================================================================== diff --git a/tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml b/tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml index 865731788..96c4b180f 100644 --- a/tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml +++ b/tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property QtObject initials: QtObject { diff --git a/tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml b/tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml index a3d753618..124a68041 100644 --- a/tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml +++ b/tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property QtObject sipAddress: QtObject { diff --git a/tests/ui/modules/Linphone/Styles/TimelineStyle.qml b/tests/ui/modules/Linphone/Styles/TimelineStyle.qml index 6eb267611..c47fe27e8 100644 --- a/tests/ui/modules/Linphone/Styles/TimelineStyle.qml +++ b/tests/ui/modules/Linphone/Styles/TimelineStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import Linphone 1.0 +import Common 1.0 QtObject { property QtObject legend: QtObject { diff --git a/tests/ui/modules/Linphone/Styles/qmldir b/tests/ui/modules/Linphone/Styles/qmldir index 3346a6756..817c66db4 100644 --- a/tests/ui/modules/Linphone/Styles/qmldir +++ b/tests/ui/modules/Linphone/Styles/qmldir @@ -3,25 +3,8 @@ module Linphone.Style # Components styles. -singleton CollapseStyle 1.0 CollapseStyle.qml -singleton DialogStyle 1.0 DialogStyle.qml -singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml -singleton MenuStyle 1.0 MenuStyle.qml -singleton PanedStyle 1.0 PanedStyle.qml -singleton PopupStyle 1.0 PopupStyle.qml -singleton SearchBoxStyle 1.0 SearchBoxStyle.qml singleton TimelineStyle 1.0 TimelineStyle.qml singleton AvatarStyle 1.0 Contact/AvatarStyle.qml singleton ContactDescriptionStyle 1.0 Contact/ContactDescriptionStyle.qml singleton ContactStyle 1.0 Contact/ContactStyle.qml - -singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml -singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml -singleton CheckBoxTextStyle 1.0 Form/CheckBoxTextStyle.qml -singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml -singleton ListFormStyle 1.0 Form/ListFormStyle.qml -singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml -singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml -singleton TextButtonBStyle 1.0 Form/TextButtonBStyle.qml -singleton TransparentComboBoxStyle 1.0 Form/TransparentComboBoxStyle.qml diff --git a/tests/ui/modules/Linphone/Timeline.qml b/tests/ui/modules/Linphone/Timeline.qml index f6d530074..9c113a18e 100644 --- a/tests/ui/modules/Linphone/Timeline.qml +++ b/tests/ui/modules/Linphone/Timeline.qml @@ -1,6 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone.Styles 1.0 // =================================================================== diff --git a/tests/ui/modules/Linphone/qmldir b/tests/ui/modules/Linphone/qmldir index 72fa17f55..804f1681d 100644 --- a/tests/ui/modules/Linphone/qmldir +++ b/tests/ui/modules/Linphone/qmldir @@ -4,76 +4,19 @@ module Linphone -# Constants ---------------------------------------------------------- - -singleton Colors 1.0 Colors.qml -singleton Constants 1.0 Constants.qml - # Components --------------------------------------------------------- -# Chat -Borders 1.0 Borders.qml - # Chat Chat 1.0 Chat/Chat.qml -# Collapse -Collapse 1.0 Collapse.qml - # Contact Avatar 1.0 Contact/Avatar.qml Contact 1.0 Contact/Contact.qml ContactDescription 1.0 Contact/ContactDescription.qml PresenceLevel 1.0 Contact/PresenceLevel.qml -# Dialog -DialogPlus 1.0 Dialog/DialogPlus.qml - -# DropZone -DropZone 1.0 DropZone.qml - -# DroppableTextArea -DroppableTextArea 1.0 DroppableTextArea.qml - -# ForceScrollBar -ForceScrollBar 1.0 ForceScrollBar.qml - -# Form -ActionBar 1.0 Form/ActionBar.qml -ActionButton 1.0 Form/ActionButton.qml -CheckBoxText 1.0 Form/CheckBoxText.qml -ExclusiveButtons 1.0 Form/ExclusiveButtons.qml -LightButton 1.0 Form/LightButton.qml -ListForm 1.0 Form/ListForm.qml -TextButtonA 1.0 Form/TextButtonA.qml -TextButtonB 1.0 Form/TextButtonB.qml -TransparentComboBox 1.0 Form/TransparentComboBox.qml - -# Image -Icon 1.0 Image/Icon.qml -RoundedImage 1.0 Image/RoundedImage.qml - -# InvertedMouseArea -InvertedMouseArea 1.0 InvertedMouseArea.qml - -# Menu -Menu 1.0 Menu.qml - -# Paned -Paned 1.0 Paned.qml - -# Popup -DropDownMenu 1.0 Popup/DropDownMenu.qml -PopupShadow 1.0 Popup/PopupShadow.qml - -# SearchBox -SearchBox 1.0 SearchBox.qml - # Select SelectContact 1.0 Select/SelectContact.qml # Timeline Timeline 1.0 Timeline.qml - -# View -ScrollableListView 1.0 View/ScrollableListView.qml diff --git a/tests/ui/scripts/Utils/utils.js b/tests/ui/scripts/Utils/utils.js index 5ef0b9caf..32d1f0de4 100644 --- a/tests/ui/scripts/Utils/utils.js +++ b/tests/ui/scripts/Utils/utils.js @@ -57,7 +57,7 @@ function openWindow (window, parent, options) { function openConfirmDialog (parent, options) { openWindow( 'import QtQuick 2.7;' + - 'import \'qrc:/ui/modules/Linphone/Dialog\';' + + 'import Common 1.0;' + 'ConfirmDialog {' + 'descriptionText: \'' + options.descriptionText + '\';' + 'title: \'' + options.title + '\'' + diff --git a/tests/ui/views/Calls/Calls.qml b/tests/ui/views/Calls/Calls.qml index 05964de82..968dd3161 100644 --- a/tests/ui/views/Calls/Calls.qml +++ b/tests/ui/views/Calls/Calls.qml @@ -3,6 +3,7 @@ import QtQuick.Layouts 1.3 import QtQuick.Window 2.2 import QtQuick.Controls 2.0 +import Common 1.0 import Linphone 1.0 Window { diff --git a/tests/ui/views/Calls/StartingCall.qml b/tests/ui/views/Calls/StartingCall.qml index eaa85e8d8..0a90424c0 100644 --- a/tests/ui/views/Calls/StartingCall.qml +++ b/tests/ui/views/Calls/StartingCall.qml @@ -1,6 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 Rectangle { diff --git a/tests/ui/views/Calls/StartingIncomingCall.qml b/tests/ui/views/Calls/StartingIncomingCall.qml index 1a3b5a28b..cc9b18778 100644 --- a/tests/ui/views/Calls/StartingIncomingCall.qml +++ b/tests/ui/views/Calls/StartingIncomingCall.qml @@ -1,3 +1,4 @@ +import Common 1.0 import Linphone 1.0 StartingCall { diff --git a/tests/ui/views/Calls/StartingOutgoingCall.qml b/tests/ui/views/Calls/StartingOutgoingCall.qml index 1d1454873..964e09c54 100644 --- a/tests/ui/views/Calls/StartingOutgoingCall.qml +++ b/tests/ui/views/Calls/StartingOutgoingCall.qml @@ -1,6 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 StartingCall { diff --git a/tests/ui/views/MainWindow/Contact.qml b/tests/ui/views/MainWindow/Contact.qml index 7c306d6e2..d8a600c93 100644 --- a/tests/ui/views/MainWindow/Contact.qml +++ b/tests/ui/views/MainWindow/Contact.qml @@ -2,6 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 import Utils 1.0 @@ -27,7 +28,7 @@ ColumnLayout { Layout.fillHeight: true Layout.preferredWidth: 80 Layout.rightMargin: 30 - presence: 'connected' // TODO: Use C++. + presenceLevel: Presence.Online // TODO: Use C++. username: 'Cameron Andrews' // TODO: Use C++. } diff --git a/tests/ui/views/MainWindow/Contacts.qml b/tests/ui/views/MainWindow/Contacts.qml index 48552f0de..c6719698a 100644 --- a/tests/ui/views/MainWindow/Contacts.qml +++ b/tests/ui/views/MainWindow/Contacts.qml @@ -2,6 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 import Utils 1.0 diff --git a/tests/ui/views/MainWindow/Conversation.qml b/tests/ui/views/MainWindow/Conversation.qml index c81088f2e..e2c479f86 100644 --- a/tests/ui/views/MainWindow/Conversation.qml +++ b/tests/ui/views/MainWindow/Conversation.qml @@ -2,6 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 ColumnLayout { diff --git a/tests/ui/views/MainWindow/Home.qml b/tests/ui/views/MainWindow/Home.qml index a09ebf3ba..84febd6c4 100644 --- a/tests/ui/views/MainWindow/Home.qml +++ b/tests/ui/views/MainWindow/Home.qml @@ -1,6 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 // =================================================================== diff --git a/tests/ui/views/MainWindow/MainWindow.qml b/tests/ui/views/MainWindow/MainWindow.qml index 46a0a1f47..4ab1fdb08 100644 --- a/tests/ui/views/MainWindow/MainWindow.qml +++ b/tests/ui/views/MainWindow/MainWindow.qml @@ -2,6 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 import Utils 1.0 diff --git a/tests/ui/views/ManageAccounts.qml b/tests/ui/views/ManageAccounts.qml index 8abb29314..01e411f41 100644 --- a/tests/ui/views/ManageAccounts.qml +++ b/tests/ui/views/ManageAccounts.qml @@ -2,6 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 +import Common 1.0 import Linphone 1.0 DialogPlus {