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
f41720a1
Commit
f41720a1
authored
Sep 09, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(app): use camelCase instead of snake_case for qml files
parent
da7f69e5
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
en.ts
tests/languages/en.ts
+2
-2
fr.ts
tests/languages/fr.ts
+2
-2
resources.qrc
tests/resources.qrc
+2
-2
main.cpp
tests/src/main.cpp
+1
-1
mainWindow.qml
tests/ui/views/mainWindow.qml
+1
-1
manageAccounts.qml
tests/ui/views/manageAccounts.qml
+0
-0
No files found.
tests/languages/en.ts
View file @
f41720a1
...
...
@@ -2,14 +2,14 @@
<!
DOCTYPE
TS
>
<
TS
version
=
"
2.1
"
>
<
context
>
<
name
>
main
_w
indow
<
/name
>
<
name
>
main
W
indow
<
/name
>
<
message
>
<
source
>
mainSearchBarPlaceholder
<
/source
>
<
translation
>
Search
contact
,
start
call
,
start
chat
...
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
manage
_a
ccounts
<
/name
>
<
name
>
manage
A
ccounts
<
/name
>
<
message
>
<
source
>
manageAccountsTitle
<
/source
>
<
translation
>
Presence
and
accounts
<
/translation
>
...
...
tests/languages/fr.ts
View file @
f41720a1
...
...
@@ -2,14 +2,14 @@
<!
DOCTYPE
TS
>
<
TS
version
=
"
2.1
"
>
<
context
>
<
name
>
main
_w
indow
<
/name
>
<
name
>
main
W
indow
<
/name
>
<
message
>
<
source
>
mainSearchBarPlaceholder
<
/source
>
<
translation
>
Chercher
contact
,
commencer
appel
ou
chat
...
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
manage
_a
ccounts
<
/name
>
<
name
>
manage
A
ccounts
<
/name
>
<
message
>
<
source
>
manageAccountsTitle
<
/source
>
<
translation
>
Pr
é
sence
et
comptes
<
/translation
>
...
...
tests/resources.qrc
View file @
f41720a1
...
...
@@ -12,8 +12,8 @@
<file>
ui/components/form/DialogComboBox.qml
</file>
<file>
ui/components/form/RoundButton.qml
</file>
<file>
ui/components/form/ToolBarButton.qml
</file>
<file>
ui/views/main
_w
indow.qml
</file>
<file>
ui/views/manage
_a
ccounts.qml
</file>
<file>
ui/views/main
W
indow.qml
</file>
<file>
ui/views/manage
A
ccounts.qml
</file>
<!-- Images. -->
<file>
imgs/collapse.svg
</file>
...
...
tests/src/main.cpp
View file @
f41720a1
...
...
@@ -8,7 +8,7 @@
int
main
(
int
argc
,
char
*
argv
[])
{
App
app
(
argc
,
argv
);
QQmlApplicationEngine
engine
(
QUrl
(
"qrc:/ui/views/main
_w
indow.qml"
));
QQmlApplicationEngine
engine
(
QUrl
(
"qrc:/ui/views/main
W
indow.qml"
));
if
(
engine
.
rootObjects
().
isEmpty
())
return
EXIT_FAILURE
;
...
...
tests/ui/views/main
_w
indow.qml
→
tests/ui/views/main
W
indow.qml
View file @
f41720a1
...
...
@@ -29,7 +29,7 @@ ApplicationWindow {
// User actions.
ToolBarButton
{
onClicked
:
{
var
component
=
Qt
.
createComponent
(
'
qrc:/ui/views/manage
_a
ccounts.qml
'
);
var
component
=
Qt
.
createComponent
(
'
qrc:/ui/views/manage
A
ccounts.qml
'
);
if
(
component
.
status
!==
Component
.
Ready
)
{
console
.
debug
(
'
Window not ready.
'
)
if
(
component
.
status
===
Component
.
Error
)
{
...
...
tests/ui/views/manage
_a
ccounts.qml
→
tests/ui/views/manage
A
ccounts.qml
View file @
f41720a1
File moved
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