Skip to content

Commit 9d922a1

Browse files
committed
fix CoderBotOrg#59 toolbox does not reenables whe maxBlocks set
1 parent ebd66a4 commit 9d922a1

File tree

7 files changed

+1164
-918
lines changed

7 files changed

+1164
-918
lines changed

coderbot.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"move_tr_speed": "80", "move_fw_elapse": "1", "camera_color_object_size_min": "4000", "camera_path_object_size_min": "4000", "load_at_start": "", "move_tr_elapse": "0.5", "sound_stop": "$shutdown.mp3", "prog_video_rec": "true", "show_control_move_commands": "true", "prog_level": "adv", "prog_scrollbars": "true", "move_fw_speed": "100", "camera_color_object_size_max": "160000", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "cv_image_factor": "4", "ctrl_hud_image": "", "button_func": "none", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "move_power_angle_2": "60", "move_power_angle_3": "60", "move_power_angle_1": "40", "move_motor_trim": "1.1", "show_page_program": "true", "sound_start": "$startup.mp3", "camera_exposure_mode": "auto", "ctrl_tr_speed": "80", "ctrl_fw_speed": "100", "camera_refresh_timeout": "0.1", "camera_jpeg_quality": "20", "prog_maxblocks": "-1", "move_motor_mode": "dc", "camera_path_object_size_max": "160000", "show_page_control": "true"}
1+
{"move_tr_speed": "80", "move_fw_elapse": "1", "camera_color_object_size_min": "4000", "camera_path_object_size_min": "4000", "load_at_start": "", "move_tr_elapse": "0.5", "sound_stop": "$shutdown.mp3", "prog_video_rec": "true", "show_control_move_commands": "true", "prog_level": "basic", "prog_scrollbars": "true", "move_fw_speed": "100", "camera_color_object_size_max": "160000", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "cv_image_factor": "4", "ctrl_hud_image": "", "button_func": "none", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "move_power_angle_2": "60", "move_power_angle_3": "60", "move_power_angle_1": "40", "move_motor_trim": "1.1", "show_page_program": "true", "sound_start": "$startup.mp3", "camera_exposure_mode": "auto", "ctrl_tr_speed": "80", "ctrl_fw_speed": "100", "camera_refresh_timeout": "0.1", "camera_jpeg_quality": "20", "prog_maxblocks": "5", "move_motor_mode": "dc", "camera_path_object_size_max": "160000", "show_page_control": "true"}

static/js/blockly/blockly_compressed.js

Lines changed: 900 additions & 690 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/js/blockly/blocks_compressed.js

Lines changed: 114 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/js/blockly/en.js

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ goog.provide('Blockly.Msg.en');
77
goog.require('Blockly.Msg');
88

