From 4bb7366bcc87133ae68bd0341c08d000faf9a887 Mon Sep 17 00:00:00 2001 From: Rodolfo Ribeiro Gomes Date: Mon, 18 Oct 2021 06:30:53 -0300 Subject: [PATCH] ChangeLocale is now not necessary due to Settings::get_value() Let us restrict ChangeLocale usage. It can cause trouble for mixing current locale. This commit fixes a problem with Text Tool Options Panel with size and orientation Widget_Vector showing bizarre values regarding decimal separator in some non-English locales (example: Portuguese. Instead of "0,5" it shows "0.50000,00") --- synfig-studio/src/gui/states/state_bline.cpp | 2 -- synfig-studio/src/gui/states/state_bone.cpp | 1 - synfig-studio/src/gui/states/state_brush.cpp | 2 -- synfig-studio/src/gui/states/state_circle.cpp | 2 -- synfig-studio/src/gui/states/state_draw.cpp | 2 -- synfig-studio/src/gui/states/state_gradient.cpp | 2 -- synfig-studio/src/gui/states/state_lasso.cpp | 2 -- synfig-studio/src/gui/states/state_polygon.cpp | 2 -- synfig-studio/src/gui/states/state_rectangle.cpp | 2 -- synfig-studio/src/gui/states/state_rotate.cpp | 1 - synfig-studio/src/gui/states/state_scale.cpp | 1 - synfig-studio/src/gui/states/state_smoothmove.cpp | 1 - synfig-studio/src/gui/states/state_star.cpp | 2 -- synfig-studio/src/gui/states/state_text.cpp | 1 - synfig-studio/src/gui/states/state_width.cpp | 2 -- 15 files changed, 25 deletions(-) diff --git a/synfig-studio/src/gui/states/state_bline.cpp b/synfig-studio/src/gui/states/state_bline.cpp index a6762652986..9a2b4c9ffab 100644 --- a/synfig-studio/src/gui/states/state_bline.cpp +++ b/synfig-studio/src/gui/states/state_bline.cpp @@ -321,8 +321,6 @@ StateBLine_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); - set_id(settings.get_value("bline.id", _("NewSpline"))); set_blend(settings.get_value("bline.blend", int(Color::BLEND_COMPOSITE))); diff --git a/synfig-studio/src/gui/states/state_bone.cpp b/synfig-studio/src/gui/states/state_bone.cpp index fc6c26e614f..cdeef7ff986 100644 --- a/synfig-studio/src/gui/states/state_bone.cpp +++ b/synfig-studio/src/gui/states/state_bone.cpp @@ -232,7 +232,6 @@ StateBone_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC,"C"); if(c_layer==SKELETON_TYPE){ set_id(settings.get_value("bone.skel_id", _("NewSkeleton"))); }else{ diff --git a/synfig-studio/src/gui/states/state_brush.cpp b/synfig-studio/src/gui/states/state_brush.cpp index a646a4f8391..fd1622d9c53 100644 --- a/synfig-studio/src/gui/states/state_brush.cpp +++ b/synfig-studio/src/gui/states/state_brush.cpp @@ -441,8 +441,6 @@ StateBrush_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); - int brush_path_count = settings.get_value("brush.path_count", 0); if (brush_path_count > 0) { diff --git a/synfig-studio/src/gui/states/state_circle.cpp b/synfig-studio/src/gui/states/state_circle.cpp index 19849a4589b..d984f9f37d7 100644 --- a/synfig-studio/src/gui/states/state_circle.cpp +++ b/synfig-studio/src/gui/states/state_circle.cpp @@ -308,8 +308,6 @@ StateCircle_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); - //parse the arguments yargh! set_id(settings.get_value("circle.id", "Circle")); diff --git a/synfig-studio/src/gui/states/state_draw.cpp b/synfig-studio/src/gui/states/state_draw.cpp index 5cfc39ff860..5520bbfb0b5 100644 --- a/synfig-studio/src/gui/states/state_draw.cpp +++ b/synfig-studio/src/gui/states/state_draw.cpp @@ -373,8 +373,6 @@ StateDraw_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); - set_id(settings.get_value("draw.id","NewDrawing")); set_blend(settings.get_value("draw.blend", int(Color::BLEND_COMPOSITE))); diff --git a/synfig-studio/src/gui/states/state_gradient.cpp b/synfig-studio/src/gui/states/state_gradient.cpp index 0c978559159..82bea192f36 100644 --- a/synfig-studio/src/gui/states/state_gradient.cpp +++ b/synfig-studio/src/gui/states/state_gradient.cpp @@ -244,8 +244,6 @@ StateGradient_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); - set_id(settings.get_value("gradient.id", "Gradient")); set_layer_linear_gradient_flag(settings.get_value("gradient.layer_linear_gradient", true)); diff --git a/synfig-studio/src/gui/states/state_lasso.cpp b/synfig-studio/src/gui/states/state_lasso.cpp index f8b79a78673..8c646cbda05 100644 --- a/synfig-studio/src/gui/states/state_lasso.cpp +++ b/synfig-studio/src/gui/states/state_lasso.cpp @@ -378,8 +378,6 @@ StateLasso_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); - set_id(settings.get_value("lasso.id", "NewDrawing")); set_opacity(settings.get_value("lasso.opacity", 1.0)); diff --git a/synfig-studio/src/gui/states/state_polygon.cpp b/synfig-studio/src/gui/states/state_polygon.cpp index c7de9f7ea1b..fa97ed0a196 100644 --- a/synfig-studio/src/gui/states/state_polygon.cpp +++ b/synfig-studio/src/gui/states/state_polygon.cpp @@ -277,8 +277,6 @@ StatePolygon_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); - set_id(settings.get_value("polygon.id", "Polygon")); set_blend(settings.get_value("polygon.blend", int(Color::BLEND_COMPOSITE))); diff --git a/synfig-studio/src/gui/states/state_rectangle.cpp b/synfig-studio/src/gui/states/state_rectangle.cpp index 5a9d25f6d36..449a68c14b9 100644 --- a/synfig-studio/src/gui/states/state_rectangle.cpp +++ b/synfig-studio/src/gui/states/state_rectangle.cpp @@ -288,8 +288,6 @@ StateRectangle_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); - //parse the arguments yargh! set_id(settings.get_value("rectangle.id", "Rectangle")); diff --git a/synfig-studio/src/gui/states/state_rotate.cpp b/synfig-studio/src/gui/states/state_rotate.cpp index 72359e0b575..f07b77c3443 100644 --- a/synfig-studio/src/gui/states/state_rotate.cpp +++ b/synfig-studio/src/gui/states/state_rotate.cpp @@ -164,7 +164,6 @@ StateRotate_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); set_scale_flag(settings.get_value("rotate.scale", true)); } catch(...) diff --git a/synfig-studio/src/gui/states/state_scale.cpp b/synfig-studio/src/gui/states/state_scale.cpp index a21cc0b720f..64bf4c25453 100644 --- a/synfig-studio/src/gui/states/state_scale.cpp +++ b/synfig-studio/src/gui/states/state_scale.cpp @@ -152,7 +152,6 @@ StateScale_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); set_aspect_lock_flag(settings.get_value("scale.lock_aspect", true)); } catch(...) diff --git a/synfig-studio/src/gui/states/state_smoothmove.cpp b/synfig-studio/src/gui/states/state_smoothmove.cpp index edadf6e86a0..d6c53eaca25 100644 --- a/synfig-studio/src/gui/states/state_smoothmove.cpp +++ b/synfig-studio/src/gui/states/state_smoothmove.cpp @@ -159,7 +159,6 @@ StateSmoothMove_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); set_radius(settings.get_value("smooth_move.radius", 1.0)); } catch(...) diff --git a/synfig-studio/src/gui/states/state_star.cpp b/synfig-studio/src/gui/states/state_star.cpp index bd276321c98..d79d657c36a 100644 --- a/synfig-studio/src/gui/states/state_star.cpp +++ b/synfig-studio/src/gui/states/state_star.cpp @@ -340,8 +340,6 @@ StateStar_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); - //parse the arguments yargh! set_id(settings.get_value("star.id", "Star")); diff --git a/synfig-studio/src/gui/states/state_text.cpp b/synfig-studio/src/gui/states/state_text.cpp index 8562f9befe2..5cdb1c8480c 100644 --- a/synfig-studio/src/gui/states/state_text.cpp +++ b/synfig-studio/src/gui/states/state_text.cpp @@ -222,7 +222,6 @@ StateText_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); Vector v; //parse the arguments yargh! diff --git a/synfig-studio/src/gui/states/state_width.cpp b/synfig-studio/src/gui/states/state_width.cpp index d092f8b1932..ea91ccb5004 100644 --- a/synfig-studio/src/gui/states/state_width.cpp +++ b/synfig-studio/src/gui/states/state_width.cpp @@ -178,8 +178,6 @@ StateWidth_Context::load_settings() { try { - synfig::ChangeLocale change_locale(LC_NUMERIC, "C"); - //parse the arguments yargh! set_delta(settings.get_value("width.delta", 6.0));