refactoring

eez-open · Nov 10, 2019 · 341f83b · 341f83b
1 parent 2a0f936
commit 341f83b
Show file tree

Hide file tree

Showing 18 changed files with 246 additions and 249 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -26223,6 +26223,7 @@
               "type": "Container",
               "style": {
                 "inheritFrom": "default",
+                "color": "Background",
                 "padding": 0
               },
               "action": "show_user_profile_settings",
@@ -46627,6 +46628,83 @@
             "width": 480,
             "height": 240,
             "layout": "main"
+          },
+          {
+            "type": "LayoutView",
+            "style": {
+              "inheritFrom": "default"
+            },
+            "left": 5155,
+            "top": 3983,
+            "width": 480,
+            "height": 272,
+            "layout": "sys_settings_screen_calibration"
+          },
+          {
+            "type": "LayoutView",
+            "style": {
+              "inheritFrom": "default"
+            },
+            "left": 4411,
+            "top": 3983,
+            "width": 480,
+            "height": 272,
+            "layout": "sys_settings_display"
+          },
+          {
+            "type": "LayoutView",
+            "style": {
+              "inheritFrom": "default"
+            },
+            "left": 5783,
+            "top": 3455,
+            "width": 480,
+            "height": 272,
+            "layout": "touch_calibration"
+          },
+          {
+            "type": "LayoutView",
+            "style": {
+              "inheritFrom": "default"
+            },
+            "left": 5783,
+            "top": 3983,
+            "width": 480,
+            "height": 272,
+            "layout": "touch_calibration"
+          },
+          {
+            "type": "LayoutView",
+            "style": {
+              "inheritFrom": "default"
+            },
+            "left": 6422,
+            "top": 3455,
+            "width": 480,
+            "height": 272,
+            "layout": "touch_calibration_yes_no"
+          },
+          {
+            "type": "LayoutView",
+            "style": {
+              "inheritFrom": "default"
+            },
+            "left": 6422,
+            "top": 3983,
+            "width": 480,
+            "height": 272,
+            "layout": "touch_calibration_yes_no_cancel"
+          },
+          {
+            "type": "LayoutView",
+            "style": {
+              "inheritFrom": "default"
+            },
+            "left": 5155,
+            "top": 3468,
+            "width": 480,
+            "height": 272,
+            "layout": "touch_calibration_intro"
           }
         ],
         "usedIn": [],

diff --git a/src/eez/gui/action_impl.cpp b/src/eez/gui/action_impl.cpp
@@ -157,7 +157,6 @@ void action_keypad_option2() {
 }
 
 void action_enter_touch_calibration() {
-    popPage();
     psu::gui::enterTouchCalibration();
 }