Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
ba75ede6
Commit
ba75ede6
authored
Sep 26, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): all `.qml` files start with a uppercase
parent
47f43a39
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
51 additions
and
28 deletions
+51
-28
linphone.pro
tests/linphone.pro
+18
-13
resources.qrc
tests/resources.qrc
+7
-7
main.cpp
tests/src/main.cpp
+1
-1
qmldir
tests/ui/Linphone/qmldir
+21
-3
Contact.qml
tests/ui/Views/MainWindow/Contact.qml
+0
-0
Contacts.qml
tests/ui/Views/MainWindow/Contacts.qml
+0
-0
Conversation.qml
tests/ui/Views/MainWindow/Conversation.qml
+0
-0
Home.qml
tests/ui/Views/MainWindow/Home.qml
+0
-0
MainWindow.qml
tests/ui/Views/MainWindow/MainWindow.qml
+3
-3
ManageAccounts.qml
tests/ui/Views/ManageAccounts.qml
+0
-0
NewCall.qml
tests/ui/Views/NewCall.qml
+0
-0
utils.js
tests/ui/scripts/utils.js
+1
-1
No files found.
tests/linphone.pro
View file @
ba75ede6
...
...
@@ -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
tests/resources.qrc
View file @
ba75ede6
...
...
@@ -2,14 +2,14 @@
<qresource
prefix=
"/"
>
<file>
languages/fr.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/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/PopupShadow.qml
</file>
<file>
ui/Linphone/qmldir
</file>
...
...
tests/src/main.cpp
View file @
ba75ede6
...
...
@@ -58,7 +58,7 @@ int main (int argc, char *argv[]) {
// Set modules paths.
engine
.
addImportPath
(
":/ui/"
);
engine
.
load
(
QUrl
(
"qrc:/ui/
views/mainWindow/m
ainWindow.qml"
));
engine
.
load
(
QUrl
(
"qrc:/ui/
Views/MainWindow/M
ainWindow.qml"
));
if
(
engine
.
rootObjects
().
isEmpty
())
return
EXIT_FAILURE
;
...
...
tests/ui/Linphone/qmldir
View file @
ba75ede6
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
# ScrollBar
ForceScrollBar 1.0 ScrollBar/ForceScrollBar.qml
# SearchBox
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
# View
ScrollableListView 1.0 View/ScrollableListView.qml
tests/ui/
views/mainWindow/c
ontact.qml
→
tests/ui/
Views/MainWindow/C
ontact.qml
View file @
ba75ede6
File moved
tests/ui/
views/mainWindow/c
ontacts.qml
→
tests/ui/
Views/MainWindow/C
ontacts.qml
View file @
ba75ede6
File moved
tests/ui/
views/mainWindow/c
onversation.qml
→
tests/ui/
Views/MainWindow/C
onversation.qml
View file @
ba75ede6
File moved
tests/ui/
views/mainWindow/h
ome.qml
→
tests/ui/
Views/MainWindow/H
ome.qml
View file @
ba75ede6
File moved
tests/ui/
views/mainWindow/m
ainWindow.qml
→
tests/ui/
Views/MainWindow/M
ainWindow.qml
View file @
ba75ede6
...
...
@@ -48,12 +48,12 @@ ApplicationWindow {
// User actions.
ActionButton
{
Layout.preferredWidth
:
16
onClicked
:
Utils
.
openWindow
(
'
m
anageAccounts
'
,
mainWindow
)
onClicked
:
Utils
.
openWindow
(
'
M
anageAccounts
'
,
mainWindow
)
}
ActionButton
{
Layout.preferredWidth
:
16
onClicked
:
Utils
.
openWindow
(
'
n
ewCall
'
,
mainWindow
)
onClicked
:
Utils
.
openWindow
(
'
N
ewCall
'
,
mainWindow
)
}
// Search.
...
...
@@ -167,7 +167,7 @@ ApplicationWindow {
Loader
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
source
:
'
qrc:/ui/
views/mainWindow/c
ontacts.qml
'
source
:
'
qrc:/ui/
Views/MainWindow/C
ontacts.qml
'
}
}
...
...
tests/ui/
views/m
anageAccounts.qml
→
tests/ui/
Views/M
anageAccounts.qml
View file @
ba75ede6
File moved
tests/ui/
views/n
ewCall.qml
→
tests/ui/
Views/N
ewCall.qml
View file @
ba75ede6
File moved
tests/ui/scripts/utils.js
View file @
ba75ede6
...
...
@@ -16,7 +16,7 @@ function openWindow (window, parent, options) {
object
=
Qt
.
createQmlObject
(
window
,
parent
)
}
else
{
var
component
=
Qt
.
createComponent
(
'
qrc:/ui/
v
iews/
'
+
window
+
'
.qml
'
'
qrc:/ui/
V
iews/
'
+
window
+
'
.qml
'
)
if
(
component
.
status
!==
Component
.
Ready
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment