Schoenenberger_Systeme_GmbH/SSG-Ruledesigner-Konfigurator
3
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Yuelin Wang
2024-10-21 15:46:16 +02:00
parent 3e9aef40e3 eb32d69643
commit 1f5afc71ca
6 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml
+4
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
<palette><div class="paletteItem"><div><img id="s_Gefaellestrecke" class="shape" title="" family="Gefaellestrecke" shapeMode="0" src="SSG/shapes/img/Gefaellestrecke.png" /></div><div>Gefällestrecke Gerade</div></div>
<div class="paletteItem"><div><img id="s_Kurve_90_L_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_L_G_32px.png" /></div><div>90 Kurve links Gefällestrecke</div></div>
<div class="paletteItem"><div><img id="s_Kurve_90_R_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_R_G_32px.png" /></div><div>90 Kurve rechts Gefällestrecke</div></div>
@@ -11,4 +12,7 @@
<div class="paletteItem"><div><img id="s_Kurve_60_R_F" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_R_F_32px.png" /></div><div>60 Kurve rechts angetriebene</div></div>
<div class="paletteItem"><div><img id="s_Kurve_30_L_F" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_L_F_32px.png" /></div><div>30 Kurve links angetriebene</div></div>
<div class="paletteItem"><div><img id="s_Kurve_30_R_F" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_R_F_32px.png" /></div><div>30 Kurve rechts angetriebene</div></div>
=======
<palette><div class="paletteItem"><div><img id="s_Gefaellestrecke" class="shape" title="" family="Gefaellestrecke" shapeMode="0" src="SSG/shapes/img/Gefaellestrecke.png" /></div><div>Gefällestrecke</div></div>
>>>>>>> eb32d6964391e3d178d96a3caa1d762ad949bab0
</palette>
Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml
+7
View File
@@ -0,0 +1,7 @@
<palette><div class="paletteItem"><div><img id="s_Kurve_90_L" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_L_32px.png" /></div><div>90 Kurve links</div></div>
<div class="paletteItem"><div><img id="s_Kurve_90_R" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_R_32px.png" /></div><div>90 Kurve rechts</div></div>
<div class="paletteItem"><div><img id="s_Kurve_60_L" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_L_32px.png" /></div><div>60 Kurve links</div></div>
<div class="paletteItem"><div><img id="s_Kurve_60_R" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_R_32px.png" /></div><div>60 Kurve rechts</div></div>
<div class="paletteItem"><div><img id="s_Kurve_30_L" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_L_32px.png" /></div><div>30 Kurve links</div></div>
<div class="paletteItem"><div><img id="s_Kurve_30_R" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_R_32px.png" /></div><div>30 Kurve rechts</div></div>
</palette>