diff --git a/addons/airway/ACE_Medical_Treatment_Actions.hpp b/addons/airway/ACE_Medical_Treatment_Actions.hpp index 716476f7..5ee389d7 100644 --- a/addons/airway/ACE_Medical_Treatment_Actions.hpp +++ b/addons/airway/ACE_Medical_Treatment_Actions.hpp @@ -13,6 +13,7 @@ class ACEGVAR(medical_treatment,actions) { condition = QUOTE(GVAR(enable) && !(_patient call ACEFUNC(common,isAwake)) && !(alive (_patient getVariable [ARR_2(QQEGVAR(breathing,BVM_Medic),objNull)]))); callbackSuccess = QFUNC(checkAirway); ACM_rollToBack = 1; + ACM_menuIcon = "CheckAirway"; }; class HeadTurn: CheckAirway { @@ -24,6 +25,7 @@ class ACEGVAR(medical_treatment,actions) { condition = QUOTE(GVAR(enable) && !(_patient call ACEFUNC(common,isAwake)) && (_patient getVariable [ARR_2(QQGVAR(AirwayItem_Oral),'')] == '') && !(alive (_patient getVariable [ARR_2(QQEGVAR(breathing,BVM_Medic),objNull)]))); callbackSuccess = QFUNC(performHeadTurn); ACM_cancelRecovery = 1; + ACM_menuIcon = "BeginHeadTiltChinLift"; }; class BeginHeadTiltChinLift: CheckAirway { @@ -35,6 +37,7 @@ class ACEGVAR(medical_treatment,actions) { condition = QUOTE(GVAR(enable) && !(_patient call ACEFUNC(common,isAwake)) && !(_patient getVariable [ARR_2(QQGVAR(HeadTilt_State),false)]) && (_patient getVariable [ARR_2(QQGVAR(AirwayItem_Oral),'')] != 'SGA')); callbackSuccess = QUOTE([ARR_2(_medic,_patient)] call FUNC(beginHeadTiltChinLift)); ACM_cancelRecovery = 1; + ACM_menuIcon = "BeginHeadTiltChinLift"; }; class RecoveryPosition: CheckAirway { @@ -47,6 +50,7 @@ class ACEGVAR(medical_treatment,actions) { condition = QUOTE(GVAR(enable) && !([_patient] call EFUNC(core,cprActive)) && !(_patient call ACEFUNC(common,isAwake)) && (_patient getVariable [ARR_2(QQGVAR(AirwayItem_Oral),'')] != 'SGA') && !(alive (_patient getVariable [ARR_2(QQEGVAR(breathing,BVM_Medic),objNull)])) && !(IN_RECOVERYPOSITION(_patient)) && (isNull objectParent _patient)); callbackSuccess = QUOTE([ARR_3(_medic,_patient,true)] call FUNC(setRecoveryPosition)); ACM_rollToBack = 0; + ACM_menuIcon = "RecoveryPosition"; }; class CancelRecoveryPosition: RecoveryPosition { displayName = CSTRING(CancelRecoveryPosition); diff --git a/addons/breathing/ACE_Medical_Treatment_Actions.hpp b/addons/breathing/ACE_Medical_Treatment_Actions.hpp index 0fdcba8b..2a17a8ae 100644 --- a/addons/breathing/ACE_Medical_Treatment_Actions.hpp +++ b/addons/breathing/ACE_Medical_Treatment_Actions.hpp @@ -13,6 +13,7 @@ class ACEGVAR(medical_treatment,actions) { condition = QUOTE(!(alive (_patient getVariable [ARR_2(QQGVAR(BVM_Medic),objNull)]))); callbackSuccess = QFUNC(checkBreathing); ACM_rollToBack = 1; + ACM_menuIcon = "CheckBreathing"; }; class InspectChest: CheckBreathing { displayName = CSTRING(InspectChest); @@ -25,6 +26,7 @@ class ACEGVAR(medical_treatment,actions) { callbackSuccess = QFUNC(inspectChest); animationMedic = "AinvPknlMstpSnonWnonDr_medic4"; ACM_cancelRecovery = 1; + ACM_menuIcon = "InspectChest"; }; class UseStethoscope: CheckBreathing { displayName = CSTRING(UseStethoscope); @@ -147,7 +149,6 @@ class ACEGVAR(medical_treatment,actions) { consumeItem = 0; condition = QUOTE(GVAR(pneumothoraxEnabled) && !([_patient] call EFUNC(core,cprActive)) && !([_patient] call EFUNC(core,bvmActive)) && (_patient getVariable [ARR_2(QQGVAR(Thoracostomy_State),0)]) == 3); callbackSuccess = QFUNC(Thoracostomy_resealChestTube); - ACM_menuIcon = ""; }; class DrainFluid_ACCUVAC: PerformThoracostomy { @@ -181,7 +182,6 @@ class ACEGVAR(medical_treatment,actions) { items[] = {}; condition = QUOTE(([ARR_3(_medic,_patient,['ACE_surgicalKit'])] call ACEFUNC(medical_treatment,hasItem) || (_patient getVariable [ARR_2(QQGVAR(Thoracostomy_UsedKit),false)])) && !([_patient] call EFUNC(core,cprActive)) && !([_patient] call EFUNC(core,bvmActive)) && (_patient getVariable [ARR_2(QQGVAR(Thoracostomy_State),0)]) > 0); callbackSuccess = QFUNC(Thoracostomy_close); - ACM_menuIcon = ""; }; class PlacePulseOximeter: CheckPulse { diff --git a/addons/circulation/ACE_Medical_Treatment_Actions.hpp b/addons/circulation/ACE_Medical_Treatment_Actions.hpp index 4aebec41..a894677b 100644 --- a/addons/circulation/ACE_Medical_Treatment_Actions.hpp +++ b/addons/circulation/ACE_Medical_Treatment_Actions.hpp @@ -7,6 +7,7 @@ class ACEGVAR(medical_treatment,actions) { allowedSelections[] = {"Head","LeftArm","RightArm","LeftLeg","RightLeg"}; condition = "true"; callbackSuccess = QFUNC(feelPulse); + ACM_menuIcon = "CheckPulse"; }; class PressureCuff_Attach: CheckPulse { diff --git a/addons/core/ACE_Medical_Treatment_Actions.hpp b/addons/core/ACE_Medical_Treatment_Actions.hpp index e1394c36..36892caf 100644 --- a/addons/core/ACE_Medical_Treatment_Actions.hpp +++ b/addons/core/ACE_Medical_Treatment_Actions.hpp @@ -70,6 +70,7 @@ class ACEGVAR(medical_treatment,actions) { class CheckPulse; class CheckResponse: CheckPulse { treatmentTime = 2.5; + ACM_menuIcon = "CheckResponse"; }; class CheckBloodPressure: CheckPulse { displayName = ECSTRING(circulation,CheckCapillaryRefill); @@ -77,6 +78,7 @@ class ACEGVAR(medical_treatment,actions) { allowedSelections[] = {"Body", "LeftArm", "RightArm"}; treatmentTime = 4; callbackSuccess = QEFUNC(circulation,checkCapillaryRefill); + ACM_menuIcon = "CheckCapillaryRefill"; }; class MeasureBloodPressure: CheckBloodPressure { displayName = ECSTRING(circulation,PressureCuff_Measure); @@ -103,6 +105,7 @@ class ACEGVAR(medical_treatment,actions) { condition = QFUNC(canCheckDogtag); callbackSuccess = QACEFUNC(dogtags,checkDogtag); ACM_rollToBack = 1; + ACM_menuIcon = "CheckDogTags"; }; class PressureBandage: BasicBandage { @@ -225,6 +228,7 @@ class ACEGVAR(medical_treatment,actions) { animationMedic = ""; condition = QEFUNC(disability,canInspectForFracture); callbackSuccess = QEFUNC(disability,inspectForFracture); + ACM_menuIcon = "Fracture"; }; class FractureRealignment: Splint { displayName = ECSTRING(disability,FractureRealignment); @@ -239,7 +243,7 @@ class ACEGVAR(medical_treatment,actions) { condition = QEFUNC(disability,canPerformFractureRealignment); litter[] = {}; ACM_rollToBack = 1; - ACM_menuIcon = ""; + ACM_menuIcon = "Fracture"; }; class ApplySAMSplint: Splint { displayName = ECSTRING(disability,ApplySAMSplint); @@ -262,6 +266,9 @@ class ACEGVAR(medical_treatment,actions) { litter[] = {}; ACM_menuIcon = "ACM_SAMSplint"; }; + class PersonalAidKit: BasicBandage { + ACM_menuIcon = "ACE_personalAidKit"; + }; class SurgicalKit: FieldDressing { ACM_menuIcon = "ACE_surgicalKit"; callbackFailure = QUOTE([ARR_2(_medic,_patient)] call EFUNC(damage,surgicalKitCancel)); @@ -328,6 +335,7 @@ class ACEGVAR(medical_treatment,actions) { animationMedic = ""; condition = QUOTE([ARR_4(_patient,_bodyPart,0,-1)] call EFUNC(circulation,hasIV) || [ARR_3(_patient,_bodyPart,0)] call EFUNC(circulation,hasIO)); callbackSuccess = QUOTE([ARR_3(_medic,_patient,_bodyPart)] call EFUNC(circulation,openTransfusionMenu)); + ACM_menuIcon = "OpenTransfusionMenu"; }; // IV Catheter Examination @@ -343,6 +351,7 @@ class ACEGVAR(medical_treatment,actions) { allowSelfTreatment = 1; condition = QUOTE(([ARR_4(_patient,_bodyPart,0,0)] call EFUNC(circulation,hasIV))); callbackSuccess = QUOTE([ARR_4(_medic,_patient,_bodyPart,0)] call EFUNC(circulation,inspectIV)); + ACM_menuIcon = ""; }; class InspectIV_Middle: InspectIV_Upper { displayName = ECSTRING(circulation,InspectIV_Middle); @@ -571,6 +580,7 @@ class ACEGVAR(medical_treatment,actions) { treatmentTime = 1.5; condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake))); callbackSuccess = QEFUNC(disability,shakeAwake); + ACM_menuIcon = "ShakeAwake"; }; class SlapAwake: ShakeAwake { displayName = ECSTRING(disability,SlapAwake); @@ -582,6 +592,7 @@ class ACEGVAR(medical_treatment,actions) { animationMedic = "AinvPknlMstpSnonWnonDr_medic3"; ACM_rollToBack = 1; ACM_ignoreAnimCoef = 1; + ACM_menuIcon = "SlapAwake"; }; class UseSyringe_10: OpenTransfusionMenu { @@ -837,5 +848,6 @@ class ACEGVAR(medical_treatment,actions) { callbackSuccess = QUOTE([ARR_3(_medic,_patient,_usedItem)] call EFUNC(CBRN,washEyes)); animationMedicSelf = ""; ACM_rollToBack = 1; + ACM_menuIcon = "WashEyes"; }; }; \ No newline at end of file diff --git a/addons/gui/ActionButtons.hpp b/addons/gui/ActionButtons.hpp index 3c38d8ed..0001896b 100644 --- a/addons/gui/ActionButtons.hpp +++ b/addons/gui/ActionButtons.hpp @@ -3,9 +3,22 @@ textureNoShortcut = picture; \ } +ACM_MEDICALMENU_ACTION_BUTTON(CheckCapillaryRefill,QPATHTOEF(gui,ui\CheckCapillaryRefill.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(SlapAwake,QPATHTOEF(gui,ui\SlapAwake.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(ShakeAwake,QPATHTOEF(gui,ui\ShakeAwake.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(CheckResponse,QPATHTOEF(gui,ui\CheckResponse.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(CheckAirway,QPATHTOEF(gui,ui\CheckAirway.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(BeginHeadTiltChinLift,QPATHTOEF(gui,ui\BeginHeadTiltChinLift.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(RecoveryPosition,QPATHTOEF(gui,ui\RecoveryPosition.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(CheckDogTags,QPATHTOEF(gui,ui\CheckDogTags.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(CheckBreathing,QPATHTOEF(gui,ui\CheckBreathing.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(InspectChest,QPATHTOEF(gui,ui\InspectChest.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(CheckPulse,QPATHTOEF(gui,ui\CheckPulse.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(WashEyes,QPATHTOEF(gui,ui\WashEyes.paa)); + ACM_MEDICALMENU_ACTION_BUTTON(ACE_tourniquet,QACEPATHTOF(medical_treatment,ui\tourniquet_ca.paa)); ACM_MEDICALMENU_ACTION_BUTTON(ACE_surgicalKit,QACEPATHTOF(medical_treatment,ui\surgicalKit_ca.paa)); -ACM_MEDICALMENU_ACTION_BUTTON(ACE_personalAidKit,QACEPATHTOF(medical_treatment,ui\surgicalKit_ca.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(ACE_personalAidKit,QACEPATHTOF(medical_treatment,ui\personal_aid_kit_ca.paa)); ACM_MEDICALMENU_ACTION_BUTTON(ACE_bodyBag,QACEPATHTOF(medical_treatment,ui\bodybag_ca.paa)); ACM_MEDICALMENU_ACTION_BUTTON(ACE_bodyBag_blue,QACEPATHTOF(medical_treatment,ui\bodybag_blue_ca.paa)); ACM_MEDICALMENU_ACTION_BUTTON(ACE_bodyBag_white,QACEPATHTOF(medical_treatment,ui\bodybag_white_ca.paa)); @@ -13,6 +26,7 @@ ACM_MEDICALMENU_ACTION_BUTTON(ACE_adenosine,QACEPATHTOF(medical_treatment,ui\ade ACM_MEDICALMENU_ACTION_BUTTON(ACE_epinephrine,QACEPATHTOF(medical_treatment,ui\epinephrine_ca.paa)); ACM_MEDICALMENU_ACTION_BUTTON(CPR,QPATHTOEF(core,ui\icon_patient_cpr.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(OpenTransfusionMenu,QPATHTOEF(core,ui\icon_patient_transfusionmenu.paa)); ACM_MEDICALMENU_ACTION_BUTTON(ACE_morphine,QPATHTOEF(core,ui\override\morphine_ca.paa)); ACM_MEDICALMENU_ACTION_BUTTON(ACM_OPA,QPATHTOEF(airway,ui\opa_ca.paa)); @@ -52,6 +66,7 @@ ACM_MEDICALMENU_ACTION_BUTTON(ACM_EmergencyTraumaDressing,QPATHTOEF(damage,ui\et ACM_MEDICALMENU_ACTION_BUTTON(ACM_ElasticWrap,QACEPATHTOF(medical_treatment,ui\elasticbandage_ca.paa)); ACM_MEDICALMENU_ACTION_BUTTON(ACM_SAMSplint,QPATHTOEF(disability,ui\samSplint.paa)); +ACM_MEDICALMENU_ACTION_BUTTON(Fracture,QACEPATHTOF(medical_feedback,data\fracture.paa)); ACM_MEDICALMENU_ACTION_BUTTON(ACM_ATNA_Autoinjector,QPATHTOEF(cbrn,ui\autoinjector_ATNA_ca.paa)); ACM_MEDICALMENU_ACTION_BUTTON(ACM_Midazolam_Autoinjector,QPATHTOEF(cbrn,ui\autoinjector_midazolam_ca.paa)); \ No newline at end of file diff --git a/addons/gui/ui/BeginHeadTiltChinLift.paa b/addons/gui/ui/BeginHeadTiltChinLift.paa new file mode 100644 index 00000000..b4e86306 Binary files /dev/null and b/addons/gui/ui/BeginHeadTiltChinLift.paa differ diff --git a/addons/gui/ui/CheckAirway.paa b/addons/gui/ui/CheckAirway.paa new file mode 100644 index 00000000..87a4d6ea Binary files /dev/null and b/addons/gui/ui/CheckAirway.paa differ diff --git a/addons/gui/ui/CheckBreathing.paa b/addons/gui/ui/CheckBreathing.paa new file mode 100644 index 00000000..2ea2044c Binary files /dev/null and b/addons/gui/ui/CheckBreathing.paa differ diff --git a/addons/gui/ui/CheckCapillaryRefill.paa b/addons/gui/ui/CheckCapillaryRefill.paa new file mode 100644 index 00000000..7ad7757e Binary files /dev/null and b/addons/gui/ui/CheckCapillaryRefill.paa differ diff --git a/addons/gui/ui/CheckDogTags.paa b/addons/gui/ui/CheckDogTags.paa new file mode 100644 index 00000000..559399bb Binary files /dev/null and b/addons/gui/ui/CheckDogTags.paa differ diff --git a/addons/gui/ui/CheckPulse.paa b/addons/gui/ui/CheckPulse.paa new file mode 100644 index 00000000..9606737d Binary files /dev/null and b/addons/gui/ui/CheckPulse.paa differ diff --git a/addons/gui/ui/CheckResponse.paa b/addons/gui/ui/CheckResponse.paa new file mode 100644 index 00000000..f5ca05b2 Binary files /dev/null and b/addons/gui/ui/CheckResponse.paa differ diff --git a/addons/gui/ui/InspectChest.paa b/addons/gui/ui/InspectChest.paa new file mode 100644 index 00000000..86feeee2 Binary files /dev/null and b/addons/gui/ui/InspectChest.paa differ diff --git a/addons/gui/ui/RecoveryPosition.paa b/addons/gui/ui/RecoveryPosition.paa new file mode 100644 index 00000000..d1594d8b Binary files /dev/null and b/addons/gui/ui/RecoveryPosition.paa differ diff --git a/addons/gui/ui/ShakeAwake.paa b/addons/gui/ui/ShakeAwake.paa new file mode 100644 index 00000000..03b7926c Binary files /dev/null and b/addons/gui/ui/ShakeAwake.paa differ diff --git a/addons/gui/ui/SlapAwake.paa b/addons/gui/ui/SlapAwake.paa new file mode 100644 index 00000000..43adafa4 Binary files /dev/null and b/addons/gui/ui/SlapAwake.paa differ diff --git a/addons/gui/ui/WashEyes.paa b/addons/gui/ui/WashEyes.paa new file mode 100644 index 00000000..daeb43ca Binary files /dev/null and b/addons/gui/ui/WashEyes.paa differ