diff --git a/examples/gallery/CMakeLists.txt b/examples/gallery/CMakeLists.txt index 379fbb4d..bbfc2e34 100644 --- a/examples/gallery/CMakeLists.txt +++ b/examples/gallery/CMakeLists.txt @@ -1,49 +1,19 @@ list(APPEND TARGET_HEADERS - label/LabelPage.h) - -list(APPEND TARGET_SOURCES - label/LabelPage.cpp) - -list(APPEND TARGET_HEADERS - slider/SliderPage.h) - -list(APPEND TARGET_SOURCES - slider/SliderPage.cpp) - -list(APPEND TARGET_HEADERS - progressbar/ProgressBarPage.h) - -list(APPEND TARGET_SOURCES - progressbar/ProgressBarPage.cpp) - -list(APPEND TARGET_HEADERS - button/ButtonPage.h) - -list(APPEND TARGET_SOURCES - button/ButtonPage.cpp) - -list(APPEND TARGET_HEADERS - textinput/TextInputPage.h) - -list(APPEND TARGET_SOURCES - textinput/TextInputPage.cpp) - -list(APPEND TARGET_HEADERS - selector/SelectorPage.h) - -list(APPEND TARGET_SOURCES - selector/SelectorPage.cpp) - -list(APPEND TARGET_HEADERS - dialog/DialogPage.h) - -list(APPEND TARGET_SOURCES - dialog/DialogPage.cpp) - -list(APPEND TARGET_HEADERS + label/LabelPage.h + inputs/InputPage.h + progressbar/ProgressBarPage.h + button/ButtonPage.h + selector/SelectorPage.h + dialog/DialogPage.h Page.h) list(APPEND TARGET_SOURCES + label/LabelPage.cpp + inputs/InputPage.cpp + progressbar/ProgressBarPage.cpp + button/ButtonPage.cpp + selector/SelectorPage.cpp + dialog/DialogPage.cpp Page.cpp main.cpp) @@ -63,4 +33,4 @@ target_link_libraries(${TARGET_NAME} target_include_directories(${TARGET_NAME} PRIVATE - ${CMAKE_CURRENT_LIST_DIR}) \ No newline at end of file + ${CMAKE_CURRENT_LIST_DIR}) diff --git a/playground/CMakeLists.txt b/playground/CMakeLists.txt index de8abd04..fa432ff0 100644 --- a/playground/CMakeLists.txt +++ b/playground/CMakeLists.txt @@ -1,10 +1,12 @@ add_subdirectory(anchors) add_subdirectory(dials) add_subdirectory(dialogbuttons) +add_subdirectory(gradients) add_subdirectory(invoker) add_subdirectory(inputpanel) add_subdirectory(images) add_subdirectory(shadows) +add_subdirectory(shapes) if (QT_VERSION_MAJOR VERSION_EQUAL "6") if(TARGET Qt::WebEngineCore) diff --git a/playground/gradients/CMakeLists.txt b/playground/gradients/CMakeLists.txt new file mode 100644 index 00000000..076ed430 --- /dev/null +++ b/playground/gradients/CMakeLists.txt @@ -0,0 +1,22 @@ +list(APPEND TARGET_HEADERS + GradientView.h) + +list(APPEND TARGET_SOURCES + GradientView.cpp + main.cpp) + +set(TARGET_NAME gradients) + +qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE + ${TARGET_HEADERS} + ${TARGET_SOURCES}) + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + qsktestsupport) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + FOLDER playground) diff --git a/playground/shapes/CMakeLists.txt b/playground/shapes/CMakeLists.txt new file mode 100644 index 00000000..9eb537f4 --- /dev/null +++ b/playground/shapes/CMakeLists.txt @@ -0,0 +1,30 @@ +list(APPEND TARGET_HEADERS + ShapeItem.h + GeometricShape.h + Window.h + Stroke.h) + +list(APPEND TARGET_SOURCES + Stroke.cpp + ShapeItem.cpp + GeometricShape.cpp + Window.cpp + main.cpp) + +set(TARGET_NAME shapes) + +qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE + ${TARGET_HEADERS} + ${TARGET_SOURCES}) + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + qskqmlexport + qsktestsupport + Qt::QuickShapesPrivate) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + FOLDER playground) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ec44ccc9..999e4421 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND TARGET_HEADERS common/QskFunctions.h common/QskGlobal.h common/QskGradient.h + common/QskGradientDirection.h common/QskGradientStop.h common/QskHctColor.h common/QskIntervalF.h @@ -39,6 +40,7 @@ list(APPEND TARGET_SOURCES common/QskBoxHints.cpp common/QskFunctions.cpp common/QskGradient.cpp + common/QskGradientDirection.cpp common/QskGradientStop.cpp common/QskHctColor.cpp common/QskIntervalF.cpp @@ -85,16 +87,24 @@ list(APPEND TARGET_HEADERS nodes/QskArcRenderer.h nodes/QskBoxNode.h nodes/QskBoxClipNode.h + nodes/QskBoxFillNode.h + nodes/QskBoxRectangleNode.h nodes/QskBoxRenderer.h - nodes/QskBoxRendererColorMap.h + nodes/QskBoxMetrics.h + nodes/QskBoxBasicStroker.h + nodes/QskBoxGradientStroker.h + nodes/QskBoxColorMap.h nodes/QskBoxShadowNode.h + nodes/QskColorRamp.h nodes/QskGraphicNode.h nodes/QskPaintedNode.h nodes/QskPlainTextRenderer.h nodes/QskRichTextRenderer.h nodes/QskScaleRenderer.h nodes/QskSGNode.h - nodes/QskShadedBoxNode.h + nodes/QskStrokeNode.h + nodes/QskShapeNode.h + nodes/QskGradientMaterial.h nodes/QskTextNode.h nodes/QskTextRenderer.h nodes/QskTextureRenderer.h @@ -106,17 +116,24 @@ list(APPEND TARGET_SOURCES nodes/QskArcRenderer.cpp nodes/QskBoxNode.cpp nodes/QskBoxClipNode.cpp - nodes/QskBoxRendererRect.cpp - nodes/QskBoxRendererEllipse.cpp - nodes/QskBoxRendererDEllipse.cpp + nodes/QskBoxFillNode.cpp + nodes/QskBoxRectangleNode.cpp + nodes/QskBoxRenderer.cpp + nodes/QskBoxMetrics.cpp + nodes/QskBoxBasicStroker.cpp + nodes/QskBoxGradientStroker.cpp nodes/QskBoxShadowNode.cpp + nodes/QskColorRamp.cpp nodes/QskGraphicNode.cpp nodes/QskPaintedNode.cpp nodes/QskPlainTextRenderer.cpp + nodes/QskRectangleNode.cpp nodes/QskRichTextRenderer.cpp nodes/QskScaleRenderer.cpp nodes/QskSGNode.cpp - nodes/QskShadedBoxNode.cpp + nodes/QskStrokeNode.cpp + nodes/QskShapeNode.cpp + nodes/QskGradientMaterial.cpp nodes/QskTextNode.cpp nodes/QskTextRenderer.cpp nodes/QskTextureRenderer.cpp @@ -139,6 +156,8 @@ list(APPEND TARGET_HEADERS controls/QskBoxSkinlet.h controls/QskCheckBox.h controls/QskCheckBoxSkinlet.h + controls/QskComboBox.h + controls/QskComboBoxSkinlet.h controls/QskControl.h controls/QskControlPrivate.h controls/QskDirtyItemFilter.h @@ -169,6 +188,8 @@ list(APPEND TARGET_HEADERS controls/QskQuick.h controls/QskQuickItem.h controls/QskQuickItemPrivate.h + controls/QskRadioBox.h + controls/QskRadioBoxSkinlet.h controls/QskScrollArea.h controls/QskScrollBox.h controls/QskScrollView.h @@ -193,6 +214,8 @@ list(APPEND TARGET_HEADERS controls/QskSliderSkinlet.h controls/QskStatusIndicator.h controls/QskStatusIndicatorSkinlet.h + controls/QskSpinBox.h + controls/QskSpinBoxSkinlet.h controls/QskSubWindowArea.h controls/QskSubWindowAreaSkinlet.h controls/QskSubWindow.h @@ -224,6 +247,8 @@ list(APPEND TARGET_SOURCES controls/QskBoxSkinlet.cpp controls/QskCheckBox.cpp controls/QskCheckBoxSkinlet.cpp + controls/QskComboBox.cpp + controls/QskComboBoxSkinlet.cpp controls/QskControl.cpp controls/QskControlPrivate.cpp controls/QskDirtyItemFilter.cpp @@ -258,6 +283,8 @@ list(APPEND TARGET_SOURCES controls/QskScrollBox.cpp controls/QskScrollView.cpp controls/QskScrollViewSkinlet.cpp + controls/QskRadioBox.cpp + controls/QskRadioBoxSkinlet.cpp controls/QskSegmentedBar.cpp controls/QskSegmentedBarSkinlet.cpp controls/QskSeparator.cpp @@ -275,6 +302,8 @@ list(APPEND TARGET_SOURCES controls/QskSkinnable.cpp controls/QskSlider.cpp controls/QskSliderSkinlet.cpp + controls/QskSpinBox.cpp + controls/QskSpinBoxSkinlet.cpp controls/QskStatusIndicator.cpp controls/QskStatusIndicatorSkinlet.cpp controls/QskSubWindowArea.cpp @@ -453,4 +482,4 @@ set_target_properties(${TARGET_NAME} list(TRANSFORM TARGET_HEADERS PREPEND "${CMAKE_CURRENT_LIST_DIR}/") set_target_properties(${TARGET_NAME} PROPERTIES - PUBLIC_HEADER "${TARGET_HEADERS}") \ No newline at end of file + PUBLIC_HEADER "${TARGET_HEADERS}")