cpee 2.1.92 → 2.1.95

data/cockpit/themes/control/symbols/arrow.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="execstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
+  <path class="colorstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
 </svg>

data/cockpit/themes/control/symbols/callmanipulate.svg

@@ -18,6 +18,6 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
   </g>
 </svg>

data/cockpit/themes/control/symbols/callmanipulate_sensor.svg

@@ -18,7 +18,8 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
+
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>
   </g>

data/cockpit/themes/control/symbols/callmanipulate_sensor_signal.svg

@@ -18,7 +18,7 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
 
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>

data/cockpit/themes/control/symbols/callmanipulate_signal.svg

@@ -18,7 +18,7 @@
   </g>
   <g class="part-extra">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle hoverstylethin execstylethin colorstyle stand"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
 
     <circle cx="29" cy="10" r="7" class="markstyle execstylethin hoverstylethin standthin colorstyle" style="stroke-dasharray: 1,2"/>
     <circle cx="29" cy="10" r="5" class="markstyle execstylethin hoverstylethin standthin colorstyle" style="stroke-dasharray: 1,2"/>

data/cockpit/themes/control/symbols/critical.svg

@@ -1,4 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3 27 l 12 -24 l 12 24 z"/>
-  <text transform="translate(15,23)" class="small">!</text>
+  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3.5 27 l 12 -24 l 12 24 z"/>
+  <path class="normal" style="fill:#000000;" d="m 16.5 11 l 0 8 l -2 0 l 0 -8 z"/>
+  <path class="normal" style="fill:#000000;" d="m 16.5 21 l 0 2 l -2 0 l 0 -2 z"/>
 </svg>

data/cockpit/themes/control/symbols/delete.svg

@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg">
-  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
-  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="colorstyle standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="colorstyle standfat"/>
 </svg>

data/cockpit/themes/control/symbols/end.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="colorstyle standfat"/>
+  <circle cx="15" cy="15" r="13" class="colorstyle standfat" style="stroke-width: 5;"/>
 </svg>

data/cockpit/themes/control/symbols/manipulate.svg

@@ -1,11 +1,11 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <g class="part-normal">
     <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
