From 787e5661deb334e915ddd889a8fea0b5ac57f871 Mon Sep 17 00:00:00 2001 From: pouya Date: Wed, 27 Jul 2022 18:19:10 +0430 Subject: [PATCH] + --- .../viewModel/markerMode/MarkerModeViewModel.h | 16 +++++++++++++++- ui | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/logic/include/viewModel/markerMode/MarkerModeViewModel.h b/logic/include/viewModel/markerMode/MarkerModeViewModel.h index 56962fe..53b425b 100644 --- a/logic/include/viewModel/markerMode/MarkerModeViewModel.h +++ b/logic/include/viewModel/markerMode/MarkerModeViewModel.h @@ -9,7 +9,6 @@ class MarkerModeViewModel : public BaseViewModel US_VIEW_MODEL(MarkerModeViewModel) SINGLETON(MarkerModeViewModel) - US_PROPERTY_VIEW_ONLY(bool, isMarkerModeActive, true) //=======JoySticks======= @@ -18,6 +17,21 @@ class MarkerModeViewModel : public BaseViewModel US_JOYSTICK_NUMBER(PointerAngle, "Angle", "", "", true, true, 0) US_JOYSTICK_NUMBER(IndicatorSize, "Indicator Size", "", "", true, true, 0) + US_JOYSTICK_PUSH (PointerDeleteLast,"Delete Last",true,true,0) + US_JOYSTICK_PUSH (PointerDeleteAll,"Delete All",true,true,0) + + US_SPIN_BOX (Page,"Page",QList({"Low", "Norm", "High"}),"@","#",true,true,1) + US_JOYSTICK_NUMBER(TextSize, "Text Size", "", "", true, true, 0) + US_JOYSTICK_PUSH (DeleteGrab,"Delete Grab",true,true,0) + US_JOYSTICK_NUMBER(GrabWord, "Grab Word", "", "", true, true, 0) + US_JOYSTICK_PUSH (DeleteLast,"Delete Last",true,true,0) + US_JOYSTICK_PUSH (DeleteAll,"Delete All",true,true,0) + //=======JoySticks======= +// US_PROPERTY (Bodymark) + + //=======Pointer======= + + }; #endif \ No newline at end of file diff --git a/ui b/ui index d0bf556..50fec2e 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit d0bf556c101384b62f4d595d03043cad148eb1d7 +Subproject commit 50fec2e3c8ce4837165dc7f1be2ead148614596a