Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -reaf21ffe52c818b4c8abdb2084582ada9dc78ceb -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision eaf21ffe52c818b4c8abdb2084582ada9dc78ceb) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) @@ -7,7 +7,7 @@ * * \file PostTreatmentReview.qml * \author (last) Behrouz NematiPour - * \date (last) 03-Mar-2022 + * \date (last) 18-Mar-2022 * \author (original) Behrouz NematiPour * \date (original) 21-Apr-2021 * @@ -36,19 +36,33 @@ header.confirmText.text: qsTr("NEXT") - ExportButton { + ExportButton { id: _exportButton + isSmall : true anchors.top : parent.top anchors.left : parent.left - exportFunction : vPostTreatmentAdjustmentTreatmentLog.doExport - enabled : vPostTreatmentAdjustmentTreatmentLog.isIdle && _GuiView.usbReady + enabled : vPostTreatmentAdjustmentTreatmentLog.isIdle && _GuiView.usbIsReady + onClicked : vPostTreatmentAdjustmentTreatmentLog.doExport() } + USBButton { id: _usbButton + anchors.top : _exportButton.top + anchors.left : _exportButton.right + anchors.leftMargin: Variables.minVGap + } ScrollBar { anchors.fill: _flickable flickable : _flickable backColor : Colors.backgroundDialog } + Label { id: _txCode + anchors.bottom : _flickable.top + anchors.left : _flickable.left + width : _flickable.width + text : qsTr("Code: ") + vPostTreatmentAdjustmentTreatmentLog.txCode + font.pixelSize : Fonts.fontPixelButton + } + Flickable { id: _flickable clip: true anchors { @@ -96,6 +110,7 @@ onItemClicked: _root.itemClicked(vIndex) } } - reasonText: vPostTreatmentAdjustmentTreatmentLog.text() + reasonText : vPostTreatmentAdjustmentTreatmentLog.text() + informationText : vPostTreatmentAdjustmentTreatmentLog.notification }