Index: leahi.qrc
===================================================================
diff -u -r0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29 -rac81e21684bfb1c72b8ef86bfeda04e174e5066e
--- leahi.qrc (.../leahi.qrc) (revision 0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29)
+++ leahi.qrc (.../leahi.qrc) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e)
@@ -192,7 +192,6 @@
sources/gui/qml/components/SubStepIndicator.qml
sources/gui/qml/components/SDCInfo.qml
sources/gui/qml/components/BaseChart.qml
- sources/gui/qml/components/HelpNotification.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
Fisheye: Tag ac81e21684bfb1c72b8ef86bfeda04e174e5066e refers to a dead (removed) revision in file `sources/gui/qml/components/HelpNotification.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/compounds/AutoStepController.qml
===================================================================
diff -u -r19acf57838bc97979052d626f3e05d46310b6335 -rac81e21684bfb1c72b8ef86bfeda04e174e5066e
--- sources/gui/qml/compounds/AutoStepController.qml (.../AutoStepController.qml) (revision 19acf57838bc97979052d626f3e05d46310b6335)
+++ sources/gui/qml/compounds/AutoStepController.qml (.../AutoStepController.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e)
@@ -1,19 +1,14 @@
-// Qt
import QtQuick 2.12
-// Qml imports
-import "qrc:/globals"
import "qrc:/components"
+import "qrc:/globals"
-IconButton { id : _root
+Item { id: _root
property int interval : 5000
property bool isPlaying : false // initial state
- iconImageSource : _root.isPlaying ? "qrc:/images/iPause" : "qrc:/images/iPlay"
- isDefault : true
+ height : 35
- onClicked : _root.isPlaying = ! _root.isPlaying
-
signal triggered()
Timer { id: _stepTimer
@@ -23,4 +18,30 @@
onTriggered : _root.triggered()
}
+
+ IconButton { id : _button
+ anchors.verticalCenter : _root.verticalCenter
+ iconImageSource : _root.isPlaying ? "qrc:/images/iPause" : "qrc:/images/iPlay"
+ isDefault : true
+
+ onClicked : _root.isPlaying = ! _root.isPlaying
+ }
+
+
+ Text { id: _helpText
+ anchors {
+ left : _button.right
+ leftMargin : Variables.defaultMargin
+ verticalCenter : _root.verticalCenter
+ }
+
+ text : qsTr("Tap step to view image, or press play to cycle.")
+ color : "#3682ED"
+ font {
+ pixelSize : 30
+ weight : Font.Medium
+ }
+
+ wrapMode: Text.WordWrap
+ }
}
Index: sources/gui/qml/compounds/InstructionView.qml
===================================================================
diff -u -r0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29 -rac81e21684bfb1c72b8ef86bfeda04e174e5066e
--- sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision 0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29)
+++ sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e)
@@ -31,22 +31,12 @@
radius : Variables.alarmDialogRadius
clip : true
- onVisibleChanged: if (visible) { _autoStepControl.isPlaying = false }
+ onVisibleChanged: if (visible) { _autoStepController.isPlaying = false }
- AutoStepController { id: _autoStepControl
- anchors {
- left : parent.left
- leftMargin : Variables.defaultMargin * 3
- verticalCenter : _title.verticalCenter
- }
-
- onTriggered : _root.currentIndex = (_root.currentIndex + 1) % _instrutionSteps.count
- }
-
Text { id: _title
anchors {
- left : _autoStepControl.right
- leftMargin : Variables.defaultMargin * 2 // with current resolution this makes the screen look nice
+ left : parent.left
+ leftMargin : Variables.defaultMargin * 3 // with current resolution this makes the screen look nice
top : parent.top
topMargin : Variables.defaultMargin * 2 // with current resolution this makes the screen look nice
}
@@ -59,23 +49,26 @@
Item { id: _instructionContainer
anchors {
right : _root.right
- left : _autoStepControl.left
+ left : _title.left
top : _title.bottom
bottom : _root.bottom
}
- HelpNotification { id: _infoItem
+ AutoStepController { id: _autoStepController
anchors {
left : parent.left
top : parent.top
- topMargin : Variables.defaultMargin
+ topMargin : Variables.defaultMargin * 2
}
+ width : parent.width / 2
+
+ onTriggered : _root.currentIndex = (_root.currentIndex + 1) % _instrutionSteps.count
}
Column { id: _contentColumn
anchors {
- top : _infoItem.bottom
- topMargin : Variables.defaultMargin
+ top : _autoStepController.bottom
+ topMargin : Variables.defaultMargin * 2.5
}
spacing : 5
Index: sources/gui/qml/dialogs/NotificationDialog.qml
===================================================================
diff -u -r19acf57838bc97979052d626f3e05d46310b6335 -rac81e21684bfb1c72b8ef86bfeda04e174e5066e
--- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 19acf57838bc97979052d626f3e05d46310b6335)
+++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e)
@@ -124,7 +124,7 @@
bottom : _timerRect.top
}
- AutoStepController { id: _autoStepControl
+ AutoStepController { id: _autoStepController
anchors {
left : parent.left
leftMargin : Variables.defaultMargin * 4
@@ -135,17 +135,9 @@
onTriggered : _listView.currentIndex = (_listView.currentIndex + 1) % _listView.count
}
- HelpNotification { id: _infoItem
- anchors {
- left : _autoStepControl.right
- leftMargin : Variables.defaultMargin * 2
- verticalCenter : _autoStepControl.verticalCenter
- }
- }
-
ListView {id: _listView
anchors {
- top : _infoItem.bottom
+ top : _autoStepController.bottom
topMargin : Variables.defaultMargin * 3
bottom : parent.bottom
left : parent.left
Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
===================================================================
diff -u -r19acf57838bc97979052d626f3e05d46310b6335 -rac81e21684bfb1c72b8ef86bfeda04e174e5066e
--- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision 19acf57838bc97979052d626f3e05d46310b6335)
+++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e)
@@ -68,7 +68,7 @@
}
Row { id: _buttonRow
- spacing : Variables.defaultMargin * 2
+ spacing : Variables.defaultMargin * 1.5
anchors {
verticalCenter : _title.verticalCenter
right : parent.right
@@ -77,14 +77,16 @@
IconButton { id : _pauseResume
visible : showPauseResume
+ iconSize : 25
+ extraSpace : 30
iconImageSource : _root.isPaused ? "qrc:/images/iPlay" : "qrc:/images/iPause"
isDefault : true
onClicked : _root.pauseResumeClicked()
}
IconButton {id : _vitals
visible : showVitals
-
+ iconImageSource : "qrc:/images/iVitals"
onClicked : _root.vitalsClicked()
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
===================================================================
diff -u -r1286d74bd015276aab604808be2766136091c125 -rac81e21684bfb1c72b8ef86bfeda04e174e5066e
--- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision 1286d74bd015276aab604808be2766136091c125)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e)
@@ -29,7 +29,7 @@
TreatmentSection { id: _root
property bool editEnabled : true
- header.title : qsTr("Treatment Parameters")
+ header.title : qsTr("Treatment Settings")
header.showLock : true
contentItem: Row { id : _row
Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -r1286d74bd015276aab604808be2766136091c125 -rac81e21684bfb1c72b8ef86bfeda04e174e5066e
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 1286d74bd015276aab604808be2766136091c125)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e)
@@ -46,9 +46,10 @@
property string notificationText: isComplete ? qsTr("Treatment Complete") :
isPaused ? qsTr("Treatment Paused") :
- isHDTreatment ? qsTr("HD Time") :
- isHDFTreatment ? qsTr("HDF Time") :
- isIsoTreatment ? qsTr("Isolated UF Time") :
+ isHDTreatment ? qsTr("HD Mode") :
+ isHDFTreatment ? ("%1\n%2").arg(qsTr("HDF Mode"))
+ .arg(vTreatmentRanges.hdfTreatmentModeOptions[vTreatmentCreate.hdfTreatmentMode]) :
+ isIsoTreatment ? qsTr("Isolated UF Mode") :
""
property color notificationColor: isComplete ? Colors.statusComplete :
Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
===================================================================
diff -u -r19acf57838bc97979052d626f3e05d46310b6335 -rac81e21684bfb1c72b8ef86bfeda04e174e5066e
--- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 19acf57838bc97979052d626f3e05d46310b6335)
+++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e)
@@ -162,7 +162,6 @@
color : _root.paused ? Colors.statusTextPaused : Colors.offWhite
font.pixelSize : 40
font.weight : Font.DemiBold
-
}
Text { id: _volumeRemovedText
Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
===================================================================
diff -u -r31b1e7a5d69f014398827e16286f28515cd60e35 -rac81e21684bfb1c72b8ef86bfeda04e174e5066e
--- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 31b1e7a5d69f014398827e16286f28515cd60e35)
+++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e)
@@ -30,8 +30,11 @@
readonly property string bloodSDSeparator: "/"
header.title : qsTr("Vitals" )
+ header.showVitals : true
contentArea.anchors.topMargin : 0
+ onVitalsClicked: print("onVitalsClicked")
+
contentItem: Column { id: _content
spacing : Variables.defaultMargin * 4.5