diff --git a/examples/TaoQuickShow/Contents.qrc b/examples/TaoQuickShow/Contents.qrc new file mode 100644 index 0000000..2e3a3c7 --- /dev/null +++ b/examples/TaoQuickShow/Contents.qrc @@ -0,0 +1,53 @@ + + + Contents/Animation/Board.qml + Contents/Animation/Circle.qml + Contents/Animation/Cleavage.qml + Contents/Animation/Cross.qml + Contents/Animation/Diagonal.qml + Contents/Animation/Dissolve.qml + Contents/Animation/Enter.qml + Contents/Animation/Grad.qml + Contents/Animation/Louver.qml + Contents/Animation/Rhombus.qml + Contents/Animation/Square.qml + Contents/Animation/Wheel.qml + Contents/BaseComponent/Buttons.qml + Contents/BaseComponent/Dialogs.qml + Contents/BaseComponent/Drags.qml + Contents/BaseComponent/Gradiants.qml + Contents/BaseComponent/Progresses.qml + Contents/Effect/Effects/TAround.qml + Contents/Effect/Effects/TArrow.qml + Contents/Effect/Effects/TRingPage.qml + Contents/Effect/Effects/TSoundByte.qml + Contents/Effect/Effects/TSwapper.qml + Contents/Effect/ARound.qml + Contents/Effect/Arrow.qml + Contents/Effect/RingPage.qml + Contents/Effect/SoundByte.qml + Contents/Effect/Swapper.qml + Contents/PageSwitch/Board.qml + Contents/PageSwitch/Circle.qml + Contents/PageSwitch/Cleavage.qml + Contents/PageSwitch/Cross.qml + Contents/PageSwitch/Diagonal.qml + Contents/PageSwitch/Dissolve.qml + Contents/PageSwitch/FadeInOut.qml + Contents/PageSwitch/Grad.qml + Contents/PageSwitch/Louver.qml + Contents/PageSwitch/PageSwitchBase.qml + Contents/PageSwitch/Rhombus.qml + Contents/PageSwitch/Sector.qml + Contents/PageSwitch/Square.qml + Contents/PageSwitch/Wheel.qml + Contents/ShaderEffect/CloudHole.qml + Contents/ShaderEffect/Planet.qml + Contents/ShaderEffect/Planet1.png + Contents/ShaderEffect/Snail.qml + Contents/ShaderEffect/SuperMario.qml + Contents/Shape/KLine.qml + Contents/Shape/RoundRect.qml + Contents/Welcome/Welcome.qml + + diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Board.qml b/examples/TaoQuickShow/Contents/Animation/Board.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Board.qml rename to examples/TaoQuickShow/Contents/Animation/Board.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Circle.qml b/examples/TaoQuickShow/Contents/Animation/Circle.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Circle.qml rename to examples/TaoQuickShow/Contents/Animation/Circle.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Cleavage.qml b/examples/TaoQuickShow/Contents/Animation/Cleavage.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Cleavage.qml rename to examples/TaoQuickShow/Contents/Animation/Cleavage.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Cross.qml b/examples/TaoQuickShow/Contents/Animation/Cross.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Cross.qml rename to examples/TaoQuickShow/Contents/Animation/Cross.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Diagonal.qml b/examples/TaoQuickShow/Contents/Animation/Diagonal.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Diagonal.qml rename to examples/TaoQuickShow/Contents/Animation/Diagonal.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Dissolve.qml b/examples/TaoQuickShow/Contents/Animation/Dissolve.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Dissolve.qml rename to examples/TaoQuickShow/Contents/Animation/Dissolve.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Enter.qml b/examples/TaoQuickShow/Contents/Animation/Enter.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Enter.qml rename to examples/TaoQuickShow/Contents/Animation/Enter.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Grad.qml b/examples/TaoQuickShow/Contents/Animation/Grad.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Grad.qml rename to examples/TaoQuickShow/Contents/Animation/Grad.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Louver.qml b/examples/TaoQuickShow/Contents/Animation/Louver.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Louver.qml rename to examples/TaoQuickShow/Contents/Animation/Louver.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Rhombus.qml b/examples/TaoQuickShow/Contents/Animation/Rhombus.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Rhombus.qml rename to examples/TaoQuickShow/Contents/Animation/Rhombus.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Square.qml b/examples/TaoQuickShow/Contents/Animation/Square.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Square.qml rename to examples/TaoQuickShow/Contents/Animation/Square.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Wheel.qml b/examples/TaoQuickShow/Contents/Animation/Wheel.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Animation/Wheel.qml rename to examples/TaoQuickShow/Contents/Animation/Wheel.qml diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/BaseComponent/Buttons.qml b/examples/TaoQuickShow/Contents/BaseComponent/Buttons.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/BaseComponent/Buttons.qml rename to examples/TaoQuickShow/Contents/BaseComponent/Buttons.qml diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/BaseComponent/Dialogs.qml b/examples/TaoQuickShow/Contents/BaseComponent/Dialogs.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/BaseComponent/Dialogs.qml rename to examples/TaoQuickShow/Contents/BaseComponent/Dialogs.qml diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/BaseComponent/Drags.qml b/examples/TaoQuickShow/Contents/BaseComponent/Drags.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/BaseComponent/Drags.qml rename to examples/TaoQuickShow/Contents/BaseComponent/Drags.qml diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/BaseComponent/Gradiants.qml b/examples/TaoQuickShow/Contents/BaseComponent/Gradiants.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/BaseComponent/Gradiants.qml rename to examples/TaoQuickShow/Contents/BaseComponent/Gradiants.qml diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/BaseComponent/Progresses.qml b/examples/TaoQuickShow/Contents/BaseComponent/Progresses.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/BaseComponent/Progresses.qml rename to examples/TaoQuickShow/Contents/BaseComponent/Progresses.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/ARound.qml b/examples/TaoQuickShow/Contents/Effect/ARound.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/ARound.qml rename to examples/TaoQuickShow/Contents/Effect/ARound.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Arrow.qml b/examples/TaoQuickShow/Contents/Effect/Arrow.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Arrow.qml rename to examples/TaoQuickShow/Contents/Effect/Arrow.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TAround.qml b/examples/TaoQuickShow/Contents/Effect/Effects/TAround.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TAround.qml rename to examples/TaoQuickShow/Contents/Effect/Effects/TAround.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TArrow.qml b/examples/TaoQuickShow/Contents/Effect/Effects/TArrow.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TArrow.qml rename to examples/TaoQuickShow/Contents/Effect/Effects/TArrow.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TRingPage.qml b/examples/TaoQuickShow/Contents/Effect/Effects/TRingPage.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TRingPage.qml rename to examples/TaoQuickShow/Contents/Effect/Effects/TRingPage.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TSoundByte.qml b/examples/TaoQuickShow/Contents/Effect/Effects/TSoundByte.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TSoundByte.qml rename to examples/TaoQuickShow/Contents/Effect/Effects/TSoundByte.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TSwapper.qml b/examples/TaoQuickShow/Contents/Effect/Effects/TSwapper.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Effects/TSwapper.qml rename to examples/TaoQuickShow/Contents/Effect/Effects/TSwapper.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/RingPage.qml b/examples/TaoQuickShow/Contents/Effect/RingPage.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/RingPage.qml rename to examples/TaoQuickShow/Contents/Effect/RingPage.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/SoundByte.qml b/examples/TaoQuickShow/Contents/Effect/SoundByte.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/SoundByte.qml rename to examples/TaoQuickShow/Contents/Effect/SoundByte.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Swapper.qml b/examples/TaoQuickShow/Contents/Effect/Swapper.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Effect/Swapper.qml rename to examples/TaoQuickShow/Contents/Effect/Swapper.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Board.qml b/examples/TaoQuickShow/Contents/PageSwitch/Board.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Board.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Board.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Circle.qml b/examples/TaoQuickShow/Contents/PageSwitch/Circle.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Circle.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Circle.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cleavage.qml b/examples/TaoQuickShow/Contents/PageSwitch/Cleavage.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cleavage.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Cleavage.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cross.qml b/examples/TaoQuickShow/Contents/PageSwitch/Cross.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Cross.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Cross.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Diagonal.qml b/examples/TaoQuickShow/Contents/PageSwitch/Diagonal.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Diagonal.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Diagonal.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Dissolve.qml b/examples/TaoQuickShow/Contents/PageSwitch/Dissolve.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Dissolve.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Dissolve.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/FadeInOut.qml b/examples/TaoQuickShow/Contents/PageSwitch/FadeInOut.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/FadeInOut.qml rename to examples/TaoQuickShow/Contents/PageSwitch/FadeInOut.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Grad.qml b/examples/TaoQuickShow/Contents/PageSwitch/Grad.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Grad.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Grad.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Louver.qml b/examples/TaoQuickShow/Contents/PageSwitch/Louver.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Louver.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Louver.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/PageSwitchBase.qml b/examples/TaoQuickShow/Contents/PageSwitch/PageSwitchBase.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/PageSwitchBase.qml rename to examples/TaoQuickShow/Contents/PageSwitch/PageSwitchBase.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Rhombus.qml b/examples/TaoQuickShow/Contents/PageSwitch/Rhombus.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Rhombus.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Rhombus.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Sector.qml b/examples/TaoQuickShow/Contents/PageSwitch/Sector.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Sector.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Sector.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Square.qml b/examples/TaoQuickShow/Contents/PageSwitch/Square.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Square.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Square.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Wheel.qml b/examples/TaoQuickShow/Contents/PageSwitch/Wheel.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/PageSwitch/Wheel.qml rename to examples/TaoQuickShow/Contents/PageSwitch/Wheel.qml diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/ShaderEffect/CloudHole.qml b/examples/TaoQuickShow/Contents/ShaderEffect/CloudHole.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/ShaderEffect/CloudHole.qml rename to examples/TaoQuickShow/Contents/ShaderEffect/CloudHole.qml diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/ShaderEffect/Planet.qml b/examples/TaoQuickShow/Contents/ShaderEffect/Planet.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/ShaderEffect/Planet.qml rename to examples/TaoQuickShow/Contents/ShaderEffect/Planet.qml diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/ShaderEffect/Planet1.png b/examples/TaoQuickShow/Contents/ShaderEffect/Planet1.png similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/ShaderEffect/Planet1.png rename to examples/TaoQuickShow/Contents/ShaderEffect/Planet1.png diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/ShaderEffect/Snail.qml b/examples/TaoQuickShow/Contents/ShaderEffect/Snail.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/ShaderEffect/Snail.qml rename to examples/TaoQuickShow/Contents/ShaderEffect/Snail.qml diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/ShaderEffect/SuperMario.qml b/examples/TaoQuickShow/Contents/ShaderEffect/SuperMario.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml/Contents/ShaderEffect/SuperMario.qml rename to examples/TaoQuickShow/Contents/ShaderEffect/SuperMario.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Shape/KLine.qml b/examples/TaoQuickShow/Contents/Shape/KLine.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Shape/KLine.qml rename to examples/TaoQuickShow/Contents/Shape/KLine.qml diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Shape/RoundRect.qml b/examples/TaoQuickShow/Contents/Shape/RoundRect.qml similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml/ContentPage/Shape/RoundRect.qml rename to examples/TaoQuickShow/Contents/Shape/RoundRect.qml diff --git a/examples/TaoQuickShow/Qml/Welcome/Welcome.qml b/examples/TaoQuickShow/Contents/Welcome/Welcome.qml similarity index 100% rename from examples/TaoQuickShow/Qml/Welcome/Welcome.qml rename to examples/TaoQuickShow/Contents/Welcome/Welcome.qml diff --git a/examples/TaoQuickShow/Image.qrc b/examples/TaoQuickShow/Image.qrc index 5787f32..77ad70b 100644 --- a/examples/TaoQuickShow/Image.qrc +++ b/examples/TaoQuickShow/Image.qrc @@ -18,5 +18,37 @@ Image/Window/about_gray.png Image/Window/about_white.png Image/Window/flower.jpg + Image/Button/cry-fill.png + Image/Button/smile-fill-hover.png + Image/Button/smile-fill.png + Image/Effect/Girls/girl1.jpeg + Image/Effect/Girls/girl10.jpeg + Image/Effect/Girls/girl11.jpeg + Image/Effect/Girls/girl12.jpeg + Image/Effect/Girls/girl14.jpeg + Image/Effect/Girls/girl15.jpeg + Image/Effect/Girls/girl2.jpeg + Image/Effect/Girls/girl3.jpeg + Image/Effect/Girls/girl4.jpeg + Image/Effect/Girls/girl5.jpeg + Image/Effect/Girls/girl6.jpeg + Image/Effect/Girls/girl7.jpeg + Image/Effect/Girls/girl8.jpeg + Image/Effect/Girls/girl9.jpeg + Image/Effect/arrow.png + Image/Effect/astronomy.jpg + Image/Effect/baby.jpg + Image/Effect/Dissolve_1.jpg + Image/Effect/Dissolve_2.png + Image/Effect/girl.jpg + Image/Effect/soundRect.png + Image/Tao/qq.jpg + Image/Tao/qq_connect.jpg + Image/Tao/qqgroup.jpg + Image/Tao/qqgroup2.jpg + Image/Tao/weixin.jpg + Image/Tao/weixin_connect.jpg + Image/Tao/weixingongzhonghao.jpg + Image/Tao/zhifubao.jpg diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Image/Button/cry-fill.png b/examples/TaoQuickShow/Image/Button/cry-fill.png similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Image/Button/cry-fill.png rename to examples/TaoQuickShow/Image/Button/cry-fill.png diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Image/Button/smile-fill-hover.png b/examples/TaoQuickShow/Image/Button/smile-fill-hover.png similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Image/Button/smile-fill-hover.png rename to examples/TaoQuickShow/Image/Button/smile-fill-hover.png diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Image/Button/smile-fill.png b/examples/TaoQuickShow/Image/Button/smile-fill.png similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoQuickPlugin/Image/Button/smile-fill.png rename to examples/TaoQuickShow/Image/Button/smile-fill.png diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Dissolve_1.jpg b/examples/TaoQuickShow/Image/Effect/Dissolve_1.jpg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Dissolve_1.jpg rename to examples/TaoQuickShow/Image/Effect/Dissolve_1.jpg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Dissolve_2.png b/examples/TaoQuickShow/Image/Effect/Dissolve_2.png similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Dissolve_2.png rename to examples/TaoQuickShow/Image/Effect/Dissolve_2.png diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl1.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl1.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl1.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl1.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl10.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl10.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl10.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl10.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl11.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl11.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl11.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl11.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl12.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl12.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl12.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl12.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl14.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl14.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl14.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl14.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl15.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl15.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl15.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl15.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl2.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl2.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl2.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl2.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl3.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl3.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl3.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl3.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl4.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl4.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl4.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl4.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl5.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl5.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl5.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl5.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl6.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl6.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl6.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl6.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl7.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl7.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl7.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl7.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl8.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl8.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl8.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl8.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl9.jpeg b/examples/TaoQuickShow/Image/Effect/Girls/girl9.jpeg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/Girls/girl9.jpeg rename to examples/TaoQuickShow/Image/Effect/Girls/girl9.jpeg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/arrow.png b/examples/TaoQuickShow/Image/Effect/arrow.png similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/arrow.png rename to examples/TaoQuickShow/Image/Effect/arrow.png diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/astronomy.jpg b/examples/TaoQuickShow/Image/Effect/astronomy.jpg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/astronomy.jpg rename to examples/TaoQuickShow/Image/Effect/astronomy.jpg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/baby.jpg b/examples/TaoQuickShow/Image/Effect/baby.jpg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/baby.jpg rename to examples/TaoQuickShow/Image/Effect/baby.jpg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/girl.jpg b/examples/TaoQuickShow/Image/Effect/girl.jpg similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/girl.jpg rename to examples/TaoQuickShow/Image/Effect/girl.jpg diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/soundRect.png b/examples/TaoQuickShow/Image/Effect/soundRect.png similarity index 100% rename from examples/TaoQuickShow/Plugins/TaoEffectPlugin/Img/soundRect.png rename to examples/TaoQuickShow/Image/Effect/soundRect.png diff --git a/examples/TaoQuickShow/Languages.qrc b/examples/TaoQuickShow/Languages.qrc deleted file mode 100644 index 58fe63a..0000000 --- a/examples/TaoQuickShow/Languages.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - Trans/language_zh.json - - diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml.qrc b/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml.qrc deleted file mode 100644 index f0a33b7..0000000 --- a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Qml.qrc +++ /dev/null @@ -1,65 +0,0 @@ - - - Img/astronomy.jpg - Img/soundRect.png - Img/girl.jpg - Img/baby.jpg - Img/Dissolve_1.jpg - Img/Dissolve_2.png - Img/arrow.png - Img/Girls/girl1.jpeg - Img/Girls/girl2.jpeg - Img/Girls/girl3.jpeg - Img/Girls/girl4.jpeg - Img/Girls/girl5.jpeg - Img/Girls/girl6.jpeg - Img/Girls/girl7.jpeg - Img/Girls/girl8.jpeg - Img/Girls/girl9.jpeg - Img/Girls/girl10.jpeg - Img/Girls/girl11.jpeg - Img/Girls/girl12.jpeg - Img/Girls/girl14.jpeg - Img/Girls/girl15.jpeg - - - Qml/ContentPage/Animation/Board.qml - Qml/ContentPage/Animation/Circle.qml - Qml/ContentPage/Animation/Cleavage.qml - Qml/ContentPage/Animation/Cross.qml - Qml/ContentPage/Animation/Diagonal.qml - Qml/ContentPage/Animation/Dissolve.qml - Qml/ContentPage/Animation/Enter.qml - Qml/ContentPage/Animation/Grad.qml - Qml/ContentPage/Animation/Louver.qml - Qml/ContentPage/Animation/Rhombus.qml - Qml/ContentPage/Animation/Square.qml - Qml/ContentPage/Animation/Wheel.qml - Qml/ContentPage/Effect/Arrow.qml - Qml/ContentPage/Effect/RingPage.qml - Qml/ContentPage/Effect/SoundByte.qml - Qml/ContentPage/Effect/Swapper.qml - Qml/ContentPage/Shape/KLine.qml - Qml/ContentPage/Shape/RoundRect.qml - Qml/ContentPage/PageSwitch/FadeInOut.qml - Qml/ContentPage/PageSwitch/Dissolve.qml - Qml/ContentPage/PageSwitch/Louver.qml - Qml/ContentPage/PageSwitch/PageSwitchBase.qml - Qml/ContentPage/PageSwitch/Board.qml - Qml/ContentPage/PageSwitch/Circle.qml - Qml/ContentPage/PageSwitch/Cleavage.qml - Qml/ContentPage/PageSwitch/Cross.qml - Qml/ContentPage/PageSwitch/Grad.qml - Qml/ContentPage/PageSwitch/Rhombus.qml - Qml/ContentPage/PageSwitch/Sector.qml - Qml/ContentPage/PageSwitch/Square.qml - Qml/ContentPage/PageSwitch/Wheel.qml - Qml/ContentPage/PageSwitch/Diagonal.qml - Qml/ContentPage/Effect/ARound.qml - Qml/ContentPage/Effect/Effects/TAround.qml - Qml/ContentPage/Effect/Effects/TArrow.qml - Qml/ContentPage/Effect/Effects/TRingPage.qml - Qml/ContentPage/Effect/Effects/TSoundByte.qml - Qml/ContentPage/Effect/Effects/TSwapper.qml - - diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Src/EffectsPlugin.cpp b/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Src/EffectsPlugin.cpp deleted file mode 100644 index 9cd8741..0000000 --- a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Src/EffectsPlugin.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "EffectsPlugin.h" -#include -EffectsPlugin::EffectsPlugin(QObject* parent) - : QObject(parent) -{ -} - -void EffectsPlugin::init() -{ - Q_INIT_RESOURCE(Qml); -} - -QJsonArray EffectsPlugin::infos() const -{ - static QJsonArray arr { - QJsonObject { - { "name", u8"Effect" }, - { "children", - QJsonArray { QJsonObject { { "name", u8"Ring" }, { "url", "qrc:/Effect/Qml/ContentPage/Effect/RingPage.qml" } }, - QJsonObject { { "name", u8"Brilliant Starry Sky" }, { "url", "qrc:/Effect/Qml/ContentPage/Effect/Swapper.qml" } }, - QJsonObject { { "name", u8"Keep up with the pace" },{ "url", "qrc:/Effect/Qml/ContentPage/Effect/SoundByte.qml" } }, - QJsonObject { { "name", u8"Undercurrent surge" },{ "url", "qrc:/Effect/Qml/ContentPage/Effect/Arrow.qml" } }, - QJsonObject { { "name", u8"Magic Circle" }, { "url", "qrc:/Effect/Qml/ContentPage/Effect/ARound.qml" } } } }, - }, - - QJsonObject { - { "name", u8"Painter" }, - { "children", - QJsonArray { QJsonObject { { "name", u8"RoundRect" }, { "url", "qrc:/Effect/Qml/ContentPage/Shape/RoundRect.qml" } }, - QJsonObject { { "name", u8"KLine" }, { "url", "qrc:/Effect/Qml/ContentPage/Shape/KLine.qml" } } } } }, - QJsonObject { - { "name", u8"Animation" }, - { "children", - QJsonArray { QJsonObject { { "name", u8"Enter" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Enter.qml" } }, - QJsonObject { { "name", u8"Grad" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Grad.qml" } }, - QJsonObject { { "name", u8"Cleavage" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Cleavage.qml" } }, - QJsonObject { { "name", u8"Diagonal" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Diagonal.qml" } }, - QJsonObject { { "name", u8"Louver" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Louver.qml" } }, - QJsonObject { { "name", u8"Square" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Square.qml" } }, - QJsonObject { { "name", u8"Circle" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Circle.qml" } }, - QJsonObject { { "name", u8"Cross" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Cross.qml" } }, - QJsonObject { { "name", u8"Rhombus" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Rhombus.qml" } }, - QJsonObject { { "name", u8"Wheel" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Wheel.qml" } }, - QJsonObject { { "name", u8"Board" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Board.qml" } }, - QJsonObject { { "name", u8"Dissolve" }, { "url", "qrc:/Effect/Qml/ContentPage/Animation/Dissolve.qml" } } } } }, - QJsonObject { - { "name", u8"PageSwitch" }, - { "children", - QJsonArray { QJsonObject { { "name", u8"FadeInOut" },{ "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/FadeInOut.qml" } }, - QJsonObject { { "name", u8"Grad" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Grad.qml" } }, - QJsonObject { { "name", u8"Cleavage" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Cleavage.qml" } }, - QJsonObject { { "name", u8"Diagonal" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Diagonal.qml" } }, - QJsonObject { { "name", u8"Louver" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Louver.qml" } }, - QJsonObject { { "name", u8"Square" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Square.qml" } }, - QJsonObject { { "name", u8"Circle" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Circle.qml" } }, - QJsonObject { { "name", u8"Cross" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Cross.qml" } }, - QJsonObject { { "name", u8"Rhombus" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Rhombus.qml" } }, - QJsonObject { { "name", u8"Wheel" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Wheel.qml" } }, - QJsonObject { { "name", u8"Sector" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Sector.qml" } }, - QJsonObject { { "name", u8"Board" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Board.qml" } }, - QJsonObject { { "name", u8"Dissolve" }, { "url", "qrc:/Effect/Qml/ContentPage/PageSwitch/Dissolve.qml" } } } } } - }; - return arr; -} diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Src/EffectsPlugin.h b/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Src/EffectsPlugin.h deleted file mode 100644 index a6eb9ef..0000000 --- a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/Src/EffectsPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "ITaoQuickPlugin.h" -class EffectsPlugin - : public QObject - , public ITaoQuickPlugin -{ - - Q_OBJECT - Q_PLUGIN_METADATA(IID TaoQuickInterface_iid) - Q_INTERFACES(ITaoQuickPlugin) -public: - explicit EffectsPlugin(QObject *parent = nullptr); - - void init() override; - QJsonArray infos() const override; -}; diff --git a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/TaoEffectPlugin.pro b/examples/TaoQuickShow/Plugins/TaoEffectPlugin/TaoEffectPlugin.pro deleted file mode 100644 index c3a2b3c..0000000 --- a/examples/TaoQuickShow/Plugins/TaoEffectPlugin/TaoEffectPlugin.pro +++ /dev/null @@ -1,36 +0,0 @@ -QT += core gui qml - -#TARGET = $$qtLibraryTarget(TaoEffect) -TARGET = TaoEffect -TEMPLATE = lib -CONFIG += plugin -msvc { - QMAKE_CFLAGS += -source-charset:utf-8 - QMAKE_CXXFLAGS += -source-charset:utf-8 -} -load(taoVersion) -include(../TaoPlugin.pri) - - -load(taoBundle) -BundlePath = $$getBundlePath("TaoQuickApp") - -load(taoBuildPath) -setBuildPath($${TaoQuick_BUILD_TREE}/$${TARGET}) - -CONFIG(debug, debug|release){ - DESTDIR=$${TaoQuick_RUN_TREE}/debug/$${BundlePath}TaoPlugin -} else { - DESTDIR=$${TaoQuick_RUN_TREE}/release/$${BundlePath}TaoPlugin -} - - -SOURCES += \ - Src/EffectsPlugin.cpp - -HEADERS += \ - Src/EffectsPlugin.h - -RESOURCES += \ - Qml.qrc - diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml.qrc b/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml.qrc deleted file mode 100644 index 14e0bd2..0000000 --- a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Qml.qrc +++ /dev/null @@ -1,17 +0,0 @@ - - - Qml/Contents/BaseComponent/Buttons.qml - Qml/Contents/BaseComponent/Dialogs.qml - Qml/Contents/BaseComponent/Drags.qml - Qml/Contents/BaseComponent/Gradiants.qml - Qml/Contents/BaseComponent/Progresses.qml - Qml/Contents/ShaderEffect/CloudHole.qml - Qml/Contents/ShaderEffect/Planet.qml - Qml/Contents/ShaderEffect/Planet1.png - Qml/Contents/ShaderEffect/Snail.qml - Qml/Contents/ShaderEffect/SuperMario.qml - Image/Button/cry-fill.png - Image/Button/smile-fill-hover.png - Image/Button/smile-fill.png - - diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Src/TaoQuickPlugin.cpp b/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Src/TaoQuickPlugin.cpp deleted file mode 100644 index d9c3793..0000000 --- a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Src/TaoQuickPlugin.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "TaoQuickPlugin.h" -#include -TaoQuickPlugin::TaoQuickPlugin(QObject *parent) : QObject (parent) -{ -} - -void TaoQuickPlugin::init() -{ - Q_INIT_RESOURCE(Qml); -} - -QJsonArray TaoQuickPlugin::infos() const -{ - static QJsonArray arr { - QJsonObject { - {"name", u8"Basic"}, - { "children", QJsonArray{ - QJsonObject { - {"name", u8"Button"}, - {"url", "qrc:/Qml/Contents/BaseComponent/Buttons.qml"} - }, - QJsonObject { - {"name", u8"Drag"}, - {"url", "qrc:/Qml/Contents/BaseComponent/Drags.qml"}, - }, - QJsonObject { - {"name", u8"Gradient"}, - {"url", "qrc:/Qml/Contents/BaseComponent/Gradiants.qml"}, - }, - QJsonObject { - {"name", u8"ProgressBar"}, - {"url", "qrc:/Qml/Contents/BaseComponent/Progresses.qml"}, - }, - QJsonObject { - {"name", u8"Dialog"}, - {"url", "qrc:/Qml/Contents/BaseComponent/Dialogs.qml"} - }, - } - } - }, - QJsonObject { - {"name", u8"ShaderEffect"}, - { "children", QJsonArray{ - QJsonObject { - {"name", u8"Cloud Hole"}, - {"url", "qrc:/Qml/Contents/ShaderEffect/CloudHole.qml"} - }, - QJsonObject { - {"name", u8"Star Light"}, - {"url", "qrc:/Qml/Contents/ShaderEffect/Planet.qml"} - }, - QJsonObject { - {"name", u8"Snail"}, - {"url", "qrc:/Qml/Contents/ShaderEffect/Snail.qml"} - }, - QJsonObject { - {"name", u8"Super Mario"}, - {"url", "qrc:/Qml/Contents/ShaderEffect/SuperMario.qml"} - } - } - } - } - }; - return arr; -} diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Src/TaoQuickPlugin.h b/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Src/TaoQuickPlugin.h deleted file mode 100644 index edcb73b..0000000 --- a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/Src/TaoQuickPlugin.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ITaoQuickPlugin.h" -class TaoQuickPlugin : public QObject, public ITaoQuickPlugin { - - Q_OBJECT - Q_PLUGIN_METADATA(IID TaoQuickInterface_iid) - Q_INTERFACES(ITaoQuickPlugin) -public: - explicit TaoQuickPlugin(QObject *parent = nullptr); - - void init() override; - QJsonArray infos() const override; -}; diff --git a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/TaoQuickPlugin.pro b/examples/TaoQuickShow/Plugins/TaoQuickPlugin/TaoQuickPlugin.pro deleted file mode 100644 index fdd44ef..0000000 --- a/examples/TaoQuickShow/Plugins/TaoQuickPlugin/TaoQuickPlugin.pro +++ /dev/null @@ -1,34 +0,0 @@ -QT += core gui qml - -#TARGET = $$qtLibraryTarget(TaoQuickPlugin) -TARGET = TaoQuickPlugin -TEMPLATE = lib -CONFIG += plugin -msvc { - QMAKE_CFLAGS += -source-charset:utf-8 - QMAKE_CXXFLAGS += -source-charset:utf-8 -} -load(taoVersion) - -include(../TaoPlugin.pri) - -load(taoBundle) -BundlePath = $$getBundlePath("TaoQuickApp") - -load(taoBuildPath) -setBuildPath($${TaoQuick_BUILD_TREE}/$${TARGET}) - -CONFIG(debug, debug|release){ - DESTDIR=$${TaoQuick_RUN_TREE}/debug/$${BundlePath}TaoPlugin -} else { - DESTDIR=$${TaoQuick_RUN_TREE}/release/$${BundlePath}TaoPlugin -} - -SOURCES += \ - Src/TaoQuickPlugin.cpp - -HEADERS += \ - Src/TaoQuickPlugin.h - -RESOURCES += \ - Qml.qrc diff --git a/examples/TaoQuickShow/Qml.qrc b/examples/TaoQuickShow/Qml.qrc index 31f3530..99b3dc3 100644 --- a/examples/TaoQuickShow/Qml.qrc +++ b/examples/TaoQuickShow/Qml.qrc @@ -9,7 +9,6 @@ Qml/MainPage.qml Qml/Page/ContentData.qml Qml/Page/AboutDialog.qml - Qml/Welcome/Welcome.qml Qml/Page/Biz/Background.qml Qml/Page/Biz/LangBtn.qml Qml/Page/Biz/SkinBtn.qml diff --git a/examples/TaoQuickShow/Qml/MainPage.qml b/examples/TaoQuickShow/Qml/MainPage.qml index 3f9c5a1..fac420f 100644 --- a/examples/TaoQuickShow/Qml/MainPage.qml +++ b/examples/TaoQuickShow/Qml/MainPage.qml @@ -26,11 +26,7 @@ Item { id: aboutDialog } - Component.onCompleted: { - view.initAppInfo() - pluginLoader.pluginReady.connect(onPluginReady); - pluginLoader.loadPlugin("TaoPlugin") - } + function onPluginReady(pluginInfo) { console.log("onPluginReady") var arr = null diff --git a/examples/TaoQuickShow/Qml/Page/AboutDialog.qml b/examples/TaoQuickShow/Qml/Page/AboutDialog.qml index 4b22d8a..20062fa 100644 --- a/examples/TaoQuickShow/Qml/Page/AboutDialog.qml +++ b/examples/TaoQuickShow/Qml/Page/AboutDialog.qml @@ -26,7 +26,7 @@ Popup { anchors.left: parent.left anchors.leftMargin: 2 anchors.verticalCenter: parent.verticalCenter - source: "qrc:/Image/logo/milk.png" + source: imgPath + "logo/milk.png" } TTextBtn { id: closeBtn diff --git a/examples/TaoQuickShow/Qml/Page/Biz/Background.qml b/examples/TaoQuickShow/Qml/Page/Biz/Background.qml index e639481..3e44ea2 100644 --- a/examples/TaoQuickShow/Qml/Page/Biz/Background.qml +++ b/examples/TaoQuickShow/Qml/Page/Biz/Background.qml @@ -37,7 +37,7 @@ Rectangle { opacity: 0.2 width: parent.width height: parent.height - source: "qrc:/Image/Window/flower.jpg" + source: imgPath + "Window/flower.jpg" } Image { id: img2 @@ -46,6 +46,6 @@ Rectangle { opacity: 0.2 width: parent.width height: parent.height - source: "qrc:/Image/Window/flower.jpg" + source: imgPath + "Window/flower.jpg" } } diff --git a/examples/TaoQuickShow/Qml/Page/Biz/LangBtn.qml b/examples/TaoQuickShow/Qml/Page/Biz/LangBtn.qml index 6cde6c6..39e88be 100644 --- a/examples/TaoQuickShow/Qml/Page/Biz/LangBtn.qml +++ b/examples/TaoQuickShow/Qml/Page/Biz/LangBtn.qml @@ -4,7 +4,7 @@ import TaoQuick 1.0 import "qrc:/TaoQuick" TImageBtn { - imageUrl: containsMouse ? "qrc:/Image/Window/lang_white.png" : "qrc:/Image/Window/lang_gray.png" + imageUrl: imgPath + (containsMouse ? "Window/lang_white.png" : "Window/lang_gray.png") onClicked: { // notifyBox.notify("change language") pop.show() diff --git a/examples/TaoQuickShow/Qml/Page/Biz/SkinBtn.qml b/examples/TaoQuickShow/Qml/Page/Biz/SkinBtn.qml index c731fe9..a24709f 100644 --- a/examples/TaoQuickShow/Qml/Page/Biz/SkinBtn.qml +++ b/examples/TaoQuickShow/Qml/Page/Biz/SkinBtn.qml @@ -4,7 +4,7 @@ import TaoQuick 1.0 import "qrc:/TaoQuick" TImageBtn { - imageUrl: containsMouse ? "qrc:/Image/Window/skin_white.png" : "qrc:/Image/Window/skin_gray.png" + imageUrl: imgPath + (containsMouse ? "Window/skin_white.png" : "Window/skin_gray.png") onClicked: { skinBox.show() } diff --git a/examples/TaoQuickShow/Qml/Page/ContentData.qml b/examples/TaoQuickShow/Qml/Page/ContentData.qml index 55f660a..e57f9da 100644 --- a/examples/TaoQuickShow/Qml/Page/ContentData.qml +++ b/examples/TaoQuickShow/Qml/Page/ContentData.qml @@ -60,6 +60,6 @@ QtObject { } property ListModel contentData: ListModel { - ListElement { name: "Home"; url: "qrc:/Qml/Welcome/Welcome.qml"; children: []} + ListElement { name: "Home"; url: ""; children: []} } } diff --git a/examples/TaoQuickShow/Qml/Page/TitlePage.qml b/examples/TaoQuickShow/Qml/Page/TitlePage.qml index 658458e..18aabc2 100644 --- a/examples/TaoQuickShow/Qml/Page/TitlePage.qml +++ b/examples/TaoQuickShow/Qml/Page/TitlePage.qml @@ -9,7 +9,7 @@ Rectangle { height: parent.height spacing: 4 Image { - source: "qrc:/Image/logo/milk.png" + source: imgPath + "logo/milk.png" } Text { id: t @@ -31,7 +31,7 @@ Rectangle { TImageBtn { width: 20 height: 20 - imageUrl: containsMouse ? "qrc:/Image/Window/minimal_white.png" : "qrc:/Image/Window/minimal_gray.png" + imageUrl: imgPath + (containsMouse ? "Window/minimal_white.png" : "Window/minimal_gray.png") onClicked: { view.showMinimized() } @@ -40,7 +40,7 @@ Rectangle { width: 20 height: 20 visible: !isMaxed - imageUrl: containsMouse ? "qrc:/Image/Window/max_white.png" : "qrc:/Image/Window/max_gray.png" + imageUrl: imgPath + (containsMouse ? "Window/max_white.png" : "Window/max_gray.png") onClicked: { view.showMaximized() isMaxed = true @@ -50,7 +50,7 @@ Rectangle { width: 20 height: 20 visible: isMaxed - imageUrl: containsMouse ? "qrc:/Image/Window/normal_white.png" : "qrc:/Image/Window/normal_gray.png" + imageUrl: imgPath + (containsMouse ? "Window/normal_white.png" : "Window/normal_gray.png") onClicked: { view.showNormal() isMaxed = false @@ -59,7 +59,7 @@ Rectangle { TImageBtn { width: 20 height: 20 - imageUrl: containsMouse ? "qrc:/Image/Window/close_white.png" : "qrc:/Image/Window/close_gray.png" + imageUrl: imgPath + (containsMouse ? "Window/close_white.png" : "Window/close_gray.png") onClicked: { view.close() } @@ -94,7 +94,7 @@ Rectangle { height: 20 anchors.verticalCenter: parent.verticalCenter - imageUrl: containsMouse ? "qrc:/Image/Window/about_white.png" : "qrc:/Image/Window/about_gray.png" + imageUrl: imgPath + (containsMouse ? "Window/about_white.png" : "Window/about_gray.png") onClicked: { aboutDialog.show() } diff --git a/examples/TaoQuickShow/Qml/Splash.qml b/examples/TaoQuickShow/Qml/Splash.qml index d778b12..8da772c 100644 --- a/examples/TaoQuickShow/Qml/Splash.qml +++ b/examples/TaoQuickShow/Qml/Splash.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 +import QtQuick 2.12 import QtQuick.Controls 2.12 Item { width: 1024 @@ -10,6 +10,6 @@ Item { AnimatedImage { anchors.fill: parent - source: "qrc:/Image/logo/splash.gif" + source: imgPath + "logo/splash.gif" } } diff --git a/examples/TaoQuickShow/Qml/main.qml b/examples/TaoQuickShow/Qml/main.qml index 44da477..8efe41e 100644 --- a/examples/TaoQuickShow/Qml/main.qml +++ b/examples/TaoQuickShow/Qml/main.qml @@ -6,6 +6,10 @@ Item { id: rootView width: 1440 height: 960 + Component.onCompleted: { + view.initAppInfo() + trans.loadFolder(appPath + "/Trans") + } RectangularGlow { id: glow anchors.fill: parent diff --git a/examples/TaoQuickShow/Src/ITaoQuickPlugin.h b/examples/TaoQuickShow/Src/ITaoQuickPlugin.h deleted file mode 100644 index d05b684..0000000 --- a/examples/TaoQuickShow/Src/ITaoQuickPlugin.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once -#include -#include -//ITaoQuickPlugin 插件接口 -class ITaoQuickPlugin -{ -public: - virtual ~ITaoQuickPlugin() {} - //插件初始化 - virtual void init() = 0; - //获取插件内容,Json格式为 - // [name: "首页", title: "欢迎", url: "qrc:/Qml/Contents/Welcome/Welcome.qml", children: []] - //或者 - // [ - // name: "基础组件"; title: "基础组件"; children: [ - // { name: "按钮组件"; title: "按钮组件"; url: "qrc:/Qml/Contents/BaseComponent/Buttons.qml"} - // ] - // ] - virtual QJsonArray infos() const = 0; - - virtual void uninit() {} -}; -#define TaoQuickInterface_iid "jaredtao.github.io/TaoQuick" -Q_DECLARE_INTERFACE(ITaoQuickPlugin, TaoQuickInterface_iid) diff --git a/examples/TaoQuickShow/Src/PluginLoader.cpp b/examples/TaoQuickShow/Src/PluginLoader.cpp deleted file mode 100644 index ae72d97..0000000 --- a/examples/TaoQuickShow/Src/PluginLoader.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "PluginLoader.h" -#include "logger.h" -#include -#include -#include -PluginLoader::PluginLoader(QObject *parent) : QObject(parent) -{ - -} - -PluginLoader::~PluginLoader() -{ - qDeleteAll(m_pluginList); - m_pluginList.clear(); -} - -void PluginLoader::loadPlugin(const QString &pluginPath) -{ - QDir dir(qApp->applicationDirPath() + "/" + pluginPath); - - auto list = dir.entryInfoList(QDir::Files); - - for (auto info : list) { - if (QLibrary::isLibrary(info.absoluteFilePath())) - { - m_loader = std::make_unique(); - m_loader->setFileName(info.absoluteFilePath()); - if (!m_loader->load()) - { - LOG_WARN << m_loader->fileName() << m_loader->errorString(); - continue; - } - QObject *pObj = m_loader->instance(); - auto pPlugin = qobject_cast(pObj); - if (!pPlugin) - { - continue; - } - pPlugin->init(); - emit pluginReady(QString(QJsonDocument(pPlugin->infos()).toJson())); - m_pluginList.append(pPlugin); - LOG_INFO << "loaded plugin " << info.absoluteFilePath(); - } - } -} diff --git a/examples/TaoQuickShow/Src/PluginLoader.h b/examples/TaoQuickShow/Src/PluginLoader.h deleted file mode 100644 index 4a38877..0000000 --- a/examples/TaoQuickShow/Src/PluginLoader.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once -#include "ITaoQuickPlugin.h" -#include -#include -#include - -class PluginLoader : public QObject{ - Q_OBJECT -public: - PluginLoader(QObject *parent = nullptr); - ~PluginLoader() override; - - Q_INVOKABLE void loadPlugin(const QString &pluginPath = u8"plugin/"); - -signals: - void pluginReady(QString pluginInfo); -private: - QList m_pluginList; - std::unique_ptr m_loader = nullptr; -}; diff --git a/examples/TaoQuickShow/Src/TaoView.cpp b/examples/TaoQuickShow/Src/TaoView.cpp index e8ee870..3b0195c 100644 --- a/examples/TaoQuickShow/Src/TaoView.cpp +++ b/examples/TaoQuickShow/Src/TaoView.cpp @@ -2,7 +2,6 @@ #include "Ver-u8.h" - #include #include #include diff --git a/examples/TaoQuickShow/Src/Trans.cpp b/examples/TaoQuickShow/Src/Trans.cpp index 37638e2..45e6238 100644 --- a/examples/TaoQuickShow/Src/Trans.cpp +++ b/examples/TaoQuickShow/Src/Trans.cpp @@ -1,4 +1,4 @@ -#include "Trans.h" +#include "Trans.h" #include "filereadwrite.h" #include const static auto cEnglisthStr = QStringLiteral("English"); @@ -93,7 +93,6 @@ void Trans::setCurrentLang(const QString& currentLang) return; m_currentLang = currentLang; -// qWarning() << "m_currentLang" << m_currentLang; emit currentLangChanged(m_currentLang); emit transStringChanged(); } diff --git a/examples/TaoQuickShow/Src/Trans.h b/examples/TaoQuickShow/Src/Trans.h index 5e939e9..4afe50c 100644 --- a/examples/TaoQuickShow/Src/Trans.h +++ b/examples/TaoQuickShow/Src/Trans.h @@ -12,8 +12,8 @@ class Trans : public QObject Q_PROPERTY(QString transString READ transString NOTIFY transStringChanged) public: explicit Trans(QObject *parent = nullptr); - void loadFolder(const QString &folder); - bool load(QString &lang, const QString &filePath); + Q_INVOKABLE void loadFolder(const QString &folder); + Q_INVOKABLE bool load(QString &lang, const QString &filePath); public: const QString ¤tLang() const; diff --git a/examples/TaoQuickShow/Src/main.cpp b/examples/TaoQuickShow/Src/main.cpp index de23b9c..068e19e 100644 --- a/examples/TaoQuickShow/Src/main.cpp +++ b/examples/TaoQuickShow/Src/main.cpp @@ -1,29 +1,51 @@ #include "TaoView.h" +#include "Trans.h" #include "logger.h" #include #include #include -#include "Trans.h" -#include "PluginLoader.h" - -int main(int argc, char **argv) +#include +#include +static void prepareApp() { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QCoreApplication::setOrganizationName("JaredTao"); + QCoreApplication::setOrganizationDomain("https://JaredTao.gitee.io"); + QCoreApplication::setApplicationName("TaoQuickApp"); +} +static void beforeUiReady(QQmlContext *ctx) +{ + Q_UNUSED(ctx) +} +static void afterUiReady() +{ +} +int main(int argc, char** argv) +{ + prepareApp(); QGuiApplication app(argc, argv); - app.setOrganizationName("JaredTao"); - app.setOrganizationDomain("https://jaredtao.github.io"); + Logger::initLog(); Trans trans; - trans.loadFolder(app.applicationDirPath() + "/Trans"); - PluginLoader loader; + TaoView view; + beforeUiReady(view.rootContext()); + view.engine()->addImportPath(qmlPath); + view.rootContext()->setContextProperty("qmlPath", qmlPath); + view.rootContext()->setContextProperty("imgPath", imgPath); + view.rootContext()->setContextProperty("appPath", app.applicationDirPath()); view.rootContext()->setContextProperty("view", &view); view.rootContext()->setContextProperty("trans", &trans); - view.rootContext()->setContextProperty("pluginLoader", &loader); - view.setSource(QUrl(QStringLiteral("qrc:/Qml/main.qml"))); + const QUrl url(qmlPath + QStringLiteral("main.qml")); + QObject::connect(&view, &QQuickView::statusChanged, [=](QQuickView::Status status){ + if (status == QQuickView::Status::Ready) { + afterUiReady(); + } + }); + view.setSource(url); view.moveToScreenCenter(); view.show(); diff --git a/examples/TaoQuickShow/TaoPlugin.pri b/examples/TaoQuickShow/TaoPlugin.pri deleted file mode 100644 index 8d46ba1..0000000 --- a/examples/TaoQuickShow/TaoPlugin.pri +++ /dev/null @@ -1,2 +0,0 @@ -HEADERS += $$PWD/TaoQuickApp/Src/ITaoQuickPlugin.h -INCLUDEPATH +=$$PWD/TaoQuickApp/Src diff --git a/examples/TaoQuickShow/TaoQuickShow.pri b/examples/TaoQuickShow/TaoQuickShow.pri index ce1418f..83a003c 100644 --- a/examples/TaoQuickShow/TaoQuickShow.pri +++ b/examples/TaoQuickShow/TaoQuickShow.pri @@ -24,21 +24,30 @@ msvc | gcc | xcode { include($${TaoQuick_3RDPARTY_TREE}/TaoCommon/TaoCommon.pri) HEADERS += \ - $$PWD/Src/ITaoQuickPlugin.h \ $$PWD/Src/TaoView.h \ $$PWD/Src/Trans.h \ - $$PWD/Src/PluginLoader.h - SOURCES += \ $$PWD/Src/TaoView.cpp \ $$PWD/Src/Trans.cpp \ - $$PWD/Src/PluginLoader.cpp \ $$PWD/Src/main.cpp -RESOURCES += \ - $$PWD/Qml.qrc \ - $$PWD/Image.qrc +CONFIG(debug, debug|release) { + #debug模式直接用本地qml文件,不要qrc资源文件。这样调试快一些。 + DEFINES += qmlPath=\\\"file:///$$PWD/Qml/\\\" + DEFINES += contentsPath=\\\"file:///$$PWD/Contents/\\\" + DEFINES += imgPath=\\\"file:///$$PWD/Image/\\\" +} else { + #release模式用qrc、走资源文件。这样发布不会携带源码。 + RESOURCES += \ + $$PWD/Qml.qrc \ + $$PWD/Image.qrc \ + $$PWD/Contents.qrc + + DEFINES += qmlPath=\\\"qrc:/Qml/\\\" + DEFINES += contentsPath=\\\"qrc:/Contents/\\\" + DEFINES += imgPath=\\\"qrc:/Image/\\\" +} !android { trans.files = $$files($$_PRO_FILE_PWD_/Trans/language_*.json) diff --git a/mkspecs/features/taoVersion.prf b/mkspecs/features/taoVersion.prf index ee6cc40..988c979 100644 --- a/mkspecs/features/taoVersion.prf +++ b/mkspecs/features/taoVersion.prf @@ -1,41 +1,40 @@ build_pass { -!exists(TaoVersionDefined) { - TaoVersionDefined=1 + !exists(TaoVersionDefined) { + TaoVersionDefined=1 - TAO_VERSION_TAG = 1.0 + TAO_VERSION_TAG = 1.0 - # current commit hash - REVISION=$$system("git rev-parse HEAD") - REVISION=$$str_member($${REVISION}, 0, $$num_add(10, -1)) - isEmpty(REVISION) { - REVISION = 0000000000 + # current commit hash + REVISION=$$system("git rev-parse HEAD") + REVISION=$$str_member($${REVISION}, 0, $$num_add(10, -1)) + isEmpty(REVISION) { + REVISION = 0000000000 + } + + # last tag + Ver=$$system("git describe --abbrev=0 --tags") + isEmpty(Ver) { + Ver=0.0.0 + } + VerList =$$split(Ver, .) + MAJ = $$take_first(VerList) + MIN = $$take_first(VerList) + PAT = $$take_first(VerList) + equals(TEMPLATE, lib) { + CONFIG += skip_target_version_ext + VER_MAJ = $${MAJ} + VER_MIN = $${MIN} + VER_PAT = $${PAT} + VERSION = $${Ver} + } + + DEFINES += TaoREVISION=$${REVISION} + DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\" + DEFINES += TaoVer=\"\\\"$${Ver}\\\"\" + DEFINES += TaoMAJ=$${MAJ} + DEFINES += TaoMIN=$${MIN} + DEFINES += TaoPAT=$${PAT} + DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\" + DEFINES += TaoCompilerVendor=\"\\\"$${QT_VERSION} $${QMAKE_PLATFORM} $${QMAKE_COMPILER} $${QMAKE_TARGET.arch}\\\"\" } - - # last tag - Ver=$$system("git describe --abbrev=0 --tags") - isEmpty(Ver) { - Ver=0.0.0 - } - VerList =$$split(Ver, .) - MAJ = $$take_first(VerList) - MIN = $$take_first(VerList) - PAT = $$take_first(VerList) - equals(TEMPLATE, lib) { - CONFIG += skip_target_version_ext - VER_MAJ = $${MAJ} - VER_MIN = $${MIN} - VER_PAT = $${PAT} - VERSION = $${Ver} - } - - DEFINES += TaoREVISION=$${REVISION} - DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\" - DEFINES += TaoVer=\"\\\"$${Ver}\\\"\" - DEFINES += TaoMAJ=$${MAJ} - DEFINES += TaoMIN=$${MIN} - DEFINES += TaoPAT=$${PAT} - DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\" - DEFINES += TaoCompilerVendor=\"\\\"$${QT_VERSION} $${QMAKE_PLATFORM} $${QMAKE_COMPILER} $${QMAKE_TARGET.arch}\\\"\" - message(DEFINES $${TARGET} $${DEFINES}) -} }