Index: main.cpp =================================================================== diff -u -r4e38f708244b0118abcf7e616af24aa8be3776b2 -rb543920c939d90945b271985dd9fbbae67e60b83 --- main.cpp (.../main.cpp) (revision 4e38f708244b0118abcf7e616af24aa8be3776b2) +++ main.cpp (.../main.cpp) (revision b543920c939d90945b271985dd9fbbae67e60b83) @@ -352,6 +352,11 @@ * and revision(build) version will be set to current date/time. */ void setApplicationVersion() { + const char sepRels = '-'; + const char sepVers = '.'; + const char sepComp = '-'; + + bool isOnServer = true; QString ver_major = QString("%1").arg(VER_MAJOR ); QString ver_minor = QString("%1").arg(VER_MINOR ); @@ -379,14 +384,15 @@ if ( isRelease ) { ver_branch = ver_branch.remove(0,QString("release/").length()).toUpper(); } - ver_major += '.'; - ver_minor += '.'; - ver_micro += '.'; + ver_major += sepVers; + ver_minor += sepVers; + ver_micro += sepVers; } } - if ( ! ver_branch.isEmpty()) ver_branch += '.'; - ver_comp = "-" + ver_comp; + if ( ! ver_branch.isEmpty()) ver_branch += sepRels; + ver_comp = sepComp + ver_comp; + QString version = ""; version += ver_branch ; version += ver_major ; Index: sources/gui/qml/components/TouchRect.qml =================================================================== diff -u -r4714af95cde20bc704971c6749a288a21979c24f -rb543920c939d90945b271985dd9fbbae67e60b83 --- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 4714af95cde20bc704971c6749a288a21979c24f) +++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision b543920c939d90945b271985dd9fbbae67e60b83) @@ -29,7 +29,7 @@ property alias pixelSize : _text.font.pixelSize property alias fgColor : _text.color //TODO need to update code to use bgColor instead of backgroundColor property -// property alias bgColor : _root.color +// property alias bgColor : _root.color property alias textString : _text.text property bool touchable : true @@ -39,7 +39,7 @@ property bool selected : false property bool fading : false - + property int debouncingTime : 350 readonly property alias isPressed : _mouseArea.pressed property color textColor : Colors.textButton @@ -55,6 +55,12 @@ Colors.backgroundButtonSelectDark : Qt.darker (_root.backgroundColor, 1.15) + Timer { id: clickDebounceTimer + interval: _root.debouncingTime // ms + } + Timer { id: pressDebounceTimer + interval: _root.debouncingTime // ms + } QtObject { id: _private function color() { var mBackgroundColor = _root.backgroundColor @@ -78,6 +84,10 @@ } return _root.borderColor } + + property bool clickDebouncing: clickDebounceTimer.running // if a click/press happens the timer starts, meaning we have to debounce. + property bool pressDebouncing: pressDebounceTimer.running // if a click/press happens the timer starts, meaning we have to debounce. + property bool pressed : false // this will take care of releases happening during debounced press, therefor no release should happen as well. } color : _private.color() @@ -110,6 +120,10 @@ radius : Variables.touchRectRadius border.width: Variables.borderWidth + function onMouseEventLog(vMsg) { + // DEBUG: console.log(vMsg, _text.text, Qt.formatTime(new Date(), "hh:mm:ss.zzz")) + } + Text { id: _text anchors.verticalCenter : parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter @@ -121,9 +135,9 @@ enabled : _root.touchable anchors.fill : parent anchors.margins : touchExpanding * -1 - onClicked : _root.clicked() - onPressed : _root.pressed() - onReleased : _root.released() - onPressAndHold : _root.pressAndHold() + onClicked : { if ( ! _private.clickDebouncing ) { onMouseEventLog("Clicked ") ; _root.clicked (); clickDebounceTimer.start(); } } + onPressed : { if ( ! _private.pressDebouncing ) { onMouseEventLog("Pressed ") ; _private.pressed = true ; _root.pressed (); pressDebounceTimer.start(); } } + onReleased : { if ( _private.pressed ) { onMouseEventLog("Released ") ; _private.pressed = false; _root.released (); pressDebounceTimer.start(); } } + onPressAndHold : { onMouseEventLog("PressAndHold ") ; _root.pressAndHold(); } } } Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r0536992850014cee0a949958ce56c0008615da41 -rb543920c939d90945b271985dd9fbbae67e60b83 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 0536992850014cee0a949958ce56c0008615da41) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision b543920c939d90945b271985dd9fbbae67e60b83) @@ -117,6 +117,16 @@ } // disabled coco end + //// ------ HIDE THE DIALOG - if has NO the alarm ------ + // DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm + if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { + hasAlarm(false); + _alarm_AlarmID = 0; + emit didAlarmEmpty(); + return; + } + + //// ----- SET PROPERTY VALUES ------ // Look for this tag: #First_Time_Message_Sent_With_Silenced // this has to be first to make sure in the Notification dialog when we decided to show the dialog, // we should also consider checking the alarms Silenced and if it is already silenced, @@ -150,29 +160,24 @@ } alarm_Flag_alarmsCondition (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION )); - if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { - hasAlarm(false); - emit didAlarmEmpty(); + hasAlarm(true); + + if ( + // alarm id properties + _alarm_AlarmIDChanged + || _alarm_PriorityChanged + // alarm buttons + || _alarm_Flag_noResumeChanged + || _alarm_Flag_noRinsebackChanged + || _alarm_Flag_noEndTreatmentChanged + || _alarm_Flag_UserMustAckChanged + // alarm cannot be minimized + || ( _alarm_Flag_noMinimizeChanged && _alarm_Flag_noMinimize ) + // alarm is out of silence + || ( _alarm_Flag_alarmsSilencedChanged && ! _alarm_Flag_alarmsSilenced ) + ){ + emit didAlarmRaise(); } - else { - hasAlarm(true); - if ( - // alarm id properties - _alarm_AlarmIDChanged - || _alarm_PriorityChanged - // alarm buttons - || _alarm_Flag_noResumeChanged - || _alarm_Flag_noRinsebackChanged - || _alarm_Flag_noEndTreatmentChanged - || _alarm_Flag_UserMustAckChanged - // alarm cannot be minimized - || ( _alarm_Flag_noMinimizeChanged && _alarm_Flag_noMinimize ) - // alarm is out of silence - || ( _alarm_Flag_alarmsSilencedChanged && ! _alarm_Flag_alarmsSilenced ) - ){ - emit didAlarmRaise(); - } - } } /*! Index: sources/view/settings/VDuetRoWaterDG.h =================================================================== diff -u -r1a9eb2756f33ec0387dd360e5c051ed9a04b9c1c -rb543920c939d90945b271985dd9fbbae67e60b83 --- sources/view/settings/VDuetRoWaterDG.h (.../VDuetRoWaterDG.h) (revision 1a9eb2756f33ec0387dd360e5c051ed9a04b9c1c) +++ sources/view/settings/VDuetRoWaterDG.h (.../VDuetRoWaterDG.h) (revision b543920c939d90945b271985dd9fbbae67e60b83) @@ -84,7 +84,7 @@ TRIGGER ( bool , adjustment , 0) TRIGGER ( bool , status , 0) - PROPERTY( QString , notification , 0) + PROPERTY( QString , notification ,"") VIEW_DEC_CLASS(VDuetRoWaterDG) VIEW_DEC_SLOT(DuetRoWaterStatDGqData)