qiurui
/
qtdoc
mirror of https://github.com/qt/qtdoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdoc/examples/demos/coffee/ChoosingCoffee.qml

11 lines
382 B
QML
Raw Normal View History

Re-design for Coffee Machine example Implementing new design for Coffee Machine example, more information on how the new design is going to look like in QTBUG-116402 and in its subtasks. Removed unused imports folder. Changed the names of Home.ui.qml to Home.qml and FilledCup.qml to Cup.qml in Coffee.qrc file. Changed the names of the files stated above also in qmldir. Fixes: QTBUG-116403 Fixes: QTBUG-116402 Task-number: QTBUG-116404 Change-Id: Ib4d33e28ce1e3f268172007e85f36eb1280d11a4 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-09-01 10:48:19 +00:00
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
Separate UI from business logic on re-designed Coffee Machine example Added .ui.qml counterpart files for components that needed separation between the UI and business logic. Rebased to dev to get the newest changes Added Cup snippet tags to ProgressForm.ui.qml Added AbstractButton snippet tags to CoffeeCardForm.ui.qml Fix ambiguous id's and corresponding property aliases in CoffeeCardForm.ui.qml Added qdoc snippet tags to ChoosingCoffeeForm.ui.qml Fixed incorrect file paths in snippet tags in coffee.qdoc Moved transitions from ProgressForm.ui.qml to Progress.qml as they did not work properly from there to make the coffee cup animation work properly. Added property alias "contentItem" to ProgressForm.ui.qml to access it's properties from Progress.qml to make the progress bar animation work properly. Fixed x coordinates in custom sliders so that the slider handle will not go over the slider bar and become unresponsive. Removed "brewTime" property int from ProgressForm.ui.qml as it was not needed there. * Fixed x coordinate in Sliders to work like they are described in official documentation. * Created property int in Progress.qml to better describe cup animation velocity factor. Fixes: QTBUG-120280 Pick-to: 6.6 6.7 Change-Id: I3ed0e1c6777674e2d9502aab1e5c670b6099f60a Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
2023-12-20 07:13:15 +00:00
ChoosingCoffeeForm {
cappuccino.button.onClicked: applicationFlow.cappuccino()
macchiato.button.onClicked: applicationFlow.macchiato()
espresso.button.onClicked: applicationFlow.espresso()
latte.button.onClicked: applicationFlow.latte()
Re-design for Coffee Machine example Implementing new design for Coffee Machine example, more information on how the new design is going to look like in QTBUG-116402 and in its subtasks. Removed unused imports folder. Changed the names of Home.ui.qml to Home.qml and FilledCup.qml to Cup.qml in Coffee.qrc file. Changed the names of the files stated above also in qmldir. Fixes: QTBUG-116403 Fixes: QTBUG-116402 Task-number: QTBUG-116404 Change-Id: Ib4d33e28ce1e3f268172007e85f36eb1280d11a4 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-09-01 10:48:19 +00:00
}