Additional fix of issue 0019875: to clarify the labels of the GUI panel for group...

diff --git a/doc/salome/gui/GEOM/input/working_with_groups.doc b/doc/salome/gui/GEOM/input/working_with_groups.doc
index 5e5a814a438d2a6d71d62572ec11bd996e0ed25a..a2ef93fc9be3d2b0c71203179a3066d434649bb0 100644 (file)
--- a/doc/salome/gui/GEOM/input/working_with_groups.doc
+++ b/doc/salome/gui/GEOM/input/working_with_groups.doc
@@ -25,14 +25,14 @@ group (points, wires, faces, shells or solids).</li>
 default, it is Group_n.</li>
 <li>Then, using the "Select" button, select the <b>Main Shape</b> (a
 geometrical object on which the group will be created). </li>
-<li> <b>Select Sub-Shapes</b> button group lets you restrict the range
+<li> <b>Main Shape Selection restriction</b> button group lets you restrict the range
 of group elements you operate with.
-<ul><li>\b All button enables work with all sub-shapes of the Main
+<ul><li> <b>No restriction</b> button enables work with all sub-shapes of the Main
 Shape.</li>
-<li><b>In Place of Second Shape</b> restricts the range of accessible
+<li><b>Geometrical parts of the Second Shape</b> restricts the range of accessible
 elements to those sub-shapes of the Main Shape that geometrically
 coincide with the <b>Second Shape</b>.</li>
-<li><b>Sub-Shapes of Second Shape</b> restricts the range of
+<li><b>Only Sub-Shapes of the Second Shape</b> restricts the range of
 accessible elements to those sub-shapes of the Main Shape that 
 are sub-shapes of <b>Second Shape</b>. This is useful because 
 sometimes purely geometrical coincidence is not enough and it 
@@ -50,7 +50,7 @@ button.</li>
 <li>Clicking <b>Select All</b> button you can add all object's
 elements of a certain type in the list of the elements of the
 group. If the <b>Second Shape</b> is used, the elements are added 
-according to <b>Select Sub Shapes</b> setting. To delete elements 
+according to <b>Main Shape Selection restriction</b> settings. To delete elements 
 from the list, select them and click \b Remove button.
 </li></ul>
 </li>

diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po
index 500ae02b024c014a837e882d68fb3215bf52106c..20cd3b6735431b890373020ea616fa7502d42e76 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.po
+++ b/src/GEOMGUI/GEOM_msg_en.po
@@ -1952,17 +1952,17 @@ msgstr "Main Shape And Sub-Shapes"
 msgid "GroupGUI_GroupDlg::MAIN_SHAPE"
 msgstr "Main Shape"
 
-msgid "GroupGUI_GroupDlg::SELECT_SUB_SHAPES"
-msgstr "Select Sub-Shapes"
+msgid "GroupGUI_GroupDlg::SHAPE_SEL_RESTR"
+msgstr "Main Shape Selection restriction"
 
-msgid "GroupGUI_GroupDlg::ALL_SUBSHAPES"
-msgstr "All"
+msgid "GroupGUI_GroupDlg::NO_RESTR"
+msgstr "No restriction"
 
-msgid "GroupGUI_GroupDlg::GET_IN_PLACE"
-msgstr "In Place of Second Shape"
+msgid "GroupGUI_GroupDlg::GEOM_PARTS_OF_SHAPE2"
+msgstr "Geometrical parts of the Second Shape"
 
 msgid "GroupGUI_GroupDlg::SUBSHAPES_OF_SHAPE2"
-msgstr "Sub-Shapes of Second Shape"
+msgstr "Only Sub-Shapes of the Second Shape"
 
 msgid "GroupGUI_GroupDlg::SECOND_SHAPE"
 msgstr "Second Shape"

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index 39ecac7357d0cecc13186586c4ffb0b2235533fc..65ac4650323a4fa8ff70a7421786e5b71bb9ed03 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -107,11 +107,11 @@ GroupGUI_GroupDlg::GroupGUI_GroupDlg(Mode mode, GeometryGUI* theGeometryGUI, QWi
 
   //mySelSubBtn = new QRadioButton ( tr( "SELECT_SUB_SHAPES" ), aFrame );
   //myPlaceCheckBox  = new QCheckBox ( tr( "GET_IN_PLACE" ), aFrame );
-  mySelectionWayGroup = new QButtonGroup(1, Qt::Horizontal, tr("SELECT_SUB_SHAPES"),aFrame);
+  mySelectionWayGroup = new QButtonGroup(1, Qt::Horizontal, tr("SHAPE_SEL_RESTR"),aFrame);
   mySelectionWayGroup->setExclusive(true);
-  QRadioButton* allSubs     = new QRadioButton(tr("ALL_SUBSHAPES")      ,mySelectionWayGroup);
-  QRadioButton* inPlaceSubs = new QRadioButton(tr("GET_IN_PLACE")       ,mySelectionWayGroup);
-  QRadioButton* shape2Subs  = new QRadioButton(tr("SUBSHAPES_OF_SHAPE2"),mySelectionWayGroup);
+  QRadioButton* allSubs     = new QRadioButton(tr("NO_RESTR")            ,mySelectionWayGroup);
+  QRadioButton* inPlaceSubs = new QRadioButton(tr("GEOM_PARTS_OF_SHAPE2"),mySelectionWayGroup);
+  QRadioButton* shape2Subs  = new QRadioButton(tr("SUBSHAPES_OF_SHAPE2") ,mySelectionWayGroup);
   mySelectionWayGroup->insert(allSubs    , ALL_SUBSHAPES);
   mySelectionWayGroup->insert(inPlaceSubs, GET_IN_PLACE);
   mySelectionWayGroup->insert(shape2Subs , SUBSHAPES_OF_SHAPE2);