From ed3ff830d103f5a7206f47b85fbf36d280c4292e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anian=20B=C3=BChler?= <anian.buehler@reutlingen-university.de> Date: Mon, 17 May 2021 16:03:57 +0200 Subject: [PATCH] added block-shape "command with bottom connectors" --- .../com/ardublock/block/ardublock.properties | 2 +- .../resources/com/ardublock/block/ardublock.xml | 16 +++++++++------- .../com/ardublock/block/ardublock_de.properties | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties index c94a879..292de99 100644 --- a/src/main/resources/com/ardublock/block/ardublock.properties +++ b/src/main/resources/com/ardublock/block/ardublock.properties @@ -622,7 +622,7 @@ bc.variable_number_long = Long bc.variable_number_float=float #TEST NEW BLOCKDESIGN -bg.setter_variable_analog=int +bg.setter_variable_analog== bg.setter_variable_analog.description= #ARRAYS diff --git a/src/main/resources/com/ardublock/block/ardublock.xml b/src/main/resources/com/ardublock/block/ardublock.xml index e3c2994..4ed278a 100644 --- a/src/main/resources/com/ardublock/block/ardublock.xml +++ b/src/main/resources/com/ardublock/block/ardublock.xml @@ -1878,17 +1878,18 @@ </BlockGenus> - <BlockGenus name="setter_variable_analog" kind="command" color="255 0 0" initlabel="bg.setter_variable_analog" editable-label="no"> + <BlockGenus name="setter_variable_analog" kind="command" color="255 0 0" initlabel="bg.setter_variable_analog" editable-label="yes"> <description> <text>TESTTEST</text> </description> <BlockConnectors> - <BlockConnector connector-type="number" connector-kind="socket" label="nameDerVariable" label-editable="yes"> - <DefaultArg genus-name="number" label="1"/> + <BlockConnector connector-type="number" connector-kind="socket" label="==" label-editable="yes" position-type="bottom"> + </BlockConnector> + <BlockConnector connector-type="number" connector-kind="socket" label="=" label-editable="yes" position-type="bottom"> </BlockConnector> </BlockConnectors> </BlockGenus> - + <!-- ******************** Arrays *************** --> <BlockGenus name="arrayDivider1" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.arrayDivider1" color="150 150 150" /> @@ -2969,6 +2970,9 @@ <BlockGenusMember>millis</BlockGenusMember> <BlockGenusMember>numberDivider2</BlockGenusMember> + + <BlockGenusMember>setter_variable_analog</BlockGenusMember> + <BlockGenusMember>setter_variable_digital</BlockGenusMember> <BlockGenusMember>variable_digital</BlockGenusMember> <BlockGenusMember>local_variable_digital</BlockGenusMember><!-- nur fÞr Sim -> spÃĪter anpassen --> @@ -2993,9 +2997,7 @@ <BlockDrawer button-color="255 0 0" name="bd.number" type="custom"> <BlockGenusMember>numberDivider1</BlockGenusMember> <BlockGenusMember>millis</BlockGenusMember> - - <BlockGenusMember>setter_variable_analog</BlockGenusMember> - + <BlockGenusMember>numberDivider2</BlockGenusMember> <BlockGenusMember>setter_variable_digital</BlockGenusMember> <BlockGenusMember>variable_digital</BlockGenusMember> diff --git a/src/main/resources/com/ardublock/block/ardublock_de.properties b/src/main/resources/com/ardublock/block/ardublock_de.properties index 89d8887..2589656 100644 --- a/src/main/resources/com/ardublock/block/ardublock_de.properties +++ b/src/main/resources/com/ardublock/block/ardublock_de.properties @@ -618,7 +618,7 @@ bc.variable_number_long =lange_analogen_Variable bc.variable_number_float=dezimale_Variable #TEST NEW BLOCKDESIGN -bg.setter_variable_analog=int +bg.setter_variable_analog== bg.setter_variable_analog.description= -- GitLab