Commit ba75ede6 authored by Ronan Abhamon's avatar Ronan Abhamon

feat(app): all `.qml` files start with a uppercase

parent 47f43a39
...@@ -24,18 +24,23 @@ TRANSLATIONS = \ ...@@ -24,18 +24,23 @@ TRANSLATIONS = \
lupdate_only{ lupdate_only{
# Each component folder must be added explicitly. # Each component folder must be added explicitly.
SOURCES = \ SOURCES = \
ui/components/chat/*.qml \ ui/Linphone/Chat/*.qml \
ui/components/collapse/*.qml \ ui/Linphone/Collapse/*.qml \
ui/components/contact/*.qml \ ui/Linphone/Contact/*.qml \
ui/components/dialog/*.qml \ ui/Linphone/Dialog/*.qml \
ui/components/form/*.qml \ ui/Linphone/Form/*.qml \
ui/components/misc/*.qml \ ui/Linphone/Image/*.qml \
ui/components/scrollBar/*.qml \ ui/Linphone/InvertedMouseArea/*.qml \
ui/components/select/*.qml \ ui/Linphone/Misc/*.qml \
ui/components/timeline/*.qml \ ui/Linphone/Popup/*.qml \
ui/views/*.qml \ ui/Linphone/ScrollBar/*.qml \
ui/views/mainWindow/*.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 = resources.qrc
resources.qrc
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<qresource prefix="/"> <qresource prefix="/">
<file>languages/fr.qm</file> <file>languages/fr.qm</file>
<file>languages/en.qm</file> <file>languages/en.qm</file>
<file>ui/Views/MainWindow/Contact.qml</file>
<file>ui/Views/MainWindow/Contacts.qml</file>
<file>ui/Views/MainWindow/Conversation.qml</file>
<file>ui/Views/MainWindow/MainWindow.qml</file>
<file>ui/Views/MainWindow/Home.qml</file>
<file>ui/Views/ManageAccounts.qml</file>
<file>ui/Views/NewCall.qml</file>
<file>ui/scripts/utils.js</file> <file>ui/scripts/utils.js</file>
<file>ui/views/newCall.qml</file>
<file>ui/views/manageAccounts.qml</file>
<file>ui/views/mainWindow/mainWindow.qml</file>
<file>ui/views/mainWindow/contacts.qml</file>
<file>ui/views/mainWindow/home.qml</file>
<file>ui/views/mainWindow/contact.qml</file>
<file>ui/views/mainWindow/conversation.qml</file>
<file>ui/Linphone/Popup/DropDownMenu.qml</file> <file>ui/Linphone/Popup/DropDownMenu.qml</file>
<file>ui/Linphone/Popup/PopupShadow.qml</file> <file>ui/Linphone/Popup/PopupShadow.qml</file>
<file>ui/Linphone/qmldir</file> <file>ui/Linphone/qmldir</file>
......
...@@ -58,7 +58,7 @@ int main (int argc, char *argv[]) { ...@@ -58,7 +58,7 @@ int main (int argc, char *argv[]) {
// Set modules paths. // Set modules paths.
engine.addImportPath(":/ui/"); 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()) if (engine.rootObjects().isEmpty())
return EXIT_FAILURE; return EXIT_FAILURE;
......
module Linphone module Linphone
# Constants. # Constants ----------------------------------------------------------
singleton Constants 1.0 Constants.qml singleton Constants 1.0 Constants.qml
# Components. # Components ---------------------------------------------------------
# Chat
Chat 1.0 Chat/Chat.qml Chat 1.0 Chat/Chat.qml
# Collapse
Collapse 1.0 Collapse/Collapse.qml Collapse 1.0 Collapse/Collapse.qml
# Contact
Avatar 1.0 Contact/Avatar.qml Avatar 1.0 Contact/Avatar.qml
Contact 1.0 Contact/Contact.qml Contact 1.0 Contact/Contact.qml
ContactDescription 1.0 Contact/ContactDescription.qml ContactDescription 1.0 Contact/ContactDescription.qml
# Dialog
DialogPlus 1.0 Dialog/DialogPlus.qml DialogPlus 1.0 Dialog/DialogPlus.qml
# Form
ActionBar 1.0 Form/ActionBar.qml ActionBar 1.0 Form/ActionBar.qml
ActionButton 1.0 Form/ActionButton.qml ActionButton 1.0 Form/ActionButton.qml
DarkButton 1.0 Form/DarkButton.qml DarkButton 1.0 Form/DarkButton.qml
...@@ -21,19 +28,30 @@ ExclusiveButtons 1.0 Form/ExclusiveButtons.qml ...@@ -21,19 +28,30 @@ ExclusiveButtons 1.0 Form/ExclusiveButtons.qml
LightButton 1.0 Form/LightButton.qml LightButton 1.0 Form/LightButton.qml
TransparentComboBox 1.0 Form/TransparentComboBox.qml TransparentComboBox 1.0 Form/TransparentComboBox.qml
# Image
Icon 1.0 Image/Icon.qml Icon 1.0 Image/Icon.qml
# InvertedMouseArea
InvertedMouseArea 1.0 InvertedMouseArea/InvertedMouseArea.qml InvertedMouseArea 1.0 InvertedMouseArea/InvertedMouseArea.qml
# Misc
MenuEntry 1.0 Misc/MenuEntry.qml MenuEntry 1.0 Misc/MenuEntry.qml
# Popup
DropDownMenu 1.0 Popup/DropDownMenu.qml DropDownMenu 1.0 Popup/DropDownMenu.qml
PopupShadow 1.0 Popup/PopupShadow.qml PopupShadow 1.0 Popup/PopupShadow.qml
# ScrollBar
ForceScrollBar 1.0 ScrollBar/ForceScrollBar.qml
# SearchBox
SearchBox 1.0 SearchBox/SearchBox.qml SearchBox 1.0 SearchBox/SearchBox.qml
ForceScrollBar 1.0 ScrollBar/ForceScrollBar.qml # Select
SelectContact 1.0 Select/SelectContact.qml
# Timeline
Timeline 1.0 Timeline/Timeline.qml Timeline 1.0 Timeline/Timeline.qml
# View
ScrollableListView 1.0 View/ScrollableListView.qml ScrollableListView 1.0 View/ScrollableListView.qml
...@@ -48,12 +48,12 @@ ApplicationWindow { ...@@ -48,12 +48,12 @@ ApplicationWindow {
// User actions. // User actions.
ActionButton { ActionButton {
Layout.preferredWidth: 16 Layout.preferredWidth: 16
onClicked: Utils.openWindow('manageAccounts', mainWindow) onClicked: Utils.openWindow('ManageAccounts', mainWindow)
} }
ActionButton { ActionButton {
Layout.preferredWidth: 16 Layout.preferredWidth: 16
onClicked: Utils.openWindow('newCall', mainWindow) onClicked: Utils.openWindow('NewCall', mainWindow)
} }
// Search. // Search.
...@@ -167,7 +167,7 @@ ApplicationWindow { ...@@ -167,7 +167,7 @@ ApplicationWindow {
Loader { Loader {
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
source: 'qrc:/ui/views/mainWindow/contacts.qml' source: 'qrc:/ui/Views/MainWindow/Contacts.qml'
} }
} }
......
...@@ -16,7 +16,7 @@ function openWindow (window, parent, options) { ...@@ -16,7 +16,7 @@ function openWindow (window, parent, options) {
object = Qt.createQmlObject(window, parent) object = Qt.createQmlObject(window, parent)
} else { } else {
var component = Qt.createComponent( var component = Qt.createComponent(
'qrc:/ui/views/' + window + '.qml' 'qrc:/ui/Views/' + window + '.qml'
) )
if (component.status !== Component.Ready) { if (component.status !== Component.Ready) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment