Skip to content

K
kicad-source-mirror
Commit 71ca194b authored by charras's avatar charras
Browse files
Options

overbar patch merged mainly in eechema/class_pin.cpp. Some cleanup and compil problem fixes.

parent c6501e7d
Hide whitespace changes
Inline Side-by-side
Showing with 2414 additions and 3417 deletions
3d-viewer/3d_draw.cpp
View file @ 71ca194b
...@@ -493,6 +493,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text ) ...@@ -493,6 +493,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
text->m_Text, text->m_Orient, text->m_Size, text->m_Text, text->m_Orient, text->m_Size,
text->m_HJustify, text->m_VJustify, text->m_HJustify, text->m_VJustify,
text->m_Width, text->m_Italic, text->m_Width, text->m_Italic,
true,
Draw3dTextSegm ); Draw3dTextSegm );
} }
......
CHANGELOG.txt
View file @ 71ca194b
...@@ -4,7 +4,17 @@ KiCad ChangeLog 2009 ...@@ -4,7 +4,17 @@ KiCad ChangeLog 2009
Please add newer entries at the top, list the date and your name with Please add newer entries at the top, list the date and your name with
email address. email address.
2009-xxx-xx UPDATE Wayne Stambaugh <stambaughw@verizon.net> 2009-apr-06 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================
++common:
overbar patch merged in drawtxt.cpp and mainly in eechema/class_pin.cpp
some cleanup and some compiling problems fixed.
++eeschema:
changed dialog_eeschema_config.cpp to use wxFormBuilder to create
the corresponding equivalent dialog in dialog_eeschema_config_fbp.cpp
2009-apr-05 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================ ================================================================================
++All ++All
* Removed all instances #ifdef eda_global, COMMON_GLOBL, and MAIN in order * Removed all instances #ifdef eda_global, COMMON_GLOBL, and MAIN in order
......
common/drawpanel.cpp
View file @ 71ca194b
...@@ -738,19 +738,20 @@ void WinEDA_DrawPanel::DrawBackGround( wxDC* DC ) ...@@ -738,19 +738,20 @@ void WinEDA_DrawPanel::DrawBackGround( wxDC* DC )
for( ii = 0; ; ii++ ) for( ii = 0; ; ii++ )
{ {
xg = wxRound(ii * screen_grid_size.x); xg = wxRound(ii * screen_grid_size.x);
if( xg > size.x )
break;
int xpos = org.x + xg; int xpos = org.x + xg;
xpos = GRMapX( xpos );
for( jj = 0; ; jj++ ) for( jj = 0; ; jj++ )
{ {
yg = wxRound(jj * screen_grid_size.y); yg = wxRound(jj * screen_grid_size.y);
GRPutPixel( &m_ClipBox, DC, xpos, org.y + yg, color );
if( yg > size.y ) if( yg > size.y )
break; break;
int ypos = org.y + yg;
DC->DrawPoint( xpos, GRMapY( ypos ) );
} }
if( xg > size.x ) }
break;
}
} }
/* Draw axis */ /* Draw axis */
......
common/drawtxt.cpp
View file @ 71ca194b
...@@ -20,6 +20,55 @@ ...@@ -20,6 +20,55 @@
#define EDA_DRAWBASE #define EDA_DRAWBASE
#include "grfonte.h" #include "grfonte.h"
/** Function NegableTextLength
* Return the text length of a negable string, excluding the ~ markers */
int NegableTextLength(const wxString& aText)
{
int char_count = aText.length();
/* Fix the character count, removing the ~ found */
for (int i = char_count-1; i >= 0; i--) {
if (aText[i] == '~') {
char_count--;
}
}
return char_count;
}
/* Helper function for drawing character polygons */
static void DrawGraphicTextPline(
WinEDA_DrawPanel* aPanel,
wxDC* aDC,
EDA_Colors aColor,
int aWidth,
bool sketch_mode,
int point_count,
wxPoint *coord,
void (* aCallback) (int x0, int y0, int xf, int yf))
{
if ( aCallback )
{
for( int ik = 0; ik < (point_count - 1); ik ++ )
{
aCallback( coord[ik].x, coord[ik].y,
coord[ik+1].x, coord[ik+1].y );
}
}
else if( sketch_mode )
{
for( int ik = 0; ik < (point_count - 1); ik ++ )
GRCSegm( &aPanel->m_ClipBox, aDC, coord[ik].x, coord[ik].y,
coord[ik+1].x, coord[ik+1].y, aWidth, aColor );
}
else
GRPoly( &aPanel->m_ClipBox, aDC, point_count, coord, 0,
aWidth, aColor, aColor );
}
static int overbar_position(int size_v, int thickness)
{
return size_v*1.1+thickness;
}
/** Function DrawGraphicText /** Function DrawGraphicText
* Draw a graphic text (like module texts) * Draw a graphic text (like module texts)
...@@ -35,6 +84,7 @@ ...@@ -35,6 +84,7 @@
* @param aWidth = line width (pen width) (default = 0) * @param aWidth = line width (pen width) (default = 0)
* if width < 0 : draw segments in sketch mode, width = abs(width) * if width < 0 : draw segments in sketch mode, width = abs(width)
* @param aItalic = true to simulate an italic font * @param aItalic = true to simulate an italic font
* @param aNegable = true to enable the ~ char for overbarring
* @param aCallback() = function called (if non null) to draw each segment. * @param aCallback() = function called (if non null) to draw each segment.
* used to draw 3D texts or for plotting, NULL for normal drawings * used to draw 3D texts or for plotting, NULL for normal drawings
*/ */
...@@ -50,10 +100,11 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, ...@@ -50,10 +100,11 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel,
enum GRTextVertJustifyType aV_justify, enum GRTextVertJustifyType aV_justify,
int aWidth, int aWidth,
bool aItalic, bool aItalic,
bool aNegable,
void (* aCallback) (int x0, int y0, int xf, int yf)) void (* aCallback) (int x0, int y0, int xf, int yf))
/****************************************************************************************************/ /****************************************************************************************************/
{ {
int kk, char_count, AsciiCode; int char_count, AsciiCode;
int x0, y0; int x0, y0;
int size_h, size_v, pitch; int size_h, size_v, pitch;
SH_CODE f_cod, plume = 'U'; SH_CODE f_cod, plume = 'U';
...@@ -62,10 +113,12 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, ...@@ -62,10 +113,12 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel,
int ux0, uy0, dx, dy; // Draw coordinate for segments to draw. also used in some other calculation int ux0, uy0, dx, dy; // Draw coordinate for segments to draw. also used in some other calculation
int cX, cY; // Texte center int cX, cY; // Texte center
int ox, oy; // Draw coordinates for the current char int ox, oy; // Draw coordinates for the current char
int overbar_x, overbar_y; // Start point for the current overbar
int overbars; // Number of ~ seen
#define BUF_SIZE 100 #define BUF_SIZE 100
wxPoint coord[BUF_SIZE+1]; // Buffer coordinate used to draw polylines (one char shape) wxPoint coord[BUF_SIZE+1]; // Buffer coordinate used to draw polylines (one char shape)
bool sketch_mode = false; bool sketch_mode = false;
bool italic_reverse = false; // true for mirrored texts with m_Size.x < 0 bool italic_reverse = false; // true for mirrored texts with m_Size.x < 0
size_h = aSize.x; size_h = aSize.x;
size_v = aSize.y; size_v = aSize.y;
...@@ -76,21 +129,22 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, ...@@ -76,21 +129,22 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel,
sketch_mode = true; sketch_mode = true;
} }
int thickness = aWidth; int thickness = aWidth;
if ( aSize.x < 0 ) // text is mirrored using size.x < 0 (mirror / Y axis) if ( aSize.x < 0 ) // text is mirrored using size.x < 0 (mirror / Y axis)
italic_reverse = true; italic_reverse = true;
kk = 0;
ptr = 0; /* ptr = text index */
char_count = aText.Len(); if (aNegable) {
char_count = NegableTextLength(aText);
} else {
char_count = aText.Len();
}
if( char_count == 0 ) if( char_count == 0 )
return; return;
pitch = (10 * size_h ) / 9; // this is the pitch between chars pitch = (10 * size_h ) / 9; // this is the pitch between chars
if ( pitch > 0 ) if ( pitch > 0 )
pitch += ABS(thickness); pitch += thickness;
else else
pitch -= ABS(thickness); pitch -= thickness;
ox = cX = aPos.x; ox = cX = aPos.x;
oy = cY = aPos.y; oy = cY = aPos.y;
...@@ -220,17 +274,44 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, ...@@ -220,17 +274,44 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel,
return; return;
} }
while( kk++ < char_count ) overbars = 0;
ptr = 0; /* ptr = text index */
while( ptr < char_count )
{ {
x0 = 0; y0 = 0; if (aNegable) {
if (aText[ptr+overbars] == '~') {
/* Found an overbar, adjust the pointers */
overbars++;
if (overbars % 2) {
/* Starting the overbar */
overbar_x = ox;
overbar_y = oy-overbar_position(size_v, thickness);
RotatePoint( &overbar_x, &overbar_y, cX, cY, aOrient );
} else {
/* Ending the overbar */
coord[0].x = overbar_x;
coord[0].y = overbar_y;
overbar_x = ox;
overbar_y = oy-overbar_position(size_v, thickness);
RotatePoint( &overbar_x, &overbar_y, cX, cY, aOrient );
coord[1].x = overbar_x;
coord[1].y = overbar_y;
/* Plot the overbar segment */
DrawGraphicTextPline(aPanel, aDC, aColor, aWidth,
sketch_mode, 2, coord, aCallback);
}
continue; /* Skip ~ processing */
}
}
#if defined(wxUSE_UNICODE) && defined(KICAD_CYRILLIC) #if defined(wxUSE_UNICODE) && defined(KICAD_CYRILLIC)
AsciiCode = aText.GetChar(ptr) & 0x7FF; AsciiCode = aText.GetChar(ptr+overbars) & 0x7FF;
if ( AsciiCode > 0x40F && AsciiCode < 0x450 ) // big small Cyr if ( AsciiCode > 0x40F && AsciiCode < 0x450 ) // big small Cyr
AsciiCode = utf8_to_ascii[AsciiCode - 0x410] & 0xFF; AsciiCode = utf8_to_ascii[AsciiCode - 0x410] & 0xFF;
else else
AsciiCode = AsciiCode & 0xFF; AsciiCode = AsciiCode & 0xFF;
#else #else
AsciiCode = aText.GetChar( ptr ) & 0xFF; AsciiCode = aText.GetChar(ptr+overbars) & 0xFF;
#endif #endif
ptcar = graphic_fonte_shape[AsciiCode]; /* ptcar pointe la description ptcar = graphic_fonte_shape[AsciiCode]; /* ptcar pointe la description
* du caractere a dessiner */ * du caractere a dessiner */
...@@ -253,24 +334,8 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, ...@@ -253,24 +334,8 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel,
{ {
if( aWidth <= 1 ) if( aWidth <= 1 )
aWidth = 0; aWidth = 0;
if ( aCallback ) DrawGraphicTextPline(aPanel, aDC, aColor, aWidth,
{ sketch_mode, point_count, coord, aCallback);
for( int ik = 0; ik < (point_count - 1); ik ++ )
{
aCallback( coord[ik].x, coord[ik].y,
coord[ik+1].x, coord[ik+1].y );
}
}
else if( sketch_mode )
{
for( int ik = 0; ik < (point_count - 1); ik ++ )
GRCSegm( &aPanel->m_ClipBox, aDC, coord[ik].x, coord[ik].y,
coord[ik+1].x, coord[ik+1].y, aWidth, aColor );
}
else
GRPoly( &aPanel->m_ClipBox, aDC, point_count, coord, 0,
aWidth, aColor, aColor );
} }
plume = f_cod; point_count = 0; plume = f_cod; point_count = 0;
break; break;
...@@ -311,6 +376,19 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, ...@@ -311,6 +376,19 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel,
ptr++; ox += pitch; ptr++; ox += pitch;
} }
if (overbars % 2) {
/* Close the last overbar */
coord[0].x = overbar_x;
coord[0].y = overbar_y;
overbar_x = ox;
overbar_y = oy-overbar_position(size_v, thickness);
RotatePoint( &overbar_x, &overbar_y, cX, cY, aOrient );
coord[1].x = overbar_x;
coord[1].y = overbar_y;
/* Plot the overbar segment */
DrawGraphicTextPline(aPanel, aDC, aColor, aWidth,
sketch_mode, 2, coord, aCallback);
}
} }
...@@ -375,6 +453,7 @@ s_Callback_plot(int x0, ...@@ -375,6 +453,7 @@ s_Callback_plot(int x0,
* @param aWidth = line width (pen width) (default = 0) * @param aWidth = line width (pen width) (default = 0)
* if width < 0 : draw segments in sketch mode, width = abs(width) * if width < 0 : draw segments in sketch mode, width = abs(width)
* @param aItalic = true to simulate an italic font * @param aItalic = true to simulate an italic font
* @param aNegable = true to enable the ~ char for overbarring
*/ */
/******************************************************************************************/ /******************************************************************************************/
void PlotGraphicText( int aFormat_plot, void PlotGraphicText( int aFormat_plot,
...@@ -386,7 +465,8 @@ void PlotGraphicText( int aFormat_plot, ...@@ -386,7 +465,8 @@ void PlotGraphicText( int aFormat_plot,
enum GRTextHorizJustifyType aH_justify, enum GRTextHorizJustifyType aH_justify,
enum GRTextVertJustifyType aV_justify, enum GRTextVertJustifyType aV_justify,
int aWidth, int aWidth,
bool aItalic ) bool aItalic,
bool aNegable)
/******************************************************************************************/ /******************************************************************************************/
{ {
// Initialise the actual function used to plot lines: // Initialise the actual function used to plot lines:
...@@ -415,7 +495,7 @@ void PlotGraphicText( int aFormat_plot, ...@@ -415,7 +495,7 @@ void PlotGraphicText( int aFormat_plot,
DrawGraphicText( NULL, NULL, aPos, aColor, aText, DrawGraphicText( NULL, NULL, aPos, aColor, aText,
aOrient, aSize, aOrient, aSize,
aH_justify, aV_justify, aH_justify, aV_justify,
aWidth, aItalic, aWidth, aItalic, aNegable,
s_Callback_plot); s_Callback_plot);
/* end text : pen UP ,no move */ /* end text : pen UP ,no move */
......
common/makefile.include
View file @ 71ca194b
EXTRACPPFLAGS += -I$(SYSINCLUDE) -I./ -Ibitmaps -I../include -I../polygon EXTRACPPFLAGS += -I$(SYSINCLUDE) -I./ -Ibitmaps -I../include -I../polygon
COMMON = ../include/colors.h PCBINCL = -I../pcbnew -I../polygon -I../3d-viewer
PCBINCL = -I../pcbnew -I../polygon COMMON_OBJECTS= \
about_kicad.o\
OBJECTS= \ base_screen.o\
about_kicad.o\ base_struct.o\
base_struct.o\ basicframe.o\
basicframe.o\ block_commande.o\
drawframe.o\ class_drawpickedstruct.o\
confirm.o \ common.o\
copy_to_clipboard.o\ common_plot_functions.o\
class_drawpickedstruct.o\ common_plotHPGL_functions.o\
common_plot_functions.o\ common_plotPS_functions.o\
common_plotGERBER_functions.o\ common_plotGERBER_functions.o\
common_plotPS_functions.o\ confirm.o\
common_plotHPGL_functions.o\ copy_to_clipboard.o\
dlist.o \ dcsvg.o\
hotkeys_basic.o\ displlst.o\
drawtxt.o \ dlist.o\
drawframe.o\
drawpanel.o\ drawpanel.o\
wxwineda.o \ drawtxt.o\
string.o \ edaappl.o\
gr_basic.o\ eda_dde.o\
gestfich.o\ eda_doc.o\
trigo.o\ gestfich.o\
selcolor.o\ get_component_dialog.o\
common.o\ gr_basic.o\
eda_doc.o\ hotkeys_basic.o\
toolbars.o\ msgpanel.o\
displlst.o \ projet_config.o\
edaappl.o\ selcolor.o\
block_commande.o\ string.o\
msgpanel.o\ toolbars.o\
projet_config.o\ trigo.o\
get_component_dialog.o\ worksheet.o\
eda_dde.o\ wxwineda.o\
worksheet.o\ zoom.o
base_screen.o\
dcsvg.o\
zoom.o\ PCB_COMMON_OBJECTS =\
pcbcommon.o\
basepcbframe.o\ basepcbframe.o\
class_board.o\ class_board.o\
class_board_connected_item.o\ class_board_connected_item.o\
class_board_item.o\
class_cotation.o\ class_cotation.o\
class_drawsegment.o\
class_drc_item.o\ class_drc_item.o\
class_edge_mod.o\
class_equipot.o\
class_marker.o\ class_marker.o\
class_mire.o\ class_mire.o\
class_module.o\
class_pad.o\ class_pad.o\
class_pad_draw_functions.o\ class_pad_draw_functions.o\
class_pcb_text.o\ class_pcb_text.o\
class_text_mod.o\
class_track.o\
class_zone.o\ class_zone.o\
class_zone_setting.o\ class_zone_setting.o\
classpcb.o\ classpcb.o\
collectors.o\ collectors.o\
sel_layer.o\ sel_layer.o\
tracemod.o\
dialog_print_using_printer_base.o dialog_print_using_printer_base.o
ifdef KICAD_PYTHON ifdef KICAD_PYTHON
OBJECTS += pyhandler.o COMMON_OBJECTS += pyhandler.o
pyhandler.o: pyhandler.cpp $(COMMON) ../include/pyhandler.h pyhandler.o: pyhandler.cpp ../include/pyhandler.h
endif endif
pcbcommon.o: pcbcommon.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ $*.cpp
basepcbframe.o: ../pcbnew/basepcbframe.cpp basepcbframe.o: ../pcbnew/basepcbframe.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp $(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_board.o: ../pcbnew/class_board.cpp class_board.o: ../pcbnew/class_board.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp $(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_board_item.o: ../pcbnew/class_board_item.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_drawsegment.o: ../pcbnew/class_drawsegment.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_edge_mod.o: ../pcbnew/class_edge_mod.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_equipot.o: ../pcbnew/class_equipot.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_module.o: ../pcbnew/class_module.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_text_mod.o: ../pcbnew/class_text_mod.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_board_connected_item.o: ../pcbnew/class_board_connected_item.cpp class_board_connected_item.o: ../pcbnew/class_board_connected_item.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp $(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
...@@ -94,6 +125,12 @@ class_pad_draw_functions.o: ../pcbnew/class_pad_draw_functions.cpp ...@@ -94,6 +125,12 @@ class_pad_draw_functions.o: ../pcbnew/class_pad_draw_functions.cpp
class_pcb_text.o: ../pcbnew/class_pcb_text.cpp class_pcb_text.o: ../pcbnew/class_pcb_text.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp $(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_track.o: ../pcbnew/class_track.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
tracemod.o: ../pcbnew/tracemod.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_zone.o: ../pcbnew/class_zone.cpp class_zone.o: ../pcbnew/class_zone.cpp
$(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp $(CXX) $(PCBINCL) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
...@@ -114,41 +151,41 @@ dialog_print_using_printer_base.o: ../pcbnew/dialog_print_using_printer_base.cpp ...@@ -114,41 +151,41 @@ dialog_print_using_printer_base.o: ../pcbnew/dialog_print_using_printer_base.cpp
gr_basic.o: gr_basic.cpp ../include/gr_basic.h $(DEPEND) gr_basic.o: gr_basic.cpp ../include/gr_basic.h $(DEPEND)
confirm.o: confirm.cpp $(COMMON) confirm.o: confirm.cpp
hotkeys_basic.o: hotkeys_basic.cpp ../include/hotkeys_basic.h $(COMMON) hotkeys_basic.o: hotkeys_basic.cpp ../include/hotkeys_basic.h
worksheet.o: worksheet.cpp ../include/worksheet.h $(COMMON) worksheet.o: worksheet.cpp ../include/worksheet.h
selcolor.o: selcolor.cpp ../include/colors.h $(COMMON) selcolor.o: selcolor.cpp ../include/colors.h
get_component_dialog.o: get_component_dialog.cpp $(COMMON) get_component_dialog.o: get_component_dialog.cpp
common_plotPS_functions.o: common_plotPS_functions.cpp ../include/plot_common.h $(COMMON) common_plotPS_functions.o: common_plotPS_functions.cpp ../include/plot_common.h
common_plotHPGL_functions.o: common_plotPS_functions.cpp ../include/plot_common.h $(COMMON) common_plotHPGL_functions.o: common_plotPS_functions.cpp ../include/plot_common.h
drawtxt.o: drawtxt.cpp ../include/grfonte.h $(COMMON) drawtxt.o: drawtxt.cpp ../include/grfonte.h
gr_basic.o: gr_basic.cpp ../include/gr_basic.h $(COMMON) ../include/plot_common.h gr_basic.o: gr_basic.cpp ../include/gr_basic.h ../include/plot_common.h
dcsvg.o: dcsvg.cpp $(COMMON) ../include/dcsvg.h dcsvg.o: dcsvg.cpp ../include/dcsvg.h
projet_config.o: projet_config.cpp $(COMMON) projet_config.o: projet_config.cpp
base_struct.o: base_struct.cpp $(COMMON) base_struct.o: base_struct.cpp
eda_doc.o: eda_doc.cpp $(COMMON) eda_doc.o: eda_doc.cpp
common.o: common.cpp $(COMMON) common.o: common.cpp
gestfich.o: gestfich.cpp $(COMMON) gestfich.o: gestfich.cpp
toolbars.o: toolbars.cpp $(COMMON) toolbars.o: toolbars.cpp
msgpanel.o: msgpanel.cpp $(COMMON) msgpanel.o: msgpanel.cpp
block_commande.o: block_commande.cpp $(COMMON) block_commande.o: block_commande.cpp
string.o: string.cpp string.o: string.cpp
...@@ -156,10 +193,10 @@ trigo.o: trigo.cpp ../include/trigo.h ...@@ -156,10 +193,10 @@ trigo.o: trigo.cpp ../include/trigo.h
bitmaps.o: bitmaps.cpp ../include/bitmaps.h bitmaps.o: bitmaps.cpp ../include/bitmaps.h
edaappl.o: edaappl.cpp $(COMMON) ../include/worksheet.h\ edaappl.o: edaappl.cpp ../include/worksheet.h\
../include/common.h ../include/gr_basic.h\ ../include/common.h ../include/gr_basic.h\
../include/build_version.h ../include/build_version.h
eda_dde.o: eda_dde.cpp $(COMMON) ../include/eda_dde.h eda_dde.o: eda_dde.cpp ../include/eda_dde.h
displlst.o: displlst.cpp $(COMMON) displlst.o: displlst.cpp
common/makefile.g95 → common/makefile.mingw
View file @ 71ca194b
...@@ -6,10 +6,18 @@ include ../libs.win ...@@ -6,10 +6,18 @@ include ../libs.win
include makefile.include include makefile.include
common.a: $(OBJECTS) ../libs.win makefile.include all: common.a pcbcommon.a
ar ruv $@ $(OBJECTS)
common.a: $(COMMON_OBJECTS) ../libs.win makefile.include
ar ruv $@ $(COMMON_OBJECTS)
ranlib $@ ranlib $@
pcbcommon.a: $(PCB_COMMON_OBJECTS) ../libs.win makefile.include
ar ruv $@ $(PCB_COMMON_OBJECTS)
ranlib $@
clean: clean:
rm -f *.bak rm -f *.bak
rm -f *.o rm -f *.o
......
common/sch_item_struct.cpp
View file @ 71ca194b
/****************************************************/ /************************/
/* class_drawpickedstruct.cpp */ /* sch_item_struct.cpp */
/****************************************************/ /************************/
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
......
cvpcb/loadcmp.cpp
View file @ 71ca194b
...@@ -35,7 +35,6 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName ) ...@@ -35,7 +35,6 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName )
wxString tmp, msg; wxString tmp, msg;
wxFileName fn; wxFileName fn;
MODULE* Module = NULL; MODULE* Module = NULL;
FILE* file;
for( ii = 0; ii < g_LibName_List.GetCount(); ii++ ) for( ii = 0; ii < g_LibName_List.GetCount(); ii++ )
{ {
...@@ -54,7 +53,7 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName ) ...@@ -54,7 +53,7 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName )
continue; continue;
} }
file = wxFopen( tmp, wxT( "rt" ) ); FILE* file = wxFopen( tmp, wxT( "rt" ) );
if( file == NULL ) if( file == NULL )
{ {
...@@ -131,12 +130,9 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName ) ...@@ -131,12 +130,9 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName )
} }
fclose( file ); fclose( file );
file = 0; file = NULL;
} }
if( file )
fclose( file );
msg.Printf( _( "Module %s not found" ), CmpName.GetData() ); msg.Printf( _( "Module %s not found" ), CmpName.GetData() );
DisplayError( this, msg ); DisplayError( this, msg );
return NULL; return NULL;
......
cvpcb/makefile.include
View file @ 71ca194b
...@@ -4,7 +4,7 @@ OBJSUFF = o ...@@ -4,7 +4,7 @@ OBJSUFF = o
EXTRACPPFLAGS += -DCVPCB -I../include -Ibitmaps\ EXTRACPPFLAGS += -DCVPCB -I../include -Ibitmaps\
-I../pcbnew -I../cvpcb -I../share -I../3d-viewer -I ../polygon -I../pcbnew -I../cvpcb -I../share -I../3d-viewer -I ../polygon
EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a\ EXTRALIBS = ../common/common.a ../common/pcbcommon.a ../bitmaps/libbitmaps.a\
../polygon/lib_polygon.a\ ../polygon/lib_polygon.a\
../polygon/kbool/src/libkbool.a ../polygon/kbool/src/libkbool.a
......
cvpcb/makefile.g95 → cvpcb/makefile.mingw
View file @ 71ca194b
...@@ -12,7 +12,7 @@ include ../libs.win ...@@ -12,7 +12,7 @@ include ../libs.win
$(TARGET).exe: $(OBJECTS) $(TARGET)_resources.o\ $(TARGET).exe: $(OBJECTS) $(TARGET)_resources.o\
$(EDALIBS) $(LIBVIEWER3D) makefile.g95 $(EDALIBS) $(LIBVIEWER3D) makefile.mingw
$(CXX) $(ALL_LDFLAGS) -o $(TARGET).exe\ $(CXX) $(ALL_LDFLAGS) -o $(TARGET).exe\
$(OBJECTS) $(LIBVIEWER3D) $(TARGET)_resources.o $(EDALIBS) $(SYSWXLIB) $(OBJECTS) $(LIBVIEWER3D) $(TARGET)_resources.o $(EDALIBS) $(SYSWXLIB)
......
eeschema/CMakeLists.txt
View file @ 71ca194b
...@@ -48,6 +48,7 @@ set(EESCHEMA_SRCS ...@@ -48,6 +48,7 @@ set(EESCHEMA_SRCS
dialog_edit_libentry_fields_in_lib.cpp dialog_edit_libentry_fields_in_lib.cpp
dialog_edit_libentry_fields_in_lib_base.cpp dialog_edit_libentry_fields_in_lib_base.cpp
dialog_eeschema_config.cpp dialog_eeschema_config.cpp
dialog_eeschema_config_fbp.cpp
dialog_erc.cpp dialog_erc.cpp
# dialog_find.cpp # dialog_find.cpp
dialog_options.cpp dialog_options.cpp
......
eeschema/class_hierarchical_PIN_sheet.cpp
View file @ 71ca194b
...@@ -98,7 +98,7 @@ void Hierarchical_PIN_Sheet_Struct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, con ...@@ -98,7 +98,7 @@ void Hierarchical_PIN_Sheet_Struct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, con
} }
DrawGraphicText( panel, DC, wxPoint( tposx, posy ), txtcolor, DrawGraphicText( panel, DC, wxPoint( tposx, posy ), txtcolor,
m_Text, TEXT_ORIENT_HORIZ, size, m_Text, TEXT_ORIENT_HORIZ, size,
side, GR_TEXT_VJUSTIFY_CENTER, LineWidth ); side, GR_TEXT_VJUSTIFY_CENTER, LineWidth, false, true );
} }
/* dessin du symbole de connexion */ /* dessin du symbole de connexion */
......
eeschema/class_pin.cpp
View file @ 71ca194b
...@@ -17,16 +17,17 @@ ...@@ -17,16 +17,17 @@
LibDrawPin::LibDrawPin() : LibEDA_BaseStruct( COMPONENT_PIN_DRAW_TYPE ) LibDrawPin::LibDrawPin() : LibEDA_BaseStruct( COMPONENT_PIN_DRAW_TYPE )
{ {
m_PinLen = 300; /* default Pin len */ m_PinLen = 300; /* default Pin len */
m_Orient = PIN_RIGHT; /* Pin oprient: Up, Down, Left, Right */ m_Orient = PIN_RIGHT; /* Pin oprient: Up, Down, Left, Right */
m_PinShape = NONE; /* Bit a bit: Pin shape (voir enum prec) */ m_PinShape = NONE; /* Bit a bit: Pin shape (voir enum prec) */
m_PinType = PIN_UNSPECIFIED; /* electrical type of pin */ m_PinType = PIN_UNSPECIFIED; /* electrical type of pin */
m_Attributs = 0; /* bit 0 != 0: pin invisible */ m_Attributs = 0; /* bit 0 != 0: pin invisible */
m_PinNum = 0; /*pin number ( i.e. 4 codes Ascii ) */ m_PinNum = 0; /*pin number ( i.e. 4 codes Ascii ) */
m_PinNumSize = 50; m_PinNumSize = 50;
m_PinNameSize = 50; /* Default size for pin name and num */ m_PinNameSize = 50; /* Default size for pin name and num */
m_Width = 0; m_Width = 0;
m_typeName = _( "Pin" ); m_typeName = _( "Pin" );
// m_PinNumWidth = m_PinNameWidth = 0; // Unused // m_PinNumWidth = m_PinNameWidth = 0; // Unused
} }
...@@ -42,30 +43,39 @@ bool LibDrawPin::Save( FILE* ExportFile ) const ...@@ -42,30 +43,39 @@ bool LibDrawPin::Save( FILE* ExportFile ) const
case PIN_INPUT: case PIN_INPUT:
Etype = 'I'; Etype = 'I';
break; break;
case PIN_OUTPUT: case PIN_OUTPUT:
Etype = 'O'; Etype = 'O';
break; break;
case PIN_BIDI: case PIN_BIDI:
Etype = 'B'; Etype = 'B';
break; break;
case PIN_TRISTATE: case PIN_TRISTATE:
Etype = 'T'; Etype = 'T';
break; break;
case PIN_PASSIVE: case PIN_PASSIVE:
Etype = 'P'; Etype = 'P';
break; break;
case PIN_UNSPECIFIED: case PIN_UNSPECIFIED:
Etype = 'U'; Etype = 'U';
break; break;
case PIN_POWER_IN: case PIN_POWER_IN:
Etype = 'W'; Etype = 'W';
break; break;
case PIN_POWER_OUT: case PIN_POWER_OUT:
Etype = 'w'; Etype = 'w';
break; break;
case PIN_OPENCOLLECTOR: case PIN_OPENCOLLECTOR:
Etype = 'C'; Etype = 'C';
break; break;
case PIN_OPENEMITTER: case PIN_OPENEMITTER:
Etype = 'E'; Etype = 'E';
break; break;
...@@ -105,7 +115,7 @@ bool LibDrawPin::Save( FILE* ExportFile ) const ...@@ -105,7 +115,7 @@ bool LibDrawPin::Save( FILE* ExportFile ) const
bool LibDrawPin::Load( char* line, wxString& errorMsg ) bool LibDrawPin::Load( char* line, wxString& errorMsg )
{ {
int i, j; int i, j;
char pinAttrs[64]; char pinAttrs[64];
char pinName[256]; char pinName[256];
char pinNum[64]; char pinNum[64];
...@@ -217,14 +227,18 @@ bool LibDrawPin::Load( char* line, wxString& errorMsg ) ...@@ -217,14 +227,18 @@ bool LibDrawPin::Load( char* line, wxString& errorMsg )
} }
void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, /**********************************************************************************************/
const wxPoint& aOffset, int aColor, void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel,
int aDrawMode, void* aData, wxDC* aDC,
const int aTransformMatrix[2][2] ) const wxPoint& aOffset,
int aColor,
int aDrawMode,
void* aData,
const int aTransformMatrix[2][2] )
/**********************************************************************************************/
{ {
// Invisibles pins are only drawn on request. // Invisibles pins are only drawn on request.
// But in libedit they are drawn in g_InvisibleItemColor because we must // But in libedit they are drawn in g_InvisibleItemColor because we must see them
// see them
WinEDA_SchematicFrame* frame = WinEDA_SchematicFrame* frame =
(WinEDA_SchematicFrame*) wxGetApp().GetTopWindow(); (WinEDA_SchematicFrame*) wxGetApp().GetTopWindow();
...@@ -236,7 +250,6 @@ void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -236,7 +250,6 @@ void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
return; return;
} }
EDA_LibComponentStruct* Entry = ( (DrawPinPrms*) aData )->m_Entry; EDA_LibComponentStruct* Entry = ( (DrawPinPrms*) aData )->m_Entry;
bool DrawPinText = ( (DrawPinPrms*) aData )->m_DrawPinText; bool DrawPinText = ( (DrawPinPrms*) aData )->m_DrawPinText;
...@@ -251,30 +264,36 @@ void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -251,30 +264,36 @@ void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
if( DrawPinText ) if( DrawPinText )
{ {
DrawPinTexts( aPanel, aDC, pos1, orient, Entry->m_TextInside, DrawPinTexts( aPanel, aDC, pos1, orient,
Entry->m_TextInside,
Entry->m_DrawPinNum, Entry->m_DrawPinName, Entry->m_DrawPinNum, Entry->m_DrawPinName,
aColor, aDrawMode ); aColor, aDrawMode );
} }
} }
/* Draw the pin symbol (without texts) /** Function DrawPinSymbol
* Draw the pin symbol (without texts)
* if Color != 0 draw with Color, else with the normal pin color * if Color != 0 draw with Color, else with the normal pin color
*/ */
void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC, void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel,
const wxPoint& aPinPos, int aOrient, wxDC* aDC,
int aDrawMode, int aColor ) const wxPoint& aPinPos,
int aOrient,
int aDrawMode,
int aColor )
{ {
int MapX1, MapY1, x1, y1; int MapX1, MapY1, x1, y1;
int color; int color;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = MAX( m_Width, g_DrawMinimunLineWidth );
int posX = aPinPos.x, posY = aPinPos.y, len = m_PinLen; int posX = aPinPos.x, posY = aPinPos.y, len = m_PinLen;
BASE_SCREEN* screen = aPanel->GetScreen(); BASE_SCREEN* screen = aPanel->GetScreen();
color = ReturnLayerColor( LAYER_PIN ); color = ReturnLayerColor( LAYER_PIN );
if( aColor < 0 ) // Used normal color or selected color if( aColor < 0 ) // Used normal color or selected color
{ {
if( m_Selected & IS_SELECTED ) if( (m_Selected & IS_SELECTED) )
color = g_ItemSelectetColor; color = g_ItemSelectetColor;
} }
else else
...@@ -282,38 +301,32 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -282,38 +301,32 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC,
GRSetDrawMode( aDC, aDrawMode ); GRSetDrawMode( aDC, aDrawMode );
MapX1 = MapY1 = 0; MapX1 = MapY1 = 0; x1 = posX; y1 = posY;
x1 = posX;
y1 = posY;
switch( aOrient ) switch( aOrient )
{ {
case PIN_UP: case PIN_UP:
y1 = posY - len; y1 = posY - len; MapY1 = 1;
MapY1 = 1;
break; break;
case PIN_DOWN: case PIN_DOWN:
y1 = posY + len; y1 = posY + len; MapY1 = -1;
MapY1 = -1;
break; break;
case PIN_LEFT: case PIN_LEFT:
x1 = posX - len; x1 = posX - len, MapX1 = 1;
MapX1 = 1;
break; break;
case PIN_RIGHT: case PIN_RIGHT:
x1 = posX + len; x1 = posX + len; MapX1 = -1;
MapX1 = -1;
break; break;
} }
if( m_PinShape & INVERT ) if( m_PinShape & INVERT )
{ {
GRCircle( &aPanel->m_ClipBox, aDC, MapX1 * INVERT_PIN_RADIUS + x1, GRCircle( &aPanel->m_ClipBox, aDC, MapX1 * INVERT_PIN_RADIUS + x1,
MapY1 * INVERT_PIN_RADIUS + y1, INVERT_PIN_RADIUS, width, MapY1 * INVERT_PIN_RADIUS + y1,
color ); INVERT_PIN_RADIUS, width, color );
GRMoveTo( MapX1 * INVERT_PIN_RADIUS * 2 + x1, GRMoveTo( MapX1 * INVERT_PIN_RADIUS * 2 + x1,
MapY1 * INVERT_PIN_RADIUS * 2 + y1 ); MapY1 * INVERT_PIN_RADIUS * 2 + y1 );
...@@ -330,17 +343,33 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -330,17 +343,33 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC,
if( MapY1 == 0 ) /* MapX1 = +- 1 */ if( MapY1 == 0 ) /* MapX1 = +- 1 */
{ {
GRMoveTo( x1, y1 + CLOCK_PIN_DIM ); GRMoveTo( x1, y1 + CLOCK_PIN_DIM );
GRLineTo( &aPanel->m_ClipBox, aDC, x1 - MapX1 * CLOCK_PIN_DIM, GRLineTo( &aPanel->m_ClipBox,
y1, width, color ); aDC,
GRLineTo( &aPanel->m_ClipBox, aDC, x1, y1 - CLOCK_PIN_DIM, width, x1 - MapX1 * CLOCK_PIN_DIM,
y1,
width,
color );
GRLineTo( &aPanel->m_ClipBox,
aDC,
x1,
y1 - CLOCK_PIN_DIM,
width,
color ); color );
} }
else /* MapX1 = 0 */ else /* MapX1 = 0 */
{ {
GRMoveTo( x1 + CLOCK_PIN_DIM, y1 ); GRMoveTo( x1 + CLOCK_PIN_DIM, y1 );
GRLineTo( &aPanel->m_ClipBox, aDC, x1, y1 - MapY1 * CLOCK_PIN_DIM, GRLineTo( &aPanel->m_ClipBox,
width, color ); aDC,
GRLineTo( &aPanel->m_ClipBox, aDC, x1 - CLOCK_PIN_DIM, y1, width, x1,
y1 - MapY1 * CLOCK_PIN_DIM,
width,
color );
GRLineTo( &aPanel->m_ClipBox,
aDC,
x1 - CLOCK_PIN_DIM,
y1,
width,
color ); color );
} }
} }
...@@ -350,9 +379,12 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -350,9 +379,12 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC,
if( MapY1 == 0 ) /* MapX1 = +- 1 */ if( MapY1 == 0 ) /* MapX1 = +- 1 */
{ {
GRMoveTo( x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2, y1 ); GRMoveTo( x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2, y1 );
GRLineTo( &aPanel->m_ClipBox, aDC, GRLineTo( &aPanel->m_ClipBox,
aDC,
x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2, x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2,
y1 - IEEE_SYMBOL_PIN_DIM, width, color ); y1 - IEEE_SYMBOL_PIN_DIM,
width,
color );
GRLineTo( &aPanel->m_ClipBox, aDC, x1, y1, width, color ); GRLineTo( &aPanel->m_ClipBox, aDC, x1, y1, width, color );
} }
else /* MapX1 = 0 */ else /* MapX1 = 0 */
...@@ -370,22 +402,36 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -370,22 +402,36 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC,
if( MapY1 == 0 ) /* MapX1 = +- 1 */ if( MapY1 == 0 ) /* MapX1 = +- 1 */
{ {
GRMoveTo( x1, y1 - IEEE_SYMBOL_PIN_DIM ); GRMoveTo( x1, y1 - IEEE_SYMBOL_PIN_DIM );
GRLineTo( &aPanel->m_ClipBox, aDC, GRLineTo( &aPanel->m_ClipBox,
x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2, y1, width, color ); aDC,
x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2,
y1,
width,
color );
} }
else /* MapX1 = 0 */ else /* MapX1 = 0 */
{ {
GRMoveTo( x1 - IEEE_SYMBOL_PIN_DIM, y1 ); GRMoveTo( x1 - IEEE_SYMBOL_PIN_DIM, y1 );
GRLineTo( &aPanel->m_ClipBox, aDC, x1, GRLineTo( &aPanel->m_ClipBox,
y1 + MapY1 * IEEE_SYMBOL_PIN_DIM * 2, width, color ); aDC,
x1,
y1 + MapY1 * IEEE_SYMBOL_PIN_DIM * 2,
width,
color );
} }
} }
/* Draw the pin end target (active end of the pin) */ /* Draw the pin end target (active end of the pin)
/* Draw but do not print the pin end target 1 pixel width */ * Draw but do not print the pin end target 1 pixel width
*/
if( !screen->m_IsPrinting ) if( !screen->m_IsPrinting )
GRCircle( &aPanel->m_ClipBox, aDC, posX, posY, TARGET_PIN_DIAM, GRCircle( &aPanel->m_ClipBox,
0, color ); aDC,
posX,
posY,
TARGET_PIN_DIAM,
0,
color );
} }
...@@ -397,195 +443,131 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -397,195 +443,131 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, wxDC* aDC,
* If TextInside then the text is been put inside,otherwise all is drawn outside. * If TextInside then the text is been put inside,otherwise all is drawn outside.
* Pin Name: substring beteween '~' is negated * Pin Name: substring beteween '~' is negated
*****************************************************************************/ *****************************************************************************/
void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
wxDC* DC,
wxPoint& pin_pos,
int orient,
int TextInside,
bool DrawPinNum,
bool DrawPinName,
int Color,
int DrawMode )
/* DrawMode = GR_OR, XOR ... */ /* DrawMode = GR_OR, XOR ... */
void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, wxDC* DC,
wxPoint& pin_pos, int orient,
int TextInside, bool DrawPinNum,
bool DrawPinName, int Color, int DrawMode )
{ {
int ii, x, y, x1, y1, dx, dy, len; int x, y, x1, y1;
wxString StringPinNum; wxString StringPinNum;
wxString PinText; EDA_Colors NameColor, NumColor;
int PinTextBarPos[256]; int PinTxtLen;
int PinTextBarCount;
EDA_Colors NameColor, NumColor;
int PinTxtLen;
wxSize PinNameSize( m_PinNameSize, m_PinNameSize ); wxSize PinNameSize( m_PinNameSize, m_PinNameSize );
wxSize PinNumSize( m_PinNumSize, m_PinNumSize ); wxSize PinNumSize( m_PinNumSize, m_PinNumSize );
int LineWidth = g_DrawMinimunLineWidth; int LineWidth = g_DrawMinimunLineWidth;
GRSetDrawMode( DC, DrawMode ); GRSetDrawMode( DC, DrawMode );
/* Get the num and name colors */ /* Get the num and name colors */
if( (Color < 0) && (m_Selected & IS_SELECTED) ) if( (Color < 0) && (m_Selected & IS_SELECTED) )
Color = g_ItemSelectetColor; Color = g_ItemSelectetColor;
NameColor = (EDA_Colors) ( ( Color == -1 ) ? NameColor = (EDA_Colors) (Color == -1 ? ReturnLayerColor( LAYER_PINNAM ) : Color);
ReturnLayerColor( LAYER_PINNAM ) : Color ); NumColor = (EDA_Colors) (Color == -1 ? ReturnLayerColor( LAYER_PINNUM ) : Color);
NumColor = (EDA_Colors) ( ( Color == -1 ) ?
ReturnLayerColor( LAYER_PINNUM ) : Color );
/* Create the pin num string */ /* Create the pin num string */
ReturnPinStringNum( StringPinNum ); ReturnPinStringNum( StringPinNum );
x1 = pin_pos.x; x1 = pin_pos.x; y1 = pin_pos.y;
y1 = pin_pos.y;
switch( orient ) switch( orient )
{ {
case PIN_UP: case PIN_UP:
y1 -= m_PinLen; y1 -= m_PinLen; break;
break;
case PIN_DOWN: case PIN_DOWN:
y1 += m_PinLen; y1 += m_PinLen; break;
break;
case PIN_LEFT: case PIN_LEFT:
x1 -= m_PinLen; x1 -= m_PinLen; break;
break;
case PIN_RIGHT: case PIN_RIGHT:
x1 += m_PinLen; x1 += m_PinLen; break;
break;
} }
const wxChar* textsrc = m_PinName.GetData(); float fPinTextPitch = (PinNameSize.x * 1.1) + LineWidth;
float fPinTextPitch = (PinNameSize.x * 1.1) + LineWidth;
/* Do we need to invert the string? Is this string has only "~"? */
PinTextBarCount = 0;
PinTxtLen = 0;
ii = 0;
while( *textsrc )
{
if( *textsrc == '~' )
{
PinTextBarPos[PinTextBarCount++] =
(int) ( PinTxtLen * fPinTextPitch );
}
else
{
PinText.Append( *textsrc );
PinTxtLen++;
}
textsrc++;
}
PinTxtLen = (int) ( fPinTextPitch * PinTxtLen ); PinTxtLen = NegableTextLength( m_PinName );
PinTextBarPos[PinTextBarCount] = PinTxtLen; // Needed if no end '~'
if( PinText[0] == 0 ) if( PinTxtLen == 0 )
DrawPinName = FALSE; DrawPinName = FALSE;
PinTxtLen = (int) ( fPinTextPitch * PinTxtLen );
if( TextInside ) /* Draw the text inside, but the pin numbers outside. */ if( TextInside ) /* Draw the text inside, but the pin numbers outside. */
{ {
if( (orient == PIN_LEFT) || (orient == PIN_RIGHT) ) if( (orient == PIN_LEFT) || (orient == PIN_RIGHT) )
// It is an horizontal line
{ {
if( PinText && DrawPinName ) // It is an horizontal line
if( m_PinName && DrawPinName )
{ {
if( orient == PIN_RIGHT ) if( orient == PIN_RIGHT )
{ {
x = x1 + TextInside; x = x1 + TextInside;
DrawGraphicText( panel, DC, wxPoint( x, y1 ), NameColor, DrawGraphicText( panel, DC, wxPoint( x, y1 ), NameColor,
PinText, TEXT_ORIENT_HORIZ, PinNameSize, m_PinName,
TEXT_ORIENT_HORIZ,
PinNameSize,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_HJUSTIFY_LEFT,
GR_TEXT_VJUSTIFY_CENTER, LineWidth ); GR_TEXT_VJUSTIFY_CENTER, LineWidth,
false, true );
for( ii = 0; ii < PinTextBarCount; )
{
GRMoveTo( x, y1 - TXTMARGE );
dy = -PinNameSize.y / 2;
GRMoveRel( 0, dy );
dx = PinTextBarPos[ii++]; // Get the line pos
GRMoveRel( dx, 0 );
len = PinTextBarPos[ii++] - dx; // Get the line length
GRLineRel( &panel->m_ClipBox, DC, len, 0, LineWidth,
NameColor );
}
} }
else // Orient == PIN_LEFT else // Orient == PIN_LEFT
{ {
x = x1 - TextInside; x = x1 - TextInside;
DrawGraphicText( panel, DC, wxPoint( x, y1 ), NameColor, DrawGraphicText( panel, DC, wxPoint( x, y1 ), NameColor,
PinText, TEXT_ORIENT_HORIZ, PinNameSize, m_PinName,
TEXT_ORIENT_HORIZ,
PinNameSize,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_CENTER, LineWidth ); GR_TEXT_VJUSTIFY_CENTER, LineWidth,
false, true );
for( ii = 0; ii < PinTextBarCount; )
{
GRMoveTo( x, y1 - TXTMARGE );
dy = -PinNameSize.y / 2;
GRMoveRel( 0, dy );
dx = PinTextBarPos[ii++]; // Get the line pos
GRMoveRel( dx - PinTxtLen, 0 );
len = PinTextBarPos[ii++] - dx; // Get the line length
GRLineRel( &panel->m_ClipBox, DC, len, 0, LineWidth,
NameColor );
}
} }
} }
if( DrawPinNum ) if( DrawPinNum )
{ {
DrawGraphicText( panel, DC, wxPoint( (x1 + pin_pos.x) / 2, DrawGraphicText( panel, DC,
y1 - TXTMARGE ), NumColor, wxPoint( (x1 + pin_pos.x) / 2,
StringPinNum, TEXT_ORIENT_HORIZ, PinNumSize, y1 - TXTMARGE ), NumColor,
StringPinNum,
TEXT_ORIENT_HORIZ, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, LineWidth ); GR_TEXT_VJUSTIFY_BOTTOM, LineWidth );
} }
} }
else /* Its a vertical line. */ else /* Its a vertical line. */
{ {
// Text is drawn from bottom to top (i.e. to negative value for // Text is drawn from bottom to top (i.e. to negative value for Y axis)
// Y axis) if( m_PinName && DrawPinName )
if( PinText && DrawPinName )
{ {
if( orient == PIN_DOWN ) if( orient == PIN_DOWN )
{ {
y = y1 + TextInside; y = y1 + TextInside;
DrawGraphicText( panel, DC, wxPoint( x1, y ), NameColor, DrawGraphicText( panel, DC, wxPoint( x1, y ), NameColor,
PinText, TEXT_ORIENT_VERT, PinNameSize, m_PinName,
TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_TOP, LineWidth ); GR_TEXT_VJUSTIFY_TOP, LineWidth,
false, true );
for( ii = 0; ii < PinTextBarCount; )
{
GRMoveTo( x1 - TXTMARGE, y );
dy = -PinNameSize.y / 2;
GRMoveRel( dy, 0 );
dx = PinTextBarPos[ii++]; // Get the line pos
GRMoveRel( 0, PinTxtLen - dx );
len = PinTextBarPos[ii++] - dx; // Get the line length
GRLineRel( &panel->m_ClipBox, DC, 0, -len, LineWidth,
NameColor );
}
} }
else /* PIN_UP */ else /* PIN_UP */
{ {
y = y1 - TextInside; y = y1 - TextInside;
DrawGraphicText( panel, DC, wxPoint( x1, y ), NameColor, DrawGraphicText( panel, DC, wxPoint( x1, y ), NameColor,
PinText, TEXT_ORIENT_VERT, PinNameSize, m_PinName,
TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, LineWidth ); GR_TEXT_VJUSTIFY_BOTTOM, LineWidth,
false, true );
for( ii = 0; ii < PinTextBarCount; )
{
GRMoveTo( x1 - TXTMARGE, y );
dy = -PinNameSize.y / 2;
GRMoveRel( dy, 0 );
dx = PinTextBarPos[ii++]; // Get the line pos
GRMoveRel( 0, -dx );
len = PinTextBarPos[ii++] - dx; // Get the line length
GRLineRel( &panel->m_ClipBox, DC, 0, -len, LineWidth,
NameColor );
}
} }
} }
...@@ -594,7 +576,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -594,7 +576,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, wxDC* DC,
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( x1 - TXTMARGE, wxPoint( x1 - TXTMARGE,
(y1 + pin_pos.y) / 2 ), NumColor, (y1 + pin_pos.y) / 2 ), NumColor,
StringPinNum, TEXT_ORIENT_VERT, PinNumSize, StringPinNum,
TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_CENTER, LineWidth ); GR_TEXT_VJUSTIFY_CENTER, LineWidth );
} }
...@@ -603,56 +586,41 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -603,56 +586,41 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, wxDC* DC,
else /**** Draw num & text pin outside ****/ else /**** Draw num & text pin outside ****/
{ {
if( (orient == PIN_LEFT) || (orient == PIN_RIGHT) ) if( (orient == PIN_LEFT) || (orient == PIN_RIGHT) )
/* Its an horizontal line. */
{ {
if( PinText && DrawPinName ) /* Its an horizontal line. */
if( m_PinName && DrawPinName )
{ {
x = (x1 + pin_pos.x) / 2; x = (x1 + pin_pos.x) / 2;
DrawGraphicText( panel, DC, wxPoint( x, y1 - TXTMARGE ), DrawGraphicText( panel, DC, wxPoint( x,
NameColor, PinText, TEXT_ORIENT_HORIZ, y1 - TXTMARGE ),
PinNameSize, GR_TEXT_HJUSTIFY_CENTER, NameColor, m_PinName,
GR_TEXT_VJUSTIFY_BOTTOM, LineWidth ); TEXT_ORIENT_HORIZ, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER,
for( ii = 0; ii < PinTextBarCount; ) GR_TEXT_VJUSTIFY_BOTTOM, LineWidth,
{ false, true );
GRMoveTo( x, y1 - TXTMARGE * 2 );
GRMoveRel( -PinTxtLen / 2, -PinNameSize.y );
dx = PinTextBarPos[ii++]; // Get the line pos
GRMoveRel( dx, 0 );
len = PinTextBarPos[ii++] - dx; // Get the line length
GRLineRel( &panel->m_ClipBox, DC, len, 0, LineWidth,
NameColor );
}
} }
if( DrawPinNum ) if( DrawPinNum )
{ {
x = (x1 + pin_pos.x) / 2; x = (x1 + pin_pos.x) / 2;
DrawGraphicText( panel, DC, wxPoint( x, y1 + TXTMARGE ), DrawGraphicText( panel, DC, wxPoint( x,
NumColor, StringPinNum, TEXT_ORIENT_HORIZ, y1 + TXTMARGE ),
PinNumSize, GR_TEXT_HJUSTIFY_CENTER, NumColor, StringPinNum,
GR_TEXT_VJUSTIFY_TOP, LineWidth ); TEXT_ORIENT_HORIZ, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_TOP,
LineWidth );
} }
} }
else /* Its a vertical line. */ else /* Its a vertical line. */
{ {
if( PinText && DrawPinName ) if( m_PinName && DrawPinName )
{ {
y = (y1 + pin_pos.y) / 2; y = (y1 + pin_pos.y) / 2;
DrawGraphicText( panel, DC, wxPoint( x1 - TXTMARGE, y ), DrawGraphicText( panel, DC, wxPoint( x1 - TXTMARGE,
NameColor, PinText, TEXT_ORIENT_VERT, y ),
PinNameSize, GR_TEXT_HJUSTIFY_RIGHT, NameColor, m_PinName,
GR_TEXT_VJUSTIFY_CENTER, LineWidth ); TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_RIGHT,
for( ii = 0; ii < PinTextBarCount; ) GR_TEXT_VJUSTIFY_CENTER, LineWidth, false, true );
{
GRMoveTo( x1 - (TXTMARGE * 2), y );
GRMoveRel( -PinNameSize.y, -PinTxtLen / 2 );
dx = PinTextBarPos[ii++]; // Get the line pos
GRMoveRel( 0, PinTxtLen - dx );
len = PinTextBarPos[ii++] - dx; // Get the line length
GRLineRel( &panel->m_ClipBox, DC, 0, -len, LineWidth,
NameColor );
}
} }
if( DrawPinNum ) if( DrawPinNum )
...@@ -660,8 +628,9 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -660,8 +628,9 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, wxDC* DC,
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( x1 + TXTMARGE, wxPoint( x1 + TXTMARGE,
(y1 + pin_pos.y) / 2 ), (y1 + pin_pos.y) / 2 ),
NumColor, StringPinNum, TEXT_ORIENT_VERT, NumColor, StringPinNum,
PinNumSize, GR_TEXT_HJUSTIFY_LEFT, TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_HJUSTIFY_LEFT,
GR_TEXT_VJUSTIFY_CENTER, LineWidth ); GR_TEXT_VJUSTIFY_CENTER, LineWidth );
} }
} }
...@@ -682,175 +651,118 @@ extern void Move_Plume( wxPoint pos, int plume ); // see plot.cpp ...@@ -682,175 +651,118 @@ extern void Move_Plume( wxPoint pos, int plume ); // see plot.cpp
* the opposite direction to x2,y2), otherwise all is drawn outside. * * the opposite direction to x2,y2), otherwise all is drawn outside. *
*****************************************************************************/ *****************************************************************************/
void LibDrawPin::PlotPinTexts( wxPoint& pin_pos, void LibDrawPin::PlotPinTexts( wxPoint& pin_pos,
int orient, int orient,
int TextInside, int TextInside,
bool DrawPinNum, bool DrawPinNum,
bool DrawPinName, bool DrawPinName,
int aWidth, bool aItalic ) int aWidth, bool aItalic )
{ {
int dx, len, start; int x, y, x1, y1;
int ii, x, y, x1, y1, cte; wxString StringPinNum;
wxString StringPinNum; EDA_Colors NameColor, NumColor;
wxString PinText; int PinTxtLen = 0;
int PinTextBarPos[256]; wxSize PinNameSize = wxSize( m_PinNameSize, m_PinNameSize );
int PinTextBarCount; wxSize PinNumSize = wxSize( m_PinNumSize, m_PinNumSize );
EDA_Colors NameColor, NumColor; bool plot_color = (g_PlotFormat == PLOT_FORMAT_POST)
int PinTxtLen = 0; && g_PlotPSColorOpt;
wxSize PinNameSize = wxSize( m_PinNameSize, m_PinNameSize );
wxSize PinNumSize = wxSize( m_PinNumSize, m_PinNumSize );
bool plot_color = (g_PlotFormat == PLOT_FORMAT_POST)
&& g_PlotPSColorOpt;
/* Get the num and name colors */ /* Get the num and name colors */
NameColor = (EDA_Colors) ( ( plot_color ) ? NameColor = (EDA_Colors) (plot_color ? ReturnLayerColor( LAYER_PINNAM ) : -1);
ReturnLayerColor( LAYER_PINNAM ) : -1 ); NumColor = (EDA_Colors) (plot_color ? ReturnLayerColor( LAYER_PINNUM ) : -1);
NumColor = (EDA_Colors) ( ( plot_color ) ?
ReturnLayerColor( LAYER_PINNUM ) : -1 );
/* Create the pin num string */ /* Create the pin num string */
ReturnPinStringNum( StringPinNum ); ReturnPinStringNum( StringPinNum );
x1 = pin_pos.x; x1 = pin_pos.x; y1 = pin_pos.y;
y1 = pin_pos.y;
switch( orient ) switch( orient )
{ {
case PIN_UP: case PIN_UP:
y1 -= m_PinLen; y1 -= m_PinLen; break;
break;
case PIN_DOWN: case PIN_DOWN:
y1 += m_PinLen; y1 += m_PinLen; break;
break;
case PIN_LEFT: case PIN_LEFT:
x1 -= m_PinLen; x1 -= m_PinLen; break;
break;
case PIN_RIGHT: case PIN_RIGHT:
x1 += m_PinLen; x1 += m_PinLen; break;
break;
} }
const wxChar* textsrc = m_PinName.GetData(); float fPinTextPitch = (PinNameSize.x * 1.1) + aWidth;
float fPinTextPitch = (PinNameSize.x * 1.1) + aWidth;
/* Do we need to invert the string? Is this string has only "~"? */
PinTextBarCount = 0;
PinTxtLen = 0;
ii = 0;
while( *textsrc )
{
if( *textsrc == '~' )
{
PinTextBarPos[PinTextBarCount++] =
(int) ( fPinTextPitch * PinTxtLen );
}
else
{
PinText.Append( *textsrc );
PinTxtLen++;
}
textsrc++;
}
PinTxtLen = (int) ( fPinTextPitch * PinTxtLen ); PinTxtLen = NegableTextLength( m_PinName );
PinTextBarPos[PinTextBarCount] = PinTxtLen; // Needed if no end '~'
if( PinText[0] == 0 ) if( PinTxtLen == 0 )
DrawPinName = FALSE; DrawPinName = FALSE;
PinTxtLen = (int) ( fPinTextPitch * PinTxtLen );
if( TextInside ) /* Draw the text inside, but the pin numbers outside. */ if( TextInside ) /* Draw the text inside, but the pin numbers outside. */
{ {
if( (orient == PIN_LEFT) || (orient == PIN_RIGHT) ) if( (orient == PIN_LEFT) || (orient == PIN_RIGHT) ) /* Its an horizontal line. */
{ /* Its an horizontal line. */ {
if( PinText && DrawPinName ) if( m_PinName && DrawPinName )
{ {
if( orient == PIN_RIGHT ) if( orient == PIN_RIGHT )
{ {
x = x1 + TextInside; x = x1 + TextInside;
PlotGraphicText( g_PlotFormat, wxPoint( x, y1 ), NameColor, PlotGraphicText( g_PlotFormat, wxPoint( x, y1 ), NameColor,
PinText, TEXT_ORIENT_HORIZ, PinNameSize, m_PinName,
TEXT_ORIENT_HORIZ,
PinNameSize,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_HJUSTIFY_LEFT,
GR_TEXT_VJUSTIFY_CENTER, aWidth, aItalic ); GR_TEXT_VJUSTIFY_CENTER,
aWidth, aItalic, true );
for( ii = 0; ii < PinTextBarCount; )
{
cte = y1 - PinNameSize.y / 2 - TXTMARGE;
dx = PinTextBarPos[ii++]; // Get the line pos
Move_Plume( wxPoint( x + dx, cte ), 'U' );
len = PinTextBarPos[ii++]; // Get the line end
Move_Plume( wxPoint( x + len, cte ), 'D' );
}
} }
else // orient == PIN_LEFT else // orient == PIN_LEFT
{ {
x = x1 - TextInside; x = x1 - TextInside;
PlotGraphicText( g_PlotFormat, wxPoint( x, y1 ), PlotGraphicText( g_PlotFormat, wxPoint( x, y1 ),
NameColor, PinText, TEXT_ORIENT_HORIZ, NameColor, m_PinName, TEXT_ORIENT_HORIZ,
PinNameSize, GR_TEXT_HJUSTIFY_RIGHT, PinNameSize,
GR_TEXT_VJUSTIFY_CENTER, aWidth, aItalic ); GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_CENTER,
for( ii = 0; ii < PinTextBarCount; ) aWidth, aItalic, true );
{
cte = y1 - PinNameSize.y / 2 - TXTMARGE;
dx = PinTextBarPos[ii++]; // Get the line pos
Move_Plume( wxPoint( x + dx - PinTxtLen, cte ), 'U' );
len = PinTextBarPos[ii++]; // Get the line end
Move_Plume( wxPoint( x + len - PinTxtLen, cte ), 'D' );
}
} }
} }
if( DrawPinNum ) if( DrawPinNum )
{ {
PlotGraphicText( g_PlotFormat, PlotGraphicText( g_PlotFormat,
wxPoint( ( x1 + pin_pos.x ) / 2, wxPoint( (x1 + pin_pos.x) / 2,
y1 - TXTMARGE ), y1 - TXTMARGE ),
NumColor, StringPinNum, TEXT_ORIENT_HORIZ, NumColor, StringPinNum,
PinNumSize, GR_TEXT_HJUSTIFY_CENTER, TEXT_ORIENT_HORIZ, PinNumSize,
GR_TEXT_VJUSTIFY_BOTTOM, aWidth, aItalic ); GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM,
aWidth, aItalic );
} }
} }
else /* Its a vertical line. */ else /* Its a vertical line. */
{ {
if( PinText && DrawPinName ) if( m_PinName && DrawPinName )
{ {
if( orient == PIN_DOWN ) if( orient == PIN_DOWN )
{ {
y = y1 + TextInside; y = y1 + TextInside;
PlotGraphicText( g_PlotFormat, wxPoint( x1, y ), NameColor, PlotGraphicText( g_PlotFormat, wxPoint( x1, y ), NameColor,
PinText, TEXT_ORIENT_VERT, PinNameSize, m_PinName,
TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_TOP, aWidth, aItalic); GR_TEXT_VJUSTIFY_TOP,
aWidth, aItalic, true );
for( ii = 0; ii < PinTextBarCount; )
{
cte = x1 - PinNameSize.y / 2 - TXTMARGE;
dx = PinTextBarPos[ii++]; // Get the line pos
Move_Plume( wxPoint( cte, y + PinTxtLen - dx ), 'U' );
len = PinTextBarPos[ii++]; // Get the line end
Move_Plume( wxPoint( cte, y + PinTxtLen - len ), 'D' );
}
} }
else /* PIN_UP */ else /* PIN_UP */
{ {
y = y1 - TextInside; y = y1 - TextInside;
PlotGraphicText( g_PlotFormat, wxPoint( x1, y ), NameColor, PlotGraphicText( g_PlotFormat, wxPoint( x1, y ), NameColor,
PinText, TEXT_ORIENT_VERT, PinNameSize, m_PinName,
TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, aWidth, aItalic); GR_TEXT_VJUSTIFY_BOTTOM,
aWidth, aItalic, true );
for( ii = 0; ii < PinTextBarCount; )
{
cte = x1 - PinNameSize.y / 2 - TXTMARGE;
dx = PinTextBarPos[ii++]; // Get the line pos
Move_Plume( wxPoint( cte, y - dx ), 'U' );
len = PinTextBarPos[ii++]; // Get the line end
Move_Plume( wxPoint( cte, y - len ), 'D' );
}
} }
} }
...@@ -858,111 +770,100 @@ void LibDrawPin::PlotPinTexts( wxPoint& pin_pos, ...@@ -858,111 +770,100 @@ void LibDrawPin::PlotPinTexts( wxPoint& pin_pos,
{ {
PlotGraphicText( g_PlotFormat, PlotGraphicText( g_PlotFormat,
wxPoint( x1 - TXTMARGE, wxPoint( x1 - TXTMARGE,
( y1 + pin_pos.y ) / 2 ), (y1 + pin_pos.y) / 2 ),
NumColor, StringPinNum, TEXT_ORIENT_VERT, NumColor, StringPinNum,
PinNumSize, GR_TEXT_HJUSTIFY_RIGHT, TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_VJUSTIFY_CENTER, aWidth, aItalic); GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_CENTER,
aWidth, aItalic );
} }
} }
} }
else /* Draw num & text pin outside */ else /* Draw num & text pin outside */
{ {
if( (orient == PIN_LEFT) || (orient == PIN_RIGHT) ) if( (orient == PIN_LEFT) || (orient == PIN_RIGHT) )
/* Its an horizontal line. */
{ {
if( PinText && DrawPinName ) /* Its an horizontal line. */
if( m_PinName && DrawPinName )
{ {
x = (x1 + pin_pos.x) / 2; x = (x1 + pin_pos.x) / 2;
PlotGraphicText( g_PlotFormat, wxPoint( x, y1 - TXTMARGE ), PlotGraphicText( g_PlotFormat, wxPoint( x,
NameColor, PinText, TEXT_ORIENT_HORIZ, y1 - TXTMARGE ),
PinNameSize, GR_TEXT_HJUSTIFY_CENTER, NameColor, m_PinName,
GR_TEXT_VJUSTIFY_BOTTOM, aWidth, aItalic); TEXT_ORIENT_HORIZ, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER,
for( ii = 0; ii < PinTextBarCount; ) GR_TEXT_VJUSTIFY_BOTTOM,
{ aWidth, aItalic, true );
cte = y1 - PinNameSize.y - TXTMARGE * 2;
start = x - (PinTxtLen / 2);
dx = PinTextBarPos[ii++]; // Get the line pos
Move_Plume( wxPoint( start + dx, cte ), 'U' );
len = PinTextBarPos[ii++]; // Get the line end
Move_Plume( wxPoint( start + len, cte ), 'D' );
}
} }
if( DrawPinNum ) if( DrawPinNum )
{ {
x = ( x1 + pin_pos.x ) / 2; x = (x1 + pin_pos.x) / 2;
PlotGraphicText( g_PlotFormat, wxPoint( x, y1 + TXTMARGE ), PlotGraphicText( g_PlotFormat, wxPoint( x, y1 + TXTMARGE ),
NumColor, StringPinNum, TEXT_ORIENT_HORIZ, NumColor, StringPinNum,
PinNumSize, GR_TEXT_HJUSTIFY_CENTER, TEXT_ORIENT_HORIZ, PinNumSize,
GR_TEXT_VJUSTIFY_TOP, aWidth, aItalic); GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_TOP,
aWidth, aItalic );
} }
} }
else /* Its a vertical line. */ else /* Its a vertical line. */
{ {
if( PinText && DrawPinName ) if( m_PinName && DrawPinName )
{ {
y = (y1 + pin_pos.y) / 2; y = (y1 + pin_pos.y) / 2;
PlotGraphicText( g_PlotFormat, wxPoint( x1 - TXTMARGE, y ), PlotGraphicText( g_PlotFormat, wxPoint( x1 - TXTMARGE,
NameColor, PinText, TEXT_ORIENT_VERT, y ),
PinNameSize, GR_TEXT_HJUSTIFY_RIGHT, NameColor, m_PinName,
GR_TEXT_VJUSTIFY_CENTER, aWidth, aItalic); TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_RIGHT,
for( ii = 0; ii < PinTextBarCount; ) GR_TEXT_VJUSTIFY_CENTER,
{ aWidth, aItalic, true );
cte = x1 - PinNameSize.y - TXTMARGE * 2;
start = y + (PinTxtLen / 2);
dx = PinTextBarPos[ii++]; // Get the line pos
Move_Plume( wxPoint( cte, start - dx ), 'U' );
len = PinTextBarPos[ii++]; // Get the line end
Move_Plume( wxPoint( cte, start - len ), 'D' );
}
} }
if( DrawPinNum ) if( DrawPinNum )
{ {
PlotGraphicText( g_PlotFormat, PlotGraphicText( g_PlotFormat,
wxPoint( x1 + TXTMARGE, wxPoint( x1 + TXTMARGE,
( y1 + pin_pos.y ) / 2 ), (y1 + pin_pos.y) / 2 ),
NumColor, StringPinNum, TEXT_ORIENT_VERT, NumColor, StringPinNum,
PinNumSize, GR_TEXT_HJUSTIFY_LEFT, TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_VJUSTIFY_CENTER, aWidth, aItalic); GR_TEXT_HJUSTIFY_LEFT,
GR_TEXT_VJUSTIFY_CENTER,
aWidth, aItalic );
} }
} }
} }
} }
/******************************************/
wxPoint LibDrawPin::ReturnPinEndPoint()
/******************************************/
/* return the pin end position, for a component in normal orient /* return the pin end position, for a component in normal orient
*/ */
wxPoint LibDrawPin::ReturnPinEndPoint()
{ {
wxPoint pos = m_Pos; wxPoint pos = m_Pos;
switch( m_Orient ) switch( m_Orient )
{ {
case PIN_UP: case PIN_UP:
pos.y += m_PinLen; pos.y += m_PinLen; break;
break;
case PIN_DOWN: case PIN_DOWN:
pos.y -= m_PinLen; pos.y -= m_PinLen; break;
break;
case PIN_LEFT: case PIN_LEFT:
pos.x -= m_PinLen; pos.x -= m_PinLen; break;
break;
case PIN_RIGHT: case PIN_RIGHT:
pos.x += m_PinLen; pos.x += m_PinLen; break;
break;
} }
return pos; return pos;
} }
/** /** Function ReturnPinDrawOrient
* Function ReturnPinDrawOrient
* Return the pin real orientation (PIN_UP, PIN_DOWN, PIN_RIGHT, PIN_LEFT), * Return the pin real orientation (PIN_UP, PIN_DOWN, PIN_RIGHT, PIN_LEFT),
* according to its orientation and the matrix transform (rot, mirror) TransMat * according to its orientation and the matrix transform (rot, mirror) TransMat
* @param TransMat = transform matrix * @param TransMat = transform matrix
...@@ -970,32 +871,25 @@ wxPoint LibDrawPin::ReturnPinEndPoint() ...@@ -970,32 +871,25 @@ wxPoint LibDrawPin::ReturnPinEndPoint()
int LibDrawPin::ReturnPinDrawOrient( const int TransMat[2][2] ) int LibDrawPin::ReturnPinDrawOrient( const int TransMat[2][2] )
{ {
int orient; int orient;
wxPoint end; /* position of a end pin starting at 0,0 according to wxPoint end; // position of a end pin starting at 0,0 according to its orientation, lenght = 1
* its orientation, lenght = 1 */
switch( m_Orient ) switch( m_Orient )
{ {
case PIN_UP: case PIN_UP:
end.y = 1; end.y = 1; break;
break;
case PIN_DOWN: case PIN_DOWN:
end.y = -1; end.y = -1; break;
break;
case PIN_LEFT: case PIN_LEFT:
end.x = -1; end.x = -1; break;
break;
case PIN_RIGHT: case PIN_RIGHT:
end.x = 1; end.x = 1; break;
break;
} }
// = pos of end point, accordint to the component orientation end = TransformCoordinate( TransMat, end ); // = pos of end point, accordint to the component orientation
end = TransformCoordinate( TransMat, end );
orient = PIN_UP; orient = PIN_UP;
if( end.x == 0 ) if( end.x == 0 )
{ {
if( end.y > 0 ) if( end.y > 0 )
...@@ -1012,8 +906,7 @@ int LibDrawPin::ReturnPinDrawOrient( const int TransMat[2][2] ) ...@@ -1012,8 +906,7 @@ int LibDrawPin::ReturnPinDrawOrient( const int TransMat[2][2] )
} }
/** Function ReturnPinStringNum
/**
* fill the buffer with pin num as a wxString * fill the buffer with pin num as a wxString
* Pin num is coded as a long * Pin num is coded as a long
* Used to print/draw the pin num * Used to print/draw the pin num
...@@ -1029,7 +922,7 @@ void LibDrawPin::ReturnPinStringNum( wxString& buffer ) const ...@@ -1029,7 +922,7 @@ void LibDrawPin::ReturnPinStringNum( wxString& buffer ) const
} }
/* /** Function LibDrawPin::SetPinNumFromString()
* fill the buffer with pin num as a wxString * fill the buffer with pin num as a wxString
* Pin num is coded as a long * Pin num is coded as a long
* Used to print/draw the pin num * Used to print/draw the pin num
...@@ -1051,13 +944,15 @@ void LibDrawPin::SetPinNumFromString( wxString& buffer ) ...@@ -1051,13 +944,15 @@ void LibDrawPin::SetPinNumFromString( wxString& buffer )
} }
/*************************************/
LibDrawPin* LibDrawPin::GenCopy() LibDrawPin* LibDrawPin::GenCopy()
/*************************************/
{ {
LibDrawPin* newpin = new LibDrawPin(); LibDrawPin* newpin = new LibDrawPin();
newpin->m_Pos = m_Pos; newpin->m_Pos = m_Pos;
newpin->m_PinLen = m_PinLen; newpin->m_PinLen = m_PinLen;
newpin->m_Orient = m_Orient; newpin->m_Orient = m_Orient;
newpin->m_PinShape = m_PinShape; newpin->m_PinShape = m_PinShape;
newpin->m_PinType = m_PinType; newpin->m_PinType = m_PinType;
newpin->m_Attributs = m_Attributs; newpin->m_Attributs = m_Attributs;
...@@ -1075,10 +970,10 @@ LibDrawPin* LibDrawPin::GenCopy() ...@@ -1075,10 +970,10 @@ LibDrawPin* LibDrawPin::GenCopy()
} }
/*******************************************************/ /** Function LibDrawPin::DisplayInfo
/* Affiche en bas d'ecran les caracteristiques de la pin * Displays info (pin num and name, otientation ...
* on the Info window
*/ */
/*******************************************************/
void LibDrawPin::DisplayInfo( WinEDA_DrawFrame* frame ) void LibDrawPin::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
wxString Text; wxString Text;
...@@ -1144,10 +1039,14 @@ void LibDrawPin::DisplayInfo( WinEDA_DrawFrame* frame ) ...@@ -1144,10 +1039,14 @@ void LibDrawPin::DisplayInfo( WinEDA_DrawFrame* frame )
} }
/** Function LibDrawPin::GetBoundingBox
* @return the boundary box for this, in schematic coordinates
*/
EDA_Rect LibDrawPin::GetBoundingBox() EDA_Rect LibDrawPin::GetBoundingBox()
{ {
wxPoint pt = m_Pos; wxPoint pt = m_Pos;
pt.y *= -1;
pt.y *= -1; // Reverse the Y axis, according to the schematic orientation
return EDA_Rect( pt, wxSize( 1, 1 ) ); return EDA_Rect( pt, wxSize( 1, 1 ) );
} }
eeschema/class_text-label.cpp
View file @ 71ca194b
...@@ -195,7 +195,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, ...@@ -195,7 +195,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
wxPoint( m_Pos.x + offset.x, m_Pos.y - TXTMARGE + offset.y ), wxPoint( m_Pos.x + offset.x, m_Pos.y - TXTMARGE + offset.y ),
color, m_Text, TEXT_ORIENT_HORIZ, m_Size, color, m_Text, TEXT_ORIENT_HORIZ, m_Size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_HJUSTIFY_LEFT,
GR_TEXT_VJUSTIFY_BOTTOM, width, m_Italic ); GR_TEXT_VJUSTIFY_BOTTOM, width, m_Italic, true );
break; break;
case 1: /* Vert Orientation UP */ case 1: /* Vert Orientation UP */
...@@ -204,7 +204,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, ...@@ -204,7 +204,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
m_Pos.y + offset.y ), m_Pos.y + offset.y ),
color, m_Text, TEXT_ORIENT_VERT, m_Size, color, m_Text, TEXT_ORIENT_VERT, m_Size,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_BOTTOM, width, m_Italic ); GR_TEXT_VJUSTIFY_BOTTOM, width, m_Italic, true );
break; break;
case 2: /* Horiz Orientation - Right justified */ case 2: /* Horiz Orientation - Right justified */
...@@ -213,7 +213,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, ...@@ -213,7 +213,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
TXTMARGE + offset.y ), TXTMARGE + offset.y ),
color, m_Text, TEXT_ORIENT_HORIZ, m_Size, color, m_Text, TEXT_ORIENT_HORIZ, m_Size,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_BOTTOM, width, m_Italic ); GR_TEXT_VJUSTIFY_BOTTOM, width, m_Italic, true );
break; break;
case 3: /* Vert Orientation BOTTOM */ case 3: /* Vert Orientation BOTTOM */
...@@ -222,7 +222,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, ...@@ -222,7 +222,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
m_Pos.y + offset.y ), m_Pos.y + offset.y ),
color, m_Text, TEXT_ORIENT_VERT, m_Size, color, m_Text, TEXT_ORIENT_VERT, m_Size,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_TOP, width, m_Italic ); GR_TEXT_VJUSTIFY_TOP, width, m_Italic, true );
break; break;
} }
...@@ -448,28 +448,28 @@ void SCH_HIERLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offs ...@@ -448,28 +448,28 @@ void SCH_HIERLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offs
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( AnchorPos.x - ii, AnchorPos.y ), color, wxPoint( AnchorPos.x - ii, AnchorPos.y ), color,
m_Text, TEXT_ORIENT_HORIZ, m_Size, m_Text, TEXT_ORIENT_HORIZ, m_Size,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_VJUSTIFY_CENTER, width, m_Italic ); GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_VJUSTIFY_CENTER, width, m_Italic, true );
break; break;
case 1: /* Orientation vert UP */ case 1: /* Orientation vert UP */
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( AnchorPos.x, AnchorPos.y + ii ), color, wxPoint( AnchorPos.x, AnchorPos.y + ii ), color,
m_Text, TEXT_ORIENT_VERT, m_Size, m_Text, TEXT_ORIENT_VERT, m_Size,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_TOP, width, m_Italic ); GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_TOP, width, m_Italic, true );
break; break;
case 2: /* Orientation horiz inverse */ case 2: /* Orientation horiz inverse */
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( AnchorPos.x + ii, AnchorPos.y ), color, wxPoint( AnchorPos.x + ii, AnchorPos.y ), color,
m_Text, TEXT_ORIENT_HORIZ, m_Size, m_Text, TEXT_ORIENT_HORIZ, m_Size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, width, m_Italic ); GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, width, m_Italic, true );
break; break;
case 3: /* Orientation vert BOTTOM */ case 3: /* Orientation vert BOTTOM */
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( AnchorPos.x, AnchorPos.y - ii ), color, wxPoint( AnchorPos.x, AnchorPos.y - ii ), color,
m_Text, TEXT_ORIENT_VERT, m_Size, m_Text, TEXT_ORIENT_VERT, m_Size,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_BOTTOM, width, m_Italic ); GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_BOTTOM, width, m_Italic, true );
break; break;
} }
...@@ -519,7 +519,7 @@ EDA_Rect SCH_HIERLABEL::GetBoundingBox() ...@@ -519,7 +519,7 @@ EDA_Rect SCH_HIERLABEL::GetBoundingBox()
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = MAX( m_Width, g_DrawMinimunLineWidth );
height = m_Size.y + 2*TXTMARGE; height = m_Size.y + 2*TXTMARGE;
length = ( Pitch(width) * GetLength() ) + height + 2*DANGLING_SYMBOL_SIZE; // add height for triangular shapes length = ( Pitch(width) * NegableTextLength(m_Text) ) + height + 2*DANGLING_SYMBOL_SIZE; // add height for triangular shapes
switch( m_Orient ) // respect orientation switch( m_Orient ) // respect orientation
{ {
...@@ -605,28 +605,28 @@ void SCH_GLOBALLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& dr ...@@ -605,28 +605,28 @@ void SCH_GLOBALLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& dr
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( AnchorPos.x - offset, AnchorPos.y ), color, wxPoint( AnchorPos.x - offset, AnchorPos.y ), color,
m_Text, TEXT_ORIENT_HORIZ, m_Size, m_Text, TEXT_ORIENT_HORIZ, m_Size,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_VJUSTIFY_CENTER, width, m_Italic ); GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_VJUSTIFY_CENTER, width, m_Italic, true );
break; break;
case 1: /* Orientation vert UP */ case 1: /* Orientation vert UP */
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( AnchorPos.x, AnchorPos.y + offset ), color, wxPoint( AnchorPos.x, AnchorPos.y + offset ), color,
m_Text, TEXT_ORIENT_VERT, m_Size, m_Text, TEXT_ORIENT_VERT, m_Size,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_TOP, width, m_Italic ); GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_TOP, width, m_Italic, true );
break; break;
case 2: /* Orientation horiz inverse */ case 2: /* Orientation horiz inverse */
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( AnchorPos.x + offset, AnchorPos.y ), color, wxPoint( AnchorPos.x + offset, AnchorPos.y ), color,
m_Text, TEXT_ORIENT_HORIZ, m_Size, m_Text, TEXT_ORIENT_HORIZ, m_Size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, width, m_Italic ); GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, width, m_Italic, true );
break; break;
case 3: /* Orientation vert BOTTOM */ case 3: /* Orientation vert BOTTOM */
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
wxPoint( AnchorPos.x, AnchorPos.y - offset ), color, wxPoint( AnchorPos.x, AnchorPos.y - offset ), color,
m_Text, TEXT_ORIENT_VERT, m_Size, m_Text, TEXT_ORIENT_VERT, m_Size,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_BOTTOM, width, m_Italic ); GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_BOTTOM, width, m_Italic, true );
break; break;
} }
...@@ -647,15 +647,15 @@ void SCH_GLOBALLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& dr ...@@ -647,15 +647,15 @@ void SCH_GLOBALLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& dr
*/ */
void SCH_GLOBALLABEL::CreateGraphicShape( int* corner_list, const wxPoint& Pos ) void SCH_GLOBALLABEL::CreateGraphicShape( int* corner_list, const wxPoint& Pos )
{ {
int HalfSize = m_Size.x / 2; int HalfSize = m_Size.y / 2;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = MAX( m_Width, g_DrawMinimunLineWidth );
*corner_list = 7; corner_list++; // 7 corners in list *corner_list = 7; corner_list++; // 7 corners in list
int symb_len = ( Pitch(width) * GetLength() ) + (TXTMARGE * 2); int symb_len = ( Pitch(width) * NegableTextLength(m_Text) ) + (TXTMARGE * 2);
// Create outline shape : 6 points // Create outline shape : 6 points
int x = symb_len + width + 3; int x = symb_len + width + 3;
int y = HalfSize + width + 3; int y = HalfSize*1.5 + width + 3; /* 50% more for negation bar */
corner_list[0] = 0; corner_list[1] = 0; // Starting point (anchor) corner_list[0] = 0; corner_list[1] = 0; // Starting point (anchor)
corner_list[2] = 0; corner_list[3] = -y; // Up corner_list[2] = 0; corner_list[3] = -y; // Up
corner_list[4] = -x; corner_list[5] = -y; // left Up corner_list[4] = -x; corner_list[5] = -y; // left Up
...@@ -734,7 +734,7 @@ EDA_Rect SCH_GLOBALLABEL::GetBoundingBox() ...@@ -734,7 +734,7 @@ EDA_Rect SCH_GLOBALLABEL::GetBoundingBox()
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = MAX( m_Width, g_DrawMinimunLineWidth );
height = m_Size.y + 2*TXTMARGE; height = m_Size.y + 2*TXTMARGE;
length = ( Pitch(width) * GetLength() ) + 2* height + 2*DANGLING_SYMBOL_SIZE; // add 2*height for triangular shapes (bidirectional) length = ( Pitch(width) * NegableTextLength(m_Text) ) + 2* height + 2*DANGLING_SYMBOL_SIZE; // add 2*height for triangular shapes (bidirectional)
switch( m_Orient ) // respect orientation switch( m_Orient ) // respect orientation
{ {
...@@ -782,7 +782,7 @@ EDA_Rect SCH_TEXT::GetBoundingBox() ...@@ -782,7 +782,7 @@ EDA_Rect SCH_TEXT::GetBoundingBox()
x = m_Pos.x; x = m_Pos.x;
y = m_Pos.y; y = m_Pos.y;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = MAX( m_Width, g_DrawMinimunLineWidth );
length = ( Pitch(width) * GetLength() ); length = ( Pitch(width) * NegableTextLength(m_Text) );
height = m_Size.y; height = m_Size.y;
dx = dy = 0; dx = dy = 0;
......
eeschema/dialog_build_BOM.cpp
View file @ 71ca194b
...@@ -203,8 +203,7 @@ void DIALOG_BUILD_BOM::OnCancelClick( wxCommandEvent& event ) ...@@ -203,8 +203,7 @@ void DIALOG_BUILD_BOM::OnCancelClick( wxCommandEvent& event )
void DIALOG_BUILD_BOM::SavePreferences() void DIALOG_BUILD_BOM::SavePreferences()
/**************************************************/ /**************************************************/
{ {
wxConfig* config = wxGetApp().m_EDA_Config; wxASSERT( m_Config != NULL );
wxASSERT( config != NULL );
// Determine current settings of "List items" and "Options" checkboxes // Determine current settings of "List items" and "Options" checkboxes
// (NOTE: These 6 settings are restored when the dialog box is next // (NOTE: These 6 settings are restored when the dialog box is next
......
eeschema/dialog_eeschema_config.cpp
View file @ 71ca194b
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dialog_eeschema_config.cpp // Name: dialog_eeschema_config.cpp
// Purpose: // Purpose:
// Author: jean-pierre Charras // Author: jean-pierre Charras
// Modified by:
// Created: 17/02/2006 21:14:46 // Created: 17/02/2006 21:14:46
// RCS-ID: // Copyright: Kicad Team
// Copyright: License GNU // Licence: GPL
// Licence:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Generated by DialogBlocks (unregistered), 17/02/2006 21:14:46
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dialog_eeschema_config.h"
#endif
////@begin includes
////@end includes
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h" #include "appl_wxstruct.h"
#include "common.h" #include "common.h"
...@@ -32,454 +23,266 @@ ...@@ -32,454 +23,266 @@
#include "id.h" #include "id.h"
#include "dialog_eeschema_config.h" #include "dialog_eeschema_config_fbp.h"
////@begin XPM images
////@end XPM images
/******************************************************************/ class DIALOG_EESCHEMA_CONFIG : public DIALOG_EESCHEMA_CONFIG_FBP
void WinEDA_SchematicFrame::InstallConfigFrame(const wxPoint & pos)
/******************************************************************/
{ {
KiConfigEeschemaFrame * CfgFrame = new KiConfigEeschemaFrame(this); private:
CfgFrame->ShowModal(); CfgFrame->Destroy(); WinEDA_SchematicFrame* m_Parent;
} bool m_LibListChanged;
/*!
* KiConfigEeschemaFrame type definition
*/
IMPLEMENT_DYNAMIC_CLASS( KiConfigEeschemaFrame, wxDialog )
/*!
* KiConfigEeschemaFrame event table definition
*/
BEGIN_EVENT_TABLE( KiConfigEeschemaFrame, wxDialog )
////@begin KiConfigEeschemaFrame event table entries
EVT_CLOSE( KiConfigEeschemaFrame::OnCloseWindow )
EVT_BUTTON( SAVE_CFG, KiConfigEeschemaFrame::OnSaveCfgClick ) private:
EVT_LISTBOX( FORMAT_NETLIST, KiConfigEeschemaFrame::OnFormatNetlistSelected ) // Virtual event handlers, overide them in your derived class
void Init();
virtual void OnCloseWindow( wxCloseEvent& event );
virtual void OnSaveCfgClick( wxCommandEvent& event );
virtual void OnRemoveLibClick( wxCommandEvent& event );
virtual void OnAddOrInsertLibClick( wxCommandEvent& event );
virtual void OnLibPathSelClick( wxCommandEvent& event );
virtual void OnOkClick( wxCommandEvent& event );
virtual void OnCancelClick( wxCommandEvent& event );
EVT_BUTTON( REMOVE_LIB, KiConfigEeschemaFrame::OnRemoveLibClick )
EVT_BUTTON( ADD_LIB, KiConfigEeschemaFrame::OnAddLibClick ) public:
DIALOG_EESCHEMA_CONFIG( WinEDA_SchematicFrame * parent );
~DIALOG_EESCHEMA_CONFIG() {};
};
EVT_BUTTON( INSERT_LIB, KiConfigEeschemaFrame::OnInsertLibClick )
EVT_BUTTON( ID_LIB_PATH_SEL, KiConfigEeschemaFrame::OnLibPathSelClick ) /******************************************************************/
void WinEDA_SchematicFrame::InstallConfigFrame( const wxPoint& pos )
////@end KiConfigEeschemaFrame event table entries /******************************************************************/
END_EVENT_TABLE()
/*!
* KiConfigEeschemaFrame constructors
*/
KiConfigEeschemaFrame::KiConfigEeschemaFrame( )
{
}
KiConfigEeschemaFrame::KiConfigEeschemaFrame( WinEDA_SchematicFrame* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
{ {
wxString msg; DIALOG_EESCHEMA_CONFIG* CfgFrame = new DIALOG_EESCHEMA_CONFIG( this );
m_Parent = parent;
m_LibListChanged = FALSE;
Create(parent, id, caption, pos, size, style); CfgFrame->ShowModal(); CfgFrame->Destroy();
msg = _("from ") + wxGetApp().m_CurrentOptionFile;
SetTitle(msg);
SetFormatsNetListes();
m_ListLibr->InsertItems(g_LibName_List, 0);
m_LibDirCtrl->SetValue( g_UserLibDirBuffer );
} }
/*!
* KiConfigEeschemaFrame creator
*/
bool KiConfigEeschemaFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) /*******************************************************************************/
DIALOG_EESCHEMA_CONFIG::DIALOG_EESCHEMA_CONFIG( WinEDA_SchematicFrame* parent )
: DIALOG_EESCHEMA_CONFIG_FBP( parent )
/*******************************************************************************/
{ {
////@begin KiConfigEeschemaFrame member initialisation wxString msg;
m_NetFormatBox = NULL;
m_FileExtList = NULL;
m_ListLibr = NULL;
m_LibDirCtrl = NULL;
////@end KiConfigEeschemaFrame member initialisation
////@begin KiConfigEeschemaFrame creation
SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
wxDialog::Create( parent, id, caption, pos, size, style );
CreateControls();
if (GetSizer())
{
GetSizer()->SetSizeHints(this);
}
Centre();
////@end KiConfigEeschemaFrame creation
return true;
}
/*!
* Control creation for KiConfigEeschemaFrame
*/
void KiConfigEeschemaFrame::CreateControls()
{
SetFont(*g_DialogFont);
////@begin KiConfigEeschemaFrame content construction
// Generated by DialogBlocks, 10/11/2007 16:00:50 (unregistered)
KiConfigEeschemaFrame* itemDialog1 = this;
wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
itemDialog1->SetSizer(itemBoxSizer2);
wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer4, 0, wxGROW|wxALL, 5);
wxButton* itemButton5 = new wxButton( itemDialog1, SAVE_CFG, _("Save Cfg"), wxDefaultPosition, wxDefaultSize, 0 );
if (KiConfigEeschemaFrame::ShowToolTips())
itemButton5->SetToolTip(_("save current configuration setting in the local .pro file"));
itemButton5->SetForegroundColour(wxColour(204, 0, 0));
itemBoxSizer4->Add(itemButton5, 0, wxGROW|wxALL, 5);
itemBoxSizer4->Add(5, 5, 0, wxGROW|wxALL, 5);
wxStaticText* itemStaticText7 = new wxStaticText( itemDialog1, wxID_STATIC, _("NetList Formats:"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer4->Add(itemStaticText7, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
wxArrayString m_NetFormatBoxStrings; m_Parent = parent;
m_NetFormatBox = new wxListBox( itemDialog1, FORMAT_NETLIST, wxDefaultPosition, wxDefaultSize, m_NetFormatBoxStrings, wxLB_SINGLE ); m_LibListChanged = false;
itemBoxSizer4->Add(m_NetFormatBox, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
itemBoxSizer4->Add(5, 5, 0, wxGROW|wxALL, 5); Init();
wxStaticBox* itemStaticBoxSizer10Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Files ext:")); msg = _( "from " ) + wxGetApp().m_CurrentOptionFile;
m_FileExtList = new wxStaticBoxSizer(itemStaticBoxSizer10Static, wxVERTICAL); SetTitle( msg );
itemBoxSizer4->Add(m_FileExtList, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL); if( GetSizer() )
itemBoxSizer3->Add(itemBoxSizer11, 1, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); GetSizer()->SetSizeHints( this );
}
wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer11->Add(itemBoxSizer12, 1, wxGROW, 5);
wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer12->Add(itemBoxSizer13, 0, wxGROW|wxALL, 5);
wxButton* itemButton14 = new wxButton( itemDialog1, REMOVE_LIB, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
if (KiConfigEeschemaFrame::ShowToolTips())
itemButton14->SetToolTip(_("Unload the selected library"));
itemButton14->SetForegroundColour(wxColour(204, 0, 0));
itemBoxSizer13->Add(itemButton14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxButton* itemButton15 = new wxButton( itemDialog1, ADD_LIB, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
if (KiConfigEeschemaFrame::ShowToolTips())
itemButton15->SetToolTip(_("Add a new library after the selected library, and load it"));
itemButton15->SetForegroundColour(wxColour(0, 128, 0));
itemBoxSizer13->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxButton* itemButton16 = new wxButton( itemDialog1, INSERT_LIB, _("Ins"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton16->SetHelpText(_("Add a new library before the selected library, and load it"));
if (KiConfigEeschemaFrame::ShowToolTips())
itemButton16->SetToolTip(_("Add a new library beforer the selected library, add load it"));
itemButton16->SetForegroundColour(wxColour(0, 0, 255));
itemBoxSizer13->Add(itemButton16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer12->Add(itemBoxSizer17, 1, wxGROW|wxALL, 5);
wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Libraries"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText18->SetForegroundColour(wxColour(204, 0, 0));
itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
wxArrayString m_ListLibrStrings;
m_ListLibr = new wxListBox( itemDialog1, ID_LISTBOX, wxDefaultPosition, wxDefaultSize, m_ListLibrStrings, wxLB_SINGLE );
itemBoxSizer17->Add(m_ListLibr, 1, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM|wxADJUST_MINSIZE, 5);
wxStaticBox* itemStaticBoxSizer20Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Default library file path:"));
wxStaticBoxSizer* itemStaticBoxSizer20 = new wxStaticBoxSizer(itemStaticBoxSizer20Static, wxHORIZONTAL);
itemStaticBoxSizer20Static->SetForegroundColour(wxColour(206, 0, 0));
itemBoxSizer2->Add(itemStaticBoxSizer20, 0, wxGROW|wxALL, 5);
m_LibDirCtrl = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
if (KiConfigEeschemaFrame::ShowToolTips())
m_LibDirCtrl->SetToolTip(_("Default path to search libraries which have no absolute path in name,\nor a name which does not start by ./ or ../\nIf void, the default path is kicad/library"));
itemStaticBoxSizer20->Add(m_LibDirCtrl, 1, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
wxButton* itemButton22 = new wxButton( itemDialog1, ID_LIB_PATH_SEL, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticBoxSizer20->Add(itemButton22, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
////@end KiConfigEeschemaFrame content construction /***********************************/
void DIALOG_EESCHEMA_CONFIG::Init()
/***********************************/
{
SetFont( *g_DialogFont );
SetFocus();
wxString msg = _("Cmp file Ext: ") + g_NetCmpExtBuffer; // Display current files extension (info)
wxStaticText * text = new wxStaticText( itemDialog1, -1, msg, wxDefaultPosition, wxDefaultSize, 0 ); wxString msg = m_InfoCmpFileExt->GetLabel() + g_NetCmpExtBuffer;
m_FileExtList->Add(text, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5); m_InfoCmpFileExt->SetLabel( msg );
msg = _("Net file Ext: ") + NetlistFileExtension; msg = m_InfoNetFileExt->GetLabel() + NetlistFileExtension;
text = new wxStaticText( itemDialog1, -1, msg, wxDefaultPosition, wxDefaultSize, 0 ); m_InfoNetFileExt->SetLabel( msg );
m_FileExtList->Add(text, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
msg = _("Library file Ext: ") + CompLibFileExtension; msg = m_InfoLibFileExt->GetLabel() + CompLibFileExtension;
text = new wxStaticText( itemDialog1, -1, msg, wxDefaultPosition, wxDefaultSize, 0 ); m_InfoLibFileExt->SetLabel( msg );
m_FileExtList->Add(text, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
msg = _("Symbol file Ext: ") + g_SymbolExtBuffer; msg = m_InfoSymbFileExt->GetLabel() + g_SymbolExtBuffer;
text = new wxStaticText( itemDialog1, -1, msg, wxDefaultPosition, wxDefaultSize, 0 ); m_InfoSymbFileExt->SetLabel( msg );
m_FileExtList->Add(text, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
msg = _("Schematic file Ext: ") + SchematicFileExtension; msg = m_InfoSchFileExt->GetLabel() + SchematicFileExtension;
text = new wxStaticText( itemDialog1, -1, msg, wxDefaultPosition, wxDefaultSize, 0 ); m_InfoSchFileExt->SetLabel( msg );
m_FileExtList->Add(text, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
// Init currently availlable netlist formats
wxArrayString NetlistNameItems; wxArrayString NetlistNameItems;
NetlistNameItems.Add(wxT("Pcbnew")); NetlistNameItems.Add( wxT( "Pcbnew" ) );
NetlistNameItems.Add(wxT("OrcadPcb2")); NetlistNameItems.Add( wxT( "OrcadPcb2" ) );
NetlistNameItems.Add(wxT("CadStar")); NetlistNameItems.Add( wxT( "CadStar" ) );
NetlistNameItems.Add(wxT("Spice")); NetlistNameItems.Add( wxT( "Spice" ) );
// Add extra neltlist format (using external converter)
msg = ReturnUserNetlistTypeName( true ); msg = ReturnUserNetlistTypeName( true );
while ( ! msg.IsEmpty() ) while( !msg.IsEmpty() )
{ {
NetlistNameItems.Add(msg); NetlistNameItems.Add( msg );
msg = ReturnUserNetlistTypeName( false ); msg = ReturnUserNetlistTypeName( false );
} }
m_NetFormatBox->InsertItems(NetlistNameItems, 0);
}
/*! m_NetFormatBox->InsertItems( NetlistNameItems, 0 );
* Should we show tooltips?
*/
bool KiConfigEeschemaFrame::ShowToolTips() if( g_NetFormat > (int) m_NetFormatBox->GetCount() )
{ g_NetFormat = NET_TYPE_PCBNEW;
return true; m_NetFormatBox->SetSelection( g_NetFormat - NET_TYPE_PCBNEW );
}
/*!
* Get bitmap resources
*/
wxBitmap KiConfigEeschemaFrame::GetBitmapResource( const wxString& name ) m_ListLibr->InsertItems( g_LibName_List, 0 );
{ m_LibDirCtrl->SetValue( g_UserLibDirBuffer );
// Bitmap retrieval
////@begin KiConfigEeschemaFrame bitmap retrieval
wxUnusedVar(name);
return wxNullBitmap;
////@end KiConfigEeschemaFrame bitmap retrieval
} }
/*!
* Get icon resources
*/
wxIcon KiConfigEeschemaFrame::GetIconResource( const wxString& name ) /******************************************************************/
void DIALOG_EESCHEMA_CONFIG::OnCancelClick( wxCommandEvent& event )
/******************************************************************/
{ {
// Icon retrieval EndModal( -1 );
////@begin KiConfigEeschemaFrame icon retrieval
wxUnusedVar(name);
return wxNullIcon;
////@end KiConfigEeschemaFrame icon retrieval
} }
/**************************************************************/ /**************************************************************/
void KiConfigEeschemaFrame::OnCloseWindow(wxCloseEvent & event) void DIALOG_EESCHEMA_CONFIG::OnOkClick( wxCommandEvent& event )
/**************************************************************/ /**************************************************************/
{ {
ChangeSetup(); // Set new netlist format
if ( m_LibListChanged ) g_NetFormat = m_NetFormatBox->GetSelection() + NET_TYPE_PCBNEW;
{
LoadLibraries(m_Parent);
if ( m_Parent->m_ViewlibFrame )
m_Parent->m_ViewlibFrame->ReCreateListLib();
}
EndModal(0);
}
// Set new default path lib
g_UserLibDirBuffer = m_LibDirCtrl->GetValue();
SetRealLibraryPath( wxT( "library" ) ); // set real path lib
/*********************************************/ // Set new active lib list
void KiConfigEeschemaFrame::ChangeSetup() if( m_LibListChanged )
/*********************************************/ {
{ // Recreate lib list
g_UserLibDirBuffer = m_LibDirCtrl->GetValue(); g_LibName_List.Clear();
for ( unsigned ii = 0; ii < m_ListLibr->GetCount(); ii ++ )
g_LibName_List.Add(m_ListLibr->GetString(ii) );
// take new list in account
LoadLibraries( m_Parent );
if( m_Parent->m_ViewlibFrame )
m_Parent->m_ViewlibFrame->ReCreateListLib();
}
if ( event.GetId() != ID_SAVE_CFG )
EndModal( 0 );
} }
/**************************************************************/
void DIALOG_EESCHEMA_CONFIG::OnCloseWindow( wxCloseEvent& event )
/********************************************************/ /**************************************************************/
void KiConfigEeschemaFrame::LibDelFct(wxCommandEvent& event)
/********************************************************/
{ {
int ii; EndModal( 0 );
ii = m_ListLibr->GetSelection();
if ( ii < 0 ) return;
g_LibName_List.RemoveAt(ii);
m_ListLibr->Clear();
m_ListLibr->InsertItems(g_LibName_List, 0);
m_LibListChanged = TRUE;
} }
/****************************************************************/
void KiConfigEeschemaFrame::AddOrInsertLibrary(wxCommandEvent& event)
/****************************************************************/
/* Insert or add a library to the existing library list:
New library is put in list before (insert) or after (add)
the selection
*/
{
int ii;
wxString tmp;
wxFileName fn;
/* TODO: Fix this, it's broken. Add should add the new library to the
* end of the list and insert should insert the new library ahead
* of the selected library in the list or at the beginning if no
* library is selected. */
ii = m_ListLibr->GetSelection();
if ( ii < 0 )
ii = 0;
ChangeSetup();
if( event.GetId() == ADD_LIB)
{
if( g_LibName_List.GetCount() != 0 )
ii++; /* Add after selection */
}
wxFileDialog dlg( this, _( "Schematic Component Library Files" ),
g_RealLibDirBuffer, wxEmptyString, CompLibFileWildcard,
wxFD_OPEN | wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST );
if ( dlg.ShowModal() != wxID_OK )
return;
wxArrayString Filenames;
dlg.GetPaths(Filenames);
for ( unsigned jj = 0; jj < Filenames.GetCount(); jj ++ ) /*********************************************************************/
{ void DIALOG_EESCHEMA_CONFIG::OnRemoveLibClick( wxCommandEvent& event )
fn = Filenames[jj]; /*********************************************************************/
{
int ii;
/* If the library path is already in the library search paths ii = m_ListLibr->GetSelection();
* list, just add the library name to the list. Otherwise, add if( ii < 0 )
* the library name with the full path. */ return;
if( wxGetApp().GetLibraryPathList().Index( fn.GetPath() ) == wxNOT_FOUND )
tmp = fn.GetPathWithSep() + fn.GetName();
else
tmp = fn.GetName();
// Add or insert new library name.
if( g_LibName_List.Index( tmp ) == wxNOT_FOUND )
{
m_LibListChanged = TRUE;
g_LibName_List.Insert( tmp, ii++ );
m_ListLibr->Clear();
m_ListLibr->InsertItems(g_LibName_List, 0);
}
else
{
wxString msg = wxT("<") + tmp + wxT("> : ") +
_("Library already in use");
DisplayError(this, msg);
}
}
m_ListLibr->Delete(ii);
m_LibListChanged = TRUE;
} }
/**************************************************************************/
void DIALOG_EESCHEMA_CONFIG::OnAddOrInsertLibClick( wxCommandEvent& event )
/**************************************************************************/
/****************************************************/ /* Insert or add a library to the existing library list:
void KiConfigEeschemaFrame::SetFormatsNetListes() * New library is put in list before (insert) or after (add)
/****************************************************/ * the selection
/* Adjust the m_NetFormatBox current selection, according to the current netlist format*/ */
{ {
if ( g_NetFormat > (int)m_NetFormatBox->GetCount() ) int ii;
g_NetFormat = NET_TYPE_PCBNEW; wxString FullLibName, ShortLibName, Mask;
m_NetFormatBox->SetSelection(g_NetFormat - NET_TYPE_PCBNEW);
}
/*! ii = m_ListLibr->GetSelection();
* wxEVT_COMMAND_NETLIST_SELECTED event handler for FORMAT_NETLIST if( ii < 0 )
*/ ii = 0;
void KiConfigEeschemaFrame::OnFormatNetlistSelected( wxCommandEvent& event ) if( event.GetId() == ID_ADD_LIB )
{ {
g_NetFormat = m_NetFormatBox->GetSelection() + NET_TYPE_PCBNEW; if( m_ListLibr->GetCount() != 0 )
} ii++; /* Add after selection */
}
/*!
* wxEVT_COMMAND_BUTTON_CLICKED event handler for DEL_LIB
*/
void KiConfigEeschemaFrame::OnRemoveLibClick( wxCommandEvent& event ) wxString libpath = m_LibDirCtrl->GetValue();
{ if ( libpath.IsEmpty() )
LibDelFct(event); libpath = g_RealLibDirBuffer;
}
/*! Mask = wxT( "*" ) + CompLibFileExtension;
* wxEVT_COMMAND_BUTTON_CLICKED event handler for ADD_LIB
*/
void KiConfigEeschemaFrame::OnAddLibClick( wxCommandEvent& event ) wxFileDialog FilesDialog( this, _( "Library files:" ), libpath,
{ wxEmptyString, Mask,
AddOrInsertLibrary(event); wxFD_DEFAULT_STYLE | wxFD_MULTIPLE );
}
/*! int diag = FilesDialog.ShowModal();
* wxEVT_COMMAND_BUTTON_CLICKED event handler for INSERT_LIB if( diag != wxID_OK )
*/ return;
void KiConfigEeschemaFrame::OnInsertLibClick( wxCommandEvent& event ) wxArrayString Filenames;
{ FilesDialog.GetPaths( Filenames );
AddOrInsertLibrary(event);
for( unsigned jj = 0; jj < Filenames.GetCount(); jj++ )
{
FullLibName = Filenames[jj];
ShortLibName = MakeReducedFileName( FullLibName, libpath, CompLibFileExtension );
if( ShortLibName.IsEmpty() ) //Just in case...
continue;
//Add or insert new library name, if not already in list
#ifdef __WINDOWS__
bool case_sensitive = false;
#else
bool case_sensitive = true;
#endif
if( m_ListLibr->FindString( ShortLibName, case_sensitive ) == wxNOT_FOUND )
{
m_LibListChanged = TRUE;
m_ListLibr->Insert( ShortLibName, ii );
}
else
{
wxString msg;
msg << wxT( "<" ) << ShortLibName << wxT( "> : " ) << _( "Library already in use" );
DisplayError( this, msg );
}
}
} }
/*!
* wxEVT_COMMAND_BUTTON_CLICKED event handler for SAVE_CFG
*/
void KiConfigEeschemaFrame::OnSaveCfgClick( wxCommandEvent& event ) /*******************************************************************/
void DIALOG_EESCHEMA_CONFIG::OnSaveCfgClick( wxCommandEvent& event )
/*******************************************************************/
{ {
ChangeSetup(); OnOkClick( event );
m_Parent->Save_Config(this); m_Parent->Save_Config( this );
} }
/*! /***********************************************************************/
* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_LIB_PATH_SEL void DIALOG_EESCHEMA_CONFIG::OnLibPathSelClick( wxCommandEvent& event )
*/ /***********************************************************************/
void KiConfigEeschemaFrame::OnLibPathSelClick( wxCommandEvent& event )
{ {
wxString path = g_RealLibDirBuffer; wxString path = m_LibDirCtrl->GetValue();
if ( path.IsEmpty() )
bool select = EDA_DirectorySelector(_(" Default Path for libraries"), /* Titre de la fenetre */ path = g_RealLibDirBuffer;
path, /* Chemin par defaut */
wxDD_DEFAULT_STYLE,
this, /* parent frame */
wxDefaultPosition);
if ( !select ) return; bool select = EDA_DirectorySelector( _( " Default Path for libraries" ), /* Titre de la fenetre */
path, /* Chemin par defaut */
wxDD_DEFAULT_STYLE,
this, /* parent frame */
wxDefaultPosition );
m_LibDirCtrl->SetValue(path); if( !select )
return;
m_LibDirCtrl->SetValue( path );
} }
eeschema/dialog_eeschema_config.h deleted 100644 → 0
View file @ c6501e7d
/////////////////////////////////////////////////////////////////////////////
// Name: dialog_eeschema_config.h
// Purpose:
// Author: jean-pierre Charras
// Modified by:
// Created: 17/02/2006 21:14:46
// RCS-ID:
// Copyright: License GNU
// Licence:
/////////////////////////////////////////////////////////////////////////////
// Generated by DialogBlocks (unregistered), 17/02/2006 21:14:46
#ifndef _DIALOG_EESCHEMA_CONFIG_H_
#define _DIALOG_EESCHEMA_CONFIG_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "dialog_eeschema_config.h"
#endif
/*!
* Includes
*/
////@begin includes
////@end includes
/*!
* Forward declarations
*/
////@begin forward declarations
////@end forward declarations
/*!
* Control identifiers
*/
////@begin control identifiers
#define ID_DIALOG 10000
#define SAVE_CFG 10001
#define FORMAT_NETLIST 10006
#define REMOVE_LIB 10009
#define ADD_LIB 10010
#define INSERT_LIB 10011
#define ID_LISTBOX 10012
#define ID_TEXTCTRL 10007
#define ID_LIB_PATH_SEL 10008
#define SYMBOL_KICONFIGEESCHEMAFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define SYMBOL_KICONFIGEESCHEMAFRAME_TITLE _("Dialog")
#define SYMBOL_KICONFIGEESCHEMAFRAME_IDNAME ID_DIALOG
#define SYMBOL_KICONFIGEESCHEMAFRAME_SIZE wxSize(400, 300)
#define SYMBOL_KICONFIGEESCHEMAFRAME_POSITION wxDefaultPosition
////@end control identifiers
/*!
* Compatibility
*/
#ifndef wxCLOSE_BOX
#define wxCLOSE_BOX 0x1000
#endif
/*!
* KiConfigEeschemaFrame class declaration
*/
class KiConfigEeschemaFrame: public wxDialog
{
DECLARE_DYNAMIC_CLASS( KiConfigEeschemaFrame )
DECLARE_EVENT_TABLE()
public:
/// Constructors
KiConfigEeschemaFrame( );
KiConfigEeschemaFrame( WinEDA_SchematicFrame* parent, wxWindowID id = SYMBOL_KICONFIGEESCHEMAFRAME_IDNAME, const wxString& caption = SYMBOL_KICONFIGEESCHEMAFRAME_TITLE, const wxPoint& pos = SYMBOL_KICONFIGEESCHEMAFRAME_POSITION, const wxSize& size = SYMBOL_KICONFIGEESCHEMAFRAME_SIZE, long style = SYMBOL_KICONFIGEESCHEMAFRAME_STYLE );
/// Creation
bool Create( wxWindow* parent, wxWindowID id = SYMBOL_KICONFIGEESCHEMAFRAME_IDNAME, const wxString& caption = SYMBOL_KICONFIGEESCHEMAFRAME_TITLE, const wxPoint& pos = SYMBOL_KICONFIGEESCHEMAFRAME_POSITION, const wxSize& size = SYMBOL_KICONFIGEESCHEMAFRAME_SIZE, long style = SYMBOL_KICONFIGEESCHEMAFRAME_STYLE );
/// Creates the controls and sizers
void CreateControls();
////@begin KiConfigEeschemaFrame event handler declarations
/// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
void OnCloseWindow( wxCloseEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for SAVE_CFG
void OnSaveCfgClick( wxCommandEvent& event );
/// wxEVT_COMMAND_LISTBOX_SELECTED event handler for FORMAT_NETLIST
void OnFormatNetlistSelected( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for REMOVE_LIB
void OnRemoveLibClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ADD_LIB
void OnAddLibClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for INSERT_LIB
void OnInsertLibClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_LIB_PATH_SEL
void OnLibPathSelClick( wxCommandEvent& event );
////@end KiConfigEeschemaFrame event handler declarations
////@begin KiConfigEeschemaFrame member function declarations
/// Retrieves bitmap resources
wxBitmap GetBitmapResource( const wxString& name );
/// Retrieves icon resources
wxIcon GetIconResource( const wxString& name );
////@end KiConfigEeschemaFrame member function declarations
/// Should we show tooltips?
static bool ShowToolTips();
void SetFormatsNetListes();
void LibDelFct(wxCommandEvent& event);
void AddOrInsertLibrary(wxCommandEvent& event);
void ChangeSetup();
////@begin KiConfigEeschemaFrame member variables
wxListBox* m_NetFormatBox;
wxStaticBoxSizer* m_FileExtList;
wxListBox* m_ListLibr;
wxTextCtrl* m_LibDirCtrl;
////@end KiConfigEeschemaFrame member variables
WinEDA_SchematicFrame * m_Parent;
bool m_LibListChanged;
};
#endif
// _DIALOG_EESCHEMA_CONFIG_H_
eeschema/dialog_eeschema_config.pjd deleted 100644 → 0
View file @ c6501e7d
<?xml version="1.0" encoding="UTF-8"?>
<anthemion-project version="1.0.0.0" xmlns="http://www.anthemion.co.uk">
<header>
<long name="name_counter">0</long>
<string name="html_path">""</string>
<string name="title">""</string>
<string name="author">""</string>
<string name="description">""</string>
<string name="xrc_filename">""</string>
<bool name="convert_images_to_xpm">0</bool>
<bool name="inline_images">0</bool>
<bool name="generate_cpp_for_xrc">0</bool>
<long name="working_mode">1</long>
<bool name="use_help_text_for_tooltips">1</bool>
<bool name="translate_strings">1</bool>
<bool name="make_unicode_strings">1</bool>
<bool name="extract_strings">0</bool>
<string name="user_name">"jean-pierre Charras"</string>
<string name="copyright_string">"License GNU"</string>
<string name="resource_prefix">""</string>
<bool name="use_two_step_construction">0</bool>
<bool name="use_enums">0</bool>
<string name="current_platform">"&lt;All platforms&gt;"</string>
<string name="target_wx_version">"&lt;Any&gt;"</string>
<string name="cpp_header_comment">"/////////////////////////////////////////////////////////////////////////////
// Name: %HEADER-FILENAME%
// Purpose:
// Author: %AUTHOR%
// Modified by:
// Created: %DATE%
// RCS-ID:
// Copyright: %COPYRIGHT%
// Licence:
/////////////////////////////////////////////////////////////////////////////
"</string>
<string name="cpp_implementation_comment">"/////////////////////////////////////////////////////////////////////////////
// Name: %SOURCE-FILENAME%
// Purpose:
// Author: %AUTHOR%
// Modified by:
// Created: %DATE%
// RCS-ID:
// Copyright: %COPYRIGHT%
// Licence:
/////////////////////////////////////////////////////////////////////////////
"</string>
<string name="cpp_symbols_file_comment">"/////////////////////////////////////////////////////////////////////////////
// Name: %SYMBOLS-FILENAME%
// Purpose: Symbols file
// Author: %AUTHOR%
// Modified by:
// Created: %DATE%
// RCS-ID:
// Copyright: %COPYRIGHT%
// Licence:
/////////////////////////////////////////////////////////////////////////////
"</string>
<string name="cpp_header_preamble">"#if defined(__GNUG__) &amp;&amp; !defined(NO_GCC_PRAGMA)
#pragma interface &quot;%HEADER-FILENAME%&quot;
#endif
"</string>
<string name="cpp_implementation_preamble">"#if defined(__GNUG__) &amp;&amp; !defined(NO_GCC_PRAGMA)
#pragma implementation &quot;%HEADER-FILENAME%&quot;
#endif
// For compilers that support precompilation, includes &quot;wx/wx.h&quot;.
#include &quot;wx/wxprec.h&quot;
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include &quot;wx/wx.h&quot;
#endif
"</string>
<string name="cpp_function_declaration_comment">" /// %BODY%
"</string>
<string name="cpp_function_implementation_comment">"
/*!
* %BODY%
*/
"</string>
<string name="resource_file_header">"app_resources.h"</string>
<string name="resource_file_implementation">"app_resources.cpp"</string>
<string name="resource_class_name">"AppResources"</string>
<string name="app_file_header">"app.h"</string>
<string name="app_file_implementation">"app.cpp"</string>
<string name="app_class_name">"Application"</string>
<bool name="generate_app_class">0</bool>
<string name="external_symbol_filenames">""</string>
<string name="configuration">"&lt;None&gt;"</string>
<string name="source_encoding">"&lt;System&gt;"</string>
<string name="xrc_encoding">"utf-8"</string>
<string name="project_encoding">"&lt;System&gt;"</string>
<string name="resource_archive">""</string>
<long name="text_file_type">0</long>
<bool name="use_tabs">0</bool>
<long name="indent_size">4</long>
<string name="whitespace_after_return_type">" "</string>
<string name="resource_xrc_cpp">""</string>
<bool name="use_resource_archive">0</bool>
<bool name="use_generated_xrc_cpp">0</bool>
<bool name="always_generate_xrc">1</bool>
<bool name="archive_xrc_files">1</bool>
<bool name="archive_image_files">1</bool>
<bool name="archive_all_image_files">0</bool>
<bool name="xrc_retain_relative_paths">1</bool>
<bool name="xrc_generate_id_tags">0</bool>
</header>
<data>
<document>
<string name="title">""</string>
<string name="type">"data-document"</string>
<string name="filename">""</string>
<string name="icon-name">""</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<document>
<string name="title">"Configurations"</string>
<string name="type">"config-data-document"</string>
<string name="filename">""</string>
<string name="icon-name">""</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="template-name">""</string>
<bool name="dirty">1</bool>
<string name="Compiler name">""</string>
<string name="Build mode">"Debug"</string>
<string name="Unicode mode">"ANSI"</string>
<string name="Shared mode">"Static"</string>
<string name="Modularity">"Modular"</string>
<string name="GUI mode">"GUI"</string>
<string name="Toolkit">"wxMSW"</string>
<string name="Runtime linking">"Dynamic"</string>
<string name="Use exceptions">"Yes"</string>
<string name="Use ODBC">"No"</string>
<string name="Use OpenGL">"No"</string>
<string name="wxWidgets version">"%WXVERSION%"</string>
<string name="Executable name">"%EXECUTABLE%"</string>
<string name="Program arguments">""</string>
<string name="Working path">"%AUTO%"</string>
<string name="Output path">"%AUTO%"</string>
<string name="Objects path">"%AUTO%"</string>
<string name="Compiler location">"%AUTO%"</string>
<string name="wxWidgets location">"%AUTO%"</string>
<string name="C++ command">"%AUTO%"</string>
<string name="Resource compiler">"%AUTO%"</string>
<string name="Make command">"%AUTO%"</string>
<string name="Project makefile">"%AUTO%"</string>
<string name="wxWidgets makefile">"%AUTO%"</string>
<string name="Compiler bin path">"%AUTO%"</string>
<string name="Compiler include path">"%AUTO%"</string>
<string name="Compiler lib path">"%AUTO%"</string>
<string name="Preprocessor flags">"%AUTO%"</string>
<string name="Optimizations">"%AUTO%"</string>
<string name="Warnings">"%AUTO%"</string>
<string name="Debug flags">"%AUTO%"</string>
<string name="Libraries">"%AUTO%"</string>
<string name="Library path">"%AUTO%"</string>
<string name="Linker flags">"%AUTO%"</string>
<string name="Include path">"%AUTO%"</string>
<string name="Resource flags">"%AUTO%"</string>
<string name="Resource path">"%AUTO%"</string>
<string name="wxWidgets build path">"%AUTO%"</string>
<string name="wxWidgets build command">"%AUTO%"</string>
<string name="wxWidgets clean command">"%AUTO%"</string>
<string name="PATH variable">"%AUTO%"</string>
</document>
</document>
</data>
<documents>
<document>
<string name="title">"Projects"</string>
<string name="type">"root-document"</string>
<string name="filename">""</string>
<string name="icon-name">"project"</string>
<long name="is-transient">1</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">1</long>
<document>
<string name="title">"Windows"</string>
<string name="type">"html-document"</string>
<string name="filename">""</string>
<string name="icon-name">"dialogsfolder"</string>
<long name="is-transient">1</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">1</long>
<document>
<string name="title">"Eeschema Configuration Setup"</string>
<string name="type">"dialog-document"</string>
<string name="filename">""</string>
<string name="icon-name">"dialog"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"17/11/2006"</string>
<string name="proxy-type">"wbDialogProxy"</string>
<long name="base-id">10000</long>
<bool name="use-id-prefix">0</bool>
<string name="id-prefix">""</string>
<bool name="use-id-suffix">0</bool>
<string name="id-suffix">""</string>
<long name="use-xrc">0</long>
<long name="working-mode">0</long>
<string name="event-handler-0">"wxEVT_CLOSE_WINDOW|OnCloseWindow"</string>
<string name="proxy-Id name">"ID_DIALOG"</string>
<long name="proxy-Id value">10000</long>
<string name="proxy-Class">"KiConfigEeschemaFrame"</string>
<string name="proxy-Base class">"wxDialog"</string>
<string name="proxy-Window kind">"wxDialog"</string>
<string name="proxy-Implementation filename">"dialog_eeschema_config.cpp"</string>
<string name="proxy-Header filename">"dialog_eeschema_config.h"</string>
<string name="proxy-XRC filename">""</string>
<string name="proxy-Title">"Dialog"</string>
<bool name="proxy-Centre">1</bool>
<string name="proxy-Icon">""</string>
<bool name="proxy-Dialog units">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Texture">""</string>
<string name="proxy-Texture style">"Tiled"</string>
<bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>
<bool name="proxy-wxCAPTION">1</bool>
<bool name="proxy-wxRESIZE_BORDER">0</bool>
<bool name="proxy-wxTHICK_FRAME">0</bool>
<bool name="proxy-wxSYSTEM_MENU">1</bool>
<bool name="proxy-wxSTAY_ON_TOP">0</bool>
<bool name="proxy-wxDIALOG_NO_PARENT">0</bool>
<bool name="proxy-wxCLOSE_BOX">1</bool>
<bool name="proxy-wxMAXIMIZE_BOX">0</bool>
<bool name="proxy-wxMINIMIZE_BOX">0</bool>
<bool name="proxy-wxDIALOG_MODAL">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxSIMPLE_BORDER">0</bool>
<bool name="proxy-wxDOUBLE_BORDER">0</bool>
<bool name="proxy-wxSUNKEN_BORDER">0</bool>
<bool name="proxy-wxRAISED_BORDER">0</bool>
<bool name="proxy-wxSTATIC_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxCLIP_CHILDREN">0</bool>
<bool name="proxy-wxTAB_TRAVERSAL">0</bool>
<bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
<bool name="proxy-wxWS_EX_BLOCK_EVENTS">1</bool>
<bool name="proxy-wxWS_EX_TRANSIENT">0</bool>
<string name="proxy-Custom styles">"MAYBE_RESIZE_BORDER"</string>
<bool name="proxy-wxDIALOG_EX_CONTEXTHELP">0</bool>
<bool name="proxy-Fit to content">1</bool>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">400</long>
<long name="proxy-Height">300</long>
<bool name="proxy-AUI manager">0</bool>
<string name="proxy-Event sources">""</string>
<document>
<string name="title">"wxBoxSizer V"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"sizer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"17/8/2006"</string>
<string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Member variable name">""</string>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<document>
<string name="title">"wxBoxSizer H"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"sizer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"17/8/2006"</string>
<string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Horizontal"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">1</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<document>
<string name="title">"wxBoxSizer V"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"sizer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"17/8/2006"</string>
<string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Expand"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<document>
<string name="title">"wxButton: SAVE_CFG"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"dialogcontrol"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"17/8/2006"</string>
<string name="proxy-type">"wbButtonProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnSaveCfgClick"</string>
<string name="proxy-Id name">"SAVE_CFG"</string>
<long name="proxy-Id value">10001</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxButton"</string>
<string name="proxy-Base class">"wxButton"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"Save Cfg"</string>
<bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">"save current configuration setting in the local .pro file"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">"CC0000"</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxBU_LEFT">0</bool>
<bool name="proxy-wxBU_RIGHT">0</bool>
<bool name="proxy-wxBU_TOP">0</bool>
<bool name="proxy-wxBU_BOTTOM">0</bool>
<bool name="proxy-wxBU_EXACTFIT">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"Spacer"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"spacer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"18/2/2006"</string>
<string name="proxy-type">"wbSpacerProxy"</string>
<long name="proxy-Width">5</long>
<long name="proxy-Height">5</long>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
</document>
<document>
<string name="title">"wxStaticText: wxID_STATIC"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"statictext"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"10/11/2007"</string>
<string name="proxy-type">"wbStaticTextProxy"</string>
<string name="proxy-Id name">"wxID_STATIC"</string>
<long name="proxy-Id value">5105</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxStaticText"</string>
<string name="proxy-Base class">"wxStaticText"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"NetList Formats:"</string>
<long name="proxy-Wrapping width">-1</long>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxALIGN_LEFT">0</bool>
<bool name="proxy-wxALIGN_RIGHT">0</bool>
<bool name="proxy-wxALIGN_CENTRE">0</bool>
<bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxSIMPLE_BORDER">0</bool>
<bool name="proxy-wxDOUBLE_BORDER">0</bool>
<bool name="proxy-wxSUNKEN_BORDER">0</bool>
<bool name="proxy-wxRAISED_BORDER">0</bool>
<bool name="proxy-wxSTATIC_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Left"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">0</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"wxListBox: FORMAT_NETLIST"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"listbox"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"17/7/2006"</string>
<string name="proxy-type">"wbListBoxProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_LISTBOX_SELECTED|OnFormatNetlistSelected|NONE||KiConfigEeschemaFrame"</string>
<string name="proxy-Id name">"FORMAT_NETLIST"</string>
<long name="proxy-Id value">10006</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxListBox"</string>
<string name="proxy-Base class">"wxListBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_NetFormatBox"</string>
<string name="proxy-Strings">""</string>
<string name="proxy-Initial value">""</string>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxLB_SINGLE">1</bool>
<bool name="proxy-wxLB_MULTIPLE">0</bool>
<bool name="proxy-wxLB_EXTENDED">0</bool>
<bool name="proxy-wxLB_ALWAYS_SB">0</bool>
<bool name="proxy-wxLB_NEEDED_SB">0</bool>
<bool name="proxy-wxLB_HSCROLL">0</bool>
<bool name="proxy-wxLB_SORT">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxSIMPLE_BORDER">0</bool>
<bool name="proxy-wxDOUBLE_BORDER">0</bool>
<bool name="proxy-wxSUNKEN_BORDER">0</bool>
<bool name="proxy-wxRAISED_BORDER">0</bool>
<bool name="proxy-wxSTATIC_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">0</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"Spacer"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"spacer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"18/2/2006"</string>
<string name="proxy-type">"wbSpacerProxy"</string>
<long name="proxy-Width">5</long>
<long name="proxy-Height">5</long>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
</document>
<document>
<string name="title">"wxStaticBoxSizer V"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"sizer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"17/8/2006"</string>
<string name="proxy-type">"wbStaticBoxSizerProxy"</string>
<string name="proxy-Id name">"wxID_ANY"</string>
<long name="proxy-Id value">-1</long>
<string name="proxy-Label">"Files ext:"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Sizer member variable name">"m_FileExtList"</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Static box class">"wxStaticBox"</string>
<string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
</document>
</document>
<document>
<string name="title">"wxBoxSizer V"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"sizer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"17/8/2006"</string>
<string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Expand"</string>
<long name="proxy-Stretch factor">1</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">0</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<document>
<string name="title">"wxBoxSizer V"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"sizer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"10/11/2007"</string>
<string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Expand"</string>
<long name="proxy-Stretch factor">1</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">0</bool>
<bool name="proxy-wxRIGHT">0</bool>
<bool name="proxy-wxTOP">0</bool>
<bool name="proxy-wxBOTTOM">0</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<document>
<string name="title">"wxBoxSizer H"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"sizer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"10/11/2007"</string>
<string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Horizontal"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<document>
<string name="title">"wxButton: REMOVE_LIB"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"dialogcontrol"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"10/11/2007"</string>
<string name="proxy-type">"wbButtonProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnRemoveLibClick|||"</string>
<string name="proxy-Id name">"REMOVE_LIB"</string>
<long name="proxy-Id value">10009</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxButton"</string>
<string name="proxy-Base class">"wxButton"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"Remove"</string>
<bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">"Unload the selected library"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">"CC0000"</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxBU_LEFT">0</bool>
<bool name="proxy-wxBU_RIGHT">0</bool>
<bool name="proxy-wxBU_TOP">0</bool>
<bool name="proxy-wxBU_BOTTOM">0</bool>
<bool name="proxy-wxBU_EXACTFIT">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"wxButton: ADD_LIB"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"dialogcontrol"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"10/11/2007"</string>
<string name="proxy-type">"wbButtonProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnAddLibClick|||"</string>
<string name="proxy-Id name">"ADD_LIB"</string>
<long name="proxy-Id value">10010</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxButton"</string>
<string name="proxy-Base class">"wxButton"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"Add"</string>
<bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">"Add a new library after the selected library, and load it"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">"008000"</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxBU_LEFT">0</bool>
<bool name="proxy-wxBU_RIGHT">0</bool>
<bool name="proxy-wxBU_TOP">0</bool>
<bool name="proxy-wxBU_BOTTOM">0</bool>
<bool name="proxy-wxBU_EXACTFIT">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"wxButton: INSERT_LIB"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"dialogcontrol"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"10/11/2007"</string>
<string name="proxy-type">"wbButtonProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnInsertLibClick|||"</string>
<string name="proxy-Id name">"INSERT_LIB"</string>
<long name="proxy-Id value">10011</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxButton"</string>
<string name="proxy-Base class">"wxButton"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"Ins"</string>
<bool name="proxy-Default">0</bool>
<string name="proxy-Help text">"Add a new library before the selected library, and load it"</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">"0000FF"</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxBU_LEFT">0</bool>
<bool name="proxy-wxBU_RIGHT">0</bool>
<bool name="proxy-wxBU_TOP">0</bool>
<bool name="proxy-wxBU_BOTTOM">0</bool>
<bool name="proxy-wxBU_EXACTFIT">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
</document>
<document>
<string name="title">"wxBoxSizer V"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"sizer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"10/11/2007"</string>
<string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">1</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<document>
<string name="title">"wxStaticText: wxID_STATIC"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"statictext"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"10/11/2007"</string>
<string name="proxy-type">"wbStaticTextProxy"</string>
<string name="proxy-Id name">"wxID_STATIC"</string>
<long name="proxy-Id value">5105</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxStaticText"</string>
<string name="proxy-Base class">"wxStaticText"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"Libraries"</string>
<long name="proxy-Wrapping width">-1</long>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">"CC0000"</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxALIGN_LEFT">0</bool>
<bool name="proxy-wxALIGN_RIGHT">0</bool>
<bool name="proxy-wxALIGN_CENTRE">0</bool>
<bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxSIMPLE_BORDER">0</bool>
<bool name="proxy-wxDOUBLE_BORDER">0</bool>
<bool name="proxy-wxSUNKEN_BORDER">0</bool>
<bool name="proxy-wxRAISED_BORDER">0</bool>
<bool name="proxy-wxSTATIC_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Left"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">0</bool>
<bool name="proxy-wxBOTTOM">0</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">1</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"wxListBox: ID_LISTBOX"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"listbox"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"10/11/2007"</string>
<string name="proxy-type">"wbListBoxProxy"</string>
<string name="proxy-Id name">"ID_LISTBOX"</string>
<long name="proxy-Id value">10012</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxListBox"</string>
<string name="proxy-Base class">"wxListBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_ListLibr"</string>
<string name="proxy-Strings">""</string>
<string name="proxy-Initial value">""</string>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxLB_SINGLE">1</bool>
<bool name="proxy-wxLB_MULTIPLE">0</bool>
<bool name="proxy-wxLB_EXTENDED">0</bool>
<bool name="proxy-wxLB_ALWAYS_SB">0</bool>
<bool name="proxy-wxLB_NEEDED_SB">0</bool>
<bool name="proxy-wxLB_HSCROLL">0</bool>
<bool name="proxy-wxLB_SORT">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxSIMPLE_BORDER">0</bool>
<bool name="proxy-wxDOUBLE_BORDER">0</bool>
<bool name="proxy-wxSUNKEN_BORDER">0</bool>
<bool name="proxy-wxRAISED_BORDER">0</bool>
<bool name="proxy-wxSTATIC_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">1</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">0</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">1</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
</document>
</document>
</document>
</document>
<document>
<string name="title">"wxStaticBoxSizer H"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"sizer"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"28/2/2007"</string>
<string name="proxy-type">"wbStaticBoxSizerProxy"</string>
<string name="proxy-Id name">"wxID_ANY"</string>
<string name="proxy-Id value">"-1"</string>
<string name="proxy-Label">"Default library file path:"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Sizer member variable name">""</string>
<string name="proxy-Foreground colour">"CE0000"</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Static box class">"wxStaticBox"</string>
<string name="proxy-Orientation">"Horizontal"</string>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<document>
<string name="title">"wxTextCtrl: ID_TEXTCTRL"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"textctrl"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"28/2/2007"</string>
<string name="proxy-type">"wbTextCtrlProxy"</string>
<string name="proxy-Id name">"ID_TEXTCTRL"</string>
<long name="proxy-Id value">10007</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxTextCtrl"</string>
<string name="proxy-Base class">"wxTextCtrl"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_LibDirCtrl"</string>
<string name="proxy-Initial value">""</string>
<long name="proxy-Max length">0</long>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">"Default path to search libraries which have no absolute path in name,
or a name which does not start by ./ or ../
If void, the default path is kicad/library"</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxTE_MULTILINE">0</bool>
<bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
<bool name="proxy-wxTE_PROCESS_TAB">0</bool>
<bool name="proxy-wxTE_PASSWORD">0</bool>
<bool name="proxy-wxTE_READONLY">0</bool>
<bool name="proxy-wxTE_RICH">0</bool>
<bool name="proxy-wxTE_RICH2">0</bool>
<bool name="proxy-wxTE_AUTO_URL">0</bool>
<bool name="proxy-wxTE_NOHIDESEL">0</bool>
<bool name="proxy-wxTE_LEFT">0</bool>
<bool name="proxy-wxTE_CENTRE">0</bool>
<bool name="proxy-wxTE_RIGHT">0</bool>
<bool name="proxy-wxHSCROLL">0</bool>
<bool name="proxy-wxTE_CHARWRAP">0</bool>
<bool name="proxy-wxTE_WORDWRAP">0</bool>
<bool name="proxy-wxTE_CAPITALIZE">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxSIMPLE_BORDER">0</bool>
<bool name="proxy-wxDOUBLE_BORDER">0</bool>
<bool name="proxy-wxSUNKEN_BORDER">0</bool>
<bool name="proxy-wxRAISED_BORDER">0</bool>
<bool name="proxy-wxSTATIC_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Expand"</string>
<long name="proxy-Stretch factor">1</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">0</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"wxButton: ID_LIB_PATH_SEL"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"dialogcontrol"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"28/2/2007"</string>
<string name="proxy-type">"wbButtonProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnLibPathSelClick"</string>
<string name="proxy-Id name">"ID_LIB_PATH_SEL"</string>
<long name="proxy-Id value">10008</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxButton"</string>
<string name="proxy-Base class">"wxButton"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"Browse"</string>
<bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxBU_LEFT">0</bool>
<bool name="proxy-wxBU_RIGHT">0</bool>
<bool name="proxy-wxBU_TOP">0</bool>
<bool name="proxy-wxBU_BOTTOM">0</bool>
<bool name="proxy-wxBU_EXACTFIT">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
</document>
</document>
</document>
</document>
<document>
<string name="title">"Sources"</string>
<string name="type">"html-document"</string>
<string name="filename">""</string>
<string name="icon-name">"sourcesfolder"</string>
<long name="is-transient">1</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">1</long>
<document>
<string name="title">"dialog_eeschema_config.rc"</string>
<string name="type">"source-editor-document"</string>
<string name="filename">"dialog_eeschema_config.rc"</string>
<string name="icon-name">"source-editor"</string>
<long name="is-transient">0</long>
<long name="owns-file">0</long>
<long name="title-mode">1</long>
<long name="locked">0</long>
<string name="created">"17/11/2006"</string>
<string name="language">""</string>
</document>
</document>
<document>
<string name="title">"Images"</string>
<string name="type">"html-document"</string>
<string name="filename">""</string>
<string name="icon-name">"bitmapsfolder"</string>
<long name="is-transient">1</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">1</long>
</document>
</document>
</documents>
</anthemion-project>
eeschema/dialog_eeschema_config_fbp.cpp 0 → 100644
View file @ 71ca194b
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "dialog_eeschema_config_fbp.h"
///////////////////////////////////////////////////////////////////////////
DIALOG_EESCHEMA_CONFIG_FBP::DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bUpperSizer;
bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bLeftSizer;
bLeftSizer = new wxBoxSizer( wxVERTICAL );
m_staticTextNetListFormats = new wxStaticText( this, wxID_ANY, _("NetList Formats:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextNetListFormats->Wrap( -1 );
bLeftSizer->Add( m_staticTextNetListFormats, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_NetFormatBox = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE );
bLeftSizer->Add( m_NetFormatBox, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
bLeftSizer->Add( 0, 20, 0, wxEXPAND, 5 );
wxStaticBoxSizer* sFileExtBox;
sFileExtBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Files ext:") ), wxVERTICAL );
m_InfoCmpFileExt = new wxStaticText( this, wxID_ANY, _("Cmp file Ext: "), wxDefaultPosition, wxDefaultSize, 0 );
m_InfoCmpFileExt->Wrap( -1 );
sFileExtBox->Add( m_InfoCmpFileExt, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_InfoNetFileExt = new wxStaticText( this, wxID_ANY, _("Net file Ext: "), wxDefaultPosition, wxDefaultSize, 0 );
m_InfoNetFileExt->Wrap( -1 );
sFileExtBox->Add( m_InfoNetFileExt, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_InfoLibFileExt = new wxStaticText( this, wxID_ANY, _("Library file Ext: "), wxDefaultPosition, wxDefaultSize, 0 );
m_InfoLibFileExt->Wrap( -1 );
sFileExtBox->Add( m_InfoLibFileExt, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_InfoSymbFileExt = new wxStaticText( this, wxID_ANY, _("Symbol file Ext: "), wxDefaultPosition, wxDefaultSize, 0 );
m_InfoSymbFileExt->Wrap( -1 );
sFileExtBox->Add( m_InfoSymbFileExt, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_InfoSchFileExt = new wxStaticText( this, wxID_ANY, _("Schematic file Ext: "), wxDefaultPosition, wxDefaultSize, 0 );
m_InfoSchFileExt->Wrap( -1 );
sFileExtBox->Add( m_InfoSchFileExt, 0, wxALL, 5 );
bLeftSizer->Add( sFileExtBox, 0, wxEXPAND, 5 );
bUpperSizer->Add( bLeftSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
wxStaticBoxSizer* sbLibsChoiceSizer;
sbLibsChoiceSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Libraries") ), wxVERTICAL );
wxBoxSizer* bLibsButtonsSizer;
bLibsButtonsSizer = new wxBoxSizer( wxHORIZONTAL );
sbLibsChoiceSizer->Add( bLibsButtonsSizer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
m_staticTextlibList = new wxStaticText( this, wxID_ANY, _("Active Libraries:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextlibList->Wrap( -1 );
sbLibsChoiceSizer->Add( m_staticTextlibList, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_ListLibr = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE );
m_ListLibr->SetToolTip( _("List of active library files.\nOnly library files in this list are loaded by Eeschema.\nThe order of this list is important:\nEeschema searchs for a given component using this list order priority.") );
m_ListLibr->SetMinSize( wxSize( 300,-1 ) );
sbLibsChoiceSizer->Add( m_ListLibr, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bUpperSizer->Add( sbLibsChoiceSizer, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bRightSizer;
bRightSizer = new wxBoxSizer( wxVERTICAL );
m_buttonRemove = new wxButton( this, ID_REMOVE_LIB, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonRemove->SetForegroundColour( wxColour( 186, 1, 38 ) );
m_buttonRemove->SetToolTip( _("Unload the selected library") );
bRightSizer->Add( m_buttonRemove, 0, wxALL, 5 );
m_buttonAdd = new wxButton( this, ID_ADD_LIB, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonAdd->SetForegroundColour( wxColour( 13, 118, 1 ) );
m_buttonAdd->SetToolTip( _("Add a new library after the selected library, and load it") );
bRightSizer->Add( m_buttonAdd, 0, wxALL, 5 );
m_buttonIns = new wxButton( this, wxID_ANY, _("Ins"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonIns->SetForegroundColour( wxColour( 0, 65, 130 ) );
m_buttonIns->SetToolTip( _("Add a new library before the selected library, and load it") );
bRightSizer->Add( m_buttonIns, 0, wxALL, 5 );
bRightSizer->Add( 0, 20, 1, wxEXPAND, 5 );
m_buttonOk = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
bRightSizer->Add( m_buttonOk, 0, wxALL, 5 );
m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonCancel->SetForegroundColour( wxColour( 14, 0, 179 ) );
bRightSizer->Add( m_buttonCancel, 0, wxALL, 5 );
m_buttonSave = new wxButton( this, ID_SAVE_CFG, _("Save Cfg"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonSave->SetToolTip( _("Accept and save current configuration setting in the local .pro file") );
bRightSizer->Add( m_buttonSave, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
bUpperSizer->Add( bRightSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bMainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
wxStaticBoxSizer* sbLibPathSizer;
sbLibPathSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Default library file path:") ), wxHORIZONTAL );
m_LibDirCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_LibDirCtrl->SetToolTip( _("Default path to search libraries which have no absolute path in name,\nor a name which does not start by ./ or ../\nIf void, the default path is kicad/share/library") );
sbLibPathSizer->Add( m_LibDirCtrl, 1, wxALL, 5 );
m_buttonBrowse = new wxButton( this, ID_LIB_PATH_SEL, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
sbLibPathSizer->Add( m_buttonBrowse, 0, wxALL, 5 );
bMainSizer->Add( sbLibPathSizer, 0, wxEXPAND, 5 );
this->SetSizer( bMainSizer );
this->Layout();
// Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnCloseWindow ) );
m_buttonRemove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnRemoveLibClick ), NULL, this );
m_buttonAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnAddOrInsertLibClick ), NULL, this );
m_buttonIns->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnAddOrInsertLibClick ), NULL, this );
m_buttonOk->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnOkClick ), NULL, this );
m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnCancelClick ), NULL, this );
m_buttonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnSaveCfgClick ), NULL, this );
m_buttonBrowse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnLibPathSelClick ), NULL, this );
}
DIALOG_EESCHEMA_CONFIG_FBP::~DIALOG_EESCHEMA_CONFIG_FBP()
{
// Disconnect Events
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnCloseWindow ) );
m_buttonRemove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnRemoveLibClick ), NULL, this );
m_buttonAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnAddOrInsertLibClick ), NULL, this );
m_buttonIns->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnAddOrInsertLibClick ), NULL, this );
m_buttonOk->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnOkClick ), NULL, this );
m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnCancelClick ), NULL, this );
m_buttonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnSaveCfgClick ), NULL, this );
m_buttonBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EESCHEMA_CONFIG_FBP::OnLibPathSelClick ), NULL, this );
}
eeschema/dialog_eeschema_config_fbp.fbp 0 → 100644
View file @ 71ca194b
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
<FileVersion major="1" minor="9" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
<property name="disconnect_events">1</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="file">dialog_eeschema_config_fbp</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="internationalize">1</property>
<property name="name">dialog_eeschema_config</property>
<property name="namespace"></property>
<property name="path">.</property>
<property name="precompiled_header"></property>
<property name="relative_path">1</property>
<property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1">
<property name="bg"></property>
<property name="center"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="extra_style"></property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">DIALOG_EESCHEMA_CONFIG_FBP</property>
<property name="pos"></property>
<property name="size">593,400</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass"></property>
<property name="title"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnActivate"></event>
<event name="OnActivateApp"></event>
<event name="OnChar"></event>
<event name="OnClose">OnCloseWindow</event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnHibernate"></event>
<event name="OnIconize"></event>
<event name="OnIdle"></event>
<event name="OnInitDialog"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bMainSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bUpperSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bLeftSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">NetList Formats:</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_staticTextNetListFormats</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxListBox" expanded="1">
<property name="bg"></property>
<property name="choices"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_NetFormatBox</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxLB_SINGLE</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnListBox"></event>
<event name="OnListBoxDClick"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="spacer" expanded="1">
<property name="height">20</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Files ext:</property>
<property name="minimum_size"></property>
<property name="name">sFileExtBox</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Cmp file Ext: </property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_InfoCmpFileExt</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Net file Ext: </property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_InfoNetFileExt</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Library file Ext: </property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_InfoLibFileExt</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Symbol file Ext: </property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_InfoSymbFileExt</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Schematic file Ext: </property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_InfoSchFileExt</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Libraries</property>
<property name="minimum_size"></property>
<property name="name">sbLibsChoiceSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bLibsButtonsSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Active Libraries:</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_staticTextlibList</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxListBox" expanded="1">
<property name="bg"></property>
<property name="choices"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size">300,-1</property>
<property name="name">m_ListLibr</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE</property>
<property name="subclass"></property>
<property name="tooltip">List of active library files.&#x0A;Only library files in this list are loaded by Eeschema.&#x0A;The order of this list is important:&#x0A;Eeschema searchs for a given component using this list order priority.</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnListBox"></event>
<event name="OnListBoxDClick"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bRightSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg">186,1,38</property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">ID_REMOVE_LIB</property>
<property name="label">Remove</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonRemove</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip">Unload the selected library</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnRemoveLibClick</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg">13,118,1</property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">ID_ADD_LIB</property>
<property name="label">Add</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonAdd</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip">Add a new library after the selected library, and load it</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnAddOrInsertLibClick</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg">0,65,130</property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Ins</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonIns</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip">Add a new library before the selected library, and load it</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnAddOrInsertLibClick</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="spacer" expanded="1">
<property name="height">20</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
<property name="label">Ok</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonOk</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnOkClick</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg">14,0,179</property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonCancel</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnCancelClick</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">ID_SAVE_CFG</property>
<property name="label">Save Cfg</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonSave</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip">Accept and save current configuration setting in the local .pro file</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnSaveCfgClick</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticLine" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_staticline1</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxLI_HORIZONTAL</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Default library file path:</property>
<property name="minimum_size"></property>
<property name="name">sbLibPathSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="maxlength">0</property>
<property name="minimum_size"></property>
<property name="name">m_LibDirCtrl</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip">Default path to search libraries which have no absolute path in name,&#x0A;or a name which does not start by ./ or ../&#x0A;If void, the default path is kicad/share/library</property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnText"></event>
<event name="OnTextEnter"></event>
<event name="OnTextMaxLen"></event>
<event name="OnTextURL"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">ID_LIB_PATH_SEL</property>
<property name="label">Browse</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonBrowse</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnLibPathSelClick</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</wxFormBuilder_Project>
eeschema/dialog_eeschema_config_fbp.h 0 → 100644
View file @ 71ca194b
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_eeschema_config_fbp__
#define __dialog_eeschema_config_fbp__
#include <wx/intl.h>
#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/listbox.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include <wx/button.h>
#include <wx/statline.h>
#include <wx/textctrl.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_EESCHEMA_CONFIG_FBP
///////////////////////////////////////////////////////////////////////////////
class DIALOG_EESCHEMA_CONFIG_FBP : public wxDialog
{
private:
protected:
enum
{
ID_REMOVE_LIB = 1000,
ID_ADD_LIB,
ID_SAVE_CFG,
ID_LIB_PATH_SEL,
};
wxStaticText* m_staticTextNetListFormats;
wxListBox* m_NetFormatBox;
wxStaticText* m_InfoCmpFileExt;
wxStaticText* m_InfoNetFileExt;
wxStaticText* m_InfoLibFileExt;
wxStaticText* m_InfoSymbFileExt;
wxStaticText* m_InfoSchFileExt;
wxStaticText* m_staticTextlibList;
wxListBox* m_ListLibr;
wxButton* m_buttonRemove;
wxButton* m_buttonAdd;
wxButton* m_buttonIns;
wxButton* m_buttonOk;
wxButton* m_buttonCancel;
wxButton* m_buttonSave;
wxStaticLine* m_staticline1;
wxTextCtrl* m_LibDirCtrl;
wxButton* m_buttonBrowse;
// Virtual event handlers, overide them in your derived class
virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
virtual void OnRemoveLibClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnAddOrInsertLibClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnSaveCfgClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnLibPathSelClick( wxCommandEvent& event ){ event.Skip(); }
public:
DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 593,400 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_EESCHEMA_CONFIG_FBP();
};
#endif //__dialog_eeschema_config_fbp__
eeschema/makefile.include
View file @ 71ca194b
...@@ -40,6 +40,7 @@ OBJECTS = eeschema.o\ ...@@ -40,6 +40,7 @@ OBJECTS = eeschema.o\
tool_sch.o\ tool_sch.o\
tool_viewlib.o\ tool_viewlib.o\
schframe.o\ schframe.o\
sch_item_struct.o\
viewlib_frame.o\ viewlib_frame.o\
dialog_print_using_printer_base.o\ dialog_print_using_printer_base.o\
dialog_print_using_printer.o\ dialog_print_using_printer.o\
...@@ -52,6 +53,7 @@ OBJECTS = eeschema.o\ ...@@ -52,6 +53,7 @@ OBJECTS = eeschema.o\
block_libedit.o\ block_libedit.o\
eeredraw.o\ eeredraw.o\
dialog_eeschema_config.o\ dialog_eeschema_config.o\
dialog_eeschema_config_fbp.o\
eelayer.o \ eelayer.o \
priorque.o eeconfig.o \ priorque.o eeconfig.o \
getpart.o\ getpart.o\
...@@ -191,8 +193,12 @@ onleftclick.o: onleftclick.cpp $(DEPEND) ...@@ -191,8 +193,12 @@ onleftclick.o: onleftclick.cpp $(DEPEND)
eeredraw.o: eeredraw.cpp $(DEPEND) eeredraw.o: eeredraw.cpp $(DEPEND)
dialog_eeschema_config.o: dialog_eeschema_config.cpp dialog_eeschema_config.h $(DEPEND) dialog_eeschema_config.o: dialog_eeschema_config.cpp dialog_eeschema_config_fbp.h $(DEPEND)
dialog_eeschema_config_fbp.o: dialog_eeschema_config_fbp.cpp dialog_eeschema_config_fbp.h $(DEPEND)
libedit.o: libedit.cpp $(DEPEND) libedit.o: libedit.cpp $(DEPEND)
sch_item_struct.o: ../common/sch_item_struct.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../common/$*.cpp
gerbview/makefile.include
View file @ 71ca194b
EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a\ EXTRALIBS = ../common/common.a ../common/pcbcommon.a ../bitmaps/libbitmaps.a\
../polygon/lib_polygon.a ../polygon/kbool/src/libkbool.a ../polygon/lib_polygon.a ../polygon/kbool/src/libkbool.a
EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing\ EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing\
......
include/drawtxt.h
View file @ 71ca194b
...@@ -10,10 +10,15 @@ ...@@ -10,10 +10,15 @@
class WinEDA_DrawPanel; class WinEDA_DrawPanel;
/** Function NegableTextLength
* Return the text length of a negable string, excluding the ~ markers */
int NegableTextLength( const wxString& aText );
/** Function DrawGraphicText /** Function DrawGraphicText
* Draw a graphic text (like module texts) * Draw a graphic text (like module texts)
* @param aPanel = the current DrawPanel. NULL if draw within a 3D GL Canvas * @param aPanel = the current DrawPanel. NULL if draw within a 3D GL Canvas
* @param aDC = the current Device Context. NULL if draw within a 3D GL Canvas * @param aDC = the current Device Context. NULL if draw within a 3D GL Canvas
* @param aPos = text position (according to h_justify, v_justify) * @param aPos = text position (according to h_justify, v_justify)
* @param aColor (enum EDA_Colors) = text color * @param aColor (enum EDA_Colors) = text color
* @param aText = text to draw * @param aText = text to draw
...@@ -24,21 +29,23 @@ class WinEDA_DrawPanel; ...@@ -24,21 +29,23 @@ class WinEDA_DrawPanel;
* @param aWidth = line width (pen width) (default = 0) * @param aWidth = line width (pen width) (default = 0)
* if width < 0 : draw segments in sketch mode, width = abs(width) * if width < 0 : draw segments in sketch mode, width = abs(width)
* @param aItalic = true to simulate an italic font * @param aItalic = true to simulate an italic font
* @param aNegable = true to enable the ~ char for overbarring
* @param aCallback() = function called (if non null) to draw each segment. * @param aCallback() = function called (if non null) to draw each segment.
* used to draw 3D texts or for plotting, NULL for normal drawings * used to draw 3D texts or for plotting, NULL for normal drawings
*/ */
void DrawGraphicText( WinEDA_DrawPanel* aPanel, void DrawGraphicText( WinEDA_DrawPanel * aPanel,
wxDC* aDC, wxDC * aDC,
const wxPoint& aPos, const wxPoint &aPos,
enum EDA_Colors aColor, enum EDA_Colors aColor,
const wxString& aText, const wxString &aText,
int aOrient, int aOrient,
const wxSize& aSize, const wxSize &aSize,
enum GRTextHorizJustifyType aH_justify, enum GRTextHorizJustifyType aH_justify,
enum GRTextVertJustifyType aV_justify, enum GRTextVertJustifyType aV_justify,
int aWidth = 0, int aWidth = 0,
bool aItalic = false, bool aItalic = false,
void (*aCallback)(int x0, int y0, int xf, int yf) = NULL); bool aNegable = false,
void (*aCallback)( int x0, int y0, int xf, int yf ) = NULL );
/** Function PlotGraphicText /** Function PlotGraphicText
* same as DrawGraphicText, but plot graphic text insteed of draw it * same as DrawGraphicText, but plot graphic text insteed of draw it
...@@ -53,18 +60,19 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, ...@@ -53,18 +60,19 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel,
* @param aWidth = line width (pen width) (default = 0) * @param aWidth = line width (pen width) (default = 0)
* if width < 0 : draw segments in sketch mode, width = abs(width) * if width < 0 : draw segments in sketch mode, width = abs(width)
* @param aItalic = true to simulate an italic font * @param aItalic = true to simulate an italic font
* @param aNegable = true to enable the ~ char for overbarring
*/ */
void PlotGraphicText( int aFormat_plot, void PlotGraphicText( int aFormat_plot,
const wxPoint& aPos, const wxPoint& aPos,
enum EDA_Colors aColor, enum EDA_Colors aColor,
const wxString& aText, const wxString& aText,
int aOrient, int aOrient,
const wxSize& aSize, const wxSize& aSize,
enum GRTextHorizJustifyType aH_justify, enum GRTextHorizJustifyType aH_justify,
enum GRTextVertJustifyType aV_justify, enum GRTextVertJustifyType aV_justify,
int aWidth, int aWidth,
bool aItalic = false ); bool aItalic = false,
bool aNegable = false );
#endif /* __INCLUDE__DRAWTXT_H__ */ #endif /* __INCLUDE__DRAWTXT_H__ */
internat/fr/kicad.mo
View file @ 71ca194b
No preview for this file type
internat/fr/kicad.po
View file @ 71ca194b
...@@ -2,9 +2,9 @@ msgid "" ...@@ -2,9 +2,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kicad\n" "Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-26 20:06+0100\n" "POT-Creation-Date: 2009-04-02 20:09+0100\n"
"PO-Revision-Date: 2009-03-27 08:26+0100\n" "PO-Revision-Date: 2009-04-02 20:09+0100\n"
"Last-Translator: jp charras <jean-pierre.charras@inpg.fr>\n" "Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n" "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
...@@ -23,26 +23,10 @@ msgstr "" ...@@ -23,26 +23,10 @@ msgstr ""
"X-Poedit-SearchPath-7: share\n" "X-Poedit-SearchPath-7: share\n"
#: pcbnew/plothpgl.cpp:68 #: pcbnew/plothpgl.cpp:68
#: pcbnew/gen_modules_placefile.cpp:147
#: pcbnew/gen_modules_placefile.cpp:163
#: pcbnew/gen_modules_placefile.cpp:331
#: pcbnew/librairi.cpp:306
#: pcbnew/librairi.cpp:452
#: pcbnew/librairi.cpp:604
#: pcbnew/librairi.cpp:807
#: pcbnew/files.cpp:363
#: pcbnew/export_gencad.cpp:86
#: eeschema/plotps.cpp:471
#: eeschema/plothpgl.cpp:678
#: cvpcb/genequiv.cpp:45
#: gerbview/export_to_pcbnew.cpp:78
#: common/hotkeys_basic.cpp:389
msgid "Unable to create " msgid "Unable to create "
msgstr "Impossible de créer " msgstr "Impossible de créer "
#: pcbnew/plothpgl.cpp:75 #: pcbnew/plothpgl.cpp:75
#: pcbnew/plotgerb.cpp:112
#: pcbnew/plotps.cpp:53
msgid "File" msgid "File"
msgstr "Fichier" msgstr "Fichier"
...@@ -59,72 +43,34 @@ msgid "PCB Text" ...@@ -59,72 +43,34 @@ msgid "PCB Text"
msgstr "Texte Pcb" msgstr "Texte Pcb"
#: pcbnew/class_pcb_text.cpp:181 #: pcbnew/class_pcb_text.cpp:181
#: pcbnew/class_track.cpp:950
#: pcbnew/class_drawsegment.cpp:302
#: pcbnew/class_pad.cpp:554
#: pcbnew/dialog_print_using_printer.cpp:179
#: pcbnew/sel_layer.cpp:147
#: pcbnew/class_module.cpp:937
#: pcbnew/class_zone.cpp:904
#: pcbnew/dialog_edit_module.cpp:263
#: pcbnew/class_text_mod.cpp:496
msgid "Layer" msgid "Layer"
msgstr "Couche" msgstr "Couche"
#: pcbnew/class_pcb_text.cpp:185 #: pcbnew/class_pcb_text.cpp:185
#: pcbnew/cotation.cpp:112
#: pcbnew/modedit_onclick.cpp:245
#: pcbnew/class_text_mod.cpp:502
#: pcbnew/dialog_print_using_printer_base.cpp:94
#: pcbnew/dialog_pcb_text_properties.cpp:165
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:54
msgid "Mirror" msgid "Mirror"
msgstr "Miroir" msgstr "Miroir"
#: pcbnew/class_pcb_text.cpp:187 #: pcbnew/class_pcb_text.cpp:187
#: pcbnew/dialog_display_options_base.cpp:120
#: pcbnew/class_text_mod.cpp:486
#: eeschema/dialog_options.cpp:269
msgid "No" msgid "No"
msgstr "Non" msgstr "Non"
#: pcbnew/class_pcb_text.cpp:189 #: pcbnew/class_pcb_text.cpp:189
#: pcbnew/dialog_display_options_base.cpp:120
#: pcbnew/class_text_mod.cpp:488
#: eeschema/dialog_options.cpp:268
msgid "Yes" msgid "Yes"
msgstr "Oui" msgstr "Oui"
#: pcbnew/class_pcb_text.cpp:192 #: pcbnew/class_pcb_text.cpp:192
#: pcbnew/class_pad.cpp:597
#: pcbnew/class_module.cpp:961
#: pcbnew/dialog_edit_module.cpp:274
#: pcbnew/class_text_mod.cpp:505
#: eeschema/affiche.cpp:118
msgid "Orient" msgid "Orient"
msgstr "Orient" msgstr "Orient"
#: pcbnew/class_pcb_text.cpp:195 #: pcbnew/class_pcb_text.cpp:195
#: pcbnew/class_track.cpp:973
#: pcbnew/cotation.cpp:128
#: pcbnew/mirepcb.cpp:113
#: pcbnew/class_drawsegment.cpp:307
#: pcbnew/class_edge_mod.cpp:252
#: pcbnew/class_text_mod.cpp:508
#: pcbnew/dialog_pcb_text_properties.cpp:118
#: eeschema/dialog_cmp_graphic_properties.cpp:189
msgid "Width" msgid "Width"
msgstr "Epaisseur" msgstr "Epaisseur"
#: pcbnew/class_pcb_text.cpp:198 #: pcbnew/class_pcb_text.cpp:198
#: pcbnew/class_pad.cpp:568
#: pcbnew/class_text_mod.cpp:511
msgid "H Size" msgid "H Size"
msgstr "Taille H" msgstr "Taille H"
#: pcbnew/class_pcb_text.cpp:201 #: pcbnew/class_pcb_text.cpp:201
#: pcbnew/class_pad.cpp:572
#: pcbnew/class_text_mod.cpp:514
msgid "V Size" msgid "V Size"
msgstr "Taille V" msgstr "Taille V"
...@@ -133,14 +79,11 @@ msgid "Read Config File" ...@@ -133,14 +79,11 @@ msgid "Read Config File"
msgstr "Lire Fichier Config" msgstr "Lire Fichier Config"
#: pcbnew/pcbcfg.cpp:86 #: pcbnew/pcbcfg.cpp:86
#: cvpcb/menucfg.cpp:168
#, c-format #, c-format
msgid "File %s not found" msgid "File %s not found"
msgstr "Fichier %s non trouvé" msgstr "Fichier %s non trouvé"
#: pcbnew/pcbcfg.cpp:211 #: pcbnew/pcbcfg.cpp:211
#: eeschema/eeconfig.cpp:214
#: cvpcb/cfg.cpp:75
msgid "Save preferences" msgid "Save preferences"
msgstr "Sauver préférences" msgstr "Sauver préférences"
...@@ -215,8 +158,6 @@ msgid "Component [%s]: footprint <%s> not found" ...@@ -215,8 +158,6 @@ msgid "Component [%s]: footprint <%s> not found"
msgstr "Composant [%s]: Module <%s> non trouvé en librairie" msgstr "Composant [%s]: Module <%s> non trouvé en librairie"
#: pcbnew/modules.cpp:83 #: pcbnew/modules.cpp:83
#: pcbnew/librairi.cpp:527
#: common/get_component_dialog.cpp:99
msgid "Name:" msgid "Name:"
msgstr "Nom:" msgstr "Nom:"
...@@ -225,19 +166,15 @@ msgid "Search footprint" ...@@ -225,19 +166,15 @@ msgid "Search footprint"
msgstr "Cherche Module" msgstr "Cherche Module"
#: pcbnew/modules.cpp:311 #: pcbnew/modules.cpp:311
#: pcbnew/onrightclick.cpp:740
msgid "Delete Module" msgid "Delete Module"
msgstr "Supprimer Module" msgstr "Supprimer Module"
#: pcbnew/modules.cpp:312 #: pcbnew/modules.cpp:312
#: eeschema/find.cpp:219
#: eeschema/onrightclick.cpp:306
msgid "Value " msgid "Value "
msgstr "Valeur " msgstr "Valeur "
#: pcbnew/pcbplot.cpp:151 #: pcbnew/pcbplot.cpp:151
#: pcbnew/pcbplot.cpp:287 #: pcbnew/pcbplot.cpp:287
#: gerbview/tool_gerber.cpp:71
msgid "Plot" msgid "Plot"
msgstr "Tracer" msgstr "Tracer"
...@@ -294,7 +231,6 @@ msgid "X scale adjust" ...@@ -294,7 +231,6 @@ msgid "X scale adjust"
msgstr "Ajustage Echelle X" msgstr "Ajustage Echelle X"
#: pcbnew/pcbplot.cpp:274 #: pcbnew/pcbplot.cpp:274
#: pcbnew/dialog_print_using_printer_base.cpp:57
msgid "Set X scale adjust for exact scale plotting" msgid "Set X scale adjust for exact scale plotting"
msgstr "Ajuster échelle X pour traçage à l'échelle exacte" msgstr "Ajuster échelle X pour traçage à l'échelle exacte"
...@@ -303,7 +239,6 @@ msgid "Y scale adjust" ...@@ -303,7 +239,6 @@ msgid "Y scale adjust"
msgstr "Ajustage Echelle Y" msgstr "Ajustage Echelle Y"
#: pcbnew/pcbplot.cpp:279 #: pcbnew/pcbplot.cpp:279
#: pcbnew/dialog_print_using_printer_base.cpp:66
msgid "Set Y scale adjust for exact scale plotting" msgid "Set Y scale adjust for exact scale plotting"
msgstr "Ajuster échelle Y pour traçage à l'échelle exacte" msgstr "Ajuster échelle Y pour traçage à l'échelle exacte"
...@@ -320,13 +255,6 @@ msgid "Generate drill file" ...@@ -320,13 +255,6 @@ msgid "Generate drill file"
msgstr "Créer Fichier de perçage" msgstr "Créer Fichier de perçage"
#: pcbnew/pcbplot.cpp:299 #: pcbnew/pcbplot.cpp:299
#: pcbnew/xchgmod.cpp:140
#: pcbnew/dialog_netlist.cpp:232
#: pcbnew/dialog_print_using_printer_base.cpp:128
#: eeschema/dialog_build_BOM_base.cpp:137
#: eeschema/annotate_dialog.cpp:220
#: eeschema/dialog_print_using_printer_base.cpp:72
#: common/zoom.cpp:277
msgid "Close" msgid "Close"
msgstr "Fermer" msgstr "Fermer"
...@@ -335,7 +263,6 @@ msgid "Exclude Edges_Pcb layer" ...@@ -335,7 +263,6 @@ msgid "Exclude Edges_Pcb layer"
msgstr "Exclure Couche Contours PCB" msgstr "Exclure Couche Contours PCB"
#: pcbnew/pcbplot.cpp:347 #: pcbnew/pcbplot.cpp:347
#: pcbnew/dialog_print_using_printer_base.cpp:37
msgid "Exclude contents of Edges_Pcb layer from all other layers" msgid "Exclude contents of Edges_Pcb layer from all other layers"
msgstr "Exclure les tracés contour PCB des autres couches" msgstr "Exclure les tracés contour PCB des autres couches"
...@@ -420,12 +347,10 @@ msgid "Scale 1.5" ...@@ -420,12 +347,10 @@ msgid "Scale 1.5"
msgstr "Echelle 1,5" msgstr "Echelle 1,5"
#: pcbnew/pcbplot.cpp:421 #: pcbnew/pcbplot.cpp:421
#: pcbnew/dialog_print_using_printer_base.cpp:46
msgid "Scale 2" msgid "Scale 2"
msgstr "Echelle 2" msgstr "Echelle 2"
#: pcbnew/pcbplot.cpp:421 #: pcbnew/pcbplot.cpp:421
#: pcbnew/dialog_print_using_printer_base.cpp:46
msgid "Scale 3" msgid "Scale 3"
msgstr "Echelle 3" msgstr "Echelle 3"
...@@ -434,36 +359,14 @@ msgid "Scale Opt" ...@@ -434,36 +359,14 @@ msgid "Scale Opt"
msgstr "Echelle" msgstr "Echelle"
#: pcbnew/pcbplot.cpp:430 #: pcbnew/pcbplot.cpp:430
#: pcbnew/class_board_item.cpp:23
#: pcbnew/dialog_display_options_base.cpp:67
#: pcbnew/dialog_display_options_base.cpp:73
#: pcbnew/dialog_display_options_base.cpp:114
#: pcbnew/dialog_non_copper_zones_properties_base.cpp:28
#: pcbnew/dialog_copper_zones_base.cpp:107
#: gerbview/options.cpp:335
msgid "Line" msgid "Line"
msgstr "Ligne" msgstr "Ligne"
#: pcbnew/pcbplot.cpp:430 #: pcbnew/pcbplot.cpp:430
#: pcbnew/dialog_display_options_base.cpp:22
#: pcbnew/dialog_display_options_base.cpp:67
#: pcbnew/dialog_display_options_base.cpp:73
#: pcbnew/dialog_display_options_base.cpp:84
#: pcbnew/dialog_display_options_base.cpp:114
#: eeschema/dialog_cmp_graphic_properties.cpp:169
#: gerbview/options.cpp:312
#: gerbview/options.cpp:335
msgid "Filled" msgid "Filled"
msgstr "Plein" msgstr "Plein"
#: pcbnew/pcbplot.cpp:430 #: pcbnew/pcbplot.cpp:430
#: pcbnew/dialog_display_options_base.cpp:22
#: pcbnew/dialog_display_options_base.cpp:67
#: pcbnew/dialog_display_options_base.cpp:73
#: pcbnew/dialog_display_options_base.cpp:84
#: pcbnew/dialog_display_options_base.cpp:114
#: gerbview/options.cpp:312
#: gerbview/options.cpp:335
msgid "Sketch" msgid "Sketch"
msgstr "Contour" msgstr "Contour"
...@@ -492,19 +395,14 @@ msgid "Draw origin ( 0,0 ) in sheet center" ...@@ -492,19 +395,14 @@ msgid "Draw origin ( 0,0 ) in sheet center"
msgstr "Origine des tracés au centre de la feuille" msgstr "Origine des tracés au centre de la feuille"
#: pcbnew/pcbplot.cpp:701 #: pcbnew/pcbplot.cpp:701
#: pcbnew/dialog_print_using_printer.cpp:650
msgid "Warning: Scale option set to a very small value" msgid "Warning: Scale option set to a very small value"
msgstr "Attention: option d'échelle ajustée à une valeur très petite" msgstr "Attention: option d'échelle ajustée à une valeur très petite"
#: pcbnew/pcbplot.cpp:703 #: pcbnew/pcbplot.cpp:703
#: pcbnew/dialog_print_using_printer.cpp:646
msgid "Warning: Scale option set to a very large value" msgid "Warning: Scale option set to a very large value"
msgstr "Attention: option d'échelle ajustée à une valeur très grande" msgstr "Attention: option d'échelle ajustée à une valeur très grande"
#: pcbnew/pcbplot.cpp:738 #: pcbnew/pcbplot.cpp:738
#: pcbnew/dialog_print_using_printer.cpp:417
#: pcbnew/dialog_print_using_printer.cpp:457
#: gerbview/edit.cpp:244
msgid "No layer selected" msgid "No layer selected"
msgstr "Pas de couche sélectionnée" msgstr "Pas de couche sélectionnée"
...@@ -597,10 +495,6 @@ msgid "Merge" ...@@ -597,10 +495,6 @@ msgid "Merge"
msgstr "Fusionner" msgstr "Fusionner"
#: pcbnew/clean.cpp:508 #: pcbnew/clean.cpp:508
#: pcbnew/dialog_pad_properties_base.cpp:64
#: eeschema/dialog_erc.cpp:193
#: eeschema/dialog_erc.cpp:197
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:39
msgid "0" msgid "0"
msgstr "0" msgstr "0"
...@@ -636,12 +530,11 @@ msgstr "Max" ...@@ -636,12 +530,11 @@ msgstr "Max"
msgid "Segm" msgid "Segm"
msgstr "Segm" msgstr "Segm"
#: pcbnew/pcbnew.cpp:46 #: pcbnew/pcbnew.cpp:47
msgid "Pcbnew is already running, Continue?" msgid "Pcbnew is already running, Continue?"
msgstr "Pcbnew est en cours d'exécution. Continuer ?" msgstr "Pcbnew est en cours d'exécution. Continuer ?"
#: pcbnew/editmod.cpp:47 #: pcbnew/editmod.cpp:47
#: pcbnew/edit.cpp:183
msgid "Module Editor" msgid "Module Editor"
msgstr "Ouvrir Editeur de modules" msgstr "Ouvrir Editeur de modules"
...@@ -658,7 +551,6 @@ msgid "Error: Unexpected end of file !" ...@@ -658,7 +551,6 @@ msgid "Error: Unexpected end of file !"
msgstr "Erreur: Fin de fichier inattendue !" msgstr "Erreur: Fin de fichier inattendue !"
#: pcbnew/modedit.cpp:78 #: pcbnew/modedit.cpp:78
#: pcbnew/controle.cpp:172
msgid "Selection Clarification" msgid "Selection Clarification"
msgstr "Clarification de la Sélection" msgstr "Clarification de la Sélection"
...@@ -691,30 +583,22 @@ msgid "Add Pad" ...@@ -691,30 +583,22 @@ msgid "Add Pad"
msgstr "Ajouter Pastilles" msgstr "Ajouter Pastilles"
#: pcbnew/modedit.cpp:397 #: pcbnew/modedit.cpp:397
#: pcbnew/menubarmodedit.cpp:45
#: pcbnew/tool_modedit.cpp:127
msgid "Pad Settings" msgid "Pad Settings"
msgstr "Caract pads" msgstr "Caract pads"
#: pcbnew/modedit.cpp:407 #: pcbnew/modedit.cpp:407
#: eeschema/schedit.cpp:200
msgid "Add Drawing" msgid "Add Drawing"
msgstr "Ajout d'éléments graphiques" msgstr "Ajout d'éléments graphiques"
#: pcbnew/modedit.cpp:411 #: pcbnew/modedit.cpp:411
#: pcbnew/tool_modedit.cpp:180
msgid "Place anchor" msgid "Place anchor"
msgstr "Place Ancre" msgstr "Place Ancre"
#: pcbnew/modedit.cpp:425 #: pcbnew/modedit.cpp:425
#: pcbnew/edit.cpp:599
#: eeschema/libframe.cpp:582
#: eeschema/schedit.cpp:370
msgid "Delete item" msgid "Delete item"
msgstr "Suppression d'éléments" msgstr "Suppression d'éléments"
#: pcbnew/class_drc_item.cpp:39 #: pcbnew/class_drc_item.cpp:39
#: pcbnew/dialog_drc.cpp:486
msgid "Unconnected pads" msgid "Unconnected pads"
msgstr "Pads non connectés" msgstr "Pads non connectés"
...@@ -783,32 +667,22 @@ msgid "Hole near track" ...@@ -783,32 +667,22 @@ msgid "Hole near track"
msgstr "Trou près d'une piste" msgstr "Trou près d'une piste"
#: pcbnew/class_board_item.cpp:24 #: pcbnew/class_board_item.cpp:24
#: pcbnew/dialog_pad_properties_base.cpp:44
msgid "Rect" msgid "Rect"
msgstr "Rect" msgstr "Rect"
#: pcbnew/class_board_item.cpp:25 #: pcbnew/class_board_item.cpp:25
#: pcbnew/class_drawsegment.cpp:286
msgid "Arc" msgid "Arc"
msgstr "Arc" msgstr "Arc"
#: pcbnew/class_board_item.cpp:26 #: pcbnew/class_board_item.cpp:26
#: pcbnew/class_track.cpp:911
#: pcbnew/class_drawsegment.cpp:282
#: pcbnew/dialog_pad_properties_base.cpp:44
#: pcbnew/dialog_pad_properties_base.cpp:53
msgid "Circle" msgid "Circle"
msgstr "Cercle" msgstr "Cercle"
#: pcbnew/class_board_item.cpp:59 #: pcbnew/class_board_item.cpp:59
#: pcbnew/class_pad.cpp:470
msgid "Net" msgid "Net"
msgstr "Net" msgstr "Net"
#: pcbnew/class_board_item.cpp:64 #: pcbnew/class_board_item.cpp:64
#: eeschema/dialog_build_BOM_base.cpp:79
#: eeschema/edit_component_in_schematic.cpp:428
#: eeschema/class_libentry_fields.cpp:131
msgid "Footprint" msgid "Footprint"
msgstr "Module" msgstr "Module"
...@@ -852,23 +726,10 @@ msgid "Pcb Text" ...@@ -852,23 +726,10 @@ msgid "Pcb Text"
msgstr "Texte Pcb" msgstr "Texte Pcb"
#: pcbnew/class_board_item.cpp:102 #: pcbnew/class_board_item.cpp:102
#: pcbnew/dialog_netlist.cpp:162
#: eeschema/onrightclick.cpp:309
#: eeschema/dialog_create_component.cpp:156
#: eeschema/edit_component_in_schematic.cpp:349
#: eeschema/class_libentry_fields.cpp:129
#: eeschema/eelayer.h:152
msgid "Reference" msgid "Reference"
msgstr "Référence" msgstr "Référence"
#: pcbnew/class_board_item.cpp:106 #: pcbnew/class_board_item.cpp:106
#: pcbnew/class_edge_mod.cpp:242
#: pcbnew/class_text_mod.cpp:468
#: eeschema/edit_component_in_schematic.cpp:387
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:154
#: eeschema/class_libentry_fields.cpp:130
#: eeschema/dialog_edit_component_in_schematic.cpp:89
#: eeschema/eelayer.h:158
msgid "Value" msgid "Value"
msgstr "Valeur" msgstr "Valeur"
...@@ -879,9 +740,6 @@ msgid " of " ...@@ -879,9 +740,6 @@ msgid " of "
msgstr " de " msgstr " de "
#: pcbnew/class_board_item.cpp:111 #: pcbnew/class_board_item.cpp:111
#: pcbnew/class_text_mod.cpp:468
#: pcbnew/class_text_mod.cpp:477
#: eeschema/dialog_edit_label_base.cpp:22
msgid "Text" msgid "Text"
msgstr "Texte" msgstr "Texte"
...@@ -890,24 +748,19 @@ msgid "Graphic" ...@@ -890,24 +748,19 @@ msgid "Graphic"
msgstr "Graphique" msgstr "Graphique"
#: pcbnew/class_board_item.cpp:129 #: pcbnew/class_board_item.cpp:129
#: pcbnew/pcbframe.cpp:510
#: pcbnew/class_track.cpp:869
msgid "Track" msgid "Track"
msgstr "Piste" msgstr "Piste"
#: pcbnew/class_board_item.cpp:136 #: pcbnew/class_board_item.cpp:136
#: pcbnew/class_board_item.cpp:207 #: pcbnew/class_board_item.cpp:207
#: pcbnew/dialog_copper_zones_base.cpp:199
msgid "Net:" msgid "Net:"
msgstr "Net:" msgstr "Net:"
#: pcbnew/class_board_item.cpp:141 #: pcbnew/class_board_item.cpp:141
#: pcbnew/class_zone.cpp:863
msgid "Zone Outline" msgid "Zone Outline"
msgstr "Contour de Zone" msgstr "Contour de Zone"
#: pcbnew/class_board_item.cpp:146 #: pcbnew/class_board_item.cpp:146
#: pcbnew/class_zone.cpp:867
msgid "(Cutout)" msgid "(Cutout)"
msgstr "(Cutout)" msgstr "(Cutout)"
...@@ -916,17 +769,14 @@ msgid "Not on copper layer" ...@@ -916,17 +769,14 @@ msgid "Not on copper layer"
msgstr "Pas sur Couches Cuivre" msgstr "Pas sur Couches Cuivre"
#: pcbnew/class_board_item.cpp:169 #: pcbnew/class_board_item.cpp:169
#: pcbnew/class_zone.cpp:889
msgid "Not Found" msgid "Not Found"
msgstr " Non Trouvé" msgstr " Non Trouvé"
#: pcbnew/class_board_item.cpp:175 #: pcbnew/class_board_item.cpp:175
#: pcbnew/class_track.cpp:873
msgid "Zone" msgid "Zone"
msgstr "Zone" msgstr "Zone"
#: pcbnew/class_board_item.cpp:193 #: pcbnew/class_board_item.cpp:193
#: pcbnew/pcbframe.cpp:542
msgid "Via" msgid "Via"
msgstr "Via" msgstr "Via"
...@@ -935,12 +785,10 @@ msgid "Blind/Buried" ...@@ -935,12 +785,10 @@ msgid "Blind/Buried"
msgstr "Borgne/Aveugle" msgstr "Borgne/Aveugle"
#: pcbnew/class_board_item.cpp:199 #: pcbnew/class_board_item.cpp:199
#: pcbnew/pcbnew.h:286
msgid "Micro Via" msgid "Micro Via"
msgstr "Micro Via" msgstr "Micro Via"
#: pcbnew/class_board_item.cpp:222 #: pcbnew/class_board_item.cpp:222
#: pcbnew/class_marker.cpp:134
msgid "Marker" msgid "Marker"
msgstr "Marqueur" msgstr "Marqueur"
...@@ -967,39 +815,10 @@ msgid "No Change" ...@@ -967,39 +815,10 @@ msgid "No Change"
msgstr "Garder" msgstr "Garder"
#: pcbnew/swap_layers.cpp:225 #: pcbnew/swap_layers.cpp:225
#: pcbnew/set_grid.cpp:178
#: pcbnew/dialog_graphic_items_options.cpp:263
#: pcbnew/dialog_initpcb.cpp:161
#: pcbnew/dialog_drc.cpp:552
#: eeschema/dialog_cmp_graphic_properties.cpp:178
#: eeschema/pinedit-dialog.cpp:232
#: eeschema/dialog_edit_component_in_lib.cpp:218
#: eeschema/sheet.cpp:190
#: eeschema/dialog_create_component.cpp:187
#: eeschema/dialog_options.cpp:277
#: cvpcb/dialog_cvpcb_config.cpp:138
#: cvpcb/dialog_display_options.cpp:178
#: gerbview/select_layers_to_pcb.cpp:285
#: share/setpage.cpp:437
msgid "&OK" msgid "&OK"
msgstr "&OK" msgstr "&OK"
#: pcbnew/swap_layers.cpp:229 #: pcbnew/swap_layers.cpp:229
#: pcbnew/set_grid.cpp:183
#: pcbnew/dialog_graphic_items_options.cpp:267
#: pcbnew/dialog_initpcb.cpp:164
#: pcbnew/dialog_drc.cpp:548
#: eeschema/dialog_cmp_graphic_properties.cpp:183
#: eeschema/pinedit-dialog.cpp:228
#: eeschema/dialog_edit_component_in_lib.cpp:214
#: eeschema/netlist_control.cpp:151
#: eeschema/netlist_control.cpp:281
#: eeschema/sheet.cpp:186
#: eeschema/dialog_create_component.cpp:192
#: eeschema/dialog_options.cpp:282
#: cvpcb/dialog_display_options.cpp:183
#: gerbview/select_layers_to_pcb.cpp:289
#: share/setpage.cpp:441
msgid "&Cancel" msgid "&Cancel"
msgstr "&Annuler" msgstr "&Annuler"
...@@ -1051,7 +870,6 @@ msgid "<%s> Not Found" ...@@ -1051,7 +870,6 @@ msgid "<%s> Not Found"
msgstr "<%s> Non trouvé" msgstr "<%s> Non trouvé"
#: pcbnew/find.cpp:240 #: pcbnew/find.cpp:240
#: eeschema/dialog_find.cpp:117
msgid "Item to find:" msgid "Item to find:"
msgstr "Elément à chercher:" msgstr "Elément à chercher:"
...@@ -1092,130 +910,111 @@ msgstr "%s pin %s non trouvée" ...@@ -1092,130 +910,111 @@ msgstr "%s pin %s non trouvée"
msgid "%s pin %s found" msgid "%s pin %s found"
msgstr "%s pin %s trouvée" msgstr "%s pin %s trouvée"
#: pcbnew/pcbframe.cpp:323 #: pcbnew/pcbframe.cpp:326
msgid "Board modified, Save before exit ?" msgid "Board modified, Save before exit ?"
msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?" msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?"
#: pcbnew/pcbframe.cpp:324 #: pcbnew/pcbframe.cpp:327
#: eeschema/schframe.cpp:316
#: cvpcb/cvframe.cpp:216
#: common/confirm.cpp:118
msgid "Confirmation" msgid "Confirmation"
msgstr "Confirmation" msgstr "Confirmation"
#: pcbnew/pcbframe.cpp:432 #: pcbnew/pcbframe.cpp:435
msgid "DRC Off (Disable !!!), Currently: DRC is active" msgid "DRC Off (Disable !!!), Currently: DRC is active"
msgstr "DRC off (désactivée !!!), actuellement DRC active" msgstr "DRC off (désactivée !!!), actuellement DRC active"
#: pcbnew/pcbframe.cpp:433 #: pcbnew/pcbframe.cpp:436
msgid "DRC On (Currently: DRC is inactive !!!)" msgid "DRC On (Currently: DRC is inactive !!!)"
msgstr "DRC On (Actuellement, DRC désactivée !!!)" msgstr "DRC On (Actuellement, DRC désactivée !!!)"
#: pcbnew/pcbframe.cpp:444 #: pcbnew/pcbframe.cpp:447
msgid "Polar Coords not show" msgid "Polar Coords not show"
msgstr "Coord Polaires non affichées" msgstr "Coord Polaires non affichées"
#: pcbnew/pcbframe.cpp:445 #: pcbnew/pcbframe.cpp:448
msgid "Display Polar Coords" msgid "Display Polar Coords"
msgstr "Affichage coord Polaires" msgstr "Affichage coord Polaires"
#: pcbnew/pcbframe.cpp:450 #: pcbnew/pcbframe.cpp:453
#: eeschema/schframe.cpp:415
msgid "Grid not show" msgid "Grid not show"
msgstr "Grille non montrée" msgstr "Grille non montrée"
#: pcbnew/pcbframe.cpp:450 #: pcbnew/pcbframe.cpp:453
#: eeschema/schframe.cpp:415
msgid "Show Grid" msgid "Show Grid"
msgstr "Afficher grille" msgstr "Afficher grille"
#: pcbnew/pcbframe.cpp:459 #: pcbnew/pcbframe.cpp:462
msgid "Hide General ratsnest" msgid "Hide General ratsnest"
msgstr "Ne pas afficher le chevelu général" msgstr "Ne pas afficher le chevelu général"
#: pcbnew/pcbframe.cpp:460 #: pcbnew/pcbframe.cpp:463
msgid "Show General ratsnest" msgid "Show General ratsnest"
msgstr "Afficher le chevelu général" msgstr "Afficher le chevelu général"
#: pcbnew/pcbframe.cpp:466 #: pcbnew/pcbframe.cpp:469
msgid "Hide Module ratsnest" msgid "Hide Module ratsnest"
msgstr "Ne pas montrer le chevelu du module" msgstr "Ne pas montrer le chevelu du module"
#: pcbnew/pcbframe.cpp:467 #: pcbnew/pcbframe.cpp:470
msgid "Show Module ratsnest" msgid "Show Module ratsnest"
msgstr "Montrer le chevelu du module" msgstr "Montrer le chevelu du module"
#: pcbnew/pcbframe.cpp:474 #: pcbnew/pcbframe.cpp:477
msgid "Disable Auto Delete old Track" msgid "Disable Auto Delete old Track"
msgstr "Ne pas Autoriser l'effacement automatique des pistes" msgstr "Ne pas Autoriser l'effacement automatique des pistes"
#: pcbnew/pcbframe.cpp:475 #: pcbnew/pcbframe.cpp:478
msgid "Enable Auto Delete old Track" msgid "Enable Auto Delete old Track"
msgstr "Autoriser l'effacement automatique des pistes" msgstr "Autoriser l'effacement automatique des pistes"
#: pcbnew/pcbframe.cpp:482 #: pcbnew/pcbframe.cpp:485
msgid "Show Pads Sketch mode" msgid "Show Pads Sketch mode"
msgstr "Afficher pastilles en contour" msgstr "Afficher pastilles en contour"
#: pcbnew/pcbframe.cpp:483 #: pcbnew/pcbframe.cpp:486
msgid "Show pads filled mode" msgid "Show pads filled mode"
msgstr "Afficher pastilles en mode plein" msgstr "Afficher pastilles en mode plein"
#: pcbnew/pcbframe.cpp:489 #: pcbnew/pcbframe.cpp:492
msgid "Show Tracks Sketch mode" msgid "Show Tracks Sketch mode"
msgstr "Afficher pistes en contour" msgstr "Afficher pistes en contour"
#: pcbnew/pcbframe.cpp:490 #: pcbnew/pcbframe.cpp:493
msgid "Show Tracks filled mode" msgid "Show Tracks filled mode"
msgstr "Afficher pistes en mode plein" msgstr "Afficher pistes en mode plein"
#: pcbnew/pcbframe.cpp:496 #: pcbnew/pcbframe.cpp:499
msgid "Normal Contrast Mode Display" msgid "Normal Contrast Mode Display"
msgstr "Mode d'affichage Contraste normal" msgstr "Mode d'affichage Contraste normal"
#: pcbnew/pcbframe.cpp:497 #: pcbnew/pcbframe.cpp:500
#: pcbnew/tool_pcb.cpp:374
msgid "Hight Contrast Mode Display" msgid "Hight Contrast Mode Display"
msgstr "Mode d'affichage Haut Contraste" msgstr "Mode d'affichage Haut Contraste"
#: pcbnew/pcbframe.cpp:614 #: pcbnew/pcbframe.cpp:617
#: pcbnew/moduleframe.cpp:392
#: cvpcb/displayframe.cpp:323
msgid "3D Frame already opened" msgid "3D Frame already opened"
msgstr "Fenêtre 3D déjà ouverte" msgstr "Fenêtre 3D déjà ouverte"
#: pcbnew/pcbframe.cpp:618 #: pcbnew/pcbframe.cpp:621
#: pcbnew/moduleframe.cpp:396
#: cvpcb/displayframe.cpp:327
msgid "3D Viewer" msgid "3D Viewer"
msgstr "Visu 3D" msgstr "Visu 3D"
#: pcbnew/class_track.cpp:881 #: pcbnew/class_track.cpp:881
#: pcbnew/class_drawsegment.cpp:277
#: pcbnew/class_zone.cpp:870
#: pcbnew/class_marker.cpp:134
#: pcbnew/class_text_mod.cpp:483
msgid "Type" msgid "Type"
msgstr "Type" msgstr "Type"
#: pcbnew/class_track.cpp:898 #: pcbnew/class_track.cpp:898
#: pcbnew/zones_by_polygon.cpp:899
#: pcbnew/class_zone.cpp:892
msgid "NetName" msgid "NetName"
msgstr "NetName" msgstr "NetName"
#: pcbnew/class_track.cpp:904 #: pcbnew/class_track.cpp:904
#: pcbnew/class_zone.cpp:900
msgid "NetCode" msgid "NetCode"
msgstr "NetCode" msgstr "NetCode"
#: pcbnew/class_track.cpp:909 #: pcbnew/class_track.cpp:909
#: pcbnew/class_drawsegment.cpp:292
msgid "Segment" msgid "Segment"
msgstr "Segment" msgstr "Segment"
#: pcbnew/class_track.cpp:913 #: pcbnew/class_track.cpp:913
#: pcbnew/dialog_pad_properties_base.cpp:80
msgid "Standard" msgid "Standard"
msgstr "Standard" msgstr "Standard"
...@@ -1224,7 +1023,6 @@ msgid "Flags" ...@@ -1224,7 +1023,6 @@ msgid "Flags"
msgstr "Flags" msgstr "Flags"
#: pcbnew/class_track.cpp:934 #: pcbnew/class_track.cpp:934
#: pcbnew/class_module.cpp:957
msgid "Stat" msgid "Stat"
msgstr "Stat" msgstr "Stat"
...@@ -1234,19 +1032,14 @@ msgstr "Diam" ...@@ -1234,19 +1032,14 @@ msgstr "Diam"
#: pcbnew/class_track.cpp:965 #: pcbnew/class_track.cpp:965
#: pcbnew/class_track.cpp:970 #: pcbnew/class_track.cpp:970
#: pcbnew/class_pad.cpp:578
msgid "Drill" msgid "Drill"
msgstr "Perçage" msgstr "Perçage"
#: pcbnew/dialog_SVG_print.cpp:206 #: pcbnew/dialog_SVG_print.cpp:206
#: eeschema/dialog_SVG_print.cpp:171
#: eeschema/dialog_SVG_print.cpp:190
msgid "Create file " msgid "Create file "
msgstr "Créer Fichier " msgstr "Créer Fichier "
#: pcbnew/dialog_SVG_print.cpp:208 #: pcbnew/dialog_SVG_print.cpp:208
#: eeschema/dialog_SVG_print.cpp:173
#: eeschema/dialog_SVG_print.cpp:192
msgid " error" msgid " error"
msgstr " erreur" msgstr " erreur"
...@@ -1272,18 +1065,14 @@ msgstr "Fichier de perçage" ...@@ -1272,18 +1065,14 @@ msgstr "Fichier de perçage"
#: pcbnew/gendrill.cpp:326 #: pcbnew/gendrill.cpp:326
#: pcbnew/gendrill.cpp:814 #: pcbnew/gendrill.cpp:814
#: pcbnew/plotps.cpp:46
#: pcbnew/xchgmod.cpp:640
msgid "Unable to create file " msgid "Unable to create file "
msgstr "Impossible de créer le fichier " msgstr "Impossible de créer le fichier "
#: pcbnew/gendrill.cpp:382 #: pcbnew/gendrill.cpp:382
#: pcbnew/dialog_gendrill.cpp:184
msgid "2:3" msgid "2:3"
msgstr "2:3" msgstr "2:3"
#: pcbnew/gendrill.cpp:383 #: pcbnew/gendrill.cpp:383
#: pcbnew/dialog_gendrill.cpp:185
msgid "2:4" msgid "2:4"
msgstr "2:4" msgstr "2:4"
...@@ -1313,7 +1102,6 @@ msgstr "Longueur (pouces):" ...@@ -1313,7 +1102,6 @@ msgstr "Longueur (pouces):"
#: pcbnew/muonde.cpp:237 #: pcbnew/muonde.cpp:237
#: pcbnew/muonde.cpp:243 #: pcbnew/muonde.cpp:243
#: eeschema/affiche.cpp:97
msgid "Length" msgid "Length"
msgstr "Longueur" msgstr "Longueur"
...@@ -1353,7 +1141,6 @@ msgid "Arc Stub" ...@@ -1353,7 +1141,6 @@ msgid "Arc Stub"
msgstr "Arc Stub" msgstr "Arc Stub"
#: pcbnew/muonde.cpp:695 #: pcbnew/muonde.cpp:695
#: common/common.cpp:150
msgid " (mm):" msgid " (mm):"
msgstr " (mm):" msgstr " (mm):"
...@@ -1375,74 +1162,10 @@ msgid "Complex shape" ...@@ -1375,74 +1162,10 @@ msgid "Complex shape"
msgstr "Forme complexe" msgstr "Forme complexe"
#: pcbnew/muonde.cpp:866 #: pcbnew/muonde.cpp:866
#: pcbnew/block.cpp:160
#: pcbnew/cotation.cpp:104
#: pcbnew/dialog_display_options_base.cpp:131
#: pcbnew/mirepcb.cpp:99
#: pcbnew/dialog_track_options_base.cpp:132
#: pcbnew/sel_layer.cpp:160
#: pcbnew/sel_layer.cpp:319
#: pcbnew/dialog_gendrill.cpp:292
#: pcbnew/set_color.cpp:344
#: pcbnew/dialog_non_copper_zones_properties_base.cpp:43
#: pcbnew/dialog_edit_module.cpp:119
#: pcbnew/dialog_orient_footprints.cpp:164
#: pcbnew/dialog_edit_module_text_base.cpp:105
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:144
#: pcbnew/dialog_pcb_text_properties.cpp:99
#: eeschema/eelayer.cpp:239
#: eeschema/dialog_edit_label_base.cpp:69
#: eeschema/sheetlab.cpp:95
#: eeschema/dialog_bodygraphictext_properties_base.cpp:71
#: gerbview/options.cpp:172
#: gerbview/options.cpp:303
#: gerbview/reglage.cpp:107
#: gerbview/set_color.cpp:315
#: common/displlst.cpp:106
#: common/get_component_dialog.cpp:113
msgid "OK" msgid "OK"
msgstr "OK" msgstr "OK"
#: pcbnew/muonde.cpp:870 #: pcbnew/muonde.cpp:870
#: pcbnew/block.cpp:157
#: pcbnew/cotation.cpp:108
#: pcbnew/dialog_display_options_base.cpp:136
#: pcbnew/mirepcb.cpp:103
#: pcbnew/globaleditpad.cpp:110
#: pcbnew/dialog_track_options_base.cpp:138
#: pcbnew/onrightclick.cpp:123
#: pcbnew/onrightclick.cpp:137
#: pcbnew/sel_layer.cpp:164
#: pcbnew/sel_layer.cpp:323
#: pcbnew/dialog_gendrill.cpp:297
#: pcbnew/set_color.cpp:348
#: pcbnew/modedit_onclick.cpp:194
#: pcbnew/modedit_onclick.cpp:226
#: pcbnew/dialog_non_copper_zones_properties_base.cpp:47
#: pcbnew/dialog_copper_zones_base.cpp:162
#: pcbnew/dialog_edit_module.cpp:123
#: pcbnew/dialog_pad_properties_base.cpp:97
#: pcbnew/dialog_orient_footprints.cpp:167
#: pcbnew/dialog_edit_module_text_base.cpp:111
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:150
#: pcbnew/dialog_pcb_text_properties.cpp:104
#: eeschema/eelayer.cpp:243
#: eeschema/dialog_edit_label_base.cpp:74
#: eeschema/onrightclick.cpp:100
#: eeschema/onrightclick.cpp:112
#: eeschema/libedit_onrightclick.cpp:42
#: eeschema/libedit_onrightclick.cpp:57
#: eeschema/sheetlab.cpp:99
#: eeschema/dialog_bodygraphictext_properties_base.cpp:74
#: gerbview/options.cpp:176
#: gerbview/options.cpp:307
#: gerbview/reglage.cpp:111
#: gerbview/set_color.cpp:319
#: gerbview/onrightclick.cpp:39
#: gerbview/onrightclick.cpp:58
#: common/selcolor.cpp:171
#: common/displlst.cpp:111
#: common/get_component_dialog.cpp:122
msgid "Cancel" msgid "Cancel"
msgstr "Annuler" msgstr "Annuler"
...@@ -1451,20 +1174,6 @@ msgid "Read Shape Descr File..." ...@@ -1451,20 +1174,6 @@ msgid "Read Shape Descr File..."
msgstr "Lire fichier de description de forme..." msgstr "Lire fichier de description de forme..."
#: pcbnew/muonde.cpp:878 #: pcbnew/muonde.cpp:878
#: pcbnew/cotation.cpp:112
#: pcbnew/dialog_edit_module.cpp:271
#: pcbnew/dialog_edit_module.cpp:317
#: pcbnew/dialog_edit_module_text_base.cpp:96
#: pcbnew/dialog_pcb_text_properties.cpp:165
#: pcbnew/dialog_pcb_text_properties.cpp:176
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:52
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134
#: eeschema/dialog_edit_label_base.cpp:40
#: eeschema/onrightclick.cpp:295
#: eeschema/dialog_options.cpp:236
#: eeschema/dialog_bodygraphictext_properties_base.cpp:60
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:99
#: eeschema/component_wizard/component_setup_frame.cpp:50
msgid "Normal" msgid "Normal"
msgstr "Normal" msgstr "Normal"
...@@ -1481,17 +1190,6 @@ msgid "Shape Option" ...@@ -1481,17 +1190,6 @@ msgid "Shape Option"
msgstr "Option Forme" msgstr "Option Forme"
#: pcbnew/muonde.cpp:885 #: pcbnew/muonde.cpp:885
#: pcbnew/cotation.cpp:124
#: pcbnew/mirepcb.cpp:108
#: pcbnew/dialog_pcb_text_properties.cpp:114
#: eeschema/pinedit-dialog.cpp:198
#: eeschema/pinedit-dialog.cpp:204
#: eeschema/dialog_edit_label_base.cpp:59
#: eeschema/sheet.cpp:169
#: eeschema/sheet.cpp:175
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:157
#: eeschema/dialog_edit_component_in_schematic.cpp:92
#: common/wxwineda.cpp:104
msgid "Size" msgid "Size"
msgstr "Taille " msgstr "Taille "
...@@ -1557,10 +1255,6 @@ msgid "Add Graphic" ...@@ -1557,10 +1255,6 @@ msgid "Add Graphic"
msgstr "Addition éléments graphiques" msgstr "Addition éléments graphiques"
#: pcbnew/edit.cpp:293 #: pcbnew/edit.cpp:293
#: pcbnew/tool_modedit.cpp:175
#: eeschema/libframe.cpp:506
#: eeschema/schedit.cpp:220
#: gerbview/tool_gerber.cpp:344
msgid "Add Text" msgid "Add Text"
msgstr "Ajout de Texte" msgstr "Ajout de Texte"
...@@ -1629,7 +1323,6 @@ msgid "Abort routing?" ...@@ -1629,7 +1323,6 @@ msgid "Abort routing?"
msgstr "Arrêter le routage?" msgstr "Arrêter le routage?"
#: pcbnew/automove.cpp:209 #: pcbnew/automove.cpp:209
#: pcbnew/xchgmod.cpp:615
msgid "No Modules!" msgid "No Modules!"
msgstr "Pas de Modules!" msgstr "Pas de Modules!"
...@@ -1654,14 +1347,10 @@ msgid "Net Code" ...@@ -1654,14 +1347,10 @@ msgid "Net Code"
msgstr "Net Code" msgstr "Net Code"
#: pcbnew/affiche.cpp:53 #: pcbnew/affiche.cpp:53
#: pcbnew/menubarpcb.cpp:233
#: pcbnew/class_module.cpp:949
#: pcbnew/class_board.cpp:530
msgid "Pads" msgid "Pads"
msgstr "Pads" msgstr "Pads"
#: pcbnew/affiche.cpp:67 #: pcbnew/affiche.cpp:67
#: pcbnew/class_board.cpp:540
msgid "Vias" msgid "Vias"
msgstr "Vias" msgstr "Vias"
...@@ -1694,9 +1383,6 @@ msgid "Include board outline layer" ...@@ -1694,9 +1383,6 @@ msgid "Include board outline layer"
msgstr "Inclure couche contour pcb" msgstr "Inclure couche contour pcb"
#: pcbnew/block.cpp:453 #: pcbnew/block.cpp:453
#: pcbnew/onrightclick.cpp:464
#: eeschema/onrightclick.cpp:632
#: eeschema/libedit_onrightclick.cpp:247
msgid "Delete Block" msgid "Delete Block"
msgstr "Effacer Bloc" msgstr "Effacer Bloc"
...@@ -1705,7 +1391,6 @@ msgid "Delete zones" ...@@ -1705,7 +1391,6 @@ msgid "Delete zones"
msgstr "SuppressionZones" msgstr "SuppressionZones"
#: pcbnew/block.cpp:605 #: pcbnew/block.cpp:605
#: pcbnew/onrightclick.cpp:462
msgid "Rotate Block" msgid "Rotate Block"
msgstr "Rotation Bloc" msgstr "Rotation Bloc"
...@@ -1722,9 +1407,6 @@ msgid "Move Block" ...@@ -1722,9 +1407,6 @@ msgid "Move Block"
msgstr "Déplacer Bloc" msgstr "Déplacer Bloc"
#: pcbnew/block.cpp:1099 #: pcbnew/block.cpp:1099
#: pcbnew/onrightclick.cpp:458
#: eeschema/onrightclick.cpp:628
#: eeschema/libedit_onrightclick.cpp:244
msgid "Copy Block" msgid "Copy Block"
msgstr "Copie Bloc" msgstr "Copie Bloc"
...@@ -1733,30 +1415,18 @@ msgid "Dimension properties" ...@@ -1733,30 +1415,18 @@ msgid "Dimension properties"
msgstr "Propriétés des Cotes" msgstr "Propriétés des Cotes"
#: pcbnew/cotation.cpp:113 #: pcbnew/cotation.cpp:113
#: pcbnew/class_text_mod.cpp:489
#: pcbnew/dialog_edit_module_text_base.cpp:87
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:22
#: pcbnew/dialog_pcb_text_properties.cpp:166
#: eeschema/affiche.cpp:93
#: gerbview/options.cpp:184
#: gerbview/tool_gerber.cpp:89
msgid "Display" msgid "Display"
msgstr "Affichage" msgstr "Affichage"
#: pcbnew/cotation.cpp:132 #: pcbnew/cotation.cpp:132
#: pcbnew/dialog_copper_zones_base.cpp:206
msgid "Layer:" msgid "Layer:"
msgstr "Couche:" msgstr "Couche:"
#: pcbnew/set_grid.cpp:154 #: pcbnew/set_grid.cpp:154
#: pcbnew/dialog_gendrill.cpp:167
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:30
#: gerbview/options.cpp:195
msgid "Inches" msgid "Inches"
msgstr "Pouces" msgstr "Pouces"
#: pcbnew/set_grid.cpp:155 #: pcbnew/set_grid.cpp:155
#: common/drawframe.cpp:366
msgid "mm" msgid "mm"
msgstr "mm" msgstr "mm"
...@@ -1786,8 +1456,6 @@ msgstr "Sélectionner comment les pistes sont affichées" ...@@ -1786,8 +1456,6 @@ msgstr "Sélectionner comment les pistes sont affichées"
#: pcbnew/dialog_display_options_base.cpp:30 #: pcbnew/dialog_display_options_base.cpp:30
#: pcbnew/dialog_display_options_base.cpp:38 #: pcbnew/dialog_display_options_base.cpp:38
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:128
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:136
msgid "Always" msgid "Always"
msgstr "Toujours" msgstr "Toujours"
...@@ -1797,8 +1465,6 @@ msgstr "Nouvelle piste" ...@@ -1797,8 +1465,6 @@ msgstr "Nouvelle piste"
#: pcbnew/dialog_display_options_base.cpp:30 #: pcbnew/dialog_display_options_base.cpp:30
#: pcbnew/dialog_display_options_base.cpp:38 #: pcbnew/dialog_display_options_base.cpp:38
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:128
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:136
msgid "Never" msgid "Never"
msgstr "Jamais" msgstr "Jamais"
...@@ -1867,7 +1533,6 @@ msgid "Module Edges:" ...@@ -1867,7 +1533,6 @@ msgid "Module Edges:"
msgstr "Contours modules:" msgstr "Contours modules:"
#: pcbnew/dialog_display_options_base.cpp:75 #: pcbnew/dialog_display_options_base.cpp:75
#: cvpcb/dialog_display_options.cpp:150
msgid "Texts:" msgid "Texts:"
msgstr "Textes:" msgstr "Textes:"
...@@ -1896,12 +1561,10 @@ msgid "Others:" ...@@ -1896,12 +1561,10 @@ msgid "Others:"
msgstr "Autres:" msgstr "Autres:"
#: pcbnew/dialog_display_options_base.cpp:116 #: pcbnew/dialog_display_options_base.cpp:116
#: gerbview/options.cpp:336
msgid "Display other items:" msgid "Display other items:"
msgstr "Afficher autres éléments" msgstr "Afficher autres éléments"
#: pcbnew/dialog_display_options_base.cpp:122 #: pcbnew/dialog_display_options_base.cpp:122
#: eeschema/dialog_options.cpp:270
msgid "Show page limits" msgid "Show page limits"
msgstr " Afficher limites de page" msgstr " Afficher limites de page"
...@@ -2010,17 +1673,10 @@ msgid "Delete Layer " ...@@ -2010,17 +1673,10 @@ msgid "Delete Layer "
msgstr "Effacer Couche" msgstr "Effacer Couche"
#: pcbnew/dialog_drc.cpp:432 #: pcbnew/dialog_drc.cpp:432
#: pcbnew/dialog_netlist.cpp:193
#: eeschema/dialog_erc.cpp:239
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:23
#: eeschema/dialog_edit_component_in_lib.cpp:166
#: eeschema/dialog_create_component.cpp:168
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:49
msgid "Options" msgid "Options"
msgstr "Options" msgstr "Options"
#: pcbnew/dialog_drc.cpp:442 #: pcbnew/dialog_drc.cpp:442
#: pcbnew/dialog_track_options_base.cpp:106
msgid "Clearance" msgid "Clearance"
msgstr "Isolation" msgstr "Isolation"
...@@ -2061,7 +1717,6 @@ msgid "Include tests for clearances between pad to pads" ...@@ -2061,7 +1717,6 @@ msgid "Include tests for clearances between pad to pads"
msgstr "Inclure test de l'isolation entre pads" msgstr "Inclure test de l'isolation entre pads"
#: pcbnew/dialog_drc.cpp:480 #: pcbnew/dialog_drc.cpp:480
#: pcbnew/onrightclick.cpp:650
msgid "Zones" msgid "Zones"
msgstr "Zones" msgstr "Zones"
...@@ -2189,7 +1844,6 @@ msgid "Current Value" ...@@ -2189,7 +1844,6 @@ msgid "Current Value"
msgstr "Valeur courante" msgstr "Valeur courante"
#: pcbnew/xchgmod.cpp:159 #: pcbnew/xchgmod.cpp:159
#: pcbnew/tool_modedit.cpp:60
msgid "New Module" msgid "New Module"
msgstr "Nouveau Module" msgstr "Nouveau Module"
...@@ -2222,7 +1876,7 @@ msgstr "Change TOUS les modules ?" ...@@ -2222,7 +1876,7 @@ msgstr "Change TOUS les modules ?"
msgid "Change module %s (%s) " msgid "Change module %s (%s) "
msgstr "Change module %s (%s) " msgstr "Change module %s (%s) "
#: pcbnew/xchgmod.cpp:624 #: pcbnew/xchgmod.cpp:630
msgid "Cmp files:" msgid "Cmp files:"
msgstr "Fichiers Cmp: " msgstr "Fichiers Cmp: "
...@@ -2231,7 +1885,6 @@ msgid "Place module" ...@@ -2231,7 +1885,6 @@ msgid "Place module"
msgstr "Place module" msgstr "Place module"
#: pcbnew/loadcmp.cpp:209 #: pcbnew/loadcmp.cpp:209
#: eeschema/eelibs_read_libraryfiles.cpp:67
#, c-format #, c-format
msgid "Library <%s> not found" msgid "Library <%s> not found"
msgstr "Librairie %s non trouvée" msgstr "Librairie %s non trouvée"
...@@ -2251,13 +1904,10 @@ msgid "Module <%s> not found" ...@@ -2251,13 +1904,10 @@ msgid "Module <%s> not found"
msgstr "Module <%s> non trouvé" msgstr "Module <%s> non trouvé"
#: pcbnew/loadcmp.cpp:355 #: pcbnew/loadcmp.cpp:355
#: pcbnew/librairi.cpp:254
#: eeschema/eelibs_read_libraryfiles.cpp:147
msgid "Library " msgid "Library "
msgstr "Librairie " msgstr "Librairie "
#: pcbnew/loadcmp.cpp:355 #: pcbnew/loadcmp.cpp:355
#: eeschema/eelibs_read_libraryfiles.cpp:151
msgid " loaded" msgid " loaded"
msgstr " chargé" msgstr " chargé"
...@@ -2403,10 +2053,6 @@ msgid "Unknown Pad shape" ...@@ -2403,10 +2053,6 @@ msgid "Unknown Pad shape"
msgstr "Forme Pad inconnue" msgstr "Forme Pad inconnue"
#: pcbnew/class_pad.cpp:464 #: pcbnew/class_pad.cpp:464
#: pcbnew/class_edge_mod.cpp:241
#: pcbnew/class_module.cpp:964
#: pcbnew/class_text_mod.cpp:474
#: cvpcb/setvisu.cpp:33
msgid "Module" msgid "Module"
msgstr "Module" msgstr "Module"
...@@ -2491,8 +2137,6 @@ msgid "Save current board as.." ...@@ -2491,8 +2137,6 @@ msgid "Save current board as.."
msgstr "Sauver le Circuit Imprimé courant sous.." msgstr "Sauver le Circuit Imprimé courant sous.."
#: pcbnew/menubarpcb.cpp:76 #: pcbnew/menubarpcb.cpp:76
#: eeschema/menubar.cpp:71
#: gerbview/tool_gerber.cpp:70
msgid "P&rint" msgid "P&rint"
msgstr "Imp&rimer" msgstr "Imp&rimer"
...@@ -2509,7 +2153,6 @@ msgid "Plot pcb board in SVG format" ...@@ -2509,7 +2153,6 @@ msgid "Plot pcb board in SVG format"
msgstr "Tracer le circuit imprimé en format SVG" msgstr "Tracer le circuit imprimé en format SVG"
#: pcbnew/menubarpcb.cpp:87 #: pcbnew/menubarpcb.cpp:87
#: eeschema/menubar.cpp:104
msgid "&Plot" msgid "&Plot"
msgstr "&Tracer" msgstr "&Tracer"
...@@ -2558,7 +2201,6 @@ msgid "Import a routed \"Specctra Session\" (*.ses) file" ...@@ -2558,7 +2201,6 @@ msgid "Import a routed \"Specctra Session\" (*.ses) file"
msgstr "Importer un fichier de routage \"Specctra Session\" (*.ses) " msgstr "Importer un fichier de routage \"Specctra Session\" (*.ses) "
#: pcbnew/menubarpcb.cpp:135 #: pcbnew/menubarpcb.cpp:135
#: eeschema/libframe.cpp:530
msgid "Import" msgid "Import"
msgstr "Importer" msgstr "Importer"
...@@ -2591,10 +2233,6 @@ msgid "Archive or add footprints in a library file" ...@@ -2591,10 +2233,6 @@ msgid "Archive or add footprints in a library file"
msgstr "Archiver ou ajouter les modules dans un fichier librairie" msgstr "Archiver ou ajouter les modules dans un fichier librairie"
#: pcbnew/menubarpcb.cpp:161 #: pcbnew/menubarpcb.cpp:161
#: eeschema/menubar.cpp:108
#: cvpcb/tool_cvpcb.cpp:125
#: kicad/buildmnu.cpp:162
#: gerbview/tool_gerber.cpp:75
msgid "E&xit" msgid "E&xit"
msgstr "&Quitter" msgstr "&Quitter"
...@@ -2603,7 +2241,6 @@ msgid "Quit PCBNEW" ...@@ -2603,7 +2241,6 @@ msgid "Quit PCBNEW"
msgstr "Quitter PCBNEW" msgstr "Quitter PCBNEW"
#: pcbnew/menubarpcb.cpp:172 #: pcbnew/menubarpcb.cpp:172
#: eeschema/menubar.cpp:285
msgid "&Library" msgid "&Library"
msgstr "&Librairie" msgstr "&Librairie"
...@@ -2640,8 +2277,6 @@ msgid "&Save Preferences" ...@@ -2640,8 +2277,6 @@ msgid "&Save Preferences"
msgstr "&Sauver Préférences" msgstr "&Sauver Préférences"
#: pcbnew/menubarpcb.cpp:199 #: pcbnew/menubarpcb.cpp:199
#: eeschema/menubar.cpp:308
#: gerbview/tool_gerber.cpp:100
msgid "Save application preferences" msgid "Save application preferences"
msgstr "Sauver les préférences de l'application" msgstr "Sauver les préférences de l'application"
...@@ -2650,7 +2285,6 @@ msgid "&Read Preferences" ...@@ -2650,7 +2285,6 @@ msgid "&Read Preferences"
msgstr "&Lire Préférences" msgstr "&Lire Préférences"
#: pcbnew/menubarpcb.cpp:204 #: pcbnew/menubarpcb.cpp:204
#: eeschema/menubar.cpp:313
msgid "Read application preferences" msgid "Read application preferences"
msgstr "Lire les préférences de l'application" msgstr "Lire les préférences de l'application"
...@@ -2663,26 +2297,18 @@ msgid "Adjust size and width for tracks and vias" ...@@ -2663,26 +2297,18 @@ msgid "Adjust size and width for tracks and vias"
msgstr "Ajuster largeur des pistes et diamètre de vias" msgstr "Ajuster largeur des pistes et diamètre de vias"
#: pcbnew/menubarpcb.cpp:222 #: pcbnew/menubarpcb.cpp:222
#: pcbnew/tool_pcb.cpp:614
#: eeschema/eelayer.cpp:211
#: pcbnew/set_color.h:414
#: eeschema/eelayer.h:214
#: gerbview/set_color.h:324
msgid "Grid" msgid "Grid"
msgstr "Grille" msgstr "Grille"
#: pcbnew/menubarpcb.cpp:223 #: pcbnew/menubarpcb.cpp:223
#: pcbnew/menubarmodedit.cpp:51
msgid "Adjust User Grid" msgid "Adjust User Grid"
msgstr "Ajuster Grille utilisateur" msgstr "Ajuster Grille utilisateur"
#: pcbnew/menubarpcb.cpp:228 #: pcbnew/menubarpcb.cpp:228
#: pcbnew/dialog_graphic_items_options.h:47
msgid "Texts and Drawings" msgid "Texts and Drawings"
msgstr "Textes et Tracés" msgstr "Textes et Tracés"
#: pcbnew/menubarpcb.cpp:229 #: pcbnew/menubarpcb.cpp:229
#: pcbnew/menubarmodedit.cpp:41
msgid "Adjust width for texts and drawings" msgid "Adjust width for texts and drawings"
msgstr "Ajuster dims pour textes et graphiques" msgstr "Ajuster dims pour textes et graphiques"
...@@ -2691,7 +2317,6 @@ msgid "Adjust size,shape,layers... for pads" ...@@ -2691,7 +2317,6 @@ msgid "Adjust size,shape,layers... for pads"
msgstr "Ajuster taille, forme, couches... pour pads" msgstr "Ajuster taille, forme, couches... pour pads"
#: pcbnew/menubarpcb.cpp:239 #: pcbnew/menubarpcb.cpp:239
#: gerbview/tool_gerber.cpp:99
msgid "&Save Setup" msgid "&Save Setup"
msgstr "&Sauver Options" msgstr "&Sauver Options"
...@@ -2723,112 +2348,95 @@ msgstr "Créer &Fichier Cmp" ...@@ -2723,112 +2348,95 @@ msgstr "Créer &Fichier Cmp"
msgid "Recreate .cmp file for CvPcb" msgid "Recreate .cmp file for CvPcb"
msgstr "Recréer le fichier .cmp pour CvPcb" msgstr "Recréer le fichier .cmp pour CvPcb"
#: pcbnew/menubarpcb.cpp:271 #: pcbnew/menubarpcb.cpp:267
msgid "Create &BOM File"
msgstr "Créer Fichier Liste du &Matériel"
#: pcbnew/menubarpcb.cpp:268
msgid "Recreate .csv file for CvPcb"
msgstr "Recréer le fichier .csv pour CvPcb"
#: pcbnew/menubarpcb.cpp:277
msgid "Global &Deletions" msgid "Global &Deletions"
msgstr "Effacements &Généraux" msgstr "Effacements &Généraux"
#: pcbnew/menubarpcb.cpp:272 #: pcbnew/menubarpcb.cpp:278
msgid "Delete tracks, modules, texts... on board" msgid "Delete tracks, modules, texts... on board"
msgstr "Effacer pistes, modules, textes... sur le C.I." msgstr "Effacer pistes, modules, textes... sur le C.I."
#: pcbnew/menubarpcb.cpp:277 #: pcbnew/menubarpcb.cpp:283
msgid "&List Nets" msgid "&List Nets"
msgstr "Liste Equipots" msgstr "Liste Equipots"
#: pcbnew/menubarpcb.cpp:278 #: pcbnew/menubarpcb.cpp:284
msgid "List nets (names and id)" msgid "List nets (names and id)"
msgstr "Lister équipotentielles (noms et numéros d'identification)" msgstr "Lister équipotentielles (noms et numéros d'identification)"
#: pcbnew/menubarpcb.cpp:283 #: pcbnew/menubarpcb.cpp:289
msgid "&Track Operations" msgid "&Track Operations"
msgstr "Opéra&tions sur Pistes" msgstr "Opéra&tions sur Pistes"
#: pcbnew/menubarpcb.cpp:284 #: pcbnew/menubarpcb.cpp:290
msgid "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" msgid "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias"
msgstr "Nettoyer bouts de pistes, vias, points inutiles, ou connecter extrémités de pistes mal connectées au centre de pads ou vias" msgstr "Nettoyer bouts de pistes, vias, points inutiles, ou connecter extrémités de pistes mal connectées au centre de pads ou vias"
#: pcbnew/menubarpcb.cpp:289 #: pcbnew/menubarpcb.cpp:295
msgid "&Swap Layers" msgid "&Swap Layers"
msgstr "&Permutte Couches" msgstr "&Permutte Couches"
#: pcbnew/menubarpcb.cpp:290 #: pcbnew/menubarpcb.cpp:296
msgid "Swap tracks on copper layers or drawings on others layers" msgid "Swap tracks on copper layers or drawings on others layers"
msgstr "Permutation de couches" msgstr "Permutation de couches"
#: pcbnew/menubarpcb.cpp:298 #: pcbnew/menubarpcb.cpp:304
#: pcbnew/menubarmodedit.cpp:64
#: eeschema/menubar.cpp:322
#: cvpcb/tool_cvpcb.cpp:154
#: kicad/buildmnu.cpp:257
#: gerbview/tool_gerber.cpp:129
msgid "&Contents" msgid "&Contents"
msgstr "&Contenu" msgstr "&Contenu"
#: pcbnew/menubarpcb.cpp:299 #: pcbnew/menubarpcb.cpp:305
msgid "Open the PCBNEW manual" msgid "Open the PCBNEW manual"
msgstr "Ouvrir la Documentation de PCBNEW" msgstr "Ouvrir la Documentation de PCBNEW"
#: pcbnew/menubarpcb.cpp:303 #: pcbnew/menubarpcb.cpp:309
msgid "&About PCBNEW" msgid "&About PCBNEW"
msgstr "&Au Sujet de PCBNEW" msgstr "&Au Sujet de PCBNEW"
#: pcbnew/menubarpcb.cpp:304 #: pcbnew/menubarpcb.cpp:310
msgid "About PCBNEW printed circuit board designer" msgid "About PCBNEW printed circuit board designer"
msgstr "Au Sujet de PCBNEW outil de conception de C.I." msgstr "Au Sujet de PCBNEW outil de conception de C.I."
#: pcbnew/menubarpcb.cpp:313 #: pcbnew/menubarpcb.cpp:319
#: pcbnew/menubarmodedit.cpp:82
msgid "3D Display" msgid "3D Display"
msgstr "3D Visu" msgstr "3D Visu"
#: pcbnew/menubarpcb.cpp:313 #: pcbnew/menubarpcb.cpp:319
#: pcbnew/menubarmodedit.cpp:82
msgid "Show board in 3D viewer" msgid "Show board in 3D viewer"
msgstr "Visualisation du circuit en 3D" msgstr "Visualisation du circuit en 3D"
#: pcbnew/menubarpcb.cpp:317 #: pcbnew/menubarpcb.cpp:323
#: eeschema/menubar.cpp:333
#: cvpcb/tool_cvpcb.cpp:164
#: kicad/buildmnu.cpp:269
#: gerbview/tool_gerber.cpp:135
#: 3d-viewer/3d_toolbar.cpp:116
msgid "&File" msgid "&File"
msgstr "&Fichiers" msgstr "&Fichiers"
#: pcbnew/menubarpcb.cpp:318 #: pcbnew/menubarpcb.cpp:324
#: eeschema/menubar.cpp:337
#: cvpcb/tool_cvpcb.cpp:165
#: kicad/buildmnu.cpp:271
#: gerbview/tool_gerber.cpp:136
#: 3d-viewer/3d_toolbar.cpp:124
msgid "&Preferences" msgid "&Preferences"
msgstr "&Préférences" msgstr "&Préférences"
#: pcbnew/menubarpcb.cpp:319 #: pcbnew/menubarpcb.cpp:325
#: pcbnew/menubarmodedit.cpp:86
msgid "&Dimensions" msgid "&Dimensions"
msgstr "&Dimensions" msgstr "&Dimensions"
#: pcbnew/menubarpcb.cpp:320 #: pcbnew/menubarpcb.cpp:326
#: gerbview/tool_gerber.cpp:137
msgid "&Miscellaneous" msgid "&Miscellaneous"
msgstr "&Divers" msgstr "&Divers"
#: pcbnew/menubarpcb.cpp:321 #: pcbnew/menubarpcb.cpp:327
msgid "P&ostprocess" msgid "P&ostprocess"
msgstr "P&ostprocesseurs" msgstr "P&ostprocesseurs"
#: pcbnew/menubarpcb.cpp:322 #: pcbnew/menubarpcb.cpp:328
#: pcbnew/menubarmodedit.cpp:87
msgid "&3D Display" msgid "&3D Display"
msgstr "&3D Visu" msgstr "&3D Visu"
#: pcbnew/menubarpcb.cpp:323 #: pcbnew/menubarpcb.cpp:329
#: pcbnew/menubarmodedit.cpp:88
#: eeschema/menubar.cpp:338
#: cvpcb/tool_cvpcb.cpp:166
#: kicad/buildmnu.cpp:272
#: gerbview/tool_gerber.cpp:140
msgid "&Help" msgid "&Help"
msgstr "&Aide" msgstr "&Aide"
...@@ -2849,7 +2457,6 @@ msgid "Delete draw items?" ...@@ -2849,7 +2457,6 @@ msgid "Delete draw items?"
msgstr "Suppression éléments graphiques?" msgstr "Suppression éléments graphiques?"
#: pcbnew/initpcb.cpp:256 #: pcbnew/initpcb.cpp:256
#: gerbview/initpcb.cpp:136
msgid "Delete Tracks?" msgid "Delete Tracks?"
msgstr "Effacer Pistes ?" msgstr "Effacer Pistes ?"
...@@ -2858,25 +2465,18 @@ msgid "Delete Modules?" ...@@ -2858,25 +2465,18 @@ msgid "Delete Modules?"
msgstr "Effacement des Modules?" msgstr "Effacement des Modules?"
#: pcbnew/initpcb.cpp:300 #: pcbnew/initpcb.cpp:300
#: gerbview/initpcb.cpp:159
msgid "Delete Pcb Texts" msgid "Delete Pcb Texts"
msgstr "Effacer Textes Pcb" msgstr "Effacer Textes Pcb"
#: pcbnew/dialog_print_using_printer.cpp:131 #: pcbnew/dialog_print_using_printer.cpp:131
#: eeschema/dialog_print_using_printer.cpp:106
msgid "Error Init Printer info" msgid "Error Init Printer info"
msgstr "Erreur Init info imprimante" msgstr "Erreur Init info imprimante"
#: pcbnew/dialog_print_using_printer.cpp:166 #: pcbnew/dialog_print_using_printer.cpp:166
#: pcbnew/dialog_SVG_print_base.cpp:23
#: pcbnew/dialog_pad_properties_base.cpp:106
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:53
#: pcbnew/dialog_print_using_printer_base.cpp:20
msgid "Layers:" msgid "Layers:"
msgstr "Couches:" msgstr "Couches:"
#: pcbnew/dialog_print_using_printer.cpp:377 #: pcbnew/dialog_print_using_printer.cpp:377
#: eeschema/dialog_print_using_printer.cpp:217
msgid "Printer Problem!" msgid "Printer Problem!"
msgstr "Problème d'imprimante" msgstr "Problème d'imprimante"
...@@ -2885,20 +2485,14 @@ msgid "Print Preview" ...@@ -2885,20 +2485,14 @@ msgid "Print Preview"
msgstr "Prévisualisation" msgstr "Prévisualisation"
#: pcbnew/dialog_print_using_printer.cpp:468 #: pcbnew/dialog_print_using_printer.cpp:468
#: pcbnew/dialog_print_using_printer_base.cpp:125
#: eeschema/dialog_print_using_printer_base.cpp:69
#: pcbnew/dialog_print_using_printer_base.h:76
#: eeschema/dialog_print_using_printer_base.h:66
msgid "Print" msgid "Print"
msgstr "Imprimer" msgstr "Imprimer"
#: pcbnew/dialog_print_using_printer.cpp:479 #: pcbnew/dialog_print_using_printer.cpp:479
#: eeschema/dialog_print_using_printer.cpp:289
msgid "There was a problem printing" msgid "There was a problem printing"
msgstr "Il y a un problème d'impression" msgstr "Il y a un problème d'impression"
#: pcbnew/dialog_print_using_printer.cpp:495 #: pcbnew/dialog_print_using_printer.cpp:495
#: eeschema/dialog_print_using_printer.cpp:305
#, c-format #, c-format
msgid "Print page %d" msgid "Print page %d"
msgstr "Imprimer page %d" msgstr "Imprimer page %d"
...@@ -2924,8 +2518,6 @@ msgid "Import Module:" ...@@ -2924,8 +2518,6 @@ msgid "Import Module:"
msgstr "Importer Module:" msgstr "Importer Module:"
#: pcbnew/librairi.cpp:80 #: pcbnew/librairi.cpp:80
#: pcbnew/files.cpp:199
#: cvpcb/readschematicnetlist.cpp:112
#, c-format #, c-format
msgid "File <%s> not found" msgid "File <%s> not found"
msgstr " fichier %s non trouvé" msgstr " fichier %s non trouvé"
...@@ -2949,7 +2541,6 @@ msgid "File %s exists, OK to replace ?" ...@@ -2949,7 +2541,6 @@ msgid "File %s exists, OK to replace ?"
msgstr "Fichier %s existant, OK pour remplacer ?" msgstr "Fichier %s existant, OK pour remplacer ?"
#: pcbnew/librairi.cpp:201 #: pcbnew/librairi.cpp:201
#: eeschema/symbedit.cpp:178
#, c-format #, c-format
msgid "Unable to create <%s>" msgid "Unable to create <%s>"
msgstr "Incapable de créer <%s>" msgstr "Incapable de créer <%s>"
...@@ -2965,13 +2556,6 @@ msgid "Ok to delete module %s in library %s" ...@@ -2965,13 +2556,6 @@ msgid "Ok to delete module %s in library %s"
msgstr "Ok pour effacer module %s en librairie %s" msgstr "Ok pour effacer module %s en librairie %s"
#: pcbnew/librairi.cpp:254 #: pcbnew/librairi.cpp:254
#: pcbnew/files.cpp:83
#: eeschema/find.cpp:240
#: eeschema/find.cpp:248
#: eeschema/find.cpp:688
#: gerbview/dcode.cpp:289
#: gerbview/readgerb.cpp:146
#: common/eda_doc.cpp:142
msgid " not found" msgid " not found"
msgstr " non trouvé" msgstr " non trouvé"
...@@ -3144,10 +2728,6 @@ msgid "The URL of the FreeRouting.net website" ...@@ -3144,10 +2728,6 @@ msgid "The URL of the FreeRouting.net website"
msgstr "L' URL du site FreeRouting.net" msgstr "L' URL du site FreeRouting.net"
#: pcbnew/dialog_freeroute_exchange.cpp:213 #: pcbnew/dialog_freeroute_exchange.cpp:213
#: pcbnew/dialog_netlist.cpp:253
#: eeschema/plotps.cpp:245
#: eeschema/dialog_erc.cpp:219
#: eeschema/plothpgl.cpp:339
msgid "&Close" msgid "&Close"
msgstr "&Fermer" msgstr "&Fermer"
...@@ -3188,7 +2768,6 @@ msgstr "" ...@@ -3188,7 +2768,6 @@ msgstr ""
"et mettre le trou de la via à cette valeur spécifique en utilisant le menu popup." "et mettre le trou de la via à cette valeur spécifique en utilisant le menu popup."
#: pcbnew/dialog_track_options_base.cpp:56 #: pcbnew/dialog_track_options_base.cpp:56
#: pcbnew/pcbnew.h:288
msgid "Through Via" msgid "Through Via"
msgstr "Via Traversante" msgstr "Via Traversante"
...@@ -3209,7 +2788,6 @@ msgstr "" ...@@ -3209,7 +2788,6 @@ msgstr ""
"Via traversante est la sélection usuelle." "Via traversante est la sélection usuelle."
#: pcbnew/dialog_track_options_base.cpp:67 #: pcbnew/dialog_track_options_base.cpp:67
#: pcbnew/dialog_gendrill.cpp:284
msgid "Micro Vias:" msgid "Micro Vias:"
msgstr "Micro Vias:" msgstr "Micro Vias:"
...@@ -3334,10 +2912,6 @@ msgid "Via %.3f" ...@@ -3334,10 +2912,6 @@ msgid "Via %.3f"
msgstr "Via %.3f" msgstr "Via %.3f"
#: pcbnew/onrightclick.cpp:128 #: pcbnew/onrightclick.cpp:128
#: pcbnew/modedit_onclick.cpp:198
#: eeschema/onrightclick.cpp:104
#: eeschema/libedit_onrightclick.cpp:47
#: gerbview/onrightclick.cpp:41
msgid "End Tool" msgid "End Tool"
msgstr "Fin Outil" msgstr "Fin Outil"
...@@ -3362,7 +2936,6 @@ msgid "Move Drawing" ...@@ -3362,7 +2936,6 @@ msgid "Move Drawing"
msgstr "Déplace Tracé" msgstr "Déplace Tracé"
#: pcbnew/onrightclick.cpp:239 #: pcbnew/onrightclick.cpp:239
#: eeschema/onrightclick.cpp:210
msgid "End Drawing" msgid "End Drawing"
msgstr "Fin tracé" msgstr "Fin tracé"
...@@ -3371,7 +2944,6 @@ msgid "Edit Drawing" ...@@ -3371,7 +2944,6 @@ msgid "Edit Drawing"
msgstr "Edit Tracé" msgstr "Edit Tracé"
#: pcbnew/onrightclick.cpp:244 #: pcbnew/onrightclick.cpp:244
#: eeschema/onrightclick.cpp:212
msgid "Delete Drawing" msgid "Delete Drawing"
msgstr "Supprimer Tracé" msgstr "Supprimer Tracé"
...@@ -3388,7 +2960,6 @@ msgid "Delete Last Corner" ...@@ -3388,7 +2960,6 @@ msgid "Delete Last Corner"
msgstr "Supprimer Dernier Sommet" msgstr "Supprimer Dernier Sommet"
#: pcbnew/onrightclick.cpp:276 #: pcbnew/onrightclick.cpp:276
#: eeschema/onrightclick.cpp:157
msgid "Delete Marker" msgid "Delete Marker"
msgstr "Effacer Marqueur" msgstr "Effacer Marqueur"
...@@ -3505,23 +3076,14 @@ msgid "Read Global AutoRouter Data" ...@@ -3505,23 +3076,14 @@ msgid "Read Global AutoRouter Data"
msgstr "Lire Données de L'autorouteur global" msgstr "Lire Données de L'autorouteur global"
#: pcbnew/onrightclick.cpp:451 #: pcbnew/onrightclick.cpp:451
#: pcbnew/modedit_onclick.cpp:208
#: eeschema/onrightclick.cpp:611
#: eeschema/libedit_onrightclick.cpp:231
#: gerbview/onrightclick.cpp:50
msgid "Cancel Block" msgid "Cancel Block"
msgstr "Annuler Bloc" msgstr "Annuler Bloc"
#: pcbnew/onrightclick.cpp:453 #: pcbnew/onrightclick.cpp:453
#: eeschema/onrightclick.cpp:617
msgid "Zoom Block" msgid "Zoom Block"
msgstr "Zoom Bloc" msgstr "Zoom Bloc"
#: pcbnew/onrightclick.cpp:456 #: pcbnew/onrightclick.cpp:456
#: pcbnew/modedit_onclick.cpp:213
#: eeschema/onrightclick.cpp:619
#: eeschema/libedit_onrightclick.cpp:238
#: gerbview/onrightclick.cpp:53
msgid "Place Block" msgid "Place Block"
msgstr "Place Bloc" msgstr "Place Bloc"
...@@ -3641,10 +3203,6 @@ msgstr "Changer TOUTES Pistes (Pas les Vias)" ...@@ -3641,10 +3203,6 @@ msgstr "Changer TOUTES Pistes (Pas les Vias)"
#: pcbnew/onrightclick.cpp:772 #: pcbnew/onrightclick.cpp:772
#: pcbnew/onrightclick.cpp:827 #: pcbnew/onrightclick.cpp:827
#: pcbnew/onrightclick.cpp:876 #: pcbnew/onrightclick.cpp:876
#: pcbnew/dialog_netlist.cpp:186
#: eeschema/edit_component_in_lib.cpp:129
#: eeschema/edit_component_in_lib.cpp:210
#: eeschema/menubar.cpp:133
msgid "Delete" msgid "Delete"
msgstr "Supprimer" msgstr "Supprimer"
...@@ -3769,7 +3327,6 @@ msgid "Rotate +" ...@@ -3769,7 +3327,6 @@ msgid "Rotate +"
msgstr "Rotation +" msgstr "Rotation +"
#: pcbnew/onrightclick.cpp:729 #: pcbnew/onrightclick.cpp:729
#: eeschema/onrightclick.cpp:290
msgid "Rotate -" msgid "Rotate -"
msgstr "Rotation -" msgstr "Rotation -"
...@@ -3780,26 +3337,19 @@ msgstr "Change côté" ...@@ -3780,26 +3337,19 @@ msgstr "Change côté"
#: pcbnew/onrightclick.cpp:734 #: pcbnew/onrightclick.cpp:734
#: pcbnew/onrightclick.cpp:768 #: pcbnew/onrightclick.cpp:768
#: pcbnew/onrightclick.cpp:872 #: pcbnew/onrightclick.cpp:872
#: pcbnew/modedit_onclick.cpp:308
#: eeschema/onrightclick.cpp:302
msgid "Edit" msgid "Edit"
msgstr "Editer" msgstr "Editer"
#: pcbnew/onrightclick.cpp:766 #: pcbnew/onrightclick.cpp:766
#: pcbnew/onrightclick.cpp:870 #: pcbnew/onrightclick.cpp:870
#: pcbnew/modedit_onclick.cpp:243
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:126
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:91
msgid "Rotate" msgid "Rotate"
msgstr "Rotation" msgstr "Rotation"
#: pcbnew/onrightclick.cpp:805 #: pcbnew/onrightclick.cpp:805
#: pcbnew/modedit_onclick.cpp:265
msgid "Edit Pad" msgid "Edit Pad"
msgstr "Edit Pad" msgstr "Edit Pad"
#: pcbnew/onrightclick.cpp:809 #: pcbnew/onrightclick.cpp:809
#: pcbnew/modedit_onclick.cpp:267
msgid "New Pad Settings" msgid "New Pad Settings"
msgstr "Nouvelles Caract. Pads" msgstr "Nouvelles Caract. Pads"
...@@ -3808,7 +3358,6 @@ msgid "Copy current pad settings to this pad" ...@@ -3808,7 +3358,6 @@ msgid "Copy current pad settings to this pad"
msgstr "Copier les réglages courants pour ce pad" msgstr "Copier les réglages courants pour ce pad"
#: pcbnew/onrightclick.cpp:813 #: pcbnew/onrightclick.cpp:813
#: pcbnew/modedit_onclick.cpp:269
msgid "Export Pad Settings" msgid "Export Pad Settings"
msgstr "Exporte Caract. Pads" msgstr "Exporte Caract. Pads"
...@@ -3817,7 +3366,6 @@ msgid "Copy this pad settings to current pad settings" ...@@ -3817,7 +3366,6 @@ msgid "Copy this pad settings to current pad settings"
msgstr "Copier les caractéristiques de ce pad vers les caractéristiques courantes" msgstr "Copier les caractéristiques de ce pad vers les caractéristiques courantes"
#: pcbnew/onrightclick.cpp:820 #: pcbnew/onrightclick.cpp:820
#: pcbnew/modedit_onclick.cpp:276
msgid "Global Pad Settings" msgid "Global Pad Settings"
msgstr "Edition Globale des pads" msgstr "Edition Globale des pads"
...@@ -3862,25 +3410,18 @@ msgid "Open module editor" ...@@ -3862,25 +3410,18 @@ msgid "Open module editor"
msgstr "Ouvrir Editeur de modules" msgstr "Ouvrir Editeur de modules"
#: pcbnew/tool_pcb.cpp:221 #: pcbnew/tool_pcb.cpp:221
#: eeschema/tool_sch.cpp:62
#: gerbview/tool_gerber.cpp:202
msgid "Cut selected item" msgid "Cut selected item"
msgstr "Suppression des éléments sélectionnés" msgstr "Suppression des éléments sélectionnés"
#: pcbnew/tool_pcb.cpp:225 #: pcbnew/tool_pcb.cpp:225
#: eeschema/tool_sch.cpp:65
#: gerbview/tool_gerber.cpp:207
msgid "Copy selected item" msgid "Copy selected item"
msgstr "Copie des éléments sélectionnés" msgstr "Copie des éléments sélectionnés"
#: pcbnew/tool_pcb.cpp:228 #: pcbnew/tool_pcb.cpp:228
#: eeschema/tool_sch.cpp:68
#: gerbview/tool_gerber.cpp:213
msgid "Paste" msgid "Paste"
msgstr "Copie des éléments sauvegardés" msgstr "Copie des éléments sauvegardés"
#: pcbnew/tool_pcb.cpp:232 #: pcbnew/tool_pcb.cpp:232
#: gerbview/tool_gerber.cpp:220
msgid "Undelete" msgid "Undelete"
msgstr "Annulation du dernier effacement" msgstr "Annulation du dernier effacement"
...@@ -3893,59 +3434,22 @@ msgid "Plot (HPGL, PostScript, or GERBER format)" ...@@ -3893,59 +3434,22 @@ msgid "Plot (HPGL, PostScript, or GERBER format)"
msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER" msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER"
#: pcbnew/tool_pcb.cpp:241 #: pcbnew/tool_pcb.cpp:241
#: pcbnew/tool_modedit.cpp:105
#: eeschema/menubar.cpp:154
#: eeschema/menubar.cpp:155
#: eeschema/tool_lib.cpp:170
#: eeschema/tool_sch.cpp:89
#: eeschema/tool_viewlib.cpp:70
#: gerbview/tool_gerber.cpp:230
#: common/zoom.cpp:211
#: 3d-viewer/3d_toolbar.cpp:43
msgid "Zoom in" msgid "Zoom in"
msgstr "Zoom +" msgstr "Zoom +"
#: pcbnew/tool_pcb.cpp:246 #: pcbnew/tool_pcb.cpp:246
#: pcbnew/tool_modedit.cpp:110
#: eeschema/menubar.cpp:160
#: eeschema/menubar.cpp:162
#: eeschema/tool_lib.cpp:174
#: eeschema/tool_sch.cpp:93
#: eeschema/tool_viewlib.cpp:74
#: gerbview/tool_gerber.cpp:237
#: common/zoom.cpp:212
#: 3d-viewer/3d_toolbar.cpp:46
msgid "Zoom out" msgid "Zoom out"
msgstr "Zoom -" msgstr "Zoom -"
#: pcbnew/tool_pcb.cpp:251 #: pcbnew/tool_pcb.cpp:251
#: pcbnew/tool_modedit.cpp:115
#: eeschema/menubar.cpp:174
#: eeschema/tool_lib.cpp:178
#: eeschema/tool_sch.cpp:97
#: eeschema/tool_viewlib.cpp:78
#: gerbview/tool_gerber.cpp:244
#: common/zoom.cpp:220
#: 3d-viewer/3d_toolbar.cpp:49
msgid "Redraw view" msgid "Redraw view"
msgstr "Redessin de l'écran" msgstr "Redessin de l'écran"
#: pcbnew/tool_pcb.cpp:258 #: pcbnew/tool_pcb.cpp:258
#: pcbnew/tool_modedit.cpp:122
#: eeschema/menubar.cpp:167
#: eeschema/menubar.cpp:168
#: eeschema/menubar.cpp:176
#: eeschema/tool_lib.cpp:184
#: eeschema/tool_sch.cpp:102
#: gerbview/tool_gerber.cpp:255
#: common/zoom.cpp:213
#: 3d-viewer/3d_toolbar.cpp:52
msgid "Zoom auto" msgid "Zoom auto"
msgstr "Zoom Automatique" msgstr "Zoom Automatique"
#: pcbnew/tool_pcb.cpp:261 #: pcbnew/tool_pcb.cpp:261
#: eeschema/menubar.cpp:140
#: eeschema/tool_sch.cpp:106
msgid "Find components and texts" msgid "Find components and texts"
msgstr "Recherche de composants et textes" msgstr "Recherche de composants et textes"
...@@ -3974,36 +3478,22 @@ msgid "Drc OFF" ...@@ -3974,36 +3478,22 @@ msgid "Drc OFF"
msgstr "Drc DESACTIVEE" msgstr "Drc DESACTIVEE"
#: pcbnew/tool_pcb.cpp:323 #: pcbnew/tool_pcb.cpp:323
#: pcbnew/tool_modedit.cpp:208
#: eeschema/tool_sch.cpp:247
#: gerbview/tool_gerber.cpp:376
msgid "Display Grid OFF" msgid "Display Grid OFF"
msgstr "Suppression de l'affichage de la grille" msgstr "Suppression de l'affichage de la grille"
#: pcbnew/tool_pcb.cpp:326 #: pcbnew/tool_pcb.cpp:326
#: pcbnew/tool_modedit.cpp:212
#: gerbview/tool_gerber.cpp:382
msgid "Display Polar Coord ON" msgid "Display Polar Coord ON"
msgstr "Activer affichage coord Polaires" msgstr "Activer affichage coord Polaires"
#: pcbnew/tool_pcb.cpp:329 #: pcbnew/tool_pcb.cpp:329
#: pcbnew/tool_modedit.cpp:216
#: eeschema/tool_sch.cpp:251
#: gerbview/tool_gerber.cpp:386
msgid "Units in inches" msgid "Units in inches"
msgstr "Unités en pouces" msgstr "Unités en pouces"
#: pcbnew/tool_pcb.cpp:332 #: pcbnew/tool_pcb.cpp:332
#: pcbnew/tool_modedit.cpp:220
#: eeschema/tool_sch.cpp:255
#: gerbview/tool_gerber.cpp:390
msgid "Units in millimeters" msgid "Units in millimeters"
msgstr "Unités en millimètres" msgstr "Unités en millimètres"
#: pcbnew/tool_pcb.cpp:335 #: pcbnew/tool_pcb.cpp:335
#: pcbnew/tool_modedit.cpp:227
#: eeschema/tool_sch.cpp:259
#: gerbview/tool_gerber.cpp:396
msgid "Change Cursor Shape" msgid "Change Cursor Shape"
msgstr "Sélection de la forme du curseur" msgstr "Sélection de la forme du curseur"
...@@ -4032,7 +3522,6 @@ msgid "Show outlines of filled areas only in zones" ...@@ -4032,7 +3522,6 @@ msgid "Show outlines of filled areas only in zones"
msgstr "Afficher uniquement les contours des surfaces remplies dans les zones" msgstr "Afficher uniquement les contours des surfaces remplies dans les zones"
#: pcbnew/tool_pcb.cpp:365 #: pcbnew/tool_pcb.cpp:365
#: pcbnew/tool_modedit.cpp:235
msgid "Show Pads Sketch" msgid "Show Pads Sketch"
msgstr "Afficher pastilles en contour" msgstr "Afficher pastilles en contour"
...@@ -4069,17 +3558,14 @@ msgid "Add zones" ...@@ -4069,17 +3558,14 @@ msgid "Add zones"
msgstr "Addition de Zones" msgstr "Addition de Zones"
#: pcbnew/tool_pcb.cpp:438 #: pcbnew/tool_pcb.cpp:438
#: pcbnew/tool_modedit.cpp:163
msgid "Add graphic line or polygon" msgid "Add graphic line or polygon"
msgstr "Addition de lignes ou polygones graphiques" msgstr "Addition de lignes ou polygones graphiques"
#: pcbnew/tool_pcb.cpp:442 #: pcbnew/tool_pcb.cpp:442
#: pcbnew/tool_modedit.cpp:167
msgid "Add graphic circle" msgid "Add graphic circle"
msgstr "Addition de graphiques (Cercle)" msgstr "Addition de graphiques (Cercle)"
#: pcbnew/tool_pcb.cpp:446 #: pcbnew/tool_pcb.cpp:446
#: pcbnew/tool_modedit.cpp:171
msgid "Add graphic arc" msgid "Add graphic arc"
msgstr "Addition de graphiques (Arc de Cercle)" msgstr "Addition de graphiques (Arc de Cercle)"
...@@ -4092,16 +3578,10 @@ msgid "Add dimension" ...@@ -4092,16 +3578,10 @@ msgid "Add dimension"
msgstr "Ajout des cotes" msgstr "Ajout des cotes"
#: pcbnew/tool_pcb.cpp:459 #: pcbnew/tool_pcb.cpp:459
#: gerbview/tool_gerber.cpp:337
msgid "Add layer alignment target" msgid "Add layer alignment target"
msgstr "Ajouter Mire de superposition" msgstr "Ajouter Mire de superposition"
#: pcbnew/tool_pcb.cpp:464 #: pcbnew/tool_pcb.cpp:464
#: pcbnew/tool_modedit.cpp:185
#: eeschema/menubar.cpp:133
#: eeschema/tool_lib.cpp:87
#: eeschema/tool_sch.cpp:225
#: gerbview/tool_gerber.cpp:352
msgid "Delete items" msgid "Delete items"
msgstr "Suppression d'éléments" msgstr "Suppression d'éléments"
...@@ -4138,19 +3618,14 @@ msgstr "" ...@@ -4138,19 +3618,14 @@ msgstr ""
" sinon utiliser la largeur courante" " sinon utiliser la largeur courante"
#: pcbnew/tool_pcb.cpp:590 #: pcbnew/tool_pcb.cpp:590
#: pcbnew/tool_modedit.cpp:285
#: eeschema/plotps.cpp:192
msgid "Auto" msgid "Auto"
msgstr "Auto" msgstr "Auto"
#: pcbnew/tool_pcb.cpp:594 #: pcbnew/tool_pcb.cpp:594
#: pcbnew/tool_modedit.cpp:289
msgid "Zoom " msgid "Zoom "
msgstr "Zoom " msgstr "Zoom "
#: pcbnew/tool_pcb.cpp:632 #: pcbnew/tool_pcb.cpp:632
#: pcbnew/tool_modedit.cpp:324
#: common/zoom.cpp:260
msgid "User Grid" msgid "User Grid"
msgstr "Grille perso" msgstr "Grille perso"
...@@ -4164,8 +3639,6 @@ msgid "Delete Pad (module %s %s) " ...@@ -4164,8 +3639,6 @@ msgid "Delete Pad (module %s %s) "
msgstr "Effacer Pad (module %s %s) " msgstr "Effacer Pad (module %s %s) "
#: pcbnew/files.cpp:21 #: pcbnew/files.cpp:21
#: kicad/files-io.cpp:36
#: gerbview/files.cpp:25
msgid "Printed circuit board" msgid "Printed circuit board"
msgstr "Circuit imprimé" msgstr "Circuit imprimé"
...@@ -4177,39 +3650,39 @@ msgstr "Fichier de secours " ...@@ -4177,39 +3650,39 @@ msgstr "Fichier de secours "
msgid "Ok to load Recovery file " msgid "Ok to load Recovery file "
msgstr "Ok pour charger le fichier de secours" msgstr "Ok pour charger le fichier de secours"
#: pcbnew/files.cpp:152 #: pcbnew/files.cpp:148
msgid "Board Modified: Continue ?" msgid "Board Modified: Continue ?"
msgstr "Circuit imprimé modifié, Continuer ?" msgstr "Circuit imprimé modifié, Continuer ?"
#: pcbnew/files.cpp:172 #: pcbnew/files.cpp:168
msgid "Open Board File:" msgid "Open Board File:"
msgstr "Ouvrir Fichier C.I.:" msgstr "Ouvrir Fichier C.I.:"
#: pcbnew/files.cpp:218 #: pcbnew/files.cpp:214
msgid "This file was created by a more recent version of PCBnew and may not load correctly. Please consider updating!" msgid "This file was created by a more recent version of PCBnew and may not load correctly. Please consider updating!"
msgstr "Ce fichier a été créé par une version plus récente de PCBnew et peut être incorrectement chargé. SVP penser à une mise à jour!" msgstr "Ce fichier a été créé par une version plus récente de PCBnew et peut être incorrectement chargé. SVP penser à une mise à jour!"
#: pcbnew/files.cpp:222 #: pcbnew/files.cpp:218
msgid "This file was created by an older version of PCBnew. It will be stored in the new file format when you save this file again." msgid "This file was created by an older version of PCBnew. It will be stored in the new file format when you save this file again."
msgstr "Ce fichier a été créé par une version plus ancienne de Eeschema. Il sera enregistré au nouveau format après la prochaine sauvegarde." msgstr "Ce fichier a été créé par une version plus ancienne de Eeschema. Il sera enregistré au nouveau format après la prochaine sauvegarde."
#: pcbnew/files.cpp:309 #: pcbnew/files.cpp:305
msgid "Save board files:" msgid "Save board files:"
msgstr "Sauver Fichiers C.I.:" msgstr "Sauver Fichiers C.I.:"
#: pcbnew/files.cpp:348 #: pcbnew/files.cpp:344
msgid "Warning: unable to create bakfile " msgid "Warning: unable to create bakfile "
msgstr "Attention: Impossible de créer fichier backup " msgstr "Attention: Impossible de créer fichier backup "
#: pcbnew/files.cpp:382 #: pcbnew/files.cpp:378
msgid "Backup file: " msgid "Backup file: "
msgstr "Fichier backup: " msgstr "Fichier backup: "
#: pcbnew/files.cpp:386 #: pcbnew/files.cpp:382
msgid "Wrote board file: " msgid "Wrote board file: "
msgstr "Ecriture fichier CI: " msgstr "Ecriture fichier CI: "
#: pcbnew/files.cpp:388 #: pcbnew/files.cpp:384
msgid "Failed to create " msgid "Failed to create "
msgstr "Impossible de créer fichier " msgstr "Impossible de créer fichier "
...@@ -4335,7 +3808,6 @@ msgid "Error writing to STRINGFORMATTER" ...@@ -4335,7 +3808,6 @@ msgid "Error writing to STRINGFORMATTER"
msgstr "Erreur d'écriture à STRINGFORMATTER" msgstr "Erreur d'écriture à STRINGFORMATTER"
#: pcbnew/dialog_gendrill.cpp:166 #: pcbnew/dialog_gendrill.cpp:166
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:30
msgid "Millimeters" msgid "Millimeters"
msgstr "Millimètres" msgstr "Millimètres"
...@@ -4393,7 +3865,6 @@ msgstr "Choisir l'origine des coordonnées: absolue ou relative à l'axe auxilia ...@@ -4393,7 +3865,6 @@ msgstr "Choisir l'origine des coordonnées: absolue ou relative à l'axe auxilia
#: pcbnew/dialog_gendrill.cpp:205 #: pcbnew/dialog_gendrill.cpp:205
#: pcbnew/dialog_gendrill.cpp:215 #: pcbnew/dialog_gendrill.cpp:215
#: eeschema/libedit.cpp:38
msgid "None" msgid "None"
msgstr "Aucun" msgstr "Aucun"
...@@ -4434,17 +3905,10 @@ msgid "Speed (cm/s)" ...@@ -4434,17 +3905,10 @@ msgid "Speed (cm/s)"
msgstr "Vitesse plume ( cm/s )" msgstr "Vitesse plume ( cm/s )"
#: pcbnew/dialog_gendrill.cpp:233 #: pcbnew/dialog_gendrill.cpp:233
#: eeschema/plothpgl.cpp:270
msgid "Pen Number" msgid "Pen Number"
msgstr "Numéro de plume" msgstr "Numéro de plume"
#: pcbnew/dialog_gendrill.cpp:239 #: pcbnew/dialog_gendrill.cpp:239
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:80
#: pcbnew/dialog_print_using_printer_base.cpp:76
#: eeschema/dialog_build_BOM_base.cpp:20
#: eeschema/dialog_build_BOM_base.cpp:60
#: eeschema/netlist_control.cpp:127
#: eeschema/dialog_print_using_printer_base.cpp:23
msgid "Options:" msgid "Options:"
msgstr "Options :" msgstr "Options :"
...@@ -4461,7 +3925,6 @@ msgid "If checked, the excellon header is minimal" ...@@ -4461,7 +3925,6 @@ msgid "If checked, the excellon header is minimal"
msgstr "Si activé, l'entête du fichier EXELLON est minimale" msgstr "Si activé, l'entête du fichier EXELLON est minimale"
#: pcbnew/dialog_gendrill.cpp:256 #: pcbnew/dialog_gendrill.cpp:256
#: common/confirm.cpp:105
msgid "Info:" msgid "Info:"
msgstr "Infos:" msgstr "Infos:"
...@@ -4523,7 +3986,6 @@ msgid "Connect" ...@@ -4523,7 +3986,6 @@ msgid "Connect"
msgstr "Connect" msgstr "Connect"
#: pcbnew/class_board.cpp:555 #: pcbnew/class_board.cpp:555
#: eeschema/eelayer.h:115
msgid "NoConn" msgid "NoConn"
msgstr "Non Conn" msgstr "Non Conn"
...@@ -4536,7 +3998,6 @@ msgid "Adjust size,shape,layers... for Pads" ...@@ -4536,7 +3998,6 @@ msgid "Adjust size,shape,layers... for Pads"
msgstr "Ajuster taille, forme, couches... pour pads" msgstr "Ajuster taille, forme, couches... pour pads"
#: pcbnew/menubarmodedit.cpp:50 #: pcbnew/menubarmodedit.cpp:50
#: pcbnew/set_grid.h:39
msgid "User Grid Size" msgid "User Grid Size"
msgstr "Dim Grille utilisteur" msgstr "Dim Grille utilisteur"
...@@ -4552,43 +4013,40 @@ msgstr "&Au sujet de Pcbnew" ...@@ -4552,43 +4013,40 @@ msgstr "&Au sujet de Pcbnew"
msgid "About pcbnew PCB designer" msgid "About pcbnew PCB designer"
msgstr "Au sujet de Pcbnew, concption de PCB" msgstr "Au sujet de Pcbnew, concption de PCB"
#: pcbnew/class_zone.cpp:895 #: pcbnew/class_zone.cpp:903
msgid "Non Copper Zone" msgid "Non Copper Zone"
msgstr "Zone non Cuivre" msgstr "Zone non Cuivre"
#: pcbnew/class_zone.cpp:908 #: pcbnew/class_zone.cpp:916
msgid "Corners" msgid "Corners"
msgstr "Sommets" msgstr "Sommets"
#: pcbnew/class_zone.cpp:912 #: pcbnew/class_zone.cpp:920
msgid "Segments" msgid "Segments"
msgstr "Segments" msgstr "Segments"
#: pcbnew/class_zone.cpp:914 #: pcbnew/class_zone.cpp:922
msgid "Polygons" msgid "Polygons"
msgstr "Polygones" msgstr "Polygones"
#: pcbnew/class_zone.cpp:915 #: pcbnew/class_zone.cpp:923
msgid "Fill mode" msgid "Fill mode"
msgstr "Mode de remplissage" msgstr "Mode de remplissage"
#: pcbnew/class_zone.cpp:920 #: pcbnew/class_zone.cpp:928
msgid "Hatch lines" msgid "Hatch lines"
msgstr "Lignes de Hachure" msgstr "Lignes de Hachure"
#: pcbnew/class_zone.cpp:926 #: pcbnew/class_zone.cpp:934
msgid "Corners in DrawList" msgid "Corners in DrawList"
msgstr "Sommets en Liste de dessin" msgstr "Sommets en Liste de dessin"
#: pcbnew/set_color.cpp:260 #: pcbnew/set_color.cpp:260
#: pcbnew/set_color.cpp:287 #: pcbnew/set_color.cpp:287
#: gerbview/set_color.cpp:248
#: gerbview/set_color.cpp:275
msgid "Show None" msgid "Show None"
msgstr "Rien Afficher" msgstr "Rien Afficher"
#: pcbnew/set_color.cpp:269 #: pcbnew/set_color.cpp:269
#: gerbview/set_color.cpp:257
msgid "Show All" msgid "Show All"
msgstr "Tout Afficher" msgstr "Tout Afficher"
...@@ -4601,14 +4059,10 @@ msgid "Switch off all of the copper layers" ...@@ -4601,14 +4059,10 @@ msgid "Switch off all of the copper layers"
msgstr "N'affiche pas les couches cuivre" msgstr "N'affiche pas les couches cuivre"
#: pcbnew/set_color.cpp:352 #: pcbnew/set_color.cpp:352
#: eeschema/eelayer.cpp:248
#: gerbview/set_color.cpp:323
msgid "Apply" msgid "Apply"
msgstr "Appliquer" msgstr "Appliquer"
#: pcbnew/modedit_onclick.cpp:210 #: pcbnew/modedit_onclick.cpp:210
#: eeschema/libedit_onrightclick.cpp:234
#: gerbview/onrightclick.cpp:51
msgid "Zoom Block (drag middle mouse)" msgid "Zoom Block (drag middle mouse)"
msgstr "Zoom Bloc (drag bouton du milieu souris)" msgstr "Zoom Bloc (drag bouton du milieu souris)"
...@@ -4641,7 +4095,6 @@ msgid "Scale Y" ...@@ -4641,7 +4095,6 @@ msgid "Scale Y"
msgstr "Echelle Y" msgstr "Echelle Y"
#: pcbnew/modedit_onclick.cpp:252 #: pcbnew/modedit_onclick.cpp:252
#: pcbnew/dialog_edit_module.cpp:192
msgid "Edit Module" msgid "Edit Module"
msgstr "Edit Module" msgstr "Edit Module"
...@@ -4739,7 +4192,6 @@ msgstr "Aspect des Contours" ...@@ -4739,7 +4192,6 @@ msgstr "Aspect des Contours"
#: pcbnew/dialog_non_copper_zones_properties_base.cpp:34 #: pcbnew/dialog_non_copper_zones_properties_base.cpp:34
#: pcbnew/dialog_copper_zones_base.cpp:101 #: pcbnew/dialog_copper_zones_base.cpp:101
#: eeschema/dialog_options.cpp:262
msgid "Any" msgid "Any"
msgstr "Tout" msgstr "Tout"
...@@ -4752,7 +4204,6 @@ msgid "Zone Edges Orient" ...@@ -4752,7 +4204,6 @@ msgid "Zone Edges Orient"
msgstr "Direction contours zone" msgstr "Direction contours zone"
#: pcbnew/dialog_non_copper_zones_properties_base.cpp:54 #: pcbnew/dialog_non_copper_zones_properties_base.cpp:54
#: gerbview/select_layers_to_pcb.cpp:91
msgid "Layer selection:" msgid "Layer selection:"
msgstr "Sélection couche:" msgstr "Sélection couche:"
...@@ -5028,9 +4479,6 @@ msgid "Export this zone setup to all other copper zones" ...@@ -5028,9 +4479,6 @@ msgid "Export this zone setup to all other copper zones"
msgstr "Exporter ces options vers les autres zones de cuivre" msgstr "Exporter ces options vers les autres zones de cuivre"
#: pcbnew/dialog_copper_zones_base.cpp:156 #: pcbnew/dialog_copper_zones_base.cpp:156
#: pcbnew/dialog_pad_properties_base.cpp:91
#: eeschema/dialog_build_BOM_base.cpp:131
#: eeschema/lib_export.cpp:146
msgid "Ok" msgid "Ok"
msgstr "Ok" msgstr "Ok"
...@@ -5095,16 +4543,10 @@ msgid "3D settings" ...@@ -5095,16 +4543,10 @@ msgid "3D settings"
msgstr "3D Caract" msgstr "3D Caract"
#: pcbnew/dialog_edit_module.cpp:185 #: pcbnew/dialog_edit_module.cpp:185
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:161
#: eeschema/dialog_edit_component_in_schematic.cpp:96
#: common/wxwineda.cpp:223
msgid "X" msgid "X"
msgstr "X" msgstr "X"
#: pcbnew/dialog_edit_module.cpp:186 #: pcbnew/dialog_edit_module.cpp:186
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:166
#: eeschema/dialog_edit_component_in_schematic.cpp:101
#: common/wxwineda.cpp:236
msgid "Y" msgid "Y"
msgstr "Y" msgstr "Y"
...@@ -5113,13 +4555,10 @@ msgid "Change module(s)" ...@@ -5113,13 +4555,10 @@ msgid "Change module(s)"
msgstr "Change module(s)" msgstr "Change module(s)"
#: pcbnew/dialog_edit_module.cpp:196 #: pcbnew/dialog_edit_module.cpp:196
#: pcbnew/dialog_pcb_text_properties.cpp:122
msgid "Position" msgid "Position"
msgstr "Position" msgstr "Position"
#: pcbnew/dialog_edit_module.cpp:221 #: pcbnew/dialog_edit_module.cpp:221
#: eeschema/dialog_edit_component_in_lib.cpp:203
#: eeschema/onrightclick.cpp:345
msgid "Doc" msgid "Doc"
msgstr "Doc" msgstr "Doc"
...@@ -5132,24 +4571,18 @@ msgid "Fields:" ...@@ -5132,24 +4571,18 @@ msgid "Fields:"
msgstr "Champs:" msgstr "Champs:"
#: pcbnew/dialog_edit_module.cpp:245 #: pcbnew/dialog_edit_module.cpp:245
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:94
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:28
msgid "Add Field" msgid "Add Field"
msgstr "Ajouter Champ" msgstr "Ajouter Champ"
#: pcbnew/dialog_edit_module.cpp:250 #: pcbnew/dialog_edit_module.cpp:250
#: eeschema/onrightclick.cpp:250
msgid "Edit Field" msgid "Edit Field"
msgstr "Editer Champ" msgstr "Editer Champ"
#: pcbnew/dialog_edit_module.cpp:255 #: pcbnew/dialog_edit_module.cpp:255
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:99
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:33
msgid "Delete Field" msgid "Delete Field"
msgstr "Supprimer Champ" msgstr "Supprimer Champ"
#: pcbnew/dialog_edit_module.cpp:262 #: pcbnew/dialog_edit_module.cpp:262
#: common/common.cpp:481
msgid "Component" msgid "Component"
msgstr "Composant" msgstr "Composant"
...@@ -5227,7 +4660,6 @@ msgid "3D Shape Name" ...@@ -5227,7 +4660,6 @@ msgid "3D Shape Name"
msgstr "3D forme" msgstr "3D forme"
#: pcbnew/dialog_edit_module.cpp:423 #: pcbnew/dialog_edit_module.cpp:423
#: eeschema/dialog_eeschema_config.cpp:223
msgid "Browse" msgid "Browse"
msgstr "Examiner" msgstr "Examiner"
...@@ -5265,54 +4697,38 @@ msgid "Delete [%s]" ...@@ -5265,54 +4697,38 @@ msgid "Delete [%s]"
msgstr "Supprimer [%s]" msgstr "Supprimer [%s]"
#: pcbnew/dialog_SVG_print_base.cpp:25 #: pcbnew/dialog_SVG_print_base.cpp:25
#: pcbnew/dialog_print_using_printer_base.cpp:25
msgid "Copper Layers:" msgid "Copper Layers:"
msgstr "Couches Cuivre:" msgstr "Couches Cuivre:"
#: pcbnew/dialog_SVG_print_base.cpp:29 #: pcbnew/dialog_SVG_print_base.cpp:29
#: pcbnew/dialog_print_using_printer_base.cpp:29
msgid "Technical Layers:" msgid "Technical Layers:"
msgstr "Couches Techniques:" msgstr "Couches Techniques:"
#: pcbnew/dialog_SVG_print_base.cpp:36 #: pcbnew/dialog_SVG_print_base.cpp:36
#: eeschema/dialog_SVG_print_base.cpp:23
msgid "Print SVG options:" msgid "Print SVG options:"
msgstr "Options d'impression SVG :" msgstr "Options d'impression SVG :"
#: pcbnew/dialog_SVG_print_base.cpp:38 #: pcbnew/dialog_SVG_print_base.cpp:38
#: eeschema/dialog_SVG_print_base.cpp:25
msgid "Pen width mini" msgid "Pen width mini"
msgstr "Epaiss plume mini" msgstr "Epaiss plume mini"
#: pcbnew/dialog_SVG_print_base.cpp:43 #: pcbnew/dialog_SVG_print_base.cpp:43
#: pcbnew/dialog_print_using_printer_base.cpp:83
#: eeschema/dialog_SVG_print_base.cpp:30
#: eeschema/dialog_print_using_printer_base.cpp:30
msgid "Selection of the minimum pen thickness used to draw items." msgid "Selection of the minimum pen thickness used to draw items."
msgstr "Valeur de l'épaisseur minimum de plume pour tracer les éléments" msgstr "Valeur de l'épaisseur minimum de plume pour tracer les éléments"
#: pcbnew/dialog_SVG_print_base.cpp:47 #: pcbnew/dialog_SVG_print_base.cpp:47
#: pcbnew/dialog_print_using_printer_base.cpp:100
#: eeschema/plotps.cpp:212
#: eeschema/dialog_SVG_print_base.cpp:34
#: eeschema/dialog_print_using_printer_base.cpp:44
msgid "Color" msgid "Color"
msgstr "Couleur" msgstr "Couleur"
#: pcbnew/dialog_SVG_print_base.cpp:47 #: pcbnew/dialog_SVG_print_base.cpp:47
#: eeschema/dialog_SVG_print_base.cpp:34
msgid "Black and White" msgid "Black and White"
msgstr "Noir et Blanc" msgstr "Noir et Blanc"
#: pcbnew/dialog_SVG_print_base.cpp:49 #: pcbnew/dialog_SVG_print_base.cpp:49
#: eeschema/dialog_SVG_print_base.cpp:36
msgid "Print mode" msgid "Print mode"
msgstr "Mode d'impression" msgstr "Mode d'impression"
#: pcbnew/dialog_SVG_print_base.cpp:51 #: pcbnew/dialog_SVG_print_base.cpp:51
#: pcbnew/dialog_print_using_printer_base.cpp:104
#: eeschema/dialog_SVG_print_base.cpp:38
#: eeschema/dialog_print_using_printer_base.cpp:48
msgid "" msgid ""
"Choose if you wand to draw the sheet like it appears on screen,\n" "Choose if you wand to draw the sheet like it appears on screen,\n"
"or in black and white mode, better to print it when using black and white printers" "or in black and white mode, better to print it when using black and white printers"
...@@ -5321,14 +4737,10 @@ msgstr "" ...@@ -5321,14 +4737,10 @@ msgstr ""
"ou en noir et blanc, préférable pour l'imprimer lorsque l'on utilise des imprimantes monochromes" "ou en noir et blanc, préférable pour l'imprimer lorsque l'on utilise des imprimantes monochromes"
#: pcbnew/dialog_SVG_print_base.cpp:55 #: pcbnew/dialog_SVG_print_base.cpp:55
#: eeschema/dialog_SVG_print_base.cpp:42
msgid "Print Frame Ref" msgid "Print Frame Ref"
msgstr "Imprimer cartouche" msgstr "Imprimer cartouche"
#: pcbnew/dialog_SVG_print_base.cpp:58 #: pcbnew/dialog_SVG_print_base.cpp:58
#: pcbnew/dialog_print_using_printer_base.cpp:90
#: eeschema/dialog_SVG_print_base.cpp:44
#: eeschema/dialog_print_using_printer_base.cpp:38
msgid "Print (or not) the Frame references." msgid "Print (or not) the Frame references."
msgstr "Imprimer (ou non) le cartouche" msgstr "Imprimer (ou non) le cartouche"
...@@ -5349,18 +4761,14 @@ msgid "Print Board" ...@@ -5349,18 +4761,14 @@ msgid "Print Board"
msgstr "Imprimer le C.I." msgstr "Imprimer le C.I."
#: pcbnew/dialog_SVG_print_base.cpp:80 #: pcbnew/dialog_SVG_print_base.cpp:80
#: eeschema/dialog_SVG_print_base.cpp:59
msgid "Quit" msgid "Quit"
msgstr "Quitter" msgstr "Quitter"
#: pcbnew/dialog_SVG_print_base.cpp:87 #: pcbnew/dialog_SVG_print_base.cpp:87
#: eeschema/sheet.cpp:154
#: eeschema/dialog_SVG_print_base.cpp:66
msgid "Filename:" msgid "Filename:"
msgstr "Nom Fichier:" msgstr "Nom Fichier:"
#: pcbnew/dialog_SVG_print_base.cpp:92 #: pcbnew/dialog_SVG_print_base.cpp:92
#: eeschema/dialog_SVG_print_base.cpp:71
msgid "" msgid ""
"Enter a filename if you do not want to use default file names\n" "Enter a filename if you do not want to use default file names\n"
"Can be used only when printing the current sheet" "Can be used only when printing the current sheet"
...@@ -5369,7 +4777,6 @@ msgstr "" ...@@ -5369,7 +4777,6 @@ msgstr ""
"Ne peut être utilisé que pour imprimer la feuille courante" "Ne peut être utilisé que pour imprimer la feuille courante"
#: pcbnew/dialog_SVG_print_base.cpp:97 #: pcbnew/dialog_SVG_print_base.cpp:97
#: eeschema/dialog_SVG_print_base.cpp:76
msgid "Messages:" msgid "Messages:"
msgstr "Messages:" msgstr "Messages:"
...@@ -5448,12 +4855,10 @@ msgid "90" ...@@ -5448,12 +4855,10 @@ msgid "90"
msgstr "90" msgstr "90"
#: pcbnew/dialog_pad_properties_base.cpp:64 #: pcbnew/dialog_pad_properties_base.cpp:64
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:39
msgid "-90" msgid "-90"
msgstr "-90" msgstr "-90"
#: pcbnew/dialog_pad_properties_base.cpp:64 #: pcbnew/dialog_pad_properties_base.cpp:64
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:39
msgid "180" msgid "180"
msgstr "180" msgstr "180"
...@@ -5470,7 +4875,6 @@ msgid "SMD" ...@@ -5470,7 +4875,6 @@ msgid "SMD"
msgstr "CMS" msgstr "CMS"
#: pcbnew/dialog_pad_properties_base.cpp:80 #: pcbnew/dialog_pad_properties_base.cpp:80
#: eeschema/netlist.cpp:246
msgid "Conn" msgid "Conn"
msgstr "Conn" msgstr "Conn"
...@@ -5531,7 +4935,6 @@ msgid "Draft layer" ...@@ -5531,7 +4935,6 @@ msgid "Draft layer"
msgstr "Couche dessin" msgstr "Couche dessin"
#: pcbnew/muwave_command.cpp:51 #: pcbnew/muwave_command.cpp:51
#: eeschema/libframe.cpp:522
msgid "Add Line" msgid "Add Line"
msgstr "Addition de lignes" msgstr "Addition de lignes"
...@@ -5552,50 +4955,30 @@ msgid "Add Polynomial Shape" ...@@ -5552,50 +4955,30 @@ msgid "Add Polynomial Shape"
msgstr "Ajout Forme polynomiale" msgstr "Ajout Forme polynomiale"
#: pcbnew/dialog_setup_libs.cpp:89 #: pcbnew/dialog_setup_libs.cpp:89
#: eeschema/dialog_eeschema_config.cpp:97
#: cvpcb/dialog_cvpcb_config.cpp:75
#: gerbview/reglage.cpp:89
msgid "from " msgid "from "
msgstr "De " msgstr "De "
#: pcbnew/dialog_setup_libs.cpp:145 #: pcbnew/dialog_setup_libs.cpp:145
#: eeschema/dialog_eeschema_config.cpp:153
#: cvpcb/dialog_cvpcb_config.cpp:128
#: cvpcb/dialog_display_options.cpp:169
msgid "Save Cfg" msgid "Save Cfg"
msgstr "Sauver config" msgstr "Sauver config"
#: pcbnew/dialog_setup_libs.cpp:151 #: pcbnew/dialog_setup_libs.cpp:151
#: eeschema/dialog_eeschema_config.cpp:170
#: cvpcb/dialog_cvpcb_config.cpp:143
msgid "Files ext:" msgid "Files ext:"
msgstr "Ext. Fichiers" msgstr "Ext. Fichiers"
#: pcbnew/dialog_setup_libs.cpp:167 #: pcbnew/dialog_setup_libs.cpp:167
#: cvpcb/dialog_cvpcb_config.cpp:162
#: cvpcb/dialog_cvpcb_config.cpp:194
msgid "Del" msgid "Del"
msgstr "Supprimer" msgstr "Supprimer"
#: pcbnew/dialog_setup_libs.cpp:171 #: pcbnew/dialog_setup_libs.cpp:171
#: eeschema/edit_component_in_lib.cpp:123
#: eeschema/edit_component_in_lib.cpp:202
#: eeschema/dialog_eeschema_config.cpp:189
#: cvpcb/dialog_cvpcb_config.cpp:166
#: cvpcb/dialog_cvpcb_config.cpp:198
msgid "Add" msgid "Add"
msgstr "Ajouter" msgstr "Ajouter"
#: pcbnew/dialog_setup_libs.cpp:175 #: pcbnew/dialog_setup_libs.cpp:175
#: eeschema/dialog_eeschema_config.cpp:195
#: cvpcb/dialog_cvpcb_config.cpp:170
#: cvpcb/dialog_cvpcb_config.cpp:202
msgid "Ins" msgid "Ins"
msgstr "Insérer" msgstr "Insérer"
#: pcbnew/dialog_setup_libs.cpp:183 #: pcbnew/dialog_setup_libs.cpp:183
#: eeschema/dialog_eeschema_config.cpp:205
#: cvpcb/dialog_cvpcb_config.cpp:177
msgid "Libraries" msgid "Libraries"
msgstr "Librairies" msgstr "Librairies"
...@@ -5604,7 +4987,6 @@ msgid "Lib Modules Dir:" ...@@ -5604,7 +4987,6 @@ msgid "Lib Modules Dir:"
msgstr "Répertoire Lib Modules:" msgstr "Répertoire Lib Modules:"
#: pcbnew/dialog_setup_libs.cpp:198 #: pcbnew/dialog_setup_libs.cpp:198
#: cvpcb/menucfg.cpp:55
msgid "Module Doc File:" msgid "Module Doc File:"
msgstr "Fichiers Doc des Modules" msgstr "Fichiers Doc des Modules"
...@@ -5625,15 +5007,10 @@ msgid "Net ext: " ...@@ -5625,15 +5007,10 @@ msgid "Net ext: "
msgstr "Net ext: " msgstr "Net ext: "
#: pcbnew/dialog_setup_libs.cpp:359 #: pcbnew/dialog_setup_libs.cpp:359
#: eeschema/dialog_eeschema_config.cpp:360
#: cvpcb/menucfg.cpp:220
msgid "Library files:" msgid "Library files:"
msgstr "Fichiers Librairies:" msgstr "Fichiers Librairies:"
#: pcbnew/dialog_setup_libs.cpp:387 #: pcbnew/dialog_setup_libs.cpp:387
#: eeschema/dialog_eeschema_config.cpp:389
#: cvpcb/menucfg.cpp:248
#: cvpcb/menucfg.cpp:322
msgid "Library already in use" msgid "Library already in use"
msgstr "Librairie déjà en usage" msgstr "Librairie déjà en usage"
...@@ -5700,7 +5077,6 @@ msgid "Offset Y" ...@@ -5700,7 +5077,6 @@ msgid "Offset Y"
msgstr "Offset Y" msgstr "Offset Y"
#: pcbnew/dialog_edit_module_text_base.cpp:72 #: pcbnew/dialog_edit_module_text_base.cpp:72
#: eeschema/affiche.cpp:196
msgid "Thickness" msgid "Thickness"
msgstr "Epaisseur" msgstr "Epaisseur"
...@@ -5713,7 +5089,6 @@ msgid "vertical" ...@@ -5713,7 +5089,6 @@ msgid "vertical"
msgstr "Vertical" msgstr "Vertical"
#: pcbnew/dialog_edit_module_text_base.cpp:81 #: pcbnew/dialog_edit_module_text_base.cpp:81
#: pcbnew/dialog_pcb_text_properties.cpp:141
msgid "Orientation" msgid "Orientation"
msgstr "Orientation" msgstr "Orientation"
...@@ -5726,27 +5101,18 @@ msgid "Invisible" ...@@ -5726,27 +5101,18 @@ msgid "Invisible"
msgstr "Invisible" msgstr "Invisible"
#: pcbnew/dialog_edit_module_text_base.cpp:96 #: pcbnew/dialog_edit_module_text_base.cpp:96
#: pcbnew/dialog_pcb_text_properties.cpp:176
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134
#: eeschema/dialog_edit_label_base.cpp:40
#: eeschema/dialog_bodygraphictext_properties_base.cpp:60
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:99
msgid "Italic" msgid "Italic"
msgstr "Italique" msgstr "Italique"
#: pcbnew/dialog_edit_module_text_base.cpp:98 #: pcbnew/dialog_edit_module_text_base.cpp:98
#: pcbnew/dialog_pcb_text_properties.cpp:177
#: eeschema/dialog_edit_label_base.cpp:42
msgid "Style" msgid "Style"
msgstr "Style" msgstr "Style"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:22 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:22
#: gerbview/options.cpp:183
msgid "No Display" msgid "No Display"
msgstr "Pas d'affichage" msgstr "Pas d'affichage"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:24 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:24
#: gerbview/options.cpp:186
msgid "Display Polar Coord" msgid "Display Polar Coord"
msgstr "Affichage coord Polaires" msgstr "Affichage coord Polaires"
...@@ -5759,8 +5125,6 @@ msgstr "" ...@@ -5759,8 +5125,6 @@ msgstr ""
"au curseur, en coordonnées polaires (angle et distance)" "au curseur, en coordonnées polaires (angle et distance)"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:32 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:32
#: eeschema/dialog_options.cpp:253
#: gerbview/options.cpp:198
msgid "Units" msgid "Units"
msgstr "Unités" msgstr "Unités"
...@@ -5777,7 +5141,6 @@ msgid "Full screen cursor" ...@@ -5777,7 +5141,6 @@ msgid "Full screen cursor"
msgstr "Curseur plein écran" msgstr "Curseur plein écran"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:40 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:40
#: gerbview/options.cpp:206
msgid "Cursor" msgid "Cursor"
msgstr "Curseur" msgstr "Curseur"
...@@ -5786,48 +5149,38 @@ msgid "Main cursor shape selection (small cross or large cursor)" ...@@ -5786,48 +5149,38 @@ msgid "Main cursor shape selection (small cross or large cursor)"
msgstr "Sélection de l'aspect du curseur principal (petite croix ou grand curseur)" msgstr "Sélection de l'aspect du curseur principal (petite croix ou grand curseur)"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
#: eeschema/component_wizard/dialog_component_setup.cpp:164
msgid "1" msgid "1"
msgstr "1" msgstr "1"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "2" msgid "2"
msgstr "2" msgstr "2"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "4" msgid "4"
msgstr "4" msgstr "4"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "6" msgid "6"
msgstr "6" msgstr "6"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "8" msgid "8"
msgstr "8" msgstr "8"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "10" msgid "10"
msgstr "10" msgstr "10"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "12" msgid "12"
msgstr "12" msgstr "12"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "14" msgid "14"
msgstr "14" msgstr "14"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "16" msgid "16"
msgstr "16" msgstr "16"
...@@ -5908,7 +5261,6 @@ msgid "If enabled, force segments directions to H, V or 45 degrees, when creatin ...@@ -5908,7 +5261,6 @@ msgid "If enabled, force segments directions to H, V or 45 degrees, when creatin
msgstr "Si activé, frorce la direction des segments à H, V ou 45° en création de segments sur couches techniques" msgstr "Si activé, frorce la direction des segments à H, V ou 45° en création de segments sur couches techniques"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:113 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:113
#: eeschema/dialog_options.cpp:245
msgid "Auto PAN" msgid "Auto PAN"
msgstr "Auto PAN" msgstr "Auto PAN"
...@@ -5946,7 +5298,6 @@ msgid "Control the capture of the pcb cursor when the mouse cursor enters a trac ...@@ -5946,7 +5298,6 @@ msgid "Control the capture of the pcb cursor when the mouse cursor enters a trac
msgstr "Contrôle la capture du curseur pcb quand le curseur souris passe sur une piste" msgstr "Contrôle la capture du curseur pcb quand le curseur souris passe sur une piste"
#: pcbnew/tool_modedit.cpp:41 #: pcbnew/tool_modedit.cpp:41
#: eeschema/tool_lib.cpp:117
msgid "Select working library" msgid "Select working library"
msgstr "Sélection de la librairie de travail" msgstr "Sélection de la librairie de travail"
...@@ -5987,16 +5338,10 @@ msgid "export module" ...@@ -5987,16 +5338,10 @@ msgid "export module"
msgstr "Exporter Module" msgstr "Exporter Module"
#: pcbnew/tool_modedit.cpp:91 #: pcbnew/tool_modedit.cpp:91
#: eeschema/menubar.cpp:120
#: eeschema/tool_lib.cpp:144
#: eeschema/tool_sch.cpp:71
msgid "Undo last edition" msgid "Undo last edition"
msgstr "Défait dernière édition" msgstr "Défait dernière édition"
#: pcbnew/tool_modedit.cpp:93 #: pcbnew/tool_modedit.cpp:93
#: eeschema/menubar.cpp:126
#: eeschema/tool_lib.cpp:146
#: eeschema/tool_sch.cpp:74
msgid "Redo the last undo command" msgid "Redo the last undo command"
msgstr "Refait la dernière commande defaite" msgstr "Refait la dernière commande defaite"
...@@ -6040,8 +5385,6 @@ msgstr "Valeur:" ...@@ -6040,8 +5385,6 @@ msgstr "Valeur:"
#: pcbnew/dialog_edit_module_text.cpp:98 #: pcbnew/dialog_edit_module_text.cpp:98
#: pcbnew/dialog_pcb_text_properties.cpp:108 #: pcbnew/dialog_pcb_text_properties.cpp:108
#: eeschema/sheetlab.cpp:103
#: eeschema/dialog_bodygraphictext_properties_base.cpp:22
msgid "Text:" msgid "Text:"
msgstr "Texte:" msgstr "Texte:"
...@@ -6090,22 +5433,18 @@ msgid "Y Scale Adjust" ...@@ -6090,22 +5433,18 @@ msgid "Y Scale Adjust"
msgstr "Ajustage Echelle Y" msgstr "Ajustage Echelle Y"
#: pcbnew/dialog_print_using_printer_base.cpp:78 #: pcbnew/dialog_print_using_printer_base.cpp:78
#: eeschema/dialog_print_using_printer_base.cpp:25
msgid "Pen Width Mini" msgid "Pen Width Mini"
msgstr "Epaiss Plume Mini" msgstr "Epaiss Plume Mini"
#: pcbnew/dialog_print_using_printer_base.cpp:87 #: pcbnew/dialog_print_using_printer_base.cpp:87
#: eeschema/dialog_print_using_printer_base.cpp:35
msgid "Print frame ref" msgid "Print frame ref"
msgstr "Imprimer cartouche" msgstr "Imprimer cartouche"
#: pcbnew/dialog_print_using_printer_base.cpp:100 #: pcbnew/dialog_print_using_printer_base.cpp:100
#: eeschema/dialog_print_using_printer_base.cpp:44
msgid "Black and white" msgid "Black and white"
msgstr "Noir et blanc" msgstr "Noir et blanc"
#: pcbnew/dialog_print_using_printer_base.cpp:102 #: pcbnew/dialog_print_using_printer_base.cpp:102
#: eeschema/dialog_print_using_printer_base.cpp:46
msgid "Print Mode" msgid "Print Mode"
msgstr "Mode d'impression" msgstr "Mode d'impression"
...@@ -6118,22 +5457,45 @@ msgid "Single page" ...@@ -6118,22 +5457,45 @@ msgid "Single page"
msgstr "Page unique" msgstr "Page unique"
#: pcbnew/dialog_print_using_printer_base.cpp:110 #: pcbnew/dialog_print_using_printer_base.cpp:110
#: eeschema/dialog_print_using_printer_base.cpp:54
msgid "Page Print" msgid "Page Print"
msgstr "Imprimer Page" msgstr "Imprimer Page"
#: pcbnew/dialog_print_using_printer_base.cpp:119 #: pcbnew/dialog_print_using_printer_base.cpp:119
#: eeschema/dialog_print_using_printer_base.cpp:63
msgid "Page Options" msgid "Page Options"
msgstr "Options Pages" msgstr "Options Pages"
#: pcbnew/dialog_print_using_printer_base.cpp:122 #: pcbnew/dialog_print_using_printer_base.cpp:122
#: eeschema/dialog_print_using_printer_base.cpp:66
#: eeschema/dialog_print_using_printer.cpp:238
#: eeschema/dialog_print_using_printer.cpp:278
msgid "Preview" msgid "Preview"
msgstr "Prévisualisation" msgstr "Prévisualisation"
#: pcbnew/build_BOM_from_board.cpp:64
msgid "Bom files:"
msgstr "Fichiers Liste de Matériel: "
#: pcbnew/build_BOM_from_board.cpp:87
msgid "Id"
msgstr "Id"
#: pcbnew/build_BOM_from_board.cpp:88
msgid "Designator"
msgstr "Reference"
#: pcbnew/build_BOM_from_board.cpp:89
msgid "Package"
msgstr "Boitier"
#: pcbnew/build_BOM_from_board.cpp:90
msgid "Number"
msgstr "Nombre"
#: pcbnew/build_BOM_from_board.cpp:91
msgid "Designation"
msgstr "Designation"
#: pcbnew/build_BOM_from_board.cpp:92
msgid "Supplier and ref"
msgstr "Fournisseur et ref"
#: pcbnew/dialog_pcb_text_properties.cpp:74 #: pcbnew/dialog_pcb_text_properties.cpp:74
msgid "TextPCB properties" msgid "TextPCB properties"
msgstr "Propriétés des textes PCB" msgstr "Propriétés des textes PCB"
...@@ -6173,7 +5535,6 @@ msgid "Start Point Y" ...@@ -6173,7 +5535,6 @@ msgid "Start Point Y"
msgstr "Start Point Y" msgstr "Start Point Y"
#: eeschema/netlist.cpp:198 #: eeschema/netlist.cpp:198
#: eeschema/dialog_build_BOM_base.cpp:47
msgid "List" msgid "List"
msgstr "Liste" msgstr "Liste"
...@@ -6213,7 +5574,6 @@ msgid "Clear Schematic Hierarchy (modified!)?" ...@@ -6213,7 +5574,6 @@ msgid "Clear Schematic Hierarchy (modified!)?"
msgstr "Effacer la hiérarchie schématique (modifiée!)?" msgstr "Effacer la hiérarchie schématique (modifiée!)?"
#: eeschema/files-io.cpp:84 #: eeschema/files-io.cpp:84
#: eeschema/save_schemas.cpp:63
msgid "Schematic files:" msgid "Schematic files:"
msgstr "Fichiers schématiques:" msgstr "Fichiers schématiques:"
...@@ -6263,12 +5623,10 @@ msgid "Warning More than 1 Pin connected to UnConnect symbol" ...@@ -6263,12 +5623,10 @@ msgid "Warning More than 1 Pin connected to UnConnect symbol"
msgstr "Attention: plus de 1 Pin connectée à un symbole de non connexion" msgstr "Attention: plus de 1 Pin connectée à un symbole de non connexion"
#: eeschema/erc.cpp:599 #: eeschema/erc.cpp:599
#: common/confirm.cpp:83
msgid "Warning" msgid "Warning"
msgstr "Avertissement" msgstr "Avertissement"
#: eeschema/erc.cpp:602 #: eeschema/erc.cpp:602
#: common/confirm.cpp:87
msgid "Error" msgid "Error"
msgstr "Erreur" msgstr "Erreur"
...@@ -6356,7 +5714,6 @@ msgid "Failed to open Stuff File <%s>" ...@@ -6356,7 +5714,6 @@ msgid "Failed to open Stuff File <%s>"
msgstr "Ne peut pas ouvrir fichier d'échange <%s>" msgstr "Ne peut pas ouvrir fichier d'échange <%s>"
#: eeschema/selpart.cpp:39 #: eeschema/selpart.cpp:39
#: eeschema/find.cpp:646
msgid "No libraries are loaded" msgid "No libraries are loaded"
msgstr "Pas de librairies chargées" msgstr "Pas de librairies chargées"
...@@ -6371,22 +5728,18 @@ msgstr "Sélection composant (%d items)" ...@@ -6371,22 +5728,18 @@ msgstr "Sélection composant (%d items)"
#: eeschema/netform.cpp:62 #: eeschema/netform.cpp:62
#: eeschema/netform.cpp:280 #: eeschema/netform.cpp:280
#: eeschema/save_schemas.cpp:88
msgid "Failed to create file " msgid "Failed to create file "
msgstr "Impossible de créer le fichier " msgstr "Impossible de créer le fichier "
#: eeschema/plotps.cpp:193 #: eeschema/plotps.cpp:193
#: eeschema/plothpgl.cpp:214
msgid "Page Size A4" msgid "Page Size A4"
msgstr "Feuille A4" msgstr "Feuille A4"
#: eeschema/plotps.cpp:194 #: eeschema/plotps.cpp:194
#: eeschema/plothpgl.cpp:219
msgid "Page Size A" msgid "Page Size A"
msgstr "Feuille A" msgstr "Feuille A"
#: eeschema/plotps.cpp:196 #: eeschema/plotps.cpp:196
#: eeschema/plothpgl.cpp:225
msgid "Plot page size:" msgid "Plot page size:"
msgstr "Format de la feuille:" msgstr "Format de la feuille:"
...@@ -6407,12 +5760,10 @@ msgid "Print Sheet Ref" ...@@ -6407,12 +5760,10 @@ msgid "Print Sheet Ref"
msgstr "Imprimer cartouche" msgstr "Imprimer cartouche"
#: eeschema/plotps.cpp:233 #: eeschema/plotps.cpp:233
#: eeschema/plothpgl.cpp:328
msgid "&Plot page" msgid "&Plot page"
msgstr "&Tracer Page" msgstr "&Tracer Page"
#: eeschema/plotps.cpp:240 #: eeschema/plotps.cpp:240
#: eeschema/plothpgl.cpp:334
msgid "Plot a&ll" msgid "Plot a&ll"
msgstr "&Tout tracer" msgstr "&Tout tracer"
...@@ -6421,7 +5772,6 @@ msgid "Messages :" ...@@ -6421,7 +5772,6 @@ msgid "Messages :"
msgstr "Messages :" msgstr "Messages :"
#: eeschema/plotps.cpp:273 #: eeschema/plotps.cpp:273
#: eeschema/dialog_options.cpp:315
msgid "Default Line Width" msgid "Default Line Width"
msgstr "Epaiss. ligne par défaut" msgstr "Epaiss. ligne par défaut"
...@@ -6431,37 +5781,30 @@ msgid "Plot: %s\n" ...@@ -6431,37 +5781,30 @@ msgid "Plot: %s\n"
msgstr "Trace: %s\n" msgstr "Trace: %s\n"
#: eeschema/pinedit.cpp:22 #: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:241
msgid "line" msgid "line"
msgstr "Ligne" msgstr "Ligne"
#: eeschema/pinedit.cpp:22 #: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:242
msgid "invert" msgid "invert"
msgstr "invert" msgstr "invert"
#: eeschema/pinedit.cpp:22 #: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:243
msgid "clock" msgid "clock"
msgstr "clock" msgstr "clock"
#: eeschema/pinedit.cpp:22 #: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:244
msgid "clock inv" msgid "clock inv"
msgstr "clock inv" msgstr "clock inv"
#: eeschema/pinedit.cpp:23 #: eeschema/pinedit.cpp:23
#: eeschema/pinedit-dialog.cpp:245
msgid "low in" msgid "low in"
msgstr "low in" msgstr "low in"
#: eeschema/pinedit.cpp:23 #: eeschema/pinedit.cpp:23
#: eeschema/pinedit-dialog.cpp:246
msgid "low clock" msgid "low clock"
msgstr "low clock" msgstr "low clock"
#: eeschema/pinedit.cpp:23 #: eeschema/pinedit.cpp:23
#: eeschema/pinedit-dialog.cpp:247
msgid "low out" msgid "low out"
msgstr "low out" msgstr "low out"
...@@ -6492,13 +5835,10 @@ msgid "Options :" ...@@ -6492,13 +5835,10 @@ msgid "Options :"
msgstr "Options :" msgstr "Options :"
#: eeschema/dialog_cmp_graphic_properties.cpp:156 #: eeschema/dialog_cmp_graphic_properties.cpp:156
#: eeschema/dialog_bodygraphictext_properties_base.cpp:34
msgid "Common to Units" msgid "Common to Units"
msgstr "Commun aux Unités" msgstr "Commun aux Unités"
#: eeschema/dialog_cmp_graphic_properties.cpp:160 #: eeschema/dialog_cmp_graphic_properties.cpp:160
#: eeschema/pinedit-dialog.cpp:187
#: eeschema/dialog_bodygraphictext_properties_base.cpp:38
msgid "Common to convert" msgid "Common to convert"
msgstr "Commun à converti" msgstr "Commun à converti"
...@@ -6514,28 +5854,27 @@ msgstr "Fond Plein" ...@@ -6514,28 +5854,27 @@ msgstr "Fond Plein"
msgid "Fill:" msgid "Fill:"
msgstr "Remplissage:" msgstr "Remplissage:"
#: eeschema/schframe.cpp:315 #: eeschema/schframe.cpp:318
msgid "Schematic modified, Save before exit ?" msgid "Schematic modified, Save before exit ?"
msgstr "Schématique modifiée, Sauver avant de quitter ?" msgstr "Schématique modifiée, Sauver avant de quitter ?"
#: eeschema/schframe.cpp:426 #: eeschema/schframe.cpp:429
msgid "No show Hidden Pins" msgid "No show Hidden Pins"
msgstr "N'affichage pas les pins invisibles" msgstr "N'affichage pas les pins invisibles"
#: eeschema/schframe.cpp:427 #: eeschema/schframe.cpp:430
#: eeschema/tool_sch.cpp:264
msgid "Show Hidden Pins" msgid "Show Hidden Pins"
msgstr "Force affichage des pins invisibles" msgstr "Force affichage des pins invisibles"
#: eeschema/schframe.cpp:431 #: eeschema/schframe.cpp:434
msgid "Allows any direction for wires and busses" msgid "Allows any direction for wires and busses"
msgstr "Autorise les directions quelconques pour les fils et bus" msgstr "Autorise les directions quelconques pour les fils et bus"
#: eeschema/schframe.cpp:432 #: eeschema/schframe.cpp:435
msgid "Allows horizontal and vertical wires and busses only" msgid "Allows horizontal and vertical wires and busses only"
msgstr "Autoriser fils et bus verticaux et horizontaux seulement" msgstr "Autoriser fils et bus verticaux et horizontaux seulement"
#: eeschema/schframe.cpp:567 #: eeschema/schframe.cpp:570
msgid "Schematic" msgid "Schematic"
msgstr "Schématique" msgstr "Schématique"
...@@ -6625,7 +5964,6 @@ msgid "Text Properties" ...@@ -6625,7 +5964,6 @@ msgid "Text Properties"
msgstr "Propriétés du Texte" msgstr "Propriétés du Texte"
#: eeschema/edit_component_in_lib.cpp:68 #: eeschema/edit_component_in_lib.cpp:68
#: eeschema/dialog_edit_component_in_lib.h:56
msgid "Lib Component Properties" msgid "Lib Component Properties"
msgstr "Propriétés du composant librairie" msgstr "Propriétés du composant librairie"
...@@ -6638,7 +5976,6 @@ msgid "(alias of " ...@@ -6638,7 +5976,6 @@ msgid "(alias of "
msgstr "(alias de " msgstr "(alias de "
#: eeschema/edit_component_in_lib.cpp:106 #: eeschema/edit_component_in_lib.cpp:106
#: eeschema/dialog_edit_component_in_lib.cpp:207
msgid "Alias" msgid "Alias"
msgstr "Alias" msgstr "Alias"
...@@ -6657,7 +5994,6 @@ msgid "Footprints" ...@@ -6657,7 +5994,6 @@ msgid "Footprints"
msgstr "Modules" msgstr "Modules"
#: eeschema/edit_component_in_lib.cpp:291 #: eeschema/edit_component_in_lib.cpp:291
#: eeschema/dialog_create_component.cpp:172
msgid "As Convert" msgid "As Convert"
msgstr "A une forme \"convertie\"" msgstr "A une forme \"convertie\""
...@@ -6666,12 +6002,10 @@ msgid "Show Pin Num" ...@@ -6666,12 +6002,10 @@ msgid "Show Pin Num"
msgstr "Montre Numéro de Pin" msgstr "Montre Numéro de Pin"
#: eeschema/edit_component_in_lib.cpp:308 #: eeschema/edit_component_in_lib.cpp:308
#: eeschema/dialog_create_component.cpp:243
msgid "Show Pin Name" msgid "Show Pin Name"
msgstr "Montre Nom de Pin" msgstr "Montre Nom de Pin"
#: eeschema/edit_component_in_lib.cpp:319 #: eeschema/edit_component_in_lib.cpp:319
#: eeschema/dialog_create_component.cpp:247
msgid "Pin Name Inside" msgid "Pin Name Inside"
msgstr "Nom de pin à l'intérieur" msgstr "Nom de pin à l'intérieur"
...@@ -6717,7 +6051,6 @@ msgid "Delete Convert items" ...@@ -6717,7 +6051,6 @@ msgid "Delete Convert items"
msgstr "Suppression des éléments convertis" msgstr "Suppression des éléments convertis"
#: eeschema/edit_component_in_lib.cpp:760 #: eeschema/edit_component_in_lib.cpp:760
#: common/eda_doc.cpp:126
msgid "Doc Files" msgid "Doc Files"
msgstr "Fichiers de Doc" msgstr "Fichiers de Doc"
...@@ -7085,7 +6418,6 @@ msgid "Add NoConnect Flag" ...@@ -7085,7 +6418,6 @@ msgid "Add NoConnect Flag"
msgstr "Ajoutde symboles de non connexion" msgstr "Ajoutde symboles de non connexion"
#: eeschema/schedit.cpp:192 #: eeschema/schedit.cpp:192
#: eeschema/hotkeys.cpp:310
msgid "Add Wire" msgid "Add Wire"
msgstr "Ajouter Fils" msgstr "Ajouter Fils"
...@@ -7094,14 +6426,10 @@ msgid "Add Bus" ...@@ -7094,14 +6426,10 @@ msgid "Add Bus"
msgstr "Addition de Bus" msgstr "Addition de Bus"
#: eeschema/schedit.cpp:204 #: eeschema/schedit.cpp:204
#: eeschema/onrightclick.cpp:515
#: eeschema/onrightclick.cpp:547
msgid "Add Junction" msgid "Add Junction"
msgstr "Ajout jonctions" msgstr "Ajout jonctions"
#: eeschema/schedit.cpp:208 #: eeschema/schedit.cpp:208
#: eeschema/onrightclick.cpp:516
#: eeschema/onrightclick.cpp:548
msgid "Add Label" msgid "Add Label"
msgstr "Ajout Label" msgstr "Ajout Label"
...@@ -7134,7 +6462,6 @@ msgid "Import PinSheet" ...@@ -7134,7 +6462,6 @@ msgid "Import PinSheet"
msgstr "Importer Connecteur de hiérarchie" msgstr "Importer Connecteur de hiérarchie"
#: eeschema/schedit.cpp:244 #: eeschema/schedit.cpp:244
#: eeschema/hotkeys.cpp:285
msgid "Add Component" msgid "Add Component"
msgstr "Ajout Composant" msgstr "Ajout Composant"
...@@ -7143,19 +6470,14 @@ msgid "Add Power" ...@@ -7143,19 +6470,14 @@ msgid "Add Power"
msgstr "Ajouter Alims" msgstr "Ajouter Alims"
#: eeschema/menubar.cpp:42 #: eeschema/menubar.cpp:42
#: kicad/buildmnu.cpp:128
#: gerbview/tool_gerber.cpp:52
msgid "&New" msgid "&New"
msgstr "&Nouveau" msgstr "&Nouveau"
#: eeschema/menubar.cpp:43 #: eeschema/menubar.cpp:43
#: eeschema/tool_sch.cpp:36
msgid "New schematic project" msgid "New schematic project"
msgstr "Nouveau Projet schématique" msgstr "Nouveau Projet schématique"
#: eeschema/menubar.cpp:47 #: eeschema/menubar.cpp:47
#: cvpcb/tool_cvpcb.cpp:112
#: kicad/buildmnu.cpp:122
msgid "&Open" msgid "&Open"
msgstr "&Ouvrir " msgstr "&Ouvrir "
...@@ -7172,7 +6494,6 @@ msgid "Save all sheets in the schematic project" ...@@ -7172,7 +6494,6 @@ msgid "Save all sheets in the schematic project"
msgstr "Sauver toutes les feuilles du projet schématique" msgstr "Sauver toutes les feuilles du projet schématique"
#: eeschema/menubar.cpp:59 #: eeschema/menubar.cpp:59
#: kicad/buildmnu.cpp:135
msgid "&Save" msgid "&Save"
msgstr "&Sauver" msgstr "&Sauver"
...@@ -7241,7 +6562,6 @@ msgid "&Redo\t" ...@@ -7241,7 +6562,6 @@ msgid "&Redo\t"
msgstr "&Redo\t" msgstr "&Redo\t"
#: eeschema/menubar.cpp:139 #: eeschema/menubar.cpp:139
#: pcbnew/find.h:38
msgid "Find" msgid "Find"
msgstr "Chercher" msgstr "Chercher"
...@@ -7290,7 +6610,6 @@ msgid "W&ire to bus entry" ...@@ -7290,7 +6610,6 @@ msgid "W&ire to bus entry"
msgstr "Entrées de bus (type fil vers bus)" msgstr "Entrées de bus (type fil vers bus)"
#: eeschema/menubar.cpp:207 #: eeschema/menubar.cpp:207
#: eeschema/tool_sch.cpp:170
msgid "Place a wire to bus entry" msgid "Place a wire to bus entry"
msgstr "Placer une Entrée de Bus (type fil vers bus)" msgstr "Placer une Entrée de Bus (type fil vers bus)"
...@@ -7299,7 +6618,6 @@ msgid "B&us to bus entry" ...@@ -7299,7 +6618,6 @@ msgid "B&us to bus entry"
msgstr "Entrées de bus (type bus vers bus)" msgstr "Entrées de bus (type bus vers bus)"
#: eeschema/menubar.cpp:213 #: eeschema/menubar.cpp:213
#: eeschema/tool_sch.cpp:174
msgid "Place a bus to bus entry" msgid "Place a bus to bus entry"
msgstr "Placer une Entrée de Bus (type bus vers bus)" msgstr "Placer une Entrée de Bus (type bus vers bus)"
...@@ -7316,7 +6634,6 @@ msgid "Net name" ...@@ -7316,7 +6634,6 @@ msgid "Net name"
msgstr "Net Name" msgstr "Net Name"
#: eeschema/menubar.cpp:223 #: eeschema/menubar.cpp:223
#: eeschema/tool_sch.cpp:183
msgid "Place net name" msgid "Place net name"
msgstr "Place nom de net" msgstr "Place nom de net"
...@@ -7329,7 +6646,6 @@ msgid "Place a global label. Warning: all global labels with the same name are c ...@@ -7329,7 +6646,6 @@ msgid "Place a global label. Warning: all global labels with the same name are c
msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hiérarchie" msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hiérarchie"
#: eeschema/menubar.cpp:233 #: eeschema/menubar.cpp:233
#: eeschema/eelayer.h:85
msgid "Junction" msgid "Junction"
msgstr "Jonction" msgstr "Jonction"
...@@ -7342,7 +6658,6 @@ msgid "Hierarchical label" ...@@ -7342,7 +6658,6 @@ msgid "Hierarchical label"
msgstr "Label Hiérarchique" msgstr "Label Hiérarchique"
#: eeschema/menubar.cpp:242 #: eeschema/menubar.cpp:242
#: eeschema/tool_sch.cpp:197
msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole" msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole"
...@@ -7383,7 +6698,6 @@ msgid "Graphic text (comment)" ...@@ -7383,7 +6698,6 @@ msgid "Graphic text (comment)"
msgstr "Textes graphiques (commentaires)" msgstr "Textes graphiques (commentaires)"
#: eeschema/menubar.cpp:278 #: eeschema/menubar.cpp:278
#: eeschema/tool_sch.cpp:220
msgid "Place graphic text (comment)" msgid "Place graphic text (comment)"
msgstr "Placer textes graphiques (commentaires)" msgstr "Placer textes graphiques (commentaires)"
...@@ -7392,7 +6706,6 @@ msgid "Library preferences" ...@@ -7392,7 +6706,6 @@ msgid "Library preferences"
msgstr "Préférences pour Librairie" msgstr "Préférences pour Librairie"
#: eeschema/menubar.cpp:290 #: eeschema/menubar.cpp:290
#: gerbview/tool_gerber.cpp:83
msgid "&Colors" msgid "&Colors"
msgstr "&Couleurs" msgstr "&Couleurs"
...@@ -7401,7 +6714,6 @@ msgid "Color preferences" ...@@ -7401,7 +6714,6 @@ msgid "Color preferences"
msgstr "Préférences de couleurs" msgstr "Préférences de couleurs"
#: eeschema/menubar.cpp:296 #: eeschema/menubar.cpp:296
#: gerbview/tool_gerber.cpp:86
msgid "&Options" msgid "&Options"
msgstr "&Options" msgstr "&Options"
...@@ -7422,7 +6734,6 @@ msgid "Open the eeschema manual" ...@@ -7422,7 +6734,6 @@ msgid "Open the eeschema manual"
msgstr "Ouvrir la documentation de eeschema" msgstr "Ouvrir la documentation de eeschema"
#: eeschema/menubar.cpp:327 #: eeschema/menubar.cpp:327
#: kicad/buildmnu.cpp:263
msgid "&About" msgid "&About"
msgstr "&Au Sujet de" msgstr "&Au Sujet de"
...@@ -7452,7 +6763,6 @@ msgstr "Sélection" ...@@ -7452,7 +6763,6 @@ msgstr "Sélection"
#: eeschema/viewlibs.cpp:122 #: eeschema/viewlibs.cpp:122
#: eeschema/tool_sch.cpp:53 #: eeschema/tool_sch.cpp:53
#: eeschema/viewlib_frame.cpp:59
msgid "Library browser" msgid "Library browser"
msgstr "Visualisateur des librairies" msgstr "Visualisateur des librairies"
...@@ -7576,7 +6886,6 @@ msgid "Edit pins part per part (Carefully use!)" ...@@ -7576,7 +6886,6 @@ msgid "Edit pins part per part (Carefully use!)"
msgstr "Editer pins unité par unité (Utiliser en connaissance de cause)" msgstr "Editer pins unité par unité (Utiliser en connaissance de cause)"
#: eeschema/tool_lib.cpp:241 #: eeschema/tool_lib.cpp:241
#: eeschema/tool_viewlib.cpp:137
#, c-format #, c-format
msgid "Part %c" msgid "Part %c"
msgstr "Composant %c" msgstr "Composant %c"
...@@ -7606,26 +6915,18 @@ msgid "No Draw" ...@@ -7606,26 +6915,18 @@ msgid "No Draw"
msgstr "Invisible" msgstr "Invisible"
#: eeschema/pinedit-dialog.cpp:213 #: eeschema/pinedit-dialog.cpp:213
#: eeschema/affiche.cpp:112
#: eeschema/dialog_edit_label_base.cpp:34
msgid "Right" msgid "Right"
msgstr "Droite" msgstr "Droite"
#: eeschema/pinedit-dialog.cpp:214 #: eeschema/pinedit-dialog.cpp:214
#: eeschema/affiche.cpp:109
#: eeschema/dialog_edit_label_base.cpp:34
msgid "Left" msgid "Left"
msgstr "Gauche" msgstr "Gauche"
#: eeschema/pinedit-dialog.cpp:215 #: eeschema/pinedit-dialog.cpp:215
#: eeschema/affiche.cpp:103
#: eeschema/dialog_edit_label_base.cpp:34
msgid "Up" msgid "Up"
msgstr "Haut" msgstr "Haut"
#: eeschema/pinedit-dialog.cpp:216 #: eeschema/pinedit-dialog.cpp:216
#: eeschema/affiche.cpp:106
#: eeschema/dialog_edit_label_base.cpp:34
msgid "Down" msgid "Down"
msgstr "Bas" msgstr "Bas"
...@@ -7638,19 +6939,14 @@ msgid "Pin Shape:" ...@@ -7638,19 +6939,14 @@ msgid "Pin Shape:"
msgstr "Forme Pin:" msgstr "Forme Pin:"
#: eeschema/pinedit-dialog.cpp:254 #: eeschema/pinedit-dialog.cpp:254
#: eeschema/dialog_edit_label_base.cpp:46
#: eeschema/component_wizard/dialog_component_setup.cpp:201
msgid "Input" msgid "Input"
msgstr "Entrée" msgstr "Entrée"
#: eeschema/pinedit-dialog.cpp:255 #: eeschema/pinedit-dialog.cpp:255
#: eeschema/dialog_edit_label_base.cpp:46
#: eeschema/component_wizard/dialog_component_setup.cpp:202
msgid "Output" msgid "Output"
msgstr "Sortie" msgstr "Sortie"
#: eeschema/pinedit-dialog.cpp:256 #: eeschema/pinedit-dialog.cpp:256
#: eeschema/dialog_edit_label_base.cpp:46
msgid "Bidi" msgid "Bidi"
msgstr "Bidi" msgstr "Bidi"
...@@ -7659,13 +6955,10 @@ msgid "3 States" ...@@ -7659,13 +6955,10 @@ msgid "3 States"
msgstr "3 Etats" msgstr "3 Etats"
#: eeschema/pinedit-dialog.cpp:258 #: eeschema/pinedit-dialog.cpp:258
#: eeschema/dialog_edit_label_base.cpp:46
#: eeschema/component_wizard/dialog_component_setup.cpp:205
msgid "Passive" msgid "Passive"
msgstr "Passive" msgstr "Passive"
#: eeschema/pinedit-dialog.cpp:259 #: eeschema/pinedit-dialog.cpp:259
#: eeschema/component_wizard/dialog_component_setup.cpp:206
msgid "Unspecified" msgid "Unspecified"
msgstr "Non specifié" msgstr "Non specifié"
...@@ -7690,7 +6983,6 @@ msgid "Electrical Type:" ...@@ -7690,7 +6983,6 @@ msgid "Electrical Type:"
msgstr "Type électrique:" msgstr "Type électrique:"
#: eeschema/component_class.cpp:56 #: eeschema/component_class.cpp:56
#: eeschema/dialog_create_component.cpp:160
msgid "U" msgid "U"
msgstr "U" msgstr "U"
...@@ -7854,8 +7146,6 @@ msgid "Done Loading " ...@@ -7854,8 +7146,6 @@ msgid "Done Loading "
msgstr "Chargement terminé" msgstr "Chargement terminé"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:26 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:26
#: eeschema/affiche.cpp:180
#: eeschema/onrightclick.cpp:330
msgid "Unit" msgid "Unit"
msgstr "Unité" msgstr "Unité"
...@@ -7936,7 +7226,6 @@ msgid "Orientation (Degrees)" ...@@ -7936,7 +7226,6 @@ msgid "Orientation (Degrees)"
msgstr "Orientation (Degrés)" msgstr "Orientation (Degrés)"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:43 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:43
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:58
msgid "Select if the component is to be rotated when drawn" msgid "Select if the component is to be rotated when drawn"
msgstr "Sélectionner si le composant doit être tourné lors de l'affichage." msgstr "Sélectionner si le composant doit être tourné lors de l'affichage."
...@@ -7949,12 +7238,10 @@ msgid "Mirror |" ...@@ -7949,12 +7238,10 @@ msgid "Mirror |"
msgstr "Miroir |" msgstr "Miroir |"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:56 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:56
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:71
msgid "Pick the graphical transformation to be used when displaying the component, if any" msgid "Pick the graphical transformation to be used when displaying the component, if any"
msgstr "Ajuster la transformation graphique à utiliser pour afficher le composant" msgstr "Ajuster la transformation graphique à utiliser pour afficher le composant"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:63 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:63
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:446
msgid "Chip Name" msgid "Chip Name"
msgstr "Nom en librairie" msgstr "Nom en librairie"
...@@ -7963,8 +7250,6 @@ msgid "The name of the symbol in the library from which this component came" ...@@ -7963,8 +7250,6 @@ msgid "The name of the symbol in the library from which this component came"
msgstr "Le nom du symbole dans la librairie d'où vient le composant." msgstr "Le nom du symbole dans la librairie d'où vient le composant."
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:73 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:73
#: eeschema/affiche.cpp:190
#: eeschema/onrightclick.cpp:317
msgid "Convert" msgid "Convert"
msgstr "Convert" msgstr "Convert"
...@@ -7977,73 +7262,54 @@ msgstr "" ...@@ -7977,73 +7262,54 @@ msgstr ""
"Pour les portes, ceci est la conversion \"De Morgan\"" "Pour les portes, ceci est la conversion \"De Morgan\""
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:79 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:79
#: eeschema/dialog_edit_component_in_lib.cpp:162
#: eeschema/dialog_create_component.cpp:180
msgid "Parts are locked" msgid "Parts are locked"
msgstr "Les parts sont verrouillées" msgstr "Les parts sont verrouillées"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:86 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:86
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:20
#: eeschema/eelayer.h:164
msgid "Fields" msgid "Fields"
msgstr "Champs" msgstr "Champs"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:95 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:95
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:29
msgid "Add a new custom field" msgid "Add a new custom field"
msgstr "Ajouter un nouveau champ utilisateur" msgstr "Ajouter un nouveau champ utilisateur"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:100 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:100
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:34
msgid "Delete one of the optional fields" msgid "Delete one of the optional fields"
msgstr "Supprimer un des champs optionnels." msgstr "Supprimer un des champs optionnels."
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:104 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:104
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:38
msgid "Move Up" msgid "Move Up"
msgstr "Vers le haut ^" msgstr "Vers le haut ^"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:105 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:105
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:39
msgid "Move the selected optional fields up one position" msgid "Move the selected optional fields up one position"
msgstr "Déplacer le champ optionnel sélectionné de une position vers le haut" msgstr "Déplacer le champ optionnel sélectionné de une position vers le haut"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:115 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:115
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:80
msgid "Visibility" msgid "Visibility"
msgstr "Visibilité" msgstr "Visibilité"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:120 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:120
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:85
msgid "Show" msgid "Show"
msgstr "Visible" msgstr "Visible"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:122 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:122
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:87
msgid "Check if you want this field visible" msgid "Check if you want this field visible"
msgstr "Activer si vous voulez avoir ce champ visible" msgstr "Activer si vous voulez avoir ce champ visible"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:128 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:128
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:93
msgid "Check if you want this field's text rotated 90 degrees" msgid "Check if you want this field's text rotated 90 degrees"
msgstr "Activer si vous voulez avoir le texte de ce champ tourné à 90°" msgstr "Activer si vous voulez avoir le texte de ce champ tourné à 90°"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134
#: eeschema/dialog_edit_label_base.cpp:40
#: eeschema/dialog_bodygraphictext_properties_base.cpp:60
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:99
msgid "Bold" msgid "Bold"
msgstr "Gras" msgstr "Gras"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134
#: eeschema/dialog_edit_label_base.cpp:40
#: eeschema/dialog_bodygraphictext_properties_base.cpp:60
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:99
msgid "Bold Italic" msgid "Bold Italic"
msgstr "Gras Italique" msgstr "Gras Italique"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:136 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:136
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:101
msgid "Style:" msgid "Style:"
msgstr "Style:" msgstr "Style:"
...@@ -8052,7 +7318,6 @@ msgid "The style of the currently selected field's text in the schemati" ...@@ -8052,7 +7318,6 @@ msgid "The style of the currently selected field's text in the schemati"
msgstr "Le style du texte du champ actuellement sélectionné" msgstr "Le style du texte du champ actuellement sélectionné"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:147 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:147
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:110
msgid "Field Name" msgid "Field Name"
msgstr "Nom Champ" msgstr "Nom Champ"
...@@ -8065,18 +7330,14 @@ msgstr "" ...@@ -8065,18 +7330,14 @@ msgstr ""
"Quelques noms de champs fixés ne sont pas modifiables." "Quelques noms de champs fixés ne sont pas modifiables."
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:161 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:161
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:124
msgid "Field Value" msgid "Field Value"
msgstr "Texte Champ" msgstr "Texte Champ"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:166 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:166
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:115
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:129
msgid "The text (or value) of the currently selected field" msgid "The text (or value) of the currently selected field"
msgstr "Le texte (ou la valeur) du champ actuellement sélectionné" msgstr "Le texte (ou la valeur) du champ actuellement sélectionné"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:175 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:175
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:138
msgid "Size(\")" msgid "Size(\")"
msgstr "Taille(\")" msgstr "Taille(\")"
...@@ -8085,7 +7346,6 @@ msgid "The size of the currently selected field's text in the schematic" ...@@ -8085,7 +7346,6 @@ msgid "The size of the currently selected field's text in the schematic"
msgstr "La taille du texte du champ actuellement sélectionné" msgstr "La taille du texte du champ actuellement sélectionné"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:192 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:192
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:155
msgid "PosX(\")" msgid "PosX(\")"
msgstr "PosX" msgstr "PosX"
...@@ -8094,12 +7354,10 @@ msgid "The X coordinate of the text relative to the component" ...@@ -8094,12 +7354,10 @@ msgid "The X coordinate of the text relative to the component"
msgstr "La position X du texte relativement au composant" msgstr "La position X du texte relativement au composant"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:206 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:206
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:167
msgid "PosY(\")" msgid "PosY(\")"
msgstr "PosY" msgstr "PosY"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:211 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:211
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:172
msgid "The Y coordinate of the text relative to the component" msgid "The Y coordinate of the text relative to the component"
msgstr "La position Y du texte relativement au composant" msgstr "La position Y du texte relativement au composant"
...@@ -8232,9 +7490,6 @@ msgid "Root" ...@@ -8232,9 +7490,6 @@ msgid "Root"
msgstr "Racine" msgstr "Racine"
#: eeschema/affiche.cpp:23 #: eeschema/affiche.cpp:23
#: eeschema/dialog_create_component.cpp:149
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:151
#: eeschema/dialog_edit_component_in_schematic.cpp:86
msgid "Name" msgid "Name"
msgstr "Nom" msgstr "Nom"
...@@ -8267,7 +7522,6 @@ msgid "PinName" ...@@ -8267,7 +7522,6 @@ msgid "PinName"
msgstr "Nom Pin" msgstr "Nom Pin"
#: eeschema/affiche.cpp:81 #: eeschema/affiche.cpp:81
#: eeschema/eelayer.h:140
msgid "PinNum" msgid "PinNum"
msgstr "Num Pin" msgstr "Num Pin"
...@@ -8287,7 +7541,6 @@ msgstr "oui" ...@@ -8287,7 +7541,6 @@ msgstr "oui"
#: eeschema/affiche.cpp:177 #: eeschema/affiche.cpp:177
#: eeschema/affiche.cpp:183 #: eeschema/affiche.cpp:183
#: eeschema/dialog_print_using_printer_base.cpp:52
msgid "All" msgid "All"
msgstr "Tout" msgstr "Tout"
...@@ -8304,12 +7557,10 @@ msgid "Number of units:" ...@@ -8304,12 +7557,10 @@ msgid "Number of units:"
msgstr "Nombre de Parts:" msgstr "Nombre de Parts:"
#: eeschema/dialog_edit_component_in_lib.cpp:152 #: eeschema/dialog_edit_component_in_lib.cpp:152
#: eeschema/dialog_create_component.cpp:251
msgid "Skew:" msgid "Skew:"
msgstr "Décalage:" msgstr "Décalage:"
#: eeschema/dialog_edit_component_in_lib.cpp:158 #: eeschema/dialog_edit_component_in_lib.cpp:158
#: eeschema/dialog_create_component.cpp:176
msgid "Power symbol" msgid "Power symbol"
msgstr "Symbole alimentation" msgstr "Symbole alimentation"
...@@ -8359,7 +7610,6 @@ msgstr "Eeschema est en cours d'exécution. Continuer ?" ...@@ -8359,7 +7610,6 @@ msgstr "Eeschema est en cours d'exécution. Continuer ?"
#: eeschema/netlist_control.cpp:131 #: eeschema/netlist_control.cpp:131
#: eeschema/netlist_control.cpp:253 #: eeschema/netlist_control.cpp:253
#: gerbview/options.cpp:214
msgid "Default format" msgid "Default format"
msgstr "Format par défaut" msgstr "Format par défaut"
...@@ -8381,7 +7631,6 @@ msgstr "&Supprimer" ...@@ -8381,7 +7631,6 @@ msgstr "&Supprimer"
#: eeschema/netlist_control.cpp:175 #: eeschema/netlist_control.cpp:175
#: eeschema/netlist_control.cpp:273 #: eeschema/netlist_control.cpp:273
#: cvpcb/cvframe.cpp:403
msgid "Netlist" msgid "Netlist"
msgstr "Netliste" msgstr "Netliste"
...@@ -8414,7 +7663,6 @@ msgid "Netlist command:" ...@@ -8414,7 +7663,6 @@ msgid "Netlist command:"
msgstr "Commande netliste:" msgstr "Commande netliste:"
#: eeschema/netlist_control.cpp:338 #: eeschema/netlist_control.cpp:338
#: share/setpage.cpp:347
msgid "Title:" msgid "Title:"
msgstr "Titre:" msgstr "Titre:"
...@@ -8780,7 +8028,6 @@ msgid "Move Text " ...@@ -8780,7 +8028,6 @@ msgid "Move Text "
msgstr "Déplacer Texte" msgstr "Déplacer Texte"
#: eeschema/libedit_onrightclick.cpp:126 #: eeschema/libedit_onrightclick.cpp:126
#: eeschema/dialog_edit_label_base.h:59
msgid "Text Editor" msgid "Text Editor"
msgstr "Editeur de Texte" msgstr "Editeur de Texte"
...@@ -9118,81 +8365,15 @@ msgstr "Montrer Numéro de Pin" ...@@ -9118,81 +8365,15 @@ msgstr "Montrer Numéro de Pin"
msgid "You must provide a name for this component" msgid "You must provide a name for this component"
msgstr "Vous devez fournir un nom pour ce composant" msgstr "Vous devez fournir un nom pour ce composant"
#: eeschema/dialog_eeschema_config.cpp:155 #: eeschema/dialog_eeschema_config.cpp:278
msgid "save current configuration setting in the local .pro file"
msgstr "Sauve configuration courante dans le fichier .pro local"
#: eeschema/dialog_eeschema_config.cpp:161
msgid "NetList Formats:"
msgstr " Formats NetListe:"
#: eeschema/dialog_eeschema_config.cpp:183
msgid "Remove"
msgstr "Enlever"
#: eeschema/dialog_eeschema_config.cpp:185
msgid "Unload the selected library"
msgstr "Décharger la librairie sélectionnée"
#: eeschema/dialog_eeschema_config.cpp:191
msgid "Add a new library after the selected library, and load it"
msgstr "Ajouter une nouvelle librairie après la librairie sélectionnée, et la charger"
#: eeschema/dialog_eeschema_config.cpp:196
msgid "Add a new library before the selected library, and load it"
msgstr "Ajouter une nouvelle librairie avant la librairie sélectionnée, et la charger"
#: eeschema/dialog_eeschema_config.cpp:198
msgid "Add a new library beforer the selected library, add load it"
msgstr "Ajouter une nouvelle librairie avant la librairie sélectionnée, et la charger"
#: eeschema/dialog_eeschema_config.cpp:213
msgid "Default library file path:"
msgstr "Chemin par Défaut des Fichiers Librairies:"
#: eeschema/dialog_eeschema_config.cpp:220
msgid ""
"Default path to search libraries which have no absolute path in name,\n"
"or a name which does not start by ./ or ../\n"
"If void, the default path is kicad/library"
msgstr ""
"Chemin par défaut pour chercher les librairies qui n'ont pas de chemin absolu dans leur nom,\n"
"ou un nom qui ne commence pas par ./ ou ../ .\n"
"Si vide, le chemin par défaut est kicad/library"
#: eeschema/dialog_eeschema_config.cpp:228
msgid "Cmp file Ext: "
msgstr "Ext fichier Cmp: "
#: eeschema/dialog_eeschema_config.cpp:232
msgid "Net file Ext: "
msgstr "Ext fichier Netliste: "
#: eeschema/dialog_eeschema_config.cpp:236
msgid "Library file Ext: "
msgstr "Ext fichier Librairie: "
#: eeschema/dialog_eeschema_config.cpp:240
msgid "Symbol file Ext: "
msgstr "Ext fichier Symbole: "
#: eeschema/dialog_eeschema_config.cpp:244
msgid "Schematic file Ext: "
msgstr "Ext fichier Schéma: "
#: eeschema/dialog_eeschema_config.cpp:465
msgid " Default Path for libraries" msgid " Default Path for libraries"
msgstr "Chemin par défaut des librairies" msgstr "Chemin par défaut des librairies"
#: eeschema/eeconfig.cpp:65 #: eeschema/eeconfig.cpp:65
#: cvpcb/menucfg.cpp:155
msgid "Read config file" msgid "Read config file"
msgstr "Lire config" msgstr "Lire config"
#: eeschema/eeconfig.cpp:78 #: eeschema/eeconfig.cpp:78
#: kicad/files-io.cpp:132
#: gerbview/dcode.cpp:289
#: gerbview/readgerb.cpp:146
msgid "File " msgid "File "
msgstr "Fichier " msgstr "Fichier "
...@@ -9238,7 +8419,6 @@ msgstr "" ...@@ -9238,7 +8419,6 @@ msgstr ""
"#End List\n" "#End List\n"
#: eeschema/build_BOM.cpp:627 #: eeschema/build_BOM.cpp:627
#: eeschema/class_libentry_fields.cpp:140
msgid "Field" msgid "Field"
msgstr "Champ" msgstr "Champ"
...@@ -9283,7 +8463,6 @@ msgid "#End labels\n" ...@@ -9283,7 +8463,6 @@ msgid "#End labels\n"
msgstr "#End labels\n" msgstr "#End labels\n"
#: eeschema/eeredraw.cpp:130 #: eeschema/eeredraw.cpp:130
#: eeschema/eelayer.h:171
msgid "Sheet" msgid "Sheet"
msgstr "Feuille" msgstr "Feuille"
...@@ -9463,10 +8642,6 @@ msgstr "Aspect Texte:" ...@@ -9463,10 +8642,6 @@ msgstr "Aspect Texte:"
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:160 #: eeschema/dialog_edit_libentry_fields_in_lib.cpp:160
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:165 #: eeschema/dialog_edit_libentry_fields_in_lib.cpp:165
#: eeschema/dialog_edit_component_in_schematic.cpp:95
#: eeschema/dialog_edit_component_in_schematic.cpp:100
#: common/wxwineda.cpp:220
#: common/wxwineda.cpp:233
msgid "Pos " msgid "Pos "
msgstr "Pos " msgstr "Pos "
...@@ -9609,6 +8784,79 @@ msgstr "Pas de nom de composant!" ...@@ -9609,6 +8784,79 @@ msgstr "Pas de nom de composant!"
msgid "Component [%s] not found!" msgid "Component [%s] not found!"
msgstr "Composant [%s] non trouvé!" msgstr "Composant [%s] non trouvé!"
#: eeschema/dialog_eeschema_config_fbp.cpp:25
msgid "NetList Formats:"
msgstr " Formats NetListe:"
#: eeschema/dialog_eeschema_config_fbp.cpp:38
msgid "Cmp file Ext: "
msgstr "Ext fichier Cmp: "
#: eeschema/dialog_eeschema_config_fbp.cpp:42
msgid "Net file Ext: "
msgstr "Ext fichier Netliste: "
#: eeschema/dialog_eeschema_config_fbp.cpp:46
msgid "Library file Ext: "
msgstr "Ext fichier Librairie: "
#: eeschema/dialog_eeschema_config_fbp.cpp:50
msgid "Symbol file Ext: "
msgstr "Ext fichier Symbole: "
#: eeschema/dialog_eeschema_config_fbp.cpp:54
msgid "Schematic file Ext: "
msgstr "Ext fichier Schéma: "
#: eeschema/dialog_eeschema_config_fbp.cpp:70
msgid "Active Libraries:"
msgstr "Librairies Actives:"
#: eeschema/dialog_eeschema_config_fbp.cpp:75
msgid ""
"List of active library files.\n"
"Only library files in this list are loaded by Eeschema.\n"
"The order of this list is important:\n"
"Eeschema searchs for a given component using this list order priority."
msgstr ""
"Liste des librairies actives.\n"
"Seuls les fichiers librairie dans cette liste sont chargés par eeschema.\n"
"L'ordre de cette liste est important:Eeschema cherche un composant donné en utilisant cette liste par ordre de priorité."
#: eeschema/dialog_eeschema_config_fbp.cpp:85
msgid "Remove"
msgstr "Enlever"
#: eeschema/dialog_eeschema_config_fbp.cpp:87
msgid "Unload the selected library"
msgstr "Décharger la librairie sélectionnée"
#: eeschema/dialog_eeschema_config_fbp.cpp:93
msgid "Add a new library after the selected library, and load it"
msgstr "Ajouter une nouvelle librairie après la librairie sélectionnée, et la charger"
#: eeschema/dialog_eeschema_config_fbp.cpp:99
msgid "Add a new library before the selected library, and load it"
msgstr "Ajouter une nouvelle librairie avant la librairie sélectionnée, et la charger"
#: eeschema/dialog_eeschema_config_fbp.cpp:115
msgid "Accept and save current configuration setting in the local .pro file"
msgstr "Acepter et sauver la configuration courante dans le fichier .pro local"
#: eeschema/dialog_eeschema_config_fbp.cpp:127
msgid "Default library file path:"
msgstr "Chemin par Défaut des Fichiers Librairies:"
#: eeschema/dialog_eeschema_config_fbp.cpp:130
msgid ""
"Default path to search libraries which have no absolute path in name,\n"
"or a name which does not start by ./ or ../\n"
"If void, the default path is kicad/share/library"
msgstr ""
"Chemin par défaut pour chercher les librairies qui n'ont pas de chemin absolu dans leur nom,\n"
"ou un nom qui ne commence pas par ./ ou ../ .\n"
"Si vide, le chemin par défaut est kicad/share/library"
#: eeschema/component_wizard/dialog_component_setup.cpp:137 #: eeschema/component_wizard/dialog_component_setup.cpp:137
msgid "Quick KICAD Library Component Builder" msgid "Quick KICAD Library Component Builder"
msgstr "" msgstr ""
...@@ -9791,7 +9039,6 @@ msgid "Equiv" ...@@ -9791,7 +9039,6 @@ msgid "Equiv"
msgstr "Equiv" msgstr "Equiv"
#: cvpcb/genorcad.cpp:134 #: cvpcb/genorcad.cpp:134
#: cvpcb/writenetlistpcbnew.cpp:187
#, c-format #, c-format
msgid "%s %s pin %s : Different Nets" msgid "%s %s pin %s : Different Nets"
msgstr "%s %s pin %s : Nets Differents" msgstr "%s %s pin %s : Nets Differents"
...@@ -9924,7 +9171,6 @@ msgid "Component %s: Footprint %s not found in libraries" ...@@ -9924,7 +9171,6 @@ msgid "Component %s: Footprint %s not found in libraries"
msgstr "Composant %s: Module %s non trouvé en librairies" msgstr "Composant %s: Module %s non trouvé en librairies"
#: cvpcb/displayframe.cpp:121 #: cvpcb/displayframe.cpp:121
#: cvpcb/dialog_display_options.h:51
msgid "Display Options" msgid "Display Options"
msgstr "Options d'Affichage" msgstr "Options d'Affichage"
...@@ -9962,22 +9208,18 @@ msgid "Delete selections" ...@@ -9962,22 +9208,18 @@ msgid "Delete selections"
msgstr "Effacement des associations existantes" msgstr "Effacement des associations existantes"
#: cvpcb/cvframe.cpp:461 #: cvpcb/cvframe.cpp:461
#: common/drawframe.cpp:123
msgid "Dialog boxes" msgid "Dialog boxes"
msgstr "Fenêtres de dialogue" msgstr "Fenêtres de dialogue"
#: cvpcb/cvframe.cpp:466 #: cvpcb/cvframe.cpp:466
#: common/drawframe.cpp:128
msgid "Lists" msgid "Lists"
msgstr "Listes" msgstr "Listes"
#: cvpcb/cvframe.cpp:471 #: cvpcb/cvframe.cpp:471
#: common/drawframe.cpp:133
msgid "Status box" msgid "Status box"
msgstr "Fenêtre d'état" msgstr "Fenêtre d'état"
#: cvpcb/cvframe.cpp:477 #: cvpcb/cvframe.cpp:477
#: common/drawframe.cpp:139
msgid "&Font" msgid "&Font"
msgstr "&Fonte" msgstr "&Fonte"
...@@ -10050,7 +9292,6 @@ msgid "&Apply" ...@@ -10050,7 +9292,6 @@ msgid "&Apply"
msgstr "&Appliquer" msgstr "&Appliquer"
#: kicad/kicad.cpp:388 #: kicad/kicad.cpp:388
#: kicad/treeprj_frame.cpp:534
msgid "noname" msgid "noname"
msgstr "noname" msgstr "noname"
...@@ -10297,7 +9538,6 @@ msgid "You must choose a PDF viewer before use this option" ...@@ -10297,7 +9538,6 @@ msgid "You must choose a PDF viewer before use this option"
msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option" msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option"
#: kicad/preferences.cpp:105 #: kicad/preferences.cpp:105
#: common/gestfich.cpp:677
msgid "Prefered Editor:" msgid "Prefered Editor:"
msgstr "Editeur préféré:" msgstr "Editeur préféré:"
...@@ -10355,101 +9595,101 @@ msgstr "Executer le Script Python:" ...@@ -10355,101 +9595,101 @@ msgstr "Executer le Script Python:"
msgid "Load file:" msgid "Load file:"
msgstr "Charger Fichier:" msgstr "Charger Fichier:"
#: kicad/treeprj_frame.cpp:110 #: kicad/treeprj_frame.cpp:113
msgid "&Run" msgid "&Run"
msgstr "Exécute&r" msgstr "Exécute&r"
#: kicad/treeprj_frame.cpp:111 #: kicad/treeprj_frame.cpp:114
msgid "Run the Python Script" msgid "Run the Python Script"
msgstr "Exécuter le Script Python" msgstr "Exécuter le Script Python"
#: kicad/treeprj_frame.cpp:120 #: kicad/treeprj_frame.cpp:123
#: kicad/treeprj_frame.cpp:195 #: kicad/treeprj_frame.cpp:198
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
msgstr "Editer avec un éditeur de Texte" msgstr "Editer avec un éditeur de Texte"
#: kicad/treeprj_frame.cpp:121 #: kicad/treeprj_frame.cpp:124
msgid "&Open the file in a Text Editor" msgid "&Open the file in a Text Editor"
msgstr "&Ouvrir le fichier avec un Editeur de texte" msgstr "&Ouvrir le fichier avec un Editeur de texte"
#: kicad/treeprj_frame.cpp:138 #: kicad/treeprj_frame.cpp:141
msgid "New D&irectory" msgid "New D&irectory"
msgstr "&Nouveau Répertoire" msgstr "&Nouveau Répertoire"
#: kicad/treeprj_frame.cpp:139 #: kicad/treeprj_frame.cpp:142
msgid "Create a New Directory" msgid "Create a New Directory"
msgstr "Créer un nouveau Répertoire" msgstr "Créer un nouveau Répertoire"
#: kicad/treeprj_frame.cpp:148 #: kicad/treeprj_frame.cpp:151
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "Nouveau Script P&ython" msgstr "Nouveau Script P&ython"
#: kicad/treeprj_frame.cpp:149 #: kicad/treeprj_frame.cpp:152
msgid "Create a New Python Script" msgid "Create a New Python Script"
msgstr "Créer un nouveau script Python" msgstr "Créer un nouveau script Python"
#: kicad/treeprj_frame.cpp:158 #: kicad/treeprj_frame.cpp:161
msgid "New &Text File" msgid "New &Text File"
msgstr "Nouveau Fichier &Texte" msgstr "Nouveau Fichier &Texte"
#: kicad/treeprj_frame.cpp:159 #: kicad/treeprj_frame.cpp:162
msgid "Create a New Txt File" msgid "Create a New Txt File"
msgstr "Créer un nouveau Fichier texte" msgstr "Créer un nouveau Fichier texte"
#: kicad/treeprj_frame.cpp:167 #: kicad/treeprj_frame.cpp:170
msgid "New &File" msgid "New &File"
msgstr "Nouveau &Fichier" msgstr "Nouveau &Fichier"
#: kicad/treeprj_frame.cpp:168 #: kicad/treeprj_frame.cpp:171
msgid "Create a New File" msgid "Create a New File"
msgstr "Créer un nouveau Fichier" msgstr "Créer un nouveau Fichier"
#: kicad/treeprj_frame.cpp:182 #: kicad/treeprj_frame.cpp:185
msgid "&Rename file" msgid "&Rename file"
msgstr "&Renommer fichier" msgstr "&Renommer fichier"
#: kicad/treeprj_frame.cpp:183 #: kicad/treeprj_frame.cpp:186
#: kicad/treeprj_frame.cpp:185 #: kicad/treeprj_frame.cpp:188
msgid "&Rename directory" msgid "&Rename directory"
msgstr "&Renommer répertoire" msgstr "&Renommer répertoire"
#: kicad/treeprj_frame.cpp:184 #: kicad/treeprj_frame.cpp:187
msgid "Rename file" msgid "Rename file"
msgstr "Renommer fichier" msgstr "Renommer fichier"
#: kicad/treeprj_frame.cpp:196 #: kicad/treeprj_frame.cpp:199
msgid "Open the file in a Text Editor" msgid "Open the file in a Text Editor"
msgstr "Ouvrir le fichier avec un Editeur de texte" msgstr "Ouvrir le fichier avec un Editeur de texte"
#: kicad/treeprj_frame.cpp:204 #: kicad/treeprj_frame.cpp:207
msgid "&Delete File" msgid "&Delete File"
msgstr "&Supprimer Fichier" msgstr "&Supprimer Fichier"
#: kicad/treeprj_frame.cpp:205 #: kicad/treeprj_frame.cpp:208
msgid "&Delete Directory" msgid "&Delete Directory"
msgstr "&Supprimer le Répertoire" msgstr "&Supprimer le Répertoire"
#: kicad/treeprj_frame.cpp:206 #: kicad/treeprj_frame.cpp:209
msgid "Delete the File" msgid "Delete the File"
msgstr "Supprimer le fichier" msgstr "Supprimer le fichier"
#: kicad/treeprj_frame.cpp:207 #: kicad/treeprj_frame.cpp:210
msgid "&Delete the Directory and its content" msgid "&Delete the Directory and its content"
msgstr "Effacer le Répertoire et son contenu" msgstr "Effacer le Répertoire et son contenu"
#: kicad/treeprj_frame.cpp:531 #: kicad/treeprj_frame.cpp:534
msgid "Create New File:" msgid "Create New File:"
msgstr "Créer un nouveau Fichier" msgstr "Créer un nouveau Fichier"
#: kicad/treeprj_frame.cpp:532 #: kicad/treeprj_frame.cpp:535
msgid "Create New Directory" msgid "Create New Directory"
msgstr "Créer un nouveau Répertoire" msgstr "Créer un nouveau Répertoire"
#: kicad/treeprj_frame.cpp:1018 #: kicad/treeprj_frame.cpp:1021
msgid "Change filename: " msgid "Change filename: "
msgstr "Changer Nom Fichier: " msgstr "Changer Nom Fichier: "
#: kicad/treeprj_frame.cpp:1020 #: kicad/treeprj_frame.cpp:1023
msgid "Change filename" msgid "Change filename"
msgstr "Changer Nom Fichier" msgstr "Changer Nom Fichier"
...@@ -10530,7 +9770,7 @@ msgstr "Effacer Zones ?" ...@@ -10530,7 +9770,7 @@ msgstr "Effacer Zones ?"
msgid "Delete Layer %d" msgid "Delete Layer %d"
msgstr "Effacer Couche %d" msgstr "Effacer Couche %d"
#: gerbview/gerbview.cpp:43 #: gerbview/gerbview.cpp:45
msgid "GerbView is already running. Continue?" msgid "GerbView is already running. Continue?"
msgstr "Gerbview est en cours d'exécution. Continuer ?" msgstr "Gerbview est en cours d'exécution. Continuer ?"
...@@ -10569,7 +9809,7 @@ msgstr "Commande <%c%c> ignorée par Gerbview" ...@@ -10569,7 +9809,7 @@ msgstr "Commande <%c%c> ignorée par Gerbview"
msgid "Too many include files!!" msgid "Too many include files!!"
msgstr "Trop de fichiers inclus!!" msgstr "Trop de fichiers inclus!!"
#: gerbview/gerberframe.cpp:185 #: gerbview/gerberframe.cpp:189
msgid "Layer modified, Continue ?" msgid "Layer modified, Continue ?"
msgstr "Couche modifiée, Continuer ?" msgstr "Couche modifiée, Continuer ?"
...@@ -10845,71 +10085,71 @@ msgstr "Fichier d'aide %s non trouvé" ...@@ -10845,71 +10085,71 @@ msgstr "Fichier d'aide %s non trouvé"
msgid "Help file %s could not be found." msgid "Help file %s could not be found."
msgstr "Fichier d'aide %s non trouvé." msgstr "Fichier d'aide %s non trouvé."
#: common/edaappl.cpp:91 #: common/edaappl.cpp:92
msgid "Default" msgid "Default"
msgstr "Défaut" msgstr "Défaut"
#: common/edaappl.cpp:108 #: common/edaappl.cpp:109
msgid "French" msgid "French"
msgstr "Français" msgstr "Français"
#: common/edaappl.cpp:116 #: common/edaappl.cpp:117
msgid "Spanish" msgid "Spanish"
msgstr "Espagnol" msgstr "Espagnol"
#: common/edaappl.cpp:124 #: common/edaappl.cpp:125
msgid "Portuguese" msgid "Portuguese"
msgstr "Portugais" msgstr "Portugais"
#: common/edaappl.cpp:132 #: common/edaappl.cpp:133
msgid "Italian" msgid "Italian"
msgstr "Italien" msgstr "Italien"
#: common/edaappl.cpp:140 #: common/edaappl.cpp:141
msgid "German" msgid "German"
msgstr "Allemand" msgstr "Allemand"
#: common/edaappl.cpp:148 #: common/edaappl.cpp:149
msgid "Slovenian" msgid "Slovenian"
msgstr "Slovène" msgstr "Slovène"
#: common/edaappl.cpp:156 #: common/edaappl.cpp:157
msgid "Hungarian" msgid "Hungarian"
msgstr "Hongrois" msgstr "Hongrois"
#: common/edaappl.cpp:164 #: common/edaappl.cpp:165
msgid "Polish" msgid "Polish"
msgstr "Polonais" msgstr "Polonais"
#: common/edaappl.cpp:172 #: common/edaappl.cpp:173
msgid "Czech" msgid "Czech"
msgstr "Tchèque" msgstr "Tchèque"
#: common/edaappl.cpp:180 #: common/edaappl.cpp:181
msgid "Russian" msgid "Russian"
msgstr "Russe" msgstr "Russe"
#: common/edaappl.cpp:188 #: common/edaappl.cpp:189
msgid "Korean" msgid "Korean"
msgstr "Coréen" msgstr "Coréen"
#: common/edaappl.cpp:196 #: common/edaappl.cpp:197
msgid "Chinese simplified" msgid "Chinese simplified"
msgstr "Chinois Simplifié" msgstr "Chinois Simplifié"
#: common/edaappl.cpp:204 #: common/edaappl.cpp:205
msgid "Catalan" msgid "Catalan"
msgstr "Catalan" msgstr "Catalan"
#: common/edaappl.cpp:212 #: common/edaappl.cpp:213
msgid "Dutch" msgid "Dutch"
msgstr "Hollandais" msgstr "Hollandais"
#: common/edaappl.cpp:818 #: common/edaappl.cpp:819
msgid "Language" msgid "Language"
msgstr "Langue" msgstr "Langue"
#: common/edaappl.cpp:819 #: common/edaappl.cpp:820
msgid "Select application language (only for testing!)" msgid "Select application language (only for testing!)"
msgstr "Choisir la langue (seulement pour tests!)" msgstr "Choisir la langue (seulement pour tests!)"
...@@ -11508,7 +10748,6 @@ msgid "Footprints Orientation" ...@@ -11508,7 +10748,6 @@ msgid "Footprints Orientation"
msgstr "Orientation des Modules" msgstr "Orientation des Modules"
#: pcbnew/dialog_setup_libs.h:43 #: pcbnew/dialog_setup_libs.h:43
#: eeschema/dialog_eeschema_config.h:50
msgid "Dialog" msgid "Dialog"
msgstr "Dialog" msgstr "Dialog"
...@@ -11525,7 +10764,6 @@ msgid "Tracks and Vias Sizes" ...@@ -11525,7 +10764,6 @@ msgid "Tracks and Vias Sizes"
msgstr "Dims Pistes et Vias" msgstr "Dims Pistes et Vias"
#: pcbnew/dialog_SVG_print_base.h:68 #: pcbnew/dialog_SVG_print_base.h:68
#: eeschema/dialog_SVG_print_base.h:65
msgid "Create SVG file" msgid "Create SVG file"
msgstr "Créer Fichier SVG" msgstr "Créer Fichier SVG"
...@@ -11568,7 +10806,6 @@ msgid "Tech Layers" ...@@ -11568,7 +10806,6 @@ msgid "Tech Layers"
msgstr "Couches Tech." msgstr "Couches Tech."
#: pcbnew/set_color.h:327 #: pcbnew/set_color.h:327
#: gerbview/set_color.h:318
msgid "Others" msgid "Others"
msgstr "Autres" msgstr "Autres"
...@@ -11920,3 +11157,8 @@ msgstr "DCodes id." ...@@ -11920,3 +11157,8 @@ msgstr "DCodes id."
msgid "Page Settings" msgid "Page Settings"
msgstr "Ajustage opt Page" msgstr "Ajustage opt Page"
#~ msgid "Add a new library beforer the selected library, add load it"
#~ msgstr ""
#~ "Ajouter une nouvelle librairie avant la librairie sélectionnée, et la "
#~ "charger"
makefile.g95 → makefile.mingw
View file @ 71ca194b
KICAD_SUBDIRS = common bitmaps 3d-viewer polygon polygon/kbool/src eeschema eeschema/plugins pcbnew kicad cvpcb gerbview KICAD_SUBDIRS = common bitmaps 3d-viewer polygon polygon/kbool/src eeschema eeschema/plugins pcbnew kicad cvpcb gerbview
KICAD_SUBDIRS_BIN = eeschema eeschema/plugins pcbnew cvpcb kicad gerbview KICAD_SUBDIRS_BIN = eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
# How to invoke make: # How to invoke make:
MAKE = make -k -f makefile.g95 MAKE = make -k -f makefile.mingw
MAKE_INSTALL = make -f makefile.g95 install MAKE_INSTALL = make -f makefile.mingw install
MAKE_CLEAN = make -f makefile.g95 clean MAKE_CLEAN = make -f makefile.mingw clean
all: all:
@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE)); done @for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE)); done
......
pcbnew/class_zone.cpp
View file @ 71ca194b
...@@ -70,11 +70,19 @@ void ZONE_CONTAINER::SetNet( int anet_code ) ...@@ -70,11 +70,19 @@ void ZONE_CONTAINER::SetNet( int anet_code )
if( m_Parent ) if( m_Parent )
{ {
EQUIPOT* net = ( (BOARD*) m_Parent )->FindNet( anet_code ); BOARD* board = (BOARD*) m_Parent;
EQUIPOT* net = board->FindNet( anet_code );
if( net ) if( net )
m_Netname = net->GetNetname(); m_Netname = net->GetNetname();
else else
m_Netname.Empty(); m_Netname.Empty();
// Set corresponding SEGZONE items if this zone uses fill areas by segments
for( SEGZONE* zseg = board->m_Zone; zseg; zseg = zseg->Next() )
{
if ( zseg->m_TimeStamp == m_TimeStamp )
zseg->SetNet(GetNet());
}
} }
else else
m_Netname.Empty(); m_Netname.Empty();
......
pcbnew/librairi.cpp
View file @ 71ca194b
...@@ -77,7 +77,7 @@ MODULE* WinEDA_ModuleEditFrame::Import_Module( wxDC* DC ) ...@@ -77,7 +77,7 @@ MODULE* WinEDA_ModuleEditFrame::Import_Module( wxDC* DC )
if( file == NULL ) if( file == NULL )
{ {
wxString msg; wxString msg;
msg.Printf( _( "File <%s> not found" ), dlg.GetPath() ); msg.Printf( _( "File <%s> not found" ), dlg.GetPath().GetData() );
DisplayError( this, msg ); DisplayError( this, msg );
return NULL; return NULL;
} }
......
pcbnew/makefile.include
View file @ 71ca194b
EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a\ EXTRALIBS = ../common/common.a ../common/pcbcommon.a ../bitmaps/libbitmaps.a\
../polygon/lib_polygon.a\ ../polygon/lib_polygon.a\
../polygon/kbool/src/libkbool.a ../polygon/kbool/src/libkbool.a
...@@ -49,14 +49,7 @@ OBJECTS= $(TARGET).o\ ...@@ -49,14 +49,7 @@ OBJECTS= $(TARGET).o\
setpage.o \ setpage.o \
tool_pcb.o \ tool_pcb.o \
pcbframe.o \ pcbframe.o \
class_drawsegment.o \
class_track.o \
class_cotation.o\ class_cotation.o\
class_equipot.o \
class_module.o \
class_edge_mod.o \
class_text_mod.o\
class_board_item.o\
track.o \ track.o \
set_color.o \ set_color.o \
set_grid.o \ set_grid.o \
...@@ -65,7 +58,6 @@ OBJECTS= $(TARGET).o\ ...@@ -65,7 +58,6 @@ OBJECTS= $(TARGET).o\
affiche.o \ affiche.o \
swap_layers.o \ swap_layers.o \
tracepcb.o \ tracepcb.o \
tracemod.o \
trpiste.o \ trpiste.o \
surbrill.o \ surbrill.o \
edit_pcb_text.o \ edit_pcb_text.o \
...@@ -154,16 +146,6 @@ export_gencad.o: export_gencad.cpp ...@@ -154,16 +146,6 @@ export_gencad.o: export_gencad.cpp
print_board_functions.o: print_board_functions.cpp print_board_functions.o: print_board_functions.cpp
class_track.o: class_track.cpp class_track.h
class_equipot.o: class_equipot.cpp
class_module.o: class_module.cpp
class_edge_mod.o: class_edge_mod.cpp
class_text_mod.o: class_text_mod.cpp
pcbnew.o: pcbnew.cpp pcbnew.h pcbplot.h drag.h \ pcbnew.o: pcbnew.cpp pcbnew.h pcbplot.h drag.h \
autorout.h ../include/eda_dde.h autorout.h ../include/eda_dde.h
...@@ -179,8 +161,6 @@ swap_layers.o: swap_layers.cpp ...@@ -179,8 +161,6 @@ swap_layers.o: swap_layers.cpp
tracepcb.o: tracepcb.cpp tracepcb.o: tracepcb.cpp
tracemod.o: tracemod.cpp ../include/grfonte.h
trpiste.o: trpiste.cpp trpiste.o: trpiste.cpp
surbrill.o: surbrill.cpp surbrill.o: surbrill.cpp
......
pcbnew/makefile.g95 → pcbnew/makefile.mingw
View file @ 71ca194b
...@@ -11,7 +11,7 @@ all: $(TARGET).exe ...@@ -11,7 +11,7 @@ all: $(TARGET).exe
include makefile.include include makefile.include
$(TARGET).exe: $(OBJECTS) $(TARGET)_resources.o\ $(TARGET).exe: $(OBJECTS) $(TARGET)_resources.o\
$(EDALIBS) $(LIBVIEWER3D) makefile.g95 $(EDALIBS) $(LIBVIEWER3D) makefile.mingw
$(CXX) $(ALL_LDFLAGS) -o $(TARGET).exe\ $(CXX) $(ALL_LDFLAGS) -o $(TARGET).exe\
$(OBJECTS) $(LIBVIEWER3D) $(TARGET)_resources.o $(EDALIBS) $(SYSWXLIB) $(OBJECTS) $(LIBVIEWER3D) $(TARGET)_resources.o $(EDALIBS) $(SYSWXLIB)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment