From 1a38f0de5faba8edd0da18115e95da587a265e82 Mon Sep 17 00:00:00 2001 From: prasimix Date: Fri, 26 Jul 2019 07:57:31 +0200 Subject: [PATCH] color theme modifications --- modular-psu-firmware.eez-project | 917 +++++++++++++++---------------- 1 file changed, 436 insertions(+), 481 deletions(-) diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project index fc103921f..16d851fa0 100644 --- a/modular-psu-firmware.eez-project +++ b/modular-psu-firmware.eez-project @@ -2130,7 +2130,7 @@ "top": 50, "width": 480, "height": 40, - "text": "Welcome to EEZ PSU" + "text": "Welcome to EEZ BB3" }, { "type": "Bitmap", @@ -2221,6 +2221,7 @@ "type": "Text", "style": { "inheritFrom": "edit_info_S", + "color": "inst_min_header_bgnd", "padding": 0 }, "activeStyle": { @@ -2234,9 +2235,10 @@ "text": "Initial touchscreen calibration" }, { - "type": "MultilineText", + "type": "Text", "style": { - "inheritFrom": "default_S", + "inheritFrom": "edit_info_S", + "color": "inst_min_header_bgnd", "padding": 0 }, "activeStyle": { @@ -2244,13 +2246,13 @@ "padding": 0 }, "left": 88, - "top": 42, + "top": 230, "width": 304, - "height": 138, - "text": "Use a stylus or something similar to touch as close to the center of the highlighted crosshair as possible. Keep as still as possible and keep holding until the highlight is removed. Repeat for all crosshairs in sequence." + "height": 26, + "text": "Touch screen to start!" }, { - "type": "MultilineText", + "type": "Text", "style": { "inheritFrom": "default_S", "padding": 0 @@ -2260,15 +2262,31 @@ "padding": 0 }, "left": 88, - "top": 180, - "width": 304, - "height": 50, - "text": "Do NOT use your finger as a calibration stylus or the result WILL BE imprecise." + "top": 181, + "width": 35, + "height": 26, + "text": "\\u0081" }, { - "type": "Text", + "type": "MultilineText", "style": { - "inheritFrom": "edit_info_S", + "inheritFrom": "default_S", + "padding": 0 + }, + "activeStyle": { + "inheritFrom": "default", + "padding": 0 + }, + "left": 123, + "top": 181, + "width": 269, + "height": 51, + "text": "Do not use your finger as a stylus or the result will be imprecise." + }, + { + "type": "MultilineText", + "style": { + "inheritFrom": "default_S", "padding": 0 }, "activeStyle": { @@ -2276,10 +2294,10 @@ "padding": 0 }, "left": 88, - "top": 230, + "top": 43, "width": 304, - "height": 26, - "text": "Touch screen to start!" + "height": 141, + "text": "Use a stylus or something similar to touch as close to the center of the highlighted crosshair as possible. Keep holding as still as possible until the highlight is removed. Repeat for all crosshairs in sequence." } ], "left": 0, @@ -2426,6 +2444,8 @@ "type": "DisplayData", "style": { "inheritFrom": "menu_S", + "font": "Oswald24", + "color": "text_regular", "padding": 0 }, "activeStyle": { @@ -2447,6 +2467,8 @@ "type": "Text", "style": { "inheritFrom": "menu_S", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -2464,6 +2486,8 @@ "type": "Text", "style": { "inheritFrom": "menu_S", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -2492,6 +2516,8 @@ "type": "DisplayData", "style": { "inheritFrom": "menu_S", + "font": "Oswald24", + "color": "text_regular", "padding": 0 }, "activeStyle": { @@ -2513,6 +2539,8 @@ "type": "Text", "style": { "inheritFrom": "menu_S", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -2530,6 +2558,8 @@ "type": "Text", "style": { "inheritFrom": "menu_S", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -2537,7 +2567,7 @@ "padding": 0 }, "action": "no", - "left": 190, + "left": 188, "top": 176, "width": 100, "height": 40, @@ -2547,6 +2577,8 @@ "type": "Text", "style": { "inheritFrom": "menu_S", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -2554,9 +2586,9 @@ "padding": 0 }, "action": "cancel", - "left": 290, + "left": 300, "top": 176, - "width": 88, + "width": 78, "height": 40, "text": "Cancel" } @@ -3704,7 +3736,7 @@ "inheritFrom": "status_bgnd", "font": "Heydings14", "alignVertical": "top", - "color": "status_line_text", + "color": "status_warning", "backgroundColor": "status_line_background" }, "activeStyle": { @@ -11782,6 +11814,8 @@ "type": "Text", "style": { "inheritFrom": "yes_no", + "font": "Oswald20", + "backgroundColor": "popup_background_warning", "padding": 0 }, "activeStyle": { @@ -11799,6 +11833,9 @@ "type": "Text", "style": { "inheritFrom": "yes_no_button", + "font": "Oswald20", + "color": "text_enabled", + "backgroundColor": "popup_background_warning", "padding": 0 }, "activeStyle": { @@ -11816,6 +11853,9 @@ "type": "Text", "style": { "inheritFrom": "yes_no_button", + "font": "Oswald20", + "color": "text_enabled", + "backgroundColor": "popup_background_warning", "padding": 0 }, "activeStyle": { @@ -11998,6 +12038,7 @@ "type": "Text", "style": { "inheritFrom": "yes_no", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -12015,6 +12056,7 @@ "type": "Text", "style": { "inheritFrom": "yes_no_button", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -12032,6 +12074,7 @@ "type": "Text", "style": { "inheritFrom": "yes_no_button", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -12049,6 +12092,7 @@ "type": "Text", "style": { "inheritFrom": "yes_no_button", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -12077,6 +12121,7 @@ "type": "Text", "style": { "inheritFrom": "text_message", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -12105,6 +12150,7 @@ "type": "Text", "style": { "inheritFrom": "async_operation", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -12113,15 +12159,16 @@ }, "data": "alert_message", "left": 0, - "top": 16, + "top": 14, "width": 280, - "height": 28, + "height": 32, "text": "" }, { "type": "Text", "style": { "inheritFrom": "async_operation", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -12130,7 +12177,7 @@ }, "data": "asyncOperationThrobber", "left": 0, - "top": 44, + "top": 46, "width": 280, "height": 28, "text": "" @@ -12150,6 +12197,7 @@ "type": "Text", "style": { "inheritFrom": "async_operation", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -12158,7 +12206,7 @@ }, "data": "alert_message", "left": 0, - "top": 16, + "top": 12, "width": 240, "height": 28, "text": "" @@ -12167,6 +12215,7 @@ "type": "Text", "style": { "inheritFrom": "async_operation", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -12184,6 +12233,8 @@ "type": "Text", "style": { "inheritFrom": "async_operation_action", + "font": "Oswald20", + "color": "text_enabled", "padding": 0 }, "activeStyle": { @@ -12508,6 +12559,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12525,6 +12578,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12542,6 +12597,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12559,6 +12616,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12576,6 +12635,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12593,6 +12654,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12610,6 +12673,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12627,6 +12692,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12644,6 +12711,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12661,6 +12730,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12678,6 +12749,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12695,6 +12768,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12712,6 +12787,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12729,6 +12806,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12746,6 +12825,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12763,6 +12844,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12780,6 +12863,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12797,6 +12882,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12814,6 +12901,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12831,6 +12920,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12848,6 +12939,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12865,6 +12958,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12882,6 +12977,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12899,6 +12996,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12916,6 +13015,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12933,6 +13034,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12950,6 +13053,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12967,6 +13072,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -12984,6 +13091,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13001,6 +13110,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13018,6 +13129,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13035,6 +13148,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13052,6 +13167,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13069,6 +13186,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13086,6 +13205,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13103,6 +13224,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13120,6 +13243,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13137,6 +13262,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13154,6 +13281,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13171,6 +13300,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13188,6 +13319,8 @@ "type": "Text", "style": { "inheritFrom": "key_spec_icons", + "color": "status_line_text", + "backgroundColor": "status_line_background", "padding": 0 }, "activeStyle": { @@ -13205,6 +13338,8 @@ "type": "ToggleButton", "style": { "inheritFrom": "key_spec", + "color": "status_line_text", + "backgroundColor": "status_line_background", "padding": 0 }, "activeStyle": { @@ -13224,6 +13359,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13241,6 +13378,8 @@ "type": "Text", "style": { "inheritFrom": "key_spec_icons", + "color": "status_line_text", + "backgroundColor": "status_line_background", "padding": 0 }, "activeStyle": { @@ -13258,6 +13397,8 @@ "type": "Text", "style": { "inheritFrom": "key_spec_icons", + "color": "status_line_text", + "backgroundColor": "status_line_background", "padding": 0 }, "activeStyle": { @@ -13324,6 +13465,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13341,6 +13484,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13358,6 +13503,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13375,6 +13522,8 @@ "type": "Text", "style": { "inheritFrom": "key_icons", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13392,6 +13541,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13409,6 +13560,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13426,6 +13579,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13443,6 +13598,8 @@ "type": "Button", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13465,6 +13622,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13482,6 +13641,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13499,6 +13660,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13516,6 +13679,8 @@ "type": "Button", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13539,6 +13704,8 @@ "type": "Text", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13556,6 +13723,8 @@ "type": "Button", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13578,6 +13747,8 @@ "type": "Button", "style": { "inheritFrom": "key_icons", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13600,6 +13771,8 @@ "type": "Button", "style": { "inheritFrom": "key", + "color": "text_enabled", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -13625,6 +13798,8 @@ "type": "Rectangle", "style": { "inheritFrom": "bottom_button_background", + "color": "status_line_background", + "backgroundColor": "status_line_background", "padding": 0 }, "activeStyle": { @@ -13640,6 +13815,8 @@ "type": "Text", "style": { "inheritFrom": "bottom_button", + "color": "status_line_text", + "backgroundColor": "status_line_background", "padding": 0 }, "activeStyle": { @@ -13657,6 +13834,8 @@ "type": "Text", "style": { "inheritFrom": "bottom_button", + "color": "status_line_text", + "backgroundColor": "status_line_background", "padding": 0 }, "activeStyle": { @@ -14033,22 +14212,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -14311,22 +14474,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -14832,22 +14979,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -15397,22 +15528,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -15918,22 +16033,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -16593,22 +16692,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -17253,22 +17336,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -17294,7 +17361,7 @@ "data": "channel.lists", "left": 2, "top": 2, - "width": 410, + "width": 476, "height": 90, "dwellData": "channel.list.dwell", "y1Data": "channel.list.voltage", @@ -17763,22 +17830,6 @@ "top": 236, "width": 165, "height": 36 - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -17795,6 +17846,9 @@ "type": "Text", "style": { "inheritFrom": "select_enum_item_popup_item", + "font": "Oswald20", + "alignHorizontal": "center", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -17803,9 +17857,9 @@ }, "data": "", "action": "channel.lists.insertRowAbove", - "left": 12, + "left": 10, "top": 12, - "width": 140, + "width": 200, "height": 32, "text": "Insert row above" }, @@ -17813,6 +17867,9 @@ "type": "Text", "style": { "inheritFrom": "select_enum_item_popup_item", + "font": "Oswald20", + "alignHorizontal": "center", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -17821,17 +17878,17 @@ }, "data": "", "action": "channel.lists.insertRowBelow", - "left": 12, - "top": 44, - "width": 140, + "left": 10, + "top": 46, + "width": 200, "height": 32, "text": "Insert row below" } ], - "left": 158, - "top": 92, - "width": 164, - "height": 88 + "left": 130, + "top": 90, + "width": 220, + "height": 92 }, { "name": "ch_settings_lists_delete_menu", @@ -17842,6 +17899,7 @@ "type": "Button", "style": { "inheritFrom": "select_enum_item_popup_item", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -17864,6 +17922,7 @@ "type": "Button", "style": { "inheritFrom": "select_enum_item_popup_item", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -17886,6 +17945,7 @@ "type": "Button", "style": { "inheritFrom": "select_enum_item_popup_item", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -17908,6 +17968,7 @@ "type": "Text", "style": { "inheritFrom": "select_enum_item_popup_item", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -17936,6 +17997,8 @@ "type": "Text", "style": { "inheritFrom": "select_enum_item_popup_item", + "font": "Oswald20", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -17944,15 +18007,17 @@ }, "action": "channel.enableOutput", "left": 12, - "top": 76, - "width": 148, - "height": 32, + "top": 96, + "width": 226, + "height": 34, "text": "Only enable output" }, { "type": "Text", "style": { "inheritFrom": "select_enum_item_popup_item", + "font": "Oswald20", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -17962,14 +18027,16 @@ "action": "channel.initiateTrigger", "left": 12, "top": 12, - "width": 148, - "height": 32, + "width": 226, + "height": 34, "text": "Initiate trigger" }, { "type": "Text", "style": { "inheritFrom": "select_enum_item_popup_item", + "font": "Oswald20", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -17978,17 +18045,17 @@ }, "action": "channel.setToFixed", "left": 12, - "top": 44, - "width": 148, - "height": 32, + "top": 54, + "width": 226, + "height": 34, "text": "Set to fixed" } ], "closePageIfTouchedOutside": true, - "left": 74, - "top": 60, - "width": 172, - "height": 120 + "left": 115, + "top": 65, + "width": 250, + "height": 142 }, { "name": "ch_settings_adv", @@ -18454,22 +18521,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -18989,22 +19040,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -19402,22 +19437,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -19629,22 +19648,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -19974,22 +19977,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -20578,22 +20565,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -21469,22 +21440,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -21837,22 +21792,6 @@ "height": 28, "text": "Sound" }, - { - "type": "Text", - "style": { - "inheritFrom": "edit_value_S_left", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 240, - "top": 140, - "width": 138, - "height": 28, - "text": "System password" - }, { "type": "Text", "style": { @@ -21864,11 +21803,11 @@ "padding": 0 }, "action": "edit_system_password", - "left": 378, + "left": 239, "top": 140, - "width": 70, + "width": 208, "height": 28, - "text": "Change" + "text": "Change system password" } ] }, @@ -22527,6 +22466,7 @@ "type": "Text", "style": { "inheritFrom": "edit_value_active", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -22535,9 +22475,9 @@ }, "action": "sys.settings.protections.toggleShutdownWhenProtectionTripped", "left": 0, - "top": 0, + "top": 2, "width": 57, - "height": 56, + "height": 52, "text": "No" }, { @@ -22627,6 +22567,7 @@ "type": "Text", "style": { "inheritFrom": "edit_value_active", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -22635,9 +22576,9 @@ }, "action": "sys.settings.protections.toggleOutputProtectionCouple", "left": 0, - "top": 0, + "top": 2, "width": 57, - "height": 56, + "height": 52, "text": "No" }, { @@ -22786,6 +22727,7 @@ "type": "Text", "style": { "inheritFrom": "edit_value_active", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -22794,9 +22736,9 @@ }, "action": "sys.settings.protections.toggleForceDisablingAllOutputsOnPowerUp", "left": 0, - "top": 0, + "top": 2, "width": 57, - "height": 56, + "height": 52, "text": "No" }, { @@ -26616,6 +26558,7 @@ "type": "Text", "style": { "inheritFrom": "edit_value_S_left", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -26624,14 +26567,17 @@ }, "left": 15, "top": 12, - "width": 107, - "height": 28, + "width": 140, + "height": 32, "text": "IP address:" }, { "type": "Text", "style": { "inheritFrom": "edit_value_active_S_left", + "font": "Oswald20", + "alignHorizontal": "center", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -26640,15 +26586,16 @@ }, "data": "ethernet.ipAddress", "action": "ethernet.editIpAddress", - "left": 122, + "left": 165, "top": 12, - "width": 133, - "height": 28 + "width": 190, + "height": 32 }, { "type": "Text", "style": { "inheritFrom": "edit_value_S_left", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -26656,15 +26603,18 @@ "padding": 0 }, "left": 15, - "top": 40, - "width": 107, - "height": 28, + "top": 46, + "width": 140, + "height": 32, "text": "DNS:" }, { "type": "Text", "style": { "inheritFrom": "edit_value_active_S_left", + "font": "Oswald20", + "alignHorizontal": "center", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -26673,15 +26623,16 @@ }, "data": "ethernet.dns", "action": "ethernet.editDns", - "left": 122, - "top": 40, - "width": 133, - "height": 28 + "left": 165, + "top": 46, + "width": 190, + "height": 32 }, { "type": "Text", "style": { "inheritFrom": "edit_value_S_left", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -26689,15 +26640,18 @@ "padding": 0 }, "left": 15, - "top": 68, - "width": 107, - "height": 28, + "top": 80, + "width": 140, + "height": 32, "text": "Gateway:" }, { "type": "Text", "style": { "inheritFrom": "edit_value_active_S_left", + "font": "Oswald20", + "alignHorizontal": "center", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -26706,15 +26660,16 @@ }, "data": "ethernet.gateway", "action": "ethernet.editGateway", - "left": 122, - "top": 68, - "width": 133, - "height": 28 + "left": 165, + "top": 80, + "width": 190, + "height": 32 }, { "type": "Text", "style": { "inheritFrom": "edit_value_S_left", + "font": "Oswald20", "padding": 0 }, "activeStyle": { @@ -26722,15 +26677,18 @@ "padding": 0 }, "left": 15, - "top": 96, - "width": 107, - "height": 28, + "top": 114, + "width": 155, + "height": 32, "text": "Subnet mask:" }, { "type": "Text", "style": { "inheritFrom": "edit_value_active_S_left", + "font": "Oswald20", + "alignHorizontal": "center", + "backgroundColor": "text_enable_background", "padding": 0 }, "activeStyle": { @@ -26739,10 +26697,10 @@ }, "data": "ethernet.subnetMask", "action": "ethernet.editSubnetMask", - "left": 122, - "top": 96, - "width": 133, - "height": 28 + "left": 165, + "top": 114, + "width": 190, + "height": 32 } ] }, @@ -28829,8 +28787,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 10, - "top": 32, + "left": 232, + "top": 14, "width": 140, "height": 28, "text": "Brightness:" @@ -28847,8 +28805,8 @@ }, "data": "sys.display.brightness", "action": "", - "left": 150, - "top": 32, + "left": 372, + "top": 14, "width": 82, "height": 28, "buttonsStyle": { @@ -28868,8 +28826,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 10, - "top": 60, + "left": 232, + "top": 55, "width": 140, "height": 28, "text": "Luminosity:" @@ -28886,8 +28844,8 @@ }, "data": "sys.display.backgroundLuminosityStep", "action": "", - "left": 150, - "top": 60, + "left": 372, + "top": 55, "width": 82, "height": 28, "buttonsStyle": { @@ -28907,8 +28865,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 10, - "top": 86, + "left": 232, + "top": 84, "width": 84, "height": 28, "text": "Backgnd" @@ -28923,8 +28881,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 94, - "top": 86, + "left": 316, + "top": 84, "width": 84, "height": 28, "text": "Status" @@ -28939,8 +28897,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 178, - "top": 86, + "left": 400, + "top": 84, "width": 68, "height": 28, "text": "Pop up" @@ -28955,8 +28913,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 10, - "top": 114, + "left": 232, + "top": 112, "width": 58, "height": 34, "text": "@", @@ -28972,8 +28930,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 94, - "top": 114, + "left": 316, + "top": 112, "width": 29, "height": 34, "text": "@", @@ -28989,8 +28947,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 123, - "top": 114, + "left": 345, + "top": 112, "width": 29, "height": 34, "text": "@", @@ -29006,8 +28964,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 178, - "top": 114, + "left": 400, + "top": 112, "width": 29, "height": 34, "text": "@" @@ -29022,8 +28980,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 207, - "top": 114, + "left": 429, + "top": 112, "width": 29, "height": 34, "text": "@", @@ -29040,8 +28998,8 @@ "padding": 0 }, "action": "show_sys_settings_screen_calibration", - "left": 263, - "top": 32, + "left": 12, + "top": 42, "width": 211, "height": 28, "text": "Touchscreen calibration" @@ -29057,8 +29015,8 @@ "padding": 0 }, "action": "turnDisplayOff", - "left": 263, - "top": 60, + "left": 12, + "top": 70, "width": 211, "height": 28, "text": "Turn display off" @@ -29073,8 +29031,8 @@ "inheritFrom": "default", "padding": 0 }, - "left": 263, - "top": 88, + "left": 12, + "top": 14, "width": 58, "height": 28, "text": "Theme:" @@ -29091,11 +29049,63 @@ }, "data": "selected_theme", "action": "select_theme", - "left": 346, - "top": 88, + "left": 71, + "top": 14, "width": 128, "height": 28, "text": "" + }, + { + "type": "Rectangle", + "style": { + "inheritFrom": "default" + }, + "activeStyle": { + "inheritFrom": "default" + }, + "left": 225, + "top": 45, + "width": 242, + "height": 2 + }, + { + "type": "Rectangle", + "style": { + "inheritFrom": "default" + }, + "activeStyle": { + "inheritFrom": "default" + }, + "left": 225, + "top": 154, + "width": 242, + "height": 2 + }, + { + "type": "Rectangle", + "style": { + "inheritFrom": "default" + }, + "activeStyle": { + "inheritFrom": "default" + }, + "left": 225, + "top": 47, + "width": 2, + "height": 109 + }, + { + "type": "Rectangle", + "style": { + "inheritFrom": "default" + }, + "activeStyle": { + "inheritFrom": "default" + }, + "left": 465, + "top": 47, + "width": 2, + "height": 109 } ] }, @@ -30867,22 +30877,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -31210,22 +31204,6 @@ "width": 48, "height": 36, "text": "X" - }, - { - "type": "LayoutView", - "style": { - "inheritFrom": "default", - "padding": 0 - }, - "activeStyle": { - "inheritFrom": "default", - "padding": 0 - }, - "left": 412, - "top": 0, - "width": 68, - "height": 204, - "layout": "Channels" } ], "left": 0, @@ -31243,6 +31221,7 @@ "style": { "inheritFrom": "select_enum_item_popup_item", "font": "Oswald20", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -31261,6 +31240,7 @@ "style": { "inheritFrom": "select_enum_item_popup_item", "font": "Oswald20", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -31279,6 +31259,7 @@ "style": { "inheritFrom": "select_enum_item_popup_item", "font": "Oswald20", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -31296,6 +31277,8 @@ "type": "Rectangle", "style": { "inheritFrom": "dark_line", + "color": "popup_text_selected", + "backgroundColor": "popup_background_regular", "padding": 0 }, "activeStyle": { @@ -31312,6 +31295,7 @@ "style": { "inheritFrom": "select_enum_item_popup_item", "font": "Oswald20", + "color": "popup_text_selected", "padding": 0 }, "activeStyle": { @@ -31426,6 +31410,8 @@ "type": "Text", "style": { "inheritFrom": "display_off", + "color": "text_regular", + "backgroundColor": "Background", "padding": 0 }, "activeStyle": { @@ -31442,6 +31428,8 @@ "type": "MultilineText", "style": { "inheritFrom": "display_off_S", + "color": "text_regular", + "backgroundColor": "Background", "padding": 0 }, "activeStyle": { @@ -36892,7 +36880,6 @@ "type": "Bitmap", "style": { "inheritFrom": "front_panel_default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -36909,7 +36896,6 @@ "type": "List", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -36925,7 +36911,6 @@ "type": "Container", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -36941,7 +36926,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -36958,7 +36942,6 @@ "type": "Rectangle", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -36975,7 +36958,6 @@ "type": "Container", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -36991,7 +36973,6 @@ "type": "Bitmap", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37008,7 +36989,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37028,7 +37008,6 @@ "font": "Oswald14", "alignHorizontal": "center", "color": "#9b9b00", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 4, "borderColor": "#808080", @@ -37077,7 +37056,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37095,7 +37073,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37115,7 +37092,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37136,7 +37112,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37154,7 +37129,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37195,7 +37169,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37213,7 +37186,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37233,7 +37205,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37254,7 +37225,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37272,7 +37242,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37292,7 +37261,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37313,7 +37281,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37331,7 +37298,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37350,7 +37316,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37368,7 +37333,6 @@ "style": { "inheritFrom": "default", "color": "#00ff00", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37388,7 +37352,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37408,7 +37371,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37428,7 +37390,6 @@ "style": { "inheritFrom": "default", "color": "#00ff00", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37451,7 +37412,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37469,7 +37429,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37489,7 +37448,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37509,7 +37467,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37532,7 +37489,6 @@ "type": "Container", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37548,7 +37504,6 @@ "type": "Bitmap", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37565,7 +37520,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37585,7 +37539,6 @@ "font": "Oswald14", "alignHorizontal": "center", "color": "#9b9b00", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 4, "borderColor": "#808080", @@ -37634,7 +37587,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37652,7 +37604,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37672,7 +37623,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37693,7 +37643,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37711,7 +37660,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37752,7 +37700,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37770,7 +37717,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37790,7 +37736,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37811,7 +37756,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37829,7 +37773,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37849,7 +37792,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37870,7 +37812,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37888,7 +37829,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37907,7 +37847,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -37925,7 +37864,6 @@ "style": { "inheritFrom": "default", "color": "#00ff00", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37945,7 +37883,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37965,7 +37902,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -37985,7 +37921,6 @@ "style": { "inheritFrom": "default", "color": "#00ff00", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -38008,7 +37943,6 @@ "type": "Select", "style": { "inheritFrom": "default", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -38026,7 +37960,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -38046,7 +37979,6 @@ "style": { "inheritFrom": "default", "color": "#ffffff", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -38066,7 +37998,6 @@ "style": { "inheritFrom": "default", "color": "#ff040b", - "backgroundColor": "#ffffff", "borderSize": 2, "borderRadius": 8, "borderColor": "#404040", @@ -38095,7 +38026,6 @@ "type": "AppView", "style": { "inheritFrom": "home", - "backgroundColor": "#ffffff", "padding": 0 }, "activeStyle": { @@ -62232,27 +62162,27 @@ { "name": "yes_no", "inheritFrom": "default_S", - "backgroundColor": "#f78000", + "backgroundColor": "popup_background_warning", "padding": 0 }, { "name": "yes_no_background", "inheritFrom": "default_S", - "color": "#f78000", - "backgroundColor": "#f78000", + "color": "popup_background_warning", + "backgroundColor": "popup_background_warning", "padding": 0 }, { "name": "yes_no_message", "inheritFrom": "default_S", "color": "#c0c0c0", - "backgroundColor": "#f78000", + "backgroundColor": "popup_background_warning", "padding": 0 }, { "name": "yes_no_button", "inheritFrom": "yes_no", - "color": "#ffff00", + "color": "text_enabled", "padding": 0 }, { @@ -62304,7 +62234,7 @@ "name": "max_current_limit_cause", "inheritFrom": "default_S", "alignHorizontal": "left", - "color": "#ff0000", + "color": "status_warning", "padding": 0 }, { @@ -62323,7 +62253,7 @@ "font": "Oswald24", "alignHorizontal": "center", "alignVertical": "center", - "color": "#ff0000", + "color": "status_warning", "borderSize": 0, "padding": 0 }, @@ -62360,7 +62290,7 @@ "font": "Oswald38", "alignHorizontal": "right", "alignVertical": "center", - "color": "#FF0000", + "color": "status_warning", "borderSize": 0, "padding": 0 }, @@ -62421,7 +62351,7 @@ "alignHorizontal": "center", "alignVertical": "center", "color": "#e0e000", - "backgroundColor": "#ff0000", + "backgroundColor": "status_warning", "borderSize": 0, "borderColor": "#D3D3D3", "padding": 0 @@ -62432,7 +62362,7 @@ "font": "Oswald14", "alignHorizontal": "center", "alignVertical": "center", - "color": "#ff0000", + "color": "status_warning", "borderSize": 0, "padding": 0 }, @@ -62442,7 +62372,7 @@ "font": "Oswald14", "alignHorizontal": "center", "alignVertical": "center", - "color": "#ff0000", + "color": "status_warning", "borderSize": 0, "padding": 0, "blink": true @@ -62607,7 +62537,7 @@ { "name": "select_enum_item_popup_container", "inheritFrom": "default_S", - "backgroundColor": "#cae7f0", + "backgroundColor": "popup_background_regular", "padding": "12", "alwaysBuild": true }, @@ -62616,6 +62546,7 @@ "inheritFrom": "select_enum_item_popup_container", "alignHorizontal": "left", "color": "#2f2f2f", + "backgroundColor": "popup_background_regular", "padding": "6", "alwaysBuild": true }, @@ -62629,16 +62560,16 @@ { "name": "display_off", "inheritFrom": "default", - "color": "#e6e6e6", - "backgroundColor": "#202020", + "color": "text_regular", + "backgroundColor": "Background", "padding": 0 }, { "name": "display_off_S", "inheritFrom": "display_off", "font": "Oswald14", - "color": "#e6e6e6", - "backgroundColor": "#202020", + "color": "text_regular", + "backgroundColor": "Background", "padding": 0 }, { @@ -62693,7 +62624,7 @@ "alignHorizontal": "center", "alignVertical": "center", "color": "#e0e000", - "backgroundColor": "#ff0000", + "backgroundColor": "status_warning", "borderSize": 0, "borderColor": "#D3D3D3", "padding": 0 @@ -408450,6 +408381,18 @@ }, { "name": "Action color" + }, + { + "name": "popup_background_regular" + }, + { + "name": "popup_text_selected" + }, + { + "name": "popup_background_warning" + }, + { + "name": "popup_background_info" } ], "themes": [ @@ -408479,7 +408422,11 @@ "#a1b52e", "#d3d3d3", "#404040", - "#ffff00" + "#ffff00", + "#cae7f0", + "#303030", + "#f78000", + "#000000" ] }, { @@ -408487,7 +408434,7 @@ "colors": [ "#f0f0f0", "#202020", - "#181e8a", + "#434cf6", "#d0d0d0", "#d0d0d0", "#404040", @@ -408508,7 +408455,11 @@ "#a1b52e", "#d3d3d3", "#202020", - "#9b9b00" + "#181e8a", + "#f0ef31", + "#303030", + "#f3da99", + "#000000" ] }, { @@ -408518,7 +408469,7 @@ "#d0d0d0", "#ffff7f", "#ff8000", - "#404040", + "#303030", "#f9fff0", "#bebebe", "#187397", @@ -408537,7 +408488,11 @@ "#a1b52e", "#202020", "#d0d0d0", - "#ffff00" + "#ffff00", + "#2b32b2", + "#b7a6f6", + "#a32d82", + "#000000" ] } ]