From 45b74a99227304a971e68909d333af5ac8db6e7d Mon Sep 17 00:00:00 2001
From: pouya <pooyasis@gmail.com>
Date: Mon, 3 Jan 2022 18:54:12 +0330
Subject: [PATCH] M mode enhance button

---
 logic/include/viewModel/MainViewModel.h              | 12 ++++++------
 .../viewModel/mMode/setting/MModeSettingViewModel.h  |  6 ++++++
 ui                                                   |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/logic/include/viewModel/MainViewModel.h b/logic/include/viewModel/MainViewModel.h
index 6955a23..8ae5209 100644
--- a/logic/include/viewModel/MainViewModel.h
+++ b/logic/include/viewModel/MainViewModel.h
@@ -58,6 +58,12 @@ private:
 	US_PROPERTY_VIEW_ONLY(BModeSettingViewModel*, bModeSettingViewModel,
 						  BModeSettingViewModel::getInstance())
 
+    US_PROPERTY_VIEW_ONLY(MModeDisplayViewModel*, mModeDisplayViewModel,
+                          MModeDisplayViewModel::getInstance())
+
+    US_PROPERTY_VIEW_ONLY(MModeSettingViewModel*, mModeSettingViewModel,
+                          MModeSettingViewModel::getInstance())
+
 	US_PROPERTY_VIEW_ONLY(CineDisplayViewModel*, cineDisplayViewModel,
 						  CineDisplayViewModel::getInstance())
 
@@ -76,12 +82,6 @@ private:
 	US_PROPERTY_VIEW_ONLY(ImageViewModel*, imageViewModel,
 						  ImageViewModel::getInstance())
 
-	US_PROPERTY_VIEW_ONLY(MModeDisplayViewModel*, mModeDisplayViewModel,
-						  MModeDisplayViewModel::getInstance())
-
-	US_PROPERTY_VIEW_ONLY(MModeSettingViewModel*, mModeSettingViewModel,
-						  MModeSettingViewModel::getInstance())
-
 	US_PROPERTY_VIEW_ONLY(UserViewModel*, userViewModel,
 						  UserViewModel::getInstance())
 
diff --git a/logic/include/viewModel/mMode/setting/MModeSettingViewModel.h b/logic/include/viewModel/mMode/setting/MModeSettingViewModel.h
index 61be7fa..43de9a4 100644
--- a/logic/include/viewModel/mMode/setting/MModeSettingViewModel.h
+++ b/logic/include/viewModel/mMode/setting/MModeSettingViewModel.h
@@ -34,6 +34,12 @@ private:
 
     US_INFO_BOX(gain, "Gain", (QList<QString>({""})), "", "dB", true, true, 0)
 
+
+    US_SWITCH_BUTTON(maxAngle, "Max Angle", "", true, true, false)
+    US_JOYSTICK_NUMBER(angle, "Angle", "", "°", true, true, 0)
+    US_SWITCH_BUTTON(virtualConvex, "Virtual Convex", "", true, true, false)
+    US_SPIN_BOX(ao, "AO", (QList<QString>({""})), "", "%", true, true, 0)
+    US_SPIN_BOX(frequency, "Frequency", {""}, "", "", true, true, 0)
     void applyPreset();
 };
 
diff --git a/ui b/ui
index f42205d..4320086 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit f42205d0d93358dfba05af310f61a64633a0cf30
+Subproject commit 43200868bb970a82b0c4fe2143df7947db5588f8