Avoid duplicate strings to avoid typos and not synchronized strings

Fixes #8964
https://gitlab.com/kicad/code/kicad/issues/8964
This commit is contained in:
jean-pierre charras 2021-08-15 17:50:23 +02:00
parent 7a7eee86ce
commit c6ce367f1e
1 changed files with 37 additions and 21 deletions

View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 1992-2021 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
@ -192,7 +192,8 @@ wxString SchematicSymbolFileWildcard()
wxString KiCadSymbolLibFileWildcard()
{
return _( "KiCad symbol library files" ) + AddFileExtListToFilter( { "kicad_sym" } );
return _( "KiCad symbol library files" )
+ AddFileExtListToFilter( { KiCadSymbolLibFileExtension } );
}
@ -204,37 +205,42 @@ wxString LegacySymbolLibFileWildcard()
wxString AllSymbolLibFilesWildcard()
{
return _( "All KiCad symbol library files" ) + AddFileExtListToFilter( { "kicad_sym", "lib" } );
return _( "All KiCad symbol library files" )
+ AddFileExtListToFilter( { KiCadSymbolLibFileExtension, "lib" } );
}
wxString ProjectFileWildcard()
{
return _( "KiCad project files" ) + AddFileExtListToFilter( { "kicad_pro" } );
return _( "KiCad project files" ) + AddFileExtListToFilter( { ProjectFileExtension } );
}
wxString LegacyProjectFileWildcard()
{
return _( "KiCad legacy project files" ) + AddFileExtListToFilter( { "pro" } );
return _( "KiCad legacy project files" )
+ AddFileExtListToFilter( { LegacyProjectFileExtension } );
}
wxString AllProjectFilesWildcard()
{
return _( "All KiCad project files" ) + AddFileExtListToFilter( { "kicad_pro", "pro" } );
return _( "All KiCad project files" )
+ AddFileExtListToFilter( { ProjectFileExtension, LegacyProjectFileExtension } );
}
wxString LegacySchematicFileWildcard()
{
return _( "KiCad legacy schematic files" ) + AddFileExtListToFilter( { "sch" } );
return _( "KiCad legacy schematic files" )
+ AddFileExtListToFilter( { LegacySchematicFileExtension } );
}
wxString KiCadSchematicFileWildcard()
{
return _( "KiCad s-expression schematic files" ) + AddFileExtListToFilter( { "kicad_sch" } );
return _( "KiCad s-expression schematic files" )
+ AddFileExtListToFilter( { KiCadSchematicFileExtension } );
}
@ -323,19 +329,22 @@ wxString FabmasterPcbFileWildcard()
wxString PcbFileWildcard()
{
return _( "KiCad printed circuit board files" ) + AddFileExtListToFilter( { "kicad_pcb" } );
return _( "KiCad printed circuit board files" ) +
AddFileExtListToFilter( { KiCadPcbFileExtension } );
}
wxString KiCadFootprintLibFileWildcard()
{
return _( "KiCad footprint files" ) + AddFileExtListToFilter( { "kicad_mod" } );
return _( "KiCad footprint files" )
+ AddFileExtListToFilter( { KiCadFootprintFileExtension } );
}
wxString KiCadFootprintLibPathWildcard()
{
return _( "KiCad footprint library paths" ) + AddFileExtListToFilter( { "pretty" } );
return _( "KiCad footprint library paths" )
+ AddFileExtListToFilter( { KiCadFootprintLibPathExtension } );
}
@ -359,27 +368,30 @@ wxString GedaPcbFootprintLibFileWildcard()
wxString DrawingSheetFileWildcard()
{
return _( "Drawing sheet files" ) + AddFileExtListToFilter( { "kicad_wks" } );
return _( "Drawing sheet files" )
+ AddFileExtListToFilter( { DrawingSheetFileExtension } );
}
// Wildcard for cvpcb symbol to footprint link file
wxString FootprintAssignmentFileWildcard()
{
return _( "KiCad symbol footprint link files" ) + AddFileExtListToFilter( { "cmp" } );
return _( "KiCad symbol footprint link files" )
+ AddFileExtListToFilter( { FootprintAssignmentFileExtension } );
}
// Wildcard for reports and fabrication documents
wxString DrillFileWildcard()
{
return _( "Drill files" ) + AddFileExtListToFilter( { "drl", "nc", "xnc", "txt" } );
return _( "Drill files" )
+ AddFileExtListToFilter( { DrillFileExtension, "nc", "xnc", "txt" } );
}
wxString SVGFileWildcard()
{
return _( "SVG files" ) + AddFileExtListToFilter( { "svg" } );
return _( "SVG files" ) + AddFileExtListToFilter( { SVGFileExtension } );
}
@ -493,31 +505,35 @@ wxString DxfFileWildcard()
wxString GerberJobFileWildcard()
{
return _( "Gerber job file" ) + AddFileExtListToFilter( { "gbrjob" } );
return _( "Gerber job file" ) + AddFileExtListToFilter( { GerberJobFileExtension } );
}
wxString SpecctraDsnFileWildcard()
{
return _( "Specctra DSN file" ) + AddFileExtListToFilter( { "dsn" } );
return _( "Specctra DSN file" )
+ AddFileExtListToFilter( { SpecctraDsnFileExtension } );
}
wxString SpecctraSessionFileWildcard()
{
return _( "Specctra Session file" ) + AddFileExtListToFilter( { "ses" } );
return _( "Specctra Session file" )
+ AddFileExtListToFilter( { SpecctraSessionFileExtension } );
}
wxString IpcD356FileWildcard()
{
return _( "IPC-D-356 Test Files" ) + AddFileExtListToFilter( { "d356" } );
return _( "IPC-D-356 Test Files" )
+ AddFileExtListToFilter( { IpcD356FileExtension } );
}
wxString WorkbookFileWildcard()
{
return _( "Workbook file" ) + AddFileExtListToFilter( { "wbk" } );
return _( "Workbook file" )
+ AddFileExtListToFilter( { WorkbookFileExtension } );
}
@ -535,5 +551,5 @@ wxString JpegFileWildcard()
wxString HotkeyFileWildcard()
{
return _( "Hotkey file" ) + AddFileExtListToFilter( { "hotkey" } );
return _( "Hotkey file" ) + AddFileExtListToFilter( { HotkeyFileExtension } );
}