Browse Source

Remove ReelImage; change default timings

Change-Id: I6b05b38e4382143e3a56181c8ac2ea37ff37597a
Donald Carr 8 years ago
parent
commit
b1da879188
3 changed files with 4 additions and 12 deletions
  1. 0 1
      qml/qml.qrc
  2. 4 4
      qml/reel/Reel.qml
  3. 0 7
      qml/reel/ReelImage.qml

+ 0 - 1
qml/qml.qrc

@@ -14,7 +14,6 @@
         <file>conveyor/Conveyor.qml</file>
         <file>basic/Basic.qml</file>
         <file>reel/Reel.qml</file>
-        <file>reel/ReelImage.qml</file>
         <file>procession/Procession.qml</file>
         <file>procession/ProcessionImage.qml</file>
         <file>effects/Effect.qml</file>

+ 4 - 4
qml/reel/Reel.qml

@@ -7,13 +7,13 @@ View {
     id: root
 
     property var pictureDelegate: Component {
-        ReelImage {}
+        ArtImage {}
     }
 
     Settings {
         id: reelSettings
         category: "Reel"
-        property int deathYawn: 5000
+        property int deathYawn: 10000
     }
 
     QtObject {
@@ -98,7 +98,7 @@ View {
                             deathTimer.start()
                             if(!d.initialized) {
                                 d.initialized = true
-                                d.velocity = 1
+                                d.velocity = 2
                             }
                         }
                     } else {
@@ -125,7 +125,7 @@ View {
         running: !d.initialized
         interval: 100
         onTriggered: {
-            d.velocity += 0.1
+            d.velocity += 0.2
         }
     }
 

+ 0 - 7
qml/reel/ReelImage.qml

@@ -1,7 +0,0 @@
-import QtQuick 2.6
-
-import ".."
-
-ArtImage {
-    property bool doomed: false
-}