update Animation

examples/TaoQuickShow/Contents/Animation/Circle.qml

@@ -17,14 +17,14 @@ Item {
             id: s1
             width: 250
             height: 375
-            dir: ASquare.Direct.FromInner
+            dir: directFromInner
             effectSource.sourceItem: src
         }
         ACircle {
             id: s2
             width: 250
             height: 375
-            dir: ASquare.Direct.FromOuter
+            dir: directFromOuter
             effectSource.sourceItem: src
         }
     }

examples/TaoQuickShow/Contents/Animation/Cleavage.qml

@@ -19,28 +19,28 @@ Item {
             id: s1
             width: 250
             height: 375
-            dir: ACleavage.Direct.HorizonToInner
+            dir: directHorizonToInner
             effectSource.sourceItem: src
         }
         ACleavage {
             id: s2
             width: 250
             height: 375
-            dir: ACleavage.Direct.HorizonToOuter
+            dir: directHorizonToOuter
             effectSource.sourceItem: src
         }
         ACleavage {
             id: s3
             width: 250
             height: 375
-            dir: ACleavage.Direct.VerticalToInner
+            dir: directVerticalToInner
             effectSource.sourceItem: src
         }
         ACleavage {
             id: s4
             width: 250
             height: 375
-            dir: ACleavage.Direct.VerticalToOuter
+            dir: directVerticalToOuter
             effectSource.sourceItem: src
         }
     }

examples/TaoQuickShow/Contents/Animation/Cross.qml

@@ -18,14 +18,14 @@ Item {
             id: s1
             width: 250
             height: 375
-            dir: ASquare.Direct.FromInner
+            dir: directFromInner
             effectSource.sourceItem: src
         }
         ACross {
             id: s2
             width: 250
             height: 375
-            dir: ASquare.Direct.FromOuter
+            dir: directFromOuter
             effectSource.sourceItem: src
         }
     }

examples/TaoQuickShow/Contents/Animation/Diagonal.qml

@@ -17,28 +17,28 @@ Item {
             id: d1
             width: 250
             height: 375
-            dir: ADiagonal.Direct.FromLeftTop
+            dir: directFromLeftTop
             effectSource.sourceItem: src
         }
         ADiagonal {
             id: d2
             width: 250
             height: 375
-            dir: ADiagonal.Direct.FromRightBottom
+            dir: directFromRightBottom
             effectSource.sourceItem: src
         }
         ADiagonal {
             id: d3
             width: 250
             height: 375
-            dir: ADiagonal.Direct.FromRightTop
+            dir: directFromRightTop
             effectSource.sourceItem: src
         }
         ADiagonal {
             id: d4
             width: 250
             height: 375
-            dir: ADiagonal.Direct.FromLeftBottom
+            dir: directFromLeftBottom
             effectSource.sourceItem: src
         }
     }

examples/TaoQuickShow/Contents/Animation/Louver.qml

@@ -24,21 +24,21 @@ Item {
             id: l2
             width: 250
             height: 375
-            dir: ALouver.Direct.HorizonReverse
+            dir: directHorizonReverse
             effectSource.sourceItem: src
         }
         ALouver {
             id: l3
             width: 250
             height: 375
-            dir: ALouver.Direct.Vertical
+            dir: directVertical
             effectSource.sourceItem: src
         }
         ALouver {
             id: l4
             width: 250
             height: 375
-            dir: ALouver.Direct.VerticalReverse
+            dir: directVerticalReverse
             effectSource.sourceItem: src
         }
 

examples/TaoQuickShow/Contents/Animation/Rhombus.qml

@@ -18,14 +18,14 @@ Item {
             id: l1
             width: 250
             height: 375
-            dir: ARhombus.Direct.FromInner
+            dir: directFromInner
             effectSource.sourceItem:  src
         }
         ARhombus {
             id: l2
             width: 250
             height: 375
-            dir: ARhombus.Direct.FromOuter
+            dir: directFromOuter
             effectSource.sourceItem: src
         }
 

examples/TaoQuickShow/Contents/Animation/Square.qml

