Use Synchronizer to synchronize different coffee
slider values with CoffeeConfig.
Set sugarAmount to 0 by default.
Change docs to reflect new implementation.
Fixes the synchronization issue with sugar value.
Pick-to: 6.10
Fixes: QTBUG-138676
Change-Id: Ic73066df3ab2a4281aaf885547f22d2a3bdf662d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
We can't have cyclic dependencies between types in 6.10.
To reduce the cyclic dependency, we are extracting the coffee settings
into their own type.
The next commit will then (targeting only 6.10) replace ApplicationFlow
properties with var properies.
Reducing the coupling further by extracting the navigation functions
into yet another type is left as a future exercise.
Also, note the opportunity to fix the PropertyChanges in Progress.qml to
not reference a non-local id (which now wouldn't work anymore) – that
wasn't caught by qmllint because PropertyChanges is custom parsed, and
the only way to avoid this is to use the new syntax – but the warning
for that has been turned off due to QDS compatabililty.
Task-number: QTBUG-138898
Change-Id: I6ae97a567350c98dcd8056ac8433858b0b8aec6f
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
(cherry picked from commit 5b075084fa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Move the orientation value into its own singleton; it's not directly
coffee related, and we want to make use of it in many places, including
ui files, where we don't really want to have a dependency
ApplicationForm (so that they can be still be opened in QDS).
Pick-to: 6.10
Task-number: QTBUG-138164
Change-Id: Ib60fe29e814af2e564a33239ba36afd0d7bf9537
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Avoid coupling CustomToolBar to ApplicationFlow. Instead, give
CustomToolBar its own signals, and emit them when the buttons are
clicked.
Add the signal handling logic to ApplicationFlow.
Pick-to: 6.10
Task-number: QTBUG-138164
Change-Id: I96c98750f99cb4529bf47dd27a22a55bcecfa20f
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Deal with Home. Home differs from the other pages, because it is used as
the initial item, and thus an actual instance is already created in the
ui.qml file, not only a Component.
As we still want to use a required property referencing the
ApplicationFlow instance, the instantiation is moved into
ApplicationFlow (instead of ApplicationFlowForm).
Pick-to: 6.10
Task-number: QTBUG-138164
Change-Id: I903352e17560c056fdb12e370ee5413adbe2fd1d
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Apply the common pattern to the remaining sub-pages, besides Home.
Pick-to: 6.10
Task-number: QTBUG-138164
Change-Id: Ic79547d04b97285981afb206ba2db79309c629fd
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Make the dependency on AppicationFlow explicit in Progress by using a
required property. Use that to move the binding to ApplicationFlow's
properties into Progress itself, instead of setting them up in the
"progress" component – this reduces the dependency of
ApplicationFlowForm on its derived type. Initialize the required
property when pushing the component on the StackView.
As a drive-by, use the more modern pushItem function instead of push.
Pick-to: 6.10
Task-number: QTBUG-138164
Change-Id: I9e483c97b7585cef2fed043aa3a5ab35a4b54b10
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Make the dependency on AppicationFlow explicit in Settings by using a
required property. Use that to move the binding to ApplicationFlow's
properties into settings itself, instead of setting them up in the
"settings" component – this reduces the dependency of
ApplicationFlowForm on its derived type. Initialize the required
property when pushing the component on the StackView.
As a drive-by, use the more modern pushItem function instead of push.
Pick-to: 6.10
Task-number: QTBUG-138164
Change-Id: I47f2931d57ccd66c47775923a15e23d371afa6d1
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
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>
Added material under Adapting to different screens.
Added section Navigating through the app pages.
Added material to Implementing start page and
Implementing Coffee selection sections.
Added code snippets that will replace the precviously used
\quotefromfile.
Added material to cover the rest of the code.
Added snippet identifiers to source code.
Removed trailing whitespaces.
* Fixed grammatical issues.
Fixes: QTBUG-116406
Pick-to: 6.6 6.7
Change-Id: I30c4d8a3f7a159d03df70b960059c11472f942bb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
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>
The bug was due to the fact that when the coffee was finished brewing,
the state was being set to "initial" which was unnecessary.
So I decided to remove this part of code, which solved the bug.
Task-number: QTBUG-114375
Pick-to: 6.5 6.6
Change-Id: I7c8cbc96330574f0378ea8d1ee3ac2a4732f70e3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Removing usused imports
* Removing versions from imports
* The state property is a string
Change-Id: I2a7c8de17c414a20984830b964f9386f92a2cb00
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: Idfd176b7f7b077a5b7c66b7738dc9bcac94ab290
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Ignore .ui.qml files though for now, until they are properly handled
by Qt Design Studio.
Task-number: QTBUG-89033
Change-Id: I85ea1dc2f85928e9fa1f473535687ab8b0288e9d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
These demos use several modules and moving them allows to use for
example Qt Quick Controls 2 in them.
The shared directory should be removed and the examples made
self-contained.
Change-Id: I5dc667d22388651894d7d145b65752bc5c5cf6cf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Fabian Kosmale
Konsta Alajärvi
Nicholas Bennett
Jakub Wincenciak
Thomas Hartmann
Lucie Gérard
Kai Koehne
Venugopal Shivashankar
Nico Vertriest