-    <text transform="translate(15,21)" class="normal">s</text>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-start" clip-path="url(#startclip)">
     <rect x="1" y="1" width="38" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
-    <text transform="translate(15,20.5)" class="normal">s</text>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-end" clip-path="url(#endclip)">
     <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>

data/cockpit/themes/control/symbols/parallel.svg

@@ -1,5 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
-  <text transform="translate(15.5,23)" class="normallarge">+</text>
+  <line x1="15.5" y1="9.5" x2="15.5" y2="21.5" class="stand"/>
+  <line x1="9.5" y1="15.5" x2="21.5" y2="15.5" class="stand"/>
 </svg>
 

data/cockpit/themes/control/symbols/scripts.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle stand"/>
-  <text transform="translate(15,21)" class="normal">s</text>
+  <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
 </svg>

data/cockpit/themes/dataflow/rngs/call.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">
@@ -51,6 +52,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/dataflow/rngs/callmanipulate.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">
@@ -43,7 +44,7 @@
     </element>
   </element>
   <element name="code" rngui:header="Data Handling">
-    <element name="signal" rngui:label="Signal after data manipulation (finalize/update)">
+    <element name="signal" rngui:label="Signal after finalize/update">
       <data type="boolean" rngui:label="A signal is sent every time the activity changes a data object"/>
     </element>
     <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -77,6 +78,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/dataflow/rngs/loop.rng

@@ -19,4 +19,11 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
+  <element name="_annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_iteration" rngui:label="Log per iteration">
+        <data type="boolean" rngui:label="Log per iteration"/>
+      </element>
+    </element>
+  </element>
 </element>

data/cockpit/themes/dataflow/rngs/manipulate.rng

@@ -16,7 +16,15 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>
+  <element name="_annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+    </element>
+  </element>
 </element>

data/cockpit/themes/dataflow/rngs/start.rng

@@ -10,6 +10,7 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <element name="_generic" rngui:header="Process Level Generic Annotations">

data/cockpit/themes/dataflow/symbols/arrow.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="execstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
+  <path class="colorstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
 </svg>

data/cockpit/themes/dataflow/symbols/callmanipulate.svg

@@ -18,6 +18,6 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
   </g>
 </svg>

data/cockpit/themes/dataflow/symbols/callmanipulate_sensor.svg

@@ -18,7 +18,8 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
+
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>
   </g>

data/cockpit/themes/dataflow/symbols/callmanipulate_sensor_signal.svg

@@ -18,7 +18,7 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
 
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>

data/cockpit/themes/dataflow/symbols/callmanipulate_signal.svg

@@ -18,7 +18,7 @@
   </g>
   <g class="part-extra">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle hoverstylethin execstylethin colorstyle stand"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
 
     <circle cx="29" cy="10" r="7" class="markstyle execstylethin hoverstylethin standthin colorstyle" style="stroke-dasharray: 1,2"/>
     <circle cx="29" cy="10" r="5" class="markstyle execstylethin hoverstylethin standthin colorstyle" style="stroke-dasharray: 1,2"/>

data/cockpit/themes/dataflow/symbols/critical.svg

@@ -1,4 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3 27 l 12 -24 l 12 24 z"/>
-  <text transform="translate(15,23)" class="small">!</text>
+  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3.5 27 l 12 -24 l 12 24 z"/>
+  <path class="normal" style="fill:#000000;" d="m 16.5 11 l 0 8 l -2 0 l 0 -8 z"/>
+  <path class="normal" style="fill:#000000;" d="m 16.5 21 l 0 2 l -2 0 l 0 -2 z"/>
 </svg>

data/cockpit/themes/dataflow/symbols/delete.svg

@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg">
-  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
-  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="colorstyle standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="colorstyle standfat"/>
 </svg>

data/cockpit/themes/dataflow/symbols/end.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="colorstyle standfat"/>
+  <circle cx="15" cy="15" r="13" class="colorstyle standfat" style="stroke-width: 5;"/>
 </svg>

data/cockpit/themes/dataflow/symbols/manipulate.svg

@@ -1,11 +1,11 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <g class="part-normal">
     <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
-    <text transform="translate(15,21)" class="normal">s</text>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-start" clip-path="url(#startclip)">
     <rect x="1" y="1" width="38" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
-    <text transform="translate(15,20.5)" class="normal">s</text>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-end" clip-path="url(#endclip)">
     <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>

data/cockpit/themes/dataflow/symbols/parallel.svg

@@ -1,5 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
-  <text transform="translate(15.5,23)" class="normallarge">+</text>
+  <line x1="15.5" y1="9.5" x2="15.5" y2="21.5" class="stand"/>
+  <line x1="9.5" y1="15.5" x2="21.5" y2="15.5" class="stand"/>
 </svg>
 

data/cockpit/themes/dataflow/symbols/scripts.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle stand"/>
-  <text transform="translate(15,21)" class="normal">s</text>
+  <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
 </svg>

data/cockpit/themes/dataflow/theme.js

@@ -5,8 +5,8 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
     this.striped = true;
     var dataflowExtract = function(subject,mixed,extract) { //{{{
       let dict = {};
-      var regassi =      /data\.([a-zA-Z_]+)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>|\|\|=)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
-      var reg_not_assi = /data\.([a-zA-Z_]+)\s*/g;
+      var regassi =      /data\.([a-z_][a-zA-Z0-9_]*)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>|\|\|=)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
+      var reg_not_assi = /data\.([a-z_][a-zA-Z0-9_]*)\s*/g;
 
       $(subject).each(function(_,ele){
         let item = extract(ele);
@@ -80,8 +80,8 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
         ret.push({ column: 'Duration', value: '~T = ' + adur + 'm' });
       }
       return ret;
-    };
-    this.elements.manipulate.illustrator.label = function(node) {
+    }; //}}}
+    this.elements.manipulate.illustrator.label = function(node) { //{{{
       var lab = $(node).attr('label');
       var ret = [ { column: 'ID', value: $(node).attr('id') } ];
 
@@ -104,7 +104,7 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var lab = $(node).attr('condition');
       var ret = [ ];
       if (lab != '') {
-        ret.unshift( { column: 'Label', value: lab } );
+        ret.unshift( { column: 'Label', value: lab.replace(/data\./,'') } );
       }
       if (avg != '') {
         ret.push({ column: 'Average', value: avg + 'ｘ' });
@@ -121,8 +121,8 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var avg = $('> _probability_avg',$(node).children('_probability')).text();
       var lab = $(node).attr('condition');
       var ret = [ ];
-      if (lab != '') {
-        ret.unshift( { column: 'Label', value: lab } );
+      if (lab && lab != '') {
+        ret.unshift( { column: 'Label', value: lab.replace(/data\./,'') } );
       }
       if (avg != '') {
         ret.push({ column: 'Average', value: avg + '%' });
@@ -141,7 +141,7 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var lab = $(node).attr('condition');
       var ret = [ ];
       if (lab != '') {
-        ret.unshift( { column: 'Label', value: lab } );
+        ret.unshift( { column: 'Label', value: lab.replace(/data\./,'') } );
       }
       if (avg != '') {
         ret.push({ column: 'Average', value: avg + 'ｘ' });

data/cockpit/themes/default/rngs/call.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">
@@ -51,6 +52,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/default/rngs/callmanipulate.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">
@@ -43,7 +44,7 @@
     </element>
   </element>
   <element name="code" rngui:header="Data Handling">
-    <element name="signal" rngui:label="Signal after data manipulation (finalize/update)">
+    <element name="signal" rngui:label="Signal after finalize/update">
       <data type="boolean" rngui:label="A signal is sent every time the activity changes a data object"/>
     </element>
     <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -77,6 +78,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/default/rngs/loop.rng

@@ -19,4 +19,11 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
+  <element name="_annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_iteration" rngui:label="Log per iteration">
+        <data type="boolean" rngui:label="Log per iteration"/>
+      </element>
+    </element>
+  </element>
 </element>

data/cockpit/themes/default/rngs/manipulate.rng

@@ -16,7 +16,15 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>
+  <element name="_annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+    </element>
+  </element>
 </element>

data/cockpit/themes/default/rngs/start.rng

@@ -10,6 +10,7 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <element name="_generic" rngui:header="Process Level Generic Annotations">

data/cockpit/themes/default/symbols/arrow.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="execstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
+  <path class="colorstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
 </svg>

data/cockpit/themes/default/symbols/callmanipulate.svg

@@ -18,6 +18,6 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
   </g>
 </svg>

data/cockpit/themes/default/symbols/callmanipulate_sensor.svg

@@ -18,7 +18,8 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
+
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>
   </g>

data/cockpit/themes/default/symbols/callmanipulate_sensor_signal.svg

@@ -18,7 +18,7 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
 
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>

data/cockpit/themes/default/symbols/callmanipulate_signal.svg

@@ -18,7 +18,7 @@
   </g>
   <g class="part-extra">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle hoverstylethin execstylethin colorstyle stand"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
 
     <circle cx="29" cy="10" r="7" class="markstyle execstylethin hoverstylethin standthin colorstyle" style="stroke-dasharray: 1,2"/>
     <circle cx="29" cy="10" r="5" class="markstyle execstylethin hoverstylethin standthin colorstyle" style="stroke-dasharray: 1,2"/>

data/cockpit/themes/default/symbols/critical.svg

@@ -1,4 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3 27 l 12 -24 l 12 24 z"/>
-  <text transform="translate(15,23)" class="small">!</text>
+  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3.5 27 l 12 -24 l 12 24 z"/>
+  <path class="normal" style="fill:#000000;" d="m 16.5 11 l 0 8 l -2 0 l 0 -8 z"/>
+  <path class="normal" style="fill:#000000;" d="m 16.5 21 l 0 2 l -2 0 l 0 -2 z"/>
 </svg>

data/cockpit/themes/default/symbols/delete.svg

@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg">
-  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
-  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="colorstyle standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="colorstyle standfat"/>
 </svg>

data/cockpit/themes/default/symbols/end.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="colorstyle standfat"/>
+  <circle cx="15" cy="15" r="13" class="colorstyle standfat" style="stroke-width: 5;"/>
 </svg>

data/cockpit/themes/default/symbols/manipulate.svg

@@ -1,11 +1,11 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <g class="part-normal">
     <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
-    <text transform="translate(15,21)" class="normal">s</text>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-start" clip-path="url(#startclip)">
     <rect x="1" y="1" width="38" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
-    <text transform="translate(15,20.5)" class="normal">s</text>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-end" clip-path="url(#endclip)">
     <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>

data/cockpit/themes/default/symbols/parallel.svg

@@ -1,5 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
-  <text transform="translate(15.5,23)" class="normallarge">+</text>
+  <line x1="15.5" y1="9.5" x2="15.5" y2="21.5" class="stand"/>
+  <line x1="9.5" y1="15.5" x2="21.5" y2="15.5" class="stand"/>
 </svg>
 

data/cockpit/themes/default/symbols/scripts.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle stand"/>
-  <text transform="translate(15,21)" class="normal">s</text>
+  <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
 </svg>