Index: sources/gui/qml/components/ProgressBarEx.qml =================================================================== diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf) +++ sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,14 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. - * \copyright \n - * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n - * IN PART OR IN WHOLE, \n - * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file ProgressBarEx.qml - * \date 2020/03/15 - * \author Behrouz NematiPour + * \author (last) Behrouz NematiPour + * \date (last) 16-Oct-2020 + * \author (original) Behrouz NematiPour + * \date (original) 18-Mar-2020 * */ @@ -23,26 +24,29 @@ * \brief Denali project ProgressBar */ ProgressBar { id: _root - property alias valueEx : _progressRectEx.value + signal extraClicked() + property alias valueEx : _progressRectEx.value // for convenience + property alias progressEx : _progressRectEx + minimum : 0 maximum : 0 minText.visible : true maxText.visible : true - ProgressRect { id: _progressRectEx - z : 2 // ProgressBarEx z order in the gui - // to be ordred amont the components of the parent (ProgressBar) + z : 0 // ProgressBarEx z order in the gui + // to be ordred among the components of the parent (ProgressBar) visible : value - + decimal : _root.decimal minimum : _root.minimum maximum : _root.maximum value : _root.valueEx color : Colors.highlightMedProgressBar maxText.visible: visible margin : 0 + onClicked: extraClicked() } }