feat(app): create a Common module wich contains no linphone components

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 \

tests/resources.qrc

@@ -28,68 +28,70 @@
     <file>imgs/valid.svg</file>
     <file>languages/en.qm</file>
     <file>languages/fr.qm</file>
-    <file>ui/modules/Linphone/Borders.qml</file>
+    <file>ui/modules/Common/Borders.qml</file>
+    <file>ui/modules/Common/Collapse.qml</file>
+    <file>ui/modules/Common/Colors.qml</file>
+    <file>ui/modules/Common/Constants.qml</file>
+    <file>ui/modules/Common/Dialog/ConfirmDialog.qml</file>
+    <file>ui/modules/Common/Dialog/DialogDescription.qml</file>
+    <file>ui/modules/Common/Dialog/DialogPlus.qml</file>
+    <file>ui/modules/Common/DroppableTextArea.qml</file>
+    <file>ui/modules/Common/DropZone.qml</file>
+    <file>ui/modules/Common/ForceScrollBar.qml</file>
+    <file>ui/modules/Common/Form/AbstractTextButton.qml</file>
+    <file>ui/modules/Common/Form/ActionBar.qml</file>
+    <file>ui/modules/Common/Form/ActionButton.qml</file>
+    <file>ui/modules/Common/Form/CheckBoxText.qml</file>
+    <file>ui/modules/Common/Form/ExclusiveButtons.qml</file>
+    <file>ui/modules/Common/Form/ListForm.qml</file>
+    <file>ui/modules/Common/Form/SmallButton.qml</file>
+    <file>ui/modules/Common/Form/TextButtonA.qml</file>
+    <file>ui/modules/Common/Form/TextButtonB.qml</file>
+    <file>ui/modules/Common/Form/TransparentComboBox.qml</file>
+    <file>ui/modules/Common/Image/Icon.qml</file>
+    <file>ui/modules/Common/Image/RoundedImage.qml</file>
+    <file>ui/modules/Common/InvertedMouseArea.qml</file>
+    <file>ui/modules/Common/Menu.qml</file>
+    <file>ui/modules/Common/Paned.qml</file>
+    <file>ui/modules/Common/Popup/DropDownMenu.qml</file>
+    <file>ui/modules/Common/Popup/PopupShadow.qml</file>
+    <file>ui/modules/Common/qmldir</file>
+    <file>ui/modules/Common/SearchBox.qml</file>
+    <file>ui/modules/Common/Styles/CollapseStyle.qml</file>
+    <file>ui/modules/Common/Styles/DialogStyle.qml</file>
+    <file>ui/modules/Common/Styles/ForceScrollBarStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/ActionBarStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/ListFormStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/SmallButtonStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/TextButtonAStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/TextButtonBStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml</file>
+    <file>ui/modules/Common/Styles/MenuStyle.qml</file>
+    <file>ui/modules/Common/Styles/PanedStyle.qml</file>
+    <file>ui/modules/Common/Styles/PopupStyle.qml</file>
+    <file>ui/modules/Common/Styles/qmldir</file>
+    <file>ui/modules/Common/Styles/SearchBoxStyle.qml</file>
+    <file>ui/modules/Common/View/ScrollableListView.qml</file>
     <file>ui/modules/Linphone/Chat/Chat.qml</file>
     <file>ui/modules/Linphone/Chat/Event.qml</file>
     <file>ui/modules/Linphone/Chat/IncomingMessage.qml</file>
     <file>ui/modules/Linphone/Chat/Message.qml</file>
     <file>ui/modules/Linphone/Chat/OutgoingMessage.qml</file>
-    <file>ui/modules/Linphone/Collapse.qml</file>
-    <file>ui/modules/Linphone/Colors.qml</file>
-    <file>ui/modules/Linphone/Constants.qml</file>
     <file>ui/modules/Linphone/Contact/Avatar.qml</file>
     <file>ui/modules/Linphone/Contact/ContactDescription.qml</file>
     <file>ui/modules/Linphone/Contact/Contact.qml</file>
     <file>ui/modules/Linphone/Contact/PresenceLevel.qml</file>