99
Blockly.Msg.ADD_COMMENT = "Add Comment";
10-
Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";
1110
Blockly.Msg.CHANGE_VALUE_TITLE = "Change value:";
12-
Blockly.Msg.CHAT = "Chat with your collaborator by typing in this box!";
1311
Blockly.Msg.CLEAN_UP = "Clean up Blocks";
1412
Blockly.Msg.COLLAPSE_ALL = "Collapse Blocks";
1513
Blockly.Msg.COLLAPSE_BLOCK = "Collapse Block";
@@ -64,6 +62,8 @@ Blockly.Msg.CONTROLS_WHILEUNTIL_TOOLTIP_UNTIL = "While a value is false, then do
6462
Blockly.Msg.CONTROLS_WHILEUNTIL_TOOLTIP_WHILE = "While a value is true, then do some statements.";
6563
Blockly.Msg.DELETE_ALL_BLOCKS = "Delete all %1 blocks?";
6664
Blockly.Msg.DELETE_BLOCK = "Delete Block";
65+
Blockly.Msg.DELETE_VARIABLE = "Delete the '%1' variable";
66+
Blockly.Msg.DELETE_VARIABLE_CONFIRMATION = "Delete %1 uses of the '%2' variable?";
6767
Blockly.Msg.DELETE_X_BLOCKS = "Delete %1 Blocks";
6868
Blockly.Msg.DISABLE_BLOCK = "Disable Block";
6969
Blockly.Msg.DUPLICATE_BLOCK = "Duplicate";
@@ -92,18 +92,15 @@ Blockly.Msg.LISTS_GET_INDEX_RANDOM = "random";
9292
Blockly.Msg.LISTS_GET_INDEX_REMOVE = "remove";
9393
Blockly.Msg.LISTS_GET_INDEX_TAIL = "";
9494
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_FIRST = "Returns the first item in a list.";
95-
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_FROM_END = "Returns the item at the specified position in a list. #1 is the last item.";
96-
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_FROM_START = "Returns the item at the specified position in a list. #1 is the first item.";
95+
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_FROM = "Returns the item at the specified position in a list.";
9796
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_LAST = "Returns the last item in a list.";
9897
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_RANDOM = "Returns a random item in a list.";
9998
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST = "Removes and returns the first item in a list.";
100-
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END = "Removes and returns the item at the specified position in a list. #1 is the last item.";
101-
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START = "Removes and returns the item at the specified position in a list. #1 is the first item.";
99+
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM = "Removes and returns the item at the specified position in a list.";
102100
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST = "Removes and returns the last item in a list.";
103101
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM = "Removes and returns a random item in a list.";
104102
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST = "Removes the first item in a list.";
105-
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END = "Removes the item at the specified position in a list. #1 is the last item.";
106-
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START = "Removes the item at the specified position in a list. #1 is the first item.";
103+
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM = "Removes the item at the specified position in a list.";
107104
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST = "Removes the last item in a list.";
108105
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM = "Removes a random item in a list.";
109106
Blockly.Msg.LISTS_GET_SUBLIST_END_FROM_END = "to # from end";
@@ -115,10 +112,12 @@ Blockly.Msg.LISTS_GET_SUBLIST_START_FROM_END = "get sub-list from # from end";
115112
Blockly.Msg.LISTS_GET_SUBLIST_START_FROM_START = "get sub-list from #";
116113
Blockly.Msg.LISTS_GET_SUBLIST_TAIL = "";
117114
Blockly.Msg.LISTS_GET_SUBLIST_TOOLTIP = "Creates a copy of the specified portion of a list.";
115+
Blockly.Msg.LISTS_INDEX_FROM_END_TOOLTIP = "%1 is the last item.";
116+
Blockly.Msg.LISTS_INDEX_FROM_START_TOOLTIP = "%1 is the first item.";
118117
Blockly.Msg.LISTS_INDEX_OF_FIRST = "find first occurrence of item";
119118
Blockly.Msg.LISTS_INDEX_OF_HELPURL = "https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list";
120119
Blockly.Msg.LISTS_INDEX_OF_LAST = "find last occurrence of item";
121-
Blockly.Msg.LISTS_INDEX_OF_TOOLTIP = "Returns the index of the first/last occurrence of the item in the list. Returns 0 if item is not found.";
120+
Blockly.Msg.LISTS_INDEX_OF_TOOLTIP = "Returns the index of the first/last occurrence of the item in the list. Returns %1 if item is not found.";
122121
Blockly.Msg.LISTS_INLIST = "in list";
123122
Blockly.Msg.LISTS_ISEMPTY_HELPURL = "https://github.com/google/blockly/wiki/Lists#is-empty";
124123
Blockly.Msg.LISTS_ISEMPTY_TITLE = "%1 is empty";
@@ -134,15 +133,21 @@ Blockly.Msg.LISTS_SET_INDEX_INPUT_TO = "as";
134133
Blockly.Msg.LISTS_SET_INDEX_INSERT = "insert at";
135134
Blockly.Msg.LISTS_SET_INDEX_SET = "set";
136135
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST = "Inserts the item at the start of a list.";
137-
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END = "Inserts the item at the specified position in a list. #1 is the last item.";
138-
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START = "Inserts the item at the specified position in a list. #1 is the first item.";
136+
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_FROM = "Inserts the item at the specified position in a list.";
139137
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_LAST = "Append the item to the end of a list.";
140138
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM = "Inserts the item randomly in a list.";
141139
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_FIRST = "Sets the first item in a list.";
142-
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_FROM_END = "Sets the item at the specified position in a list. #1 is the last item.";
143-
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_FROM_START = "Sets the item at the specified position in a list. #1 is the first item.";
140+
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_FROM = "Sets the item at the specified position in a list.";
144141
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_LAST = "Sets the last item in a list.";
145142
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_RANDOM = "Sets a random item in a list.";
143+
Blockly.Msg.LISTS_SORT_HELPURL = "https://github.com/google/blockly/wiki/Lists#sorting-a-list";
144+
Blockly.Msg.LISTS_SORT_ORDER_ASCENDING = "ascending";
145+
Blockly.Msg.LISTS_SORT_ORDER_DESCENDING = "descending";
146+
Blockly.Msg.LISTS_SORT_TITLE = "sort %1 %2 %3";
147+
Blockly.Msg.LISTS_SORT_TOOLTIP = "Sort a copy of a list.";
148+
Blockly.Msg.LISTS_SORT_TYPE_IGNORECASE = "alphabetic, ignore case";
149+
Blockly.Msg.LISTS_SORT_TYPE_NUMERIC = "numeric";
150+
Blockly.Msg.LISTS_SORT_TYPE_TEXT = "alphabetic";
146151
Blockly.Msg.LISTS_SPLIT_HELPURL = "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists";
147152
Blockly.Msg.LISTS_SPLIT_LIST_FROM_TEXT = "make list from text";
148153
Blockly.Msg.LISTS_SPLIT_TEXT_FROM_LIST = "make text from list";
@@ -259,8 +264,7 @@ Blockly.Msg.MATH_TRIG_TOOLTIP_ATAN = "Return the arctangent of a number.";
259264
Blockly.Msg.MATH_TRIG_TOOLTIP_COS = "Return the cosine of a degree (not radian).";
260265
Blockly.Msg.MATH_TRIG_TOOLTIP_SIN = "Return the sine of a degree (not radian).";
261266
Blockly.Msg.MATH_TRIG_TOOLTIP_TAN = "Return the tangent of a degree (not radian).";
262-
Blockly.Msg.ME = "Me";
263-
Blockly.Msg.NEW_VARIABLE = "New variable...";
267+
Blockly.Msg.NEW_VARIABLE = "Create variable...";
264268
Blockly.Msg.NEW_VARIABLE_TITLE = "New variable name:";
265269
Blockly.Msg.ORDINAL_NUMBER_SUFFIX = "";
266270
Blockly.Msg.PROCEDURES_ALLOW_STATEMENTS = "allow statements";
@@ -289,6 +293,7 @@ Blockly.Msg.PROCEDURES_MUTATORARG_TITLE = "input name:";
289293
Blockly.Msg.PROCEDURES_MUTATORARG_TOOLTIP = "Add an input to the function.";
290294
Blockly.Msg.PROCEDURES_MUTATORCONTAINER_TITLE = "inputs";
291295
Blockly.Msg.PROCEDURES_MUTATORCONTAINER_TOOLTIP = "Add, remove, or reorder inputs to this function.";
296+
Blockly.Msg.REDO = "Redo";
292297
Blockly.Msg.REMOVE_COMMENT = "Remove Comment";
293298
Blockly.Msg.RENAME_VARIABLE = "Rename variable...";
294299
Blockly.Msg.RENAME_VARIABLE_TITLE = "Rename all '%1' variables to:";
@@ -328,7 +333,7 @@ Blockly.Msg.TEXT_INDEXOF_INPUT_INTEXT = "in text";
328333
Blockly.Msg.TEXT_INDEXOF_OPERATOR_FIRST = "find first occurrence of text";
329334
Blockly.Msg.TEXT_INDEXOF_OPERATOR_LAST = "find last occurrence of text";
330335
Blockly.Msg.TEXT_INDEXOF_TAIL = "";
331-
Blockly.Msg.TEXT_INDEXOF_TOOLTIP = "Returns the index of the first/last occurrence of the first text in the second text. Returns 0 if text is not found.";
336+
Blockly.Msg.TEXT_INDEXOF_TOOLTIP = "Returns the index of the first/last occurrence of the first text in the second text. Returns %1 if text is not found.";
332337
Blockly.Msg.TEXT_ISEMPTY_HELPURL = "https://github.com/google/blockly/wiki/Text#checking-for-empty-text";
333338
Blockly.Msg.TEXT_ISEMPTY_TITLE = "%1 is empty";
334339
Blockly.Msg.TEXT_ISEMPTY_TOOLTIP = "Returns true if the provided text is empty.";
@@ -354,6 +359,7 @@ Blockly.Msg.TEXT_TRIM_OPERATOR_LEFT = "trim spaces from left side of";
354359
Blockly.Msg.TEXT_TRIM_OPERATOR_RIGHT = "trim spaces from right side of";
355360
Blockly.Msg.TEXT_TRIM_TOOLTIP = "Return a copy of the text with spaces removed from one or both ends.";
356361
Blockly.Msg.TODAY = "Today";
362+
Blockly.Msg.UNDO = "Undo";
357363
Blockly.Msg.VARIABLES_DEFAULT_NAME = "item";
358364
Blockly.Msg.VARIABLES_GET_CREATE_SET = "Create 'set %1'";
359365
Blockly.Msg.VARIABLES_GET_HELPURL = "https://github.com/google/blockly/wiki/Variables#get";
@@ -362,6 +368,7 @@ Blockly.Msg.VARIABLES_SET = "set %1 to %2";
362368
Blockly.Msg.VARIABLES_SET_CREATE_GET = "Create 'get %1'";
363369
Blockly.Msg.VARIABLES_SET_HELPURL = "https://github.com/google/blockly/wiki/Variables#set";
364370
Blockly.Msg.VARIABLES_SET_TOOLTIP = "Sets this variable to be equal to the input.";
371+
Blockly.Msg.VARIABLE_ALREADY_EXISTS = "A variable named '%1' already exists.";
365372
Blockly.Msg.PROCEDURES_DEFRETURN_TITLE = Blockly.Msg.PROCEDURES_DEFNORETURN_TITLE;
366373
Blockly.Msg.CONTROLS_IF_IF_TITLE_IF = Blockly.Msg.CONTROLS_IF_MSG_IF;
367374
Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;

0 commit comments

Comments
 (0)