gui fixes

eez-open · Feb 20, 2020 · 2415c2b · 2415c2b
1 parent b941f12
commit 2415c2b
Show file tree

Hide file tree

Showing 11 changed files with 119,418 additions and 119,407 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -24551,7 +24551,7 @@
                   "inheritFrom": "default"
                 },
                 "data": "serial_enabled",
-                "action": "serial_toggle",
+                "action": "",
                 "left": 0,
                 "top": 32,
                 "width": 460,

diff --git a/src/eez/gui/action_impl.cpp b/src/eez/gui/action_impl.cpp
@@ -211,7 +211,7 @@ void action_show_main_page() {
 }
 
 void action_show_event_queue() {
-	showPage(PAGE_ID_EVENT_QUEUE);
+    showPage(PAGE_ID_EVENT_QUEUE);
 }
 
 void action_show_sys_settings() {

diff --git a/src/eez/gui/app_context.cpp b/src/eez/gui/app_context.cpp
@@ -142,7 +142,7 @@ void AppContext::doShowPage(int pageId, Page *page, int previousPageId) {
         page->pageWillAppear();
     }
 
-    m_showPageTime = micros();
+    m_showPageTime = millis();
 
     onPageChanged(previousPageId, pageId);
 

diff --git a/src/eez/gui/document_simulator.cpp b/src/eez/gui/document_simulator.cpp
diff --git a/src/eez/gui/document_simulator.h b/src/eez/gui/document_simulator.h
@@ -1287,70 +1287,71 @@ enum StylesEnum {
     STYLE_ID_YES_NO_MESSAGE = 63,
     STYLE_ID_TEXT_MESSAGE = 64,
     STYLE_ID_ASYNC_OPERATION = 65,
-    STYLE_ID_SCROLLBAR_THUMB = 66,
-    STYLE_ID_SCROLLBAR_BUTTON = 67,
-    STYLE_ID_BOTTOM_BUTTON_TEXTUAL_S_LEFT = 68,
-    STYLE_ID_KEY_SPEC_ICONS = 69,
-    STYLE_ID_KEY_SPEC_ICONS_DISABLED = 70,
-    STYLE_ID_KEY_DISABLED = 71,
-    STYLE_ID_EDIT_VALUE_S_CENTERED = 72,
-    STYLE_ID_EDIT_VALUE_ACTIVE_S_CENTER = 73,
-    STYLE_ID_EDIT_VALUE_ACTIVE_M_CENTER = 74,
-    STYLE_ID_VALUE_M = 75,
-    STYLE_ID_DEFAULT_DISABLED_M_LEFT = 76,
-    STYLE_ID_YT_GRAPH = 77,
-    STYLE_ID_LIST_GRAPH_CURSOR = 78,
-    STYLE_ID_YT_GRAPH_U_DEFAULT_LABEL = 79,
-    STYLE_ID_YT_GRAPH_I_DEFAULT_LABEL = 80,
-    STYLE_ID_EDIT_VALUE_FOCUS_S_CENTER = 81,
-    STYLE_ID_VALUE = 82,
-    STYLE_ID_DEFAULT_M = 83,
-    STYLE_ID_NON_INTERACTIVE_BUTTON_M = 84,
-    STYLE_ID_OPTION_TOGGLE_L_CENTER = 85,
-    STYLE_ID_DEFAULT_M_LEFT = 86,
-    STYLE_ID_EVENT_ERROR = 87,
-    STYLE_ID_DEFAULT_DISABLED_S_LEFT = 88,
-    STYLE_ID_ICON_AND_TEXT_S = 89,
-    STYLE_ID_ICON_AND_TEXT_S_DISABLED = 90,
-    STYLE_ID_DEFAULT_DISABLED = 91,
-    STYLE_ID_EDIT_VALUE_M_CENTERED = 92,
-    STYLE_ID_EDIT_S = 93,
-    STYLE_ID_EDIT_VALUE_ACTIVE_S_LEFT = 94,
-    STYLE_ID_EVENT_WARNING = 95,
-    STYLE_ID_DISPLAY_OFF = 96,
-    STYLE_ID_DISPLAY_OFF_S = 97,
-    STYLE_ID_DEFAULT_GUI_TMPL = 98,
-    STYLE_ID_MON_VALUE_48_RIGHT = 99,
-    STYLE_ID_MON_VALUE_20_LEFT = 100,
-    STYLE_ID_ENCODER_CURSOR_14_DISABLED = 101,
-    STYLE_ID_ENCODER_CURSOR_14_ENABLED = 102,
-    STYLE_ID_ENCODER_CURSOR_14_FOCUSED = 103,
-    STYLE_ID_BAR_GRAPH_U_DEFAULT = 104,
-    STYLE_ID_BAR_GRAPH_TEXT = 105,
-    STYLE_ID_BAR_GRAPH_LIMIT_LINE = 106,
-    STYLE_ID_BAR_GRAPH_I_DEFAULT = 107,
-    STYLE_ID_TRIGGER_BUTTON_24 = 108,
-    STYLE_ID_MON_VALUE_14_RIGHT = 109,
-    STYLE_ID_ENCODER_CURSOR_14_RIGHT_DISABLED = 110,
-    STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 111,
-    STYLE_ID_ENCODER_CURSOR_14_RIGHT_FOCUSED = 112,
-    STYLE_ID_ENCODER_CURSOR_14_LEFT_DISABLED = 113,
-    STYLE_ID_CHANNEL_OFF_BUTTON_20 = 114,
-    STYLE_ID_TRIGGER_BUTTON_14 = 115,
-    STYLE_ID_CHANNEL_OFF_BUTTON_38 = 116,
-    STYLE_ID_INST_SELECTED = 117,
-    STYLE_ID_MON_VALUE_38_RIGHT = 118,
-    STYLE_ID_CH_PROT_OFF = 119,
-    STYLE_ID_CH_PROT_ON = 120,
-    STYLE_ID_CH_PROT_TRIPPED = 121,
-    STYLE_ID_BUTTON_BGND = 122,
-    STYLE_ID_MON_VALUE_24_RIGHT = 123,
-    STYLE_ID_MON_VALUE_14_CENTER = 124,
-    STYLE_ID_MON_VALUE_20_RIGHT = 125,
-    STYLE_ID_MON_VALUE_14_LEFT = 126,
-    STYLE_ID_CHANNEL_OFF_BUTTON_14 = 127,
-    STYLE_ID_SCROLLBAR_TRACK = 128,
-    STYLE_ID_NON_INTERACTIVE_BUTTON_S_DISABLED = 129
+    STYLE_ID_ASYNC_OPERATION_ACTION = 66,
+    STYLE_ID_SCROLLBAR_THUMB = 67,
+    STYLE_ID_SCROLLBAR_BUTTON = 68,
+    STYLE_ID_BOTTOM_BUTTON_TEXTUAL_S_LEFT = 69,
+    STYLE_ID_KEY_SPEC_ICONS = 70,
+    STYLE_ID_KEY_SPEC_ICONS_DISABLED = 71,
+    STYLE_ID_KEY_DISABLED = 72,
+    STYLE_ID_EDIT_VALUE_S_CENTERED = 73,
+    STYLE_ID_EDIT_VALUE_ACTIVE_S_CENTER = 74,
+    STYLE_ID_EDIT_VALUE_ACTIVE_M_CENTER = 75,
+    STYLE_ID_VALUE_M = 76,
+    STYLE_ID_DEFAULT_DISABLED_M_LEFT = 77,
+    STYLE_ID_YT_GRAPH = 78,
+    STYLE_ID_LIST_GRAPH_CURSOR = 79,
+    STYLE_ID_YT_GRAPH_U_DEFAULT_LABEL = 80,
+    STYLE_ID_YT_GRAPH_I_DEFAULT_LABEL = 81,
+    STYLE_ID_EDIT_VALUE_FOCUS_S_CENTER = 82,
+    STYLE_ID_VALUE = 83,
+    STYLE_ID_DEFAULT_M = 84,
+    STYLE_ID_NON_INTERACTIVE_BUTTON_M = 85,
+    STYLE_ID_OPTION_TOGGLE_L_CENTER = 86,
+    STYLE_ID_DEFAULT_M_LEFT = 87,
+    STYLE_ID_EVENT_ERROR = 88,
+    STYLE_ID_DEFAULT_DISABLED_S_LEFT = 89,
+    STYLE_ID_ICON_AND_TEXT_S = 90,
+    STYLE_ID_ICON_AND_TEXT_S_DISABLED = 91,
+    STYLE_ID_DEFAULT_DISABLED = 92,
+    STYLE_ID_EDIT_VALUE_M_CENTERED = 93,
+    STYLE_ID_EDIT_S = 94,
+    STYLE_ID_EDIT_VALUE_ACTIVE_S_LEFT = 95,
+    STYLE_ID_EVENT_WARNING = 96,
+    STYLE_ID_DISPLAY_OFF = 97,
+    STYLE_ID_DISPLAY_OFF_S = 98,
+    STYLE_ID_DEFAULT_GUI_TMPL = 99,
+    STYLE_ID_MON_VALUE_48_RIGHT = 100,
+    STYLE_ID_MON_VALUE_20_LEFT = 101,
+    STYLE_ID_ENCODER_CURSOR_14_DISABLED = 102,
+    STYLE_ID_ENCODER_CURSOR_14_ENABLED = 103,
+    STYLE_ID_ENCODER_CURSOR_14_FOCUSED = 104,
+    STYLE_ID_BAR_GRAPH_U_DEFAULT = 105,
+    STYLE_ID_BAR_GRAPH_TEXT = 106,
+    STYLE_ID_BAR_GRAPH_LIMIT_LINE = 107,
+    STYLE_ID_BAR_GRAPH_I_DEFAULT = 108,
+    STYLE_ID_TRIGGER_BUTTON_24 = 109,
+    STYLE_ID_MON_VALUE_14_RIGHT = 110,
+    STYLE_ID_ENCODER_CURSOR_14_RIGHT_DISABLED = 111,
+    STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 112,
+    STYLE_ID_ENCODER_CURSOR_14_RIGHT_FOCUSED = 113,
+    STYLE_ID_ENCODER_CURSOR_14_LEFT_DISABLED = 114,
+    STYLE_ID_CHANNEL_OFF_BUTTON_20 = 115,
+    STYLE_ID_TRIGGER_BUTTON_14 = 116,
+    STYLE_ID_CHANNEL_OFF_BUTTON_38 = 117,
+    STYLE_ID_INST_SELECTED = 118,
+    STYLE_ID_MON_VALUE_38_RIGHT = 119,
+    STYLE_ID_CH_PROT_OFF = 120,
+    STYLE_ID_CH_PROT_ON = 121,
+    STYLE_ID_CH_PROT_TRIPPED = 122,
+    STYLE_ID_BUTTON_BGND = 123,
+    STYLE_ID_MON_VALUE_24_RIGHT = 124,
+    STYLE_ID_MON_VALUE_14_CENTER = 125,
+    STYLE_ID_MON_VALUE_20_RIGHT = 126,
+    STYLE_ID_MON_VALUE_14_LEFT = 127,
+    STYLE_ID_CHANNEL_OFF_BUTTON_14 = 128,
+    STYLE_ID_SCROLLBAR_TRACK = 129,
+    STYLE_ID_NON_INTERACTIVE_BUTTON_S_DISABLED = 130
 };
 
 enum ThemesEnum {
@@ -1581,7 +1582,7 @@ enum PagesEnum {
 };
 
 #ifdef OPTION_SDRAM
-extern const uint8_t assets[393947];
+extern const uint8_t assets[393959];
 #else
-extern const uint8_t assets[3864216];
+extern const uint8_t assets[3864160];
 #endif