haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use consistent terminology for component placement files. 

CHANGED footprint positions files -> component placement files.

Not all footprints get placed, so component is a more neutral word.
Use of "placement" instead of "positions" removes the double-plural
that makes footprint positions files such a mouth-full.

Fixes https://gitlab.com/kicad/code/kicad/issues/7097
This commit is contained in:
Jeff Young 2021-01-28 17:32:43 +00:00
parent 945faba586
commit 1a7b7e84c6
6 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/wildcards_and_files_ext.cpp
View File

@ -407,7 +407,7 @@ wxString ReportFileWildcard()
wxString FootprintPlaceFileWildcard() wxString FootprintPlaceFileWildcard()
{ {
return _( "Footprint place files" ) + AddFileExtListToFilter( { "pos" } ); return _( "Component placement files" ) + AddFileExtListToFilter( { "pos" } );
} }

2
pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!

5
pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp
View File

@ -14,7 +14,6 @@
<property name="file">dialog_gen_footprint_position_file_base</property> <property name="file">dialog_gen_footprint_position_file_base</property>
<property name="first_id">1000</property> <property name="first_id">1000</property>
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="image_path_wrapper_function_name"></property>
<property name="indent_with_spaces"></property> <property name="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">dialog_gen_footprint_positions_base</property> <property name="name">dialog_gen_footprint_positions_base</property>
@ -26,7 +25,6 @@
<property name="skip_php_events">1</property> <property name="skip_php_events">1</property>
<property name="skip_python_events">1</property> <property name="skip_python_events">1</property>
<property name="ui_table">UI</property> <property name="ui_table">UI</property>
<property name="use_array_enum">0</property>
<property name="use_enum">1</property> <property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property> <property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1"> <object class="Dialog" expanded="1">
@ -50,7 +48,7 @@
<property name="size">-1,-1</property> <property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property> <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Generate Footprint Position Files</property> <property name="title">Generate Placement Files</property>
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
@ -216,7 +214,6 @@
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="aui_position"></property> <property name="aui_position"></property>
<property name="aui_row"></property> <property name="aui_row"></property>
<property name="auth_needed">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmap"></property> <property name="bitmap"></property>

4
pcbnew/dialogs/dialog_gen_footprint_position_file_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -69,7 +69,7 @@ class DIALOG_GEN_FOOTPRINT_POSITION_BASE : public DIALOG_SHIM
public: public:
DIALOG_GEN_FOOTPRINT_POSITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Generate Footprint Position Files"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_GEN_FOOTPRINT_POSITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Generate Placement Files"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_GEN_FOOTPRINT_POSITION_BASE(); ~DIALOG_GEN_FOOTPRINT_POSITION_BASE();
}; };

16
pcbnew/exporters/gen_footprints_placefile.cpp
View File

@ -272,7 +272,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateGerberFiles()
return false; return false;
} }
msg.Printf( _( "Front side (top side) place file: \"%s\"." ), filename ); msg.Printf( _( "Front (top side) placement file: \"%s\"." ), filename );
m_reporter->Report( msg, RPT_SEVERITY_INFO ); m_reporter->Report( msg, RPT_SEVERITY_INFO );
msg.Printf( _( "Component count: %d." ), fpcount ); msg.Printf( _( "Component count: %d." ), fpcount );
@ -294,7 +294,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateGerberFiles()
} }
// Display results // Display results
msg.Printf( _( "Back side (bottom side) place file: \"%s\"." ), filename ); msg.Printf( _( "Back (bottom side) placement file: \"%s\"." ), filename );
m_reporter->Report( msg, RPT_SEVERITY_INFO ); m_reporter->Report( msg, RPT_SEVERITY_INFO );
msg.Printf( _( "Component count: %d." ), fpcount ); msg.Printf( _( "Component count: %d." ), fpcount );
@ -305,7 +305,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateGerberFiles()
msg.Printf( _( "Full component count: %d\n" ), fullcount ); msg.Printf( _( "Full component count: %d\n" ), fullcount );
m_reporter->Report( msg, RPT_SEVERITY_INFO ); m_reporter->Report( msg, RPT_SEVERITY_INFO );
m_reporter->Report( _( "Component Placement File generation OK." ), RPT_SEVERITY_ACTION ); m_reporter->Report( _( "File generation successful." ), RPT_SEVERITY_ACTION );
return true; return true;
} }
@ -386,9 +386,9 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateAsciiFiles()
} }
if( singleFile ) if( singleFile )
msg.Printf( _( "Place file: \"%s\"." ), fn.GetFullPath() ); msg.Printf( _( "Placement file: \"%s\"." ), fn.GetFullPath() );
else else
msg.Printf( _( "Front side (top side) place file: \"%s\"." ), msg.Printf( _( "Front (top side) placement file: \"%s\"." ),
fn.GetFullPath() ); fn.GetFullPath() );
m_reporter->Report( msg, RPT_SEVERITY_INFO ); m_reporter->Report( msg, RPT_SEVERITY_INFO );
@ -397,7 +397,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateAsciiFiles()
if( singleFile ) if( singleFile )
{ {
m_reporter->Report( _( "Component Placement File generation OK." ), RPT_SEVERITY_ACTION ); m_reporter->Report( _( "File generation successful." ), RPT_SEVERITY_ACTION );
return true; return true;
} }
@ -431,7 +431,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateAsciiFiles()
// Display results // Display results
if( !singleFile ) if( !singleFile )
{ {
msg.Printf( _( "Back side (bottom side) place file: \"%s\"." ), fn.GetFullPath() ); msg.Printf( _( "Back (bottom side) placement file: \"%s\"." ), fn.GetFullPath() );
m_reporter->Report( msg, RPT_SEVERITY_INFO ); m_reporter->Report( msg, RPT_SEVERITY_INFO );
msg.Printf( _( "Component count: %d." ), fpcount ); msg.Printf( _( "Component count: %d." ), fpcount );
@ -446,7 +446,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateAsciiFiles()
m_reporter->Report( msg, RPT_SEVERITY_INFO ); m_reporter->Report( msg, RPT_SEVERITY_INFO );
} }
m_reporter->Report( _( "Component Placement File generation OK." ), RPT_SEVERITY_ACTION ); m_reporter->Report( _( "File generation successful." ), RPT_SEVERITY_ACTION );
return true; return true;
} }

6
pcbnew/tools/pcb_actions.cpp
View File

@ -565,8 +565,8 @@ TOOL_ACTION PCB_ACTIONS::generateDrillFiles( "pcbnew.EditorControl.generateDrill
TOOL_ACTION PCB_ACTIONS::generatePosFile( "pcbnew.EditorControl.generatePosFile", TOOL_ACTION PCB_ACTIONS::generatePosFile( "pcbnew.EditorControl.generatePosFile",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Footprint Positions (.pos)..." ), _( "Component Placement (.pos)..." ),
_( "Generate footprint position file for pick and place" ), _( "Generate component placement file(s) for pick and place" ),
post_compo_xpm ); post_compo_xpm );
TOOL_ACTION PCB_ACTIONS::generateReportFile( "pcbnew.EditorControl.generateReportFile", TOOL_ACTION PCB_ACTIONS::generateReportFile( "pcbnew.EditorControl.generateReportFile",
@ -634,7 +634,7 @@ TOOL_ACTION PCB_ACTIONS::placeFootprint( "pcbnew.EditorControl.placeFootprint",
TOOL_ACTION PCB_ACTIONS::drillOrigin( "pcbnew.EditorControl.drillOrigin", TOOL_ACTION PCB_ACTIONS::drillOrigin( "pcbnew.EditorControl.drillOrigin",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Drill/Place File Origin" ), _( "Drill/Place File Origin" ),
_( "Place origin point for drill files and footprint position files" ), _( "Place origin point for drill files and component placement files" ),
set_origin_xpm, AF_ACTIVATE ); set_origin_xpm, AF_ACTIVATE );
TOOL_ACTION PCB_ACTIONS::toggleLock( "pcbnew.EditorControl.toggleLock", TOOL_ACTION PCB_ACTIONS::toggleLock( "pcbnew.EditorControl.toggleLock",