Merge from V5_1_main 10/12/2010

diff --git a/doc/salome/gui/images/pref24.png b/doc/salome/gui/images/pref24.png
index a9b9a56be4972f11e4111acf56513fcb9155e8d3..c75cbfb70c64d76ee361d8b9052184dadf9913ea 100755 (executable)
Binary files a/doc/salome/gui/images/pref24.png and b/doc/salome/gui/images/pref24.png differ

diff --git a/doc/salome/gui/input/mesh_preferences.doc b/doc/salome/gui/input/mesh_preferences.doc
index 0b5a756d79a10a6bfc4961e0e1fbaf4d32b156d2..ebed193cd754ba47cadb4e731846ef74ff418672 100644 (file)
--- a/doc/salome/gui/input/mesh_preferences.doc
+++ b/doc/salome/gui/input/mesh_preferences.doc
@@ -164,6 +164,11 @@ placement (<b>X</b> and <b>Y</b>) and lookout (<b>Width</b> and
 side)</li>
 <li><b>Y</b>: ordinate of the origin of the bar (from the bottom)</li>
 </ul>
+<li><b>Distribution</b> in this menu you can Show/Hide distribution histogram of the values of the <b>Scalar Bar</b> and specify the <b>Coloring Type</b> of the histogram</li>
+<ul>
+<li><b>Multicolor</b> the histogram is colored as <b>Scalar Bar</b></li>
+<li><b>Monocolor</b> the histogram is colored as selected with <b>Distribution color</b> selector</li>
+<ul>
 </ul>
 
 */