From 2850facd800478ab95fd9775decaa61c2471bc65 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 26 Sep 2016 15:34:33 +0200 Subject: [PATCH] feat(app): use Linphone module (1.0)!!! --- tests/resources.qrc | 83 +++++++++---------- tests/src/main.cpp | 2 +- .../chat => Linphone/Chat}/Chat.qml | 4 +- .../chat => Linphone/Chat}/Event.qml | 0 .../Chat}/IncomingMessage.qml | 2 +- .../chat => Linphone/Chat}/Message.qml | 0 .../Chat}/OutgoingMessage.qml | 2 +- .../Collapse}/Collapse.qml | 5 +- tests/ui/Linphone/Constants.qml | 16 ++++ .../contact => Linphone/Contact}/Avatar.qml | 0 .../contact => Linphone/Contact}/Contact.qml | 2 +- .../Contact}/ContactDescription.qml | 0 .../Dialog}/ConfirmDialog.qml | 5 +- .../Dialog}/DialogDescription.qml | 2 +- .../dialog => Linphone/Dialog}/DialogPlus.qml | 2 +- .../form => Linphone/Form}/ActionBar.qml | 0 .../form => Linphone/Form}/ActionButton.qml | 2 +- .../form => Linphone/Form}/CheckBoxText.qml | 0 .../form => Linphone/Form}/DarkButton.qml | 0 .../form => Linphone/Form}/DropZone.qml | 0 .../Form}/ExclusiveButtons.qml | 0 .../form => Linphone/Form}/LightButton.qml | 0 .../form => Linphone/Form}/ListForm.qml | 0 .../form => Linphone/Form}/SmallButton.qml | 0 .../Form}/TransparentComboBox.qml | 0 .../image => Linphone/Image}/Icon.qml | 0 .../InvertedMouseArea}/InvertedMouseArea.qml | 2 +- .../misc => Linphone/Misc}/MenuEntry.qml | 0 .../popup => Linphone/Popup}/DropDownMenu.qml | 6 +- .../popup => Linphone/Popup}/PopupShadow.qml | 2 +- .../ScrollBar}/ForceScrollBar.qml | 2 +- .../SearchBox}/SearchBox.qml | 7 +- .../Select}/SelectContact.qml | 4 +- .../Styles}/CollapseStyle.qml | 0 .../Styles}/DialogStyle.qml | 0 .../Styles}/PopupStyle.qml | 4 +- .../Styles}/ScrollBarStyle.qml | 8 +- .../Styles}/SearchBoxStyle.qml | 4 +- .../Styles}/TimelineStyle.qml | 6 +- .../Styles}/qmldir | 5 +- .../Timeline}/Timeline.qml | 7 +- .../View}/ScrollableListView.qml | 2 +- tests/ui/Linphone/qmldir | 39 +++++++++ tests/ui/style/AppStyle/Colors.qml | 11 --- tests/ui/style/AppStyle/Constants.qml | 7 -- tests/ui/style/AppStyle/qmldir | 6 -- tests/ui/views/mainWindow/contact.qml | 4 +- tests/ui/views/mainWindow/contacts.qml | 4 +- tests/ui/views/mainWindow/conversation.qml | 5 +- tests/ui/views/mainWindow/home.qml | 2 +- tests/ui/views/mainWindow/mainWindow.qml | 7 +- tests/ui/views/manageAccounts.qml | 4 +- tests/ui/views/newCall.qml | 4 +- 53 files changed, 140 insertions(+), 139 deletions(-) rename tests/ui/{components/chat => Linphone/Chat}/Chat.qml (97%) rename tests/ui/{components/chat => Linphone/Chat}/Event.qml (100%) rename tests/ui/{components/chat => Linphone/Chat}/IncomingMessage.qml (93%) rename tests/ui/{components/chat => Linphone/Chat}/Message.qml (100%) rename tests/ui/{components/chat => Linphone/Chat}/OutgoingMessage.qml (89%) rename tests/ui/{components/collapse => Linphone/Collapse}/Collapse.qml (94%) create mode 100644 tests/ui/Linphone/Constants.qml rename tests/ui/{components/contact => Linphone/Contact}/Avatar.qml (100%) rename tests/ui/{components/contact => Linphone/Contact}/Contact.qml (96%) rename tests/ui/{components/contact => Linphone/Contact}/ContactDescription.qml (100%) rename tests/ui/{components/dialog => Linphone/Dialog}/ConfirmDialog.qml (91%) rename tests/ui/{components/dialog => Linphone/Dialog}/DialogDescription.qml (96%) rename tests/ui/{components/dialog => Linphone/Dialog}/DialogPlus.qml (98%) rename tests/ui/{components/form => Linphone/Form}/ActionBar.qml (100%) rename tests/ui/{components/form => Linphone/Form}/ActionButton.qml (94%) rename tests/ui/{components/form => Linphone/Form}/CheckBoxText.qml (100%) rename tests/ui/{components/form => Linphone/Form}/DarkButton.qml (100%) rename tests/ui/{components/form => Linphone/Form}/DropZone.qml (100%) rename tests/ui/{components/form => Linphone/Form}/ExclusiveButtons.qml (100%) rename tests/ui/{components/form => Linphone/Form}/LightButton.qml (100%) rename tests/ui/{components/form => Linphone/Form}/ListForm.qml (100%) rename tests/ui/{components/form => Linphone/Form}/SmallButton.qml (100%) rename tests/ui/{components/form => Linphone/Form}/TransparentComboBox.qml (100%) rename tests/ui/{components/image => Linphone/Image}/Icon.qml (100%) rename tests/ui/{components/invertedMouseArea => Linphone/InvertedMouseArea}/InvertedMouseArea.qml (98%) rename tests/ui/{components/misc => Linphone/Misc}/MenuEntry.qml (100%) rename tests/ui/{components/popup => Linphone/Popup}/DropDownMenu.qml (97%) rename tests/ui/{components/popup => Linphone/Popup}/PopupShadow.qml (92%) rename tests/ui/{components/scrollBar => Linphone/ScrollBar}/ForceScrollBar.qml (94%) rename tests/ui/{components/searchBox => Linphone/SearchBox}/SearchBox.qml (92%) rename tests/ui/{components/select => Linphone/Select}/SelectContact.qml (97%) rename tests/ui/{style/ComponentsStyle => Linphone/Styles}/CollapseStyle.qml (100%) rename tests/ui/{style/ComponentsStyle => Linphone/Styles}/DialogStyle.qml (100%) rename tests/ui/{style/ComponentsStyle => Linphone/Styles}/PopupStyle.qml (77%) rename tests/ui/{style/ComponentsStyle => Linphone/Styles}/ScrollBarStyle.qml (60%) rename tests/ui/{style/ComponentsStyle => Linphone/Styles}/SearchBoxStyle.qml (66%) rename tests/ui/{style/ComponentsStyle => Linphone/Styles}/TimelineStyle.qml (78%) rename tests/ui/{style/ComponentsStyle => Linphone/Styles}/qmldir (87%) rename tests/ui/{components/timeline => Linphone/Timeline}/Timeline.qml (90%) rename tests/ui/{components/view => Linphone/View}/ScrollableListView.qml (88%) create mode 100644 tests/ui/Linphone/qmldir delete mode 100644 tests/ui/style/AppStyle/Colors.qml delete mode 100644 tests/ui/style/AppStyle/Constants.qml delete mode 100644 tests/ui/style/AppStyle/qmldir diff --git a/tests/resources.qrc b/tests/resources.qrc index e26db59b3..1865f3397 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -2,49 +2,7 @@ languages/fr.qm languages/en.qm - ui/components/scrollBar/ForceScrollBar.qml - ui/components/searchBox/SearchBox.qml - ui/components/misc/MenuEntry.qml - ui/components/timeline/Timeline.qml - ui/components/image/Icon.qml - ui/components/select/SelectContact.qml - ui/components/collapse/Collapse.qml - ui/components/chat/IncomingMessage.qml - ui/components/chat/Chat.qml - ui/components/chat/OutgoingMessage.qml - ui/components/chat/Event.qml - ui/components/chat/Message.qml - ui/components/contact/Contact.qml - ui/components/contact/ContactDescription.qml - ui/components/contact/Avatar.qml - ui/components/popup/DropDownMenu.qml - ui/components/popup/PopupShadow.qml - ui/components/view/ScrollableListView.qml - ui/components/dialog/ConfirmDialog.qml - ui/components/dialog/DialogDescription.qml - ui/components/dialog/DialogPlus.qml - ui/components/form/CheckBoxText.qml - ui/components/form/DropZone.qml - ui/components/form/LightButton.qml - ui/components/form/ListForm.qml - ui/components/form/ExclusiveButtons.qml - ui/components/form/ActionBar.qml - ui/components/form/ActionButton.qml - ui/components/form/TransparentComboBox.qml - ui/components/form/SmallButton.qml - ui/components/form/DarkButton.qml - ui/components/invertedMouseArea/InvertedMouseArea.qml ui/scripts/utils.js - ui/style/ComponentsStyle/qmldir - ui/style/ComponentsStyle/DialogStyle.qml - ui/style/ComponentsStyle/ScrollBarStyle.qml - ui/style/ComponentsStyle/TimelineStyle.qml - ui/style/ComponentsStyle/SearchBoxStyle.qml - ui/style/ComponentsStyle/CollapseStyle.qml - ui/style/ComponentsStyle/PopupStyle.qml - ui/style/AppStyle/qmldir - ui/style/AppStyle/Colors.qml - ui/style/AppStyle/Constants.qml ui/views/newCall.qml ui/views/manageAccounts.qml ui/views/mainWindow/mainWindow.qml @@ -52,6 +10,47 @@ ui/views/mainWindow/home.qml ui/views/mainWindow/contact.qml ui/views/mainWindow/conversation.qml + ui/Linphone/Popup/DropDownMenu.qml + ui/Linphone/Popup/PopupShadow.qml + ui/Linphone/qmldir + ui/Linphone/ScrollBar/ForceScrollBar.qml + ui/Linphone/Chat/IncomingMessage.qml + ui/Linphone/Chat/Chat.qml + ui/Linphone/Chat/OutgoingMessage.qml + ui/Linphone/Chat/Event.qml + ui/Linphone/Chat/Message.qml + ui/Linphone/SearchBox/SearchBox.qml + ui/Linphone/Form/CheckBoxText.qml + ui/Linphone/Form/DropZone.qml + ui/Linphone/Form/LightButton.qml + ui/Linphone/Form/ListForm.qml + ui/Linphone/Form/ExclusiveButtons.qml + ui/Linphone/Form/ActionBar.qml + ui/Linphone/Form/ActionButton.qml + ui/Linphone/Form/TransparentComboBox.qml + ui/Linphone/Form/SmallButton.qml + ui/Linphone/Form/DarkButton.qml + ui/Linphone/View/ScrollableListView.qml + ui/Linphone/Collapse/Collapse.qml + ui/Linphone/Styles/qmldir + ui/Linphone/Styles/DialogStyle.qml + ui/Linphone/Styles/ScrollBarStyle.qml + ui/Linphone/Styles/TimelineStyle.qml + ui/Linphone/Styles/SearchBoxStyle.qml + ui/Linphone/Styles/CollapseStyle.qml + ui/Linphone/Styles/PopupStyle.qml + ui/Linphone/Timeline/Timeline.qml + ui/Linphone/Misc/MenuEntry.qml + ui/Linphone/InvertedMouseArea/InvertedMouseArea.qml + ui/Linphone/Select/SelectContact.qml + ui/Linphone/Contact/Contact.qml + ui/Linphone/Contact/ContactDescription.qml + ui/Linphone/Contact/Avatar.qml + ui/Linphone/Constants.qml + ui/Linphone/Dialog/ConfirmDialog.qml + ui/Linphone/Dialog/DialogDescription.qml + ui/Linphone/Dialog/DialogPlus.qml + ui/Linphone/Image/Icon.qml imgs/lost_outgoing_call.svg imgs/led_disconnected.svg imgs/valid.svg diff --git a/tests/src/main.cpp b/tests/src/main.cpp index 54f306c79..491f69665 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -56,7 +56,7 @@ int main (int argc, char *argv[]) { selector->setExtraSelectors(QStringList("custom")); // Set modules paths. - engine.addImportPath(":/ui/style"); + engine.addImportPath(":/ui/"); engine.load(QUrl("qrc:/ui/views/mainWindow/mainWindow.qml")); if (engine.rootObjects().isEmpty()) diff --git a/tests/ui/components/chat/Chat.qml b/tests/ui/Linphone/Chat/Chat.qml similarity index 97% rename from tests/ui/components/chat/Chat.qml rename to tests/ui/Linphone/Chat/Chat.qml index 45bddee1c..d4c59e06d 100644 --- a/tests/ui/components/chat/Chat.qml +++ b/tests/ui/Linphone/Chat/Chat.qml @@ -2,9 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import 'qrc:/ui/components/form' -import 'qrc:/ui/components/image' -import 'qrc:/ui/components/view' +import Linphone 1.0 ScrollableListView { model: ListModel { diff --git a/tests/ui/components/chat/Event.qml b/tests/ui/Linphone/Chat/Event.qml similarity index 100% rename from tests/ui/components/chat/Event.qml rename to tests/ui/Linphone/Chat/Event.qml diff --git a/tests/ui/components/chat/IncomingMessage.qml b/tests/ui/Linphone/Chat/IncomingMessage.qml similarity index 93% rename from tests/ui/components/chat/IncomingMessage.qml rename to tests/ui/Linphone/Chat/IncomingMessage.qml index 5ffbb4a83..3ea5707e7 100644 --- a/tests/ui/components/chat/IncomingMessage.qml +++ b/tests/ui/Linphone/Chat/IncomingMessage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 -import 'qrc:/ui/components/contact' +import Linphone 1.0 // =================================================================== diff --git a/tests/ui/components/chat/Message.qml b/tests/ui/Linphone/Chat/Message.qml similarity index 100% rename from tests/ui/components/chat/Message.qml rename to tests/ui/Linphone/Chat/Message.qml diff --git a/tests/ui/components/chat/OutgoingMessage.qml b/tests/ui/Linphone/Chat/OutgoingMessage.qml similarity index 89% rename from tests/ui/components/chat/OutgoingMessage.qml rename to tests/ui/Linphone/Chat/OutgoingMessage.qml index 8065af77e..605c0bde3 100644 --- a/tests/ui/components/chat/OutgoingMessage.qml +++ b/tests/ui/Linphone/Chat/OutgoingMessage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 -import 'qrc:/ui/components/image' +import Linphone 1.0 Message { backgroundColor: '#E4E4E4' diff --git a/tests/ui/components/collapse/Collapse.qml b/tests/ui/Linphone/Collapse/Collapse.qml similarity index 94% rename from tests/ui/components/collapse/Collapse.qml rename to tests/ui/Linphone/Collapse/Collapse.qml index 7c2d97dab..3edc9256d 100644 --- a/tests/ui/components/collapse/Collapse.qml +++ b/tests/ui/Linphone/Collapse/Collapse.qml @@ -1,8 +1,7 @@ import QtQuick 2.7 -import ComponentsStyle 1.0 - -import 'qrc:/ui/components/form' +import Linphone 1.0 +import Linphone.Styles 1.0 // =================================================================== // A simple component to build collapsed item. diff --git a/tests/ui/Linphone/Constants.qml b/tests/ui/Linphone/Constants.qml new file mode 100644 index 000000000..e70699e86 --- /dev/null +++ b/tests/ui/Linphone/Constants.qml @@ -0,0 +1,16 @@ +pragma Singleton +import QtQuick 2.7 + +QtObject { + property int zPopup: 999 + property int zMax: 999999 + + // TODO: Mutualize similar colors. + property QtObject colors: QtObject { + property string a: '#808080' + property string b: '#5E5E5F' + property string c: '#C5C5C5' + property string d: '#5A585B' + property string e: '#DEDEDE' + } +} diff --git a/tests/ui/components/contact/Avatar.qml b/tests/ui/Linphone/Contact/Avatar.qml similarity index 100% rename from tests/ui/components/contact/Avatar.qml rename to tests/ui/Linphone/Contact/Avatar.qml diff --git a/tests/ui/components/contact/Contact.qml b/tests/ui/Linphone/Contact/Contact.qml similarity index 96% rename from tests/ui/components/contact/Contact.qml rename to tests/ui/Linphone/Contact/Contact.qml index 6806d2402..ae9ceb6a0 100644 --- a/tests/ui/components/contact/Contact.qml +++ b/tests/ui/Linphone/Contact/Contact.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 -import 'qrc:/ui/components/form' +import Linphone 1.0 // =================================================================== diff --git a/tests/ui/components/contact/ContactDescription.qml b/tests/ui/Linphone/Contact/ContactDescription.qml similarity index 100% rename from tests/ui/components/contact/ContactDescription.qml rename to tests/ui/Linphone/Contact/ContactDescription.qml diff --git a/tests/ui/components/dialog/ConfirmDialog.qml b/tests/ui/Linphone/Dialog/ConfirmDialog.qml similarity index 91% rename from tests/ui/components/dialog/ConfirmDialog.qml rename to tests/ui/Linphone/Dialog/ConfirmDialog.qml index 29cfcbecb..f8be5d484 100644 --- a/tests/ui/components/dialog/ConfirmDialog.qml +++ b/tests/ui/Linphone/Dialog/ConfirmDialog.qml @@ -1,8 +1,7 @@ import QtQuick 2.7 -import ComponentsStyle 1.0 - -import 'qrc:/ui/components/form' +import Linphone 1.0 +import Linphone.Styles 1.0 // =================================================================== // A dialog with OK/Cancel buttons. diff --git a/tests/ui/components/dialog/DialogDescription.qml b/tests/ui/Linphone/Dialog/DialogDescription.qml similarity index 96% rename from tests/ui/components/dialog/DialogDescription.qml rename to tests/ui/Linphone/Dialog/DialogDescription.qml index b642ebe21..44f3ca1a0 100644 --- a/tests/ui/components/dialog/DialogDescription.qml +++ b/tests/ui/Linphone/Dialog/DialogDescription.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 -import ComponentsStyle 1.0 +import Linphone.Styles 1.0 // =================================================================== // Description content used by dialogs. diff --git a/tests/ui/components/dialog/DialogPlus.qml b/tests/ui/Linphone/Dialog/DialogPlus.qml similarity index 98% rename from tests/ui/components/dialog/DialogPlus.qml rename to tests/ui/Linphone/Dialog/DialogPlus.qml index c199b102d..8ea4b0d00 100644 --- a/tests/ui/components/dialog/DialogPlus.qml +++ b/tests/ui/Linphone/Dialog/DialogPlus.qml @@ -2,7 +2,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 import QtQuick.Window 2.2 -import ComponentsStyle 1.0 +import Linphone.Styles 1.0 // =================================================================== // Helper to build quickly dialogs. diff --git a/tests/ui/components/form/ActionBar.qml b/tests/ui/Linphone/Form/ActionBar.qml similarity index 100% rename from tests/ui/components/form/ActionBar.qml rename to tests/ui/Linphone/Form/ActionBar.qml diff --git a/tests/ui/components/form/ActionButton.qml b/tests/ui/Linphone/Form/ActionButton.qml similarity index 94% rename from tests/ui/components/form/ActionButton.qml rename to tests/ui/Linphone/Form/ActionButton.qml index 9cfa49225..fde44ea6e 100644 --- a/tests/ui/components/form/ActionButton.qml +++ b/tests/ui/Linphone/Form/ActionButton.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import 'qrc:/ui/components/image' +import Linphone 1.0 // =================================================================== // An animated small button with an image. diff --git a/tests/ui/components/form/CheckBoxText.qml b/tests/ui/Linphone/Form/CheckBoxText.qml similarity index 100% rename from tests/ui/components/form/CheckBoxText.qml rename to tests/ui/Linphone/Form/CheckBoxText.qml diff --git a/tests/ui/components/form/DarkButton.qml b/tests/ui/Linphone/Form/DarkButton.qml similarity index 100% rename from tests/ui/components/form/DarkButton.qml rename to tests/ui/Linphone/Form/DarkButton.qml diff --git a/tests/ui/components/form/DropZone.qml b/tests/ui/Linphone/Form/DropZone.qml similarity index 100% rename from tests/ui/components/form/DropZone.qml rename to tests/ui/Linphone/Form/DropZone.qml diff --git a/tests/ui/components/form/ExclusiveButtons.qml b/tests/ui/Linphone/Form/ExclusiveButtons.qml similarity index 100% rename from tests/ui/components/form/ExclusiveButtons.qml rename to tests/ui/Linphone/Form/ExclusiveButtons.qml diff --git a/tests/ui/components/form/LightButton.qml b/tests/ui/Linphone/Form/LightButton.qml similarity index 100% rename from tests/ui/components/form/LightButton.qml rename to tests/ui/Linphone/Form/LightButton.qml diff --git a/tests/ui/components/form/ListForm.qml b/tests/ui/Linphone/Form/ListForm.qml similarity index 100% rename from tests/ui/components/form/ListForm.qml rename to tests/ui/Linphone/Form/ListForm.qml diff --git a/tests/ui/components/form/SmallButton.qml b/tests/ui/Linphone/Form/SmallButton.qml similarity index 100% rename from tests/ui/components/form/SmallButton.qml rename to tests/ui/Linphone/Form/SmallButton.qml diff --git a/tests/ui/components/form/TransparentComboBox.qml b/tests/ui/Linphone/Form/TransparentComboBox.qml similarity index 100% rename from tests/ui/components/form/TransparentComboBox.qml rename to tests/ui/Linphone/Form/TransparentComboBox.qml diff --git a/tests/ui/components/image/Icon.qml b/tests/ui/Linphone/Image/Icon.qml similarity index 100% rename from tests/ui/components/image/Icon.qml rename to tests/ui/Linphone/Image/Icon.qml diff --git a/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml b/tests/ui/Linphone/InvertedMouseArea/InvertedMouseArea.qml similarity index 98% rename from tests/ui/components/invertedMouseArea/InvertedMouseArea.qml rename to tests/ui/Linphone/InvertedMouseArea/InvertedMouseArea.qml index d3d132cc6..4e68838ac 100644 --- a/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml +++ b/tests/ui/Linphone/InvertedMouseArea/InvertedMouseArea.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 -import AppStyle 1.0 +import Linphone.Styles 1.0 // =================================================================== // Helper to handle button click outside a component. diff --git a/tests/ui/components/misc/MenuEntry.qml b/tests/ui/Linphone/Misc/MenuEntry.qml similarity index 100% rename from tests/ui/components/misc/MenuEntry.qml rename to tests/ui/Linphone/Misc/MenuEntry.qml diff --git a/tests/ui/components/popup/DropDownMenu.qml b/tests/ui/Linphone/Popup/DropDownMenu.qml similarity index 97% rename from tests/ui/components/popup/DropDownMenu.qml rename to tests/ui/Linphone/Popup/DropDownMenu.qml index 54edb200f..fe527b928 100644 --- a/tests/ui/components/popup/DropDownMenu.qml +++ b/tests/ui/Linphone/Popup/DropDownMenu.qml @@ -2,10 +2,8 @@ import QtGraphicalEffects 1.0 import QtQuick 2.7 import QtQuick.Controls 2.0 -import 'qrc:/ui/components/contact' -import 'qrc:/ui/components/form' -import 'qrc:/ui/components/view' -import 'qrc:/ui/style' +import Linphone 1.0 +import Linphone.Styles 1.0 Rectangle { readonly property int entryHeight: 50 diff --git a/tests/ui/components/popup/PopupShadow.qml b/tests/ui/Linphone/Popup/PopupShadow.qml similarity index 92% rename from tests/ui/components/popup/PopupShadow.qml rename to tests/ui/Linphone/Popup/PopupShadow.qml index 76dcef4d4..e9f166971 100644 --- a/tests/ui/components/popup/PopupShadow.qml +++ b/tests/ui/Linphone/Popup/PopupShadow.qml @@ -1,6 +1,6 @@ import QtGraphicalEffects 1.0 -import ComponentsStyle 1.0 +import Linphone.Styles 1.0 // =================================================================== diff --git a/tests/ui/components/scrollBar/ForceScrollBar.qml b/tests/ui/Linphone/ScrollBar/ForceScrollBar.qml similarity index 94% rename from tests/ui/components/scrollBar/ForceScrollBar.qml rename to tests/ui/Linphone/ScrollBar/ForceScrollBar.qml index 84720fce3..131ba07fc 100644 --- a/tests/ui/components/scrollBar/ForceScrollBar.qml +++ b/tests/ui/Linphone/ScrollBar/ForceScrollBar.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import ComponentsStyle 1.0 +import Linphone.Styles 1.0 // =================================================================== diff --git a/tests/ui/components/searchBox/SearchBox.qml b/tests/ui/Linphone/SearchBox/SearchBox.qml similarity index 92% rename from tests/ui/components/searchBox/SearchBox.qml rename to tests/ui/Linphone/SearchBox/SearchBox.qml index e61e8bb58..506c4c279 100644 --- a/tests/ui/components/searchBox/SearchBox.qml +++ b/tests/ui/Linphone/SearchBox/SearchBox.qml @@ -1,11 +1,8 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import AppStyle 1.0 -import ComponentsStyle 1.0 - -import 'qrc:/ui/components/invertedMouseArea' -import 'qrc:/ui/components/popup' +import Linphone 1.0 +import Linphone.Styles 1.0 // =================================================================== diff --git a/tests/ui/components/select/SelectContact.qml b/tests/ui/Linphone/Select/SelectContact.qml similarity index 97% rename from tests/ui/components/select/SelectContact.qml rename to tests/ui/Linphone/Select/SelectContact.qml index a5be782fb..b8e40b9e7 100644 --- a/tests/ui/components/select/SelectContact.qml +++ b/tests/ui/Linphone/Select/SelectContact.qml @@ -2,9 +2,7 @@ import QtGraphicalEffects 1.0 import QtQuick 2.7 import QtQuick.Controls 2.0 -import 'qrc:/ui/components/contact' -import 'qrc:/ui/components/form' -import 'qrc:/ui/components/view' +import Linphone 1.0 // TODO: Contacts list. Item { diff --git a/tests/ui/style/ComponentsStyle/CollapseStyle.qml b/tests/ui/Linphone/Styles/CollapseStyle.qml similarity index 100% rename from tests/ui/style/ComponentsStyle/CollapseStyle.qml rename to tests/ui/Linphone/Styles/CollapseStyle.qml diff --git a/tests/ui/style/ComponentsStyle/DialogStyle.qml b/tests/ui/Linphone/Styles/DialogStyle.qml similarity index 100% rename from tests/ui/style/ComponentsStyle/DialogStyle.qml rename to tests/ui/Linphone/Styles/DialogStyle.qml diff --git a/tests/ui/style/ComponentsStyle/PopupStyle.qml b/tests/ui/Linphone/Styles/PopupStyle.qml similarity index 77% rename from tests/ui/style/ComponentsStyle/PopupStyle.qml rename to tests/ui/Linphone/Styles/PopupStyle.qml index d7c55cc5c..fd2f354a8 100644 --- a/tests/ui/style/ComponentsStyle/PopupStyle.qml +++ b/tests/ui/Linphone/Styles/PopupStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import AppStyle 1.0 +import Linphone 1.0 QtObject { property QtObject shadow: QtObject { @@ -9,6 +9,6 @@ QtObject { property int horizontalOffset: 0 property int samples: 15 property int verticalOffset: 2 - property string color: Colors.a + property string color: Constants.colors.a } } diff --git a/tests/ui/style/ComponentsStyle/ScrollBarStyle.qml b/tests/ui/Linphone/Styles/ScrollBarStyle.qml similarity index 60% rename from tests/ui/style/ComponentsStyle/ScrollBarStyle.qml rename to tests/ui/Linphone/Styles/ScrollBarStyle.qml index 9fc7f62f6..8e6e3195a 100644 --- a/tests/ui/style/ComponentsStyle/ScrollBarStyle.qml +++ b/tests/ui/Linphone/Styles/ScrollBarStyle.qml @@ -1,14 +1,14 @@ pragma Singleton import QtQuick 2.7 -import AppStyle 1.0 +import Linphone 1.0 QtObject { - property string color: Colors.c - property string pressedColor: Colors.b + property string color: Constants.colors.c + property string pressedColor: Constants.colors.b property Rectangle background: Rectangle { - color: Colors.d + color: Constants.colors.d } property Rectangle contentItem: Rectangle { diff --git a/tests/ui/style/ComponentsStyle/SearchBoxStyle.qml b/tests/ui/Linphone/Styles/SearchBoxStyle.qml similarity index 66% rename from tests/ui/style/ComponentsStyle/SearchBoxStyle.qml rename to tests/ui/Linphone/Styles/SearchBoxStyle.qml index a41f7b93d..7314d8848 100644 --- a/tests/ui/style/ComponentsStyle/SearchBoxStyle.qml +++ b/tests/ui/Linphone/Styles/SearchBoxStyle.qml @@ -1,10 +1,10 @@ pragma Singleton import QtQuick 2.7 -import AppStyle 1.0 +import Linphone 1.0 QtObject { - property string shadowColor: Colors.a + property string shadowColor: Constants.colors.a property Rectangle searchFieldBackground: Rectangle { implicitHeight: 30 diff --git a/tests/ui/style/ComponentsStyle/TimelineStyle.qml b/tests/ui/Linphone/Styles/TimelineStyle.qml similarity index 78% rename from tests/ui/style/ComponentsStyle/TimelineStyle.qml rename to tests/ui/Linphone/Styles/TimelineStyle.qml index b3655d1ed..37b068a34 100644 --- a/tests/ui/style/ComponentsStyle/TimelineStyle.qml +++ b/tests/ui/Linphone/Styles/TimelineStyle.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import AppStyle 1.0 +import Linphone 1.0 QtObject { property QtObject legend: QtObject { @@ -11,12 +11,12 @@ QtObject { property int leftMargin: 18 property int spacing: 16 property int topMargin: 10 - property string color: Colors.d + property string color: Constants.colors.d property string icon: 'history' } property QtObject separator: QtObject { property int height: 1 - property string color: Colors.e + property string color: Constants.colors.e } } diff --git a/tests/ui/style/ComponentsStyle/qmldir b/tests/ui/Linphone/Styles/qmldir similarity index 87% rename from tests/ui/style/ComponentsStyle/qmldir rename to tests/ui/Linphone/Styles/qmldir index 487165d11..1a2bfc970 100644 --- a/tests/ui/style/ComponentsStyle/qmldir +++ b/tests/ui/Linphone/Styles/qmldir @@ -1,10 +1,11 @@ # See: https://wiki.qt.io/Qml_Styling -module ComponentsStyle +module Linphone.Style +# Components styles. singleton CollapseStyle 1.0 CollapseStyle.qml singleton DialogStyle 1.0 DialogStyle.qml singleton PopupStyle 1.0 PopupStyle.qml -singleton SearchBoxStyle 1.0 SearchBoxStyle.qml singleton ScrollBarStyle 1.0 ScrollBarStyle.qml +singleton SearchBoxStyle 1.0 SearchBoxStyle.qml singleton TimelineStyle 1.0 TimelineStyle.qml diff --git a/tests/ui/components/timeline/Timeline.qml b/tests/ui/Linphone/Timeline/Timeline.qml similarity index 90% rename from tests/ui/components/timeline/Timeline.qml rename to tests/ui/Linphone/Timeline/Timeline.qml index e4f57fb27..d831d1ca7 100644 --- a/tests/ui/components/timeline/Timeline.qml +++ b/tests/ui/Linphone/Timeline/Timeline.qml @@ -1,11 +1,8 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 -import ComponentsStyle 1.0 - -import 'qrc:/ui/components/contact' -import 'qrc:/ui/components/image' -import 'qrc:/ui/components/view' +import Linphone 1.0 +import Linphone.Styles 1.0 // =================================================================== diff --git a/tests/ui/components/view/ScrollableListView.qml b/tests/ui/Linphone/View/ScrollableListView.qml similarity index 88% rename from tests/ui/components/view/ScrollableListView.qml rename to tests/ui/Linphone/View/ScrollableListView.qml index b3ca26793..e4d0dc7e7 100644 --- a/tests/ui/components/view/ScrollableListView.qml +++ b/tests/ui/Linphone/View/ScrollableListView.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import 'qrc:/ui/components/scrollBar' +import Linphone 1.0 // =================================================================== diff --git a/tests/ui/Linphone/qmldir b/tests/ui/Linphone/qmldir new file mode 100644 index 000000000..ce87ccea9 --- /dev/null +++ b/tests/ui/Linphone/qmldir @@ -0,0 +1,39 @@ +module Linphone + +# Constants. +singleton Constants 1.0 Constants.qml + +# Components. +Chat 1.0 Chat/Chat.qml + +Collapse 1.0 Collapse/Collapse.qml + +Avatar 1.0 Contact/Avatar.qml +Contact 1.0 Contact/Contact.qml +ContactDescription 1.0 Contact/ContactDescription.qml + +DialogPlus 1.0 Dialog/DialogPlus.qml + +ActionBar 1.0 Form/ActionBar.qml +ActionButton 1.0 Form/ActionButton.qml +DarkButton 1.0 Form/DarkButton.qml +ExclusiveButtons 1.0 Form/ExclusiveButtons.qml +LightButton 1.0 Form/LightButton.qml +TransparentComboBox 1.0 Form/TransparentComboBox.qml + +Icon 1.0 Image/Icon.qml + +InvertedMouseArea 1.0 InvertedMouseArea/InvertedMouseArea.qml + +MenuEntry 1.0 Misc/MenuEntry.qml + +DropDownMenu 1.0 Popup/DropDownMenu.qml +PopupShadow 1.0 Popup/PopupShadow.qml + +SearchBox 1.0 SearchBox/SearchBox.qml + +ForceScrollBar 1.0 ScrollBar/ForceScrollBar.qml + +Timeline 1.0 Timeline/Timeline.qml + +ScrollableListView 1.0 View/ScrollableListView.qml diff --git a/tests/ui/style/AppStyle/Colors.qml b/tests/ui/style/AppStyle/Colors.qml deleted file mode 100644 index c34c03935..000000000 --- a/tests/ui/style/AppStyle/Colors.qml +++ /dev/null @@ -1,11 +0,0 @@ -pragma Singleton -import QtQuick 2.7 - -// TODO: Mutualize similar colors. -QtObject { - property string a: '#808080' - property string b: '#5E5E5F' - property string c: '#C5C5C5' - property string d: '#5A585B' - property string e: '#DEDEDE' -} diff --git a/tests/ui/style/AppStyle/Constants.qml b/tests/ui/style/AppStyle/Constants.qml deleted file mode 100644 index b5c48cc83..000000000 --- a/tests/ui/style/AppStyle/Constants.qml +++ /dev/null @@ -1,7 +0,0 @@ -pragma Singleton -import QtQuick 2.7 - -QtObject { - property int zPopup: 999 - property int zMax: 999999 -} diff --git a/tests/ui/style/AppStyle/qmldir b/tests/ui/style/AppStyle/qmldir deleted file mode 100644 index 1a89ac421..000000000 --- a/tests/ui/style/AppStyle/qmldir +++ /dev/null @@ -1,6 +0,0 @@ -# See: https://wiki.qt.io/Qml_Styling - -module AppStyle - -singleton Colors 1.0 Colors.qml -singleton Constants 1.0 Constants.qml diff --git a/tests/ui/views/mainWindow/contact.qml b/tests/ui/views/mainWindow/contact.qml index 4cd194e84..da18c081c 100644 --- a/tests/ui/views/mainWindow/contact.qml +++ b/tests/ui/views/mainWindow/contact.qml @@ -2,9 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import 'qrc:/ui/components/contact' -import 'qrc:/ui/components/form' -import 'qrc:/ui/components/scrollBar' +import Linphone 1.0 ColumnLayout { spacing: 0 diff --git a/tests/ui/views/mainWindow/contacts.qml b/tests/ui/views/mainWindow/contacts.qml index 4c670f158..5c33cce8d 100644 --- a/tests/ui/views/mainWindow/contacts.qml +++ b/tests/ui/views/mainWindow/contacts.qml @@ -2,9 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import 'qrc:/ui/components/contact' -import 'qrc:/ui/components/form' -import 'qrc:/ui/components/view' +import Linphone 1.0 import 'qrc:/ui/scripts/utils.js' as Utils diff --git a/tests/ui/views/mainWindow/conversation.qml b/tests/ui/views/mainWindow/conversation.qml index 68209dc4f..7eded8016 100644 --- a/tests/ui/views/mainWindow/conversation.qml +++ b/tests/ui/views/mainWindow/conversation.qml @@ -2,10 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import 'qrc:/ui/components/contact' -import 'qrc:/ui/components/form' -import 'qrc:/ui/components/scrollBar' -import 'qrc:/ui/components/chat' +import Linphone 1.0 ColumnLayout { spacing: 0 diff --git a/tests/ui/views/mainWindow/home.qml b/tests/ui/views/mainWindow/home.qml index c9b3fa116..dd1855046 100644 --- a/tests/ui/views/mainWindow/home.qml +++ b/tests/ui/views/mainWindow/home.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 -import 'qrc:/ui/components/form' +import Linphone 1.0 // =================================================================== diff --git a/tests/ui/views/mainWindow/mainWindow.qml b/tests/ui/views/mainWindow/mainWindow.qml index f59e344d5..f0597efc7 100644 --- a/tests/ui/views/mainWindow/mainWindow.qml +++ b/tests/ui/views/mainWindow/mainWindow.qml @@ -2,12 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import 'qrc:/ui/components/collapse' -import 'qrc:/ui/components/contact' -import 'qrc:/ui/components/form' -import 'qrc:/ui/components/misc' -import 'qrc:/ui/components/searchBox' -import 'qrc:/ui/components/timeline' +import Linphone 1.0 import 'qrc:/ui/scripts/utils.js' as Utils diff --git a/tests/ui/views/manageAccounts.qml b/tests/ui/views/manageAccounts.qml index 1bcf340eb..41a22f9da 100644 --- a/tests/ui/views/manageAccounts.qml +++ b/tests/ui/views/manageAccounts.qml @@ -2,9 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import 'qrc:/ui/components/dialog' -import 'qrc:/ui/components/form' -import 'qrc:/ui/components/view' +import Linphone 1.0 DialogPlus { descriptionText: qsTr('manageAccountsDescription') diff --git a/tests/ui/views/newCall.qml b/tests/ui/views/newCall.qml index 18d673459..c18eadecf 100644 --- a/tests/ui/views/newCall.qml +++ b/tests/ui/views/newCall.qml @@ -1,9 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import 'qrc:/ui/components/dialog' -import 'qrc:/ui/components/form' -import 'qrc:/ui/components/select' +import Linphone 1.0 DialogPlus { centeredButtons: true