QT/TaoQuick
1
0
Fork 0
mirror of https://github.com/jaredtao/TaoQuick.git synced 2025-01-31 21:22:58 +08:00
Code Issues Projects Releases Wiki Activity

update image size

Browse Source
This commit is contained in:
jared 2020-07-17 23:46:24 +08:00
parent 3484df8b11
commit 1470dc06a3
13 changed files with 123 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/TaoQuickShow/Contents/Animation/Circle.qml
View File

@ -15,15 +15,15 @@ Item {
spacing: 40 spacing: 40
ACircle { ACircle {
id: s1 id: s1
width: 460 width: 250
height: 280 height: 375
dir: ASquare.Direct.FromInner dir: ASquare.Direct.FromInner
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ACircle { ACircle {
id: s2 id: s2
width: 460 width: 250
height: 280 height: 375
dir: ASquare.Direct.FromOuter dir: ASquare.Direct.FromOuter
effectSource.sourceItem: src effectSource.sourceItem: src
} }

16
examples/TaoQuickShow/Contents/Animation/Cleavage.qml
View File

@ -17,29 +17,29 @@ Item {
spacing: 40 spacing: 40
ACleavage { ACleavage {
id: s1 id: s1
width: 460 width: 250
height: 280 height: 375
dir: ACleavage.Direct.HorizonToInner dir: ACleavage.Direct.HorizonToInner
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ACleavage { ACleavage {
id: s2 id: s2
width: 460 width: 250
height: 280 height: 375
dir: ACleavage.Direct.HorizonToOuter dir: ACleavage.Direct.HorizonToOuter
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ACleavage { ACleavage {
id: s3 id: s3
width: 460 width: 250
height: 280 height: 375
dir: ACleavage.Direct.VerticalToInner dir: ACleavage.Direct.VerticalToInner
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ACleavage { ACleavage {
id: s4 id: s4
width: 460 width: 250
height: 280 height: 375
dir: ACleavage.Direct.VerticalToOuter dir: ACleavage.Direct.VerticalToOuter
effectSource.sourceItem: src effectSource.sourceItem: src
} }

9
examples/TaoQuickShow/Contents/Animation/Cross.qml
View File

@ -13,17 +13,18 @@ Item {
anchors.centerIn: parent anchors.centerIn: parent
columns: 2 columns: 2
spacing: 40 spacing: 40
ACross { ACross {
id: s1 id: s1
width: 460 width: 250
height: 280 height: 375
dir: ASquare.Direct.FromInner dir: ASquare.Direct.FromInner
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ACross { ACross {
id: s2 id: s2
width: 460 width: 250
height: 280 height: 375
dir: ASquare.Direct.FromOuter dir: ASquare.Direct.FromOuter
effectSource.sourceItem: src effectSource.sourceItem: src
} }

16
examples/TaoQuickShow/Contents/Animation/Diagonal.qml
View File

@ -15,29 +15,29 @@ Item {
spacing: 40 spacing: 40
ADiagonal { ADiagonal {
id: d1 id: d1
width: 460 width: 250
height: 280 height: 375
dir: ADiagonal.Direct.FromLeftTop dir: ADiagonal.Direct.FromLeftTop
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ADiagonal { ADiagonal {
id: d2 id: d2
width: 460 width: 250
height: 280 height: 375
dir: ADiagonal.Direct.FromRightBottom dir: ADiagonal.Direct.FromRightBottom
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ADiagonal { ADiagonal {
id: d3 id: d3
width: 460 width: 250
height: 280 height: 375
dir: ADiagonal.Direct.FromRightTop dir: ADiagonal.Direct.FromRightTop
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ADiagonal { ADiagonal {
id: d4 id: d4
width: 460 width: 250
height: 280 height: 375
dir: ADiagonal.Direct.FromLeftBottom dir: ADiagonal.Direct.FromLeftBottom
effectSource.sourceItem: src effectSource.sourceItem: src
} }

8
examples/TaoQuickShow/Contents/Animation/Dissolve.qml
View File

@ -24,16 +24,16 @@ Item {
spacing: 40 spacing: 40
ADissolve { ADissolve {
id: a1 id: a1
width: 460 width: 250
height: 280 height: 375
duration: 1800 duration: 1800
effectSource.sourceItem: src effectSource.sourceItem: src
dissolveSource.sourceItem: dissolveSrc1 dissolveSource.sourceItem: dissolveSrc1
} }
ADissolve { ADissolve {
id: a2 id: a2
width: 460 width: 250
height: 280 height: 375
duration: 1800 duration: 1800
effectSource.sourceItem: src effectSource.sourceItem: src
dissolveSource.sourceItem: dissolveSrc2 dissolveSource.sourceItem: dissolveSrc2

45
examples/TaoQuickShow/Contents/Animation/Enter.qml
View File

@ -4,18 +4,6 @@ import TaoQuick 1.0
import "qrc:/TaoQuick" import "qrc:/TaoQuick"
Item { Item {
anchors.fill: parent anchors.fill: parent
ASlowEnter {
id: a1
width: 320
height: 216
x: (parent.width - width) / 2
targetY: parent.height / 2
dir: ASlowEnter.Direct.FromBottom
Image {
anchors.fill: parent
source: imgPath + "Effect/baby.jpg"
}
}
ASlowEnter { ASlowEnter {
id: a2 id: a2
width: 320 width: 320
@ -28,11 +16,32 @@ Item {
source: imgPath + "Effect/baby.jpg" source: imgPath + "Effect/baby.jpg"
} }
} }
Rectangle {
width: 320
height: 216
anchors.centerIn: parent
border.width: 1
border.color: "red"
color: "transparent"
}
ASlowEnter {
id: a1
width: 320
height: 216
x: (parent.width - width) / 2
targetY: parent.height / 2
dir: ASlowEnter.Direct.FromBottom
Image {
anchors.fill: parent
source: imgPath + "Effect/baby.jpg"
}
}
ASlowEnter { ASlowEnter {
id: a3 id: a3
width: 320 width: 320
height: 216 height: 216
targetX: parent.width / 2 - width * 1.5 targetX: (parent.width - width) / 2 - width
y: (parent.height - height) / 2 y: (parent.height - height) / 2
dir: ASlowEnter.Direct.FromLeft dir: ASlowEnter.Direct.FromLeft
Image { Image {
@ -44,7 +53,7 @@ Item {
id: a4 id: a4
width: 320 width: 320
height: 216 height: 216
targetX: parent.width / 2 + width / 2 targetX: parent.width - (parent.width - width)/2
y: (parent.height - height) / 2 y: (parent.height - height) / 2
dir: ASlowEnter.Direct.FromRight dir: ASlowEnter.Direct.FromRight
Image { Image {
@ -54,10 +63,10 @@ Item {
} }
ParallelAnimation { ParallelAnimation {
id: ani id: ani
ScriptAction{ script: {a1.animation.restart()} } ScriptAction{ script: {a1.animation.start()} }
ScriptAction{ script: {a2.animation.restart()} } ScriptAction{ script: {a2.animation.start()} }
ScriptAction{ script: {a3.animation.restart()} } ScriptAction{ script: {a3.animation.start()} }
ScriptAction{ script: {a4.animation.restart()} } ScriptAction{ script: {a4.animation.start()} }
} }
Component.onCompleted: { Component.onCompleted: {
ani.restart() ani.restart()

16
examples/TaoQuickShow/Contents/Animation/Grad.qml
View File

@ -16,31 +16,31 @@ Item {
spacing: 40 spacing: 40
AGrad { AGrad {
id: g1 id: g1
width: 460 width: 250
height: 280 height: 375
effectSource.sourceItem: src effectSource.sourceItem: src
} }
AGrad { AGrad {
id: g2 id: g2
width: 460 width: 250
height: 280 height: 375
dir: ASlowEnter.Direct.FromRight dir: ASlowEnter.Direct.FromRight
effectSource.sourceItem: src effectSource.sourceItem: src
} }
AGrad { AGrad {
id: g3 id: g3
width: 460 width: 250
height: 280 height: 375
dir: ASlowEnter.Direct.FromTop dir: ASlowEnter.Direct.FromTop
effectSource.sourceItem: src effectSource.sourceItem: src
} }
AGrad { AGrad {
id: g4 id: g4
dir: ASlowEnter.Direct.FromBottom dir: ASlowEnter.Direct.FromBottom
width: 460 width: 250
height: 280 height: 375
effectSource.sourceItem: src effectSource.sourceItem: src
} }

16
examples/TaoQuickShow/Contents/Animation/Louver.qml
View File

@ -16,28 +16,28 @@ Item {
ALouver { ALouver {
id: l1 id: l1
width: 460 width: 250
height: 280 height: 375
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ALouver { ALouver {
id: l2 id: l2
width: 460 width: 250
height: 280 height: 375
dir: ALouver.Direct.HorizonReverse dir: ALouver.Direct.HorizonReverse
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ALouver { ALouver {
id: l3 id: l3
width: 460 width: 250
height: 280 height: 375
dir: ALouver.Direct.Vertical dir: ALouver.Direct.Vertical
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ALouver { ALouver {
id: l4 id: l4
width: 460 width: 250
height: 280 height: 375
dir: ALouver.Direct.VerticalReverse dir: ALouver.Direct.VerticalReverse
effectSource.sourceItem: src effectSource.sourceItem: src
} }

8
examples/TaoQuickShow/Contents/Animation/Rhombus.qml
View File

@ -16,15 +16,15 @@ Item {
ARhombus { ARhombus {
id: l1 id: l1
width: 460 width: 250
height: 280 height: 375
dir: ARhombus.Direct.FromInner dir: ARhombus.Direct.FromInner
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ARhombus { ARhombus {
id: l2 id: l2
width: 460 width: 250
height: 280 height: 375
dir: ARhombus.Direct.FromOuter dir: ARhombus.Direct.FromOuter
effectSource.sourceItem: src effectSource.sourceItem: src
} }

8
examples/TaoQuickShow/Contents/Animation/Square.qml
View File

@ -15,15 +15,15 @@ Item {
spacing: 40 spacing: 40
ASquare { ASquare {
id: s1 id: s1
width: 460 width: 250
height: 280 height: 375
dir: ASquare.Direct.FromInner dir: ASquare.Direct.FromInner
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ASquare { ASquare {
id: s2 id: s2
width: 460 width: 250
height: 280 height: 375
dir: ASquare.Direct.FromOuter dir: ASquare.Direct.FromOuter
effectSource.sourceItem: src effectSource.sourceItem: src
} }

12
examples/TaoQuickShow/Contents/Animation/Wheel.qml
View File

@ -15,22 +15,22 @@ Item {
spacing: 40 spacing: 40
AWheel { AWheel {
id: s1 id: s1
width: 460 width: 250
height: 280 height: 375
dir: AWheel.Direct.Clockwise dir: AWheel.Direct.Clockwise
effectSource.sourceItem: src effectSource.sourceItem: src
} }
AWheel { AWheel {
id: s2 id: s2
width: 460 width: 250
height: 280 height: 375
dir: AWheel.Direct.CounterClockwise dir: AWheel.Direct.CounterClockwise
effectSource.sourceItem: src effectSource.sourceItem: src
} }
ASector { ASector {
id: s3 id: s3
width: 460 width: 250
height: 280 height: 375
effectSource.sourceItem: src effectSource.sourceItem: src
} }
} }

73
mkspecs/features/taoVersion.prf
View File

@ -1,42 +1,41 @@
build_pass { !exists(TaoVersionDefined) {
!exists(TaoVersionDefined) { TaoVersionDefined=1
TaoVersionDefined=1
TAO_VERSION_TAG = 1.0 TAO_VERSION_TAG = 1.0
# current commit hash # current commit hash
REVISION=$$system("git rev-parse HEAD") REVISION=$$system("git rev-parse HEAD")
REVISION=$$str_member($${REVISION}, 0, $$num_add(10, -1)) REVISION=$$str_member($${REVISION}, 0, $$num_add(10, -1))
isEmpty(REVISION) { isEmpty(REVISION) {
REVISION = 0000000000 REVISION = 0000000000
} }
# last tag # last tag
Ver=$$system("git describe --abbrev=0 --tags") Ver=$$system("git describe --abbrev=0 --tags")
isEmpty(Ver) { isEmpty(Ver) {
Ver=0.0.0 Ver=0.0.0
} }
VerList =$$split(Ver, .) VerList =$$split(Ver, .)
MAJ = $$take_first(VerList) MAJ = $$take_first(VerList)
MIN = $$take_first(VerList) MIN = $$take_first(VerList)
PAT = $$take_first(VerList) PAT = $$take_first(VerList)
equals(TEMPLATE, lib) { equals(TEMPLATE, lib) {
CONFIG += skip_target_version_ext CONFIG += skip_target_version_ext
VER_MAJ = $${MAJ} VER_MAJ = $${MAJ}
VER_MIN = $${MIN} VER_MIN = $${MIN}
VER_PAT = $${PAT} VER_PAT = $${PAT}
VERSION = $${Ver} VERSION = $${Ver}
} }
!exists(TaoDefined) { !exists(TaoDefined) {
TaoDefined=1 TaoDefined=1
DEFINES += TaoREVISION=$${REVISION} DEFINES += TaoREVISION=$${REVISION}
DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\" DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\"
DEFINES += TaoVer=\"\\\"$${Ver}\\\"\" DEFINES += TaoVer=\"\\\"$${Ver}\\\"\"
DEFINES += TaoMAJ=$${MAJ} DEFINES += TaoMAJ=$${MAJ}
DEFINES += TaoMIN=$${MIN} DEFINES += TaoMIN=$${MIN}
DEFINES += TaoPAT=$${PAT} DEFINES += TaoPAT=$${PAT}
DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\" DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\"
DEFINES += TaoCompilerVendor=\"\\\"$${QT_VERSION} $${QMAKE_PLATFORM} $${QMAKE_COMPILER} $${QMAKE_TARGET.arch}\\\"\" DEFINES += TaoCompilerVendor=\"\\\"$${QT_VERSION} $${QMAKE_PLATFORM} $${QMAKE_COMPILER} $${QMAKE_TARGET.arch}\\\"\"
}
} }
} }

2
src/TaoQuick/TaoQuick/EffectComponent/Animation/ASlowEnter.qml
View File

@ -30,6 +30,6 @@ Item {
to: __toList[dir] to: __toList[dir]
duration: r.duration duration: r.duration
loops: 1 loops: 1
alwaysRunToEnd: true // alwaysRunToEnd: true
} }
} }