From d0ecafcf7a9f62ec9feac98f6a1b6ab5f439757a Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Fri, 3 Mar 2017 16:43:33 -0800 Subject: [PATCH] Using gridpicker for icons (#365) * Use the grid picker custom field for show icons --- libs/core/_locales/core-strings.json | 1 + libs/core/icons.ts | 14 +++++++++++++- sim/public/blocks/iconnames/scissors.png | Bin 0 -> 8213 bytes theme/style.less | 9 +++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 sim/public/blocks/iconnames/scissors.png diff --git a/libs/core/_locales/core-strings.json b/libs/core/_locales/core-strings.json index 8206a063..5086a2c8 100644 --- a/libs/core/_locales/core-strings.json +++ b/libs/core/_locales/core-strings.json @@ -91,6 +91,7 @@ "IconNames.Rabbit|block": "rabbit", "IconNames.Rollerskate|block": "roller skate", "IconNames.Sad|block": "sad", + "IconNames.Scissors|block": "scissors", "IconNames.Silly|block": "silly", "IconNames.Skull|block": "skull", "IconNames.SmallDiamond|block": "small diamond", diff --git a/libs/core/icons.ts b/libs/core/icons.ts index 1464e7cd..af666250 100644 --- a/libs/core/icons.ts +++ b/libs/core/icons.ts @@ -142,7 +142,10 @@ enum IconNames { Square, //% block="small square" //% blockImage=1 - SmallSquare + SmallSquare, + //% block="scissors" + //% blockImage=1 + Scissors } enum ArrowNames { @@ -174,6 +177,9 @@ namespace basic { //% block="show icon %i" icon="\uf00a" //% parts="ledmatrix" //% help=basic/show-icon + //% blockFieldEditor="FieldGridPicker" + //% blockFieldEditorParams.width=500 blockFieldEditorParams.columns=5 + //% blockFieldEditorParams.itemColour=black blockFieldEditorParams.tooltips=true export function showIcon(icon: IconNames) { let res = images.iconImage(icon) res.showImage(0) @@ -380,6 +386,12 @@ namespace images { . # . # . . # # # . . . . . .`; + case IconNames.Scissors: return ` + # # . . # + # # . # . + . . # . . + # # . # . + # # . . #`; // The following images were designed by Abbie Brooks. case IconNames.TShirt: return ` # # . # # diff --git a/sim/public/blocks/iconnames/scissors.png b/sim/public/blocks/iconnames/scissors.png new file mode 100644 index 0000000000000000000000000000000000000000..1bfc69f4b709a6ccbe852e930f810c094148d12e GIT binary patch literal 8213 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 literal 0 HcmV?d00001 diff --git a/theme/style.less b/theme/style.less index 650bac34..35e06f78 100644 --- a/theme/style.less +++ b/theme/style.less @@ -85,6 +85,15 @@ span.blocklyTreeLabel { &:extend(.pink all); } +/* Blockly Field: Grid picker */ +.blocklyGridPickerTooltip { + padding: 3px 5px; + background-color: #fefefe; + border: black solid 3px; + color: black; + border-radius: 10px; +} + /******************************* Monaco *******************************/