From 1096d825ec1c1cdd640c5d000f11562d607d98df Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 27 May 2017 22:55:56 -0300 Subject: [PATCH] Using PropertyFont in Arch, Draft --- src/Gui/ViewProviderAnnotation.h | 2 +- src/Mod/Arch/ArchSpace.py | 2 +- src/Mod/Draft/Draft.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Gui/ViewProviderAnnotation.h b/src/Gui/ViewProviderAnnotation.h index d44081e4eb..f986bb9c08 100644 --- a/src/Gui/ViewProviderAnnotation.h +++ b/src/Gui/ViewProviderAnnotation.h @@ -53,7 +53,7 @@ public: App::PropertyColor TextColor; App::PropertyEnumeration Justification; App::PropertyFloat FontSize; - App::PropertyString FontName; + App::PropertyFont FontName; App::PropertyFloat LineSpacing; App::PropertyAngle Rotation; App::PropertyEnumeration RotationAxis; diff --git a/src/Mod/Arch/ArchSpace.py b/src/Mod/Arch/ArchSpace.py index eb41b79272..040f81ec5e 100644 --- a/src/Mod/Arch/ArchSpace.py +++ b/src/Mod/Arch/ArchSpace.py @@ -420,7 +420,7 @@ class _ViewProviderSpace(ArchComponent.ViewProviderComponent): vobj.LineColor = (1.0,0.0,0.0,1.0) vobj.DrawStyle = "Dotted" vobj.addProperty("App::PropertyStringList", "Text", "Arch",QT_TRANSLATE_NOOP("App::Property","The text to show. Use $area, $label, $tag, $floor, $walls, $ceiling to insert the respective data")) - vobj.addProperty("App::PropertyString", "FontName", "Arch",QT_TRANSLATE_NOOP("App::Property","The name of the font")) + vobj.addProperty("App::PropertyFont", "FontName", "Arch",QT_TRANSLATE_NOOP("App::Property","The name of the font")) vobj.addProperty("App::PropertyColor", "TextColor", "Arch",QT_TRANSLATE_NOOP("App::Property","The color of the area text")) vobj.addProperty("App::PropertyLength", "FontSize", "Arch",QT_TRANSLATE_NOOP("App::Property","The size of the text font")) vobj.addProperty("App::PropertyLength", "FirstLine", "Arch",QT_TRANSLATE_NOOP("App::Property","The size of the first line of text")) diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 65fce87681..9efa706c95 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -3862,7 +3862,7 @@ class _ViewProviderDimension(_ViewProviderDraft): obj.addProperty("App::PropertyLength","ArrowSize","Draft",QT_TRANSLATE_NOOP("App::Property","Arrow size")) obj.addProperty("App::PropertyLength","TextSpacing","Draft",QT_TRANSLATE_NOOP("App::Property","The spacing between the text and the dimension line")) obj.addProperty("App::PropertyEnumeration","ArrowType","Draft",QT_TRANSLATE_NOOP("App::Property","Arrow type")) - obj.addProperty("App::PropertyString","FontName","Draft",QT_TRANSLATE_NOOP("App::Property","Font name")) + obj.addProperty("App::PropertyFont","FontName","Draft",QT_TRANSLATE_NOOP("App::Property","Font name")) obj.addProperty("App::PropertyFloat","LineWidth","Draft",QT_TRANSLATE_NOOP("App::Property","Line width")) obj.addProperty("App::PropertyColor","LineColor","Draft",QT_TRANSLATE_NOOP("App::Property","Line color")) obj.addProperty("App::PropertyDistance","ExtLines","Draft",QT_TRANSLATE_NOOP("App::Property","Length of the extension lines")) @@ -4248,7 +4248,7 @@ class _ViewProviderAngularDimension(_ViewProviderDraft): def __init__(self, obj): obj.addProperty("App::PropertyLength","FontSize","Draft",QT_TRANSLATE_NOOP("App::Property","Font size")) obj.addProperty("App::PropertyInteger","Decimals","Draft",QT_TRANSLATE_NOOP("App::Property","The number of decimals to show")) - obj.addProperty("App::PropertyString","FontName","Draft",QT_TRANSLATE_NOOP("App::Property","Font name")) + obj.addProperty("App::PropertyFont","FontName","Draft",QT_TRANSLATE_NOOP("App::Property","Font name")) obj.addProperty("App::PropertyLength","ArrowSize","Draft",QT_TRANSLATE_NOOP("App::Property","Arrow size")) obj.addProperty("App::PropertyLength","TextSpacing","Draft",QT_TRANSLATE_NOOP("App::Property","The spacing between the text and the dimension line")) obj.addProperty("App::PropertyEnumeration","ArrowType","Draft",QT_TRANSLATE_NOOP("App::Property","Arrow type"))