fix last French to English translations problems
This commit is contained in:
parent
d2eac37ddf
commit
1a6b90d057
|
@ -58,7 +58,7 @@ int g_TabAllCopperLayerMask[NB_COPPER_LAYERS] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
wxString g_ViaType_Name[4] = {
|
wxString g_ViaType_Name[4] = {
|
||||||
_( "??? Via" ), // Not used yet
|
_( "??? Via" ), // Not used yet, do not exists
|
||||||
_( "Micro Via" ), // from external layer (TOP or BOTTOM) from
|
_( "Micro Via" ), // from external layer (TOP or BOTTOM) from
|
||||||
// the near neighbor inner layer only
|
// the near neighbor inner layer only
|
||||||
_( "Blind/Buried Via" ), // from inner or external to inner or external
|
_( "Blind/Buried Via" ), // from inner or external to inner or external
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Searches for all ref <path lib> *.??? if offering their file name,
|
* Functions to read footprint libraries and create the list of availlable footprints
|
||||||
* or reviews <path lib> [MODULE.LIB]
|
* and their documentation (comments and keywords)
|
||||||
*/
|
*/
|
||||||
#include "fctsys.h"
|
#include "fctsys.h"
|
||||||
#include "wxstruct.h"
|
#include "wxstruct.h"
|
||||||
|
|
|
@ -336,7 +336,9 @@ void TEXTE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode,
|
||||||
wxPoint pos; // Center of text
|
wxPoint pos; // Center of text
|
||||||
PCB_SCREEN* screen;
|
PCB_SCREEN* screen;
|
||||||
WinEDA_BasePcbFrame* frame;
|
WinEDA_BasePcbFrame* frame;
|
||||||
MODULE* Module = (MODULE*) m_Parent;
|
MODULE* Module = (MODULE*) m_Parent; /* parent must *not* be null
|
||||||
|
* (a module text without a footprint parent has no sense)
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
if( panel == NULL )
|
if( panel == NULL )
|
||||||
|
@ -371,18 +373,16 @@ void TEXTE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode,
|
||||||
pos.x, pos.y + anchor_size, 0, g_AnchorColor );
|
pos.x, pos.y + anchor_size, 0, g_AnchorColor );
|
||||||
}
|
}
|
||||||
|
|
||||||
//@@@@IMB: BIG BIG BUG Here???? May Module be NULL?
|
|
||||||
color = g_DesignSettings.m_LayerColor[Module->GetLayer()];
|
color = g_DesignSettings.m_LayerColor[Module->GetLayer()];
|
||||||
|
|
||||||
|
|
||||||
//@@IMB: Why the next ifs are testing for Module?
|
if( Module->GetLayer() == COPPER_LAYER_N )
|
||||||
if( Module && Module->GetLayer() == COPPER_LAYER_N )
|
|
||||||
{
|
{
|
||||||
if( g_DesignSettings.IsElementVisible( MODULE_TEXT_CU_VISIBLE ) == false )
|
if( g_DesignSettings.IsElementVisible( MODULE_TEXT_CU_VISIBLE ) == false )
|
||||||
return;
|
return;
|
||||||
color = g_ModuleTextCUColor;
|
color = g_ModuleTextCUColor;
|
||||||
}
|
}
|
||||||
else if( Module && Module->GetLayer() == CMP_N )
|
else if( Module->GetLayer() == CMP_N )
|
||||||
{
|
{
|
||||||
if( g_DesignSettings.IsElementVisible( MODULE_TEXT_CMP_VISIBLE ) == false )
|
if( g_DesignSettings.IsElementVisible( MODULE_TEXT_CMP_VISIBLE ) == false )
|
||||||
return;
|
return;
|
||||||
|
@ -419,12 +419,9 @@ int TEXTE_MODULE::GetDrawRotation()
|
||||||
NORMALIZE_ANGLE_POS( rotation );
|
NORMALIZE_ANGLE_POS( rotation );
|
||||||
|
|
||||||
// For angle = 0 .. 180 deg
|
// For angle = 0 .. 180 deg
|
||||||
// if( (rotation > 900 ) && (rotation < 2700 ) ) rotation -= 1800;
|
|
||||||
while( rotation > 900 )
|
while( rotation > 900 )
|
||||||
rotation -= 1800;
|
rotation -= 1800;
|
||||||
|
|
||||||
// For angle = -90 .. 90 deg
|
|
||||||
|
|
||||||
return rotation;
|
return rotation;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -433,13 +430,15 @@ int TEXTE_MODULE::GetDrawRotation()
|
||||||
void TEXTE_MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
|
void TEXTE_MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
|
||||||
{
|
{
|
||||||
MODULE* module = (MODULE*) m_Parent;
|
MODULE* module = (MODULE*) m_Parent;
|
||||||
|
|
||||||
if( module == NULL ) // Happens in modedit, and for new texts
|
if( module == NULL ) // Happens in modedit, and for new texts
|
||||||
return;
|
return;
|
||||||
|
|
||||||
wxString msg, Line;
|
wxString msg, Line;
|
||||||
int ii;
|
int ii;
|
||||||
|
|
||||||
static const wxString text_type_msg[3] = {
|
static const wxString text_type_msg[3] =
|
||||||
|
{
|
||||||
_( "Ref." ), _( "Value" ), _( "Text" )
|
_( "Ref." ), _( "Value" ), _( "Text" )
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ static EDGE_MODULE* gen_arc( MODULE* aModule,
|
||||||
int cX,
|
int cX,
|
||||||
int cY,
|
int cY,
|
||||||
int angle );
|
int angle );
|
||||||
static void ShowCadreSelf( WinEDA_DrawPanel* panel,
|
static void ShowBoundingBoxMicroWaveInductor( WinEDA_DrawPanel* panel,
|
||||||
wxDC* DC,
|
wxDC* DC,
|
||||||
bool erase );
|
bool erase );
|
||||||
|
|
||||||
|
@ -57,8 +57,10 @@ static int Self_On;
|
||||||
static int Bl_X0, Bl_Y0, Bl_Xf, Bl_Yf;
|
static int Bl_X0, Bl_Y0, Bl_Xf, Bl_Yf;
|
||||||
|
|
||||||
|
|
||||||
/* ??? Routine d'affichage a l'ecran du cadre de la self */
|
/* This function shows on screen the bounding box of the inductor that will be
|
||||||
static void ShowCadreSelf( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
|
* created at the end of the build inductor process
|
||||||
|
*/
|
||||||
|
static void ShowBoundingBoxMicroWaveInductor( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
|
||||||
{
|
{
|
||||||
int deltaX, deltaY;
|
int deltaX, deltaY;
|
||||||
|
|
||||||
|
@ -132,7 +134,7 @@ void WinEDA_PcbFrame::Begin_Self( wxDC* DC )
|
||||||
Bl_Xf = Bl_X0;
|
Bl_Xf = Bl_X0;
|
||||||
Bl_Yf = Bl_Y0;
|
Bl_Yf = Bl_Y0;
|
||||||
|
|
||||||
DrawPanel->ManageCurseur = ShowCadreSelf;
|
DrawPanel->ManageCurseur = ShowBoundingBoxMicroWaveInductor;
|
||||||
DrawPanel->ForceCloseManageCurseur = Exit_Self;
|
DrawPanel->ForceCloseManageCurseur = Exit_Self;
|
||||||
DrawPanel->ManageCurseur( DrawPanel, DC, 0 );
|
DrawPanel->ManageCurseur( DrawPanel, DC, 0 );
|
||||||
}
|
}
|
||||||
|
|
|
@ -959,12 +959,10 @@ int ReadListeModules( const wxString& CmpFullFileName, const wxString* RefCmp,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* ??? Fontion copiant en memoire de travail les caracteristiques
|
/* This function add to the current list of footprints found in netlist
|
||||||
* des nouveaux modules
|
* a new MODULEtoLOAD item (a descriptor of footprints)
|
||||||
*/
|
*/
|
||||||
void AddToList( const wxString& NameLibCmp,
|
void AddToList( const wxString& NameLibCmp, const wxString& CmpName, const wxString& path )
|
||||||
const wxString& CmpName,
|
|
||||||
const wxString& path )
|
|
||||||
{
|
{
|
||||||
MODULEtoLOAD* NewMod;
|
MODULEtoLOAD* NewMod;
|
||||||
|
|
||||||
|
|
|
@ -1100,7 +1100,9 @@ static int Retrace( WinEDA_PcbFrame* pcbframe, wxDC* DC,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* ??? appelle la routine OrCell et place la piste reelle sur le pcb */
|
/* This function is used by Retrace and read the autorouting matrix data cells to create
|
||||||
|
* the real track on the physical board
|
||||||
|
*/
|
||||||
static void OrCell_Trace( BOARD* pcb, int col, int row,
|
static void OrCell_Trace( BOARD* pcb, int col, int row,
|
||||||
int side, int orient, int current_net_code )
|
int side, int orient, int current_net_code )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue