Преглед изворни кода

globalVars now contains methods => globalUtil

Change-Id: Id3f884fc32d3c13c70e3a1930c1a31c2791a905e
Donald Carr пре 9 година
родитељ
комит
bbf66aca12
3 измењених фајлова са 15 додато и 15 уклоњено
  1. 9 9
      qml/basic/Basic.qml
  2. 3 3
      qml/main.qml
  3. 3 3
      qml/physics/Physics.qml

+ 9 - 9
qml/basic/Basic.qml

@@ -64,7 +64,7 @@ Item {
                 onFullChanged: {
                     if (!initialized) {
                         initialized = true
-                        globalVars.registerColumnPrimed()
+                        globalUtil.registerColumnPrimed()
                     }
                 }
 
@@ -83,7 +83,7 @@ Item {
                     image.y = root.height - compoundArtworkHeight
 
                     pictureArray.push(image)
-                    globalVars.itemCount++
+                    globalUtil.itemCount++
                 }
 
                 function removeImage(image) {
@@ -91,7 +91,7 @@ Item {
                         image.effect.destroy()
                     }
                     image.destroy()
-                    globalVars.itemCount--
+                    globalUtil.itemCount--
                 }
 
                 function shift() {
@@ -120,14 +120,14 @@ Item {
                     id: deathTimer
                     running: !generalSettings.commonFeed && artworkStack.initialized
                     repeat: true
-                    interval: globalVars.adjustedInterval
+                    interval: globalUtil.adjustedInterval
                     onTriggered: artworkStack.shift()
                 }
 
                 Behavior on y {
                     enabled: artworkStack.initialized
                     NumberAnimation {
-                        duration: Math.min(globalVars.adjustedInterval, basicSettings.animationDuration)
+                        duration: Math.min(globalUtil.adjustedInterval, basicSettings.animationDuration)
                         easing.type: basicSettings.easingType
                     }
                 }
@@ -143,14 +143,14 @@ Item {
 
     Timer {
         id: globalDeathTimer
-        running: generalSettings.commonFeed && globalVars.primed
+        running: generalSettings.commonFeed && globalUtil.primed
         repeat: true
-        interval: globalVars.adjustedInterval
-        onTriggered: d.columnArray[globalVars.columnSelection()].shift()
+        interval: globalUtil.adjustedInterval
+        onTriggered: d.columnArray[globalUtil.columnSelection()].shift()
     }
 
     Repeater {
-        model: globalVars.columnCount
+        model: globalUtil.columnCount
         delegate: columnComponent
         onModelChanged: d.reset()
     }

+ 3 - 3
qml/main.qml

@@ -14,7 +14,7 @@ Window {
     }
 
     QtObject {
-        id: globalVars
+        id: globalUtil
         property int itemCount
         property int currentColumn: 0
         property bool primed: d.primedColumns === columnCount
@@ -57,7 +57,7 @@ Window {
 
         onViewChanged: {
             loader.source = generalSettings.view.toLowerCase() + "/" + generalSettings.view + ".qml"
-            globalVars.reset()
+            globalUtil.reset()
         }
 
         onColumnCountChanged: d.reset()
@@ -111,7 +111,7 @@ Window {
         Text {
             id: itemCountLabel
             font.pixelSize: 100
-            text: globalVars.itemCount
+            text: globalUtil.itemCount
             color: "white"
         }
     }

+ 3 - 3
qml/physics/Physics.qml

@@ -91,7 +91,7 @@ Item {
                 image.y = floor.y - stackHeight
 
                 pictureArray.push(image)
-                globalVars.itemCount++
+                globalUtil.itemCount++
             }
 
             function removeImage(image) {
@@ -100,7 +100,7 @@ Item {
                 }
                 stackHeight -= (image.height + d.itemTravel)
                 image.destroy()
-                globalVars.itemCount--
+                globalUtil.itemCount--
             }
 
             function shiftImageToLimbo() {
@@ -155,7 +155,7 @@ Item {
                 id: deathTimer
                 running: d.running
                 repeat: true
-                interval: globalVars.adjustedInterval
+                interval: globalUtil.adjustedInterval
                 onTriggered: shiftImageToLimbo()
             }