X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ModelWidget.cpp;h=69cd60c463ba29b321ad6d99cf508fe7c15fb82a;hb=7e9e955376b504dc7d9e0a5e79a9a38943a53fcd;hp=d82016eacb5c55c5b84c8bf190292627a6699545;hpb=d9af84f3ba67333e0e3d1d34e436ddb8ea6b3be5;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_ModelWidget.cpp b/src/ModuleBase/ModuleBase_ModelWidget.cpp index d82016eac..69cd60c46 100644 --- a/src/ModuleBase/ModuleBase_ModelWidget.cpp +++ b/src/ModuleBase/ModuleBase_ModelWidget.cpp @@ -9,6 +9,8 @@ #include "ModuleBase_Tools.h" #include "ModuleBase_WidgetValidator.h" +#include + #include #include #include @@ -17,12 +19,14 @@ #include #include +#include #include #include #include #include +#include //#define DEBUG_VALUE_STATE @@ -119,22 +123,41 @@ QString ModuleBase_ModelWidget::getError(const bool theValueStateChecked) const return anError; std::string aValidatorID; - std::string anErrorMsg; + Events_InfoMessage anErrorMsg; static ModelAPI_ValidatorsFactory* aValidators = ModelAPI_Session::get()->validators(); if (!aValidators->validate(anAttribute, aValidatorID, anErrorMsg)) { if (anErrorMsg.empty()) anErrorMsg = "unknown error."; - anErrorMsg = anAttributeID + " - " + aValidatorID + ": " + anErrorMsg; + anErrorMsg = anAttributeID + " - " + aValidatorID + ": " + anErrorMsg.messageString(); + } + + if (!anErrorMsg.empty()) { + std::string aStr = Config_Translator::translate(anErrorMsg); + std::string aCodec = Config_Translator::codec(anErrorMsg.context()); + anError = QTextCodec::codecForName(aCodec.c_str())->toUnicode(aStr.c_str()); } - anError = QString::fromStdString(anErrorMsg); if (anError.isEmpty() && theValueStateChecked) anError = getValueStateError(); + anError = translateString(anError); return anError; } + +QString ModuleBase_ModelWidget::translateString(const QString& theMsg) const +{ + if (!theMsg.isEmpty()) { + std::string aContext = feature()->getKind(); + std::string aStr = Config_Translator::translate(aContext, theMsg.toStdString().c_str()); + std::string aCodec = Config_Translator::codec(aContext); + return QTextCodec::codecForName(aCodec.c_str())->toUnicode(aStr.c_str()); + } + return theMsg; +} + + void ModuleBase_ModelWidget::enableFocusProcessing() { QList aMyControls = getControls();