diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Board.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Board.qml index 753b437..5a9916b 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Board.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Board.qml @@ -2,7 +2,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Circle.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Circle.qml index c570610..193db4c 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Circle.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Circle.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Image { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Cleavage.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Cleavage.qml index 2736919..0ac8bd0 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Cleavage.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Cleavage.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Image { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Cross.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Cross.qml index 5f96b35..54ff6d0 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Cross.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Cross.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Image { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Diagonal.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Diagonal.qml index cb4949b..459d3ad 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Diagonal.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Diagonal.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Image { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Dissolve.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Dissolve.qml index 4c17e64..94f7c8a 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Dissolve.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Dissolve.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Image { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Enter.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Enter.qml index 737e2e9..32f2c5f 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Enter.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Enter.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent ASlowEnter { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Grad.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Grad.qml index 783abbf..5ab7dc3 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Grad.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Grad.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Image { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Louver.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Louver.qml index cf965cf..b3b618e 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Louver.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Louver.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Image { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Rhombus.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Rhombus.qml index 0432eab..0cdbe55 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Rhombus.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Rhombus.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Image { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Square.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Square.qml index ed5ec29..d4fdf66 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Square.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Square.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Image { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Wheel.qml b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Wheel.qml index 418acd1..9254e32 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Animation/Wheel.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Animation/Wheel.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Image { diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TAround.qml b/src/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TAround.qml index c673ef8..4607df8 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TAround.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TAround.qml @@ -2,7 +2,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" TShaderToy { id: r diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Board.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Board.qml index 67b2c2c..4cff882 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Board.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Board.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Circle.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Circle.qml index 74f2640..9b3068f 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Circle.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Circle.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cleavage.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cleavage.qml index 32fb4d5..ca9fc2f 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cleavage.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cleavage.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cross.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cross.qml index b419dc4..899d4f9 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cross.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cross.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Diagonal.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Diagonal.qml index 046ec3c..71677a7 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Diagonal.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Diagonal.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Dissolve.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Dissolve.qml index 5d12cf1..113c5e5 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Dissolve.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Dissolve.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/FadeInOut.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/FadeInOut.qml index 0ecfa6c..1e9bd59 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/FadeInOut.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/FadeInOut.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { id: r diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Grad.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Grad.qml index 06c0d59..4056fb2 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Grad.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Grad.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Louver.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Louver.qml index 9763152..377ea65 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Louver.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Louver.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { id: r anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/PageSwitchBase.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/PageSwitchBase.qml index eebae5c..7ff3bf8 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/PageSwitchBase.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/PageSwitchBase.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { id: base diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Rhombus.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Rhombus.qml index 9eb743c..d67f890 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Rhombus.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Rhombus.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Sector.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Sector.qml index 35d8f87..b699cf8 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Sector.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Sector.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Square.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Square.qml index ce03675..49478bd 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Square.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Square.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Wheel.qml b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Wheel.qml index 0f46308..ef0e7f3 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Wheel.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Wheel.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Shape/KLine.qml b/src/TaoEffectPlugin/Qml/ContentPage/Shape/KLine.qml index 89cbf87..9e45d14 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Shape/KLine.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Shape/KLine.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Shape/RoundRect.qml b/src/TaoEffectPlugin/Qml/ContentPage/Shape/RoundRect.qml index 76c8094..087e254 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Shape/RoundRect.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Shape/RoundRect.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent Rectangle { diff --git a/src/TaoQuick/Image.qrc b/src/TaoQuick/Image.qrc deleted file mode 100644 index 2419fe7..0000000 --- a/src/TaoQuick/Image.qrc +++ /dev/null @@ -1,9 +0,0 @@ - - - Image/ProgressBar/fail.png - Image/ProgressBar/ok.png - Image/ProgressBar/ok_circle.png - Image/ProgressBar/fail_circle.png - Image/Others/spinner.png - - diff --git a/src/TaoQuick/Qml.qrc b/src/TaoQuick/Qml.qrc index 47dd90c..6aae5ef 100644 --- a/src/TaoQuick/Qml.qrc +++ b/src/TaoQuick/Qml.qrc @@ -1,52 +1,57 @@ - - - Qml/BasicComponent/Button/TGradientBtn.qml - Qml/BasicComponent/Button/TImageBtn.qml - Qml/BasicComponent/Button/TImgTextBtn.qml - Qml/BasicComponent/Button/TTextBtn.qml - Qml/BasicComponent/Mouse/TMoveArea.qml - Qml/BasicComponent/Mouse/TTransArea.qml - Qml/BasicComponent/Others/TBusyIndicator.qml - Qml/BasicComponent/Others/TDragItem.qml - Qml/BasicComponent/Others/TResizeBorder.qml - Qml/BasicComponent/Others/TToolTip.qml - Qml/BasicComponent/Others/TPopup.qml - Qml/BasicComponent/Progress/TNormalProgress.qml - Qml/BasicComponent/Progress/TCircleProgress.qml - Qml/BasicComponent/Others/TDialog.qml - Qml/BasicComponent/Progress/TInOut.qml - Qml/BasicComponent/Others/TFPS.qml - Qml/qmldir - Qml/EffectComponent/Animation/ABoard.qml - Qml/EffectComponent/Animation/ACircle.qml - Qml/EffectComponent/Animation/ACleavage.qml - Qml/EffectComponent/Animation/ACross.qml - Qml/EffectComponent/Animation/ADiagonal.qml - Qml/EffectComponent/Animation/ADissolve.qml - Qml/EffectComponent/Animation/AGrad.qml - Qml/EffectComponent/Animation/ALouver.qml - Qml/EffectComponent/Animation/ARhombus.qml - Qml/EffectComponent/Animation/ASector.qml - Qml/EffectComponent/Animation/ASlowEnter.qml - Qml/EffectComponent/Animation/ASquare.qml - Qml/EffectComponent/Animation/AWheel.qml - Qml/EffectComponent/PageSwitch/SBoard.qml - Qml/EffectComponent/PageSwitch/SCircle.qml - Qml/EffectComponent/PageSwitch/SCleavage.qml - Qml/EffectComponent/PageSwitch/SCross.qml - Qml/EffectComponent/PageSwitch/SDiagonal.qml - Qml/EffectComponent/PageSwitch/SDissolve.qml - Qml/EffectComponent/PageSwitch/SFadeInOut.qml - Qml/EffectComponent/PageSwitch/SGrad.qml - Qml/EffectComponent/PageSwitch/SLouver.qml - Qml/EffectComponent/PageSwitch/SRhombus.qml - Qml/EffectComponent/PageSwitch/SSector.qml - Qml/EffectComponent/PageSwitch/SSquare.qml - Qml/EffectComponent/PageSwitch/SWheel.qml - Qml/EffectComponent/Shapes/TKLine.qml - Qml/EffectComponent/Shapes/TRoundRect.qml - Qml/EffectComponent/TCommon.qml - Qml/EffectComponent/TShaderToy.qml - Qml/BasicComponent/Others/CallLatter.qml + + + TaoQuick/BasicComponent/Button/TGradientBtn.qml + TaoQuick/BasicComponent/Button/TImageBtn.qml + TaoQuick/BasicComponent/Button/TImgTextBtn.qml + TaoQuick/BasicComponent/Button/TTextBtn.qml + TaoQuick/BasicComponent/Mouse/TMoveArea.qml + TaoQuick/BasicComponent/Mouse/TTransArea.qml + TaoQuick/BasicComponent/Others/TBusyIndicator.qml + TaoQuick/BasicComponent/Others/TDragItem.qml + TaoQuick/BasicComponent/Others/TResizeBorder.qml + TaoQuick/BasicComponent/Others/TToolTip.qml + TaoQuick/BasicComponent/Others/TPopup.qml + TaoQuick/BasicComponent/Progress/TNormalProgress.qml + TaoQuick/BasicComponent/Progress/TCircleProgress.qml + TaoQuick/BasicComponent/Others/TDialog.qml + TaoQuick/BasicComponent/Progress/TInOut.qml + TaoQuick/BasicComponent/Others/TFPS.qml + TaoQuick/qmldir + TaoQuick/EffectComponent/Animation/ABoard.qml + TaoQuick/EffectComponent/Animation/ACircle.qml + TaoQuick/EffectComponent/Animation/ACleavage.qml + TaoQuick/EffectComponent/Animation/ACross.qml + TaoQuick/EffectComponent/Animation/ADiagonal.qml + TaoQuick/EffectComponent/Animation/ADissolve.qml + TaoQuick/EffectComponent/Animation/AGrad.qml + TaoQuick/EffectComponent/Animation/ALouver.qml + TaoQuick/EffectComponent/Animation/ARhombus.qml + TaoQuick/EffectComponent/Animation/ASector.qml + TaoQuick/EffectComponent/Animation/ASlowEnter.qml + TaoQuick/EffectComponent/Animation/ASquare.qml + TaoQuick/EffectComponent/Animation/AWheel.qml + TaoQuick/EffectComponent/PageSwitch/SBoard.qml + TaoQuick/EffectComponent/PageSwitch/SCircle.qml + TaoQuick/EffectComponent/PageSwitch/SCleavage.qml + TaoQuick/EffectComponent/PageSwitch/SCross.qml + TaoQuick/EffectComponent/PageSwitch/SDiagonal.qml + TaoQuick/EffectComponent/PageSwitch/SDissolve.qml + TaoQuick/EffectComponent/PageSwitch/SFadeInOut.qml + TaoQuick/EffectComponent/PageSwitch/SGrad.qml + TaoQuick/EffectComponent/PageSwitch/SLouver.qml + TaoQuick/EffectComponent/PageSwitch/SRhombus.qml + TaoQuick/EffectComponent/PageSwitch/SSector.qml + TaoQuick/EffectComponent/PageSwitch/SSquare.qml + TaoQuick/EffectComponent/PageSwitch/SWheel.qml + TaoQuick/EffectComponent/Shapes/TKLine.qml + TaoQuick/EffectComponent/Shapes/TRoundRect.qml + TaoQuick/EffectComponent/TCommon.qml + TaoQuick/EffectComponent/TShaderToy.qml + TaoQuick/BasicComponent/Others/CallLatter.qml + TaoQuick/BasicComponent/Others/spinner.png + TaoQuick/BasicComponent/Progress/fail.png + TaoQuick/BasicComponent/Progress/fail_circle.png + TaoQuick/BasicComponent/Progress/ok.png + TaoQuick/BasicComponent/Progress/ok_circle.png diff --git a/src/TaoQuick/Qml/BasicComponent/Others/CallLatter.qml b/src/TaoQuick/Qml/BasicComponent/Others/CallLatter.qml deleted file mode 100644 index c714669..0000000 --- a/src/TaoQuick/Qml/BasicComponent/Others/CallLatter.qml +++ /dev/null @@ -1,40 +0,0 @@ -import QtQuick 2.12 - -QtObject { - Component { - id: timerComp - Timer { - id: timer - repeat: false - property var _cb: function() {} - onTriggered: { - _cb() - destroy(parent) - } - function setTimeout(callback, delayTime) { - _cb = callback; - interval = delayTime; - start(); - } - } - } - function callLatter(callback, delayTime) { - // if (Qt.callLater) { - // Qt.callLater(callback) - // } else { - let timerObj = timerComp.createObject() - timerObj.setTimeout(callback, delayTime) - // } - } - Component.onCompleted: { - callLatter(function() { - console.log("0") - }, 0) - callLatter(function() { - console.log("100") - }, 100) - callLatter(function() { - console.log("50") - }, 50) - } -} diff --git a/src/TaoQuick/Qml/designer/images/TBusyIndicator.png b/src/TaoQuick/Qml/designer/images/TBusyIndicator.png deleted file mode 100644 index 9d55cb8..0000000 --- a/src/TaoQuick/Qml/designer/images/TBusyIndicator.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60cff8dcb4bfb1f74f4561c3ecbf53be0390256db08454388e0c0b698ca302dd -size 745 diff --git a/src/TaoQuick/Qml/designer/images/TCircleProgress.png b/src/TaoQuick/Qml/designer/images/TCircleProgress.png deleted file mode 100644 index fb4b5be..0000000 --- a/src/TaoQuick/Qml/designer/images/TCircleProgress.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2450111cf8fad6bcb0e25160096a5ce6a033b7e9b7138384451ce5a227d1175 -size 884 diff --git a/src/TaoQuick/Qml/designer/images/TDialog.png b/src/TaoQuick/Qml/designer/images/TDialog.png deleted file mode 100644 index 4a0bb68..0000000 --- a/src/TaoQuick/Qml/designer/images/TDialog.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2f0d35f9e58d1c030dbfdba2b38902296e179081a25f8e7dfd1a05ee861af33 -size 894 diff --git a/src/TaoQuick/Qml/designer/images/TDragItem.png b/src/TaoQuick/Qml/designer/images/TDragItem.png deleted file mode 100644 index 24c6448..0000000 --- a/src/TaoQuick/Qml/designer/images/TDragItem.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b5f57401cdf16b7735806d883d50a9d23bb5db8a1dcffbbb5115aaf58493316 -size 661 diff --git a/src/TaoQuick/Qml/designer/images/TFPS.png b/src/TaoQuick/Qml/designer/images/TFPS.png deleted file mode 100644 index fa12cd9..0000000 --- a/src/TaoQuick/Qml/designer/images/TFPS.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51d300447865d725a1f493a1f2e5234b418c53732dd09e08b96916c01bc7a845 -size 665 diff --git a/src/TaoQuick/Qml/designer/images/TGradientBtn.png b/src/TaoQuick/Qml/designer/images/TGradientBtn.png deleted file mode 100644 index bf3a426..0000000 --- a/src/TaoQuick/Qml/designer/images/TGradientBtn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07034444253ac59a8b9be3d4c0592a77b94fc2c812e00d449f5b1c239618652f -size 422 diff --git a/src/TaoQuick/Qml/designer/images/TImageBtn.png b/src/TaoQuick/Qml/designer/images/TImageBtn.png deleted file mode 100644 index 9c9a8c3..0000000 --- a/src/TaoQuick/Qml/designer/images/TImageBtn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02c1160ab882e3b399c81cc96e20d8d6b69366fbecf30b4a6819db9d23cb5ee6 -size 380 diff --git a/src/TaoQuick/Qml/designer/images/TImgTextBtn.png b/src/TaoQuick/Qml/designer/images/TImgTextBtn.png deleted file mode 100644 index f2477ba..0000000 --- a/src/TaoQuick/Qml/designer/images/TImgTextBtn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e79798fc51be0511406aa8b28fe80826471f187b9742c43e8ae6be15797dc66 -size 361 diff --git a/src/TaoQuick/Qml/designer/images/TMoveArea.png b/src/TaoQuick/Qml/designer/images/TMoveArea.png deleted file mode 100644 index 60bf121..0000000 --- a/src/TaoQuick/Qml/designer/images/TMoveArea.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d2474d19553a3020fa2d5eef16529018295d662f7c95ebfe1a09c964c6d7c7f -size 674 diff --git a/src/TaoQuick/Qml/designer/images/TNormalProgress.png b/src/TaoQuick/Qml/designer/images/TNormalProgress.png deleted file mode 100644 index a77ec1c..0000000 --- a/src/TaoQuick/Qml/designer/images/TNormalProgress.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d71ec4d684c25a422b98e617d587c9b4b965a3f042af1655abc433c37ed115e7 -size 276 diff --git a/src/TaoQuick/Qml/designer/images/TPopup.png b/src/TaoQuick/Qml/designer/images/TPopup.png deleted file mode 100644 index c903921..0000000 --- a/src/TaoQuick/Qml/designer/images/TPopup.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82a623ec15e53b405526835b2756ca15adf395f0da5d4eacf2f77d9609688b26 -size 405 diff --git a/src/TaoQuick/Qml/designer/images/TResizeBorder.png b/src/TaoQuick/Qml/designer/images/TResizeBorder.png deleted file mode 100644 index cf3bae1..0000000 --- a/src/TaoQuick/Qml/designer/images/TResizeBorder.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:516873931f13830ab1b40ffb92d99a49c32d8c6d0ac8923f5f8c327f72d2f181 -size 616 diff --git a/src/TaoQuick/Qml/designer/images/TTextBtn.png b/src/TaoQuick/Qml/designer/images/TTextBtn.png deleted file mode 100644 index b17114e..0000000 --- a/src/TaoQuick/Qml/designer/images/TTextBtn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edc2619659253a67e6bce4826db6a172f5c0aab1c96561c4614a5e4df741ae3a -size 599 diff --git a/src/TaoQuick/Qml/designer/images/TToolTip.png b/src/TaoQuick/Qml/designer/images/TToolTip.png deleted file mode 100644 index c6e3016..0000000 --- a/src/TaoQuick/Qml/designer/images/TToolTip.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dd26240813c1d82e9d166d55036af3365c653ee8231868d3cff4dbafd62d6ae -size 405 diff --git a/src/TaoQuick/Qml/designer/images/TTransArea.png b/src/TaoQuick/Qml/designer/images/TTransArea.png deleted file mode 100644 index abc8f23..0000000 --- a/src/TaoQuick/Qml/designer/images/TTransArea.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:181daffe92e7733e4fd320acc2690a379c5e5583313dd7d7362557073a367351 -size 261 diff --git a/src/TaoQuick/TaoQuick.pri b/src/TaoQuick/TaoQuick.pri index 3efc0e9..dcd0d91 100644 --- a/src/TaoQuick/TaoQuick.pri +++ b/src/TaoQuick/TaoQuick.pri @@ -4,7 +4,6 @@ HEADERS += \ SOURCES += RESOURCES += \ - $$PWD/Image.qrc \ $$PWD/Qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model diff --git a/src/TaoQuick/TaoQuick.pro b/src/TaoQuick/TaoQuick.pro index 822a458..25dc3a7 100644 --- a/src/TaoQuick/TaoQuick.pro +++ b/src/TaoQuick/TaoQuick.pro @@ -18,7 +18,7 @@ uri = $$TARGET include(../TaoVersion.pri) include(../TaoBundle.pri) include(TaoQuick.pri) -include(Qml/TaoQuickDesigner.pri) +include(TaoQuick/TaoQuickDesigner.pri) CONFIG(debug, debug|release){ DESTDIR = $${TaoQuick_RUN_TREE}/debug/$${BundlePath}$${uri} diff --git a/src/TaoQuick/Qml/BasicComponent/Button/TGradientBtn.qml b/src/TaoQuick/TaoQuick/BasicComponent/Button/TGradientBtn.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Button/TGradientBtn.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Button/TGradientBtn.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Button/TImageBtn.qml b/src/TaoQuick/TaoQuick/BasicComponent/Button/TImageBtn.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Button/TImageBtn.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Button/TImageBtn.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Button/TImgTextBtn.qml b/src/TaoQuick/TaoQuick/BasicComponent/Button/TImgTextBtn.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Button/TImgTextBtn.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Button/TImgTextBtn.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Button/TTextBtn.qml b/src/TaoQuick/TaoQuick/BasicComponent/Button/TTextBtn.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Button/TTextBtn.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Button/TTextBtn.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Mouse/TMoveArea.qml b/src/TaoQuick/TaoQuick/BasicComponent/Mouse/TMoveArea.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Mouse/TMoveArea.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Mouse/TMoveArea.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Mouse/TTransArea.qml b/src/TaoQuick/TaoQuick/BasicComponent/Mouse/TTransArea.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Mouse/TTransArea.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Mouse/TTransArea.qml diff --git a/src/TaoQuick/TaoQuick/BasicComponent/Others/CallLatter.qml b/src/TaoQuick/TaoQuick/BasicComponent/Others/CallLatter.qml new file mode 100644 index 0000000..8d4a3f8 --- /dev/null +++ b/src/TaoQuick/TaoQuick/BasicComponent/Others/CallLatter.qml @@ -0,0 +1,40 @@ +import QtQuick 2.12 + +QtObject { + Component { + id: timerComp + Timer { + id: timer + repeat: false + property var _cb: function() {} + onTriggered: { + _cb() + destroy(parent) + } + function setTimeout(callback, delayTime) { + _cb = callback; + interval = delayTime; + start(); + } + } + } + function callLatter(callback, delayTime) { + if (Qt.callLater) { + Qt.callLater(callback) + } else { + let timerObj = timerComp.createObject() + timerObj.setTimeout(callback, delayTime) + } + } + // Component.onCompleted: { + // callLatter(function() { + // console.log("0") + // }, 0) + // callLatter(function() { + // console.log("100") + // }, 100) + // callLatter(function() { + // console.log("50") + // }, 50) + // } +} diff --git a/src/TaoQuick/Qml/BasicComponent/Others/TBusyIndicator.qml b/src/TaoQuick/TaoQuick/BasicComponent/Others/TBusyIndicator.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Others/TBusyIndicator.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Others/TBusyIndicator.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Others/TDialog.qml b/src/TaoQuick/TaoQuick/BasicComponent/Others/TDialog.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Others/TDialog.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Others/TDialog.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Others/TDragItem.qml b/src/TaoQuick/TaoQuick/BasicComponent/Others/TDragItem.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Others/TDragItem.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Others/TDragItem.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Others/TFPS.qml b/src/TaoQuick/TaoQuick/BasicComponent/Others/TFPS.qml similarity index 92% rename from src/TaoQuick/Qml/BasicComponent/Others/TFPS.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Others/TFPS.qml index 89a42f1..675b45c 100644 --- a/src/TaoQuick/Qml/BasicComponent/Others/TFPS.qml +++ b/src/TaoQuick/TaoQuick/BasicComponent/Others/TFPS.qml @@ -1,5 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.12 import QtQuick.Controls 2.12 +import "../.." Item { property int fps: 60 @@ -7,7 +8,7 @@ Item { property color textColor: "#f7e08c" Image { id: spinner - source: "qrc:/Core/Image/Others/spinner.png" + source: "spinner.png" width: 32 height: 32 anchors.verticalCenter: parent.verticalCenter diff --git a/src/TaoQuick/Qml/BasicComponent/Others/TPopup.qml b/src/TaoQuick/TaoQuick/BasicComponent/Others/TPopup.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Others/TPopup.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Others/TPopup.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Others/TResizeBorder.qml b/src/TaoQuick/TaoQuick/BasicComponent/Others/TResizeBorder.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Others/TResizeBorder.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Others/TResizeBorder.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Others/TToolTip.qml b/src/TaoQuick/TaoQuick/BasicComponent/Others/TToolTip.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Others/TToolTip.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Others/TToolTip.qml diff --git a/src/TaoQuick/Image/Others/spinner.png b/src/TaoQuick/TaoQuick/BasicComponent/Others/spinner.png similarity index 100% rename from src/TaoQuick/Image/Others/spinner.png rename to src/TaoQuick/TaoQuick/BasicComponent/Others/spinner.png diff --git a/src/TaoQuick/Qml/BasicComponent/Progress/TCircleProgress.qml b/src/TaoQuick/TaoQuick/BasicComponent/Progress/TCircleProgress.qml similarity index 93% rename from src/TaoQuick/Qml/BasicComponent/Progress/TCircleProgress.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Progress/TCircleProgress.qml index 4540e65..1d531a0 100644 --- a/src/TaoQuick/Qml/BasicComponent/Progress/TCircleProgress.qml +++ b/src/TaoQuick/TaoQuick/BasicComponent/Progress/TCircleProgress.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtGraphicalEffects 1.12 -import TaoQuick 1.0 + import "../../" Item { id: r @@ -47,7 +47,7 @@ Item { } Image { id: image - source: percent === 100 ? "qrc:/Core/Image/ProgressBar/ok.png" : "qrc:/Core/Image/ProgressBar/fail.png" + source: percent === 100 ? "ok.png" : "fail.png" enabled: barType === TCircleProgress.BarType.SucceedOrFailed visible: enabled scale: 2 diff --git a/src/TaoQuick/Qml/BasicComponent/Progress/TInOut.qml b/src/TaoQuick/TaoQuick/BasicComponent/Progress/TInOut.qml similarity index 100% rename from src/TaoQuick/Qml/BasicComponent/Progress/TInOut.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Progress/TInOut.qml diff --git a/src/TaoQuick/Qml/BasicComponent/Progress/TNormalProgress.qml b/src/TaoQuick/TaoQuick/BasicComponent/Progress/TNormalProgress.qml similarity index 94% rename from src/TaoQuick/Qml/BasicComponent/Progress/TNormalProgress.qml rename to src/TaoQuick/TaoQuick/BasicComponent/Progress/TNormalProgress.qml index 4268f85..94d55e8 100644 --- a/src/TaoQuick/Qml/BasicComponent/Progress/TNormalProgress.qml +++ b/src/TaoQuick/TaoQuick/BasicComponent/Progress/TNormalProgress.qml @@ -1,6 +1,5 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 -import TaoQuick 1.0 import "../../" Item { id: r @@ -41,7 +40,7 @@ Item { } Image { id: image - source: percent === 100 ? "qrc:/Core/Image/ProgressBar/ok_circle.png" : "qrc:/Core/Image/ProgressBar/fail_circle.png" + source: percent === 100 ? "ok_circle.png" : "fail_circle.png" height: parent.height width: height enabled: barType === TNormalProgress.BarType.SucceedOrFailed diff --git a/src/TaoQuick/Image/ProgressBar/fail.png b/src/TaoQuick/TaoQuick/BasicComponent/Progress/fail.png similarity index 100% rename from src/TaoQuick/Image/ProgressBar/fail.png rename to src/TaoQuick/TaoQuick/BasicComponent/Progress/fail.png diff --git a/src/TaoQuick/Image/ProgressBar/fail_circle.png b/src/TaoQuick/TaoQuick/BasicComponent/Progress/fail_circle.png similarity index 100% rename from src/TaoQuick/Image/ProgressBar/fail_circle.png rename to src/TaoQuick/TaoQuick/BasicComponent/Progress/fail_circle.png diff --git a/src/TaoQuick/Image/ProgressBar/ok.png b/src/TaoQuick/TaoQuick/BasicComponent/Progress/ok.png similarity index 100% rename from src/TaoQuick/Image/ProgressBar/ok.png rename to src/TaoQuick/TaoQuick/BasicComponent/Progress/ok.png diff --git a/src/TaoQuick/Image/ProgressBar/ok_circle.png b/src/TaoQuick/TaoQuick/BasicComponent/Progress/ok_circle.png similarity index 100% rename from src/TaoQuick/Image/ProgressBar/ok_circle.png rename to src/TaoQuick/TaoQuick/BasicComponent/Progress/ok_circle.png diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ABoard.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ABoard.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ABoard.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ABoard.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ACircle.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ACircle.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ACircle.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ACircle.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ACleavage.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ACleavage.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ACleavage.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ACleavage.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ACross.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ACross.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ACross.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ACross.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ADiagonal.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ADiagonal.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ADiagonal.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ADiagonal.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ADissolve.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ADissolve.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ADissolve.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ADissolve.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/AGrad.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/AGrad.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/AGrad.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/AGrad.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ALouver.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ALouver.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ALouver.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ALouver.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ARhombus.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ARhombus.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ARhombus.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ARhombus.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ASector.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ASector.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ASector.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ASector.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ASlowEnter.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ASlowEnter.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ASlowEnter.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ASlowEnter.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/ASquare.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/ASquare.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/ASquare.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/ASquare.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Animation/AWheel.qml b/src/TaoQuick/TaoQuick/EffectComponent/Animation/AWheel.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Animation/AWheel.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Animation/AWheel.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SBoard.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SBoard.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SBoard.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SBoard.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SCircle.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SCircle.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SCircle.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SCircle.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SCleavage.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SCleavage.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SCleavage.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SCleavage.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SCross.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SCross.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SCross.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SCross.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SDiagonal.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SDiagonal.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SDiagonal.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SDiagonal.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SDissolve.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SDissolve.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SDissolve.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SDissolve.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SFadeInOut.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SFadeInOut.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SFadeInOut.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SFadeInOut.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SGrad.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SGrad.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SGrad.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SGrad.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SLouver.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SLouver.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SLouver.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SLouver.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SRhombus.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SRhombus.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SRhombus.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SRhombus.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SSector.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SSector.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SSector.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SSector.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SSquare.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SSquare.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SSquare.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SSquare.qml diff --git a/src/TaoQuick/Qml/EffectComponent/PageSwitch/SWheel.qml b/src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SWheel.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/PageSwitch/SWheel.qml rename to src/TaoQuick/TaoQuick/EffectComponent/PageSwitch/SWheel.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Shapes/TKLine.qml b/src/TaoQuick/TaoQuick/EffectComponent/Shapes/TKLine.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Shapes/TKLine.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Shapes/TKLine.qml diff --git a/src/TaoQuick/Qml/EffectComponent/Shapes/TRoundRect.qml b/src/TaoQuick/TaoQuick/EffectComponent/Shapes/TRoundRect.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/Shapes/TRoundRect.qml rename to src/TaoQuick/TaoQuick/EffectComponent/Shapes/TRoundRect.qml diff --git a/src/TaoQuick/Qml/EffectComponent/TCommon.qml b/src/TaoQuick/TaoQuick/EffectComponent/TCommon.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/TCommon.qml rename to src/TaoQuick/TaoQuick/EffectComponent/TCommon.qml diff --git a/src/TaoQuick/Qml/EffectComponent/TShaderToy.qml b/src/TaoQuick/TaoQuick/EffectComponent/TShaderToy.qml similarity index 100% rename from src/TaoQuick/Qml/EffectComponent/TShaderToy.qml rename to src/TaoQuick/TaoQuick/EffectComponent/TShaderToy.qml diff --git a/src/TaoQuick/Qml/TaoQuickDesigner.pri b/src/TaoQuick/TaoQuick/TaoQuickDesigner.pri similarity index 100% rename from src/TaoQuick/Qml/TaoQuickDesigner.pri rename to src/TaoQuick/TaoQuick/TaoQuickDesigner.pri diff --git a/src/TaoQuick/Qml/Updateqmldir.ps1 b/src/TaoQuick/TaoQuick/Updateqmldir.ps1 similarity index 100% rename from src/TaoQuick/Qml/Updateqmldir.ps1 rename to src/TaoQuick/TaoQuick/Updateqmldir.ps1 diff --git a/src/TaoQuick/Qml/designer/TaoQuick.metainfo b/src/TaoQuick/TaoQuick/designer/TaoQuick.metainfo similarity index 100% rename from src/TaoQuick/Qml/designer/TaoQuick.metainfo rename to src/TaoQuick/TaoQuick/designer/TaoQuick.metainfo diff --git a/src/TaoQuick/TaoQuick/designer/images/TBusyIndicator.png b/src/TaoQuick/TaoQuick/designer/images/TBusyIndicator.png new file mode 100644 index 0000000..0fae55f Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TBusyIndicator.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TCircleProgress.png b/src/TaoQuick/TaoQuick/designer/images/TCircleProgress.png new file mode 100644 index 0000000..b588ac7 Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TCircleProgress.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TDialog.png b/src/TaoQuick/TaoQuick/designer/images/TDialog.png new file mode 100644 index 0000000..cf4e13f Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TDialog.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TDragItem.png b/src/TaoQuick/TaoQuick/designer/images/TDragItem.png new file mode 100644 index 0000000..5bd808c Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TDragItem.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TFPS.png b/src/TaoQuick/TaoQuick/designer/images/TFPS.png new file mode 100644 index 0000000..f97a1d2 Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TFPS.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TGradientBtn.png b/src/TaoQuick/TaoQuick/designer/images/TGradientBtn.png new file mode 100644 index 0000000..d292f51 Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TGradientBtn.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TImageBtn.png b/src/TaoQuick/TaoQuick/designer/images/TImageBtn.png new file mode 100644 index 0000000..41cff33 Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TImageBtn.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TImgTextBtn.png b/src/TaoQuick/TaoQuick/designer/images/TImgTextBtn.png new file mode 100644 index 0000000..96ad03c Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TImgTextBtn.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TMoveArea.png b/src/TaoQuick/TaoQuick/designer/images/TMoveArea.png new file mode 100644 index 0000000..76609c8 Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TMoveArea.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TNormalProgress.png b/src/TaoQuick/TaoQuick/designer/images/TNormalProgress.png new file mode 100644 index 0000000..e04f507 Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TNormalProgress.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TPopup.png b/src/TaoQuick/TaoQuick/designer/images/TPopup.png new file mode 100644 index 0000000..e5b6e1e Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TPopup.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TResizeBorder.png b/src/TaoQuick/TaoQuick/designer/images/TResizeBorder.png new file mode 100644 index 0000000..77df41f Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TResizeBorder.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TTextBtn.png b/src/TaoQuick/TaoQuick/designer/images/TTextBtn.png new file mode 100644 index 0000000..251fb91 Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TTextBtn.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TToolTip.png b/src/TaoQuick/TaoQuick/designer/images/TToolTip.png new file mode 100644 index 0000000..a85a428 Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TToolTip.png differ diff --git a/src/TaoQuick/TaoQuick/designer/images/TTransArea.png b/src/TaoQuick/TaoQuick/designer/images/TTransArea.png new file mode 100644 index 0000000..7e5dc7c Binary files /dev/null and b/src/TaoQuick/TaoQuick/designer/images/TTransArea.png differ diff --git a/src/TaoQuick/Qml/qmldir b/src/TaoQuick/TaoQuick/qmldir similarity index 100% rename from src/TaoQuick/Qml/qmldir rename to src/TaoQuick/TaoQuick/qmldir diff --git a/src/TaoQuickApp/Qml/+QT6/MainPage.qml b/src/TaoQuickApp/Qml/+QT6/MainPage.qml index 5b7029a..60fcef5 100644 --- a/src/TaoQuickApp/Qml/+QT6/MainPage.qml +++ b/src/TaoQuickApp/Qml/+QT6/MainPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.12 import "../Page" import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { ContentData { diff --git a/src/TaoQuickApp/Qml/MainPage.qml b/src/TaoQuickApp/Qml/MainPage.qml index 5c00694..33ab129 100644 --- a/src/TaoQuickApp/Qml/MainPage.qml +++ b/src/TaoQuickApp/Qml/MainPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.12 import "./Page" import "./+QT6" import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Item { anchors.fill: parent diff --git a/src/TaoQuickApp/Qml/Page/+QT6/MenuPage.qml b/src/TaoQuickApp/Qml/Page/+QT6/MenuPage.qml index 24b4ab5..c2e29eb 100644 --- a/src/TaoQuickApp/Qml/Page/+QT6/MenuPage.qml +++ b/src/TaoQuickApp/Qml/Page/+QT6/MenuPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" ListView { id: root anchors.fill: parent diff --git a/src/TaoQuickApp/Qml/Page/AboutDialog.qml b/src/TaoQuickApp/Qml/Page/AboutDialog.qml index 3ba5004..100b5da 100644 --- a/src/TaoQuickApp/Qml/Page/AboutDialog.qml +++ b/src/TaoQuickApp/Qml/Page/AboutDialog.qml @@ -2,7 +2,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Popup { id: root diff --git a/src/TaoQuickApp/Qml/Page/ContentPage.qml b/src/TaoQuickApp/Qml/Page/ContentPage.qml index 80def06..7d76787 100644 --- a/src/TaoQuickApp/Qml/Page/ContentPage.qml +++ b/src/TaoQuickApp/Qml/Page/ContentPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Rectangle { id: root diff --git a/src/TaoQuickApp/Qml/Page/MenuPage.qml b/src/TaoQuickApp/Qml/Page/MenuPage.qml index 2aab5b2..afa8ddf 100644 --- a/src/TaoQuickApp/Qml/Page/MenuPage.qml +++ b/src/TaoQuickApp/Qml/Page/MenuPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" ListView { id: root anchors.fill: parent diff --git a/src/TaoQuickApp/Qml/Page/TitlePage.qml b/src/TaoQuickApp/Qml/Page/TitlePage.qml index 48947a0..65fa3bc 100644 --- a/src/TaoQuickApp/Qml/Page/TitlePage.qml +++ b/src/TaoQuickApp/Qml/Page/TitlePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import TaoQuick 1.0 -import "qrc:/Tao/Qml" +import "qrc:/TaoQuick" Rectangle { Row {