Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r442d1c4f53c96991d4103485ff5ff683ed00d4f7 -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 442d1c4f53c96991d4103485ff5ff683ed00d4f7) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) @@ -1,15 +1,16 @@ /*! - * + * * 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 - * - * \file Fonts.qml - * \date 2019/10/18 - * \author Behrouz NematiPour - * + * \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 Fonts.qml + * \author (last) Peter Lucia + * \date (last) 15-Oct-2020 + * \author (original) Behrouz NematiPour + * \date (original) 17-Oct-2019 + * */ // Qt @@ -22,8 +23,10 @@ * which is going to be used in the project */ QtObject { - readonly property int fontPixelButton : 12 * 2 - readonly property int fontPixelTitle : 12 * 3.5 + readonly property int fontPixelButton : 24 + readonly property int fontPixelTitle : 42 + readonly property int fontPixelSection : 36 + readonly property int fontPixelDialogText : 22 readonly property int fontPixelTouchAreaTitle : 16 @@ -33,4 +36,35 @@ readonly property int fontPixelVitals : 68 + readonly property int fontPixelRangeMarker : 16 + readonly property int fontPixelRangeRectText : 14 + + readonly property int fontPixelPresseuresText : 22 + + readonly property int fontPixelFluidText : 22 + readonly property int fontPixelFluidValue : 32 + readonly property int fontPixelFluidUnit : 22 + readonly property int fontPixelFluidVolume : 16 + + readonly property int fontPixelConfirm : 19 + readonly property int fontPixelBack : 17 + + readonly property int fontPixelSliderMarker : 17 + + readonly property int fontPixelNotification : 24 + + readonly property int fontPixelDurationCurTime : 89 + readonly property int fontPixelDurationAdjTime : 28 + + readonly property int fontPixelUltrafiltrationAdjustmentPauseButton : 26 + readonly property int fontPixelUltrafiltrationAdjustmentResumeButton : 30 + readonly property int fontPixelUltrafiltrationAdjustmentEditButton : 30 + readonly property int fontPixelUltrafiltrationAdjustmentNextButton : 26 + readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : 26 + readonly property int fontPixelUltrafiltrationAdjustmentConfirmTitle : 40 + readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 46 + + readonly property int primingFontSize : 20 + readonly property int crTreatmentFontSize : 30 + readonly property int crTreatmentTableFontSize : 24 }