Index: sources/gui/qml/components/NotificationBarSmall.qml =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -r96d3da12ee7760f0d97fd7c2e9e89e56bcdcf6b1 --- sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision 96d3da12ee7760f0d97fd7c2e9e89e56bcdcf6b1) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 NotificationBarSmall.qml * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Peter Lucia * \date (original) 25-Jun-2020 - * + * */ // Qt @@ -50,8 +50,8 @@ spacing: 10 Image { id: _image anchors.verticalCenter: parent.verticalCenter - width : imageAutoSize ? Math.min(_root.height, _root.width) : Variables.notificationIconSize - height: imageAutoSize ? Math.min(_root.height, _root.width) : Variables.notificationIconSize + width : source == "" ? 0 : imageAutoSize ? Math.min(_root.height, _root.width) : Variables.notificationIconSize + height: source == "" ? 0 : imageAutoSize ? Math.min(_root.height, _root.width) : Variables.notificationIconSize } Text { id: _text color : Colors.textNotificationNoneFg Index: sources/model/MAbstract.cpp =================================================================== diff -u -r15de0cd12dad1ea5107c52e5ed89280bc9e29b1d -r96d3da12ee7760f0d97fd7c2e9e89e56bcdcf6b1 --- sources/model/MAbstract.cpp (.../MAbstract.cpp) (revision 15de0cd12dad1ea5107c52e5ed89280bc9e29b1d) +++ sources/model/MAbstract.cpp (.../MAbstract.cpp) (revision 96d3da12ee7760f0d97fd7c2e9e89e56bcdcf6b1) @@ -58,7 +58,11 @@ * \return String */ QString MAbstract::description() const { - return _typeText[typeText()] + _delimiter + _unitText[unitText()] + _delimiter + infoText(); + // FIXME: + // not all the received messages are inherited form MAbstract + // also LOG_EVENT is adding E + // so for now let LOG_EVENT add E until all the received messages inherit from MAbstract + return /*_typeText[typeText()] + _delimiter +*/ _unitText[unitText()] + _delimiter + infoText(); } Index: sources/view/vtreatmentadjustmentresponsebase.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r96d3da12ee7760f0d97fd7c2e9e89e56bcdcf6b1 --- sources/view/vtreatmentadjustmentresponsebase.h (.../vtreatmentadjustmentresponsebase.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/view/vtreatmentadjustmentresponsebase.h (.../vtreatmentadjustmentresponsebase.h) (revision 96d3da12ee7760f0d97fd7c2e9e89e56bcdcf6b1) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmentadjustmentresponsebase.h * \author (last) Behrouz NemaiPour * \date (last) 08-Jun-2020 * \author (original) Behrouz NemaiPour * \date (original) 08-Jun-2020 - * + * */ #pragma once @@ -46,6 +46,8 @@ PROPERTY( bool , adjustment_Accepted , 0) + Q_PROPERTY(QString adjustment_ReasonText READ text NOTIFY adjustment_ReasonChanged) + VIEW_DEC_CLASS(VTreatmentAdjustmentResponseBase) private: