Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -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) 2019-2022 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 ModalDialog.qml - * \date 2019/10/21 - * \author Behrouz NematiPour + * \author (last) Behrouz NematiPour + * \date (last) 18-Jun-2021 + * \author (original) Behrouz NematiPour + * \date (original) 21-Oct-2019 * */ @@ -24,18 +25,25 @@ * \brief The parent item for modal dialogs */ Dialog { id : _root + contentItem.objectName: "ModalDialog" //SquishQt testability + property bool autoHide : false property int autoHideDuration : 1000 + property alias backgroundColor : _backgroundRect.color + property alias textColor : _notification.textColor + property alias border : _backgroundRect.border + property alias radius : _backgroundRect.radius property alias notificationText : _notification.text + property alias notification : _notification width : Variables.dialogWidth height : Variables.dialogHeight visible : false anchors.centerIn: parent - enter: Transition { NumberAnimation { property: "opacity"; from: 0.0; to: 1.0 } } - exit : Transition { NumberAnimation { property: "opacity"; from: 1.0; to: 0.0 } } + enter: Transition { NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 200 } } + exit : Transition { NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 200 } } modal: true @@ -45,7 +53,6 @@ color: Colors.borderDialog } - background: Rectangle { id: _backgroundRect color : Colors.backgroundDialog radius: Variables.dialogRadius @@ -68,5 +75,5 @@ } } - NotificationBar { id: _notification } + NotificationBarSmall { id: _notification } }