From 6a3a1b1312db0ee95d8430a7bed136483f08ebb9 Mon Sep 17 00:00:00 2001 From: Martin Vladic Date: Tue, 1 Oct 2019 09:36:17 +0200 Subject: [PATCH] styles and colors changes --- modular-psu-firmware.eez-project | 506 ++++++++++--------------------- src/eez/apps/psu/gui/data.cpp | 7 +- src/eez/gui/page.cpp | 4 +- 3 files changed, 162 insertions(+), 355 deletions(-) diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project index c2500f378..8f58f5bd0 100644 --- a/modular-psu-firmware.eez-project +++ b/modular-psu-firmware.eez-project @@ -3012,9 +3012,9 @@ "inheritFrom": "default", "padding": 0 }, - "left": 96, - "top": 16, - "width": 288, + "left": 0, + "top": 17, + "width": 480, "height": 26, "text": "Initial touchscreen calibration" }, @@ -3028,9 +3028,9 @@ "inheritFrom": "default", "padding": 0 }, - "left": 96, + "left": 0, "top": 230, - "width": 288, + "width": 480, "height": 26, "text": "Touch screen to start!" }, @@ -3130,8 +3130,8 @@ "style": { "inheritFrom": "default", "font": "Oswald17", - "color": "#404040", - "backgroundColor": "#c0c0c0", + "color": "status_line_text", + "backgroundColor": "status_line_background", "borderRadius": 4, "padding": "10" }, @@ -3146,7 +3146,7 @@ "top": 95, "width": 270, "height": 82, - "text": "Touch top-left cross in the\\n center until turns green." + "text": "Touch top-left cross in the\\n center until change color" }, { "type": "Text", @@ -3187,8 +3187,8 @@ "style": { "inheritFrom": "default", "font": "Oswald17", - "color": "#404040", - "backgroundColor": "#c0c0c0", + "color": "status_line_text", + "backgroundColor": "status_line_background", "borderRadius": 4, "padding": "10" }, @@ -3199,11 +3199,11 @@ "backgroundColor": "#404040", "borderRadius": 4 }, - "left": 99, + "left": 105, "top": 95, - "width": 282, + "width": 270, "height": 82, - "text": "Touch bottom-right cross in\\nthe center until turns green." + "text": "Touch top-left cross in the\\n center until change color" }, { "type": "Text", @@ -3244,8 +3244,8 @@ "style": { "inheritFrom": "default", "font": "Oswald17", - "color": "#404040", - "backgroundColor": "#c0c0c0", + "color": "status_line_text", + "backgroundColor": "status_line_background", "borderRadius": 4, "padding": "10" }, @@ -3256,11 +3256,11 @@ "backgroundColor": "#404040", "borderRadius": 4 }, - "left": 100, + "left": 105, "top": 95, - "width": 280, + "width": 270, "height": 82, - "text": "Touch top-right cross in the\\n center until turns green." + "text": "Touch top-left cross in the\\n center until change color" }, { "type": "Text", @@ -3307,10 +3307,10 @@ "padding": 0 }, "data": "alert_message", - "left": 80, + "left": 0, "top": 82, - "width": 320, - "height": 37, + "width": 480, + "height": 40, "focusStyle": { "inheritFrom": "default", "padding": 0 @@ -3379,10 +3379,10 @@ "padding": 0 }, "data": "alert_message", - "left": 80, + "left": 0, "top": 82, - "width": 320, - "height": 37, + "width": 480, + "height": 40, "focusStyle": { "inheritFrom": "default", "padding": 0 @@ -3402,7 +3402,7 @@ "padding": 0 }, "action": "yes", - "left": 128, + "left": 114, "top": 176, "width": 48, "height": 40, @@ -3421,7 +3421,7 @@ "padding": 0 }, "action": "no", - "left": 188, + "left": 174, "top": 176, "width": 100, "height": 40, @@ -3440,9 +3440,9 @@ "padding": 0 }, "action": "cancel", - "left": 300, + "left": 286, "top": 176, - "width": 78, + "width": 79, "height": 40, "text": "Cancel" } @@ -6677,7 +6677,7 @@ "left": 70, "top": 80, "width": 100, - "height": 28, + "height": 32, "text": "Abort" } ], @@ -18107,116 +18107,45 @@ "activeStyle": { "inheritFrom": "default" }, - "data": "setPage.dirty", + "data": "ioPin.state", "left": 0, "top": 0, "width": 70, "height": 28, "widgets": [ { - "type": "Select", + "type": "Text", "style": { - "inheritFrom": "default", + "inheritFrom": "edit_value_active_S_center", "padding": 0 }, "activeStyle": { "inheritFrom": "default", "padding": 0 }, - "data": "ioPin.state", - "action": "ioPin.toggleState", + "action": "", "left": 0, "top": 0, "width": 70, "height": 28, - "widgets": [ - { - "type": "Text", - "style": { - "inheritFrom": "edit_value_active_S_center", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "action": "", - "left": 0, - "top": 0, - "width": 70, - "height": 28, - "text": "Inactive" - }, - { - "type": "Text", - "style": { - "inheritFrom": "edit_value_active_S_center", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "action": "", - "left": 0, - "top": 0, - "width": 70, - "height": 28, - "text": "Active" - } - ] + "text": "Inactive" }, { - "type": "Select", + "type": "Text", "style": { - "inheritFrom": "default", + "inheritFrom": "edit_value_active_S_center", "padding": 0 }, "activeStyle": { "inheritFrom": "default", "padding": 0 }, - "data": "ioPin.state", + "action": "", "left": 0, "top": 0, "width": 70, "height": 28, - "widgets": [ - { - "type": "Text", - "style": { - "inheritFrom": "edit_value_S_centered", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "action": "", - "left": 0, - "top": 0, - "width": 70, - "height": 28, - "text": "Inactive" - }, - { - "type": "Text", - "style": { - "inheritFrom": "edit_value_S_centered", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "action": "", - "left": 0, - "top": 0, - "width": 70, - "height": 28, - "text": "Active" - } - ] + "text": "Active" } ] } @@ -19176,7 +19105,7 @@ "top": 0, "width": 103, "height": 32, - "text": "Time zone:" + "text": "Zone:" }, { "type": "DisplayData", @@ -19190,9 +19119,9 @@ }, "data": "dateTime.timeZone", "action": "edit_field", - "left": 103, + "left": 62, "top": 0, - "width": 89, + "width": 130, "height": 32, "focusStyle": { "inheritFrom": "default", @@ -23597,7 +23526,7 @@ }, "left": 64, "top": 240, - "width": 333, + "width": 334, "height": 32 }, { @@ -24942,7 +24871,7 @@ { "type": "Text", "style": { - "inheritFrom": "bottom_button_textual_S", + "inheritFrom": "edit_value_active_S_center", "padding": 0 }, "activeStyle": { @@ -24959,7 +24888,7 @@ { "type": "Button", "style": { - "inheritFrom": "bottom_button_textual_S", + "inheritFrom": "edit_value_active_S_center", "padding": 0 }, "activeStyle": { @@ -24981,7 +24910,7 @@ { "type": "Button", "style": { - "inheritFrom": "bottom_button_textual_S", + "inheritFrom": "edit_value_active_S_center", "color": "status_warning", "padding": 0 }, @@ -26488,7 +26417,7 @@ { "type": "Rectangle", "style": { - "inheritFrom": "dark_line", + "inheritFrom": "select_enum_item_popup_item", "color": "popup_text_selected", "backgroundColor": "popup_background_regular", "padding": 0 @@ -26762,8 +26691,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -26905,9 +26832,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "top", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "top" }, "activeStyle": { "inheritFrom": "default" @@ -27555,8 +27480,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -27698,9 +27621,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "top", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "top" }, "activeStyle": { "inheritFrom": "default" @@ -28228,8 +28149,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -28372,9 +28291,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "top", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "top" }, "activeStyle": { "inheritFrom": "default" @@ -28762,8 +28679,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -28906,9 +28821,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "top", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "top" }, "activeStyle": { "inheritFrom": "default" @@ -29179,8 +29092,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -29322,9 +29233,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "top", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "top" }, "activeStyle": { "inheritFrom": "default" @@ -29956,8 +29865,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -30100,9 +30007,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "top", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "top" }, "activeStyle": { "inheritFrom": "default" @@ -30428,8 +30333,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -30571,9 +30474,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "top", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "top" }, "activeStyle": { "inheritFrom": "default" @@ -31010,8 +30911,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -31153,9 +31052,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "top", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "top" }, "activeStyle": { "inheritFrom": "default" @@ -31501,8 +31398,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -31521,9 +31416,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "top", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "top" }, "activeStyle": { "inheritFrom": "default" @@ -31790,8 +31683,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -31809,9 +31700,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "top", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "top" }, "activeStyle": { "inheritFrom": "default" @@ -32280,8 +32169,6 @@ "inheritFrom": "inst_selected", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -32299,9 +32186,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -32318,9 +32203,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -32337,9 +32220,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -39963,8 +39844,6 @@ "inheritFrom": "inst_selected", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -39982,9 +39861,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -40001,9 +39878,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -40020,9 +39895,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -40506,8 +40379,6 @@ "inheritFrom": "inst_selected", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -40525,9 +40396,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -40545,9 +40414,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -40564,9 +40431,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -40722,9 +40587,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -40795,9 +40658,7 @@ "style": { "inheritFrom": "inst_selected", "font": "Heydings14", - "alignVertical": "center", - "color": "inst_max_header_text", - "backgroundColor": "inst_max_header_bgnd" + "alignVertical": "center" }, "activeStyle": { "inheritFrom": "default" @@ -40871,8 +40732,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -40890,9 +40749,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "bottom", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "bottom" }, "activeStyle": { "inheritFrom": "default" @@ -41508,8 +41365,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -41542,9 +41397,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "bottom", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "bottom" }, "activeStyle": { "inheritFrom": "default" @@ -42233,8 +42086,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -42252,9 +42103,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "bottom", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "bottom" }, "activeStyle": { "inheritFrom": "default" @@ -42510,7 +42359,6 @@ "font": "Oswald14", "alignHorizontal": "center", "color": "status_warning", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -42529,9 +42377,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "bottom", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "bottom" }, "activeStyle": { "inheritFrom": "default" @@ -42765,9 +42611,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "bottom", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "bottom" }, "activeStyle": { "inheritFrom": "default" @@ -42839,9 +42683,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "bottom", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "bottom" }, "activeStyle": { "inheritFrom": "default" @@ -42916,8 +42758,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -42935,9 +42775,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "bottom", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "bottom" }, "activeStyle": { "inheritFrom": "default" @@ -43392,8 +43230,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -43426,9 +43262,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "bottom", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "bottom" }, "activeStyle": { "inheritFrom": "default" @@ -44043,8 +43877,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -44062,9 +43894,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "bottom", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "bottom" }, "activeStyle": { "inheritFrom": "default" @@ -44319,8 +44149,6 @@ "inheritFrom": "inst_minimized", "font": "Oswald14", "alignHorizontal": "left", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd", "padding": "0 5" }, "activeStyle": { @@ -44353,9 +44181,7 @@ "style": { "inheritFrom": "inst_minimized", "font": "Heydings14", - "alignVertical": "bottom", - "color": "inst_min_header_text", - "backgroundColor": "inst_min_header_bgnd" + "alignVertical": "bottom" }, "activeStyle": { "inheritFrom": "default" @@ -44963,7 +44789,7 @@ "top": 200, "width": 48, "height": 40, - "text": "B" + "text": "E" } ] } @@ -47713,8 +47539,8 @@ "description": "", "inheritFrom": "", "font": "Oswald24", - "color": "#c830c8", - "backgroundColor": "#d3d3d3", + "color": "bar_graph_current", + "backgroundColor": "Background", "padding": 0 }, { @@ -47738,7 +47564,7 @@ { "name": "bar_graph_set_line", "inheritFrom": "default", - "color": "#808080", + "color": "status_line_text_disabled", "borderSize": 1, "padding": 0 }, @@ -47749,8 +47575,8 @@ "font": "Oswald14", "alignHorizontal": "center", "alignVertical": "top", - "color": "#404040", - "backgroundColor": "#ffff00", + "color": "status_line_text", + "backgroundColor": "popup_background_regular", "padding": 0 }, { @@ -47780,32 +47606,9 @@ "borderColor": "#D3D3D3", "padding": 0 }, - { - "name": "bottom_button_textual", - "font": "Oswald14", - "alignHorizontal": "center", - "alignVertical": "center", - "color": "#2F2F2F", - "backgroundColor": "#E9F5F9", - "borderSize": 0, - "borderColor": "#D3D3D3", - "padding": 0 - }, - { - "name": "bottom_button_textual_S", - "inheritFrom": "bottom_button", - "font": "Oswald14", - "alignHorizontal": "center", - "alignVertical": "center", - "color": "#2F2F2F", - "backgroundColor": "#E9F5F9", - "borderSize": 0, - "borderColor": "#D3D3D3", - "padding": 0 - }, { "name": "bottom_button_textual_S_left", - "inheritFrom": "bottom_button_textual", + "inheritFrom": "", "font": "Oswald14", "alignHorizontal": "left", "color": "status_line_text", @@ -47814,13 +47617,15 @@ }, { "name": "bottom_button_textual_S_disabled", - "inheritFrom": "bottom_button_textual_S", - "color": "#c0c0c0", + "inheritFrom": "", + "font": "Heydings14", + "color": "text_disabled", + "backgroundColor": "text_disabled_background", "padding": 0 }, { "name": "default", - "description": "Previous background color was: #52b5d3\nNew one was changed intentionally to test inheritance.", + "description": "", "font": "Oswald24", "color": "text_regular", "backgroundColor": "Background", @@ -47832,7 +47637,6 @@ "description": "", "inheritFrom": "default", "font": "Oswald24", - "color": "#c0c0c0", "padding": 0 }, { @@ -47841,15 +47645,14 @@ "inheritFrom": "default", "font": "Oswald14", "alignHorizontal": "left", - "color": "#c0c0c0", + "color": "text_disabled", "padding": 0 }, { "name": "default_edit_inverse", "description": "", "inheritFrom": "default", - "font": "Oswald24", - "backgroundColor": "#ffffff" + "font": "Oswald24" }, { "name": "default_inverse", @@ -47966,7 +47769,7 @@ { "name": "error_alert", "inheritFrom": "default_S", - "backgroundColor": "#f78000", + "backgroundColor": "popup_background_warning", "padding": "20", "margin": "20", "alwaysBuild": true @@ -47974,7 +47777,7 @@ { "name": "error_alert_button", "inheritFrom": "error_alert", - "color": "#ffff00", + "color": "text_selectable_background", "padding": 0, "alwaysBuild": true }, @@ -47994,18 +47797,9 @@ { "name": "event_warning", "inheritFrom": "event_info", - "color": "#ff8040", + "color": "popup_background_warning", "padding": 0 }, - { - "name": "info_alert", - "inheritFrom": "default_S", - "color": "#404040", - "backgroundColor": "#5fd3b4", - "padding": "20", - "margin": "20", - "alwaysBuild": true - }, { "name": "yes_no", "inheritFrom": "default_S", @@ -48197,7 +47991,7 @@ { "name": "non_interactive_button_S_disabled", "inheritFrom": "non_interactive_button_S", - "color": "#c0c0c0", + "color": "text_disabled", "padding": 0 }, { @@ -48278,8 +48072,8 @@ "description": "", "inheritFrom": "default", "font": "Oswald14", - "color": "#ffb000", - "backgroundColor": "#000000", + "color": "bar_graph_voltage", + "backgroundColor": "text_disabled_background", "padding": 0 }, { @@ -48287,7 +48081,7 @@ "description": "", "inheritFrom": "default", "font": "Oswald14", - "color": "#ffb000", + "color": "bar_graph_voltage", "padding": 0 }, { @@ -48296,7 +48090,7 @@ "inheritFrom": "default", "font": "Oswald14", "color": "#c830c8", - "backgroundColor": "#000000", + "backgroundColor": "text_disabled_background", "padding": 0 }, { @@ -48312,7 +48106,7 @@ "description": "", "inheritFrom": "default", "font": "Oswald14", - "backgroundColor": "#000000", + "backgroundColor": "text_disabled_background", "borderSize": 0, "borderColor": "#ffffff", "padding": 0 @@ -48322,8 +48116,8 @@ "description": "", "inheritFrom": "default", "font": "Oswald14", - "color": "#ff0000", - "backgroundColor": "#000000", + "color": "status_warning", + "backgroundColor": "text_disabled_background", "padding": 0 }, { @@ -48346,7 +48140,7 @@ { "name": "select_enum_item_popup_disabled_item", "inheritFrom": "select_enum_item_popup_item", - "color": "#2f2f2f", + "color": "text_disabled", "padding": "6", "alwaysBuild": true }, @@ -48370,43 +48164,35 @@ "description": "", "inheritFrom": "default", "font": "Oswald14", - "backgroundColor": "#525252", + "backgroundColor": "text_disabled_background", "borderSize": 0, "borderColor": "#ffffff", "padding": 0 }, - { - "name": "dark_line", - "font": "Oswald14", - "color": "#2f2f2f", - "borderColor": "#2f2f2f", - "padding": 0 - }, { "name": "text_message", "inheritFrom": "default_S", - "backgroundColor": "#008080", + "backgroundColor": "popup_background_info", "padding": 0 }, { "name": "async_operation", "inheritFrom": "default_S", "font": "Oswald17", - "backgroundColor": "#808000", + "backgroundColor": "popup_background_info", "padding": 0 }, { "name": "async_operation_action", "inheritFrom": "async_operation", - "color": "#ffff00", - "backgroundColor": "#808000", + "backgroundColor": "text_enable_background", "padding": 0 }, { "name": "front_panel_default", "font": "Oswald14", - "color": "#ffffff", - "backgroundColor": "#000000", + "color": "text_regular", + "backgroundColor": "Background", "borderColor": "#ffffff", "padding": 0 }, @@ -48414,24 +48200,24 @@ "name": "touch_calibration", "inheritFrom": "default", "font": "WebHostingHub24", - "color": "#ffffff", - "backgroundColor": "#000000", + "color": "protection_text", + "backgroundColor": "text_disabled_background", "padding": 0 }, { "name": "touch_calibration_active", "inheritFrom": "default", "font": "WebHostingHub24", - "color": "#00ff00", - "backgroundColor": "#000000", + "color": "status_ok", + "backgroundColor": "text_disabled_background", "padding": 0 }, { "name": "home", "description": "", "font": "Oswald24", - "color": "#ffffff", - "backgroundColor": "#5c5c5c", + "color": "status_line_text", + "backgroundColor": "status_line_background", "borderColor": "#D3D3D3", "padding": 0 }, @@ -48466,19 +48252,19 @@ }, { "name": "button_bgnd", - "inheritFrom": "default_gui_tmpl", - "backgroundColor": "#7ea1fe" + "inheritFrom": "default_gui_tmpl" }, { "name": "inst_selected", "inheritFrom": "default_gui_tmpl", - "color": "#000000", - "backgroundColor": "#f3c20c" + "color": "inst_max_header_text", + "backgroundColor": "inst_max_header_bgnd" }, { "name": "inst_minimized", "inheritFrom": "default_gui_tmpl", - "backgroundColor": "#272eb0" + "color": "inst_min_header_text", + "backgroundColor": "inst_min_header_bgnd" }, { "name": "encoder_cursor_14_disabled", @@ -48506,14 +48292,16 @@ }, { "name": "encoder_cursor_14_focused", - "inheritFrom": "encoder_cursor_focused" + "inheritFrom": "encoder_cursor_focused", + "color": "text_enable_background", + "backgroundColor": "text_selectable_background" }, { "name": "encoder_cursor_focused", "inheritFrom": "default", "font": "Oswald14", - "color": "#5080ff", - "backgroundColor": "#ffff00", + "color": "text_enable_background", + "backgroundColor": "text_selectable_background", "borderColor": "#000000" }, { @@ -48539,12 +48327,16 @@ { "name": "encoder_cursor_14_left_focused", "inheritFrom": "encoder_cursor_focused", - "alignHorizontal": "left" + "alignHorizontal": "left", + "color": "text_enable_background", + "backgroundColor": "text_selectable_background" }, { "name": "encoder_cursor_14_right_focused", "inheritFrom": "encoder_cursor_focused", - "alignHorizontal": "right" + "alignHorizontal": "right", + "color": "text_enable_background", + "backgroundColor": "text_selectable_background" }, { "name": "encoder_cursor_38_right_enabled", @@ -48562,7 +48354,9 @@ "name": "encoder_cursor_38_right_focused", "inheritFrom": "encoder_cursor_focused", "font": "Oswald38", - "alignHorizontal": "right" + "alignHorizontal": "right", + "color": "text_enable_background", + "backgroundColor": "text_selectable_background" }, { "name": "encoder_cursor_20_right_enabled", @@ -48580,7 +48374,9 @@ "name": "encoder_cursor_20_right_focused", "inheritFrom": "encoder_cursor_focused", "font": "Oswald20", - "alignHorizontal": "right" + "alignHorizontal": "right", + "color": "text_enable_background", + "backgroundColor": "text_selectable_background" }, { "name": "encoder_cursor_20_left_bottom_enabled", @@ -48601,7 +48397,9 @@ "inheritFrom": "encoder_cursor_focused", "font": "Oswald20", "alignHorizontal": "left", - "alignVertical": "bottom" + "alignVertical": "bottom", + "color": "text_enable_background", + "backgroundColor": "text_selectable_background" }, { "name": "ch_prot_off", @@ -48610,6 +48408,15 @@ "color": "text_enabled", "backgroundColor": "text_enable_background" }, + { + "name": "info_alert", + "inheritFrom": "default_S", + "color": "#404040", + "backgroundColor": "#5fd3b4", + "padding": "20", + "margin": "20", + "alwaysBuild": true + }, { "name": "ch_prot_on", "inheritFrom": "default", @@ -48643,14 +48450,13 @@ { "name": "trigger_button", "inheritFrom": "default", - "color": "#ffff00", + "color": "Action color", "backgroundColor": "text_enable_background" }, { "name": "trigger_button_14", "inheritFrom": "trigger_button", - "font": "Oswald14", - "color": "#ffff00" + "font": "Oswald14" }, { "name": "channel_off_button_38", @@ -427211,7 +427017,7 @@ { "name": "Legacy", "colors": [ - "#5080ff", + "#1b4fd9", "#ffffff", "#ffffff", "#5080ff", @@ -427228,7 +427034,7 @@ "#ffffff", "#ffff00", "#ffffff", - "#272eb0", + "#777dfb", "#ffb000", "#c830c8", "#a1b52e", @@ -427238,7 +427044,7 @@ "#359ebd", "#303030", "#f78000", - "#000000", + "#008080", "#c8e7f0", "#c8e7f0" ] @@ -427273,7 +427079,7 @@ "#f0ef31", "#1f7bc3", "#f3da99", - "#000000", + "#c7aae9", "#000000", "#1f7bc3" ] @@ -427308,7 +427114,7 @@ "#2b32b2", "#b7a6f6", "#a32d82", - "#000000", + "#087380", "#a32d82", "#66999b" ] diff --git a/src/eez/apps/psu/gui/data.cpp b/src/eez/apps/psu/gui/data.cpp index 110e4b343..0bdae0433 100644 --- a/src/eez/apps/psu/gui/data.cpp +++ b/src/eez/apps/psu/gui/data.cpp @@ -3540,8 +3540,11 @@ void data_io_pin_state(data::DataOperationEnum operation, data::Cursor &cursor, void data_io_pin_is_output(data::DataOperationEnum operation, data::Cursor &cursor, data::Value &value) { if (operation == data::DATA_OPERATION_GET) { - int pin = cursor.i; - value = pin >= 2 && persist_conf::devConf2.ioPins[pin].function == io_pins::FUNCTION_OUTPUT ? 1 : 0; + SysSettingsIOPinsPage *page = (SysSettingsIOPinsPage *)getPage(PAGE_ID_SYS_SETTINGS_IO); + if (page) { + int pin = cursor.i; + value = pin >= 2 && page->m_function[pin] == io_pins::FUNCTION_OUTPUT && persist_conf::devConf2.ioPins[pin].function == io_pins::FUNCTION_OUTPUT ? 1 : 0; + } } } diff --git a/src/eez/gui/page.cpp b/src/eez/gui/page.cpp index 14f87257b..63c29ebc1 100644 --- a/src/eez/gui/page.cpp +++ b/src/eez/gui/page.cpp @@ -183,9 +183,7 @@ bool ToastMessagePage::onEncoderClicked() { } void ToastMessagePage::refresh() { - const Style *style = getStyle( - type == INFO_TOAST ? STYLE_ID_INFO_ALERT : - STYLE_ID_ERROR_ALERT); + const Style *style = getStyle(type == INFO_TOAST ? STYLE_ID_INFO_ALERT : STYLE_ID_ERROR_ALERT); font::Font font = styleGetFont(style);