application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-11539: Service password initial setup

- removed the console log debug line

DEN-11539: Service password initial setup

- added hashing for the service password and did some clean up.

- improved the navigation

- made the service password mandatory to navigate to the service menu, so HD message can't navigate the UI to service screen without user entering the password.

    • -10
    • +9
    /sources/gui/qml/pages/UserConfirmation.qml
    • -20
    • +56
    /sources/view/settings/VSettings.cpp
DEN-14955 ServicePassword - Add secondary password line input to userConfirmation - Add logic for checking password entry - Add a mock encrypt function to signify needing encryption

    • -4
    • +48
    /sources/gui/qml/pages/UserConfirmation.qml
DEN-14955 Service Password - Add a validation CPP function for QML to call to check entry conforms to rules

    • -0
    • +27
    /sources/view/settings/VSettings.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -2
    • +2
    /sources/gui/qml/components/ConfirmButton.qml
    • -2
    • +2
    /sources/gui/qml/components/ProgressRect.qml
    • -2
    • +2
    /sources/gui/qml/components/RangeRect.qml
    • -2
    • +2
    /sources/gui/qml/components/RangeSlider.qml
    • -2
    • +2
    /sources/gui/qml/components/ScrollBar.qml
    • -2
    • +2
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/gui/qml/components/SliderArrows.qml
    • -2
    • +2
    /sources/gui/qml/components/TextRect.qml
    • -1
    • +1
    /sources/gui/qml/components/TickMarks.qml
    • -2
    • +2
    /sources/gui/qml/components/TouchRect.qml
    • -2
    • +2
    /sources/gui/qml/globals/Variables.qml
  1. … 12 more files in changeset.
Merge branch 'DEN-14937-UI-VD-S93' into staging

DEN-14955 Quick Start - Arrows - Re-instate the press and hold automatic increment/decrement of the sliderArrows

    • -31
    • +23
    /sources/gui/qml/components/SliderArrows.qml
    • -0
    • +2
    /sources/gui/qml/components/TouchRect.qml
    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
Merge branch 'DEN-14937-UI-VD-S93' of ssh://dvm-linux02:7999/ui/application into DEN-14937-UI-VD-S93

    • -4
    • +22
    /sources/gui/qml/components/RangeSlider.qml
DEN-14955 Quick Start Arrows - Fix Arrow +/- to follow non-arrow control logic for RangeSlider - Fix missed removed _private object in Slider

    • -2
    • +16
    /sources/gui/qml/components/RangeSlider.qml
    • -3
    • +3
    /sources/gui/qml/components/Slider.qml
DEN-14955 Quick Start - sliders - Clean up of code to remove displayedValue and also the valueUpdateComplete signal

    • -36
    • +29
    /sources/gui/qml/components/Slider.qml
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-14866-UI-BN-S92-3' into staging

DEN-14955 Quick Start Sliders

- RangeSliders : Added an if block in case for the first time (not adjusted yet) the value is not changed (still on def value), to force the valueChanged emit.

- Fixed the PreTreatmentConfirm display value for the Blood Pressure interval OFF state.

    • -4
    • +22
    /sources/gui/qml/components/RangeSlider.qml
DEN-14955 Quick Start Sliders - Re-add back the negating of the check state

DEN-14955 Quick Start Sliders - Correct label for switch state on slider

DEN-14955 Quick Start Sliders - Add signal to set values when using arrows

    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
DEN-14955 Quick Start - Sliders - Update placement and color of the range slider of pressure screen

    • -2
    • +3
    /sources/gui/qml/components/RangeSlider.qml
DEN-14955 Quick Start - Sliders - Add arrows to rangeSliders for pressure screen

    • -2
    • +47
    /sources/gui/qml/components/RangeSlider.qml
    • -0
    • +2
    /sources/gui/qml/components/TextRect.qml
DEN-14955 Quick Start - Sliders - Correct slider handle sizing inconsistency between range and single sliders - Add property to set tickmark location to slider

    • -9
    • +17
    /sources/gui/qml/components/RangeSlider.qml
    • -2
    • +2
    /sources/gui/qml/globals/Variables.qml
DEN-14955 Quick Start - Sliders - Correct switch and slider active state - Correct the spelling of a color variable

    • -6
    • +8
    /sources/gui/qml/components/Slider.qml
DEN-14955 Quick Start - Sliders - Remove UF slider's dark background - Update Flow slider behavior to be active when arrow changes value - Change look of InTx Pressure sliders to be rounded

    • -1
    • +1
    /sources/gui/qml/components/RangeSlider.qml
    • -9
    • +12
    /sources/gui/qml/components/Slider.qml
DEN-14955 Quick Start - Slider - Correct the color scheme for the tickMarks to match border colors

    • -1
    • +2
    /sources/gui/qml/components/RangeSlider.qml
    • -0
    • +1
    /sources/gui/qml/components/Slider.qml
DEN-14955 Quick Start - Sliders - Modify RangeSlider to active on pressing on slider body

    • -19
    • +7
    /sources/gui/qml/components/RangeSlider.qml