sources

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Fixed the save issue.

  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -19
    • +19
    ./model/hd/alarm/MAlarmMapping.cpp
DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Fixed the issue with the kyeValue of different categories overwriting by adding the category as the top level.

- I still have issue in saving for the settings, which writes duplicate.

    • -29
    • +25
    ./view/hd/alarm/VAlarmStatus.cpp
  1. … 1 more file in changeset.
DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Code preparation for the implementation.

  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 14 more files in changeset.
Merge branch 'DEN-13965-UI-BN-S80' into staging

  1. … 2 more files in changeset.
DEN-13939: IMP: Fixed the merge issue

- Not sure why git didn't get the changes on the ModalDialog's Norification changes to NotificationSmall, and caused the issue on the property IconVisible.

Bamboo Commit: Updated MAlarmMapping.cpp

Merge branch 'DEN-13965-UI-BN-S80' into develop

  1. … 1 more file in changeset.
DEN-13939: IMP: Implementation of the the message [0xBB00]

DEN-13939: IMP: Implementation of the the message [0xBA00]

Messaging:

- Modified the message 0xBB00 required length from 3xU32 to 2xU32

- Renamed the VConfrimDialog to VConfirm, since the view class is not the actual dialog implementation.

- Merged the vPowerOff view to the VConfrim, and removed the VPowerOff view classes.

Alarm Integration:

- AlarmItem: add the hasAlarm to theAlarmMinimize as well to prevent the AlarmBar being visible when there is no active alarm.

- VAlarmStatus: fixed the issue with the hasAlarm property which was causing the AlarmDialog being visible while there was not active alarm.

Confirm Dialog:

- Used the PowerItem.qml and the PowerOff Dialog for Generic Confirm, and improved the code to be repurposed.

- Footer: updated the Footer component to be able to re-layout the touchrects without an open/close cycle.

- TouchRect: exposed the the buttons text.

    • -0
    • +107
    ./view/confirm/VConfirm.cpp
    • -0
    • +69
    ./view/confirm/VConfirm.h
  1. … 5 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +24
    ./model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 81 more files in changeset.
Merge branch 'DEN-13198-UI_BN_75' into staging

  1. … 31 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -11
    • +11
    ./model/hd/alarm/MAlarmMapping.cpp
DEN-13939: IMP: Implementation of the the message [0xBA00]

- The Model/View are implemented and exposed to QML.

    • -0
    • +49
    ./model/confirm/MDuetConfirmHDi.cpp
    • -0
    • +85
    ./model/confirm/MDuetConfirmHDi.h
    • -0
    • +46
    ./view/confirm/VConfirmDialog.cpp
    • -0
    • +56
    ./view/confirm/VConfirmDialog.h
  1. … 4 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 86 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Merge branch 'DEN-12640-UI-BN-S79' into develop

Merge branch 'Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging' into develop

DEN-12640: UI: Pressure readings on blood prime / rinseback

- Added bottom line separators.