cpee 2.1.91 → 2.1.93

data/cockpit/themes/base.js

@@ -115,9 +115,9 @@ function WFAdaptorManifestationBase(adaptor) {
         });
       }
       nodes.reverse();
-      var iconm =  self.resources['arrow'].clone();
-      var iconc =  self.resources['arrow'].clone();
-      iconm.children('.rfill').addClass('menu');
+      var iconm = contextMenuHandling_clean_icon(self.resources['arrow']);
+      var iconc = contextMenuHandling_clean_icon(self.resources['arrow']);
+      iconm.children('.colorstyle').css('fill','var(--wfadaptor-important');
       if (myid == localStorage.getItem('marked_from')) {
         menu.push(
           {
@@ -141,6 +141,13 @@ function WFAdaptorManifestationBase(adaptor) {
     }
   } //}}}
 
+  function contextMenuHandling_clean_icon(icon) { //{{{
+    icon = icon.clone();
+    $('.part-start',icon).remove();
+    $('.part-middle',icon).remove();
+    $('.part-end',icon).remove();
+    return icon;
+  } //}}}
   function contextMenuHandling(svgid,e,child,sibling) { //{{{
     if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
 
@@ -178,9 +185,8 @@ function WFAdaptorManifestationBase(adaptor) {
     }
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
-      var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-      icon.find('.rfill').addClass('menu');
-      icon.find('.hfill').addClass('menu');
+      var icon = contextMenuHandling_clean_icon(self.elements[xml_node.get(0).tagName].illustrator.svg);
+      icon.find('.colorstyle').css('fill','var(--wfadaptor-important');
       menu['Delete'] = [{
         'label': 'Remove Element',
         'function_call': function(selector,target,selected){
@@ -196,8 +202,8 @@ function WFAdaptorManifestationBase(adaptor) {
       var nodes = localStorage.getItem('marked');
       nodes = JSON.parse(nodes);
       if (nodes && nodes.length > 0) {
-        var icond =  self.resources['delete'].clone();
-        icond.children('.standfat').addClass('menu');
+        var icond = contextMenuHandling_clean_icon(self.resources['delete']);
+        icond.find('.colorstyle').css('stroke','var(--wfadaptor-important)');
         menu['Delete'].push({
           'label': 'Remove Marked Elements',
           'function_call': function(){
@@ -228,8 +234,8 @@ function WFAdaptorManifestationBase(adaptor) {
       }
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
-      var icon =  self.elements.callmanipulate.illustrator.svg.clone();
-      icon.children('.rfill:last').addClass('menu');
+      var icon = contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg);
+      icon.find('.part-extra .colorstyle').css('fill','var(--wfadaptor-important');
       menu['Delete'].push({
         'label': 'Remove Scripts',
         'function_call': self.adaptor.description.remove,
@@ -239,8 +245,8 @@ function WFAdaptorManifestationBase(adaptor) {
       });
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
-      var icon =  self.elements.call.illustrator.svg.clone();
-      icon.children('g.replace').addClass('passive');
+      var icon = contextMenuHandling_clean_icon(self.elements.call.illustrator.svg);
+      icon.find('.part-normal').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
@@ -336,6 +342,7 @@ function WFAdaptorManifestationBase(adaptor) {
 
       self.update_details(svgid);
     }
+    if (e) { e.stopImmediatePropagation(); }
   } // }}}
   this.events.dblclick = function(svgid, e) { // {{{
   } // }}}
@@ -374,17 +381,35 @@ function WFAdaptorManifestationBase(adaptor) {
         var ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') } ];
         return ret;
       },
-      'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
+      'style': function(node){
+        let sty = {};
+        let col = $('> parameters > color', node);
+        if (col.length > 0 && col.text() != '') {
+          sty['fill'] = col.text();
+        }
+        return sty;
+      },
+      'info': function(node){
+        return { 'element-endpoint': $(node).attr('endpoint') };
+      },
       'resolve_symbol': function(node) {
         if ($('> annotations > _context_data_analysis > probes > probe', node).length > 0) {
           if ($('> code', node).length > 0) {
-            return 'callmanipulate_sensor';
+            if ($('> code > signal', node).length > 0 && $('> code > signal', node).text() == 'on') {
+              return 'callmanipulate_sensor_signal';
+            } else {
+              return 'callmanipulate_sensor';
+            }
           } else {
             return 'call_sensor';
           }
         } else {
           if ($('> code', node).length > 0) {
-            return 'callmanipulate';
+            if ($('> code > signal', node).length > 0 && $('> code > signal', node).text() == 'on') {
+              return 'callmanipulate_signal';
+            } else {
+              return 'callmanipulate';
+            }
           } else {
             return 'call';
           }
@@ -398,7 +423,7 @@ function WFAdaptorManifestationBase(adaptor) {
         return [
          {'label': 'Scripts',
           'function_call': self.adaptor.description.insert_last_into,
-          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+          'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
           'type': undefined,
           'params': [self.adaptor.description.elements.scripts, node]}
         ];
@@ -418,6 +443,14 @@ function WFAdaptorManifestationBase(adaptor) {
     'type': 'primitive',
     'illustrator': {//{{{
       'endnodes': 'this',
+      'style': function(node) {
+        let sty = {};
+        let col = $(node).attr('color');
+        if (col && col != '') {
+          sty['fill'] = col;
+        }
+        return sty;
+      },
       'label': function(node){
         var lab = $(node).attr('label');
         if (lab) {
@@ -479,6 +512,29 @@ function WFAdaptorManifestationBase(adaptor) {
       'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
+  this.elements.wait_for_signal = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $('> label',$(node)).text().replace(/^['"]/,'').replace(/['"]$/,'') } ];
+        return ret;
+      },
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/wait_for_signal.svg'
+    },//}}}
+    'description': self.adaptor.theme_dir + 'rngs/wait_for_signal.rng',
+    'permissible_children': function(node,mode) { //{{{
+      return [];
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,false,true); },
+      'touchend': self.events.touchend,
+      'click': self.events.click,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
+  }; /*}}}*/
   this.elements.terminate = { /*{{{*/
     'type': 'primitive',
     'illustrator': {//{{{
@@ -512,6 +568,7 @@ function WFAdaptorManifestationBase(adaptor) {
     'type': 'primitive',
     'illustrator': {//{{{
       'endnodes': 'this',
+      'wide': true,
       'svg': self.adaptor.theme_dir + 'symbols/event_end.svg'
     }, //}}}
     'adaptor': {//{{{
@@ -554,7 +611,7 @@ function WFAdaptorManifestationBase(adaptor) {
         var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
         return ret;
       },
-      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg',
+      'svg': self.adaptor.theme_dir + 'symbols/loop_end.svg',
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
@@ -600,7 +657,7 @@ function WFAdaptorManifestationBase(adaptor) {
   this.elements.choose = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){ return [ { column: 'Label', value: $(node).attr('mode') == 'exclusive' ? 'exclusive' : 'inclusive' } ]; },
+      'label': function(node){ return [ { column: 'Label', value: $(node).attr('label') } ]; },
       'endnodes': 'aggregate',
       'closeblock': false,
       'closing_symbol': 'choose_finish',
@@ -627,25 +684,25 @@ function WFAdaptorManifestationBase(adaptor) {
       if(node.children('parallel_branch').length > 0) {
         return [{'label': 'Parallel Branch',
          'function_call': func,
-         'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel_branch.illustrator.svg),
          'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]}];
       }
       var childs = [{'label': 'Alternative',
        'function_call': func,
-       'menu_icon': self.elements.alternative.illustrator.svg.clone(),
+       'menu_icon': contextMenuHandling_clean_icon(self.elements.alternative.illustrator.svg),
        'type': 'alternative',
        'params': [self.adaptor.description.elements.alternative, node]}];
       if((node.children('otherwise').length == 0) && node.parents('parallel').length == node.parents('parallel_branch').length && node.parent('choose').length == 0)
         childs.push({'label': 'Otherwise',
          'function_call': self.adaptor.description.insert_last_into,
-         'menu_icon': self.elements.otherwise.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.otherwise.illustrator.svg),
          'type': 'otherwise',
          'params': [self.adaptor.description.elements.otherwise, node]});
       if(node.parents('parallel').length > node.parents('parallel_branch').length)
         childs.push({'label': 'Parallel Branch',
          'function_call': func,
-         'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel_branch.illustrator.svg),
          'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]});
       return childs;
@@ -684,53 +741,58 @@ function WFAdaptorManifestationBase(adaptor) {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Terminate',
          'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.terminate.illustrator.svg),
          'type': 'terminate',
          'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
-      if(node.parent('parallel_branch').length > 0) {
-        childs.push({
-           'label': 'Critical',
+      if(node.parents('parallel_branch').length > 0) {
+        childs.push(
+          {'label': 'Critical',
            'function_call': func,
-           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
            'type': 'critical',
-           'params': [self.adaptor.description.elements.critical, node]
-        });
+           'params': [self.adaptor.description.elements.critical, node]},
+          {'label': 'Wait for Signal',
+           'function_call': func,
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.wait_for_signal.illustrator.svg),
+           'type': 'wait_for_signal',
+           'params': [self.adaptor.description.elements.wait_for_signal, node]}
+        );
       }
       return childs;
     }, //}}}
@@ -769,60 +831,65 @@ function WFAdaptorManifestationBase(adaptor) {
       if(node.parents('parallel').length > node.parents('parallel_branch').length && node.get(0).tagName == 'alternative') {
         return [{'label': 'Parallel Branch',
          'function_call': func,
-         'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel_branch.illustrator.svg),
          'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]}];
       }
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Terminate',
          'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.terminate.illustrator.svg),
          'type': 'terminate',
          'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
-      if(node.parent('parallel_branch').length > 0) {
-        childs.push({
-           'label': 'Critical',
+      if(node.parents('parallel_branch').length > 0) {
+        childs.push(
+          {'label': 'Critical',
            'function_call': func,
-           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
            'type': 'critical',
-           'params': [self.adaptor.description.elements.critical, node]
-        });
+           'params': [self.adaptor.description.elements.critical, node]},
+          {'label': 'Wait for Signal',
+           'function_call': func,
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.wait_for_signal.illustrator.svg),
+           'type': 'wait_for_signal',
+           'params': [self.adaptor.description.elements.wait_for_signal, node]}
+        );
       }
       return childs;
     }, //}}}
@@ -862,60 +929,65 @@ function WFAdaptorManifestationBase(adaptor) {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Terminate',
          'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.terminate.illustrator.svg),
          'type': 'terminate',
          'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
-      if(node.parent('parallel_branch').length > 0) {
-        childs.push({
-           'label': 'Critical',
+      if(node.parents('parallel_branch').length > 0) {
+        childs.push(
+          {'label': 'Critical',
            'function_call': func,
-           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
            'type': 'critical',
-           'params': [self.adaptor.description.elements.critical, node]
-        });
+           'params': [self.adaptor.description.elements.critical, node]},
+          {'label': 'Wait for Signal',
+           'function_call': func,
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.wait_for_signal.illustrator.svg),
+           'type': 'wait_for_signal',
+           'params': [self.adaptor.description.elements.wait_for_signal, node]}
+        );
       }
-      if(node.parent('parallel').length > node.parent('parallel_branch').length) {
+      if(node.parents('parallel').length > node.parents('parallel_branch').length) {
         childs.push({'label': 'Parallel Branch',
                      'function_call': func,
-                     'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+                     'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel_branch.illustrator.svg),
                      'type': 'parallel_branch',
                      'params': [self.adaptor.description.elements.parallel_branch, node]}
                     );
       } else {
         childs.push({'label': 'Parallel',
                      'function_call': func,
-                     'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+                     'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
                      'type': 'parallel',
                      'params': [self.adaptor.description.elements.parallel, node]}
                     );
@@ -965,7 +1037,7 @@ function WFAdaptorManifestationBase(adaptor) {
       var childs =  [
         {'label': 'Parallel Branch',
          'function_call': func,
-         'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel_branch.illustrator.svg),
          'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]},
       ];
@@ -978,39 +1050,39 @@ function WFAdaptorManifestationBase(adaptor) {
       var childs =  [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
       if(node.get(0).tagName != 'parallel')
         childs.push({'label': 'Parallel',
            'function_call': self.adaptor.description.insert_last_into,
-           'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
            'type': 'parallel',
            'params': [self.adaptor.description.elements.parallel, node]});
       return childs;
@@ -1056,54 +1128,59 @@ function WFAdaptorManifestationBase(adaptor) {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Terminate',
          'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.terminate.illustrator.svg),
          'type': 'terminate',
          'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
          'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.critical, node]},
+        {'label': 'Wait for Signal',
+         'function_call': func,
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.wait_for_signal.illustrator.svg),
+         'type': 'wait_for_signal',
+         'params': [self.adaptor.description.elements.wait_for_signal, node]}
       ];
       if(node.parents('choose').length > node.parents('alternative, otherwise').length && node.get(0).tagName == 'parallel_branch') {
         return [{'label': 'Alternative',
          'function_call': func,
-         'menu_icon': self.elements.alternative.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.alternative.illustrator.svg),
          'type': 'alternative',
          'params': [self.adaptor.description.elements.alternative, node]}];
       }
@@ -1141,53 +1218,58 @@ function WFAdaptorManifestationBase(adaptor) {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Terminate',
          'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.terminate.illustrator.svg),
          'type': 'terminate',
          'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
-      if(node.parent('parallel_branch').length > 0) {
-        childs.push({
-           'label': 'Critical',
+      if(node.parents('parallel_branch').length > 0) {
+        childs.push(
+          {'label': 'Critical',
            'function_call': func,
-           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
            'type': 'critical',
-           'params': [self.adaptor.description.elements.critical, node]
-        });
+           'params': [self.adaptor.description.elements.critical, node]},
+          {'label': 'Wait for Signal',
+           'function_call': func,
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.wait_for_signal.illustrator.svg),
+           'type': 'wait_for_signal',
+           'params': [self.adaptor.description.elements.wait_for_signal, node]}
+        );
       }
       return childs;
     }, //}}}
@@ -1237,6 +1319,14 @@ function WFAdaptorManifestationBase(adaptor) {
     'type': 'description',
     'illustrator': {//{{{
       'endnodes': 'passthrough',
+      'style': function(node) {
+        let sty = {};
+        let col = $(node).attr('color');
+        if (col && col != '') {
+          sty['fill'] = col;
+        }
+        return sty;
+      },
       'closeblock': false,
       'balance': true,
       'expansion': function(node) {
@@ -1246,8 +1336,8 @@ function WFAdaptorManifestationBase(adaptor) {
         let alist = []
         let plist = []
 
-        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-zA-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-zA-Z_][a-zA-Z0-9_]*)\s*/g;
 
         $('call, manipulate, loop[condition], alternative[condition]',node).each(function(i,n) {
           let item = '';
@@ -1261,13 +1351,11 @@ function WFAdaptorManifestationBase(adaptor) {
               item += n.textContent + '\n';
             }
             $('call > parameters > arguments > *, call > code > finalize, call > code > update, call > code > rescue',n).each(function(j,m){
-              console.log('aaa');
               let x = m.textContent;
               if (m.parentNode.nodeName == 'arguments' && x.charAt(0) != '!' ) { return }
               item += x + '\n';
             });
           }
-          console.log(item);
           if (item == '') { return; }
 
           let indices = [];
@@ -1303,49 +1391,40 @@ function WFAdaptorManifestationBase(adaptor) {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
-      if(node.parent('parallel_branch').length > 0) {
-        childs.push({
-           'label': 'Critical',
-           'function_call': func,
-           'menu_icon': self.elements.critical.illustrator.svg.clone(),
-           'type': 'critical',
-           'params': [self.adaptor.description.elements.critical, node]
-        });
-      }
       return childs;
     }, //}}}
     'adaptor': {//{{{
@@ -1378,7 +1457,17 @@ function WFAdaptorManifestationBase(adaptor) {
     'parent': 'call',
     'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
     'illustrator': {//{{{
-      'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
+      'style': function(node){
+        let sty = {};
+        let col = $('> parameters > color', node);
+        if (col.length > 0 && col.text() != '') {
+          sty['fill'] = col.text();
+        }
+        return sty;
+      },
+      'info': function(node){
+        return { 'element-endpoint': $(node).attr('endpoint') };
+      },
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
     }//}}}
   }; /*}}}*/
@@ -1389,6 +1478,20 @@ function WFAdaptorManifestationBase(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate_sensor.svg'
     }//}}}
   }; /*}}}*/
+  this.elements.callmanipulate_signal = { /*{{{*/
+    'parent': 'call',
+    'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/callmanipulate_signal.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.callmanipulate_sensor_signal = { /*{{{*/
+    'parent': 'call',
+    'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/callmanipulate_sensor_signal.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.loop_head = { /*{{{*/
     'parent': 'loop',
     'illustrator': {//{{{
@@ -1423,13 +1526,13 @@ function WFAdaptorManifestationBase(adaptor) {
   this.elements.choose_inclusive_finish = { /*{{{*/
     'parent': 'choose_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/choose_inclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_inclusive_finish.svg'
     }//}}}
   };  /*}}}*/
   this.elements.choose_exclusive_finish = { /*{{{*/
     'parent': 'choose_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive_finish.svg'
     },//}}}
   };  /*}}}*/
   this.elements.loop_head_finish = { /*{{{*/
@@ -1507,13 +1610,6 @@ function WFAdaptorManifestationBase(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/parallel_branch_event.svg'
     }//}}}
   };  /*}}}*/
-  this.elements.parallel_branch_compact = { /*{{{*/
-    'parent': 'parallel_branch',
-    'illustrator': {//{{{
-      'endnodes': 'this',
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_branch_compact.svg'
-    }//}}}
-  };  /*}}}*/
   this.elements.scripts = { /*{{{*/
     'description': [self.adaptor.theme_dir + 'rngs/scripts.rng']
   }; /*}}}*/