-    <file>ui/modules/Linphone/Dialog/ConfirmDialog.qml</file>
-    <file>ui/modules/Linphone/Dialog/DialogDescription.qml</file>
-    <file>ui/modules/Linphone/Dialog/DialogPlus.qml</file>
-    <file>ui/modules/Linphone/DroppableTextArea.qml</file>
-    <file>ui/modules/Linphone/DropZone.qml</file>
-    <file>ui/modules/Linphone/ForceScrollBar.qml</file>
-    <file>ui/modules/Linphone/Form/AbstractTextButton.qml</file>
-    <file>ui/modules/Linphone/Form/ActionBar.qml</file>
-    <file>ui/modules/Linphone/Form/ActionButton.qml</file>
-    <file>ui/modules/Linphone/Form/CheckBoxText.qml</file>
-    <file>ui/modules/Linphone/Form/ExclusiveButtons.qml</file>
-    <file>ui/modules/Linphone/Form/ListForm.qml</file>
-    <file>ui/modules/Linphone/Form/SmallButton.qml</file>
-    <file>ui/modules/Linphone/Form/TextButtonA.qml</file>
-    <file>ui/modules/Linphone/Form/TextButtonB.qml</file>
-    <file>ui/modules/Linphone/Form/TransparentComboBox.qml</file>
-    <file>ui/modules/Linphone/Image/Icon.qml</file>
-    <file>ui/modules/Linphone/Image/RoundedImage.qml</file>
-    <file>ui/modules/Linphone/InvertedMouseArea.qml</file>
-    <file>ui/modules/Linphone/Menu.qml</file>
-    <file>ui/modules/Linphone/Paned.qml</file>
-    <file>ui/modules/Linphone/Popup/DropDownMenu.qml</file>
-    <file>ui/modules/Linphone/Popup/PopupShadow.qml</file>
     <file>ui/modules/Linphone/qmldir</file>
-    <file>ui/modules/Linphone/SearchBox.qml</file>
     <file>ui/modules/Linphone/Select/SelectContact.qml</file>
-    <file>ui/modules/Linphone/Styles/CollapseStyle.qml</file>
     <file>ui/modules/Linphone/Styles/Contact/AvatarStyle.qml</file>
     <file>ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml</file>
     <file>ui/modules/Linphone/Styles/Contact/ContactStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/DialogStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/ForceScrollBarStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/Form/ActionBarStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/Form/CheckBoxTextStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/Form/ExclusiveButtonsStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/Form/ListFormStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/Form/TransparentComboBoxStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/MenuStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/PanedStyle.qml</file>
-    <file>ui/modules/Linphone/Styles/PopupStyle.qml</file>
     <file>ui/modules/Linphone/Styles/qmldir</file>
-    <file>ui/modules/Linphone/Styles/SearchBoxStyle.qml</file>
     <file>ui/modules/Linphone/Styles/TimelineStyle.qml</file>
     <file>ui/modules/Linphone/Timeline.qml</file>
-    <file>ui/modules/Linphone/View/ScrollableListView.qml</file>
     <file>ui/scripts/Utils/qmldir</file>
     <file>ui/scripts/Utils/utils.js</file>
     <file>ui/views/Calls/Calls.qml</file>

tests/src/main.cpp

@@ -1,12 +1,12 @@
-
 #include <QMenu>
 #include <QQmlApplicationEngine>
+#include <QQmlComponent>
 #include <QQmlContext>
 #include <QQmlFileSelector>
 #include <QQuickView>
 #include <QSystemTrayIcon>
 #include <QtDebug>
- #include <QQmlComponent>
+
 #include "app.hpp"
 #include "components/contacts/ContactsListProxyModel.hpp"
 #include "components/notification/Notification.hpp"

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.

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.

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.

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.

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
 
 // ===================================================================
 

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
 
 // ===================================================================
 

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.

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.

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.

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
 
 // ===================================================================
 

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
 
 // ===================================================================
 

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
 
 // ===================================================================
 

tests/ui/modules/Common/Form/TextButtonA.qml

@@ -1,4 +1,4 @@
-import Linphone.Styles 1.0
+import Common.Styles 1.0
 
 // ===================================================================
 

tests/ui/modules/Common/Form/TextButtonB.qml

@@ -1,4 +1,4 @@
-import Linphone.Styles 1.0
+import Common.Styles 1.0
 
 // ===================================================================
 

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.

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
 
 // ===================================================================

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.

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
 
 // ===================================================================

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.

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
 
 // ===================================================================
 

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
 
 // ===================================================================
 

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

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 {

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

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

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

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 {

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 {

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 {

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 {

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

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

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

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

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

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
 
 // ===================================================================
 

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

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 {

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 {

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
 

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`. */
 
 // ===================================================================
 

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 {

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 {

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 {

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

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
 
 // ===================================================================

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

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 + '\'' +

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 {

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 {

tests/ui/views/Calls/StartingIncomingCall.qml

@@ -1,3 +1,4 @@
+import Common 1.0
 import Linphone 1.0
 
 StartingCall {

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 {

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++.
       }
 

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
 

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  {

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
 
 // ===================================================================

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
 

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 {