From 1cd582707821b4e3a5bfa6c3af594820ee03240b Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 28 Feb 2024 17:50:51 +0000 Subject: [PATCH] _() -> _HKI() for group names. (cherry picked from commit d08e0e9eaa0c9766e09959a2ef483a8cbb2adff5) --- common/eda_text.cpp | 2 +- eeschema/lib_textbox.cpp | 30 ++++++++++++++++++++++++++++++ eeschema/lib_textbox.h | 3 +++ eeschema/sch_field.cpp | 2 +- eeschema/sch_text.cpp | 2 +- eeschema/sch_textbox.cpp | 5 +++-- 6 files changed, 39 insertions(+), 5 deletions(-) diff --git a/common/eda_text.cpp b/common/eda_text.cpp index 766066cedf..6fe1a42eb0 100644 --- a/common/eda_text.cpp +++ b/common/eda_text.cpp @@ -1176,7 +1176,7 @@ static struct EDA_TEXT_DESC &EDA_TEXT::SetTextAngleDegrees, &EDA_TEXT::GetTextAngleDegrees, PROPERTY_DISPLAY::PT_DEGREE ) ); - const wxString textProps = _( "Text Properties" ); + const wxString textProps = _HKI( "Text Properties" ); propMgr.AddProperty( new PROPERTY( _HKI( "Text" ), &EDA_TEXT::SetText, &EDA_TEXT::GetText ), diff --git a/eeschema/lib_textbox.cpp b/eeschema/lib_textbox.cpp index 077ffa8e44..c787a434c0 100644 --- a/eeschema/lib_textbox.cpp +++ b/eeschema/lib_textbox.cpp @@ -537,3 +537,33 @@ void LIB_TEXTBOX::ViewGetLayers( int aLayers[], int& aCount ) const aLayers[1] = IsPrivate() ? LAYER_NOTES_BACKGROUND : LAYER_DEVICE_BACKGROUND; aLayers[2] = LAYER_SELECTION_SHADOWS; } + + +static struct LIB_TEXTBOX_DESC +{ + LIB_TEXTBOX_DESC() + { + PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); + REGISTER_TYPE( LIB_TEXTBOX ); + + propMgr.AddTypeCast( new TYPE_CAST ); + propMgr.AddTypeCast( new TYPE_CAST ); + propMgr.AddTypeCast( new TYPE_CAST ); + propMgr.InheritsAfter( TYPE_HASH( LIB_TEXTBOX ), TYPE_HASH( LIB_SHAPE ) ); + propMgr.InheritsAfter( TYPE_HASH( LIB_TEXTBOX ), TYPE_HASH( EDA_SHAPE ) ); + propMgr.InheritsAfter( TYPE_HASH( LIB_TEXTBOX ), TYPE_HASH( EDA_TEXT ) ); + + propMgr.Mask( TYPE_HASH( LIB_TEXTBOX ), TYPE_HASH( EDA_SHAPE ), _HKI( "Shape" ) ); + + propMgr.Mask( TYPE_HASH( LIB_TEXTBOX ), TYPE_HASH( EDA_TEXT ), _HKI( "Visible" ) ); + propMgr.Mask( TYPE_HASH( LIB_TEXTBOX ), TYPE_HASH( EDA_TEXT ), _HKI( "Width" ) ); + propMgr.Mask( TYPE_HASH( LIB_TEXTBOX ), TYPE_HASH( EDA_TEXT ), _HKI( "Height" ) ); + propMgr.Mask( TYPE_HASH( LIB_TEXTBOX ), TYPE_HASH( EDA_TEXT ), _HKI( "Thickness" ) ); + + propMgr.AddProperty( new PROPERTY( _HKI( "Text Size" ), + &LIB_TEXTBOX::SetLibTextSize, &LIB_TEXTBOX::GetLibTextSize, PROPERTY_DISPLAY::PT_SIZE ), + _HKI( "Text Properties" ) ); + + propMgr.Mask( TYPE_HASH( LIB_TEXTBOX ), TYPE_HASH( EDA_TEXT ), _HKI( "Orientation" ) ); + } +} _LIB_TEXTBOX_DESC; diff --git a/eeschema/lib_textbox.h b/eeschema/lib_textbox.h index 4df451e445..b3d7b8b4d4 100644 --- a/eeschema/lib_textbox.h +++ b/eeschema/lib_textbox.h @@ -53,6 +53,9 @@ public: int GetTextMargin() const; + int GetLibTextSize() const { return GetTextWidth(); } + void SetLibTextSize( int aSize ) { SetTextSize( VECTOR2I( aSize, aSize ) ); } + VECTOR2I GetDrawPos() const override; wxString GetShownText( bool aAllowExtraText, int aDepth = 0 ) const override; diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp index 25d2dcd1fb..54d88acfbd 100644 --- a/eeschema/sch_field.cpp +++ b/eeschema/sch_field.cpp @@ -1402,7 +1402,7 @@ static struct SCH_FIELD_DESC propMgr.AddProperty( new PROPERTY( _HKI( "Text Size" ), &SCH_FIELD::SetSchTextSize, &SCH_FIELD::GetSchTextSize, PROPERTY_DISPLAY::PT_SIZE ), - _( "Text Properties" ) ); + _HKI( "Text Properties" ) ); propMgr.Mask( TYPE_HASH( SCH_FIELD ), TYPE_HASH( EDA_TEXT ), _HKI( "Orientation" ) ); diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp index 3c4c398a25..fa9a19f4f3 100644 --- a/eeschema/sch_text.cpp +++ b/eeschema/sch_text.cpp @@ -498,7 +498,7 @@ static struct SCH_TEXT_DESC propMgr.AddProperty( new PROPERTY( _HKI( "Text Size" ), &SCH_TEXT::SetSchTextSize, &SCH_TEXT::GetSchTextSize, PROPERTY_DISPLAY::PT_SIZE ), - _( "Text Properties" ) ); + _HKI( "Text Properties" ) ); // Orientation is exposed differently in schematic; mask the base for now propMgr.Mask( TYPE_HASH( SCH_TEXT ), TYPE_HASH( EDA_TEXT ), _HKI( "Orientation" ) ); diff --git a/eeschema/sch_textbox.cpp b/eeschema/sch_textbox.cpp index ea852e276a..eace1e110e 100644 --- a/eeschema/sch_textbox.cpp +++ b/eeschema/sch_textbox.cpp @@ -519,8 +519,9 @@ static struct SCH_TEXTBOX_DESC propMgr.Mask( TYPE_HASH( SCH_TEXTBOX ), TYPE_HASH( EDA_TEXT ), _HKI( "Thickness" ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Text Size" ), - &SCH_TEXTBOX::SetSchTextSize, &SCH_TEXTBOX::GetSchTextSize, PROPERTY_DISPLAY::PT_SIZE ), - _( "Text Properties" ) ); + &SCH_TEXTBOX::SetSchTextSize, &SCH_TEXTBOX::GetSchTextSize, + PROPERTY_DISPLAY::PT_SIZE ), + _HKI( "Text Properties" ) ); propMgr.Mask( TYPE_HASH( SCH_TEXTBOX ), TYPE_HASH( EDA_TEXT ), _HKI( "Orientation" ) ); }