diff --git a/Extensions/TextObject/Extension.cpp b/Extensions/TextObject/Extension.cpp index 2044207798..593f563c45 100644 --- a/Extensions/TextObject/Extension.cpp +++ b/Extensions/TextObject/Extension.cpp @@ -214,14 +214,18 @@ class Extension : public ExtensionBase DECLARE_END_OBJECT_CONDITION() - DECLARE_OBJECT_EXPRESSION("Opacity", _("Opacité"), _("Opacité"), _("Opacité"), "res/actions/opacity.png", &TextObject::GetOpacity) + DECLARE_OBJECT_EXPRESSION("Opacity", _("Opacité"), _("Opacité"), _("Opacité"), "res/actions/opacity.png", &TextObject::ExpOpacity) DECLARE_PARAMETER("object", _("Objet"), true, "Text") DECLARE_END_OBJECT_EXPRESSION() - DECLARE_OBJECT_EXPRESSION("Angle", _("Angle"), _("Angle"), _("Rotation"), "res/actions/rotate.png", &TextObject::GetAngle) + DECLARE_OBJECT_EXPRESSION("Angle", _("Angle"), _("Angle"), _("Rotation"), "res/actions/rotate.png", &TextObject::ExpAngle) DECLARE_PARAMETER("object", _("Objet"), true, "Text") DECLARE_END_OBJECT_EXPRESSION() + DECLARE_OBJECT_STR_EXPRESSION("String", _("Texte"), _("Texte"), _("Texte"), "res/texteicon.png", &TextObject::ExpString) + DECLARE_PARAMETER("object", _("Objet"), true, "Text") + DECLARE_END_OBJECT_STR_EXPRESSION() + DECLARE_END_OBJECT() CompleteCompilationInformation(); diff --git a/Extensions/TextObject/TextExpressions.cpp b/Extensions/TextObject/TextExpressions.cpp index 1115e21e17..4743f88bd9 100644 --- a/Extensions/TextObject/TextExpressions.cpp +++ b/Extensions/TextObject/TextExpressions.cpp @@ -40,3 +40,7 @@ double TextObject::ExpAngle( const RuntimeScene & scene, ObjectsConcerned & obje return angle; } +std::string TextObject::ExpString( const RuntimeScene & scene, ObjectsConcerned & objectsConcerned, ObjSPtr obj1, ObjSPtr obj2, const StrExpressionInstruction & exprInstruction ) +{ + return text.GetString(); +} diff --git a/Extensions/TextObject/TextExtension.layout b/Extensions/TextObject/TextExtension.layout index b2282fa39e..6d30a616c1 100644 --- a/Extensions/TextObject/TextExtension.layout +++ b/Extensions/TextObject/TextExtension.layout @@ -1,26 +1,26 @@ - - + + - + - + - - + + - - + + - - + + - - + + diff --git a/Extensions/TextObject/TextObject.h b/Extensions/TextObject/TextObject.h index ef2f139245..b7b2a3c493 100644 --- a/Extensions/TextObject/TextObject.h +++ b/Extensions/TextObject/TextObject.h @@ -118,6 +118,7 @@ class TextObject : public Object //ACE for string bool CondString( RuntimeScene & scene, ObjectsConcerned & objectsConcerned, const Instruction & condition ); bool ActString( RuntimeScene & scene, ObjectsConcerned & objectsConcerned, const Instruction & action ); + std::string ExpString( const RuntimeScene & scene, ObjectsConcerned & objectsConcerned, ObjSPtr obj1, ObjSPtr obj2, const StrExpressionInstruction & exprInstruction ); //ACE for font and size bool ActFont( RuntimeScene & scene, ObjectsConcerned & objectsConcerned, const Instruction & action ); diff --git a/Extensions/TextObject/TextObjectEditor.cpp b/Extensions/TextObject/TextObjectEditor.cpp index 03c6471fb6..d76bec5fa3 100644 --- a/Extensions/TextObject/TextObjectEditor.cpp +++ b/Extensions/TextObject/TextObjectEditor.cpp @@ -135,7 +135,7 @@ TextObjectEditor::~TextObjectEditor() void TextObjectEditor::OnokBtClick(wxCommandEvent& event) { object.SetString(string(textEdit->GetValue().mb_str())); - object.SetFont(fontEdit->GetValue().mb_str()); + object.SetFont(string(fontEdit->GetValue().mb_str())); EndModal(1); }