Skip to content

Commit 877d367

Browse files
muenchrisChris MuenchMarkusHorstmann
authored
Feb 2024 (#62)
* Fix for SubProperties in NMI * proper UX Management of Sub-Properties * Fix for super large collapsible groups * Fix for missing Template assignment; fix for SideBar in ClassicMode * no checkin of cdeWorker.js * LiveChart with PixelWidth * Bar with PixelHeight/Width; remove od debugger * fix for Chart Control * Fix for Pixel precision sizing of NMI Controls * Fix for Bar PixelWidth * code smell removed * fix for sonarcloud * Fix for Foreign Things in Screens * Fix for FacePlate inlines pointing at other Things * Missing Event Fire on Screen Model Update * Tuning of Faceplate tags * Fix for custom HomeScreen OnShow not firing; fix for FacePlate parsing * fix for faceplate parsing * SonarCloud Cleanup; Final FacePlate Fix * remove allowanonymour from nmi initialization * SonarCloud cleanup; Support for ReloadAfterLogout; Support for DefaultPortal of a plugin; Fix of Login Screen if host name has changed; * code smell fix * Small Fix for Dashboard Tiles * ForceLoad if DefaultPortal is set * new FitToScreen option for Forms; some more SonarCloud cleanup * code smell fix * Fit To Screen for vertical adjustments * Fix for FitToScreen; new ClassName Macro for Faceplates * FacePlate fix; Copyright to 2023 * Fix for SonarCloud duplication * Correct fetch of images from Mesh Sources; Sonarcloud fixes * sonar cloud fix * Initial work on NMI Editor * Updates to NMI Editor * Support the for the NMI Editor with RedPill * fix for sonar * No Sonar for webworker * still fighting sonarcloud * Still fighting * NMI Model preparation for NMI Editor allowing to remove sub-controls on the fly * Fix for Canvas Controls with Scaling of Screens * New Numeric Macro for html templates * SonarCloud bugfix * Fix for dragging not canceled by screenchange; fix for value crash on SmartGauge2; Fix for NMI Editor Creation * Preview of Gesture Support to delete a control from a "Group" screen Fix for Overlay on fullscreens * Color Scheme update for NMI Editor * Theme updates * Fix for Property Updates in NMI are only sent to TheThing owner. * Support for search in ComboBox * Support for TimeSpan NMI control * Improvement for control dragging * Fix for lazy control loading * C3 Smoothy update * Support for TileFactor and Pixelwidth on ctrlGauge * Minor fixe * Ignore AzureBat * AzureSign * Updates styles for Pins * ComboBox Cleanup * CertPicker Cleanup * AzureSign Removed * Code Signing: switch to Azure Vault * copy * Update workflow for azure vault * signme fix * Removed double definition * updated nuget * Default Icons for SOE header in NMI * Better Nuget Collection * ignore local nugets * missing licensing * lic fix * lic up * Update dotnetcore.yml * Update dotnetcore.yml * Update dotnetcore.yml * Update dotnetcore.yml * lic update * lic --------- Co-authored-by: Chris Muench <chris.muench@live.com> Co-authored-by: Markus Horstmann <markushorstmann@hotmail.com>
1 parent 7cf17e1 commit 877d367

File tree

14 files changed

+81
-49
lines changed

14 files changed

+81
-49
lines changed

‎.github/workflows/dotnetcore.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ jobs:
8787
- name: Gather artifacts
8888
run: (robocopy .\bin\ .\artifacts\ *.CDEX *.CDEP *.nupkg *.snupkg *.msi /s /np) ^& IF %ERRORLEVEL% LEQ 1 exit 0
8989
shell: cmd
90+
- name: Gather nuget artifacts
91+
run: (robocopy .\src\nugets .\artifacts\ *.nupkg *.snupkg /s /np) ^& IF %ERRORLEVEL% LEQ 1 exit 0
92+
shell: cmd
9093
- name: Upload artifacts
9194
uses: actions/upload-artifact@v1
9295
with:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
/.vs
66
/src/.vs
7+
/src/Nugets
78

89
## Ignore Visual Studio temporary files, build results, and
910
## files generated by popular Visual Studio add-ons.

‎.reuse/dep5‎

Lines changed: 51 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,63 @@ Upstream-Contact: <>
44
Source: https://github.com/TRUMPF-IoT/C-DEngine
55

66
Files: README.md
7-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
7+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
88
License: MPL-2.0
99

1010
Files: .gitignore
11-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
11+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
1212
License: MPL-2.0
1313

1414
Files: GitVersion.yml
15-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
15+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
1616
License: MPL-2.0
1717

1818
Files: NuGet.config
19-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
19+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
2020
License: MPL-2.0
2121

2222
Files: src/HTML5/CDMyNMIHtml5RT/toplogo-128.png
23-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
23+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
2424
License: MPL-2.0
2525

2626
Files: docs/*
27-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
27+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
2828
License: MPL-2.0
2929

3030
Files: BuildTools/*
31-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
31+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
3232
License: MPL-2.0
3333

3434
Files: src/cdeNMI.sln
35-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
35+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
3636
License: MPL-2.0
3737

3838
Files: src/readme.md
39-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
39+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
4040
License: MPL-2.0
4141

4242
Files: src/HTML5/readme.md
43-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
43+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
4444
License: MPL-2.0
4545

4646
Files: src/HTML5/CDMyNMIHtml5RT/CDMyNMIHtml5RT.csproj
47-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
47+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
4848
License: CC0-1.0
4949

5050
Files: src/HTML5/CDMyNMIHtml5RT/README.md
51-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
51+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
5252
License: MPL-2.0
5353

5454
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/CDE/*
55-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
55+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
5656
License: MPL-2.0
5757

5858
Files: src/HTML5/CDMyNMIHtml5RT/compilerconfig.json.defaults
59-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
59+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
6060
License: MPL-2.0
6161

6262
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/JS/cdeNMITransforms.js
63-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
63+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
6464
License: MPL-2.0
6565

6666
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/JS/cdeSorttable.js
@@ -94,47 +94,55 @@ Copyright: Tim Wood, Iskren Chernev, Moment.js contributors
9494
License: MIT
9595

9696
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/FAVICON.ICO
97-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
97+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
9898
License: MPL-2.0
9999

100100
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/APPLE-TOUCH-ICON.PNG
101-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
101+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
102102
License: MPL-2.0
103103

104104
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/CLIENTACCESSPOLICY.XML
105-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
105+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
106106
License: MPL-2.0
107107

108108
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/CROSSDOMAIN.XML
109-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
109+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
110110
License: MPL-2.0
111111

112112
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/CROSSDOMAINPOLICY.XML
113-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
113+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
114114
License: MPL-2.0
115115

116116
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/CSS/CDESTYLES.min.css
117-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
117+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
118+
License: MPL-2.0
119+
120+
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/*.png
121+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
122+
License: MPL-2.0
123+
124+
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/*.webmanifest
125+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
118126
License: MPL-2.0
119127

120128
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/CSS/all.min.css
121129
Copyright: Fonticons, Inc.
122130
License: CC-BY-4.0
123131

124132
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/IMAGES/*
125-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
133+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
126134
License: MPL-2.0
127135

128136
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/pages/*
129-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
137+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
130138
License: MPL-2.0
131139

132140
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/CSS/*
133-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
141+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
134142
License: MPL-2.0
135143

136144
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/webfonts/C-Labs-Font*
137-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
145+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
138146
License: MPL-2.0
139147

140148
Files: src/HTML5/CDMyNMIHtml5RT/ClientBin/webfonts/fa-*
@@ -150,58 +158,58 @@ Copyright: 2015 Google Inc
150158
License: Apache-2.0
151159

152160
Files: src/HTML5/cdeTS/*.png
153-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
161+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
154162
License: CC-BY-4.0
155163

156164
Files: src/HTML5/cdeTS/*.json
157-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
165+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
158166
License: CC0-1.0
159167

160168

161169

162170
Files: src/HTML5/cdeTS/*.json.defaults
163-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
171+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
164172
License: CC0-1.0
165173

166174
Files: src/HTML5/cdeTS/*.csproj
167-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
175+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
168176
License: CC0-1.0
169177

170178

171179
Files: src/HTML5/cdeTS/README.md
172-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
180+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
173181
License: MPL-2.0
174182

175183
Files: src/HTML5/cdeTS/cde/webfonts/C-Labs-Font*
176-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
184+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
177185
License: MPL-2.0
178186

179187
Files: src/HTML5/cdeTS/cde/webfonts/Roboto-*
180188
Copyright: 2015 Google Inc
181189
License: Apache-2.0
182190

183191
Files: src/HTML5/cdeTS/cde/CSS/*
184-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
192+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
185193
License: MPL-2.0
186194

187195
Files: src/HTML5/cdeTS/cde/cde.min.js
188-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
196+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
189197
License: MPL-2.0
190198

191199
Files: src/HTML5/cdeTS/cde/cdeWorker.min.js
192-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
200+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
193201
License: MPL-2.0
194202

195203
Files: src/HTML5/ExtensionPlugins/172-CDMyC3/CDMyC3/CDMyC3.csproj
196-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
204+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
197205
License: CC0-1.0
198206

199207
Files: src/HTML5/ExtensionPlugins/readme.md
200-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
208+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
201209
License: MPL-2.0
202210

203211
Files: src/HTML5/ExtensionPlugins/172-CDMyC3/CDMyC3/ClientBin/P172/CDMyC3.TheC3Service.js
204-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
212+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
205213
License: MPL-2.0
206214

207215
Files: src/HTML5/ExtensionPlugins/172-CDMyC3/CDMyC3/ClientBin/P172/JS/c3.min.js
@@ -217,9 +225,13 @@ Copyright: 2010-2013, Joe Walnes, 2013-2014, Drew Noakes
217225
License: MIT
218226

219227
Files: src/HTML5/ExtensionPlugins/172-CDMyC3/CDMyC3/ClientBin/P172/JS/cytoscape.min.js
220-
Copyright: 2016-2022, The Cytoscape Consortium
228+
Copyright: 2016-2024, The Cytoscape Consortium
221229
License: MIT
222230

223231
Files: src/HTML5/cdeTS/cde/cdeWorker.js
224-
Copyright: 2009-2022 TRUMPF Laser GmbH, authors: C-Labs
232+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
225233
License: MPL-2.0
234+
235+
Files: artifacts/*
236+
Copyright: 2009-2024 TRUMPF Laser GmbH, authors: C-Labs
237+
License: MPL-2.0

‎src/HTML5/CDMyNMIHtml5RT/CDMyNMIHtml5RT.csproj‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- Workaround for placing the .nupkg into the build's output folder when using msbuild's GenerateProjectSpecificOutputFolder -->
2121
<ProjectName>$(AssemblyName).$(TargetFramework)</ProjectName>
2222
<!-- Workaround for placing each DLL into a separate directory when using msbuild's GenerateProjectSpecificOutputFolder -->
23-
<PackageOutputPath>$(OutDir)</PackageOutputPath>
23+
<PackageOutputPath>$(SolutionDir)Nugets</PackageOutputPath>
2424
</PropertyGroup>
2525

2626

@@ -50,10 +50,16 @@
5050

5151

5252
<ItemGroup>
53+
<None Remove="ClientBin\android-chrome-192x192.png" />
54+
<None Remove="ClientBin\android-chrome-512x512.png" />
55+
<None Remove="ClientBin\apple-touch-icon.png" />
5356
<None Remove="ClientBin\CDE\cde.min.js" />
5457
<None Remove="ClientBin\CDE\cde.minold.js" />
5558
<None Remove="ClientBin\CDE\cdeWorker.min.js" />
5659
<None Remove="ClientBin\CDE\cdeWorker.minold.js" />
60+
<None Remove="ClientBin\CLIENTACCESSPOLICY.XML" />
61+
<None Remove="ClientBin\CROSSDOMAIN.XML" />
62+
<None Remove="ClientBin\CROSSDOMAINPOLICY.XML" />
5763
<None Remove="ClientBin\CSS\cdeBaseColors.min.css" />
5864
<None Remove="ClientBin\CSS\CDESTYLES.min.css" />
5965
<None Remove="ClientBin\CSS\choices.dark.min.css" />
@@ -71,17 +77,26 @@
7177
<None Remove="ClientBin\CSS\MYSTYLESTY.min.css" />
7278
<None Remove="ClientBin\CSS\MYSTYLESW.min.css" />
7379
<None Remove="ClientBin\CSS\MYSTYLESX.min.css" />
80+
<None Remove="ClientBin\favicon-16x16.png" />
81+
<None Remove="ClientBin\favicon-32x32.png" />
7482
<None Remove="ClientBin\IMAGES\GlasButton.png" />
7583
<None Remove="ClientBin\JS\choices.min.js" />
7684
<None Remove="ClientBin\JS\flatpickr.js" />
7785
<None Remove="ClientBin\JS\flatpickr.monthSelect.js" />
86+
<None Remove="ClientBin\site.webmanifest" />
7887
<None Remove="ClientBin\webfonts\roboto-medium-webfont.woff2" />
7988
<None Remove="ClientBin\webfonts\roboto-regular-webfont.woff2" />
8089
</ItemGroup>
8190

8291
<ItemGroup>
92+
<EmbeddedResource Include="ClientBin\android-chrome-192x192.png" />
93+
<EmbeddedResource Include="ClientBin\android-chrome-512x512.png" />
94+
<EmbeddedResource Include="ClientBin\apple-touch-icon.png" />
8395
<EmbeddedResource Include="ClientBin\CDE\cde.min.js" />
8496
<EmbeddedResource Include="ClientBin\CDE\cdeWorker.min.js" />
97+
<EmbeddedResource Include="ClientBin\CLIENTACCESSPOLICY.XML" />
98+
<EmbeddedResource Include="ClientBin\CROSSDOMAIN.XML" />
99+
<EmbeddedResource Include="ClientBin\CROSSDOMAINPOLICY.XML" />
85100
<EmbeddedResource Include="ClientBin\CSS\cdeBaseColors.min.css" />
86101
<EmbeddedResource Include="ClientBin\CSS\CDESTYLES.min.css" />
87102
<EmbeddedResource Include="ClientBin\CSS\choices.dark.min.css" />
@@ -105,6 +120,8 @@
105120
<EmbeddedResource Include="ClientBin\CSS\all.min.css" />
106121
<EmbeddedResource Include="ClientBin\CSS\BaseColors.min.CSS" />
107122
<EmbeddedResource Include="ClientBin\CSS\LBaseColors.min.CSS" />
123+
<EmbeddedResource Include="ClientBin\favicon-16x16.png" />
124+
<EmbeddedResource Include="ClientBin\favicon-32x32.png" />
108125
<EmbeddedResource Include="ClientBin\IMAGES\cdeInnerCheck.png" />
109126
<EmbeddedResource Include="ClientBin\IMAGES\E.PNG" />
110127
<EmbeddedResource Include="ClientBin\IMAGES\iconTopLogo.png" />
@@ -123,6 +140,7 @@
123140
<EmbeddedResource Include="ClientBin\pages\nmiportal.html" />
124141
<EmbeddedResource Include="ClientBin\pages\ThingFace.html" />
125142
<EmbeddedResource Include="ClientBin\lang\NMIlang1031.json" />
143+
<EmbeddedResource Include="ClientBin\site.webmanifest" />
126144
<EmbeddedResource Include="ClientBin\webfonts\C-Labs-Font_Basis.eot" />
127145
<EmbeddedResource Include="ClientBin\webfonts\C-Labs-Font_Basis.otf" />
128146
<EmbeddedResource Include="ClientBin\webfonts\C-Labs-Font_Basis.ttf" />
@@ -154,7 +172,7 @@
154172
<None Include="toplogo-128.png" Pack="true" PackagePath="" />
155173
</ItemGroup>
156174
<ItemGroup>
157-
<None Include="ClientBin\FAVICON.ICO" />
175+
<EmbeddedResource Include="ClientBin\FAVICON.ICO" />
158176
</ItemGroup>
159177

160178
<ItemGroup>

‎src/HTML5/CDMyNMIHtml5RT/ClientBin/APPLE-TOUCH-ICON.PNG‎

22.7 KB
Loading

‎src/HTML5/CDMyNMIHtml5RT/ClientBin/FAVICON.ICO‎

-17.2 KB
Binary file not shown.

‎src/HTML5/CDMyNMIHtml5RT/ClientBin/android-chrome-192x192.png‎

30.8 KB
Loading

‎src/HTML5/CDMyNMIHtml5RT/ClientBin/android-chrome-512x512.png‎

156 KB
Loading

‎src/HTML5/CDMyNMIHtml5RT/ClientBin/favicon-16x16.png‎

702 Bytes
Loading

‎src/HTML5/CDMyNMIHtml5RT/ClientBin/favicon-32x32.png‎

1.79 KB
Loading

0 commit comments

Comments
 (0)