diff options
Diffstat (limited to 'examples/quick/tutorials')
20 files changed, 440 insertions, 299 deletions
diff --git a/examples/quick/tutorials/dynamicview/CMakeLists.txt b/examples/quick/tutorials/dynamicview/CMakeLists.txt index 27a94e84f0..2245f3cdfb 100644 --- a/examples/quick/tutorials/dynamicview/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause qt_internal_add_example(dynamicview1) qt_internal_add_example(dynamicview2) diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt index 4cc0d60742..a1ba04f8e9 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt @@ -1,19 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(dynamicview1 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynamicview1") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(dynamicview1 main.cpp ) @@ -25,21 +21,29 @@ set_target_properties(dynamicview1 PROPERTIES qt_add_qml_module(dynamicview1 URI dynamicview - AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml PetsModel.qml ) target_link_libraries(dynamicview1 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS dynamicview1 - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_qml_app_script( + TARGET dynamicview1 + OUTPUT_SCRIPT deploy_script + MACOS_BUNDLE_POST_BUILD + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM ) +install(SCRIPT ${deploy_script}) diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml index 45c43909e4..0ebbb1d12e 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml @@ -6,59 +6,59 @@ import QtQuick ListModel { ListElement { - name: "Polly" - type: "Parrot" + name: qsTr("Polly") + type: qsTr("Parrot") age: 12 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Penny" - type: "Turtle" + name: qsTr("Penny") + type: qsTr("Turtle") age: 4 - size: "Small" + size: qsTr("Small") } //![0] ListElement { - name: "Warren" - type: "Rabbit" + name: qsTr("Warren") + type: qsTr("Rabbit") age: 2 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Spot" - type: "Dog" + name: qsTr("Spot") + type: qsTr("Dog") age: 9 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Schrödinger" - type: "Cat" + name: qsTr("Schrödinger") + type: qsTr("Cat") age: 2 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Joey" - type: "Kangaroo" + name: qsTr("Joey") + type: qsTr("Kangaroo") age: 1 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Kimba" - type: "Bunny" + name: qsTr("Kimba") + type: qsTr("Bunny") age: 65 - size: "Large" + size: qsTr("Large") } ListElement { - name: "Rover" - type: "Dog" + name: qsTr("Rover") + type: qsTr("Dog") age: 5 - size: "Large" + size: qsTr("Large") } ListElement { - name: "Tiny" - type: "Elephant" + name: qsTr("Tiny") + type: qsTr("Elephant") age: 15 - size: "Large" + size: qsTr("Large") } //![1] } diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml index ec776d4153..3cf9194729 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml @@ -8,7 +8,8 @@ import QtQuick Rectangle { id: root - width: 300; height: 400 + width: 300 + height: 400 //![1] Component { @@ -32,12 +33,15 @@ Rectangle { Column { id: column - anchors { fill: parent; margins: 2 } + anchors { + fill: parent + margins: 2 + } - Text { text: 'Name: ' + name } - Text { text: 'Type: ' + type } - Text { text: 'Age: ' + age } - Text { text: 'Size: ' + size } + Text { text: qsTr('Name: ') + content.name } + Text { text: qsTr('Type: ') + content.type } + Text { text: qsTr('Age: ') + content.age } + Text { text: qsTr('Size: ') + content.size } } } } @@ -46,7 +50,10 @@ Rectangle { ListView { id: view - anchors { fill: parent; margins: 2 } + anchors { + fill: parent + margins: 2 + } model: PetsModel {} delegate: dragDelegate diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt index 6db9439a77..d1d65497f5 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt @@ -1,19 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(dynamicview2 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynamicview2") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(dynamicview2 main.cpp ) @@ -25,21 +21,29 @@ set_target_properties(dynamicview2 PROPERTIES qt_add_qml_module(dynamicview2 URI dynamicview - AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml PetsModel.qml ) target_link_libraries(dynamicview2 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS dynamicview2 - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_qml_app_script( + TARGET dynamicview2 + OUTPUT_SCRIPT deploy_script + MACOS_BUNDLE_POST_BUILD + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM ) +install(SCRIPT ${deploy_script}) diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml index acdab53c20..457d8e5dcf 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml @@ -5,57 +5,57 @@ import QtQuick ListModel { ListElement { - name: "Polly" - type: "Parrot" + name: qsTr("Polly") + type: qsTr("Parrot") age: 12 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Penny" - type: "Turtle" + name: qsTr("Penny") + type: qsTr("Turtle") age: 4 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Warren" - type: "Rabbit" + name: qsTr("Warren") + type: qsTr("Rabbit") age: 2 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Spot" - type: "Dog" + name: qsTr("Spot") + type: qsTr("Dog") age: 9 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Schrödinger" - type: "Cat" + name: qsTr("Schrödinger") + type: qsTr("Cat") age: 2 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Joey" - type: "Kangaroo" + name: qsTr("Joey") + type: qsTr("Kangaroo") age: 1 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Kimba" - type: "Bunny" + name: qsTr("Kimba") + type: qsTr("Bunny") age: 65 - size: "Large" + size: qsTr("Large") } ListElement { - name: "Rover" - type: "Dog" + name: qsTr("Rover") + type: qsTr("Dog") age: 5 - size: "Large" + size: qsTr("Large") } ListElement { - name: "Tiny" - type: "Elephant" + name: qsTr("Tiny") + type: qsTr("Elephant") age: 15 - size: "Large" + size: qsTr("Large") } } diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml index 99b1bbdaa1..d1e954ba27 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml @@ -1,12 +1,14 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound import QtQuick Rectangle { id: root - width: 300; height: 400 + width: 300 + height: 400 //![0] Component { @@ -17,8 +19,15 @@ Rectangle { id: dragArea property bool held: false - - anchors { left: parent.left; right: parent.right } + required property string name + required property string type + required property string size + required property int age + + anchors { + left: parent?.left + right: parent?.right + } height: content.height drag.target: held ? content : undefined @@ -34,7 +43,8 @@ Rectangle { horizontalCenter: parent.horizontalCenter verticalCenter: parent.verticalCenter } - width: dragArea.width; height: column.implicitHeight + 4 + width: dragArea.width + height: column.implicitHeight + 4 border.width: 1 border.color: "lightsteelblue" @@ -47,21 +57,30 @@ Rectangle { states: State { when: dragArea.held - ParentChange { target: content; parent: root } + ParentChange { + target: content + parent: root + } AnchorChanges { target: content - anchors { horizontalCenter: undefined; verticalCenter: undefined } + anchors { + horizontalCenter: undefined + verticalCenter: undefined + } } } //![4] Column { id: column - anchors { fill: parent; margins: 2 } + anchors { + fill: parent + margins: 2 + } - Text { text: 'Name: ' + name } - Text { text: 'Type: ' + type } - Text { text: 'Age: ' + age } - Text { text: 'Size: ' + size } + Text { text: qsTr('Name: ') + dragArea.name } + Text { text: qsTr('Type: ') + dragArea.type } + Text { text: qsTr('Age: ') + dragArea.age } + Text { text: qsTr('Size: ') + dragArea.size } } //![2] } @@ -73,7 +92,10 @@ Rectangle { ListView { id: view - anchors { fill: parent; margins: 2 } + anchors { + fill: parent + margins: 2 + } model: PetsModel {} delegate: dragDelegate diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt index 6b7a4b1605..5c561f1112 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt @@ -1,19 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(dynamicview3 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynamicview3") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(dynamicview3 main.cpp ) @@ -25,21 +21,29 @@ set_target_properties(dynamicview3 PROPERTIES qt_add_qml_module(dynamicview3 URI dynamicview - AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml PetsModel.qml ) target_link_libraries(dynamicview3 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS dynamicview3 - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_qml_app_script( + TARGET dynamicview3 + OUTPUT_SCRIPT deploy_script + MACOS_BUNDLE_POST_BUILD + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM ) +install(SCRIPT ${deploy_script}) diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml index acdab53c20..457d8e5dcf 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml @@ -5,57 +5,57 @@ import QtQuick ListModel { ListElement { - name: "Polly" - type: "Parrot" + name: qsTr("Polly") + type: qsTr("Parrot") age: 12 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Penny" - type: "Turtle" + name: qsTr("Penny") + type: qsTr("Turtle") age: 4 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Warren" - type: "Rabbit" + name: qsTr("Warren") + type: qsTr("Rabbit") age: 2 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Spot" - type: "Dog" + name: qsTr("Spot") + type: qsTr("Dog") age: 9 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Schrödinger" - type: "Cat" + name: qsTr("Schrödinger") + type: qsTr("Cat") age: 2 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Joey" - type: "Kangaroo" + name: qsTr("Joey") + type: qsTr("Kangaroo") age: 1 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Kimba" - type: "Bunny" + name: qsTr("Kimba") + type: qsTr("Bunny") age: 65 - size: "Large" + size: qsTr("Large") } ListElement { - name: "Rover" - type: "Dog" + name: qsTr("Rover") + type: qsTr("Dog") age: 5 - size: "Large" + size: qsTr("Large") } ListElement { - name: "Tiny" - type: "Elephant" + name: qsTr("Tiny") + type: qsTr("Elephant") age: 15 - size: "Large" + size: qsTr("Large") } } diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml index ea88da4e53..1212ac066c 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml @@ -1,13 +1,15 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound import QtQuick import QtQml.Models //![0] Rectangle { id: root - width: 300; height: 400 + width: 300 + height: 400 Component { id: dragDelegate @@ -16,8 +18,15 @@ Rectangle { id: dragArea property bool held: false - - anchors { left: parent.left; right: parent.right } + required property string name + required property string type + required property string size + required property int age + + anchors { + left: parent?.left + right: parent?.right + } height: content.height drag.target: held ? content : undefined @@ -33,7 +42,8 @@ Rectangle { horizontalCenter: parent.horizontalCenter verticalCenter: parent.verticalCenter } - width: dragArea.width; height: column.implicitHeight + 4 + width: dragArea.width + height: column.implicitHeight + 4 border.width: 1 border.color: "lightsteelblue" @@ -51,29 +61,41 @@ Rectangle { states: State { when: dragArea.held - ParentChange { target: content; parent: root } + ParentChange { + target: content + parent: root + } AnchorChanges { target: content - anchors { horizontalCenter: undefined; verticalCenter: undefined } + anchors { + horizontalCenter: undefined + verticalCenter: undefined + } } } Column { id: column - anchors { fill: parent; margins: 2 } + anchors { + fill: parent + margins: 2 + } - Text { text: 'Name: ' + name } - Text { text: 'Type: ' + type } - Text { text: 'Age: ' + age } - Text { text: 'Size: ' + size } + Text { text: qsTr('Name: ') + dragArea.name } + Text { text: qsTr('Type: ') + dragArea.type } + Text { text: qsTr('Age: ') + dragArea.age } + Text { text: qsTr('Size: ') + dragArea.size } } //![2] } //![3] DropArea { - anchors { fill: parent; margins: 10 } + anchors { + fill: parent + margins: 10 + } - onEntered: (drag)=> { + onEntered: (drag) => { visualModel.items.move( drag.source.DelegateModel.itemsIndex, dragArea.DelegateModel.itemsIndex) @@ -94,7 +116,10 @@ Rectangle { ListView { id: view - anchors { fill: parent; margins: 2 } + anchors { + fill: parent + margins: 2 + } model: visualModel diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt index aff35996da..a3f0ae04e9 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt @@ -1,19 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(dynamicview4 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynamicview4") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(dynamicview4 main.cpp ) @@ -25,7 +21,6 @@ set_target_properties(dynamicview4 PROPERTIES qt_add_qml_module(dynamicview4 URI dynamicview - AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml ListSelector.qml @@ -33,14 +28,23 @@ qt_add_qml_module(dynamicview4 ) target_link_libraries(dynamicview4 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS dynamicview4 - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_qml_app_script( + TARGET dynamicview4 + OUTPUT_SCRIPT deploy_script + MACOS_BUNDLE_POST_BUILD + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM ) +install(SCRIPT ${deploy_script}) diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml b/examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml index 42a200a936..ee788417d9 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml @@ -1,6 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound import QtQuick Item { @@ -11,12 +12,17 @@ Item { property alias label: labelText.text property bool expanded - width: 100; height: labelText.implicitHeight + 26 + width: 100 + height: labelText.implicitHeight + 26 Rectangle { - anchors { left: parent.left; right: parent.right; bottom: parent.bottom; } + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + } - height: labelText.implicitHeight + 4 + (expanded ? 20 * view.count : 20) + height: labelText.implicitHeight + 4 + (selector.expanded ? 20 * view.count : 20) Behavior on height { NumberAnimation { duration: 300 } } radius: 2 @@ -31,13 +37,20 @@ Item { Text { id: labelText - anchors { left: parent.left; top: parent.top; margins: 2 } + + anchors { + left: parent.left + top: parent.top + margins: 2 + } } Rectangle { anchors { - left: parent.left; top: labelText.bottom; - right: parent.right; bottom: parent.bottom; + left: parent.left + top: labelText.bottom + right: parent.right + bottom: parent.bottom margins: 2 leftMargin: 10 } @@ -53,7 +66,13 @@ Item { clip: true delegate: Text { - anchors { left: parent.left; right: parent.right } + required property int index + required property string modelData + + anchors { + left: parent.left + right: parent.right + } height: 20 verticalAlignment: Text.AlignVCenter @@ -64,13 +83,16 @@ Item { anchors.fill: parent onClicked: { - view.currentIndex = index + parent.ListView.view.currentIndex = parent.index selector.expanded = !selector.expanded } } } highlight: Rectangle { - anchors { left: parent.left; right: parent.right } + anchors { + left: parent.left + right: parent.right + } height: 20 radius: 2 diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml index acdab53c20..457d8e5dcf 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml @@ -5,57 +5,57 @@ import QtQuick ListModel { ListElement { - name: "Polly" - type: "Parrot" + name: qsTr("Polly") + type: qsTr("Parrot") age: 12 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Penny" - type: "Turtle" + name: qsTr("Penny") + type: qsTr("Turtle") age: 4 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Warren" - type: "Rabbit" + name: qsTr("Warren") + type: qsTr("Rabbit") age: 2 - size: "Small" + size: qsTr("Small") } ListElement { - name: "Spot" - type: "Dog" + name: qsTr("Spot") + type: qsTr("Dog") age: 9 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Schrödinger" - type: "Cat" + name: qsTr("Schrödinger") + type: qsTr("Cat") age: 2 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Joey" - type: "Kangaroo" + name: qsTr("Joey") + type: qsTr("Kangaroo") age: 1 - size: "Medium" + size: qsTr("Medium") } ListElement { - name: "Kimba" - type: "Bunny" + name: qsTr("Kimba") + type: qsTr("Bunny") age: 65 - size: "Large" + size: qsTr("Large") } ListElement { - name: "Rover" - type: "Dog" + name: qsTr("Rover") + type: qsTr("Dog") age: 5 - size: "Large" + size: qsTr("Large") } ListElement { - name: "Tiny" - type: "Elephant" + name: qsTr("Tiny") + type: qsTr("Elephant") age: 15 - size: "Large" + size: qsTr("Large") } } diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml index cb454c0d46..1a354d12d9 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml @@ -1,13 +1,15 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound import QtQuick import QtQml.Models Rectangle { id: root - width: 300; height: 400 + width: 300 + height: 400 Component { id: dragDelegate @@ -16,8 +18,15 @@ Rectangle { id: dragArea property bool held: false - - anchors { left: parent.left; right: parent.right } + required property string name + required property string type + required property string size + required property int age + + anchors { + left: parent?.left + right: parent?.right + } height: content.height enabled: visualModel.sortOrder == visualModel.lessThan.length @@ -35,7 +44,8 @@ Rectangle { horizontalCenter: parent.horizontalCenter verticalCenter: parent.verticalCenter } - width: dragArea.width; height: column.implicitHeight + 4 + width: dragArea.width + height: column.implicitHeight + 4 border.width: 1 border.color: "lightsteelblue" @@ -53,28 +63,40 @@ Rectangle { states: State { when: dragArea.held - ParentChange { target: content; parent: root } + ParentChange { + target: content + parent: root + } AnchorChanges { target: content - anchors { horizontalCenter: undefined; verticalCenter: undefined } + anchors { + horizontalCenter: undefined + verticalCenter: undefined + } } } Column { id: column - anchors { fill: parent; margins: 2 } + anchors { + fill: parent + margins: 2 + } - Text { text: 'Name: ' + name } - Text { text: 'Type: ' + type } - Text { text: 'Age: ' + age } - Text { text: 'Size: ' + size } + Text { text: qsTr('Name: ') + dragArea.name } + Text { text: qsTr('Type: ') + dragArea.type } + Text { text: qsTr('Age: ') + dragArea.age } + Text { text: qsTr('Size: ') + dragArea.size } } } DropArea { - anchors { fill: parent; margins: 10 } + anchors { + fill: parent + margins: 10 + } - onEntered: (drag)=> { + onEntered: (drag) => { visualModel.items.move( drag.source.DelegateModel.itemsIndex, dragArea.DelegateModel.itemsIndex) @@ -110,11 +132,11 @@ Rectangle { //![6] //![3] function insertPosition(lessThan, item) { - var lower = 0 - var upper = items.count + let lower = 0 + let upper = items.count while (lower < upper) { - var middle = Math.floor(lower + (upper - lower) / 2) - var result = lessThan(item.model, items.get(middle).model); + const middle = Math.floor(lower + (upper - lower) / 2) + const result = lessThan(item.model, items.get(middle).model) if (result) { upper = middle } else { @@ -126,8 +148,8 @@ Rectangle { function sort(lessThan) { while (unsortedItems.count > 0) { - var item = unsortedItems.get(0) - var index = insertPosition(lessThan, item) + const item = unsortedItems.get(0) + const index = insertPosition(lessThan, item) item.groups = "items" items.move(item.itemsIndex, index) @@ -162,7 +184,10 @@ Rectangle { id: view anchors { - left: parent.left; top: parent.top; right: parent.right; bottom: orderSelector.top; + left: parent.left + top: parent.top + right: parent.right + bottom: orderSelector.top margins: 2 } @@ -175,9 +200,14 @@ Rectangle { ListSelector { id: orderSelector - anchors { left: parent.left; right: parent.right; bottom: parent.bottom; margins: 2 } + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + margins: 2 + } - label: "Sort By" - list: [ "Name", "Type", "Age", "Size", "Custom" ] + label: qsTr("Sort By") + list: [ qsTr("Name"), qsTr("Type"), qsTr("Age"), qsTr("Size"), qsTr("Custom") ] } } diff --git a/examples/quick/tutorials/samegame/CMakeLists.txt b/examples/quick/tutorials/samegame/CMakeLists.txt index 49b043e18d..4582f44309 100644 --- a/examples/quick/tutorials/samegame/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause qt_internal_add_example(samegame1) qt_internal_add_example(samegame2) diff --git a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt index 8cc399ccd0..0ce11660a8 100644 --- a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt @@ -1,19 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(samegame1 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame1") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(samegame1 main.cpp ) @@ -25,7 +21,6 @@ set_target_properties(samegame1 PROPERTIES qt_add_qml_module(samegame1 URI samegame - AUTO_RESOURCE_PREFIX QML_FILES "Block.qml" "Button.qml" @@ -36,14 +31,23 @@ qt_add_qml_module(samegame1 ) target_link_libraries(samegame1 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS samegame1 - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_qml_app_script( + TARGET samegame1 + OUTPUT_SCRIPT deploy_script + MACOS_BUNDLE_POST_BUILD + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM ) +install(SCRIPT ${deploy_script}) diff --git a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt index 1233e4d407..3fe42e4cd4 100644 --- a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt @@ -1,19 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(samegame2 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame2") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(samegame2 main.cpp ) @@ -25,7 +21,6 @@ set_target_properties(samegame2 PROPERTIES qt_add_qml_module(samegame2 URI samegame - AUTO_RESOURCE_PREFIX QML_FILES "Block.qml" "Button.qml" @@ -37,14 +32,23 @@ qt_add_qml_module(samegame2 ) target_link_libraries(samegame2 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS samegame2 - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_qml_app_script( + TARGET samegame2 + OUTPUT_SCRIPT deploy_script + MACOS_BUNDLE_POST_BUILD + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM ) +install(SCRIPT ${deploy_script}) diff --git a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt index 59fa1302a6..4bd5124fbe 100644 --- a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt @@ -1,19 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(samegame3 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame3") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(samegame3 main.cpp ) @@ -25,7 +21,6 @@ set_target_properties(samegame3 PROPERTIES qt_add_qml_module(samegame3 URI samegame - AUTO_RESOURCE_PREFIX QML_FILES "Block.qml" "Button.qml" @@ -40,14 +35,23 @@ qt_add_qml_module(samegame3 ) target_link_libraries(samegame3 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS samegame3 - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_qml_app_script( + TARGET samegame3 + OUTPUT_SCRIPT deploy_script + MACOS_BUNDLE_POST_BUILD + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM ) +install(SCRIPT ${deploy_script}) diff --git a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt index 77fdb83718..7760ee1abf 100644 --- a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt @@ -1,19 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(samegame4 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame4") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(samegame4 main.cpp ) @@ -25,7 +21,6 @@ set_target_properties(samegame4 PROPERTIES qt_add_qml_module(samegame4 URI samegame - AUTO_RESOURCE_PREFIX QML_FILES "BoomBlock.qml" "Button.qml" @@ -47,14 +42,23 @@ qt_add_qml_module(samegame4 ) target_link_libraries(samegame4 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS samegame4 - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_qml_app_script( + TARGET samegame4 + OUTPUT_SCRIPT deploy_script + MACOS_BUNDLE_POST_BUILD + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM ) +install(SCRIPT ${deploy_script}) diff --git a/examples/quick/tutorials/samegame/samegame4/samegame.js b/examples/quick/tutorials/samegame/samegame4/samegame.js index 80b175d450..99d34c64a0 100644 --- a/examples/quick/tutorials/samegame/samegame4/samegame.js +++ b/examples/quick/tutorials/samegame/samegame4/samegame.js @@ -27,10 +27,6 @@ function startNewGame() { maxRow = Math.floor(gameCanvas.height / gameCanvas.blockSize); maxIndex = maxRow * maxColumn; - //Close dialogs - nameInputDialog.hide(); - dialog.hide(); - //Initialize Board board = new Array(maxIndex); gameCanvas.score = 0; @@ -41,6 +37,10 @@ function startNewGame() { } } + //Close dialogs + nameInputDialog.hide(); + dialog.hide(); + gameDuration = new Date(); } @@ -191,6 +191,9 @@ function floodMoveCheck(column, row, type) { //![2] function saveHighScore(name) { + if (gameCanvas.score == 0) + return; + if (scoresURL != "") sendHighScore(name); |