From 672ec3770adaf052ea13bf8affdb8069b3f6ad7e Mon Sep 17 00:00:00 2001 From: vsv Date: Wed, 24 Sep 2014 15:55:44 +0400 Subject: [PATCH] Issue #163: Correct messages in extrusion --- src/FeaturesPlugin/plugin-Features.xml | 2 +- src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) 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 @@ - + 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")); } } -- 2.39.2