Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Blockly Editor: combine renderer selection and show item label icons #2415

Merged
merged 3 commits into from
Feb 26, 2024
Merged

Blockly Editor: combine renderer selection and show item label icons #2415

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19f34cd
Blockly Editor: combine renderer selection and show item label icons
jimtng Feb 26, 2024
cc347ab
Capitalize renderer names
jimtng Feb 26, 2024
716e8d8
Split the icons into two on desktop
jimtng Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 24 additions & 14 deletions bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,26 @@
:tooltip="rule.status.description" />
</span>
<span class="display-flex flex-direction-row align-items-center">
<f7-button v-if="isBlockly && !blocklyCodePreview" outline small class="no-ripple" style="margin-right: 5px; padding: 3px" :tooltip="'Block style'">
<select @change="setBlocklyRenderer($event)" style="text-align-last: center">
<option v-for="renderer in blocklyRenderers" :key="renderer" :selected="renderer === blocklyRenderer">{{ renderer }}</option>
</select>
</f7-button>
<f7-button v-if="!createMode && isBlockly && !blocklyCodePreview" outline small :active="blocklyShowLabels" icon-f7="square_on_circle" :icon-size="($theme.aurora) ? 20 : 22" class="no-ripple" style="margin-right: 5px" @click="toggleBlocklyItemLabelId" tooltip="Toggle to show either Item labels or IDs" />
<f7-segmented v-if="!createMode && isBlockly" class="margin-right">
<f7-button outline small :active="!blocklyCodePreview" icon-f7="ticket" :icon-size="($theme.aurora) ? 20 : 22" class="no-ripple" @click="blocklyCodePreview = false" tooltip="Show blocks" />
<f7-button outline small :active="blocklyCodePreview" icon-f7="doc_text" :icon-size="($theme.aurora) ? 20 : 22" class="no-ripple" @click="showBlocklyCode" tooltip="Show generated code" />
</f7-segmented>
<template v-if="isBlockly">
<f7-popover class="config-popover">
<f7-list class="config-menu">
<f7-list-item group-title title="Block Style" />
<f7-list-item v-for="renderer in blocklyRenderers" :key="renderer" :title="renderer" style="text-transform:capitalize" color="blue" radio :checked="renderer === blocklyRenderer" @click="setBlocklyRenderer(renderer)" />
<f7-list-item v-if="!$device.desktop" group-title title="Show Items" />
<f7-list-item v-if="!$device.desktop" title="As Labels" color="blue" radio :checked="blocklyShowLabels" @click="setBlocklyShowLabels(true)" />
<f7-list-item v-if="!$device.desktop" title="As Item IDs" color="blue" radio :checked="!blocklyShowLabels" @click="setBlocklyShowLabels(false)" />
</f7-list>
</f7-popover>
<template v-if="$device.desktop">
<f7-button v-if="!blocklyCodePreview" outline small icon-f7="paintbrush" :icon-size="($theme.aurora) ? 20 : 22" class="no-ripple" style="margin-right: 5px" tooltip="Block Style" popover-open=".config-popover" />
<f7-button v-if="!createMode && !blocklyCodePreview" outline small :active="blocklyShowLabels" icon-f7="square_on_circle" :icon-size="($theme.aurora) ? 20 : 22" class="no-ripple" style="margin-right: 5px" @click="setBlocklyShowLabels(!blocklyShowLabels)" tooltip="Toggle to show either Item labels or IDs" />
</template>
<f7-button v-else-if="!blocklyCodePreview" outline small icon-f7="ellipsis_vertical" :icon-size="($theme.aurora) ? 20 : 22" class="no-ripple" style="margin-right: 5px" tooltip="Blockly Settings" popover-open=".config-popover" />
<f7-segmented v-if="!createMode" class="margin-right">
<f7-button outline small :active="!blocklyCodePreview" icon-f7="ticket" :icon-size="($theme.aurora) ? 20 : 22" class="no-ripple" @click="blocklyCodePreview = false" tooltip="Show blocks" />
<f7-button outline small :active="blocklyCodePreview" icon-f7="doc_text" :icon-size="($theme.aurora) ? 20 : 22" class="no-ripple" @click="showBlocklyCode" tooltip="Show generated code" />
</f7-segmented>
</template>
<f7-link class="right details-link padding-right" ref="detailsLink" @click="detailsOpened = true" icon-f7="chevron_up" />
</span>
</f7-toolbar>
Expand Down Expand Up @@ -541,12 +551,12 @@ export default {
this.blocklyRenderer = this.$refs.blocklyEditor.getCurrentRenderer()
this.blocklyRenderers = this.$refs.blocklyEditor.getRenderers()
},
setBlocklyRenderer (event) {
this.blocklyRenderer = event.target.value
setBlocklyRenderer (newRenderer) {
this.blocklyRenderer = newRenderer
this.$refs.blocklyEditor.changeRenderer(this.blocklyRenderer)
},
toggleBlocklyItemLabelId () {
this.blocklyShowLabels = !this.blocklyShowLabels
setBlocklyShowLabels (showLabels) {
this.blocklyShowLabels = showLabels
this.$refs.blocklyEditor.showHideLabels(this.blocklyShowLabels)
},
showBlocklyCode () {
Expand Down