update path

examples/TaoQuickShow/Contents/General/Shapes.qml

@@ -1,3 +1,4 @@
+import QtQml 2.0
 import QtQuick 2.9
 import QtQuick.Shapes 1.0
 
@@ -47,6 +48,22 @@ Rectangle {
 
     property int gridSpacing: 10
 
+    Rectangle {
+        anchors.fill: parent
+        anchors.margins: 10
+        color: "transparent"
+        clip: true
+
+        GridView {
+            id: grid
+            anchors.fill: parent
+            anchors.margins: root.gridSpacing
+            cellWidth: 300
+            cellHeight: 300
+            delegate: pathGalleryDelegate
+            model: pathGalleryModel
+        }
+    }
     Component {
         id: pathGalleryDelegate
         Rectangle {
@@ -73,21 +90,4 @@ Rectangle {
             }
         }
     }
-
-    Rectangle {
-        anchors.fill: parent
-        anchors.margins: 10
-        color: "transparent"
-        clip: true
-
-        GridView {
-            id: grid
-            anchors.fill: parent
-            anchors.margins: root.gridSpacing
-            cellWidth: 300
-            cellHeight: 300
-            delegate: pathGalleryDelegate
-            model: pathGalleryModel
-        }
-    }
 }

examples/TaoQuickShow/Contents/ShapeGallery/ShapeCapStyles.qml

@@ -1,4 +1,6 @@
+import QtQml 2.0
 import QtQuick 2.12
