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
24ce071a
Commit
24ce071a
authored
Sep 29, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): utils.js is now a module
parent
5dedf82c
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
15 deletions
+14
-15
resources.qrc
tests/resources.qrc
+2
-1
main.cpp
tests/src/main.cpp
+1
-0
Event.qml
tests/ui/modules/Linphone/Chat/Event.qml
+1
-1
InvertedMouseArea.qml
tests/ui/modules/Linphone/InvertedMouseArea.qml
+1
-2
qmldir
tests/ui/scripts/Utils/qmldir
+3
-0
utils.js
tests/ui/scripts/Utils/utils.js
+3
-5
Contact.qml
tests/ui/views/MainWindow/Contact.qml
+1
-2
Contacts.qml
tests/ui/views/MainWindow/Contacts.qml
+1
-2
MainWindow.qml
tests/ui/views/MainWindow/MainWindow.qml
+1
-2
No files found.
tests/resources.qrc
View file @
24ce071a
...
...
@@ -78,7 +78,8 @@
<file>
ui/modules/Linphone/Styles/TimelineStyle.qml
</file>
<file>
ui/modules/Linphone/Timeline.qml
</file>
<file>
ui/modules/Linphone/View/ScrollableListView.qml
</file>
<file>
ui/scripts/utils.js
</file>
<file>
ui/scripts/Utils/qmldir
</file>
<file>
ui/scripts/Utils/utils.js
</file>
<file>
ui/views/MainWindow/Contact.qml
</file>
<file>
ui/views/MainWindow/Contacts.qml
</file>
<file>
ui/views/MainWindow/Conversation.qml
</file>
...
...
tests/src/main.cpp
View file @
24ce071a
...
...
@@ -57,6 +57,7 @@ int main (int argc, char *argv[]) {
// Set modules paths.
engine
.
addImportPath
(
":/ui/modules"
);
engine
.
addImportPath
(
":/ui/scripts"
);
engine
.
load
(
QUrl
(
"qrc:/ui/views/MainWindow/MainWindow.qml"
));
if
(
engine
.
rootObjects
().
isEmpty
())
...
...
tests/ui/modules/Linphone/Chat/Event.qml
View file @
24ce071a
import
QtQuick
2.7
import
'
qrc:/ui/scripts/utils.js
'
as
Utils
import
Utils
1.0
// ===================================================================
...
...
tests/ui/modules/Linphone/InvertedMouseArea.qml
View file @
24ce071a
import
QtQuick
2.7
import
Linphone
1.0
import
'
qrc:/ui/scripts/utils.js
'
as
Utils
import
Utils
1.0
// ===================================================================
// Helper to handle button click outside a component.
...
...
tests/ui/scripts/Utils/qmldir
0 → 100644
View file @
24ce071a
module Utils
Utils 1.0 utils.js
tests/ui/scripts/utils.js
→
tests/ui/scripts/
Utils/
utils.js
View file @
24ce071a
...
...
@@ -79,16 +79,14 @@ function snakeToCamel (s) {
// -------------------------------------------------------------------
function
Timer
(
parent
)
{
return
Qt
.
createQmlObject
(
'
import QtQuick 2.7; Timer { }
'
,
parent
)
}
// A copy of `Window.setTimeout` from js.
// Use setTimeout.call(parentContext, delayTime, cb) to use it.
//
// delay is in milliseconds.
function
setTimeout
(
delay
,
cb
)
{
var
timer
=
new
Timer
(
this
)
var
timer
=
new
(
function
(
parent
)
{
return
Qt
.
createQmlObject
(
'
import QtQuick 2.7; Timer { }
'
,
parent
)
})(
this
)
timer
.
interval
=
delay
timer
.
repeat
=
false
...
...
tests/ui/views/MainWindow/Contact.qml
View file @
24ce071a
...
...
@@ -3,8 +3,7 @@ import QtQuick.Controls 2.0
import
QtQuick
.
Layouts
1.3
import
Linphone
1.0
import
'
qrc:/ui/scripts/utils.js
'
as
Utils
import
Utils
1.0
ColumnLayout
{
spacing
:
0
...
...
tests/ui/views/MainWindow/Contacts.qml
View file @
24ce071a
...
...
@@ -3,8 +3,7 @@ import QtQuick.Controls 2.0
import
QtQuick
.
Layouts
1.3
import
Linphone
1.0
import
'
qrc:/ui/scripts/utils.js
'
as
Utils
import
Utils
1.0
ColumnLayout
{
spacing
:
2
...
...
tests/ui/views/MainWindow/MainWindow.qml
View file @
24ce071a
...
...
@@ -3,8 +3,7 @@ import QtQuick.Controls 2.0
import
QtQuick
.
Layouts
1.3
import
Linphone
1.0
import
'
qrc:/ui/scripts/utils.js
'
as
Utils
import
Utils
1.0
ApplicationWindow
{
id
:
window
...
...
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