diff options
Diffstat (limited to 'TurtleArt')
| -rw-r--r-- | TurtleArt/tablock.py | 26 | ||||
| -rw-r--r-- | TurtleArt/tapalette.py | 11 |
2 files changed, 27 insertions, 10 deletions
diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py index 13d6f36..2355b02 100644 --- a/TurtleArt/tablock.py +++ b/TurtleArt/tablock.py @@ -142,25 +142,26 @@ class Block: self._image = None self.block_methods = { + 'basic-style': self._make_basic_style, 'basic-style-head': self._make_basic_style_head, 'basic-style-head-1arg': self._make_basic_style_head_1arg, 'basic-style-tail': self._make_basic_style_tail, - 'basic-style': self._make_basic_style, - 'basic-style-extended-vertical': [self._make_basic_style, 0, 4], - 'invisible': self._make_invisible_style, 'basic-style-extended': [self._make_basic_style, 16, 16], + 'basic-style-extended-vertical': [self._make_basic_style, 0, 4], 'basic-style-1arg': self._make_basic_style_1arg, + 'basic-style-2arg': self._make_basic_style_2arg, + 'basic-style-3arg': self._make_basic_style_3arg, 'basic-style-var-arg': self._make_basic_style_var_arg, + 'invisible': self._make_invisible_style, 'bullet-style': self._make_bullet_style, - 'basic-style-2arg': self._make_basic_style_2arg, 'box-style': self._make_box_style, 'box-style-media': self._make_media_style, 'number-style': self._make_number_style, - 'number-style-var-arg': self._make_number_style_var_arg, 'number-style-block': self._make_number_style_block, 'number-style-porch': self._make_number_style_porch, 'number-style-1arg': self._make_number_style_1arg, 'number-style-1strarg': self._make_number_style_1strarg, + 'number-style-var-arg': self._make_number_style_var_arg, 'compare-style': self._make_compare_style, 'compare-porch-style': self._make_compare_porch_style, 'boolean-style': self._make_boolean_style, @@ -536,6 +537,21 @@ class Block: ['flow', False, self.svg.docks[3][0], self.svg.docks[3][1]]] + def _make_basic_style_3arg(self, svg): + self.svg.expand(10 + self.dx + self.ex, self.ey) + self.svg.set_innie([True, True, True]) + self._make_block_graphics(svg, self.svg.basic_block) + self.docks = [['flow', True, self.svg.docks[0][0], + self.svg.docks[0][1]], + ['number', False, self.svg.docks[1][0], + self.svg.docks[1][1]], + ['number', False, self.svg.docks[2][0], + self.svg.docks[2][1]], + ['number', False, self.svg.docks[3][0], + self.svg.docks[3][1]], + ['flow', False, self.svg.docks[4][0], + self.svg.docks[4][1]]] + def _make_basic_style_var_arg(self, svg): self.svg.expand(10 + self.dx + self.ex, self.ey) innie = [True] diff --git a/TurtleArt/tapalette.py b/TurtleArt/tapalette.py index 8d98a2f..3f94fec 100644 --- a/TurtleArt/tapalette.py +++ b/TurtleArt/tapalette.py @@ -30,17 +30,18 @@ special_names = {} # Names for blocks without names for popup help content_blocks = ['number', 'string', 'description', 'audio', 'video', 'journal'] value_blocks = [] # blocks whose labels are updated get added here -block_styles = {'basic-style-head': [], +block_styles = {'basic-style': [], + 'basic-style-head': [], 'basic-style-head-1arg': [], 'basic-style-tail': [], - 'basic-style': [], - 'basic-style-extended-vertical': [], - 'invisible': [], 'basic-style-extended': [], + 'basic-style-extended-vertical': [], 'basic-style-1arg': [], + 'basic-style-2arg': [], + 'basic-style-3arg': [], 'basic-style-var-arg': [], 'bullet-style': [], - 'basic-style-2arg': [], + 'invisible': [], 'box-style': [], 'box-style-media': [], 'number-style': [], |