From ea682b93522c96918a482b3f811e4e9f50d16adf Mon Sep 17 00:00:00 2001
From: jojohoch <joachim.hoch@iqb.hu-berlin.de>
Date: Fri, 4 Aug 2023 10:27:25 +0200
Subject: [PATCH] Change default value of showToolbar for GGB element to false
#511
GGB elements without toolbar aren't loaded, if this parameter is true
---
projects/common/models/elements/geometry/geometry.ts | 2 +-
.../element-model-properties.component.html | 10 +++++-----
projects/editor/src/assets/i18n/de.json | 3 ++-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/projects/common/models/elements/geometry/geometry.ts b/projects/common/models/elements/geometry/geometry.ts
index 22093c0a0..f0d79c6a3 100644
--- a/projects/common/models/elements/geometry/geometry.ts
+++ b/projects/common/models/elements/geometry/geometry.ts
@@ -17,7 +17,7 @@ export class GeometryElement extends UIElement implements PositionedUIElement, G
appDefinition: string = '';
showResetIcon: boolean = true;
enableUndoRedo: boolean = true;
- showToolbar: boolean = true;
+ showToolbar: boolean = false;
enableShiftDragZoom: boolean = true;
showZoomButtons: boolean = true;
showFullscreenButton: boolean = true;
diff --git a/projects/editor/src/app/components/properties-panel/model-properties-tab/element-model-properties.component.html b/projects/editor/src/app/components/properties-panel/model-properties-tab/element-model-properties.component.html
index e334bdecf..ea423009f 100644
--- a/projects/editor/src/app/components/properties-panel/model-properties-tab/element-model-properties.component.html
+++ b/projects/editor/src/app/components/properties-panel/model-properties-tab/element-model-properties.component.html
@@ -190,6 +190,11 @@
</button>
</mat-form-field>
+ <mat-checkbox *ngIf="combinedProperties.showToolbar !== undefined"
+ [checked]="$any(combinedProperties.showToolbar)"
+ (change)="updateModel.emit({ property: 'showToolbar', value: $event.checked })">
+ {{'propertiesPanel.showToolbar' | translate }}
+ </mat-checkbox>
<mat-checkbox *ngIf="combinedProperties.showResetIcon !== undefined"
[checked]="$any(combinedProperties.showResetIcon)"
(change)="updateModel.emit({ property: 'showResetIcon', value: $event.checked })">
@@ -200,11 +205,6 @@
(change)="updateModel.emit({ property: 'enableUndoRedo', value: $event.checked })">
{{'propertiesPanel.enableUndoRedo' | translate }}
</mat-checkbox>
- <mat-checkbox *ngIf="combinedProperties.showToolbar !== undefined"
- [checked]="$any(combinedProperties.showToolbar)"
- (change)="updateModel.emit({ property: 'showToolbar', value: $event.checked })">
- {{'propertiesPanel.showToolbar' | translate }}
- </mat-checkbox>
<mat-checkbox *ngIf="combinedProperties.enableShiftDragZoom !== undefined"
[checked]="$any(combinedProperties.enableShiftDragZoom)"
(change)="updateModel.emit({ property: 'enableShiftDragZoom', value: $event.checked })">
diff --git a/projects/editor/src/assets/i18n/de.json b/projects/editor/src/assets/i18n/de.json
index 59862a7b8..d50367785 100644
--- a/projects/editor/src/assets/i18n/de.json
+++ b/projects/editor/src/assets/i18n/de.json
@@ -220,7 +220,8 @@
"hasBorderRight": "Kante rechts",
"showResetIcon": "Zurücksetzen-Knopf anzeigen",
"enableUndoRedo": "Schritt rückgängig/wiederherstellen",
- "showToolbar": "Werkzeugleiste anzeigen",
+ "appDefinition": "GGB-Definition",
+ "showToolbar": "Werkzeugleiste (muss in GGB aktiviert sein)",
"showZoomButtons": "Zoom-Knöpfe anzeigen",
"showFullscreenButton": "Vollbild-Knopf anzeigen",
"enableShiftDragZoom": "Bewegen und Zoom erlauben",
--
GitLab