Skip to content
Snippets Groups Projects
Commit cbd9916d authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'develop'

parents 8fedbf33 72f6ca3e
No related branches found
No related tags found
1 merge request!50Features 3819
...@@ -58,17 +58,11 @@ DapBusyIndicatorForm ...@@ -58,17 +58,11 @@ DapBusyIndicatorForm
interval: busyIndicatorDelay * (index) interval: busyIndicatorDelay * (index)
onTriggered: onTriggered:
{ {
console.log("reset triggered, index: ", index)
parent.opacity = 1 parent.opacity = 1
parent.color = busyIndicatorDarkColor parent.color = busyIndicatorDarkColor
parent.scale = busyPointMaxScale parent.scale = busyPointMaxScale
reset2.start() reset2.start()
} }
onRunningChanged:
{
if(running) console.log("reset start, index: ", index)
else console.log("reset stop, index: ", index)
}
} }
//Timer of point transformation at one position //Timer of point transformation at one position
Timer Timer
...@@ -77,16 +71,10 @@ DapBusyIndicatorForm ...@@ -77,16 +71,10 @@ DapBusyIndicatorForm
interval: busyIndicatorDelay interval: busyIndicatorDelay
onTriggered: onTriggered:
{ {
console.log("reset2 triggered, index: ", index)
parent.opacity = 1 parent.opacity = 1
parent.color = busyIndicatorLightColor parent.color = busyIndicatorLightColor
parent.scale = busyPointMinScale parent.scale = busyPointMinScale
} }
onRunningChanged:
{
if(running) console.log("reset2 start, index: ", index)
else console.log("reset2 stop, index: ", index)
}
} }
//Timer of all busy indicator transformation //Timer of all busy indicator transformation
Timer Timer
...@@ -95,7 +83,6 @@ DapBusyIndicatorForm ...@@ -95,7 +83,6 @@ DapBusyIndicatorForm
interval: busyIndicatorDelay * busyPointNum interval: busyIndicatorDelay * busyPointNum
onTriggered: onTriggered:
{ {
console.log("globalTimer triggered, index: ", index)
reset.start() reset.start()
} }
triggeredOnStart: true triggeredOnStart: true
...@@ -118,13 +105,5 @@ DapBusyIndicatorForm ...@@ -118,13 +105,5 @@ DapBusyIndicatorForm
} }
} }
} }
onRunningChanged:
{
if(running)
{
console.log("running all")
}
else console.log("stop all")
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment