From: vsv <vitaly.smetannikov@opencascade.com>
Date: Wed, 24 Sep 2014 11:55:44 +0000 (+0400)
Subject: Issue #163: Correct messages in extrusion
X-Git-Tag: V_0.4.4~26^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=672ec3770adaf052ea13bf8affdb8069b3f6ad7e;p=modules%2Fshaper.git

Issue #163: Correct messages in extrusion
---

diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml
index 876a74821..1088f2425 100644
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@ -1,7 +1,7 @@
 <plugin>
   <workbench id="Features" document="Part">
     <group id="Basic">
-      <feature id="Extrusion" title="Extrusion" tooltip="Create a shape by extrusion of a contour" icon=":icons/extrusion.png">
+      <feature id="Extrusion" title="Extrusion" tooltip="Create a shape by extrusion of a face" icon=":icons/extrusion.png">
           <source path="extrusion_widget.xml"/>
       </feature>
       <feature id="Boolean" title="Boolean" tooltip="Perform boolean operations with shapes" icon=":icons/cut.png">
diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index 92c31271c..dafc37e38 100644
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -198,9 +198,17 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName()
     std::string aName = mySelectedObject->data()->name();
     myTextLine->setText(QString::fromStdString(aName));
   } else {
-    if (myIsActive)
-      myTextLine->setText(tr("Select an object"));
-    else
+    if (myIsActive) {
+      QString aMsg = tr("Select a ");
+      int i = 0;
+      foreach (QString aType, myShapeTypes) {
+        if (i > 0)
+          aMsg += " or ";
+        aMsg += aType;
+        i++;
+      }
+      myTextLine->setText(aMsg);
+    } else
       myTextLine->setText(tr("No object selected"));
   }
 }