+import QtQuick.Controls 2.12
 import QtQuick.Shapes 1.12
 
 Rectangle {

examples/TaoQuickShow/Contents/ShapeGallery/ShapeCircle.qml

@@ -1,4 +1,6 @@
+import QtQml 2.0
 import QtQuick 2.12
+import QtQuick.Controls 2.12
 import QtQuick.Shapes 1.12
 
 
@@ -6,7 +8,6 @@ Rectangle {
     width: 120
     height: 120
     color: th.pressed ? "steelBlue" : "lightGray"
-    containmentMask: ctr
 
     TapHandler { id: th }
 

examples/TaoQuickShow/Contents/ShapeGallery/ShapeCubicBezier.qml

@@ -1,4 +1,6 @@
+import QtQml 2.12
 import QtQuick 2.12
+import QtQuick.Controls 2.12
 import QtQuick.Shapes 1.12
 
 

examples/TaoQuickShow/Contents/ShapeGallery/ShapeEllipse.qml

@@ -1,4 +1,6 @@
+import QtQml 2.12
 import QtQuick 2.12
+import QtQuick.Controls 2.12
 import QtQuick.Shapes 1.12
 
 
@@ -6,7 +8,6 @@ Rectangle {
     width: 120
     height: 120
     color: th.pressed ? "steelBlue" : "lightGray"
-    containmentMask: ctr
 
     TapHandler { id: th }
 

examples/TaoQuickShow/Contents/ShapeGallery/ShapeJoinStyles.qml

@@ -1,4 +1,6 @@
+import QtQml 2.12
 import QtQuick 2.12
+import QtQuick.Controls 2.12
 import QtQuick.Shapes 1.12
 
 

examples/TaoQuickShow/Contents/ShapeGallery/ShapeQuadraticBezier.qml

@@ -1,4 +1,6 @@
+import QtQml 2.12
 import QtQuick 2.12
+import QtQuick.Controls 2.12
 import QtQuick.Shapes 1.12
 
 

examples/TaoQuickShow/Contents/ShapeGallery/ShapeRectrangle.qml

@@ -1,4 +1,6 @@
+import QtQml 2.12
 import QtQuick 2.12
+import QtQuick.Controls 2.12
 import QtQuick.Shapes 1.12
 
 

examples/TaoQuickShow/Contents/ShapeGallery/ShapeTriangle.qml

@@ -1,4 +1,6 @@
+import QtQml 2.12
 import QtQuick 2.12
+import QtQuick.Controls 2.12
 import QtQuick.Shapes 1.12
 
 

examples/TaoQuickShow/Qml/Pane/LeftPane.qml

@@ -1,3 +1,4 @@
+import QtQml 2.0
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import TaoQuick 1.0

examples/TaoQuickShow/Qml/Pane/RightPane.qml

@@ -1,3 +1,4 @@
+import QtQml 2.0
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import TaoQuick 1.0
@@ -35,6 +36,7 @@ Loader {
             btnImgNormal: imgPath + "Common/view.png"
             tipText: qsTr("View Source Code") + trans.transString
             onClicked: {
+                console.log("source", source)
                 Qt.openUrlExternally(source)
             }
         }

examples/TaoQuickShow/Qml/main.qml

@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import QtQml 2.0
 import QtQuick.Controls 2.2
 import TaoQuick 1.0
 import "./Page"

examples/TaoQuickShow/Src/main.cpp

@@ -68,6 +68,13 @@ int main(int argc, char **argv)
     view.rootContext()->setContextProperty("isDebug", QVariant(false));
 #endif
 
+
+#if QT_VERSION > QT_VERSION_CHECK(5, 10, 0)
+    view.rootContext()->setContextProperty("hasShape", true);
+#else
+    view.rootContext()->setContextProperty("hasShape", false);
+#endif
+
     view.rootContext()->setContextProperty("qmlPath", qmlPath);
     view.rootContext()->setContextProperty("imgPath", imgPath);
     view.rootContext()->setContextProperty("contentsPath", contentsPath);

examples/TaoQuickShow/taoMacro.h

@@ -1,7 +1,7 @@
 #pragma once
-#define TaoQuickImport "file:///E:/00github/TaoQuick/src"
+#define TaoQuickImport "file:///E:/Dev/Tao/TaoQuick/src"
-#define TaoQuickImage "file:///E:/00github/TaoQuick/src/TaoQuick/Images/"
+#define TaoQuickImage "file:///E:/Dev/Tao/TaoQuick/src/TaoQuick/Images/"
-#define qmlPath "file:///E:/00github/TaoQuick/examples/TaoQuickShow/Qml/"
+#define qmlPath "file:///E:/Dev/Tao/TaoQuick/examples/TaoQuickShow/Qml/"
-#define contentsPath "file:///E:/00github/TaoQuick/examples/TaoQuickShow/Contents/"
+#define contentsPath "file:///E:/Dev/Tao/TaoQuick/examples/TaoQuickShow/Contents/"
-#define imgPath "file:///E:/00github/TaoQuick/examples/TaoQuickShow/Image/"
+#define imgPath "file:///E:/Dev/Tao/TaoQuick/examples/TaoQuickShow/Image/"
-#define transDir "E:/00github/TaoQuick/examples/TaoQuickShow/Trans/"
+#define transDir "E:/Dev/Tao/TaoQuick/examples/TaoQuickShow/Trans/"

src/TaoQuick/TaoQuick.qrc

@@ -1,4 +1,4 @@
-<RCC>
+<RCC>
     <qresource prefix="/TaoQuick">
         <file>qmldir</file>
         <file>Qml/CusConfig.qml</file>
@@ -10,6 +10,7 @@
         <file>Qml/Basic/RoundRectangleShape.qml</file>
         <file>Qml/Basic/TransArea.qml</file>
         <file>Qml/CusBackground/CusBackground.qml</file>
+        <file>Qml/CusButton/CusButton.qml</file>
         <file>Qml/CusButton/CusButton_Blue.qml</file>
         <file>Qml/CusButton/CusButton_Gradient.qml</file>
         <file>Qml/CusButton/CusButton_Image.qml</file>
@@ -17,33 +18,32 @@
         <file>Qml/CusButton/CusButton_ImageColorOverlay.qml</file>
         <file>Qml/CusButton/CusButton_Red.qml</file>
         <file>Qml/CusButton/CusButton_White.qml</file>
-        <file>Qml/CusButton/CusButton.qml</file>
         <file>Qml/CusButton/CusRadioButton.qml</file>
         <file>Qml/CusButton/CusTextButton.qml</file>
         <file>Qml/CusCheckBox/CusCheckBox.qml</file>
         <file>Qml/CusCheckBox/CusSwitch.qml</file>
         <file>Qml/CusComboBox/CusComboBox.qml</file>
-        <file>Qml/CusImage/CusImage_Tip.qml</file>
         <file>Qml/CusImage/CusImage.qml</file>
         <file>Qml/CusImage/CusImageOverlay.qml</file>
+        <file>Qml/CusImage/CusImage_Tip.qml</file>
         <file>Qml/CusInput/CusIPAddress.qml</file>
+        <file>Qml/CusInput/CusTextField.qml</file>
         <file>Qml/CusInput/CusTextField_Btn.qml</file>
         <file>Qml/CusInput/CusTextField_Search.qml</file>
         <file>Qml/CusInput/CusTextField_Valid.qml</file>
-        <file>Qml/CusInput/CusTextField.qml</file>
         <file>Qml/CusInput/CusTextInput.qml</file>
+        <file>Qml/CusLabel/CusLabel.qml</file>
         <file>Qml/CusLabel/CusLabel_Center.qml</file>
         <file>Qml/CusLabel/CusLabel_Left.qml</file>
-        <file>Qml/CusLabel/CusLabel.qml</file>
         <file>Qml/CusListView/CusListView.qml</file>
         <file>Qml/CusPopup/CusPopup.qml</file>
         <file>Qml/CusPopup/CusToolTip_Triangle.qml</file>
         <file>Qml/CusPopup/CusTriangleTipBorder.qml</file>
         <file>Qml/CusScroll/CusScrollBar.qml</file>
-        <file>Qml/CusSlider/CusSlider_Spin.qml</file>
         <file>Qml/CusSlider/CusSlider.qml</file>
-        <file>Qml/CusSpinBox/CusSpinBox_HourMinute.qml</file>
+        <file>Qml/CusSlider/CusSlider_Spin.qml</file>
         <file>Qml/CusSpinBox/CusSpinBox.qml</file>
+        <file>Qml/CusSpinBox/CusSpinBox_HourMinute.qml</file>
         <file>Qml/CusTable/CusTableConstant.qml</file>
         <file>Qml/CusTable/CusTableHeader.qml</file>
         <file>Qml/CusTable/CusTableRow.qml</file>
@@ -106,12 +106,12 @@
         <file>Images/particle.png</file>
         <file>Images/right.png</file>
         <file>Images/rotate.png</file>
-        <file>Images/Search_Clear.png</file>
         <file>Images/Search.png</file>
+        <file>Images/Search_Clear.png</file>
         <file>Images/spinner.png</file>
-        <file>Images/Table_Asc_Hovered.png</file>
         <file>Images/Table_Asc.png</file>
-        <file>Images/Table_Desc_Hovered.png</file>
+        <file>Images/Table_Asc_Hovered.png</file>
         <file>Images/Table_Desc.png</file>
+        <file>Images/Table_Desc_Hovered.png</file>
     </qresource>
 </RCC>

src/TaoQuick/qmldir

@@ -1,4 +1,4 @@
-module TaoQuick
+module TaoQuick
 BasicText 1.0 Qml/Basic/BasicText.qml
 BasicTooltip 1.0 Qml/Basic/BasicTooltip.qml
 CusCallLater 1.0 Qml/Basic/CusCallLater.qml
@@ -7,6 +7,7 @@ RoundRectangle 1.0 Qml/Basic/RoundRectangle.qml
 RoundRectangleShape 1.0 Qml/Basic/RoundRectangleShape.qml
 TransArea 1.0 Qml/Basic/TransArea.qml
 CusBackground 1.0 Qml/CusBackground/CusBackground.qml
+CusButton 1.0 Qml/CusButton/CusButton.qml
 CusButton_Blue 1.0 Qml/CusButton/CusButton_Blue.qml
 CusButton_Gradient 1.0 Qml/CusButton/CusButton_Gradient.qml
 CusButton_Image 1.0 Qml/CusButton/CusButton_Image.qml
@@ -14,33 +15,32 @@ CusButton_ImageBackground 1.0 Qml/CusButton/CusButton_ImageBackground.qml
 CusButton_ImageColorOverlay 1.0 Qml/CusButton/CusButton_ImageColorOverlay.qml
 CusButton_Red 1.0 Qml/CusButton/CusButton_Red.qml
 CusButton_White 1.0 Qml/CusButton/CusButton_White.qml
-CusButton 1.0 Qml/CusButton/CusButton.qml
 CusRadioButton 1.0 Qml/CusButton/CusRadioButton.qml
 CusTextButton 1.0 Qml/CusButton/CusTextButton.qml
 CusCheckBox 1.0 Qml/CusCheckBox/CusCheckBox.qml
 CusSwitch 1.0 Qml/CusCheckBox/CusSwitch.qml
 CusComboBox 1.0 Qml/CusComboBox/CusComboBox.qml
-CusImage_Tip 1.0 Qml/CusImage/CusImage_Tip.qml
 CusImage 1.0 Qml/CusImage/CusImage.qml
 CusImageOverlay 1.0 Qml/CusImage/CusImageOverlay.qml
+CusImage_Tip 1.0 Qml/CusImage/CusImage_Tip.qml
 CusIPAddress 1.0 Qml/CusInput/CusIPAddress.qml
+CusTextField 1.0 Qml/CusInput/CusTextField.qml
 CusTextField_Btn 1.0 Qml/CusInput/CusTextField_Btn.qml
 CusTextField_Search 1.0 Qml/CusInput/CusTextField_Search.qml
 CusTextField_Valid 1.0 Qml/CusInput/CusTextField_Valid.qml
-CusTextField 1.0 Qml/CusInput/CusTextField.qml
 CusTextInput 1.0 Qml/CusInput/CusTextInput.qml
+CusLabel 1.0 Qml/CusLabel/CusLabel.qml
 CusLabel_Center 1.0 Qml/CusLabel/CusLabel_Center.qml
 CusLabel_Left 1.0 Qml/CusLabel/CusLabel_Left.qml
-CusLabel 1.0 Qml/CusLabel/CusLabel.qml
 CusListView 1.0 Qml/CusListView/CusListView.qml
 CusPopup 1.0 Qml/CusPopup/CusPopup.qml
 CusToolTip_Triangle 1.0 Qml/CusPopup/CusToolTip_Triangle.qml
 CusTriangleTipBorder 1.0 Qml/CusPopup/CusTriangleTipBorder.qml
 CusScrollBar 1.0 Qml/CusScroll/CusScrollBar.qml
-CusSlider_Spin 1.0 Qml/CusSlider/CusSlider_Spin.qml
 CusSlider 1.0 Qml/CusSlider/CusSlider.qml
-CusSpinBox_HourMinute 1.0 Qml/CusSpinBox/CusSpinBox_HourMinute.qml
+CusSlider_Spin 1.0 Qml/CusSlider/CusSlider_Spin.qml
 CusSpinBox 1.0 Qml/CusSpinBox/CusSpinBox.qml
+CusSpinBox_HourMinute 1.0 Qml/CusSpinBox/CusSpinBox_HourMinute.qml
 singleton CusTableConstant 1.0 Qml/CusTable/CusTableConstant.qml
 CusTableHeader 1.0 Qml/CusTable/CusTableHeader.qml
 CusTableRow 1.0 Qml/CusTable/CusTableRow.qml