Skip to content

Commit

Permalink
#71
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Nov 12, 2020
1 parent 3bc8561 commit d48a963
Show file tree
Hide file tree
Showing 14 changed files with 53,120 additions and 53,122 deletions.
3 changes: 1 addition & 2 deletions modular-psu-firmware.eez-project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7675,8 +7675,7 @@
{
"type": "DisplayData",
"style": {
"inheritFrom": "edit_value_M_left",
"alignHorizontal": "left-right"
"inheritFrom": "edit_value_M_left"
},
"data": "keypad_text",
"left": 0,
Expand Down
65,606 changes: 32,802 additions & 32,804 deletions src/eez/gui/document_simulator.cpp
View file

Large diffs are not rendered by default.

167 changes: 83 additions & 84 deletions src/eez/gui/document_simulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1680,58 +1680,58 @@ enum StylesEnum {
STYLE_ID_SCROLLBAR_BUTTON = 117,
STYLE_ID_BOTTOM_BUTTON_TEXTUAL_S_LEFT = 118,
STYLE_ID_INLINE119 = 119,
STYLE_ID_INLINE120 = 120,
STYLE_ID_KEY_SPEC_ICONS = 121,
STYLE_ID_INLINE122 = 122,
STYLE_ID_KEY_SPEC_ICONS_DISABLED = 123,
STYLE_ID_KEY_SPEC_ICONS = 120,
STYLE_ID_INLINE121 = 121,
STYLE_ID_KEY_SPEC_ICONS_DISABLED = 122,
STYLE_ID_INLINE123 = 123,
STYLE_ID_INLINE124 = 124,
STYLE_ID_INLINE125 = 125,
STYLE_ID_INLINE126 = 126,
STYLE_ID_INLINE127 = 127,
STYLE_ID_EDIT_VALUE_S_CENTERED = 128,
STYLE_ID_EDIT_VALUE_S_CENTERED = 127,
STYLE_ID_INLINE128 = 128,
STYLE_ID_INLINE129 = 129,
STYLE_ID_INLINE130 = 130,
STYLE_ID_INLINE131 = 131,
STYLE_ID_INLINE132 = 132,
STYLE_ID_INLINE133 = 133,
STYLE_ID_INLINE134 = 134,
STYLE_ID_INLINE135 = 135,
STYLE_ID_VALUE_M_LEFT = 136,
STYLE_ID_MAX_CURRENT_LIMIT_CAUSE = 137,
STYLE_ID_INLINE138 = 138,
STYLE_ID_DEFAULT_DISABLED_M_LEFT = 139,
STYLE_ID_ENCODER_CURSOR_17_ENABLED = 140,
STYLE_ID_INLINE141 = 141,
STYLE_ID_YT_GRAPH = 142,
STYLE_ID_LIST_GRAPH_CURSOR = 143,
STYLE_ID_YT_GRAPH_U_DEFAULT_LABEL = 144,
STYLE_ID_YT_GRAPH_I_DEFAULT_LABEL = 145,
STYLE_ID_ENCODER_CURSOR_14_ENABLED = 146,
STYLE_ID_VALUE_M_LEFT = 135,
STYLE_ID_MAX_CURRENT_LIMIT_CAUSE = 136,
STYLE_ID_INLINE137 = 137,
STYLE_ID_DEFAULT_DISABLED_M_LEFT = 138,
STYLE_ID_ENCODER_CURSOR_17_ENABLED = 139,
STYLE_ID_INLINE140 = 140,
STYLE_ID_YT_GRAPH = 141,
STYLE_ID_LIST_GRAPH_CURSOR = 142,
STYLE_ID_YT_GRAPH_U_DEFAULT_LABEL = 143,
STYLE_ID_YT_GRAPH_I_DEFAULT_LABEL = 144,
STYLE_ID_ENCODER_CURSOR_14_ENABLED = 145,
STYLE_ID_INLINE146 = 146,
STYLE_ID_INLINE147 = 147,
STYLE_ID_INLINE148 = 148,
STYLE_ID_INLINE149 = 149,
STYLE_ID_EDIT_VALUE_M_CENTERED = 150,
STYLE_ID_EDIT_VALUE_M_CENTERED = 149,
STYLE_ID_INLINE150 = 150,
STYLE_ID_INLINE151 = 151,
STYLE_ID_INLINE152 = 152,
STYLE_ID_INLINE153 = 153,
STYLE_ID_BUTTON_S_DISABLED = 154,
STYLE_ID_BUTTON_S_DISABLED = 153,
STYLE_ID_INLINE154 = 154,
STYLE_ID_INLINE155 = 155,
STYLE_ID_INLINE156 = 156,
STYLE_ID_OPTION_TOGGLE_L_CENTER = 157,
STYLE_ID_INLINE158 = 158,
STYLE_ID_EVENT_ERROR = 159,
STYLE_ID_DEFAULT_DISABLED_S_LEFT = 160,
STYLE_ID_INLINE161 = 161,
STYLE_ID_ICON_AND_TEXT_S = 162,
STYLE_ID_OPTION_TOGGLE_L_CENTER = 156,
STYLE_ID_INLINE157 = 157,
STYLE_ID_EVENT_ERROR = 158,
STYLE_ID_DEFAULT_DISABLED_S_LEFT = 159,
STYLE_ID_INLINE160 = 160,
STYLE_ID_ICON_AND_TEXT_S = 161,
STYLE_ID_INLINE162 = 162,
STYLE_ID_INLINE163 = 163,
STYLE_ID_INLINE164 = 164,
STYLE_ID_VALUE_M = 165,
STYLE_ID_VALUE_M = 164,
STYLE_ID_INLINE165 = 165,
STYLE_ID_INLINE166 = 166,
STYLE_ID_INLINE167 = 167,
STYLE_ID_DEFAULT_DISABLED = 168,
STYLE_ID_DEFAULT_DISABLED = 167,
STYLE_ID_INLINE168 = 168,
STYLE_ID_INLINE169 = 169,
STYLE_ID_INLINE170 = 170,
STYLE_ID_EDIT_S = 171,
STYLE_ID_EDIT_S = 170,
STYLE_ID_INLINE171 = 171,
STYLE_ID_INLINE172 = 172,
STYLE_ID_INLINE173 = 173,
STYLE_ID_INLINE174 = 174,
Expand All @@ -1748,8 +1748,8 @@ enum StylesEnum {
STYLE_ID_INLINE185 = 185,
STYLE_ID_INLINE186 = 186,
STYLE_ID_INLINE187 = 187,
STYLE_ID_INLINE188 = 188,
STYLE_ID_DEFAULT_M = 189,
STYLE_ID_DEFAULT_M = 188,
STYLE_ID_INLINE189 = 189,
STYLE_ID_INLINE190 = 190,
STYLE_ID_INLINE191 = 191,
STYLE_ID_INLINE192 = 192,
Expand All @@ -1760,29 +1760,29 @@ enum StylesEnum {
STYLE_ID_INLINE197 = 197,
STYLE_ID_INLINE198 = 198,
STYLE_ID_INLINE199 = 199,
STYLE_ID_INLINE200 = 200,
STYLE_ID_EVENT_WARNING = 201,
STYLE_ID_DISPLAY_OFF = 202,
STYLE_ID_DISPLAY_OFF_S = 203,
STYLE_ID_EVENT_WARNING = 200,
STYLE_ID_DISPLAY_OFF = 201,
STYLE_ID_DISPLAY_OFF_S = 202,
STYLE_ID_INLINE203 = 203,
STYLE_ID_INLINE204 = 204,
STYLE_ID_INLINE205 = 205,
STYLE_ID_INLINE206 = 206,
STYLE_ID_INST_MIN_HEADER = 207,
STYLE_ID_INST_MIN_HEADER = 206,
STYLE_ID_INLINE207 = 207,
STYLE_ID_INLINE208 = 208,
STYLE_ID_INLINE209 = 209,
STYLE_ID_INLINE210 = 210,
STYLE_ID_INLINE211 = 211,
STYLE_ID_INLINE212 = 212,
STYLE_ID_INST_MAX_HEADER = 213,
STYLE_ID_INST_MAX_HEADER = 212,
STYLE_ID_INLINE213 = 213,
STYLE_ID_INLINE214 = 214,
STYLE_ID_INLINE215 = 215,
STYLE_ID_INLINE216 = 216,
STYLE_ID_INLINE217 = 217,
STYLE_ID_INLINE218 = 218,
STYLE_ID_INLINE219 = 219,
STYLE_ID_STATUS_LINE_SMALL_TITLE = 220,
STYLE_ID_EDIT_VALUE_S_CENTERED_STATUS_LINE = 221,
STYLE_ID_SCROLLBAR_TRACK = 222,
STYLE_ID_STATUS_LINE_SMALL_TITLE = 219,
STYLE_ID_EDIT_VALUE_S_CENTERED_STATUS_LINE = 220,
STYLE_ID_SCROLLBAR_TRACK = 221,
STYLE_ID_INLINE222 = 222,
STYLE_ID_INLINE223 = 223,
STYLE_ID_INLINE224 = 224,
STYLE_ID_INLINE225 = 225,
Expand Down Expand Up @@ -1827,8 +1827,8 @@ enum StylesEnum {
STYLE_ID_INLINE264 = 264,
STYLE_ID_INLINE265 = 265,
STYLE_ID_INLINE266 = 266,
STYLE_ID_INLINE267 = 267,
STYLE_ID_FRONT_PANEL_MODULE = 268,
STYLE_ID_FRONT_PANEL_MODULE = 267,
STYLE_ID_INLINE268 = 268,
STYLE_ID_INLINE269 = 269,
STYLE_ID_INLINE270 = 270,
STYLE_ID_INLINE271 = 271,
Expand Down Expand Up @@ -1859,37 +1859,37 @@ enum StylesEnum {
STYLE_ID_INLINE296 = 296,
STYLE_ID_INLINE297 = 297,
STYLE_ID_INLINE298 = 298,
STYLE_ID_INLINE299 = 299,
STYLE_ID_MON_VALUE_48_RIGHT = 300,
STYLE_ID_INLINE301 = 301,
STYLE_ID_MON_VALUE_20_LEFT = 302,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 303,
STYLE_ID_BAR_GRAPH_TEXT = 304,
STYLE_ID_BAR_GRAPH_SET_LINE = 305,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 306,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 307,
STYLE_ID_INLINE308 = 308,
STYLE_ID_TRIGGER_BUTTON_24 = 309,
STYLE_ID_MON_VALUE_48_RIGHT = 299,
STYLE_ID_INLINE300 = 300,
STYLE_ID_MON_VALUE_20_LEFT = 301,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 302,
STYLE_ID_BAR_GRAPH_TEXT = 303,
STYLE_ID_BAR_GRAPH_SET_LINE = 304,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 305,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 306,
STYLE_ID_INLINE307 = 307,
STYLE_ID_TRIGGER_BUTTON_24 = 308,
STYLE_ID_INLINE309 = 309,
STYLE_ID_INLINE310 = 310,
STYLE_ID_INLINE311 = 311,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 312,
STYLE_ID_TRIGGER_BUTTON_14 = 313,
STYLE_ID_INLINE314 = 314,
STYLE_ID_INST_SELECTED = 315,
STYLE_ID_MON_VALUE_38_RIGHT = 316,
STYLE_ID_INLINE317 = 317,
STYLE_ID_CH_PROT_OFF = 318,
STYLE_ID_CH_PROT_ON = 319,
STYLE_ID_CH_PROT_TRIPPED = 320,
STYLE_ID_INLINE321 = 321,
STYLE_ID_MON_VALUE_20_RIGHT = 322,
STYLE_ID_MON_VALUE_14_LEFT = 323,
STYLE_ID_MON_VALUE_14_CENTER = 324,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 325,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 326,
STYLE_ID_MON_VALUE_14_RIGHT = 327,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 328,
STYLE_ID_MON_VALUE_24_RIGHT = 329,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 311,
STYLE_ID_TRIGGER_BUTTON_14 = 312,
STYLE_ID_INLINE313 = 313,
STYLE_ID_INST_SELECTED = 314,
STYLE_ID_MON_VALUE_38_RIGHT = 315,
STYLE_ID_INLINE316 = 316,
STYLE_ID_CH_PROT_OFF = 317,
STYLE_ID_CH_PROT_ON = 318,
STYLE_ID_CH_PROT_TRIPPED = 319,
STYLE_ID_INLINE320 = 320,
STYLE_ID_MON_VALUE_20_RIGHT = 321,
STYLE_ID_MON_VALUE_14_LEFT = 322,
STYLE_ID_MON_VALUE_14_CENTER = 323,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 324,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 325,
STYLE_ID_MON_VALUE_14_RIGHT = 326,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 327,
STYLE_ID_MON_VALUE_24_RIGHT = 328,
STYLE_ID_INLINE329 = 329,
STYLE_ID_INLINE330 = 330,
STYLE_ID_INLINE331 = 331,
STYLE_ID_INLINE332 = 332,
Expand All @@ -1901,8 +1901,7 @@ enum StylesEnum {
STYLE_ID_INLINE338 = 338,
STYLE_ID_INLINE339 = 339,
STYLE_ID_INLINE340 = 340,
STYLE_ID_INLINE341 = 341,
STYLE_ID_INLINE342 = 342
STYLE_ID_INLINE341 = 341
};

enum ThemesEnum {
Expand Down Expand Up @@ -2227,4 +2226,4 @@ enum PagesEnum {
PAGE_ID_DIB_DCM224_SLOT_MICRO_2CH_OFF = 252
};

extern const uint8_t assets[538728];
extern const uint8_t assets[538699];
Loading

0 comments on commit d48a963

Please sign in to comment.