mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-15 20:17:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(app): utils.js is now a module

Browse source
This commit is contained in:
Ronan Abhamon 2016-09-29 10:51:05 +02:00
parent 5dedf82c3e
commit 24ce071a05
9 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/resources.qrc
View file

@ -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>

1
tests/src/main.cpp
View file

@ -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())

2
tests/ui/modules/Linphone/Chat/Event.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.7
import 'qrc:/ui/scripts/utils.js' as Utils
import Utils 1.0
// ===================================================================

3
tests/ui/modules/Linphone/InvertedMouseArea.qml
View file

@ -1,8 +1,7 @@
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.

3
tests/ui/scripts/Utils/qmldir Normal file
View file

@ -0,0 +1,3 @@
module Utils
Utils 1.0 utils.js

8
tests/ui/scripts/utils.js → tests/ui/scripts/Utils/utils.js
View file

@ -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

3
tests/ui/views/MainWindow/Contact.qml
View file

@ -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

3
tests/ui/views/MainWindow/Contacts.qml
View file

@ -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

3
tests/ui/views/MainWindow/MainWindow.qml
View file

@ -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