* Bug #10657 fixed - CONSTRAINT_c had no icons on a graph. 32/7432/2
Clément DAVID [Thu, 7 Jun 2012 12:37:51 +0000 (14:37 +0200)]
Change-Id: Ie786cebdd2f54059cb15d01d73cd83ff7246f073

scilab/CHANGES_5.4.X
scilab/modules/xcos/etc/Xcos-style.xml
scilab/modules/xcos/etc/palettes.xml
scilab/modules/xcos/images/palettes/CONSTRAINT2_c.png [new file with mode: 0644]
scilab/modules/xcos/images/palettes/CONSTRAINT_c.png

index b5008f1..e7d3726 100644 (file)
@@ -341,6 +341,8 @@ Xcos
 * Bug #10533 fixed - Some action shortcuts were not disabled when editing a text
                      block.
 
+* Bug #10657 fixed - CONSTRAINT_c had no icons on a graph.
+
 * Bug #10679 fixed - blocks_link.tst failed.
 
 * Bug #10697 fixed - post_xcos_simulate function did not work if a TOWS_c block
index ede9de7..2b5ea82 100644 (file)
     <remove as="image"/>
     <add as="fontSize" value="20"/>
   </add>
-  <add as="CONSTRAINT_f" extend="blockWithLabel">
-    <add as="displayedLabel" value="=0 ?"/>
+  <add as="CONSTRAINT_c" extend="blockWithLabel">
+    <add as="displayedLabel" value="x == %s"/>
+  </add>
+  <add as="CONSTRAINT2_c" extend="blockWithLabel">
+    <add as="displayedLabel" value="x  == %s&lt;br/&gt;x' == %s"/>
   </add>
   <!-- MODELICA -->
   <add as="MBLOCK" extend="blockWithLabel">
index 6e94196..8c4896e 100644 (file)
       <block name="CONSTRAINT_c">
         <icon variable="SCI" path="/modules/xcos/images/palettes/CONSTRAINT_c.png"/>
       </block>
+      <block name="CONSTRAINT2_c">
+        <icon variable="SCI" path="/modules/xcos/images/palettes/CONSTRAINT2_c.png"/>
+      </block>
       <block name="DIFF_f">
         <icon variable="SCI" path="/modules/xcos/images/palettes/DIFF_f.png"/>
       </block>
diff --git a/scilab/modules/xcos/images/palettes/CONSTRAINT2_c.png b/scilab/modules/xcos/images/palettes/CONSTRAINT2_c.png
new file mode 100644 (file)
index 0000000..0a5b6e7
Binary files /dev/null and b/scilab/modules/xcos/images/palettes/CONSTRAINT2_c.png differ
index 9667f30..a8cf0b9 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CONSTRAINT_c.png and b/scilab/modules/xcos/images/palettes/CONSTRAINT_c.png differ