Index: leahi.qrc
===================================================================
diff -u -r67557d6769a1719e2a1c068303bda9816075dd84 -rb04fa0fce565a52305f2153f2cb6c5858453ab15
--- leahi.qrc (.../leahi.qrc) (revision 67557d6769a1719e2a1c068303bda9816075dd84)
+++ leahi.qrc (.../leahi.qrc) (revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
@@ -44,6 +44,7 @@
sources/gui/qml/dialogs/headerbar/WiFiDialog.qml
+ sources/gui/qml/dialogs/headerbar/StorageDialog.qml
sources/gui/qml/dialogs/headerbar/SettingsDialog.qml
@@ -96,6 +97,7 @@
resources/images/CloudSync.png
resources/images/Information.png
resources/images/Storage.png
+ resources/images/help.png
sources/gui/qml/components/MainMenu.qml
@@ -143,14 +145,12 @@
sources/gui/qml/components/DebugDataColumn.qml
sources/gui/qml/components/RangeSlider.qml
sources/gui/qml/components/MuteButton.qml
- sources/gui/qml/components/UpDownButton.qml
sources/gui/qml/components/ImageText.qml
sources/gui/qml/components/WaitDone.qml
sources/gui/qml/components/TimeCircle.qml
sources/gui/qml/components/Footer.qml
sources/gui/qml/components/TextEntry.qml
sources/gui/qml/components/ScrollBar.qml
- sources/gui/qml/compounds/Fader.qml
sources/gui/qml/components/FooterStatic.qml
sources/gui/qml/components/TimeEntry.qml
sources/gui/qml/components/Label.qml
@@ -162,6 +162,7 @@
sources/gui/qml/components/ArrowButton.qml
sources/gui/qml/components/HeaderBar.qml
sources/gui/qml/components/HeaderBarPopup.qml
+ sources/gui/qml/components/AlarmButtonRow.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r8144efe22a7a15f19e6e958a40b3360096c84c49 -rb04fa0fce565a52305f2153f2cb6c5858453ab15
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 8144efe22a7a15f19e6e958a40b3360096c84c49)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
@@ -17,6 +17,23 @@
GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.2) }
}
+ MouseArea { id: _mouseArea
+ anchors.fill : parent
+ // TODO: disable this later. this is only for diagnostic purpose.
+ onDoubleClicked : {
+ if ( _GuiView.dryDemoMode ) {
+ let dryDemoTempID = 99
+ let id = vConfirm.id
+ vConfirm.id = dryDemoTempID
+ vConfirm.doConfirm( true )
+ vConfirm.id = id
+ }
+ else {
+ _diagnosticsDialog.open()
+ }
+ }
+ }
+
Item { id: _dateTimeItem
width : Variables.headerBarDateTimeWidth
anchors {
@@ -95,7 +112,7 @@
highlightHeight : 15
isMainTreatment : true
- onHiddenChanged: if (hidden) { index = 0 }
+ onHiddenChanged: { if (hidden) { index = 0 } }
}
Row { id: _headerButtonRow
@@ -112,7 +129,7 @@
iconImageSource : "qrc:/images/iPrescription"
extraSpace : _headerButtonRow.spacing
- onPressed: print("Prescription button pressed!")
+ onPressed : print("Prescription button pressed!")
}
IconButton { id : _wifiButton
@@ -127,23 +144,23 @@
iconImageSource : "qrc:/images/iBluetooth"
extraSpace : _headerButtonRow.spacing
- onPressed: print("Bluetooth button pressed!")
+ onPressed : print("Bluetooth button pressed!")
}
IconButton { id : _cloudSyncButton
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iCloudSync"
extraSpace : _headerButtonRow.spacing
- onPressed: print("CloudSync button pressed!")
+ onPressed : print("CloudSync button pressed!")
}
IconButton { id : _storageButton
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iStorage"
extraSpace : _headerButtonRow.spacing
- onPressed: print("Storage button pressed!")
+ onPressed : _storageDialog.openDialog(_storageButton)
}
IconButton { id : _settingsButton
@@ -159,7 +176,7 @@
iconImageSource : "qrc:/images/iInformation"
extraSpace : _headerButtonRow.spacing
- onPressed: print("Information button pressed!")
+ onPressed : print("Information button pressed!")
}
}
}
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -rc65859e54930664100dfdff13afa019e05ae23b6 -rb04fa0fce565a52305f2153f2cb6c5858453ab15
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision c65859e54930664100dfdff13afa019e05ae23b6)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
@@ -55,6 +55,9 @@
readonly property color backgroundUltrafiltrationButton : "#31568F"
readonly property color textValueUltrafiltrationButtonFg: "#98aec2"
readonly property color dialogText : "#343434"
+ readonly property color alarmDialogText : "#343434"
+ readonly property color alarmDialogGreyText : "#838080"
+ readonly property color alarmDialog : "#FEFEFE"
readonly property color dialogShadowColor : "#334E759C"
readonly property color dialogValueColor : "#3D8EEF"
@@ -116,7 +119,7 @@
readonly property color textNotificationHighBg : red
readonly property color textNotificationHighFg : white
- readonly property color alarmTopBarHighBg : "#831913"
+ readonly property color alarmTopBarHighBg : red
readonly property color alarmTopBarHighFg : white
readonly property color alarmTopBarMedBg : "#db8f00"
@@ -151,25 +154,25 @@
case GuiActions.ALARM_PRIORITY_HIGH:
titleBg = alarmTopBarHighBg
titleFg = alarmTopBarHighFg
- contentBg = textNotificationHighBg
+ contentBg = white
contentFg = textNotificationHighFg
break
case GuiActions.ALARM_PRIORITY_MEDIUM:
titleBg = alarmTopBarMedBg
titleFg = alarmTopBarMedFg
- contentBg = textNotificationMedBg
+ contentBg = white
contentFg = textNotificationMedFg
break
case GuiActions.ALARM_PRIORITY_LOW:
titleBg = alarmTopBarLowBg
titleFg = alarmTopBarLowFg
- contentBg = textNotificationLowBg
+ contentBg = white
contentFg = textNotificationLowFg
break
default : // GuiActions.ALARM_PRIORITY_NONE
titleBg = backgroundButtonSelect
titleFg = textMain
- contentBg = backgroundDialog
+ contentBg = white
contentFg = textMain
}
return [titleBg ,
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r67557d6769a1719e2a1c068303bda9816075dd84 -rb04fa0fce565a52305f2153f2cb6c5858453ab15
--- sources/gui/qml/main.qml (.../main.qml) (revision 67557d6769a1719e2a1c068303bda9816075dd84)
+++ sources/gui/qml/main.qml (.../main.qml) (revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
@@ -324,26 +324,11 @@
anchors.top: parent.top
}
- SDCProgressItem { id: _sdcProgressItem
- // TODO: disable this later. this is only for diagnostic purpose.
- onDoubleClicked : {
- if ( _GuiView.dryDemoMode ) {
- let dryDemoTempID = 99
- let id = vConfirm.id
- vConfirm.id = dryDemoTempID
- vConfirm.doConfirm( true )
- vConfirm.id = id
- }
- else {
- _diagnosticsDialog.open()
- }
- }
- }
-
// keyboard should always be before AlarmItem to not to covet it.
KeyboardItem { id: _keyboard }
WiFiDialog { id: _wifiDialog }
+ StorageDialog { id: _storageDialog }
SettingsDialog { id: _settingsDialog }
LockDialog { id: _lockDialog }
AlarmItem { id: _alarmItem ; z: 996 }
@@ -355,14 +340,13 @@
// then cannot be anchored.
NotificationBar { id: _alarmBar
anchors.bottom : _mainMenu.top
- backgroundColor : _alarmItem.backgroundColor
+ color : _alarmItem.backgroundColor
textColor : _alarmItem.textColor
alarmID : _alarmItem.alarm_AlarmID
text : _alarmItem.title
textPixelSize : Fonts.fontPixelAlarmBarTitle
isSilenced : _alarmItem.isSilenced
timeout : _alarmItem.timeout
- backgroundFading : vTDOpMode.fault
z : 995
}