-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <ModuleBase_WidgetExprEditor.h>
#include <ModuleBase_Tools.h>
+#include <Locale_Convert.h>
+
#include <ModelAPI_Data.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Validator.h>
QTextCursor aCursor = textCursor();
aCursor.select(QTextCursor::WordUnderCursor);
const QString aPrefix = aCursor.selectedText();
- if (!aPrefix.isEmpty() && aPrefix.at(aPrefix.length() - 1).isLetter()) {
- performCompletion(aPrefix);
- }
+ performCompletion(aPrefix);
}
void ExpressionEditor::performCompletion(const QString& theCompletionPrefix)
aMainLay->addWidget(myResultLabel);
myEditor = new ExpressionEditor(this);
myEditor->setMinimumHeight(20);
- myEditor->setPlaceHolderText( QString::fromStdString( thePlaceHolder ) );
+ myEditor->setPlaceHolderText( translate( thePlaceHolder ) );
aMainLay->addWidget(myEditor);
this->setLayout(aMainLay);
AttributeStringPtr aStringAttr = aData->string(attributeID());
QString aWidgetValue = myEditor->toPlainText();
- aStringAttr->setValue(aWidgetValue.toStdString());
+ aStringAttr->setValue(aWidgetValue.toStdWString());
updateObject(myFeature);
// Try to get the value
bool isBlocked = myEditor->blockSignals(true);
QTextCursor aCursor = myEditor->textCursor();
int pos = aCursor.position();
- std::string aRestoredStr = aStringAttr->value();
- myEditor->setPlainText(QString::fromStdString(aRestoredStr));
+ QString aRestoredStr;
+ if (aStringAttr->isUValue())
+ aRestoredStr = QString::fromStdWString(Locale::Convert::toWString(aStringAttr->valueU()));
+ else
+ aRestoredStr = QString::fromStdString(aStringAttr->value());
+ myEditor->setPlainText(aRestoredStr);
aCursor.setPosition(pos);
myEditor->setTextCursor(aCursor);
myEditor->blockSignals(isBlocked);