From ba75ede62b13bf69c94ac555e15bf7bdd01e2221 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 26 Sep 2016 15:59:07 +0200 Subject: [PATCH] feat(app): all `.qml` files start with a uppercase --- tests/linphone.pro | 31 +++++++++++-------- tests/resources.qrc | 14 ++++----- tests/src/main.cpp | 2 +- tests/ui/Linphone/qmldir | 26 +++++++++++++--- .../MainWindow/Contact.qml} | 0 .../MainWindow/Contacts.qml} | 0 .../MainWindow/Conversation.qml} | 0 .../home.qml => Views/MainWindow/Home.qml} | 0 .../MainWindow/MainWindow.qml} | 6 ++-- .../ManageAccounts.qml} | 0 .../{views/newCall.qml => Views/NewCall.qml} | 0 tests/ui/scripts/utils.js | 2 +- 12 files changed, 52 insertions(+), 29 deletions(-) rename tests/ui/{views/mainWindow/contact.qml => Views/MainWindow/Contact.qml} (100%) rename tests/ui/{views/mainWindow/contacts.qml => Views/MainWindow/Contacts.qml} (100%) rename tests/ui/{views/mainWindow/conversation.qml => Views/MainWindow/Conversation.qml} (100%) rename tests/ui/{views/mainWindow/home.qml => Views/MainWindow/Home.qml} (100%) rename tests/ui/{views/mainWindow/mainWindow.qml => Views/MainWindow/MainWindow.qml} (96%) rename tests/ui/{views/manageAccounts.qml => Views/ManageAccounts.qml} (100%) rename tests/ui/{views/newCall.qml => Views/NewCall.qml} (100%) diff --git a/tests/linphone.pro b/tests/linphone.pro index 5bb80b85b..1cfdb0ab7 100644 --- a/tests/linphone.pro +++ b/tests/linphone.pro @@ -24,18 +24,23 @@ TRANSLATIONS = \ lupdate_only{ # Each component folder must be added explicitly. SOURCES = \ - ui/components/chat/*.qml \ - ui/components/collapse/*.qml \ - ui/components/contact/*.qml \ - ui/components/dialog/*.qml \ - ui/components/form/*.qml \ - ui/components/misc/*.qml \ - ui/components/scrollBar/*.qml \ - ui/components/select/*.qml \ - ui/components/timeline/*.qml \ - ui/views/*.qml \ - ui/views/mainWindow/*.qml + ui/Linphone/Chat/*.qml \ + ui/Linphone/Collapse/*.qml \ + ui/Linphone/Contact/*.qml \ + ui/Linphone/Dialog/*.qml \ + ui/Linphone/Form/*.qml \ + ui/Linphone/Image/*.qml \ + ui/Linphone/InvertedMouseArea/*.qml \ + ui/Linphone/Misc/*.qml \ + ui/Linphone/Popup/*.qml \ + ui/Linphone/ScrollBar/*.qml \ + ui/Linphone/SearchBox/*.qml \ + ui/Linphone/Select/*.qml \ + ui/Linphone/Styles/*.qml \ + ui/Linphone/Timeline/*.qml \ + ui/Linphone/View/*.qml \ + ui/Views/*.qml \ + ui/Views/MainWindow/*.qml } -RESOURCES += \ - resources.qrc +RESOURCES = resources.qrc diff --git a/tests/resources.qrc b/tests/resources.qrc index 1865f3397..de2e6b5e8 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -2,14 +2,14 @@ languages/fr.qm languages/en.qm + ui/Views/MainWindow/Contact.qml + ui/Views/MainWindow/Contacts.qml + ui/Views/MainWindow/Conversation.qml + ui/Views/MainWindow/MainWindow.qml + ui/Views/MainWindow/Home.qml + ui/Views/ManageAccounts.qml + ui/Views/NewCall.qml ui/scripts/utils.js - ui/views/newCall.qml - ui/views/manageAccounts.qml - ui/views/mainWindow/mainWindow.qml - ui/views/mainWindow/contacts.qml - 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 diff --git a/tests/src/main.cpp b/tests/src/main.cpp index 491f69665..45fe62a35 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -58,7 +58,7 @@ int main (int argc, char *argv[]) { // Set modules paths. engine.addImportPath(":/ui/"); - engine.load(QUrl("qrc:/ui/views/mainWindow/mainWindow.qml")); + engine.load(QUrl("qrc:/ui/Views/MainWindow/MainWindow.qml")); if (engine.rootObjects().isEmpty()) return EXIT_FAILURE; diff --git a/tests/ui/Linphone/qmldir b/tests/ui/Linphone/qmldir index ce87ccea9..56d75aa14 100644 --- a/tests/ui/Linphone/qmldir +++ b/tests/ui/Linphone/qmldir @@ -1,19 +1,26 @@ module Linphone -# Constants. +# Constants ---------------------------------------------------------- + singleton Constants 1.0 Constants.qml -# Components. +# Components --------------------------------------------------------- + +# Chat Chat 1.0 Chat/Chat.qml +# Collapse Collapse 1.0 Collapse/Collapse.qml +# Contact Avatar 1.0 Contact/Avatar.qml Contact 1.0 Contact/Contact.qml ContactDescription 1.0 Contact/ContactDescription.qml +# Dialog DialogPlus 1.0 Dialog/DialogPlus.qml +# Form ActionBar 1.0 Form/ActionBar.qml ActionButton 1.0 Form/ActionButton.qml DarkButton 1.0 Form/DarkButton.qml @@ -21,19 +28,30 @@ ExclusiveButtons 1.0 Form/ExclusiveButtons.qml LightButton 1.0 Form/LightButton.qml TransparentComboBox 1.0 Form/TransparentComboBox.qml +# Image Icon 1.0 Image/Icon.qml +# InvertedMouseArea InvertedMouseArea 1.0 InvertedMouseArea/InvertedMouseArea.qml +# Misc MenuEntry 1.0 Misc/MenuEntry.qml +# Popup DropDownMenu 1.0 Popup/DropDownMenu.qml PopupShadow 1.0 Popup/PopupShadow.qml -SearchBox 1.0 SearchBox/SearchBox.qml - +# ScrollBar ForceScrollBar 1.0 ScrollBar/ForceScrollBar.qml +# SearchBox +SearchBox 1.0 SearchBox/SearchBox.qml + +# Select +SelectContact 1.0 Select/SelectContact.qml + +# Timeline Timeline 1.0 Timeline/Timeline.qml +# View ScrollableListView 1.0 View/ScrollableListView.qml diff --git a/tests/ui/views/mainWindow/contact.qml b/tests/ui/Views/MainWindow/Contact.qml similarity index 100% rename from tests/ui/views/mainWindow/contact.qml rename to tests/ui/Views/MainWindow/Contact.qml diff --git a/tests/ui/views/mainWindow/contacts.qml b/tests/ui/Views/MainWindow/Contacts.qml similarity index 100% rename from tests/ui/views/mainWindow/contacts.qml rename to tests/ui/Views/MainWindow/Contacts.qml diff --git a/tests/ui/views/mainWindow/conversation.qml b/tests/ui/Views/MainWindow/Conversation.qml similarity index 100% rename from tests/ui/views/mainWindow/conversation.qml rename to tests/ui/Views/MainWindow/Conversation.qml diff --git a/tests/ui/views/mainWindow/home.qml b/tests/ui/Views/MainWindow/Home.qml similarity index 100% rename from tests/ui/views/mainWindow/home.qml rename to tests/ui/Views/MainWindow/Home.qml diff --git a/tests/ui/views/mainWindow/mainWindow.qml b/tests/ui/Views/MainWindow/MainWindow.qml similarity index 96% rename from tests/ui/views/mainWindow/mainWindow.qml rename to tests/ui/Views/MainWindow/MainWindow.qml index f0597efc7..b7997801e 100644 --- a/tests/ui/views/mainWindow/mainWindow.qml +++ b/tests/ui/Views/MainWindow/MainWindow.qml @@ -48,12 +48,12 @@ ApplicationWindow { // User actions. ActionButton { Layout.preferredWidth: 16 - onClicked: Utils.openWindow('manageAccounts', mainWindow) + onClicked: Utils.openWindow('ManageAccounts', mainWindow) } ActionButton { Layout.preferredWidth: 16 - onClicked: Utils.openWindow('newCall', mainWindow) + onClicked: Utils.openWindow('NewCall', mainWindow) } // Search. @@ -167,7 +167,7 @@ ApplicationWindow { Loader { Layout.fillHeight: true Layout.fillWidth: true - source: 'qrc:/ui/views/mainWindow/contacts.qml' + source: 'qrc:/ui/Views/MainWindow/Contacts.qml' } } diff --git a/tests/ui/views/manageAccounts.qml b/tests/ui/Views/ManageAccounts.qml similarity index 100% rename from tests/ui/views/manageAccounts.qml rename to tests/ui/Views/ManageAccounts.qml diff --git a/tests/ui/views/newCall.qml b/tests/ui/Views/NewCall.qml similarity index 100% rename from tests/ui/views/newCall.qml rename to tests/ui/Views/NewCall.qml diff --git a/tests/ui/scripts/utils.js b/tests/ui/scripts/utils.js index 9b1592518..27fd0858a 100644 --- a/tests/ui/scripts/utils.js +++ b/tests/ui/scripts/utils.js @@ -16,7 +16,7 @@ function openWindow (window, parent, options) { object = Qt.createQmlObject(window, parent) } else { var component = Qt.createComponent( - 'qrc:/ui/views/' + window + '.qml' + 'qrc:/ui/Views/' + window + '.qml' ) if (component.status !== Component.Ready) {