Skip to content

Commit 34fa477

Browse files
committed
fix(sperimental): mac os shortcuts for editor (#1946), widget with foreignObject content (html element)
1 parent 59c5f7f commit 34fa477

File tree

8 files changed

+72
-68
lines changed

8 files changed

+72
-68
lines changed

client/dist/assets/lib/svgeditor/fuxa-editor.min.js

Lines changed: 17 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@
8686
</div>
8787
</div>
8888
</app-root>
89-
<script src="runtime.9136a61a9b98f987.js" type="module"></script><script src="polyfills.d7de05f9af2fb559.js" type="module"></script><script src="scripts.d9e6ee984bf6f3b7.js" defer></script><script src="main.cbcce26a6b6aacee.js" type="module"></script></body>
89+
<script src="runtime.9136a61a9b98f987.js" type="module"></script><script src="polyfills.d7de05f9af2fb559.js" type="module"></script><script src="scripts.d9e6ee984bf6f3b7.js" defer></script><script src="main.d21122a4bd70d6e9.js" type="module"></script></body>
9090

9191
</html>
Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fuxa",
3-
"version": "1.3.0-2779",
3+
"version": "1.3.0-2780",
44
"keywords": [],
55
"author": "frangoteam <info@frangoteam.org>",
66
"description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",

client/src/app/help/tutorial/tutorial.component.html

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,9 @@
2525
</mat-expansion-panel-header>
2626
<div class="tutorial-content">
2727
<ul>
28-
<li>Ctrl + Left / Right: rotate selected item</li>
29-
<li>Ctrl + Shift + Left / Right: rotate the selected item in big step</li>
30-
<li>Shift + O / P: select the prev / next item</li>
31-
<li>Tab / Shift + Tab: select the prev / next item</li>
32-
<li>Ctrl + Up / Down: central zoom in / out</li>
33-
<li>Ctrl + Z / Y: undo / redo</li>
34-
<li>Shift + 'resize with mouse the selected item': lock width and height</li>
35-
<li>Shift + Up / Down / Left / Right: move the selected item</li>
36-
<li>Shift + SCROLLER: zoom by mouse position</li>
37-
<li>Ctrl + A: select all item</li>
38-
<li>Ctrl + G: group or ungroup selected item</li>
39-
<li>Ctrl + D: duplicate selected item</li>
40-
<li>Shift + 'Draw line': line gradient horizonal, vertical 45° diagonal</li>
41-
<li>Ctrl + X: cut selected item</li>
42-
<li>Ctrl + C / V: copy / paste selected item</li>
28+
<li *ngFor="let shortcut of shortcuts">
29+
{{ shortcut.combo }}: {{ shortcut.description }}
30+
</li>
4331
</ul>
4432
</div>
4533
</mat-expansion-panel>
@@ -69,4 +57,4 @@
6957
</mat-expansion-panel> -->
7058
</mat-accordion>
7159
</div>
72-
</div>
60+
</div>

client/src/app/help/tutorial/tutorial.component.ts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import { Component } from '@angular/core';
22

3+
interface TutorialShortcut {
4+
combo: string;
5+
description: string;
6+
}
7+
38
@Component({
49
selector: 'app-tutorial',
510
templateUrl: './tutorial.component.html',
@@ -8,10 +13,33 @@ import { Component } from '@angular/core';
813
export class TutorialComponent {
914

1015
show = false;
16+
shortcuts: TutorialShortcut[] = this.buildShortcuts();
1117

1218
constructor() { }
1319

1420
close() {
1521
this.show = false;
1622
}
23+
24+
private buildShortcuts(): TutorialShortcut[] {
25+
const shortcuts: TutorialShortcut[] = [
26+
{ combo: 'Ctrl / ⌘ + Left / Right', description: 'rotate selected item' },
27+
{ combo: 'Ctrl / ⌘ + Shift + Left / Right', description: 'rotate the selected item in big step' },
28+
{ combo: 'Shift + O / P', description: 'select the previous / next item' },
29+
{ combo: 'Tab / Shift + Tab', description: 'select the previous / next item' },
30+
{ combo: 'Ctrl / ⌘ + Up / Down', description: 'central zoom in / out' },
31+
{ combo: 'Ctrl / ⌘ + Z / Y', description: 'undo / redo' },
32+
{ combo: `Shift + resize the selected item with the mouse`, description: 'lock width and height' },
33+
{ combo: 'Shift + Up / Down / Left / Right', description: 'move the selected item' },
34+
{ combo: 'Shift + Mouse Wheel', description: 'zoom by mouse position' },
35+
{ combo: 'Ctrl / ⌘ + A', description: 'select all items' },
36+
{ combo: 'Ctrl / ⌘ + G', description: 'group or ungroup selected items' },
37+
{ combo: 'Ctrl / ⌘ + D', description: 'duplicate selected item' },
38+
{ combo: 'Shift + Draw line', description: 'constrain line gradient to horizontal, vertical, or 45° diagonal' },
39+
{ combo: 'Ctrl / ⌘ + X', description: 'cut selected item' },
40+
{ combo: 'Ctrl / ⌘ + C / V', description: 'copy / paste selected item' }
41+
];
42+
43+
return shortcuts;
44+
}
1745
}

client/src/assets/lib/svgeditor/fuxa-editor.min.js

Lines changed: 17 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fuxa-server",
3-
"version": "1.3.0-2779",
3+
"version": "1.3.0-2780",
44
"description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",
55
"main": "main.js",
66
"scripts": {

0 commit comments

Comments
 (0)