Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -r5f4b3aacfede4aa545a44c7f3b33ca649b81aac7 -r0ced87f43c28bcc9f3402e19284030ad1405e9e8 --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 5f4b3aacfede4aa545a44c7f3b33ca649b81aac7) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 0ced87f43c28bcc9f3402e19284030ad1405e9e8) @@ -21,7 +21,6 @@ // Project // Qml imports import "qrc:/globals" -import "qrc:/compounds" /*! * \brief The parent item for modal dialogs @@ -38,7 +37,8 @@ property alias notificationText : _notification.text property alias notification : _notification property bool showDropShadow : false - property alias numPad : _numPad + property alias backgroundItem : _backgroundItem.children + property alias backgroundItemZ : _backgroundItem.z width : Variables.dialogWidth height : Variables.dialogHeight @@ -77,11 +77,8 @@ anchors.fill : _backgroundRect } - NumPad { id: _numPad - x : _root.width - _numPad.width - y : 0 - onCancel : _numPad.hide() - } + // 👇 Placeholder for an injected component. Ex. numpad + Item { id: _backgroundItem } } onVisibleChanged: { Index: sources/gui/qml/compounds/NumPad.qml =================================================================== diff -u -r41a604f3fe3a5bb40bddd8c06e5fe88df85e3997 -r0ced87f43c28bcc9f3402e19284030ad1405e9e8 --- sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision 41a604f3fe3a5bb40bddd8c06e5fe88df85e3997) +++ sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision 0ced87f43c28bcc9f3402e19284030ad1405e9e8) @@ -43,7 +43,6 @@ color : Colors.backgroundMain x : Math.round((Variables.applicationWidth - _root.width) / 2) y : Math.round((Variables.applicationHeight - _root.height) / 2) - z : isOpened ? 0 : -1 onVisibleChanged : if ( ! _root.visible ) { reset() } onDisplayValueChanged : if ( _root.setter ) { _root.setter( _valueLabel.text ) } onSettingValueChanged : _valueLabel.text = _root.settingValue !== undefined ? _root.settingValue : "" Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -rfcbac06bdb6ec780d34ee273ea83da6a3a3973e9 -r0ced87f43c28bcc9f3402e19284030ad1405e9e8 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision fcbac06bdb6ec780d34ee273ea83da6a3a3973e9) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 0ced87f43c28bcc9f3402e19284030ad1405e9e8) @@ -29,9 +29,18 @@ width : 1000 x : numPad.isOpened ? Math.round((Variables.applicationWidth - width) / 2) - 200 : Math.round((Variables.applicationWidth - width) / 2) - notification.textfontSize: 20 - notification.visible: vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText + notification.textfontSize : 20 + notification.visible : vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText + backgroundItemZ : numPad.isOpened ? 0 : -1 + backgroundItem : [ NumPad { id: _numPad + x : _root.width - _numPad.width + y : 0 + onCancel: _numPad.hide() + } ] + + property alias numPad : _numPad + readonly property string intervalTextString : qsTr("Interval:" ) + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) + " , " Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -r5f4b3aacfede4aa545a44c7f3b33ca649b81aac7 -r0ced87f43c28bcc9f3402e19284030ad1405e9e8 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 5f4b3aacfede4aa545a44c7f3b33ca649b81aac7) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 0ced87f43c28bcc9f3402e19284030ad1405e9e8) @@ -30,7 +30,7 @@ void View::VTreatmentVitals::initConnections() { connect(this, SIGNAL( intervalChanged (const quint8 &)), this, SLOT(onIntervalChanged ( ))); - ACTION_RECEIVE_BRIDGE_CONNECTION( Gui::_GuiController, TreatmentVitalsData); + ACTION_VIEW_CONNECTION( TreatmentVitalsData ); } /*!