Skip to content

Commit

Permalink
"Action color" -> "action_color"
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Feb 11, 2021
1 parent 44e934d commit 62a955e
Show file tree
Hide file tree
Showing 7 changed files with 53,787 additions and 53,800 deletions.
66,242 changes: 33,119 additions & 33,123 deletions src/eez/gui/document_simulator.cpp
View file

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions src/eez/gui/document_simulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1993,36 +1993,36 @@ enum StylesEnum {
STYLE_ID_INLINE304 = 304,
STYLE_ID_INLINE305 = 305,
STYLE_ID_INLINE306 = 306,
STYLE_ID_INLINE307 = 307,
STYLE_ID_MON_VALUE_48_RIGHT = 308,
STYLE_ID_INLINE309 = 309,
STYLE_ID_MON_VALUE_20_LEFT = 310,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 311,
STYLE_ID_BAR_GRAPH_TEXT = 312,
STYLE_ID_BAR_GRAPH_SET_LINE = 313,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 314,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 315,
STYLE_ID_LABELS_AND_COLORS_CHANNEL = 316,
STYLE_ID_INLINE317 = 317,
STYLE_ID_TRIGGER_BUTTON_24 = 318,
STYLE_ID_MON_VALUE_48_RIGHT = 307,
STYLE_ID_INLINE308 = 308,
STYLE_ID_MON_VALUE_20_LEFT = 309,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 310,
STYLE_ID_BAR_GRAPH_TEXT = 311,
STYLE_ID_BAR_GRAPH_SET_LINE = 312,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 313,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 314,
STYLE_ID_LABELS_AND_COLORS_CHANNEL = 315,
STYLE_ID_INLINE316 = 316,
STYLE_ID_TRIGGER_BUTTON_24 = 317,
STYLE_ID_INLINE318 = 318,
STYLE_ID_INLINE319 = 319,
STYLE_ID_INLINE320 = 320,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 321,
STYLE_ID_TRIGGER_BUTTON_14 = 322,
STYLE_ID_MON_VALUE_38_RIGHT = 323,
STYLE_ID_INLINE324 = 324,
STYLE_ID_CH_PROT_OFF = 325,
STYLE_ID_CH_PROT_ON = 326,
STYLE_ID_CH_PROT_TRIPPED = 327,
STYLE_ID_INLINE328 = 328,
STYLE_ID_MON_VALUE_20_RIGHT = 329,
STYLE_ID_MON_VALUE_14_LEFT = 330,
STYLE_ID_MON_VALUE_14_CENTER = 331,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 332,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 333,
STYLE_ID_MON_VALUE_14_RIGHT = 334,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 335,
STYLE_ID_MON_VALUE_24_RIGHT = 336,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 320,
STYLE_ID_TRIGGER_BUTTON_14 = 321,
STYLE_ID_MON_VALUE_38_RIGHT = 322,
STYLE_ID_INLINE323 = 323,
STYLE_ID_CH_PROT_OFF = 324,
STYLE_ID_CH_PROT_ON = 325,
STYLE_ID_CH_PROT_TRIPPED = 326,
STYLE_ID_INLINE327 = 327,
STYLE_ID_MON_VALUE_20_RIGHT = 328,
STYLE_ID_MON_VALUE_14_LEFT = 329,
STYLE_ID_MON_VALUE_14_CENTER = 330,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 331,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 332,
STYLE_ID_MON_VALUE_14_RIGHT = 333,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 334,
STYLE_ID_MON_VALUE_24_RIGHT = 335,
STYLE_ID_INLINE336 = 336,
STYLE_ID_INLINE337 = 337,
STYLE_ID_INLINE338 = 338,
STYLE_ID_INLINE339 = 339,
Expand Down Expand Up @@ -2433,4 +2433,4 @@ enum PagesEnum {
PAGE_ID_DIB_DCM224_LABELS_AND_COLORS_CH = 285
};

extern const uint8_t assets[549030];
extern const uint8_t assets[548975];
41,153 changes: 20,575 additions & 20,578 deletions src/eez/gui/document_stm32.cpp
View file

Large diffs are not rendered by default.

61 changes: 30 additions & 31 deletions src/eez/gui/document_stm32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1955,37 +1955,36 @@ enum StylesEnum {
STYLE_ID_INLINE297 = 297,
STYLE_ID_INLINE298 = 298,
STYLE_ID_INLINE299 = 299,
STYLE_ID_INLINE300 = 300,
STYLE_ID_MON_VALUE_48_RIGHT = 301,
STYLE_ID_INLINE302 = 302,
STYLE_ID_MON_VALUE_20_LEFT = 303,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 304,
STYLE_ID_BAR_GRAPH_TEXT = 305,
STYLE_ID_BAR_GRAPH_SET_LINE = 306,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 307,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 308,
STYLE_ID_LABELS_AND_COLORS_CHANNEL = 309,
STYLE_ID_INLINE310 = 310,
STYLE_ID_TRIGGER_BUTTON_24 = 311,
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_LABELS_AND_COLORS_CHANNEL = 308,
STYLE_ID_INLINE309 = 309,
STYLE_ID_TRIGGER_BUTTON_24 = 310,
STYLE_ID_INLINE311 = 311,
STYLE_ID_INLINE312 = 312,
STYLE_ID_INLINE313 = 313,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 314,
STYLE_ID_TRIGGER_BUTTON_14 = 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_INLINE330 = 330
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 313,
STYLE_ID_TRIGGER_BUTTON_14 = 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
};

enum ThemesEnum {
Expand Down Expand Up @@ -2374,4 +2373,4 @@ enum PagesEnum {
PAGE_ID_DIB_DCM224_LABELS_AND_COLORS_CH = 274
};

extern const uint8_t assets[340694];
extern const uint8_t assets[340654];
38 changes: 19 additions & 19 deletions src/eez/modules/dib-mio168/dib-mio168.eez-project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,8 @@
"inheritFrom": "default",
"font": "Oswald12",
"alignVertical": "center",
"color": "Action color",
"activeBackgroundColor": "Action color"
"color": "action_color",
"activeBackgroundColor": "action_color"
},
"data": "dout_no",
"action": "dout_toggle_state",
Expand Down Expand Up @@ -638,8 +638,8 @@
"inheritFrom": "default_inverse",
"font": "Oswald12",
"alignVertical": "center",
"backgroundColor": "Action color",
"activeColor": "Action color",
"backgroundColor": "action_color",
"activeColor": "action_color",
"padding": "0"
},
"data": "dout_no",
Expand Down Expand Up @@ -1050,8 +1050,8 @@
"inheritFrom": "default",
"font": "Oswald12",
"alignVertical": "center",
"color": "Action color",
"activeBackgroundColor": "Action color"
"color": "action_color",
"activeBackgroundColor": "action_color"
},
"data": "dout_no",
"action": "dout_toggle_state",
Expand Down Expand Up @@ -1079,8 +1079,8 @@
"inheritFrom": "default_inverse",
"font": "Oswald12",
"alignVertical": "center",
"backgroundColor": "Action color",
"activeColor": "Action color",
"backgroundColor": "action_color",
"activeColor": "action_color",
"padding": "0"
},
"data": "dout_no",
Expand Down Expand Up @@ -1599,8 +1599,8 @@
"inheritFrom": "default",
"font": "Oswald12",
"alignVertical": "center",
"color": "Action color",
"activeBackgroundColor": "Action color"
"color": "action_color",
"activeBackgroundColor": "action_color"
},
"data": "dout_no",
"action": "dout_toggle_state",
Expand Down Expand Up @@ -1628,8 +1628,8 @@
"inheritFrom": "default_inverse",
"font": "Oswald12",
"alignVertical": "center",
"backgroundColor": "Action color",
"activeColor": "Action color"
"backgroundColor": "action_color",
"activeColor": "action_color"
},
"data": "dout_no",
"action": "dout_toggle_state",
Expand Down Expand Up @@ -2130,7 +2130,7 @@
"activeColor": "text_enable_background",
"borderSize": "1",
"borderRadius": 4,
"borderColor": "Action color"
"borderColor": "action_color"
},
"data": "ain_mode_and_range",
"action": "ain_select_mode_and_range",
Expand Down Expand Up @@ -4026,8 +4026,8 @@
"style": {
"inheritFrom": "encoder_cursor_14_enabled",
"font": "Oswald17",
"color": "Action color",
"activeBackgroundColor": "Action color"
"color": "action_color",
"activeBackgroundColor": "action_color"
},
"action": "show_calibration",
"left": 0,
Expand Down Expand Up @@ -4395,8 +4395,8 @@
"style": {
"inheritFrom": "encoder_cursor_14_enabled",
"font": "Oswald17",
"color": "Action color",
"activeBackgroundColor": "Action color"
"color": "action_color",
"activeBackgroundColor": "action_color"
},
"action": "show_calibration",
"left": 0,
Expand Down Expand Up @@ -4576,8 +4576,8 @@
"style": {
"inheritFrom": "encoder_cursor_14_enabled",
"font": "Oswald17",
"color": "Action color",
"activeBackgroundColor": "Action color"
"color": "action_color",
"activeBackgroundColor": "action_color"
},
"action": "show_calibration",
"left": 0,
Expand Down
26 changes: 10 additions & 16 deletions src/eez/modules/dib-smx46/dib-smx46.eez-project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,9 +490,7 @@
"font": "Oswald17",
"alignHorizontal": "left",
"color": "text_enable_background",
"backgroundColor": "Action color",
"activeColor": "Action color",
"activeBackgroundColor": "text_enable_background",
"backgroundColor": "action_color",
"borderSize": "0",
"borderRadius": 0,
"borderColor": "text_regular",
Expand Down Expand Up @@ -820,9 +818,7 @@
"font": "Oswald17",
"alignHorizontal": "left",
"color": "text_enable_background",
"backgroundColor": "Action color",
"activeColor": "Action color",
"activeBackgroundColor": "text_enable_background",
"backgroundColor": "action_color",
"borderSize": "0",
"borderRadius": 0,
"borderColor": "text_regular",
Expand Down Expand Up @@ -1280,9 +1276,7 @@
"font": "Oswald17",
"alignHorizontal": "left",
"color": "text_enable_background",
"backgroundColor": "Action color",
"activeColor": "Action color",
"activeBackgroundColor": "text_enable_background",
"backgroundColor": "action_color",
"borderSize": "0",
"borderRadius": 0,
"borderColor": "text_regular",
Expand Down Expand Up @@ -1762,8 +1756,8 @@
"type": "Rectangle",
"style": {
"inheritFrom": "default",
"color": "Action color",
"activeBackgroundColor": "Action color",
"color": "action_color",
"activeBackgroundColor": "action_color",
"borderSize": "0",
"borderRadius": 7
},
Expand Down Expand Up @@ -1791,7 +1785,7 @@
"color": "Background",
"borderSize": "1",
"borderRadius": 8,
"borderColor": "Action color"
"borderColor": "action_color"
},
"left": 25,
"top": 13,
Expand Down Expand Up @@ -1849,8 +1843,8 @@
"type": "Text",
"style": {
"inheritFrom": "default_S_right_condensed",
"color": "Action color",
"activeBackgroundColor": "Action color"
"color": "action_color",
"activeBackgroundColor": "action_color"
},
"data": "y_label",
"action": "edit_y_label",
Expand Down Expand Up @@ -1890,8 +1884,8 @@
"style": {
"inheritFrom": "default_S_right_condensed",
"alignHorizontal": "center",
"color": "Action color",
"activeBackgroundColor": "Action color"
"color": "action_color",
"activeBackgroundColor": "action_color"
},
"data": "x_label",
"action": "edit_x_label",
Expand Down
7 changes: 4 additions & 3 deletions src/eez/modules/psu/gui/page_ch_settings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,11 @@ void ChSettingsAdvViewPage::onDisplayValueRangeSet(float value) {
if (
page->displayValues[page->displayValueIndex].scale == DISPLAY_VALUE_SCALE_CUSTOM &&
(
page->displayValues[page->displayValueIndex].range <= 0 ||
page->displayValues[page->displayValueIndex].range < 0 ||
page->displayValues[page->displayValueIndex].range > page->displayValues[page->displayValueIndex].getMaxRange(g_channel)
)
) {
)
)
{
page->displayValues[page->displayValueIndex].range = page->displayValues[page->displayValueIndex].getMaxRange(g_channel);
}
}
Expand Down

0 comments on commit 62a955e

Please sign in to comment.