@@ -17,14 +17,14 @@ Item {
             id: s1
             width: 250
             height: 375
-            dir: ASquare.Direct.FromInner
+            dir: directFromInner
             effectSource.sourceItem: src
         }
         ASquare {
             id: s2
             width: 250
             height: 375
-            dir: ASquare.Direct.FromOuter
+            dir: directFromOuter
             effectSource.sourceItem: src
         }
     }

examples/TaoQuickShow/Contents/Animation/Wheel.qml

@@ -17,14 +17,14 @@ Item {
             id: s1
             width: 250
             height: 375
-            dir: AWheel.Direct.Clockwise
+            dir: directClockwise
             effectSource.sourceItem: src
         }
         AWheel {
             id: s2
             width: 250
             height: 375
-            dir: AWheel.Direct.CounterClockwise
+            dir: directCounterClockwise
             effectSource.sourceItem: src
         }
         ASector {

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ABoard.qml

@@ -1,15 +1,13 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-
+import ".."
 import "../.."
 
 ShaderEffect {
     id: r
-    enum Direct {
+    readonly property int directToRight: 0
-        ToRight = 0,
+    readonly property int directToBottom: 1
-        ToBottom = 1
+    property int dir :directToRight
-    }
-    property int dir : ABoard.Direct.ToRight
     property int rowCount: 10
     property int columnCount: 10
     property int duration: 1000
@@ -28,7 +26,7 @@ ShaderEffect {
         loops: 1
         duration: r.duration
     }
-    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === ABoard.Direct.ToRight ? "
+    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === directToRight ? "
         varying  vec2 qt_TexCoord0;
         uniform float qt_Opacity;
         uniform sampler2D effectSource;

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ACircle.qml

@@ -1,15 +1,13 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-
+import ".."
 import "../.."
 
 ShaderEffect {
     id: r
-    enum Direct {
+    readonly property int directFromInner: 0
-        FromInner = 0,
+    readonly property int directFromOuter: 1
-        FromOuter = 1
+    property int dir :directFromInner
-    }
-    property int dir : ASquare.Direct.FromInner
     property int duration: 1000
     property ShaderEffectSource effectSource: ShaderEffectSource {
         hideSource: true
@@ -26,7 +24,7 @@ ShaderEffect {
         loops: 1
         duration: r.duration
     }
-    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === ASquare.Direct.FromInner ? "
+    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === directFromInner ? "
         varying vec2 qt_TexCoord0;
         uniform float qt_Opacity;
         uniform sampler2D effectSource;

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ACleavage.qml

@@ -1,17 +1,16 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-
+import ".."
 import "../.."
 
 ShaderEffect {
     id: r
-    enum Direct {
+    readonly property int directHorizonToInner: 0
-        HorizonToInner = 0,
+    readonly property int directHorizonToOuter: 1
-        HorizonToOuter = 1,
+    readonly property int directVerticalToInner: 2
-        VerticalToInner = 2,
+    readonly property int directVerticalToOuter: 3
-        VerticalToOuter = 3
+
-    }
+    property int dir : directVerticalToInner
-    property int dir : ASquare.ACleavge.HorizonToInner
     property int duration: 1000
     property ShaderEffectSource effectSource: ShaderEffectSource {
         hideSource: true

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ACross.qml

@@ -1,15 +1,13 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-
+import ".."
 import "../.."
 
 ShaderEffect {
     id: r
-    enum Direct {
+    readonly property int directFromInner: 0
-        FromInner = 0,
+    readonly property int directFromOuter: 1
-        FromOuter = 1
+    property int dir : directFromInner
-    }
-    property int dir : ASquare.Direct.FromInner
     property int duration: 1000
     property ShaderEffectSource effectSource: ShaderEffectSource {
         hideSource: true
@@ -26,7 +24,7 @@ ShaderEffect {
         loops: 1
         duration: r.duration
     }
-    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === ASquare.Direct.FromInner ? "
+    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === directFromInner ? "
         varying vec2 qt_TexCoord0;
         uniform float qt_Opacity;
         uniform sampler2D effectSource;

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ADiagonal.qml

@@ -1,17 +1,16 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 
+import ".."
 import "../.."
 
 ShaderEffect {
     id: r
-    enum Direct {
+    readonly property int directFromLeftTop: 0
-        FromLeftTop = 0,
+    readonly property int directFromRightTop: 1
-        FromRightTop = 1,
+    readonly property int directFromLeftBottom: 2
-        FromLeftBottom = 2,
+    readonly property int directFromRightBottom: 3
-        FromRightBottom = 3
+    property int dir: directFromLeftTop
-    }
-    property int dir: ADiagonal.Direct.FromLeftTop
     property int duration: 1000
     property ShaderEffectSource effectSource: ShaderEffectSource {
         hideSource: true

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ADissolve.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 
+import ".."
 import "../.."
 
 ShaderEffect {

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ALouver.qml

@@ -1,18 +1,16 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-
+import ".."
 import "../.."
 
 ShaderEffect {
     id: r
-    enum Direct {
+    readonly property int directHorizon: 0
-        Horizon = 0,
+    readonly property int directVertical: 1
-        Vertical = 1,
+    readonly property int directHorizonReverse: 2
-        HorizonReverse = 2,
+    readonly property int directVerticalReverse: 3
-        VerticalReverse = 3
-    }
 
-    property int dir: ALouver.Direct.Horizon
+    property int dir: directHorizon
 
     property int count: 4
     property int duration: 1000

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ARhombus.qml

@@ -1,15 +1,13 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-
+import ".."
 import "../.."
 
 ShaderEffect {
     id: r
-    enum Direct {
+    readonly property int directFromInner: 0
-        FromInner = 0,
+    readonly property int directFromOuter: 1
-        FromOuter = 1
+    property int dir: directFromInner
-    }
-    property int dir : ASquare.Direct.FromInner
     property int duration: 1000
     property ShaderEffectSource effectSource: ShaderEffectSource {
         hideSource: true
@@ -26,7 +24,7 @@ ShaderEffect {
         loops: 1
         duration: r.duration
     }
-    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === ASquare.Direct.FromInner ? "
+    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === directFromInner ? "
         varying vec2 qt_TexCoord0;
         uniform float qt_Opacity;
         uniform sampler2D effectSource;

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ASector.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-
+import ".."
 import "../.."
 
 ShaderEffect {

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ASlowEnter.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
+import ".."
 import "../.."
 
 Item {
@@ -13,7 +14,7 @@ Item {
     readonly property int directFromTop: 2
     readonly property int directFromBottom: 3
 
-    property int dir: ASlowEnter.directFromBottom
+    property int dir: directFromBottom
     property int duration: 2000
     property int extDistance: 10
     property var __propList: ["x", "x", "y", "y"]

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/ASquare.qml

@@ -1,15 +1,14 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 
+import ".."
 import "../.."
 
 ShaderEffect {
     id: r
-    enum Direct {
+    readonly property int directFromInner: 0
-        FromInner = 0,
+    readonly property int directFromOuter: 1
-        FromOuter = 1
+    property int dir : directFromInner
-    }
-    property int dir : ASquare.Direct.FromInner
     property int duration: 1000
     property ShaderEffectSource effectSource: ShaderEffectSource {
         hideSource: true
@@ -26,7 +25,7 @@ ShaderEffect {
         loops: 1
         duration: r.duration
     }
-    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === ASquare.Direct.FromInner ? "
+    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === directFromInner ? "
        varying vec2 qt_TexCoord0;
        uniform float qt_Opacity;
        uniform sampler2D effectSource;

src/TaoQuick/imports/TaoQuick/Qml/Effect/Animation/AWheel.qml

@@ -1,15 +1,14 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 
+import ".."
 import "../.."
 
 ShaderEffect {
     id: r
-    enum Direct {
+    readonly property int directClockwise: 0
-        Clockwise = 0,
+    readonly property int directCounterClockwise: 1
-        CounterClockwise = 1
+    property int dir: directClockwise
-    }
-    property int dir : AWheel.Direct.Clockwise
     property int duration: 1000
     property ShaderEffectSource effectSource: ShaderEffectSource {
         hideSource: true
@@ -27,7 +26,7 @@ ShaderEffect {
         duration: r.duration
 
     }
-    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === AWheel.Direct.CounterClockwise ? "
+    fragmentShader: CusEffectCommon.fragmentShaderCommon + (dir === directCounterClockwise ? "
         varying vec2 qt_TexCoord0;
         uniform float qt_Opacity;
         uniform sampler2D effectSource;