* update for settings layout

mooch443 · Oct 1, 2023 · 6e74ecf · 6e74ecf
1 parent 17e81f7
commit 6e74ecf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/Application/src/commons b/Application/src/commons
diff --git a/Application/src/tracker/settings_layout.json b/Application/src/tracker/settings_layout.json
@@ -8,11 +8,6 @@
         "highlight_clr":[50,50,75]
     },
     "objects":[
-    {
-        "type":"image",
-        "path":"/Users/tristan/Downloads/average_test_pmoc_pupa_05JUN23_0_MV-CH430-90XM-F-NF.mp4_fixed-s1.png",
-        "scale":[0.5,0.1]
-    },
     {
         "type":"vlayout",
         "align":"left",
@@ -102,7 +97,7 @@
                         [
                             [{
                                 "type":"text",
-                                "text":"region model"
+                                "text":"region"
                             }],
                             [{
                                 "type":"settings",
@@ -230,8 +225,7 @@
                         "line":[75,75,75],
                         "size":[600,40],
                         "color":[225,225,225],
-                        "desc":"",
-                        "highlight_clr":[75,75,75,255]
+                        "desc":""
                     },
                     {
                         "type":"button",
+2 −0		common/gui/DynamicGUI.cpp
+1 −0		common/gui/DynamicGUI.h
+1 −1		common/gui/GuiTypes.h
+3 −96		common/gui/LabeledField.cpp
+4 −50		common/gui/LabeledField.h
+1 −1		common/gui/types/Button.h
+77 −0		common/gui/types/ErrorElement.cpp
+55 −0		common/gui/types/ErrorElement.h
+1 −1		common/gui/types/StaticText.h