diff --git a/common/eda_item.cpp b/common/eda_item.cpp index 1b49c9cb3b..cf5656a691 100644 --- a/common/eda_item.cpp +++ b/common/eda_item.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com - * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,20 +22,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -/** - * @brief Implementation of EDA_ITEM base class for KiCad. - */ +#include -#include - -#include #include #include #include #include #include - -#include +#include static const unsigned char dummy_png[] = { @@ -262,63 +256,64 @@ static struct EDA_ITEM_DESC ENUM_MAP::Instance() .Undefined( TYPE_NOT_INIT ) .Map( NOT_USED, wxT( "" ) ) - .Map( SCREEN_T, _( "Screen" ) ) + .Map( SCREEN_T, _HKI( "Screen" ) ) - .Map( PCB_MODULE_T, _( "Footprint" ) ) - .Map( PCB_PAD_T, _( "Pad" ) ) - .Map( PCB_SHAPE_T, _( "Graphic Shape" ) ) - .Map( PCB_TEXT_T, _( "Board Text" ) ) - .Map( PCB_FP_TEXT_T, _( "Footprint Text" ) ) - .Map( PCB_FP_SHAPE_T, _( "Graphic Shape" ) ) - .Map( PCB_TRACE_T, _( "Track" ) ) - .Map( PCB_VIA_T, _( "Via" ) ) - .Map( PCB_MARKER_T, _( "Board Marker" ) ) - .Map( PCB_DIM_ALIGNED_T, _( "Aligned Dimension" ) ) - .Map( PCB_DIM_ORTHOGONAL_T, _( "Orthogonal Dimension" ) ) - .Map( PCB_DIM_CENTER_T, _( "Center Dimension" ) ) - .Map( PCB_DIM_LEADER_T, _( "Leader" ) ) - .Map( PCB_TARGET_T, _( "Target" ) ) - .Map( PCB_ZONE_AREA_T, _( "Zone" ) ) - .Map( PCB_ITEM_LIST_T, _( "Item List" ) ) - .Map( PCB_NETINFO_T, _( "Net Info" ) ) - .Map( PCB_GROUP_T, _( "Group" ) ) + .Map( PCB_MODULE_T, _HKI( "Footprint" ) ) + .Map( PCB_PAD_T, _HKI( "Pad" ) ) + .Map( PCB_SHAPE_T, _HKI( "Graphic Shape" ) ) + .Map( PCB_TEXT_T, _HKI( "Board Text" ) ) + .Map( PCB_FP_TEXT_T, _HKI( "Footprint Text" ) ) + .Map( PCB_FP_SHAPE_T, _HKI( "Graphic Shape" ) ) + .Map( PCB_TRACE_T, _HKI( "Track" ) ) + .Map( PCB_VIA_T, _HKI( "Via" ) ) + .Map( PCB_MARKER_T, _HKI( "Board Marker" ) ) + .Map( PCB_DIM_ALIGNED_T, _HKI( "Aligned Dimension" ) ) + .Map( PCB_DIM_ORTHOGONAL_T, _HKI( "Orthogonal Dimension" ) ) + .Map( PCB_DIM_CENTER_T, _HKI( "Center Dimension" ) ) + .Map( PCB_DIM_LEADER_T, _HKI( "Leader" ) ) + .Map( PCB_TARGET_T, _HKI( "Target" ) ) + .Map( PCB_ZONE_AREA_T, _HKI( "Zone" ) ) + .Map( PCB_ITEM_LIST_T, _HKI( "Item List" ) ) + .Map( PCB_NETINFO_T, _HKI( "Net Info" ) ) + .Map( PCB_GROUP_T, _HKI( "Group" ) ) - .Map( SCH_MARKER_T, _( "Schematic Marker" ) ) - .Map( SCH_JUNCTION_T, _( "Junction" ) ) - .Map( SCH_NO_CONNECT_T, _( "No-Connect Flag" ) ) - .Map( SCH_BUS_WIRE_ENTRY_T, _( "Wire Entry" ) ) - .Map( SCH_BUS_BUS_ENTRY_T, _( "Bus Entry" ) ) - .Map( SCH_LINE_T, _( "Graphic Line" ) ) - .Map( SCH_BITMAP_T, _( "Bitmap" ) ) - .Map( SCH_TEXT_T, _( "Schematic Text" ) ) - .Map( SCH_LABEL_T, _( "Net Label" ) ) - .Map( SCH_GLOBAL_LABEL_T, _( "Global Label" ) ) - .Map( SCH_HIER_LABEL_T, _( "Hierarchical Label" ) ) - .Map( SCH_FIELD_T, _( "Schematic Field" ) ) - .Map( SCH_COMPONENT_T, _( "Component" ) ) - .Map( SCH_SHEET_PIN_T, _( "Sheet Pin" ) ) - .Map( SCH_SHEET_T, _( "Sheet" ) ) + .Map( SCH_MARKER_T, _HKI( "Schematic Marker" ) ) + .Map( SCH_JUNCTION_T, _HKI( "Junction" ) ) + .Map( SCH_NO_CONNECT_T, _HKI( "No-Connect Flag" ) ) + .Map( SCH_BUS_WIRE_ENTRY_T, _HKI( "Wire Entry" ) ) + .Map( SCH_BUS_BUS_ENTRY_T, _HKI( "Bus Entry" ) ) + .Map( SCH_LINE_T, _HKI( "Graphic Line" ) ) + .Map( SCH_BITMAP_T, _HKI( "Bitmap" ) ) + .Map( SCH_TEXT_T, _HKI( "Schematic Text" ) ) + .Map( SCH_LABEL_T, _HKI( "Net Label" ) ) + .Map( SCH_GLOBAL_LABEL_T, _HKI( "Global Label" ) ) + .Map( SCH_HIER_LABEL_T, _HKI( "Hierarchical Label" ) ) + .Map( SCH_FIELD_T, _HKI( "Schematic Field" ) ) + .Map( SCH_COMPONENT_T, _HKI( "Component" ) ) + .Map( SCH_SHEET_PIN_T, _HKI( "Sheet Pin" ) ) + .Map( SCH_SHEET_T, _HKI( "Sheet" ) ) - .Map( SCH_FIELD_LOCATE_REFERENCE_T, _( "Field Locate Reference" ) ) - .Map( SCH_FIELD_LOCATE_VALUE_T, _( "Field Locate Value" ) ) - .Map( SCH_FIELD_LOCATE_FOOTPRINT_T, _( "Field Locate Footprint" ) ) + // Synthetic search tokens don't need to be included... + //.Map( SCH_FIELD_LOCATE_REFERENCE_T, _HKI( "Field Locate Reference" ) ) + //.Map( SCH_FIELD_LOCATE_VALUE_T, _HKI( "Field Locate Value" ) ) + //.Map( SCH_FIELD_LOCATE_FOOTPRINT_T, _HKI( "Field Locate Footprint" ) ) - .Map( SCH_SCREEN_T, _( "SCH Screen" ) ) + .Map( SCH_SCREEN_T, _HKI( "SCH Screen" ) ) - .Map( LIB_PART_T, _( "Symbol" ) ) - .Map( LIB_ALIAS_T, _( "Alias" ) ) - .Map( LIB_ARC_T, _( "Arc" ) ) - .Map( LIB_CIRCLE_T, _( "Circle" ) ) - .Map( LIB_TEXT_T, _( "Symbol Text" ) ) - .Map( LIB_RECTANGLE_T, _( "Rectangle" ) ) - .Map( LIB_POLYLINE_T, _( "Polyline" ) ) - .Map( LIB_BEZIER_T, _( "Bezier" ) ) - .Map( LIB_PIN_T, _( "Pin" ) ) - .Map( LIB_FIELD_T, _( "Symbol Field" ) ) + .Map( LIB_PART_T, _HKI( "Symbol" ) ) + .Map( LIB_ALIAS_T, _HKI( "Alias" ) ) + .Map( LIB_ARC_T, _HKI( "Arc" ) ) + .Map( LIB_CIRCLE_T, _HKI( "Circle" ) ) + .Map( LIB_TEXT_T, _HKI( "Symbol Text" ) ) + .Map( LIB_RECTANGLE_T, _HKI( "Rectangle" ) ) + .Map( LIB_POLYLINE_T, _HKI( "Polyline" ) ) + .Map( LIB_BEZIER_T, _HKI( "Bezier" ) ) + .Map( LIB_PIN_T, _HKI( "Pin" ) ) + .Map( LIB_FIELD_T, _HKI( "Symbol Field" ) ) - .Map( GERBER_LAYOUT_T, _( "Gerber Layout" ) ) - .Map( GERBER_DRAW_ITEM_T, _( "Draw Item" ) ) - .Map( GERBER_IMAGE_T, _( "Image" ) ); + .Map( GERBER_LAYOUT_T, _HKI( "Gerber Layout" ) ) + .Map( GERBER_DRAW_ITEM_T, _HKI( "Draw Item" ) ) + .Map( GERBER_IMAGE_T, _HKI( "Image" ) ); PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); REGISTER_TYPE( EDA_ITEM ); diff --git a/common/eda_text.cpp b/common/eda_text.cpp index b6f758f4bc..0f4f3b3eed 100644 --- a/common/eda_text.cpp +++ b/common/eda_text.cpp @@ -37,7 +37,6 @@ #include // for BASIC_GAL, basic_gal #include // for wxStringSplit #include // for Mils2iu -#include // for KICAD_T, SCH_LABEL_T, SCH_TEXT_T, SCH_G... #include // for EDA_RECT #include // for EDA_TEXT, TEXT_EFFECTS, GR_TEXT_VJUSTIF... #include // for COLOR4D, COLOR4D::BLACK @@ -48,8 +47,7 @@ #include // for VECTOR2D #include #include // for RotatePoint - -#include +#include #include #include @@ -644,35 +642,35 @@ static struct EDA_TEXT_DESC EDA_TEXT_DESC() { ENUM_MAP::Instance() - .Map( GR_TEXT_HJUSTIFY_LEFT, _( "Left" ) ) - .Map( GR_TEXT_HJUSTIFY_CENTER, _( "Center" ) ) - .Map( GR_TEXT_HJUSTIFY_RIGHT, _( "Right" ) ); + .Map( GR_TEXT_HJUSTIFY_LEFT, _HKI( "Left" ) ) + .Map( GR_TEXT_HJUSTIFY_CENTER, _HKI( "Center" ) ) + .Map( GR_TEXT_HJUSTIFY_RIGHT, _HKI( "Right" ) ); ENUM_MAP::Instance() - .Map( GR_TEXT_VJUSTIFY_TOP, _( "Top" ) ) - .Map( GR_TEXT_VJUSTIFY_CENTER, _( "Center" ) ) - .Map( GR_TEXT_VJUSTIFY_BOTTOM, _( "Bottom" ) ); + .Map( GR_TEXT_VJUSTIFY_TOP, _HKI( "Top" ) ) + .Map( GR_TEXT_VJUSTIFY_CENTER, _HKI( "Center" ) ) + .Map( GR_TEXT_VJUSTIFY_BOTTOM, _HKI( "Bottom" ) ); PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); REGISTER_TYPE( EDA_TEXT ); - propMgr.AddProperty( new PROPERTY( _( "Text" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Text" ), &EDA_TEXT::SetText, &EDA_TEXT::GetText ) ); - propMgr.AddProperty( new PROPERTY( _( "Thickness" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Thickness" ), &EDA_TEXT::SetTextThickness, &EDA_TEXT::GetTextThickness, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Italic" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Italic" ), &EDA_TEXT::SetItalic, &EDA_TEXT::IsItalic ) ); - propMgr.AddProperty( new PROPERTY( _( "Bold" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Bold" ), &EDA_TEXT::SetBold, &EDA_TEXT::IsBold ) ); - propMgr.AddProperty( new PROPERTY( _( "Mirrored" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Mirrored" ), &EDA_TEXT::SetMirrored, &EDA_TEXT::IsMirrored ) ); - propMgr.AddProperty( new PROPERTY( _( "Visible" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Visible" ), &EDA_TEXT::SetVisible, &EDA_TEXT::IsVisible ) ); - propMgr.AddProperty( new PROPERTY( _( "Width" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Width" ), &EDA_TEXT::SetTextWidth, &EDA_TEXT::GetTextWidth, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Height" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Height" ), &EDA_TEXT::SetTextHeight, &EDA_TEXT::GetTextHeight, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY_ENUM( _( "Horizontal Justification" ), + propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Horizontal Justification" ), &EDA_TEXT::SetHorizJustify, &EDA_TEXT::GetHorizJustify ) ); - propMgr.AddProperty( new PROPERTY_ENUM( _( "Vertical Justification" ), + propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Vertical Justification" ), &EDA_TEXT::SetVertJustify, &EDA_TEXT::GetVertJustify ) ); } } _EDA_TEXT_DESC; diff --git a/pcbnew/board_connected_item.cpp b/pcbnew/board_connected_item.cpp index a4da9b8a18..4a207420d1 100644 --- a/pcbnew/board_connected_item.cpp +++ b/pcbnew/board_connected_item.cpp @@ -28,6 +28,7 @@ #include #include #include +#include using namespace std::placeholders; @@ -153,15 +154,15 @@ static struct BOARD_CONNECTED_ITEM_DESC REGISTER_TYPE( BOARD_CONNECTED_ITEM ); propMgr.InheritsAfter( TYPE_HASH( BOARD_CONNECTED_ITEM ), TYPE_HASH( BOARD_ITEM ) ); - propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _( "Layer" ), - new PROPERTY_ENUM( _( "Layer" ), + propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ), + new PROPERTY_ENUM( _HKI( "Layer" ), &BOARD_CONNECTED_ITEM::SetLayer, &BOARD_CONNECTED_ITEM::GetLayer ) ); - propMgr.AddProperty( new PROPERTY_ENUM( _( "Net" ), + propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Net" ), &BOARD_CONNECTED_ITEM::SetNetCode, &BOARD_CONNECTED_ITEM::GetNetCode ) ); - propMgr.AddProperty( new PROPERTY( _( "NetName" ), + propMgr.AddProperty( new PROPERTY( _HKI( "NetName" ), NO_SETTER( BOARD_CONNECTED_ITEM, wxString ), &BOARD_CONNECTED_ITEM::GetNetname ) ); - propMgr.AddProperty( new PROPERTY( _( "NetClass" ), + propMgr.AddProperty( new PROPERTY( _HKI( "NetClass" ), NO_SETTER( BOARD_CONNECTED_ITEM, wxString ), &BOARD_CONNECTED_ITEM::GetNetClassName ) ); } } _BOARD_CONNECTED_ITEM_DESC; diff --git a/pcbnew/class_board_item.cpp b/pcbnew/class_board_item.cpp index c18db4588c..70ac8beec9 100644 --- a/pcbnew/class_board_item.cpp +++ b/pcbnew/class_board_item.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,9 +23,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include #include - +#include #include #include @@ -181,13 +180,13 @@ static struct BOARD_ITEM_DESC REGISTER_TYPE( BOARD_ITEM ); propMgr.InheritsAfter( TYPE_HASH( BOARD_ITEM ), TYPE_HASH( EDA_ITEM ) ); - propMgr.AddProperty( new PROPERTY( _( "Position X" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Position X" ), &BOARD_ITEM::SetX, &BOARD_ITEM::GetX, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Position Y" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Position Y" ), &BOARD_ITEM::SetY, &BOARD_ITEM::GetY, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY_ENUM( _( "Layer" ), + propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Layer" ), &BOARD_ITEM::SetLayer, &BOARD_ITEM::GetLayer ) ); - propMgr.AddProperty( new PROPERTY( _( "Locked" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Locked" ), &BOARD_ITEM::SetLocked, &BOARD_ITEM::IsLocked ) ); } } _BOARD_ITEM_DESC; diff --git a/pcbnew/class_dimension.cpp b/pcbnew/class_dimension.cpp index 5ef9c17a61..05ea548d71 100644 --- a/pcbnew/class_dimension.cpp +++ b/pcbnew/class_dimension.cpp @@ -31,11 +31,11 @@ #include #include #include -#include #include #include #include #include +#include DIMENSION::DIMENSION( BOARD_ITEM* aParent, KICAD_T aType ) : @@ -503,19 +503,6 @@ OPT_VECTOR2I DIMENSION::segPolyIntersection( SHAPE_POLY_SET& aPoly, SEG& aSeg, b } -static struct DIMENSION_DESC -{ - DIMENSION_DESC() - { - PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); - REGISTER_TYPE( DIMENSION ); - propMgr.InheritsAfter( TYPE_HASH( DIMENSION ), TYPE_HASH( BOARD_ITEM ) ); - //propMgr.AddProperty( new PROPERTY( "Height", - //&DIMENSION::SetHeight, &DIMENSION::GetHeight, PROPERTY_DISPLAY::DISTANCE ) ); - } -} _DIMENSION_DESC; - - ALIGNED_DIMENSION::ALIGNED_DIMENSION( BOARD_ITEM* aParent, KICAD_T aType ) : DIMENSION( aParent, aType ), m_height( 0 ) @@ -1059,3 +1046,19 @@ void CENTER_DIMENSION::updateGeometry() m_shapes.emplace_back( new SHAPE_SEGMENT( center - arm, center + arm ) ); } + + +static struct DIMENSION_DESC +{ + DIMENSION_DESC() + { + PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); + REGISTER_TYPE( DIMENSION ); + propMgr.InheritsAfter( TYPE_HASH( DIMENSION ), TYPE_HASH( BOARD_ITEM ) ); + // TODO: add dimension properties: + //propMgr.AddProperty( new PROPERTY( _HKI( "Height" ), + //&DIMENSION::SetHeight, &DIMENSION::GetHeight, PROPERTY_DISPLAY::DISTANCE ) ); + } +} _DIMENSION_DESC; + + diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp index b16f489256..23ad0a2b5a 100644 --- a/pcbnew/class_module.cpp +++ b/pcbnew/class_module.cpp @@ -35,6 +35,7 @@ #include #include #include +#include MODULE::MODULE( BOARD* parent ) : BOARD_ITEM_CONTAINER( (BOARD_ITEM*) parent, PCB_MODULE_T ), @@ -1809,30 +1810,30 @@ static struct MODULE_DESC propMgr.InheritsAfter( TYPE_HASH( MODULE ), TYPE_HASH( BOARD_ITEM ) ); propMgr.InheritsAfter( TYPE_HASH( MODULE ), TYPE_HASH( BOARD_ITEM_CONTAINER ) ); - auto layer = new PROPERTY_ENUM( _( "Layer" ), + auto layer = new PROPERTY_ENUM( _HKI( "Layer" ), &MODULE::SetLayer, &MODULE::GetLayer ); layer->SetChoices( fpLayers ); - propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _( "Layer" ), layer ); + propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ), layer ); - propMgr.AddProperty( new PROPERTY( _( "Reference" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Reference" ), &MODULE::SetReference, &MODULE::GetReference ) ); - propMgr.AddProperty( new PROPERTY( _( "Value" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Value" ), &MODULE::SetValue, &MODULE::GetValue ) ); - propMgr.AddProperty( new PROPERTY( _( "Orientation" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Orientation" ), &MODULE::SetOrientationDegrees, &MODULE::GetOrientationDegrees, PROPERTY_DISPLAY::DEGREE ) ); - propMgr.AddProperty( new PROPERTY( _( "Local Clearance" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Local Clearance" ), &MODULE::SetLocalClearance, &MODULE::GetLocalClearance, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Local Solderpaste Margin" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Local Solderpaste Margin" ), &MODULE::SetLocalSolderPasteMargin, &MODULE::GetLocalSolderPasteMargin, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Local Solderpaste Margin Ratio" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Local Solderpaste Margin Ratio" ), &MODULE::SetLocalSolderPasteMarginRatio, &MODULE::GetLocalSolderPasteMarginRatio ) ); - propMgr.AddProperty( new PROPERTY( _( "Thermal Width" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Width" ), &MODULE::SetThermalWidth, &MODULE::GetThermalWidth, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Thermal Gap" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Gap" ), &MODULE::SetThermalGap, &MODULE::GetThermalGap, PROPERTY_DISPLAY::DISTANCE ) ); // TODO zone connection, FPID? diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp index 9c57d1c4b1..336947cb4d 100644 --- a/pcbnew/class_pad.cpp +++ b/pcbnew/class_pad.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -1326,67 +1326,67 @@ static struct PAD_DESC PAD_DESC() { ENUM_MAP::Instance() - .Map( PAD_ATTRIB_PTH, _( "Through-hole" ) ) - .Map( PAD_ATTRIB_SMD, _( "SMD" ) ) - .Map( PAD_ATTRIB_CONN, _( "Edge connector" ) ) - .Map( PAD_ATTRIB_NPTH, _( "NPTH, mechanical" ) ); + .Map( PAD_ATTRIB_PTH, _HKI( "Through-hole" ) ) + .Map( PAD_ATTRIB_SMD, _HKI( "SMD" ) ) + .Map( PAD_ATTRIB_CONN, _HKI( "Edge connector" ) ) + .Map( PAD_ATTRIB_NPTH, _HKI( "NPTH, mechanical" ) ); ENUM_MAP::Instance() - .Map( PAD_SHAPE_CIRCLE, _( "Circle" ) ) - .Map( PAD_SHAPE_RECT, _( "Rectangle" ) ) - .Map( PAD_SHAPE_OVAL, _( "Oval" ) ) - .Map( PAD_SHAPE_TRAPEZOID, _( "Trapezoid" ) ) - .Map( PAD_SHAPE_ROUNDRECT, _( "Rounded rectangle" ) ) - .Map( PAD_SHAPE_CHAMFERED_RECT, _( "Chamfered rectangle" ) ) - .Map( PAD_SHAPE_CUSTOM, _( "Custom" ) ); + .Map( PAD_SHAPE_CIRCLE, _HKI( "Circle" ) ) + .Map( PAD_SHAPE_RECT, _HKI( "Rectangle" ) ) + .Map( PAD_SHAPE_OVAL, _HKI( "Oval" ) ) + .Map( PAD_SHAPE_TRAPEZOID, _HKI( "Trapezoid" ) ) + .Map( PAD_SHAPE_ROUNDRECT, _HKI( "Rounded rectangle" ) ) + .Map( PAD_SHAPE_CHAMFERED_RECT, _HKI( "Chamfered rectangle" ) ) + .Map( PAD_SHAPE_CUSTOM, _HKI( "Custom" ) ); ENUM_MAP::Instance() - .Map( PAD_PROP_NONE, _( "None" ) ) - .Map( PAD_PROP_BGA, _( "BGA pad" ) ) - .Map( PAD_PROP_FIDUCIAL_GLBL, _( "Fiducial, global to board" ) ) - .Map( PAD_PROP_FIDUCIAL_LOCAL, _( "Fiducial, local to footprint" ) ) - .Map( PAD_PROP_TESTPOINT, _( "Test point pad" ) ) - .Map( PAD_PROP_HEATSINK, _( "Heatsink pad" ) ) - .Map( PAD_PROP_CASTELLATED, _( "Castellated pad" ) ); + .Map( PAD_PROP_NONE, _HKI( "None" ) ) + .Map( PAD_PROP_BGA, _HKI( "BGA pad" ) ) + .Map( PAD_PROP_FIDUCIAL_GLBL, _HKI( "Fiducial, global to board" ) ) + .Map( PAD_PROP_FIDUCIAL_LOCAL, _HKI( "Fiducial, local to footprint" ) ) + .Map( PAD_PROP_TESTPOINT, _HKI( "Test point pad" ) ) + .Map( PAD_PROP_HEATSINK, _HKI( "Heatsink pad" ) ) + .Map( PAD_PROP_CASTELLATED, _HKI( "Castellated pad" ) ); PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); REGISTER_TYPE( D_PAD ); propMgr.InheritsAfter( TYPE_HASH( D_PAD ), TYPE_HASH( BOARD_CONNECTED_ITEM ) ); - auto padType = new PROPERTY_ENUM( _( "Pad Type" ), + auto padType = new PROPERTY_ENUM( _HKI( "Pad Type" ), &D_PAD::SetAttribute, &D_PAD::GetAttribute ); propMgr.AddProperty( padType ); - auto shape = new PROPERTY_ENUM( _( "Shape" ), + auto shape = new PROPERTY_ENUM( _HKI( "Shape" ), &D_PAD::SetShape, &D_PAD::GetShape ); propMgr.AddProperty( shape ); - propMgr.AddProperty( new PROPERTY( _( "Name" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Name" ), &D_PAD::SetName, &D_PAD::GetName ) ); - propMgr.AddProperty( new PROPERTY( _( "Orientation" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Orientation" ), &D_PAD::SetOrientationDegrees, &D_PAD::GetOrientationDegrees, PROPERTY_DISPLAY::DEGREE ) ); - propMgr.AddProperty( new PROPERTY( _( "Pad To Die Length" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Pad To Die Length" ), &D_PAD::SetPadToDieLength, &D_PAD::GetPadToDieLength, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Local Soldermask Margin" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Local Soldermask Margin" ), &D_PAD::SetLocalSolderMaskMargin, &D_PAD::GetLocalSolderMaskMargin, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Local Solderpaste Margin" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Local Solderpaste Margin" ), &D_PAD::SetLocalSolderPasteMargin, &D_PAD::GetLocalSolderPasteMargin, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Local Solderpaste Margin Ratio" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Local Solderpaste Margin Ratio" ), &D_PAD::SetLocalSolderPasteMarginRatio, &D_PAD::GetLocalSolderPasteMarginRatio ) ); - propMgr.AddProperty( new PROPERTY( _( "Thermal Relief Spoke Width" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Relief Spoke Width" ), &D_PAD::SetThermalSpokeWidth, &D_PAD::GetThermalSpokeWidth, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Thermal Relief" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Relief" ), &D_PAD::SetThermalGap, &D_PAD::GetThermalGap, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY_ENUM( _( "Fabrication Property" ), + propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Fabrication Property" ), &D_PAD::SetProperty, &D_PAD::GetProperty ) ); - auto roundRadiusRatio = new PROPERTY( _( "Round Radius Ratio" ), + auto roundRadiusRatio = new PROPERTY( _HKI( "Round Radius Ratio" ), &D_PAD::SetRoundRectRadiusRatio, &D_PAD::GetRoundRectRadiusRatio ); roundRadiusRatio->SetAvailableFunc( [=]( INSPECTABLE* aItem ) -> bool @@ -1395,7 +1395,7 @@ static struct PAD_DESC } ); propMgr.AddProperty( roundRadiusRatio ); - propMgr.AddProperty( new PROPERTY( _( "Local Clearance" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Local Clearance" ), &D_PAD::SetLocalClearance, &D_PAD::GetLocalClearance, PROPERTY_DISPLAY::DISTANCE ) ); // TODO delta, size, drill size, dirill shape offset, layerset, zone connection diff --git a/pcbnew/class_pcb_target.cpp b/pcbnew/class_pcb_target.cpp index b184debfb3..c0ac2a6a9d 100644 --- a/pcbnew/class_pcb_target.cpp +++ b/pcbnew/class_pcb_target.cpp @@ -36,6 +36,7 @@ #include #include #include +#include PCB_TARGET::PCB_TARGET( BOARD_ITEM* aParent ) : @@ -148,15 +149,15 @@ static struct PCB_TARGET_DESC PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); REGISTER_TYPE( PCB_TARGET ); propMgr.InheritsAfter( TYPE_HASH( PCB_TARGET ), TYPE_HASH( BOARD_ITEM ) ); - propMgr.AddProperty( new PROPERTY( _( "Size" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Size" ), &PCB_TARGET::SetSize, &PCB_TARGET::GetSize, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Width" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Width" ), &PCB_TARGET::SetWidth, &PCB_TARGET::GetWidth, PROPERTY_DISPLAY::DISTANCE ) ); - auto shape = new PROPERTY( _( "Shape" ), + auto shape = new PROPERTY( _HKI( "Shape" ), &PCB_TARGET::SetShape, &PCB_TARGET::GetShape ); // TODO change the integer to an enum? - //shape->SetValues( { { 0, _( "Cross" ) }, { 1, ( "Plus" ) } } ); + //shape->SetValues( { { 0, _HKI( "Cross" ) }, { 1, ( "Plus" ) } } ); propMgr.AddProperty( shape ); } } _PCB_TARGET_DESC; diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp index 64cfb8f14d..b26e07f5b8 100644 --- a/pcbnew/class_track.cpp +++ b/pcbnew/class_track.cpp @@ -34,7 +34,7 @@ #include #include #include - +#include #include #include #include @@ -1048,9 +1048,9 @@ static struct TRACK_VIA_DESC { ENUM_MAP::Instance() .Undefined( VIATYPE::NOT_DEFINED ) - .Map( VIATYPE::THROUGH, _( "Through" ) ) - .Map( VIATYPE::BLIND_BURIED, _( "Blind/buried" ) ) - .Map( VIATYPE::MICROVIA, _( "Micro" ) ); + .Map( VIATYPE::THROUGH, _HKI( "Through" ) ) + .Map( VIATYPE::BLIND_BURIED, _HKI( "Blind/buried" ) ) + .Map( VIATYPE::MICROVIA, _HKI( "Micro" ) ); ENUM_MAP& layerEnum = ENUM_MAP::Instance(); @@ -1068,17 +1068,17 @@ static struct TRACK_VIA_DESC REGISTER_TYPE( TRACK ); propMgr.InheritsAfter( TYPE_HASH( TRACK ), TYPE_HASH( BOARD_CONNECTED_ITEM ) ); - propMgr.AddProperty( new PROPERTY( _( "Width" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Width" ), &TRACK::SetWidth, &TRACK::GetWidth, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _( "Position X" ), - new PROPERTY( _( "Origin X" ), + propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Position X" ), + new PROPERTY( _HKI( "Origin X" ), &TRACK::SetX, &TRACK::GetX, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _( "Position Y" ), - new PROPERTY( _( "Origin Y" ), + propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Position Y" ), + new PROPERTY( _HKI( "Origin Y" ), &TRACK::SetY, &TRACK::GetY, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "End X" ), + propMgr.AddProperty( new PROPERTY( _HKI( "End X" ), &TRACK::SetEndX, &TRACK::GetEndX, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "End Y" ), + propMgr.AddProperty( new PROPERTY( _HKI( "End Y" ), &TRACK::SetEndY, &TRACK::GetEndY, PROPERTY_DISPLAY::DISTANCE ) ); // Via @@ -1087,17 +1087,17 @@ static struct TRACK_VIA_DESC // TODO layerset for vias? // TODO test drill, use getdrillvalue? - propMgr.ReplaceProperty( TYPE_HASH( TRACK ), _( "Width" ), - new PROPERTY( _( "Diameter" ), + propMgr.ReplaceProperty( TYPE_HASH( TRACK ), _HKI( "Width" ), + new PROPERTY( _HKI( "Diameter" ), &VIA::SetWidth, &VIA::GetWidth, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Drill" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Drill" ), &VIA::SetDrill, &VIA::GetDrillValue, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _( "Layer" ), - new PROPERTY_ENUM( _( "Layer Top" ), + propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ), + new PROPERTY_ENUM( _HKI( "Layer Top" ), &VIA::SetLayer, &VIA::GetLayer ) ); - propMgr.AddProperty( new PROPERTY_ENUM( _( "Layer Bottom" ), + propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Layer Bottom" ), &VIA::SetBottomLayer, &VIA::BottomLayer ) ); - propMgr.AddProperty( new PROPERTY_ENUM( _( "Via Type" ), + propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Via Type" ), &VIA::SetViaType, &VIA::GetViaType ) ); } } _TRACK_VIA_DESC; diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp index 08c896da37..09b66365ce 100644 --- a/pcbnew/class_zone.cpp +++ b/pcbnew/class_zone.cpp @@ -36,6 +36,7 @@ #include #include #include +#include ZONE_CONTAINER::ZONE_CONTAINER( BOARD_ITEM_CONTAINER* aParent, bool aInFP ) : BOARD_CONNECTED_ITEM( aParent, aInFP ? PCB_FP_ZONE_AREA_T : PCB_ZONE_AREA_T ), @@ -1368,33 +1369,33 @@ static struct ZONE_CONTAINER_DESC ZONE_CONTAINER_DESC() { ENUM_MAP::Instance() - .Map( ZONE_CONNECTION::INHERITED, _( "Inherited" ) ) - .Map( ZONE_CONNECTION::NONE, _( "None" ) ) - .Map( ZONE_CONNECTION::THERMAL, _( "Thermal reliefs" ) ) - .Map( ZONE_CONNECTION::FULL, _( "Solid" ) ) - .Map( ZONE_CONNECTION::THT_THERMAL, _( "Reliefs for PTH" ) ); + .Map( ZONE_CONNECTION::INHERITED, _HKI( "Inherited" ) ) + .Map( ZONE_CONNECTION::NONE, _HKI( "None" ) ) + .Map( ZONE_CONNECTION::THERMAL, _HKI( "Thermal reliefs" ) ) + .Map( ZONE_CONNECTION::FULL, _HKI( "Solid" ) ) + .Map( ZONE_CONNECTION::THT_THERMAL, _HKI( "Reliefs for PTH" ) ); PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); REGISTER_TYPE( ZONE_CONTAINER ); propMgr.InheritsAfter( TYPE_HASH( ZONE_CONTAINER ), TYPE_HASH( BOARD_CONNECTED_ITEM ) ); - propMgr.AddProperty( new PROPERTY( _( "Priority" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Priority" ), &ZONE_CONTAINER::SetPriority, &ZONE_CONTAINER::GetPriority ) ); //propMgr.AddProperty( new PROPERTY( "Filled", //&ZONE_CONTAINER::SetIsFilled, &ZONE_CONTAINER::IsFilled ) ); - propMgr.AddProperty( new PROPERTY( _( "Name" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Name" ), &ZONE_CONTAINER::SetZoneName, &ZONE_CONTAINER::GetZoneName ) ); - propMgr.AddProperty( new PROPERTY( _( "Clearance" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Clearance" ), &ZONE_CONTAINER::SetLocalClearance, &ZONE_CONTAINER::GetLocalClearance, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Min Width" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Min Width" ), &ZONE_CONTAINER::SetMinThickness, &ZONE_CONTAINER::GetMinThickness, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY_ENUM( _( "Pad Connections" ), + propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Pad Connections" ), &ZONE_CONTAINER::SetPadConnection, &ZONE_CONTAINER::GetPadConnection ) ); - propMgr.AddProperty( new PROPERTY( _( "Thermal Clearance" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Clearance" ), &ZONE_CONTAINER::SetThermalReliefGap, &ZONE_CONTAINER::GetThermalReliefGap, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "Thermal Spoke Width" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Spoke Width" ), &ZONE_CONTAINER::SetThermalReliefSpokeWidth, &ZONE_CONTAINER::GetThermalReliefSpokeWidth, PROPERTY_DISPLAY::DISTANCE ) ); } diff --git a/pcbnew/pcb_shape.cpp b/pcbnew/pcb_shape.cpp index 76f2139a00..037511b17a 100644 --- a/pcbnew/pcb_shape.cpp +++ b/pcbnew/pcb_shape.cpp @@ -39,6 +39,7 @@ #include #include #include +#include PCB_SHAPE::PCB_SHAPE( BOARD_ITEM* aParent, KICAD_T idtype ) : @@ -1268,16 +1269,16 @@ static struct DRAWSEGMENT_DESC REGISTER_TYPE( PCB_SHAPE ); propMgr.InheritsAfter( TYPE_HASH( PCB_SHAPE ), TYPE_HASH( BOARD_ITEM ) ); - propMgr.AddProperty( new PROPERTY( _( "Thickness" ), + propMgr.AddProperty( new PROPERTY( _HKI( "Thickness" ), &PCB_SHAPE::SetWidth, &PCB_SHAPE::GetWidth, PROPERTY_DISPLAY::DISTANCE ) ); // TODO show certain properties depending on the shape - //propMgr.AddProperty( new PROPERTY( _( "Angle" ), + //propMgr.AddProperty( new PROPERTY( _HKI( "Angle" ), // &PCB_SHAPE::SetAngle, &PCB_SHAPE::GetAngle, PROPERTY_DISPLAY::DECIDEGREE ) ); // TODO or may have different names (arcs) // TODO type? - propMgr.AddProperty( new PROPERTY( _( "End X" ), + propMgr.AddProperty( new PROPERTY( _HKI( "End X" ), &PCB_SHAPE::SetEndX, &PCB_SHAPE::GetEndX, PROPERTY_DISPLAY::DISTANCE ) ); - propMgr.AddProperty( new PROPERTY( _( "End Y" ), + propMgr.AddProperty( new PROPERTY( _HKI( "End Y" ), &PCB_SHAPE::SetEndY, &PCB_SHAPE::GetEndY, PROPERTY_DISPLAY::DISTANCE ) ); } } _DRAWSEGMENT_DESC;