Skip to content

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

Code cleaning. Use new font.

parent d84087c0
Hide whitespace changes
Inline Side-by-side
Showing with 12056 additions and 636 deletions
common/common.cpp
View file @ a61b48ec
...@@ -68,7 +68,6 @@ const wxString AllFilesWildcard( _( "All files (*)|*" ) ); ...@@ -68,7 +68,6 @@ const wxString AllFilesWildcard( _( "All files (*)|*" ) );
wxString g_ProductName = wxT( "KiCad E.D.A. " ); wxString g_ProductName = wxT( "KiCad E.D.A. " );
bool g_ShowPageLimits = true; bool g_ShowPageLimits = true;
int g_GridColor = DARKGRAY;
wxString g_UserLibDirBuffer; wxString g_UserLibDirBuffer;
int g_DebugLevel; int g_DebugLevel;
int g_MouseOldButtons; int g_MouseOldButtons;
......
common/drawframe.cpp
View file @ a61b48ec
...@@ -22,8 +22,9 @@ ...@@ -22,8 +22,9 @@
/* Configuration entry names. */ /* Configuration entry names. */
static const wxString CursorShapeEntry( wxT( "CuShape" ) ); static const wxString CursorShapeEntryKeyword( wxT( "CursorShape" ) );
static const wxString ShowGridEntry( wxT( "ShGrid" ) ); static const wxString ShowGridEntryKeyword( wxT( "ShowGrid" ) );
static const wxString GridColorEntryKeyword( wxT( "GridColor" ) );
static const wxString LastGridSizeId( wxT( "_LastGridSize" ) ); static const wxString LastGridSizeId( wxT( "_LastGridSize" ) );
...@@ -60,13 +61,14 @@ WinEDA_DrawFrame::WinEDA_DrawFrame( wxWindow* father, int idtype, ...@@ -60,13 +61,14 @@ WinEDA_DrawFrame::WinEDA_DrawFrame( wxWindow* father, int idtype,
m_ID_last_state = 0; m_ID_last_state = 0;
m_HTOOL_current_state = 0; m_HTOOL_current_state = 0;
m_Draw_Axis = FALSE; // TRUE to draw axis. m_Draw_Axis = FALSE; // TRUE to draw axis.
m_Draw_Grid = FALSE; // TRUE to show grid.
m_Draw_Sheet_Ref = FALSE; // TRUE to display reference sheet. m_Draw_Sheet_Ref = FALSE; // TRUE to display reference sheet.
m_Print_Sheet_Ref = TRUE; // TRUE to print reference sheet. m_Print_Sheet_Ref = TRUE; // TRUE to print reference sheet.
m_Draw_Auxiliary_Axis = FALSE; // TRUE draw auxilary axis. m_Draw_Auxiliary_Axis = FALSE; // TRUE draw auxilary axis.
m_UnitType = INTERNAL_UNIT_TYPE; // Internal unit = inch m_UnitType = INTERNAL_UNIT_TYPE; // Internal unit = inch
m_CursorShape = 0; m_CursorShape = 0;
m_LastGridSizeId = 0; m_LastGridSizeId = 0;
m_DrawGrid = true; // hide/Show grid. default = show
m_GridColor = DARKGRAY; // Grid color
// Internal units per inch: = 1000 for schema, = 10000 for PCB // Internal units per inch: = 1000 for schema, = 10000 for PCB
m_InternalUnits = EESCHEMA_INTERNAL_UNIT; m_InternalUnits = EESCHEMA_INTERNAL_UNIT;
...@@ -720,8 +722,13 @@ void WinEDA_DrawFrame::LoadSettings() ...@@ -720,8 +722,13 @@ void WinEDA_DrawFrame::LoadSettings()
wxConfig* cfg = wxGetApp().m_EDA_Config; wxConfig* cfg = wxGetApp().m_EDA_Config;
WinEDA_BasicFrame::LoadSettings(); WinEDA_BasicFrame::LoadSettings();
cfg->Read( m_FrameName + CursorShapeEntry, &m_CursorShape, ( long )0 ); cfg->Read( m_FrameName + CursorShapeEntryKeyword, &m_CursorShape, ( long )0 );
cfg->Read( m_FrameName + ShowGridEntry, &m_Draw_Grid, true ); bool btmp;
if ( cfg->Read( m_FrameName + ShowGridEntryKeyword, &btmp ) )
SetGridVisibility( btmp);
int itmp;
if( cfg->Read( m_FrameName + GridColorEntryKeyword, &itmp ) )
SetGridColor(itmp);
cfg->Read( m_FrameName + LastGridSizeId, &m_LastGridSizeId, 0L ); cfg->Read( m_FrameName + LastGridSizeId, &m_LastGridSizeId, 0L );
} }
...@@ -739,8 +746,9 @@ void WinEDA_DrawFrame::SaveSettings() ...@@ -739,8 +746,9 @@ void WinEDA_DrawFrame::SaveSettings()
wxConfig* cfg = wxGetApp().m_EDA_Config; wxConfig* cfg = wxGetApp().m_EDA_Config;
WinEDA_BasicFrame::SaveSettings(); WinEDA_BasicFrame::SaveSettings();
cfg->Write( m_FrameName + CursorShapeEntry, m_CursorShape ); cfg->Write( m_FrameName + CursorShapeEntryKeyword, m_CursorShape );
cfg->Write( m_FrameName + ShowGridEntry, m_Draw_Grid ); cfg->Write( m_FrameName + ShowGridEntryKeyword, IsGridVisible() );
cfg->Write( m_FrameName + GridColorEntryKeyword, GetGridColor() );
cfg->Write( m_FrameName + LastGridSizeId, ( long ) m_LastGridSizeId ); cfg->Write( m_FrameName + LastGridSizeId, ( long ) m_LastGridSizeId );
} }
......
common/drawpanel.cpp
View file @ a61b48ec
...@@ -703,7 +703,7 @@ void WinEDA_DrawPanel::DrawBackGround( wxDC* DC ) ...@@ -703,7 +703,7 @@ void WinEDA_DrawPanel::DrawBackGround( wxDC* DC )
GRSetDrawMode( DC, GR_COPY ); GRSetDrawMode( DC, GR_COPY );
if( m_Parent->m_Draw_Grid ) if( m_Parent->IsGridVisible() )
DrawGrid( DC ); DrawGrid( DC );
/* Draw axis */ /* Draw axis */
...@@ -789,7 +789,7 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC ) ...@@ -789,7 +789,7 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC )
#endif #endif
m_Parent->PutOnGrid( &org ); m_Parent->PutOnGrid( &org );
GRSetColorPen( DC, g_GridColor ); GRSetColorPen( DC, m_Parent->GetGridColor() );
int xpos, ypos; int xpos, ypos;
...@@ -842,7 +842,7 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC ) ...@@ -842,7 +842,7 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC )
tmpDC.SelectObject( tmpBM ); tmpDC.SelectObject( tmpBM );
GRSetColorPen( &tmpDC, g_DrawBgColor ); GRSetColorPen( &tmpDC, g_DrawBgColor );
tmpDC.DrawLine( 0, 0, 0, screenSize.y-1 ); // init background tmpDC.DrawLine( 0, 0, 0, screenSize.y-1 ); // init background
GRSetColorPen( &tmpDC, g_GridColor ); GRSetColorPen( &tmpDC, m_Parent->GetGridColor() );
for( jj = 0; ; jj++ ) // draw grid points for( jj = 0; ; jj++ ) // draw grid points
{ {
yg = wxRound( jj * screen_grid_size.y ); yg = wxRound( jj * screen_grid_size.y );
......
common/drawtxt.cpp
View file @ a61b48ec
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#endif #endif
#define EDA_DRAWBASE #define EDA_DRAWBASE
#include "hershey_fonts.h" #include "newstroke_font.h"
#include "plot_common.h" #include "plot_common.h"
/* factor used to calculate actual size of shapes from hershey fonts (could be adjusted depending on the font name) /* factor used to calculate actual size of shapes from hershey fonts (could be adjusted depending on the font name)
...@@ -122,13 +122,15 @@ static const char* GetHersheyShapeDescription( int AsciiCode ) ...@@ -122,13 +122,15 @@ static const char* GetHersheyShapeDescription( int AsciiCode )
} }
#endif #endif
if ( AsciiCode > 0x7F ) /* calculate font length */
int font_length_max = sizeof(newstroke_font)/sizeof(*newstroke_font);
if ( AsciiCode >= (32 + font_length_max) )
AsciiCode = '?'; AsciiCode = '?';
if( AsciiCode < 32 ) if( AsciiCode < 32 )
AsciiCode = 32; /* Clamp control chars */ AsciiCode = 32; /* Clamp control chars */
AsciiCode -= 32; AsciiCode -= 32;
return hershey_simplex[AsciiCode]; return newstroke_font[AsciiCode];
} }
......
cvpcb/CMakeLists.txt
View file @ a61b48ec
...@@ -21,13 +21,13 @@ set(CVPCB_SRCS ...@@ -21,13 +21,13 @@ set(CVPCB_SRCS
cfg.cpp cfg.cpp
class_cvpcb.cpp class_cvpcb.cpp
class_components_listbox.cpp class_components_listbox.cpp
class_DisplayFootprintsFrame.cpp
class_footprints_listbox.cpp class_footprints_listbox.cpp
cvframe.cpp cvframe.cpp
cvpcb.cpp cvpcb.cpp
dialog_cvpcb_config.cpp dialog_cvpcb_config.cpp
dialog_cvpcb_config_fbp.cpp dialog_cvpcb_config_fbp.cpp
dialog_display_options.cpp dialog_display_options.cpp
displayframe.cpp
dummy_functions.cpp dummy_functions.cpp
genequiv.cpp genequiv.cpp
init.cpp init.cpp
......
cvpcb/displayframe.cpp → cvpcb/class_DisplayFootprintsFrame.cpp
View file @ a61b48ec
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "bitmaps.h" #include "bitmaps.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h" #include "cvstruct.h"
#include "class_DisplayFootprintsFrame.h"
/* /*
* NOTE: There is something in 3d_viewer.h that causes a compiler error in * NOTE: There is something in 3d_viewer.h that causes a compiler error in
...@@ -23,20 +24,20 @@ ...@@ -23,20 +24,20 @@
BEGIN_EVENT_TABLE( WinEDA_DisplayFrame, WinEDA_BasePcbFrame ) BEGIN_EVENT_TABLE( DISPLAY_FOOTPRINTS_FRAME, WinEDA_BasePcbFrame )
EVT_CLOSE( WinEDA_DisplayFrame::OnCloseWindow ) EVT_CLOSE( DISPLAY_FOOTPRINTS_FRAME::OnCloseWindow )
EVT_SIZE( WinEDA_DisplayFrame::OnSize ) EVT_SIZE( DISPLAY_FOOTPRINTS_FRAME::OnSize )
EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_DisplayFrame::OnZoom ) EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, DISPLAY_FOOTPRINTS_FRAME::OnZoom )
EVT_TOOL( ID_OPTIONS_SETUP, WinEDA_DisplayFrame::InstallOptionsDisplay ) EVT_TOOL( ID_OPTIONS_SETUP, DISPLAY_FOOTPRINTS_FRAME::InstallOptionsDisplay )
EVT_TOOL( ID_CVPCB_SHOW3D_FRAME, WinEDA_DisplayFrame::Show3D_Frame ) EVT_TOOL( ID_CVPCB_SHOW3D_FRAME, DISPLAY_FOOTPRINTS_FRAME::Show3D_Frame )
END_EVENT_TABLE() END_EVENT_TABLE()
/***************************************************************************/ /***************************************************************************/
/* WinEDA_DisplayFrame: the frame to display the current focused footprint */ /* DISPLAY_FOOTPRINTS_FRAME: the frame to display the current focused footprint */
/***************************************************************************/ /***************************************************************************/
WinEDA_DisplayFrame::WinEDA_DisplayFrame( WinEDA_CvpcbFrame* father, DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( WinEDA_CvpcbFrame* father,
const wxString& title, const wxString& title,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, long style ) : const wxSize& size, long style ) :
...@@ -109,7 +110,7 @@ WinEDA_DisplayFrame::WinEDA_DisplayFrame( WinEDA_CvpcbFrame* father, ...@@ -109,7 +110,7 @@ WinEDA_DisplayFrame::WinEDA_DisplayFrame( WinEDA_CvpcbFrame* father,
} }
WinEDA_DisplayFrame::~WinEDA_DisplayFrame() DISPLAY_FOOTPRINTS_FRAME::~DISPLAY_FOOTPRINTS_FRAME()
{ {
delete GetBoard(); delete GetBoard();
...@@ -122,7 +123,7 @@ WinEDA_DisplayFrame::~WinEDA_DisplayFrame() ...@@ -122,7 +123,7 @@ WinEDA_DisplayFrame::~WinEDA_DisplayFrame()
/* Called when the frame is closed /* Called when the frame is closed
* Save current settings (frame position and size * Save current settings (frame position and size
*/ */
void WinEDA_DisplayFrame::OnCloseWindow( wxCloseEvent& event ) void DISPLAY_FOOTPRINTS_FRAME::OnCloseWindow( wxCloseEvent& event )
{ {
wxPoint pos; wxPoint pos;
wxSize size; wxSize size;
...@@ -135,14 +136,14 @@ void WinEDA_DisplayFrame::OnCloseWindow( wxCloseEvent& event ) ...@@ -135,14 +136,14 @@ void WinEDA_DisplayFrame::OnCloseWindow( wxCloseEvent& event )
} }
void WinEDA_DisplayFrame::ReCreateVToolbar() void DISPLAY_FOOTPRINTS_FRAME::ReCreateVToolbar()
{ {
// Currently, no vertical right toolbar. // Currently, no vertical right toolbar.
// So do nothing // So do nothing
} }
void WinEDA_DisplayFrame::ReCreateHToolbar() void DISPLAY_FOOTPRINTS_FRAME::ReCreateHToolbar()
{ {
if( m_HToolBar != NULL ) if( m_HToolBar != NULL )
return; return;
...@@ -184,29 +185,29 @@ void WinEDA_DisplayFrame::ReCreateHToolbar() ...@@ -184,29 +185,29 @@ void WinEDA_DisplayFrame::ReCreateHToolbar()
} }
void WinEDA_DisplayFrame::SetToolbars() void DISPLAY_FOOTPRINTS_FRAME::SetToolbars()
{ {
} }
void WinEDA_DisplayFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) void DISPLAY_FOOTPRINTS_FRAME::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
{ {
} }
void WinEDA_DisplayFrame::OnLeftDClick( wxDC* DC, const wxPoint& MousePos ) void DISPLAY_FOOTPRINTS_FRAME::OnLeftDClick( wxDC* DC, const wxPoint& MousePos )
{ {
} }
bool WinEDA_DisplayFrame::OnRightClick( const wxPoint& MousePos, bool DISPLAY_FOOTPRINTS_FRAME::OnRightClick( const wxPoint& MousePos,
wxMenu* PopMenu ) wxMenu* PopMenu )
{ {
return true; return true;
} }
void WinEDA_DisplayFrame::GeneralControle( wxDC* DC, wxPoint Mouse ) void DISPLAY_FOOTPRINTS_FRAME::GeneralControle( wxDC* DC, wxPoint Mouse )
{ {
wxRealPoint delta; wxRealPoint delta;
int flagcurseur = 0; int flagcurseur = 0;
...@@ -325,7 +326,7 @@ void WinEDA_DisplayFrame::GeneralControle( wxDC* DC, wxPoint Mouse ) ...@@ -325,7 +326,7 @@ void WinEDA_DisplayFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
/** /**
* Display 3D frame of current footprint selection. * Display 3D frame of current footprint selection.
*/ */
void WinEDA_DisplayFrame::Show3D_Frame( wxCommandEvent& event ) void DISPLAY_FOOTPRINTS_FRAME::Show3D_Frame( wxCommandEvent& event )
{ {
if( m_Draw3DFrame ) if( m_Draw3DFrame )
{ {
...@@ -347,3 +348,30 @@ void WinEDA_DisplayFrame::Show3D_Frame( wxCommandEvent& event ) ...@@ -347,3 +348,30 @@ void WinEDA_DisplayFrame::Show3D_Frame( wxCommandEvent& event )
void PCB_SCREEN::ClearUndoORRedoList(UNDO_REDO_CONTAINER&, int ) void PCB_SCREEN::ClearUndoORRedoList(UNDO_REDO_CONTAINER&, int )
{ {
} }
/** Function IsGridVisible() , virtual
* @return true if the grid must be shown
*/
bool DISPLAY_FOOTPRINTS_FRAME::IsGridVisible()
{
return true;
}
/** Function SetGridVisibility() , virtual
* It may be overloaded by derived classes
* if you want to store/retrieve the grid visiblity in configuration.
* @param aVisible = true if the grid must be shown
*/
void DISPLAY_FOOTPRINTS_FRAME::SetGridVisibility(bool aVisible)
{
// Currently do nothing because there is no option to hide/show grid
}
/** Function GetGridColor() , virtual
* @return the color of the grid
*/
int DISPLAY_FOOTPRINTS_FRAME::GetGridColor()
{
return DARKGRAY;
}
cvpcb/class_DisplayFootprintsFrame.h 0 → 100644
View file @ a61b48ec
/* class_DisplayFootprintsFrame.h */
/*******************************************************/
/* class DISPLAY_FOOTPRINTS_FRAME: used to display footprints */
/*******************************************************/
class DISPLAY_FOOTPRINTS_FRAME : public WinEDA_BasePcbFrame
{
public:
public:
DISPLAY_FOOTPRINTS_FRAME( WinEDA_CvpcbFrame* father,
const wxString& title,
const wxPoint& pos, const wxSize& size,
long style = KICAD_DEFAULT_DRAWFRAME_STYLE );
~DISPLAY_FOOTPRINTS_FRAME();
void OnCloseWindow( wxCloseEvent& Event );
void RedrawActiveWindow( wxDC* DC, bool EraseBg );
void ReCreateHToolbar();
void ReCreateVToolbar();
void RecreateMenuBar();
/** Function IsGridVisible() , virtual
* @return true if the grid must be shown
*/
virtual bool IsGridVisible();
/** Function SetGridVisibility() , virtual
* It may be overloaded by derived classes
* if you want to store/retrieve the grid visiblity in configuration.
* @param aVisible = true if the grid must be shown
*/
virtual void SetGridVisibility(bool aVisible);
/** Function GetGridColor() , virtual
* @return the color of the grid
*/
virtual int GetGridColor();
void OnLeftClick( wxDC* DC, const wxPoint& MousePos );
void OnLeftDClick( wxDC* DC, const wxPoint& MousePos );
bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu );
void SetToolbars();
void GeneralControle( wxDC* DC, wxPoint Mouse );
void InstallOptionsDisplay( wxCommandEvent& event );
MODULE* Get_Module( const wxString& CmpName );
void Process_Settings( wxCommandEvent& event );
void Show3D_Frame( wxCommandEvent& event );
/* SaveCopyInUndoList() virtual
* currently: do nothing in cvpcb.
* but but be defined because it is a pure virtual in WinEDA_BasePcbFrame
*/
virtual void SaveCopyInUndoList( BOARD_ITEM* aItemToCopy,
UndoRedoOpType aTypeCommand = UR_UNSPECIFIED,
const wxPoint& aTransformPoint = wxPoint( 0, 0 ) )
{
}
/** Function SaveCopyInUndoList (overloaded).
* Creates a new entry in undo list of commands.
* add a list of pickers to handle a list of items
* @param aItemsList = the list of items modified by the command to undo
* @param aTypeCommand = command type (see enum UndoRedoOpType)
* @param aTransformPoint = the reference point of the transformation,
* for commands like move
*/
virtual void SaveCopyInUndoList( PICKED_ITEMS_LIST& aItemsList,
UndoRedoOpType aTypeCommand,
const wxPoint& aTransformPoint = wxPoint( 0, 0 ) )
{
// currently: do nothing in cvpcb.
}
DECLARE_EVENT_TABLE()
};
cvpcb/cvframe.cpp
View file @ a61b48ec
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "protos.h" #include "protos.h"
#include "cvstruct.h" #include "cvstruct.h"
#include "dialog_cvpcb_config.h" #include "dialog_cvpcb_config.h"
#include "class_DisplayFootprintsFrame.h"
#include "build_version.h" #include "build_version.h"
......
cvpcb/cvstruct.h
View file @ a61b48ec
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
/* Forward declarations of all top-level window classes. */ /* Forward declarations of all top-level window classes. */
class FOOTPRINTS_LISTBOX; class FOOTPRINTS_LISTBOX;
class COMPONENTS_LISTBOX; class COMPONENTS_LISTBOX;
class WinEDA_DisplayFrame; class DISPLAY_FOOTPRINTS_FRAME;
#include "id.h" #include "id.h"
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
bool m_KeepCvpcbOpen; bool m_KeepCvpcbOpen;
FOOTPRINTS_LISTBOX* m_FootprintList; FOOTPRINTS_LISTBOX* m_FootprintList;
COMPONENTS_LISTBOX* m_ListCmp; COMPONENTS_LISTBOX* m_ListCmp;
WinEDA_DisplayFrame* DrawFrame; DISPLAY_FOOTPRINTS_FRAME* DrawFrame;
WinEDA_Toolbar* m_HToolBar; WinEDA_Toolbar* m_HToolBar;
wxFileName m_NetlistFileName; wxFileName m_NetlistFileName;
wxArrayString m_ModuleLibNames; wxArrayString m_ModuleLibNames;
...@@ -219,67 +219,4 @@ public: ...@@ -219,67 +219,4 @@ public:
}; };
/*******************************************************/
/* class WinEDA_DisplayFrame: used to display footprints */
/*******************************************************/
class WinEDA_DisplayFrame : public WinEDA_BasePcbFrame
{
public:
public:
WinEDA_DisplayFrame( WinEDA_CvpcbFrame* father,
const wxString& title,
const wxPoint& pos, const wxSize& size,
long style = KICAD_DEFAULT_DRAWFRAME_STYLE );
~WinEDA_DisplayFrame();
void OnCloseWindow( wxCloseEvent& Event );
void RedrawActiveWindow( wxDC* DC, bool EraseBg );
void ReCreateHToolbar();
void ReCreateVToolbar();
void RecreateMenuBar();
void OnLeftClick( wxDC* DC, const wxPoint& MousePos );
void OnLeftDClick( wxDC* DC, const wxPoint& MousePos );
bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu );
void SetToolbars();
void GeneralControle( wxDC* DC, wxPoint Mouse );
void InstallOptionsDisplay( wxCommandEvent& event );
MODULE* Get_Module( const wxString& CmpName );
void Process_Settings( wxCommandEvent& event );
void Show3D_Frame( wxCommandEvent& event );
/* SaveCopyInUndoList() virtual
* currently: do nothing in cvpcb.
* but but be defined because it is a pure virtual in WinEDA_BasePcbFrame
*/
virtual void SaveCopyInUndoList( BOARD_ITEM* aItemToCopy,
UndoRedoOpType aTypeCommand = UR_UNSPECIFIED,
const wxPoint& aTransformPoint = wxPoint( 0, 0 ) )
{
}
/** Function SaveCopyInUndoList (overloaded).
* Creates a new entry in undo list of commands.
* add a list of pickers to handle a list of items
* @param aItemsList = the list of items modified by the command to undo
* @param aTypeCommand = command type (see enum UndoRedoOpType)
* @param aTransformPoint = the reference point of the transformation,
* for commands like move
*/
virtual void SaveCopyInUndoList( PICKED_ITEMS_LIST& aItemsList,
UndoRedoOpType aTypeCommand,
const wxPoint& aTransformPoint = wxPoint( 0, 0 ) )
{
// currently: do nothing in cvpcb.
}
DECLARE_EVENT_TABLE()
};
#endif //#ifndef CVSTRUCT_H #endif //#ifndef CVSTRUCT_H
cvpcb/dialog_display_options.cpp
View file @ a61b48ec
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "protos.h" #include "protos.h"
#include "class_drawpanel.h" #include "class_drawpanel.h"
#include "cvstruct.h" #include "cvstruct.h"
#include "class_DisplayFootprintsFrame.h"
#include "dialog_display_options.h" #include "dialog_display_options.h"
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
////@end XPM images ////@end XPM images
void WinEDA_DisplayFrame::InstallOptionsDisplay( wxCommandEvent& event ) void DISPLAY_FOOTPRINTS_FRAME::InstallOptionsDisplay( wxCommandEvent& event )
{ {
WinEDA_FootprintDisplayOptionsFrame* OptionWindow = WinEDA_FootprintDisplayOptionsFrame* OptionWindow =
new WinEDA_FootprintDisplayOptionsFrame( this ); new WinEDA_FootprintDisplayOptionsFrame( this );
......
cvpcb/loadcmp.cpp
View file @ a61b48ec
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "cvpcb.h" #include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h" #include "cvstruct.h"
#include "class_DisplayFootprintsFrame.h"
/** /**
...@@ -24,7 +25,7 @@ ...@@ -24,7 +25,7 @@
* @param CmpName - Module name * @param CmpName - Module name
* @return - Module if found otherwise NULL. * @return - Module if found otherwise NULL.
*/ */
MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName ) MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& CmpName )
{ {
int LineNum, Found = 0; int LineNum, Found = 0;
unsigned ii; unsigned ii;
......
cvpcb/setvisu.cpp
View file @ a61b48ec
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "cvpcb.h" #include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h" #include "cvstruct.h"
#include "class_DisplayFootprintsFrame.h"
/* /*
* NOTE: There is something in 3d_viewer.h that causes a compiler error in * NOTE: There is something in 3d_viewer.h that causes a compiler error in
...@@ -33,7 +34,7 @@ void WinEDA_CvpcbFrame::CreateScreenCmp() ...@@ -33,7 +34,7 @@ void WinEDA_CvpcbFrame::CreateScreenCmp()
if( DrawFrame == NULL ) if( DrawFrame == NULL )
{ {
DrawFrame = new WinEDA_DisplayFrame( this, _( "Module" ), DrawFrame = new DISPLAY_FOOTPRINTS_FRAME( this, _( "Module" ),
wxPoint( 0, 0 ), wxPoint( 0, 0 ),
wxSize( 600, 400 ), wxSize( 600, 400 ),
KICAD_DEFAULT_DRAWFRAME_STYLE | KICAD_DEFAULT_DRAWFRAME_STYLE |
...@@ -85,7 +86,7 @@ void WinEDA_CvpcbFrame::CreateScreenCmp() ...@@ -85,7 +86,7 @@ void WinEDA_CvpcbFrame::CreateScreenCmp()
/* /*
* Draws the current highlighted footprint. * Draws the current highlighted footprint.
*/ */
void WinEDA_DisplayFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg ) void DISPLAY_FOOTPRINTS_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg )
{ {
if( !GetBoard() ) if( !GetBoard() )
return; return;
......
eeschema/eelayer.cpp
View file @ a61b48ec
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
#include "eelayer.h" // Header file associated with this file #include "eelayer.h" // Header file associated with this file
// Local variables: // Local variables:
int CurrentColor[NB_BUTT]; // Holds color for each layer while dialog box open static int CurrentColor[NB_BUTT]; // Holds color for each layer while dialog box open
IMPLEMENT_DYNAMIC_CLASS( WinEDA_SetColorsFrame, wxDialog ) IMPLEMENT_DYNAMIC_CLASS( WinEDA_SetColorsFrame, wxDialog )
...@@ -35,7 +34,7 @@ END_EVENT_TABLE() ...@@ -35,7 +34,7 @@ END_EVENT_TABLE()
/**************************************************************/ /**************************************************************/
void DisplayColorSetupFrame( WinEDA_DrawFrame* parent, void DisplayColorSetupFrame( WinEDA_SchematicFrame* parent,
const wxPoint& framepos ) const wxPoint& framepos )
{ {
/**************************************************************/ /**************************************************************/
...@@ -56,7 +55,7 @@ WinEDA_SetColorsFrame::WinEDA_SetColorsFrame() ...@@ -56,7 +55,7 @@ WinEDA_SetColorsFrame::WinEDA_SetColorsFrame()
// Standard Constructor // Standard Constructor
WinEDA_SetColorsFrame::WinEDA_SetColorsFrame( WinEDA_DrawFrame* parent, WinEDA_SetColorsFrame::WinEDA_SetColorsFrame( WinEDA_SchematicFrame* parent,
const wxPoint& framepos ) const wxPoint& framepos )
{ {
m_Parent = parent; m_Parent = parent;
...@@ -224,7 +223,7 @@ void WinEDA_SetColorsFrame::CreateControls() ...@@ -224,7 +223,7 @@ void WinEDA_SetColorsFrame::CreateControls()
m_ShowGrid = m_ShowGrid =
new wxCheckBox( this, ID_CHECKBOX_SHOW_GRID, _( "Grid" ), new wxCheckBox( this, ID_CHECKBOX_SHOW_GRID, _( "Grid" ),
wxDefaultPosition, wxDefaultSize, 0 ); wxDefaultPosition, wxDefaultSize, 0 );
m_ShowGrid->SetValue( m_Parent->m_Draw_Grid ); m_ShowGrid->SetValue( m_Parent->IsGridVisible() );
RowBoxSizer->Add( m_ShowGrid, RowBoxSizer->Add( m_ShowGrid,
1, 1,
wxALIGN_CENTER_VERTICAL | wxBOTTOM, wxALIGN_CENTER_VERTICAL | wxBOTTOM,
...@@ -283,32 +282,6 @@ void WinEDA_SetColorsFrame::CreateControls() ...@@ -283,32 +282,6 @@ void WinEDA_SetColorsFrame::CreateControls()
} }
/**********************************************************/
bool WinEDA_SetColorsFrame::ShowToolTips()
{
/**********************************************************/
return true;
}
/**********************************************************/
wxBitmap WinEDA_SetColorsFrame::GetBitmapResource( const wxString& name )
{
/**********************************************************/
wxUnusedVar( name );
return wxNullBitmap;
}
/**********************************************************/
wxIcon WinEDA_SetColorsFrame::GetIconResource( const wxString& name )
{
/**********************************************************/
wxUnusedVar( name );
return wxNullIcon;
}
/**********************************************************/ /**********************************************************/
void WinEDA_SetColorsFrame::SetColor( wxCommandEvent& event ) void WinEDA_SetColorsFrame::SetColor( wxCommandEvent& event )
{ {
...@@ -367,7 +340,7 @@ void WinEDA_SetColorsFrame::UpdateLayerSettings() ...@@ -367,7 +340,7 @@ void WinEDA_SetColorsFrame::UpdateLayerSettings()
// The previous command compiles OK, but to prevent a warning // The previous command compiles OK, but to prevent a warning
// from being generated when the Linux version is being compiled, // from being generated when the Linux version is being compiled,
// the next two commands are provided instead. // the next two commands are provided instead.
m_Parent->m_Draw_Grid = m_ShowGrid->GetValue(); m_Parent->SetGridVisibility( m_ShowGrid->GetValue() );
// Update color of background // Update color of background
if( m_SelBgColor->GetSelection() == 0 ) if( m_SelBgColor->GetSelection() == 0 )
......
eeschema/eelayer.h
View file @ a61b48ec
...@@ -205,13 +205,6 @@ static ColorButton Layer_Erc_Error_Item = ...@@ -205,13 +205,6 @@ static ColorButton Layer_Erc_Error_Item =
}; };
static ColorButton Layer_Grid_Item =
{
_( "Grid" ), // Title
&g_GridColor // Adr of optional parameter
};
static ColorButton* laytool_list[NB_BUTT] = { static ColorButton* laytool_list[NB_BUTT] = {
&Layer_Wire_Item, &Layer_Wire_Item,
&Layer_Bus_Item, &Layer_Bus_Item,
...@@ -239,8 +232,6 @@ static ColorButton* laytool_list[NB_BUTT] = { ...@@ -239,8 +232,6 @@ static ColorButton* laytool_list[NB_BUTT] = {
&Layer_Erc_Warning_Item, &Layer_Erc_Warning_Item,
&Layer_Erc_Error_Item, &Layer_Erc_Error_Item,
&Layer_Grid_Item
}; };
...@@ -294,7 +285,7 @@ private: ...@@ -294,7 +285,7 @@ private:
DECLARE_DYNAMIC_CLASS( WinEDA_SetColorsFrame ) DECLARE_DYNAMIC_CLASS( WinEDA_SetColorsFrame )
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
WinEDA_DrawFrame* m_Parent; WinEDA_SchematicFrame* m_Parent;
wxBoxSizer* OuterBoxSizer; wxBoxSizer* OuterBoxSizer;
wxBoxSizer* MainBoxSizer; wxBoxSizer* MainBoxSizer;
wxBoxSizer* ColumnBoxSizer; wxBoxSizer* ColumnBoxSizer;
...@@ -334,7 +325,7 @@ private: ...@@ -334,7 +325,7 @@ private:
public: public:
// Constructors and destructor // Constructors and destructor
WinEDA_SetColorsFrame(); WinEDA_SetColorsFrame();
WinEDA_SetColorsFrame( WinEDA_DrawFrame* parent, const wxPoint& framepos ); WinEDA_SetColorsFrame( WinEDA_SchematicFrame* parent, const wxPoint& framepos );
~WinEDA_SetColorsFrame(); ~WinEDA_SetColorsFrame();
}; };
......
eeschema/eeschema_config.cpp
View file @ a61b48ec
...@@ -120,7 +120,7 @@ void WinEDA_SchematicFrame::OnSetOptions( wxCommandEvent& event ) ...@@ -120,7 +120,7 @@ void WinEDA_SchematicFrame::OnSetOptions( wxCommandEvent& event )
dlg.SetRepeatHorizontal( g_RepeatStep.x ); dlg.SetRepeatHorizontal( g_RepeatStep.x );
dlg.SetRepeatVertical( g_RepeatStep.y ); dlg.SetRepeatVertical( g_RepeatStep.y );
dlg.SetRepeatLabel( g_RepeatDeltaLabel ); dlg.SetRepeatLabel( g_RepeatDeltaLabel );
dlg.SetShowGrid( m_Draw_Grid ); dlg.SetShowGrid( IsGridVisible() );
dlg.SetShowHiddenPins( m_ShowAllPins ); dlg.SetShowHiddenPins( m_ShowAllPins );
dlg.SetEnableAutoPan( DrawPanel->m_AutoPAN_Enable ); dlg.SetEnableAutoPan( DrawPanel->m_AutoPAN_Enable );
dlg.SetEnableAnyBusOrientation( g_HVLines ); dlg.SetEnableAnyBusOrientation( g_HVLines );
...@@ -140,7 +140,7 @@ void WinEDA_SchematicFrame::OnSetOptions( wxCommandEvent& event ) ...@@ -140,7 +140,7 @@ void WinEDA_SchematicFrame::OnSetOptions( wxCommandEvent& event )
g_RepeatStep.x = dlg.GetRepeatHorizontal(); g_RepeatStep.x = dlg.GetRepeatHorizontal();
g_RepeatStep.y = dlg.GetRepeatVertical(); g_RepeatStep.y = dlg.GetRepeatVertical();
g_RepeatDeltaLabel = dlg.GetRepeatLabel(); g_RepeatDeltaLabel = dlg.GetRepeatLabel();
m_Draw_Grid = dlg.GetShowGrid(); SetGridVisibility( dlg.GetShowGrid() );
m_ShowAllPins = dlg.GetShowHiddenPins(); m_ShowAllPins = dlg.GetShowHiddenPins();
DrawPanel->m_AutoPAN_Enable = dlg.GetEnableAutoPan(); DrawPanel->m_AutoPAN_Enable = dlg.GetEnableAutoPan();
g_HVLines = dlg.GetEnableAnyBusOrientation(); g_HVLines = dlg.GetEnableAnyBusOrientation();
...@@ -437,9 +437,6 @@ PARAM_CFG_ARRAY& WinEDA_SchematicFrame::GetConfigurationSettings( void ) ...@@ -437,9 +437,6 @@ PARAM_CFG_ARRAY& WinEDA_SchematicFrame::GetConfigurationSettings( void )
m_configSettings.push_back( new PARAM_CFG_SETCOLOR( true, wxT( "ColorErcE" ), m_configSettings.push_back( new PARAM_CFG_SETCOLOR( true, wxT( "ColorErcE" ),
&g_LayerDescr.LayerColor[LAYER_ERC_ERR], &g_LayerDescr.LayerColor[LAYER_ERC_ERR],
RED ) ); RED ) );
m_configSettings.push_back( new PARAM_CFG_SETCOLOR( true, wxT( "ColorGrid" ),
&g_GridColor,
DARKDARKGRAY ) );
return m_configSettings; return m_configSettings;
} }
......
eeschema/libframe.cpp
View file @ a61b48ec
...@@ -163,7 +163,6 @@ WinEDA_LibeditFrame::WinEDA_LibeditFrame( wxWindow* father, ...@@ -163,7 +163,6 @@ WinEDA_LibeditFrame::WinEDA_LibeditFrame( wxWindow* father,
{ {
m_FrameName = wxT( "LibeditFrame" ); m_FrameName = wxT( "LibeditFrame" );
m_Draw_Axis = true; // true to draw axis m_Draw_Axis = true; // true to draw axis
m_Draw_Grid = true; // true to draw grid
m_ConfigPath = wxT( "LibraryEditor" ); m_ConfigPath = wxT( "LibraryEditor" );
SetShowDeMorgan( false ); SetShowDeMorgan( false );
m_drawSpecificConvert = true; m_drawSpecificConvert = true;
......
eeschema/protos.h
View file @ a61b48ec
...@@ -158,7 +158,7 @@ void RedrawOneStruct( WinEDA_DrawPanel* panel, ...@@ -158,7 +158,7 @@ void RedrawOneStruct( WinEDA_DrawPanel* panel,
/**************/ /**************/
void SeedLayers(); void SeedLayers();
EDA_Colors ReturnLayerColor( int Layer ); EDA_Colors ReturnLayerColor( int Layer );
void DisplayColorSetupFrame( WinEDA_DrawFrame* parent, void DisplayColorSetupFrame( WinEDA_SchematicFrame* parent,
const wxPoint& pos ); const wxPoint& pos );
/*************/ /*************/
......
eeschema/schframe.cpp
View file @ a61b48ec
...@@ -519,9 +519,9 @@ void WinEDA_SchematicFrame::OnUpdateUnits( wxUpdateUIEvent& event ) ...@@ -519,9 +519,9 @@ void WinEDA_SchematicFrame::OnUpdateUnits( wxUpdateUIEvent& event )
void WinEDA_SchematicFrame::OnUpdateGrid( wxUpdateUIEvent& event ) void WinEDA_SchematicFrame::OnUpdateGrid( wxUpdateUIEvent& event )
{ {
wxString tool_tip = m_Draw_Grid ? _( "Hide grid" ) : _( "Show grid" ); wxString tool_tip = IsGridVisible() ? _( "Hide grid" ) : _( "Show grid" );
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID, m_Draw_Grid ); m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID, IsGridVisible() );
m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_GRID, tool_tip ); m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_GRID, tool_tip );
} }
......
eeschema/tool_sch.cpp
View file @ a61b48ec
...@@ -291,7 +291,7 @@ void WinEDA_SchematicFrame::OnSelectOptionToolbar( wxCommandEvent& event ) ...@@ -291,7 +291,7 @@ void WinEDA_SchematicFrame::OnSelectOptionToolbar( wxCommandEvent& event )
switch( id ) switch( id )
{ {
case ID_TB_OPTIONS_SHOW_GRID: case ID_TB_OPTIONS_SHOW_GRID:
m_Draw_Grid = m_OptionsToolBar->GetToolState( id ); SetGridVisibility( m_OptionsToolBar->GetToolState( id ) );
DrawPanel->Refresh(); DrawPanel->Refresh();
break; break;
......
gerbview/gerberframe.cpp
View file @ a61b48ec
...@@ -292,7 +292,7 @@ void WinEDA_GerberFrame::SetToolbars() ...@@ -292,7 +292,7 @@ void WinEDA_GerberFrame::SetToolbars()
DisplayOpt.DisplayPolarCood ); DisplayOpt.DisplayPolarCood );
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID, m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID,
m_Draw_Grid ); IsGridVisible() );
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SELECT_CURSOR, m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SELECT_CURSOR,
m_CursorShape ); m_CursorShape );
......
gerbview/gerbview_config.h
View file @ a61b48ec
...@@ -337,15 +337,6 @@ static PARAM_CFG_SETCOLOR ColorLayer31Cfg ...@@ -337,15 +337,6 @@ static PARAM_CFG_SETCOLOR ColorLayer31Cfg
7 7
); );
static PARAM_CFG_SETCOLOR ColorpcbGrilleCfg
(
INSETUP,
wxT("CoPcbGr"),
&g_GridColor,
DARKGRAY
);
static PARAM_CFG_SETCOLOR ColorDCodesCfg static PARAM_CFG_SETCOLOR ColorDCodesCfg
( (
INSETUP, INSETUP,
...@@ -421,7 +412,6 @@ PARAM_CFG_BASE * ParamCfgList[] = ...@@ -421,7 +412,6 @@ PARAM_CFG_BASE * ParamCfgList[] =
& ColorLayer29Cfg, & ColorLayer29Cfg,
& ColorLayer30Cfg, & ColorLayer30Cfg,
& ColorLayer31Cfg, & ColorLayer31Cfg,
& ColorpcbGrilleCfg,
& ColorDCodesCfg, & ColorDCodesCfg,
& GERBERSpotMiniCfg, & GERBERSpotMiniCfg,
& TimeOutCfg, & TimeOutCfg,
......
gerbview/options.cpp
View file @ a61b48ec
...@@ -29,7 +29,7 @@ void WinEDA_GerberFrame::OnSelectOptionToolbar( wxCommandEvent& event ) ...@@ -29,7 +29,7 @@ void WinEDA_GerberFrame::OnSelectOptionToolbar( wxCommandEvent& event )
switch( id ) switch( id )
{ {
case ID_TB_OPTIONS_SHOW_GRID: case ID_TB_OPTIONS_SHOW_GRID:
m_Draw_Grid = m_OptionsToolBar->GetToolState( id ); SetGridVisibility( m_OptionsToolBar->GetToolState( id ) );
DrawPanel->Refresh( TRUE ); DrawPanel->Refresh( TRUE );
break; break;
......
gerbview/set_color.cpp
View file @ a61b48ec
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
// variable used to handle grid visibility: // variable used to handle grid visibility:
bool s_showGrid; bool s_showGrid;
int s_gridColor;
#include "set_color.h" // Header file associated with this file #include "set_color.h" // Header file associated with this file
...@@ -132,7 +133,8 @@ void WinEDA_SetColorsFrame::CreateControls() ...@@ -132,7 +133,8 @@ void WinEDA_SetColorsFrame::CreateControls()
// Add various items to the dialog box, as determined by the // Add various items to the dialog box, as determined by the
// details of each element contained within laytool_list[] // details of each element contained within laytool_list[]
s_showGrid = m_Parent->m_Draw_Grid; s_showGrid = m_Parent->IsGridVisible();
s_gridColor = m_Parent->GetGridColor();
for( lyr = 0, cln = 0; lyr < NB_BUTT; lyr++ ) for( lyr = 0, cln = 0; lyr < NB_BUTT; lyr++ )
{ {
// Look for the first set of controls within each column. // Look for the first set of controls within each column.
...@@ -435,14 +437,15 @@ void WinEDA_SetColorsFrame::UpdateLayerSettings() ...@@ -435,14 +437,15 @@ void WinEDA_SetColorsFrame::UpdateLayerSettings()
// actually has been provided for each of those layers.) // actually has been provided for each of those layers.)
g_GridColor = CurrentColor[32]; s_gridColor = CurrentColor[32];
s_showGrid = laytool_list[32]->m_CheckBox->GetValue(); s_showGrid = laytool_list[32]->m_CheckBox->GetValue();
g_ColorsSettings.SetItemColor(DCODES_VISIBLE, CurrentColor[33] ); g_ColorsSettings.SetItemColor(DCODES_VISIBLE, CurrentColor[33] );
DisplayOpt.DisplayPadNum = laytool_list[33]->m_CheckBox->GetValue(); DisplayOpt.DisplayPadNum = laytool_list[33]->m_CheckBox->GetValue();
// Additional command required for updating visibility of grid. // Additional command required for updating visibility of grid.
m_Parent->m_Draw_Grid = s_showGrid; m_Parent->SetGridVisibility( s_showGrid );
m_Parent->SetGridColor( s_gridColor );
} }
......
gerbview/set_color.h
View file @ a61b48ec
...@@ -319,7 +319,7 @@ static ButtonIndex Msg_Others_Items = ...@@ -319,7 +319,7 @@ static ButtonIndex Msg_Others_Items =
static ColorButton Grid_Butt= static ColorButton Grid_Butt=
{ {
_("Grid"), // Title _("Grid"), // Title
&g_GridColor, // Address of optional parameter &s_gridColor, // Address of optional parameter
FALSE, FALSE,
&s_showGrid // Address of boolean display control parameter to toggle &s_showGrid // Address of boolean display control parameter to toggle
}; };
......
include/common.h
View file @ a61b48ec
...@@ -182,9 +182,6 @@ extern int g_UnitMetric; // display units mm = 1, inches = 0, cm = 2 ...@@ -182,9 +182,6 @@ extern int g_UnitMetric; // display units mm = 1, inches = 0, cm = 2
/* Draw color for moving objects: */ /* Draw color for moving objects: */
extern int g_GhostColor; extern int g_GhostColor;
/* Draw color for grid: */
extern int g_GridColor;
/* Current used screen: (not used in eeshema)*/ /* Current used screen: (not used in eeshema)*/
extern BASE_SCREEN* ActiveScreen; extern BASE_SCREEN* ActiveScreen;
......
include/newstroke_font.h 0 → 100644
View file @ a61b48ec
This source diff could not be displayed because it is too large. You can view the blob instead.
include/wxEeschemaStruct.h
View file @ a61b48ec
...@@ -73,7 +73,6 @@ private: ...@@ -73,7 +73,6 @@ private:
PARAM_CFG_ARRAY m_projectFileParams; PARAM_CFG_ARRAY m_projectFileParams;
PARAM_CFG_ARRAY m_configSettings; PARAM_CFG_ARRAY m_configSettings;
public: public:
WinEDA_SchematicFrame( wxWindow* father, WinEDA_SchematicFrame( wxWindow* father,
const wxString& title, const wxString& title,
......
include/wxPcbStruct.h
View file @ a61b48ec
...@@ -148,6 +148,28 @@ public: ...@@ -148,6 +148,28 @@ public:
void GetKicadAbout( wxCommandEvent& event ); void GetKicadAbout( wxCommandEvent& event );
/** Function IsGridVisible() , virtual
* @return true if the grid must be shown
*/
virtual bool IsGridVisible();
/** Function SetGridVisibility() , virtual
* It may be overloaded by derived classes
* if you want to store/retrieve the grid visiblity in configuration.
* @param aVisible = true if the grid must be shown
*/
virtual void SetGridVisibility(bool aVisible);
/** Function GetGridColor() , virtual
* @return the color of the grid
*/
virtual int GetGridColor();
/** Function SetGridColor() , virtual
* @param aColor = the new color of the grid
*/
virtual void SetGridColor(int aColor);
// Configurations: // Configurations:
void InstallConfigFrame( const wxPoint& pos ); void InstallConfigFrame( const wxPoint& pos );
void Process_Config( wxCommandEvent& event ); void Process_Config( wxCommandEvent& event );
......
include/wxstruct.h
View file @ a61b48ec
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <wx/aui/aui.h> #include <wx/aui/aui.h>
#endif #endif
#include "colors.h"
//C++ guarantees that operator delete checks its argument for null-ness //C++ guarantees that operator delete checks its argument for null-ness
#ifndef SAFE_DELETE #ifndef SAFE_DELETE
...@@ -175,7 +176,6 @@ public: ...@@ -175,7 +176,6 @@ public:
int m_UnitType; // Internal Unit type (0 = inch) int m_UnitType; // Internal Unit type (0 = inch)
bool m_Draw_Axis; // TRUE to show X and Y axis bool m_Draw_Axis; // TRUE to show X and Y axis
bool m_Draw_Grid; // TRUE to show the grid
bool m_Draw_Sheet_Ref; // TRUE to show frame references bool m_Draw_Sheet_Ref; // TRUE to show frame references
bool m_Print_Sheet_Ref; // TRUE to print frame references bool m_Print_Sheet_Ref; // TRUE to print frame references
...@@ -189,6 +189,8 @@ public: ...@@ -189,6 +189,8 @@ public:
protected: protected:
int m_LastGridSizeId; int m_LastGridSizeId;
bool m_DrawGrid; // hide/Show grid
int m_GridColor; // Grid color
private: private:
BASE_SCREEN* m_CurrentScreen; ///< current used SCREEN BASE_SCREEN* m_CurrentScreen; ///< current used SCREEN
...@@ -233,6 +235,44 @@ public: ...@@ -233,6 +235,44 @@ public:
virtual void SetToolID( int id, int new_cursor_id, virtual void SetToolID( int id, int new_cursor_id,
const wxString& title ); const wxString& title );
/* Thes 4 functions provide a basic way to sho/hide grid
* and /get/set grid color.
* thes parameters are saved in kicad config for each main frame
*/
/** Function IsGridVisible() , virtual
* @return true if the grid must be shown
*/
virtual bool IsGridVisible()
{
return m_DrawGrid;
}
/** Function SetGridVisibility() , virtual
* It may be overloaded by derived classes
* @param aVisible = true if the grid must be shown
*/
virtual void SetGridVisibility(bool aVisible)
{
m_DrawGrid = aVisible;
}
/** Function GetGridColor() , virtual
* @return the color of the grid
*/
virtual int GetGridColor()
{
return m_GridColor;
}
/** Function SetGridColor() , virtual
* @param aColor = the new color of the grid
*/
virtual void SetGridColor(int aColor)
{
m_GridColor = aColor;
}
/** /**
* Command event handler for selecting grid sizes. * Command event handler for selecting grid sizes.
* *
...@@ -682,7 +722,7 @@ public: ...@@ -682,7 +722,7 @@ public:
void SetToolNormalBitmap( int id, const wxBitmap& bitmap ) {}; void SetToolNormalBitmap( int id, const wxBitmap& bitmap ) {};
void SetRows( int nRows ) {}; void SetRows( int nRows ) {};
#endif #endif
/** Function GetDimension /** Function GetDimension
* @return the dimension of this toolbar (Height if horizontal, Width if vertical. * @return the dimension of this toolbar (Height if horizontal, Width if vertical.
*/ */
......
internat/fr/kicad.mo
View file @ a61b48ec
No preview for this file type
internat/fr/kicad.po
View file @ a61b48ec
...@@ -2,8 +2,8 @@ msgid "" ...@@ -2,8 +2,8 @@ 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: 2010-01-27 21:22+0100\n" "POT-Creation-Date: 2010-02-01 11:23+0100\n"
"PO-Revision-Date: 2010-01-28 11:33+0100\n" "PO-Revision-Date: 2010-02-01 11:24+0100\n"
"Last-Translator: \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"
...@@ -299,35 +299,35 @@ msgstr "Filtre Equipot" ...@@ -299,35 +299,35 @@ msgstr "Filtre Equipot"
msgid "List Nets" msgid "List Nets"
msgstr "Liste équipots" msgstr "Liste équipots"
#: pcbnew/autoplac.cpp:104 #: pcbnew/autoplac.cpp:105
msgid "Footprints NOT LOCKED will be moved" msgid "Footprints NOT LOCKED will be moved"
msgstr "Les modules NON FIXES vont être déplacés" msgstr "Les modules NON FIXES vont être déplacés"
#: pcbnew/autoplac.cpp:109 #: pcbnew/autoplac.cpp:110
msgid "Footprints NOT PLACED will be moved" msgid "Footprints NOT PLACED will be moved"
msgstr "Les modules NON PLACES vont être déplacés" msgstr "Les modules NON PLACES vont être déplacés"
#: pcbnew/autoplac.cpp:390 #: pcbnew/autoplac.cpp:391
msgid "No PCB edge found, unknown board size!" msgid "No PCB edge found, unknown board size!"
msgstr "Pas de contour PCB, la taille du PCB est inconnue!" msgstr "Pas de contour PCB, la taille du PCB est inconnue!"
#: pcbnew/autoplac.cpp:413 #: pcbnew/autoplac.cpp:414
msgid "Cols" msgid "Cols"
msgstr "Cols" msgstr "Cols"
#: pcbnew/autoplac.cpp:415 #: pcbnew/autoplac.cpp:416
msgid "Lines" msgid "Lines"
msgstr "Lignes" msgstr "Lignes"
#: pcbnew/autoplac.cpp:417 #: pcbnew/autoplac.cpp:418
msgid "Cells." msgid "Cells."
msgstr "Cells." msgstr "Cells."
#: pcbnew/autoplac.cpp:480 #: pcbnew/autoplac.cpp:481
msgid "Loop" msgid "Loop"
msgstr "Itération" msgstr "Itération"
#: pcbnew/autoplac.cpp:630 #: pcbnew/autoplac.cpp:631
msgid "Ok to abort?" msgid "Ok to abort?"
msgstr "Ok pour abandonner?" msgstr "Ok pour abandonner?"
...@@ -359,7 +359,7 @@ msgstr "Epaisseur Contour" ...@@ -359,7 +359,7 @@ msgstr "Epaisseur Contour"
msgid "Incorrect number, no change" msgid "Incorrect number, no change"
msgstr "Nombre incorrect, pas de changement" msgstr "Nombre incorrect, pas de changement"
#: pcbnew/tool_pcb.cpp:28 #: pcbnew/tool_pcb.cpp:29
msgid "" msgid ""
"Show active layer selections\n" "Show active layer selections\n"
"and select layer pair for route and place via" "and select layer pair for route and place via"
...@@ -367,163 +367,163 @@ msgstr "" ...@@ -367,163 +367,163 @@ msgstr ""
"Affiche sélections couche active\n" "Affiche sélections couche active\n"
"et sélection paire de couches pour routage et placement via" "et sélection paire de couches pour routage et placement via"
#: pcbnew/tool_pcb.cpp:197 #: pcbnew/tool_pcb.cpp:200
msgid "New board" msgid "New board"
msgstr "Nouveau Circuit Imprimé" msgstr "Nouveau Circuit Imprimé"
#: pcbnew/tool_pcb.cpp:199 #: pcbnew/tool_pcb.cpp:202
msgid "Open existing board" msgid "Open existing board"
msgstr "Ouvrir C.I. existant" msgstr "Ouvrir C.I. existant"
#: pcbnew/tool_pcb.cpp:201 #: pcbnew/tool_pcb.cpp:204
msgid "Save board" msgid "Save board"
msgstr "Sauver Circuit Imprimé" msgstr "Sauver Circuit Imprimé"
#: pcbnew/tool_pcb.cpp:205 #: pcbnew/tool_pcb.cpp:208
msgid "Page settings (size, texts)" msgid "Page settings (size, texts)"
msgstr "Ajustage de la feuille de dessin (dimensions, textes)" msgstr "Ajustage de la feuille de dessin (dimensions, textes)"
#: pcbnew/tool_pcb.cpp:210 #: pcbnew/tool_pcb.cpp:213
msgid "Open module editor" msgid "Open module editor"
msgstr "Ouvrir Editeur de modules" msgstr "Ouvrir Editeur de modules"
#: pcbnew/tool_pcb.cpp:214 #: pcbnew/tool_pcb.cpp:217
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:218 #: pcbnew/tool_pcb.cpp:221
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:221 #: pcbnew/tool_pcb.cpp:224
msgid "Paste" msgid "Paste"
msgstr "Copie des éléments sauvegardés" msgstr "Copie des éléments sauvegardés"
#: pcbnew/tool_pcb.cpp:226 #: pcbnew/tool_pcb.cpp:229
msgid "Undo last edition" msgid "Undo last edition"
msgstr "Défait dernière édition" msgstr "Défait dernière édition"
#: pcbnew/tool_pcb.cpp:228 #: pcbnew/tool_pcb.cpp:231
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"
#: pcbnew/tool_pcb.cpp:232 #: pcbnew/tool_pcb.cpp:235
msgid "Print board" msgid "Print board"
msgstr "Imprimer C.I." msgstr "Imprimer C.I."
#: pcbnew/tool_pcb.cpp:234 #: pcbnew/tool_pcb.cpp:237
msgid "Plot (HPGL, PostScript, or GERBER format)" 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:237 #: pcbnew/tool_pcb.cpp:240
msgid "Zoom in" msgid "Zoom in"
msgstr "Zoom +" msgstr "Zoom +"
#: pcbnew/tool_pcb.cpp:242 #: pcbnew/tool_pcb.cpp:245
msgid "Zoom out" msgid "Zoom out"
msgstr "Zoom -" msgstr "Zoom -"
#: pcbnew/tool_pcb.cpp:247 #: pcbnew/tool_pcb.cpp:250
msgid "Redraw view" msgid "Redraw view"
msgstr "Redessin de l'écran" msgstr "Redessin de l'écran"
#: pcbnew/tool_pcb.cpp:252 #: pcbnew/tool_pcb.cpp:255
msgid "Zoom auto" msgid "Zoom auto"
msgstr "Zoom Automatique" msgstr "Zoom Automatique"
#: pcbnew/tool_pcb.cpp:258 #: pcbnew/tool_pcb.cpp:261
msgid "Find components and texts" msgid "Find components and texts"
msgstr "Recherche de composants et textes" msgstr "Recherche de composants et textes"
#: pcbnew/tool_pcb.cpp:266 #: pcbnew/tool_pcb.cpp:269
msgid "Read netlist" msgid "Read netlist"
msgstr "Lire Netliste" msgstr "Lire Netliste"
#: pcbnew/tool_pcb.cpp:268 #: pcbnew/tool_pcb.cpp:271
msgid "Perform design rules check" msgid "Perform design rules check"
msgstr "Exécute le contrôle des règles de conception" msgstr "Exécute le contrôle des règles de conception"
#: pcbnew/tool_pcb.cpp:281 #: pcbnew/tool_pcb.cpp:284
msgid "Manual and automatic move or place of modules" msgid "Manual and automatic move or place of modules"
msgstr "Mode module: déplacements ou placement manuel ou automatique des modules" msgstr "Mode module: déplacements ou placement manuel ou automatique des modules"
#: pcbnew/tool_pcb.cpp:285 #: pcbnew/tool_pcb.cpp:288
msgid "Mode Track and Autorouting" msgid "Mode Track and Autorouting"
msgstr "Mode Pistes et Autoroutage" msgstr "Mode Pistes et Autoroutage"
#: pcbnew/tool_pcb.cpp:291 #: pcbnew/tool_pcb.cpp:294
msgid "Fast access to theWeb Based FreeROUTE advanced router" msgid "Fast access to theWeb Based FreeROUTE advanced router"
msgstr "Acces rapide au routeur avancé FreeROUTE sur le Web" msgstr "Acces rapide au routeur avancé FreeROUTE sur le Web"
#: pcbnew/tool_pcb.cpp:311 #: pcbnew/tool_pcb.cpp:314
msgid "Enable design rule checking" msgid "Enable design rule checking"
msgstr "Active le contrôle des règles de conception" msgstr "Active le contrôle des règles de conception"
#: pcbnew/tool_pcb.cpp:315 #: pcbnew/tool_pcb.cpp:318
msgid "Hide grid" msgid "Hide grid"
msgstr "Ne pas afficher la grille" msgstr "Ne pas afficher la grille"
#: pcbnew/tool_pcb.cpp:318 #: pcbnew/tool_pcb.cpp:321
msgid "Display polar coordinates" msgid "Display polar coordinates"
msgstr "Affichage coord polaires" msgstr "Affichage coord polaires"
#: pcbnew/tool_pcb.cpp:321 #: pcbnew/tool_pcb.cpp:324
msgid "Units in inches" msgid "Units in inches"
msgstr "Unités en pouces" msgstr "Unités en pouces"
#: pcbnew/tool_pcb.cpp:324 #: pcbnew/tool_pcb.cpp:327
msgid "Units in millimeters" msgid "Units in millimeters"
msgstr "Unités en millimètres" msgstr "Unités en millimètres"
#: pcbnew/tool_pcb.cpp:327 #: pcbnew/tool_pcb.cpp:330
msgid "Change cursor shape" msgid "Change cursor shape"
msgstr "Changer la forme du curseur" msgstr "Changer la forme du curseur"
#: pcbnew/tool_pcb.cpp:332 #: pcbnew/tool_pcb.cpp:335
msgid "Show board ratsnest" msgid "Show board ratsnest"
msgstr "Montrer le chevelu général" msgstr "Montrer le chevelu général"
#: pcbnew/tool_pcb.cpp:335 #: pcbnew/tool_pcb.cpp:338
msgid "Show module ratsnest when moving" msgid "Show module ratsnest when moving"
msgstr "Montrer le chevelu du module pendant le déplacement" msgstr "Montrer le chevelu du module pendant le déplacement"
#: pcbnew/tool_pcb.cpp:341 #: pcbnew/tool_pcb.cpp:344
msgid "Enable automatic track deletion" msgid "Enable automatic track deletion"
msgstr "Active l'effacement de piste automatique lorsque l'on recrée une piste." msgstr "Active l'effacement de piste automatique lorsque l'on recrée une piste."
#: pcbnew/tool_pcb.cpp:347 #: pcbnew/tool_pcb.cpp:350
msgid "Show filled areas in zones" msgid "Show filled areas in zones"
msgstr "Afficher les surfaces remplies dans les zones" msgstr "Afficher les surfaces remplies dans les zones"
#: pcbnew/tool_pcb.cpp:352 #: pcbnew/tool_pcb.cpp:355
msgid "Do not show filled areas in zones" msgid "Do not show filled areas in zones"
msgstr "Ne pas afficher les surfaces remplies dans les zones" msgstr "Ne pas afficher les surfaces remplies dans les zones"
#: pcbnew/tool_pcb.cpp:357 #: pcbnew/tool_pcb.cpp:360
msgid "Show outlines of filled areas only in zones" 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:362 #: pcbnew/tool_pcb.cpp:365
msgid "Show pads in outline mode" msgid "Show pads in outline mode"
msgstr "Afficher pastilles en mode contour" msgstr "Afficher pastilles en mode contour"
#: pcbnew/tool_pcb.cpp:366 #: pcbnew/tool_pcb.cpp:369
msgid "Show vias in outline mode" msgid "Show vias in outline mode"
msgstr "Afficher pastilles en mode contour" msgstr "Afficher pastilles en mode contour"
#: pcbnew/tool_pcb.cpp:370 #: pcbnew/tool_pcb.cpp:373
msgid "Show tracks in outline mode" msgid "Show tracks in outline mode"
msgstr "Afficher pistes en mode contour" msgstr "Afficher pistes en mode contour"
#: pcbnew/tool_pcb.cpp:376 #: pcbnew/tool_pcb.cpp:379
msgid "Enable high contrast display mode" msgid "Enable high contrast display mode"
msgstr "Active le mode d'affichage haut contraste" msgstr "Active le mode d'affichage haut contraste"
#: pcbnew/tool_pcb.cpp:387 #: pcbnew/tool_pcb.cpp:390
msgid "Show/hide the layers manager toolbar" msgid "Show/hide the layers manager toolbar"
msgstr "Afficher/cacher le gestionnaire de couches" msgstr "Afficher/cacher le gestionnaire de couches"
#: pcbnew/tool_pcb.cpp:392 #: pcbnew/tool_pcb.cpp:395
msgid "" msgid ""
"Show/hide the toolbar for microwaves tools\n" "Show/hide the toolbar for microwaves tools\n"
" This is a experimental feature (under development)" " This is a experimental feature (under development)"
...@@ -531,87 +531,87 @@ msgstr "" ...@@ -531,87 +531,87 @@ msgstr ""
"Affiche/cache le toolbar vertical auxiliaire pour applications micro-ondes)\n" "Affiche/cache le toolbar vertical auxiliaire pour applications micro-ondes)\n"
"C'est un outil expérimental (en cours de développement)" "C'est un outil expérimental (en cours de développement)"
#: pcbnew/tool_pcb.cpp:417 #: pcbnew/tool_pcb.cpp:420
msgid "Highlight net" msgid "Highlight net"
msgstr "Surbrillance net" msgstr "Surbrillance net"
#: pcbnew/tool_pcb.cpp:422 #: pcbnew/tool_pcb.cpp:425
msgid "Display local ratsnest" msgid "Display local ratsnest"
msgstr "Afficher le chevelu local" msgstr "Afficher le chevelu local"
#: pcbnew/tool_pcb.cpp:428 #: pcbnew/tool_pcb.cpp:431
msgid "Add modules" msgid "Add modules"
msgstr "Addition de Modules" msgstr "Addition de Modules"
#: pcbnew/tool_pcb.cpp:432 #: pcbnew/tool_pcb.cpp:435
msgid "Add tracks and vias" msgid "Add tracks and vias"
msgstr "Ajouter pistes et vias" msgstr "Ajouter pistes et vias"
#: pcbnew/tool_pcb.cpp:436 #: pcbnew/tool_pcb.cpp:439
msgid "Add zones" msgid "Add zones"
msgstr "Addition de Zones" msgstr "Addition de Zones"
#: pcbnew/tool_pcb.cpp:441 #: pcbnew/tool_pcb.cpp:444
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:445 #: pcbnew/tool_pcb.cpp:448
msgid "Add graphic circle" msgid "Add graphic circle"
msgstr "Addition de graphiques (Cercle)" msgstr "Addition de graphiques (Cercle)"
#: pcbnew/tool_pcb.cpp:449 #: pcbnew/tool_pcb.cpp:452
msgid "Add graphic arc" msgid "Add graphic arc"
msgstr "Addition de graphiques (Arc de Cercle)" msgstr "Addition de graphiques (Arc de Cercle)"
#: pcbnew/tool_pcb.cpp:453 #: pcbnew/tool_pcb.cpp:456
msgid "Add text" msgid "Add text"
msgstr "Ajout de Texte" msgstr "Ajout de Texte"
#: pcbnew/tool_pcb.cpp:458 #: pcbnew/tool_pcb.cpp:461
msgid "Add dimension" msgid "Add dimension"
msgstr "Ajout des cotes" msgstr "Ajout des cotes"
#: pcbnew/tool_pcb.cpp:462 #: pcbnew/tool_pcb.cpp:465
msgid "Add layer alignment target" msgid "Add layer alignment target"
msgstr "Ajouter Mire de superposition" msgstr "Ajouter Mire de superposition"
#: pcbnew/tool_pcb.cpp:467 #: pcbnew/tool_pcb.cpp:470
msgid "Delete items" msgid "Delete items"
msgstr "Suppression d'éléments" msgstr "Suppression d'éléments"
#: pcbnew/tool_pcb.cpp:472 #: pcbnew/tool_pcb.cpp:475
msgid "Offset adjust for drill and place files" msgid "Offset adjust for drill and place files"
msgstr "Ajuste offset pour fichier de perçage et placement" msgstr "Ajuste offset pour fichier de perçage et placement"
#: pcbnew/tool_pcb.cpp:494 #: pcbnew/tool_pcb.cpp:497
msgid "Create line of specified length for microwave applications" msgid "Create line of specified length for microwave applications"
msgstr "Création de lignes de longueur spécifiée (pour applications micro-ondes)" msgstr "Création de lignes de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:498 #: pcbnew/tool_pcb.cpp:501
msgid "Create gap of specified length for microwave applications" msgid "Create gap of specified length for microwave applications"
msgstr "Création de gaps de longueur spécifiée (pour applications micro-ondes)" msgstr "Création de gaps de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:504 #: pcbnew/tool_pcb.cpp:507
msgid "Create stub of specified length for microwave applications" msgid "Create stub of specified length for microwave applications"
msgstr "Création de stub de longueur spécifiée (pour applications micro-ondes)" msgstr "Création de stub de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:508 #: pcbnew/tool_pcb.cpp:511
msgid "Create stub (arc) of specified length for microwave applications" msgid "Create stub (arc) of specified length for microwave applications"
msgstr "Création de stub (arc) de longueur spécifiée (pour applications micro-ondes)" msgstr "Création de stub (arc) de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:513 #: pcbnew/tool_pcb.cpp:516
msgid "Create a polynomial shape for microwave applications" msgid "Create a polynomial shape for microwave applications"
msgstr "Création de formes polynomiales (pour applications micro-ondes)" msgstr "Création de formes polynomiales (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:565 #: pcbnew/tool_pcb.cpp:568
msgid "Current NetClass clearance value" msgid "Current NetClass clearance value"
msgstr "Valeur isolation NetClass courante" msgstr "Valeur isolation NetClass courante"
#: pcbnew/tool_pcb.cpp:574 #: pcbnew/tool_pcb.cpp:577
msgid "Name of the current NetClass" msgid "Name of the current NetClass"
msgstr "Nom de la NetClass courante" msgstr "Nom de la NetClass courante"
#: pcbnew/tool_pcb.cpp:583 #: pcbnew/tool_pcb.cpp:586
msgid "" msgid ""
"Auto track width: when starting on an existing track use its width\n" "Auto track width: when starting on an existing track use its width\n"
"otherwise, use current width setting" "otherwise, use current width setting"
...@@ -619,23 +619,23 @@ msgstr "" ...@@ -619,23 +619,23 @@ msgstr ""
"Largeur de piste automatique: si on démarre sur une piste existante, utiliser sa largeur\n" "Largeur de piste automatique: si on démarre sur une piste existante, utiliser sa largeur\n"
" sinon utiliser la largeur courante" " sinon utiliser la largeur courante"
#: pcbnew/tool_pcb.cpp:601 #: pcbnew/tool_pcb.cpp:604
msgid "Auto" msgid "Auto"
msgstr "Auto" msgstr "Auto"
#: pcbnew/tool_pcb.cpp:605 #: pcbnew/tool_pcb.cpp:608
msgid "Zoom " msgid "Zoom "
msgstr "Zoom " msgstr "Zoom "
#: pcbnew/tool_pcb.cpp:627 #: pcbnew/tool_pcb.cpp:630
msgid "Grid" msgid "Grid"
msgstr "Grille" msgstr "Grille"
#: pcbnew/tool_pcb.cpp:646 #: pcbnew/tool_pcb.cpp:649
msgid "User Grid" msgid "User Grid"
msgstr "Grille perso" msgstr "Grille perso"
#: pcbnew/tool_pcb.cpp:760 #: pcbnew/tool_pcb.cpp:763
msgid "+/- to switch" msgid "+/- to switch"
msgstr "+/- pour commuter" msgstr "+/- pour commuter"
...@@ -959,67 +959,67 @@ msgstr "Diamètre uVia en NetClass &lt; limite globale" ...@@ -959,67 +959,67 @@ msgstr "Diamètre uVia en NetClass &lt; limite globale"
msgid "NetClass uVia Drill &lt; global limit" msgid "NetClass uVia Drill &lt; global limit"
msgstr "Diamètre de perçage de uVia en NetClassl &lt; limite globale" msgstr "Diamètre de perçage de uVia en NetClassl &lt; limite globale"
#: pcbnew/class_pad.cpp:482 #: pcbnew/class_pad.cpp:496
msgid "Unknown pad shape" msgid "Unknown pad shape"
msgstr "Forme pad inconnue" msgstr "Forme pad inconnue"
#: pcbnew/class_pad.cpp:564 #: pcbnew/class_pad.cpp:578
msgid "Module" msgid "Module"
msgstr "Module" msgstr "Module"
#: pcbnew/class_pad.cpp:566 #: pcbnew/class_pad.cpp:580
msgid "RefP" msgid "RefP"
msgstr "RefP" msgstr "RefP"
#: pcbnew/class_pad.cpp:569 #: pcbnew/class_pad.cpp:583
msgid "Net" msgid "Net"
msgstr "Net" msgstr "Net"
#: pcbnew/class_pad.cpp:640 #: pcbnew/class_pad.cpp:654
msgid "Non-copper" msgid "Non-copper"
msgstr "Non-cuivre" msgstr "Non-cuivre"
#: pcbnew/class_pad.cpp:648 #: pcbnew/class_pad.cpp:662
msgid " & int" msgid " & int"
msgstr " & int" msgstr " & int"
#: pcbnew/class_pad.cpp:676 #: pcbnew/class_pad.cpp:690
msgid "internal" msgid "internal"
msgstr "interne" msgstr "interne"
#: pcbnew/class_pad.cpp:679 #: pcbnew/class_pad.cpp:693
#: pcbnew/class_pcb_text.cpp:229 #: pcbnew/class_pcb_text.cpp:234
msgid "Layer" msgid "Layer"
msgstr "Couche" msgstr "Couche"
#: pcbnew/class_pad.cpp:689 #: pcbnew/class_pad.cpp:703
#: pcbnew/class_pcb_text.cpp:244 #: pcbnew/class_pcb_text.cpp:249
msgid "H Size" msgid "H Size"
msgstr "Taille H" msgstr "Taille H"
#: pcbnew/class_pad.cpp:692 #: pcbnew/class_pad.cpp:706
#: pcbnew/class_pcb_text.cpp:247 #: pcbnew/class_pcb_text.cpp:252
msgid "V Size" msgid "V Size"
msgstr "Taille V" msgstr "Taille V"
#: pcbnew/class_pad.cpp:697 #: pcbnew/class_pad.cpp:711
msgid "Drill" msgid "Drill"
msgstr "Perçage" msgstr "Perçage"
#: pcbnew/class_pad.cpp:705 #: pcbnew/class_pad.cpp:719
msgid "Drill X / Y" msgid "Drill X / Y"
msgstr "Perçage X/Y" msgstr "Perçage X/Y"
#: pcbnew/class_pad.cpp:716 #: pcbnew/class_pad.cpp:730
#: pcbnew/class_pcb_text.cpp:238 #: pcbnew/class_pcb_text.cpp:243
msgid "Orient" msgid "Orient"
msgstr "Orient" msgstr "Orient"
#: pcbnew/class_pad.cpp:719 #: pcbnew/class_pad.cpp:733
msgid "X Pos" msgid "X Pos"
msgstr "X Pos" msgstr "X Pos"
#: pcbnew/class_pad.cpp:722 #: pcbnew/class_pad.cpp:736
msgid "Y pos" msgid "Y pos"
msgstr "Y pos" msgstr "Y pos"
...@@ -1168,28 +1168,28 @@ msgstr "Le texte est la REFERENCE!" ...@@ -1168,28 +1168,28 @@ msgstr "Le texte est la REFERENCE!"
msgid "Text is VALUE!" msgid "Text is VALUE!"
msgstr "Le texte est la VALEUR!" msgstr "Le texte est la VALEUR!"
#: pcbnew/class_pcb_text.cpp:225 #: pcbnew/class_pcb_text.cpp:230
msgid "COTATION" msgid "COTATION"
msgstr "COTATION" msgstr "COTATION"
#: pcbnew/class_pcb_text.cpp:227 #: pcbnew/class_pcb_text.cpp:232
msgid "PCB Text" msgid "PCB Text"
msgstr "Texte PCB" msgstr "Texte PCB"
#: pcbnew/class_pcb_text.cpp:233 #: pcbnew/class_pcb_text.cpp:238
#: pcbnew/class_pcb_text.cpp:235 #: pcbnew/class_pcb_text.cpp:240
msgid "Mirror" msgid "Mirror"
msgstr "Miroir" msgstr "Miroir"
#: pcbnew/class_pcb_text.cpp:233 #: pcbnew/class_pcb_text.cpp:238
msgid "No" msgid "No"
msgstr "Non" msgstr "Non"
#: pcbnew/class_pcb_text.cpp:235 #: pcbnew/class_pcb_text.cpp:240
msgid "Yes" msgid "Yes"
msgstr "Oui" msgstr "Oui"
#: pcbnew/class_pcb_text.cpp:241 #: pcbnew/class_pcb_text.cpp:246
msgid "Width" msgid "Width"
msgstr "Epaisseur" msgstr "Epaisseur"
...@@ -1467,55 +1467,55 @@ msgstr "Supprimer Net?" ...@@ -1467,55 +1467,55 @@ msgstr "Supprimer Net?"
msgid "Abort routing?" msgid "Abort routing?"
msgstr "Arrêter le routage?" msgstr "Arrêter le routage?"
#: pcbnew/class_zone.cpp:909 #: pcbnew/class_zone.cpp:915
msgid "Zone Outline" msgid "Zone Outline"
msgstr "Contour de Zone" msgstr "Contour de Zone"
#: pcbnew/class_zone.cpp:913 #: pcbnew/class_zone.cpp:919
msgid "(Cutout)" msgid "(Cutout)"
msgstr "(Cutout)" msgstr "(Cutout)"
#: pcbnew/class_zone.cpp:915 #: pcbnew/class_zone.cpp:921
msgid "Type" msgid "Type"
msgstr "Type" msgstr "Type"
#: pcbnew/class_zone.cpp:932 #: pcbnew/class_zone.cpp:938
msgid "Not Found" msgid "Not Found"
msgstr " Non Trouvé" msgstr " Non Trouvé"
#: pcbnew/class_zone.cpp:935 #: pcbnew/class_zone.cpp:941
msgid "NetName" msgid "NetName"
msgstr "NetName" msgstr "NetName"
#: pcbnew/class_zone.cpp:938 #: pcbnew/class_zone.cpp:944
msgid "Non Copper Zone" msgid "Non Copper Zone"
msgstr "Zone non Cuivre" msgstr "Zone non Cuivre"
#: pcbnew/class_zone.cpp:942 #: pcbnew/class_zone.cpp:948
msgid "NetCode" msgid "NetCode"
msgstr "NetCode" msgstr "NetCode"
#: pcbnew/class_zone.cpp:948 #: pcbnew/class_zone.cpp:954
msgid "Corners" msgid "Corners"
msgstr "Sommets" msgstr "Sommets"
#: pcbnew/class_zone.cpp:951 #: pcbnew/class_zone.cpp:957
msgid "Segments" msgid "Segments"
msgstr "Segments" msgstr "Segments"
#: pcbnew/class_zone.cpp:953 #: pcbnew/class_zone.cpp:959
msgid "Polygons" msgid "Polygons"
msgstr "Polygones" msgstr "Polygones"
#: pcbnew/class_zone.cpp:954 #: pcbnew/class_zone.cpp:960
msgid "Fill mode" msgid "Fill mode"
msgstr "Mode de remplissage" msgstr "Mode de remplissage"
#: pcbnew/class_zone.cpp:958 #: pcbnew/class_zone.cpp:964
msgid "Hatch lines" msgid "Hatch lines"
msgstr "Lignes de Hachure" msgstr "Lignes de Hachure"
#: pcbnew/class_zone.cpp:963 #: pcbnew/class_zone.cpp:969
msgid "Corners in DrawList" msgid "Corners in DrawList"
msgstr "Sommets en Liste de dessin" msgstr "Sommets en Liste de dessin"
...@@ -1558,15 +1558,15 @@ msgstr "Ce fichier a été créé par une version plus récente de PCBnew et peu ...@@ -1558,15 +1558,15 @@ msgstr "Ce fichier a été créé par une version plus récente de PCBnew et peu
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:308 #: pcbnew/files.cpp:314
msgid "Save Board File" msgid "Save Board File"
msgstr "Sauver Fichier C.I." msgstr "Sauver Fichier C.I."
#: pcbnew/files.cpp:342 #: pcbnew/files.cpp:348
msgid "Warning: unable to create backup file " msgid "Warning: unable to create backup file "
msgstr "Attention: impossible de créer un fichier backup " msgstr "Attention: impossible de créer un fichier backup "
#: pcbnew/files.cpp:359 #: pcbnew/files.cpp:365
#: pcbnew/librairi.cpp:301 #: pcbnew/librairi.cpp:301
#: pcbnew/librairi.cpp:447 #: pcbnew/librairi.cpp:447
#: pcbnew/librairi.cpp:606 #: pcbnew/librairi.cpp:606
...@@ -1574,15 +1574,15 @@ msgstr "Attention: impossible de créer un fichier backup " ...@@ -1574,15 +1574,15 @@ msgstr "Attention: impossible de créer un fichier backup "
msgid "Unable to create " msgid "Unable to create "
msgstr "Impossible de créer " msgstr "Impossible de créer "
#: pcbnew/files.cpp:378 #: pcbnew/files.cpp:384
msgid "Backup file: " msgid "Backup file: "
msgstr "Fichier backup: " msgstr "Fichier backup: "
#: pcbnew/files.cpp:382 #: pcbnew/files.cpp:388
msgid "Wrote board file: " msgid "Wrote board file: "
msgstr "Ecriture fichier CI: " msgstr "Ecriture fichier CI: "
#: pcbnew/files.cpp:384 #: pcbnew/files.cpp:390
msgid "Failed to create " msgid "Failed to create "
msgstr "Impossible de créer fichier " msgstr "Impossible de créer fichier "
...@@ -1833,7 +1833,7 @@ msgstr "Place Ancre" ...@@ -1833,7 +1833,7 @@ msgstr "Place Ancre"
msgid "Delete item" msgid "Delete item"
msgstr "Suppression d'éléments" msgstr "Suppression d'éléments"
#: pcbnew/pcbnew.cpp:98 #: pcbnew/pcbnew.cpp:102
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 ?"
...@@ -1919,6 +1919,18 @@ msgstr "Surbrillance des équipotentielles" ...@@ -1919,6 +1919,18 @@ msgstr "Surbrillance des équipotentielles"
msgid "Local Ratsnest" msgid "Local Ratsnest"
msgstr "Montrer le chevelu général" msgstr "Montrer le chevelu général"
#: pcbnew/editrack.cpp:806
msgid "Track Len"
msgstr "Long. Piste"
#: pcbnew/editrack.cpp:810
msgid "Segs Count"
msgstr "Nb Segms"
#: pcbnew/ioascii.cpp:175
msgid "Error: Unexpected end of file !"
msgstr "Erreur: Fin de fichier inattendue !"
#: pcbnew/pcbframe.cpp:114 #: pcbnew/pcbframe.cpp:114
msgid "Through Via" msgid "Through Via"
msgstr "Via Traversante" msgstr "Via Traversante"
...@@ -2024,126 +2036,114 @@ msgstr "Modules Dessous" ...@@ -2024,126 +2036,114 @@ msgstr "Modules Dessous"
msgid "Show footprints that are on board's back" msgid "Show footprints that are on board's back"
msgstr "Afficher les modules situés sur le dessous du ciruit imprimé" msgstr "Afficher les modules situés sur le dessous du ciruit imprimé"
#: pcbnew/pcbframe.cpp:183 #: pcbnew/pcbframe.cpp:131
msgid "Values"
msgstr "Valeurs"
#: pcbnew/pcbframe.cpp:131
msgid "Show footprint's values"
msgstr "Afficher les valeurs des modules"
#: pcbnew/pcbframe.cpp:132
msgid "References"
msgstr "Références"
#: pcbnew/pcbframe.cpp:132
msgid "Show footprint's references"
msgstr "Afficher les références des modules"
#: pcbnew/pcbframe.cpp:185
msgid "Show All Cu" msgid "Show All Cu"
msgstr "Afficher toutes couches cuivre" msgstr "Afficher toutes couches cuivre"
#: pcbnew/pcbframe.cpp:186 #: pcbnew/pcbframe.cpp:188
msgid "Hide All Cu" msgid "Hide All Cu"
msgstr "Cacher Cu" msgstr "Cacher Cu"
#: pcbnew/pcbframe.cpp:260 #: pcbnew/pcbframe.cpp:262
msgid "Front copper layer" msgid "Front copper layer"
msgstr "Couche cuivre dessus" msgstr "Couche cuivre dessus"
#: pcbnew/pcbframe.cpp:268 #: pcbnew/pcbframe.cpp:270
msgid "An innner copper layer" msgid "An innner copper layer"
msgstr "Couche interne" msgstr "Couche interne"
#: pcbnew/pcbframe.cpp:276 #: pcbnew/pcbframe.cpp:278
msgid "Back copper layer" msgid "Back copper layer"
msgstr "Couche cuivre dessous" msgstr "Couche cuivre dessous"
#: pcbnew/pcbframe.cpp:284 #: pcbnew/pcbframe.cpp:286
msgid "Adhesive on board's front" msgid "Adhesive on board's front"
msgstr "Afficher couche adhésive situés sur le dessus du ciruit imprimé" msgstr "Afficher couche adhésive situés sur le dessus du ciruit imprimé"
#: pcbnew/pcbframe.cpp:285 #: pcbnew/pcbframe.cpp:287
msgid "Adhesive on board's back" msgid "Adhesive on board's back"
msgstr "Couche adhésive sur le dessous du circuit imprimé" msgstr "Couche adhésive sur le dessous du circuit imprimé"
#: pcbnew/pcbframe.cpp:286 #: pcbnew/pcbframe.cpp:288
msgid "Solder paste on board's front" msgid "Solder paste on board's front"
msgstr "Couche de pâte à souder sur dessus du circuit imprimé" msgstr "Couche de pâte à souder sur dessus du circuit imprimé"
#: pcbnew/pcbframe.cpp:287 #: pcbnew/pcbframe.cpp:289
msgid "Solder paste on board's back" msgid "Solder paste on board's back"
msgstr "Couche de pate à souder sur dessous du circuit imprimé" msgstr "Couche de pate à souder sur dessous du circuit imprimé"
#: pcbnew/pcbframe.cpp:288 #: pcbnew/pcbframe.cpp:290
msgid "Silkscreen on board's front" msgid "Silkscreen on board's front"
msgstr "Sérigraphie sur le dessus du ciruit imprimé" msgstr "Sérigraphie sur le dessus du ciruit imprimé"
#: pcbnew/pcbframe.cpp:289 #: pcbnew/pcbframe.cpp:291
msgid "Silkscreen on board's back" msgid "Silkscreen on board's back"
msgstr "Sérigraphie sur le dessous du ciruit imprimé " msgstr "Sérigraphie sur le dessous du ciruit imprimé "
#: pcbnew/pcbframe.cpp:290 #: pcbnew/pcbframe.cpp:292
msgid "Solder mask on board's front" msgid "Solder mask on board's front"
msgstr "Couche masque soudure sur le dessus du ciruit imprimée" msgstr "Couche masque soudure sur le dessus du ciruit imprimée"
#: pcbnew/pcbframe.cpp:291 #: pcbnew/pcbframe.cpp:293
msgid "Solder mask on board's back" msgid "Solder mask on board's back"
msgstr "Couche masque soudure sur le dessous du ciruit imprimée" msgstr "Couche masque soudure sur le dessous du ciruit imprimée"
#: pcbnew/pcbframe.cpp:292 #: pcbnew/pcbframe.cpp:294
msgid "Explanatory drawings" msgid "Explanatory drawings"
msgstr "Couche dessins explicatifs" msgstr "Couche dessins explicatifs"
#: pcbnew/pcbframe.cpp:293 #: pcbnew/pcbframe.cpp:295
msgid "Explanatory comments" msgid "Explanatory comments"
msgstr "Couche commentaires" msgstr "Couche commentaires"
#: pcbnew/pcbframe.cpp:294 #: pcbnew/pcbframe.cpp:296
msgid "TDB" msgid "TDB"
msgstr "" msgstr ""
#: pcbnew/pcbframe.cpp:295 #: pcbnew/pcbframe.cpp:297
msgid "TBD" msgid "TBD"
msgstr "" msgstr ""
#: pcbnew/pcbframe.cpp:296 #: pcbnew/pcbframe.cpp:298
msgid "Board's perimeter definition" msgid "Board's perimeter definition"
msgstr "Couche de définition des contours du circuit imprimé" msgstr "Couche de définition des contours du circuit imprimé"
#: pcbnew/pcbframe.cpp:672 #: pcbnew/pcbframe.cpp:675
msgid "Visibles" msgid "Visibles"
msgstr "Visibles" msgstr "Visibles"
#: pcbnew/pcbframe.cpp:763 #: pcbnew/pcbframe.cpp:766
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:764 #: pcbnew/pcbframe.cpp:767
msgid "Confirmation" msgid "Confirmation"
msgstr "Confirmation" msgstr "Confirmation"
#: pcbnew/pcbframe.cpp:803 #: pcbnew/pcbframe.cpp:806
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:807 #: pcbnew/pcbframe.cpp:810
msgid "3D Viewer" msgid "3D Viewer"
msgstr "Visu 3D" msgstr "Visu 3D"
#: pcbnew/editrack.cpp:805
msgid "Track Len"
msgstr "Long. Piste"
#: pcbnew/editrack.cpp:809
msgid "Segs Count"
msgstr "Nb Segms"
#: pcbnew/ioascii.cpp:175
msgid "Error: Unexpected end of file !"
msgstr "Erreur: Fin de fichier inattendue !"
#: pcbnew/layer_widget.cpp:333
msgid "Left click to select, middle click for color change, right click for menu"
msgstr "Cliquer sur bouton gauche pour selectionner, du milieu pour changer la couleur, droit pour le menu"
#: pcbnew/layer_widget.cpp:349
msgid "Enable this for visibility"
msgstr "Activer ceci pour activer la visibilité"
#: pcbnew/layer_widget.cpp:368
msgid "Middle click for color change"
msgstr "Clicquer sur bouton du milieu pour changer la couleur"
#: pcbnew/layer_widget.cpp:459
msgid "Render"
msgstr "Autres"
#: pcbnew/pcbplot.cpp:558 #: pcbnew/pcbplot.cpp:558
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"
...@@ -2246,7 +2246,6 @@ msgid "..." ...@@ -2246,7 +2246,6 @@ msgid "..."
msgstr "..." msgstr "..."
#: pcbnew/dialog_drc_base.cpp:101 #: pcbnew/dialog_drc_base.cpp:101
#: pcbnew/dialog_SVG_print_base.cpp:97
msgid "Messages:" msgid "Messages:"
msgstr "Messages:" msgstr "Messages:"
...@@ -2302,23 +2301,23 @@ msgstr "Pour une liste de pads non connecté, clic droit pour ouvrir un menu" ...@@ -2302,23 +2301,23 @@ msgstr "Pour une liste de pads non connecté, clic droit pour ouvrir un menu"
msgid "Unconnected" msgid "Unconnected"
msgstr "Non connecté" msgstr "Non connecté"
#: pcbnew/moduleframe.cpp:251 #: pcbnew/moduleframe.cpp:254
msgid "Module Editor: Module modified! Continue?" msgid "Module Editor: Module modified! Continue?"
msgstr "Editeur de Module: Module modifié! Continuer ?" msgstr "Editeur de Module: Module modifié! Continuer ?"
#: pcbnew/moduleframe.cpp:359 #: pcbnew/moduleframe.cpp:362
msgid "Display rectangular coordinates" msgid "Display rectangular coordinates"
msgstr "Affichage coord XY" msgstr "Affichage coord XY"
#: pcbnew/moduleframe.cpp:367 #: pcbnew/moduleframe.cpp:370
msgid "Show grid" msgid "Show grid"
msgstr "Afficher grille" msgstr "Afficher grille"
#: pcbnew/moduleframe.cpp:379 #: pcbnew/moduleframe.cpp:382
msgid "Show pads in sketch mode" msgid "Show pads in sketch mode"
msgstr "Afficher pastilles en mode contour" msgstr "Afficher pastilles en mode contour"
#: pcbnew/moduleframe.cpp:380 #: pcbnew/moduleframe.cpp:383
msgid "Show pads in filled mode" msgid "Show pads in filled mode"
msgstr "Afficher pastilles en mode plein" msgstr "Afficher pastilles en mode plein"
...@@ -3040,29 +3039,29 @@ msgstr "" ...@@ -3040,29 +3039,29 @@ msgstr ""
"Entrez un nom de fichier si vous ne voulez pas utiliser les noms par défaut\n" "Entrez un nom de fichier si vous ne voulez pas utiliser les noms par défaut\n"
"Ne peut être utilisé que pour imprimer la feuille courante" "Ne peut être utilisé que pour imprimer la feuille courante"
#: pcbnew/dialog_graphic_item_properties.cpp:87 #: pcbnew/dialog_graphic_item_properties.cpp:89
#: pcbnew/dialog_graphic_item_properties.cpp:96 #: pcbnew/dialog_graphic_item_properties.cpp:98
msgid "Center X" msgid "Center X"
msgstr "Centre X" msgstr "Centre X"
#: pcbnew/dialog_graphic_item_properties.cpp:88 #: pcbnew/dialog_graphic_item_properties.cpp:90
#: pcbnew/dialog_graphic_item_properties.cpp:97 #: pcbnew/dialog_graphic_item_properties.cpp:99
msgid "Center Y" msgid "Center Y"
msgstr "Centrer Y" msgstr "Centrer Y"
#: pcbnew/dialog_graphic_item_properties.cpp:89 #: pcbnew/dialog_graphic_item_properties.cpp:91
msgid "Point X" msgid "Point X"
msgstr "Point X" msgstr "Point X"
#: pcbnew/dialog_graphic_item_properties.cpp:90 #: pcbnew/dialog_graphic_item_properties.cpp:92
msgid "Point Y" msgid "Point Y"
msgstr "Point Y" msgstr "Point Y"
#: pcbnew/dialog_graphic_item_properties.cpp:98 #: pcbnew/dialog_graphic_item_properties.cpp:100
msgid "Start Point X" msgid "Start Point X"
msgstr "Start Point X" msgstr "Start Point X"
#: pcbnew/dialog_graphic_item_properties.cpp:99 #: pcbnew/dialog_graphic_item_properties.cpp:101
msgid "Start Point Y" msgid "Start Point Y"
msgstr "Start Point Y" msgstr "Start Point Y"
...@@ -3197,7 +3196,7 @@ msgid "Warning: The Top Layer and Bottom Layer are same." ...@@ -3197,7 +3196,7 @@ msgid "Warning: The Top Layer and Bottom Layer are same."
msgstr "Attention: Les couches dessus et dessous sont les mêmes" msgstr "Attention: Les couches dessus et dessous sont les mêmes"
#: pcbnew/class_board_item.cpp:25 #: pcbnew/class_board_item.cpp:25
#: pcbnew/class_drawsegment.cpp:381 #: pcbnew/class_drawsegment.cpp:383
msgid "Arc" msgid "Arc"
msgstr "Arc" msgstr "Arc"
...@@ -3253,7 +3252,7 @@ msgid "Reference" ...@@ -3253,7 +3252,7 @@ msgid "Reference"
msgstr "Référence" msgstr "Référence"
#: pcbnew/class_board_item.cpp:100 #: pcbnew/class_board_item.cpp:100
#: pcbnew/class_edge_mod.cpp:304 #: pcbnew/class_edge_mod.cpp:300
msgid "Value" msgid "Value"
msgstr "Valeur" msgstr "Valeur"
...@@ -3369,19 +3368,19 @@ msgstr "NETCLASS: '%s' a un diamètre de microvia: %s qui est plus petit que la ...@@ -3369,19 +3368,19 @@ msgstr "NETCLASS: '%s' a un diamètre de microvia: %s qui est plus petit que la
msgid "NETCLASS: '%s' has uVia Drill:%s which is less than global:%s" msgid "NETCLASS: '%s' has uVia Drill:%s which is less than global:%s"
msgstr "NETCLASS: '%s' a un perçage de microvia: %s qui est plus petit que la valeur globale: %s" msgstr "NETCLASS: '%s' a un perçage de microvia: %s qui est plus petit que la valeur globale: %s"
#: pcbnew/class_edge_mod.cpp:300 #: pcbnew/class_edge_mod.cpp:296
msgid "Graphic Item" msgid "Graphic Item"
msgstr "Element Graphique" msgstr "Element Graphique"
#: pcbnew/class_edge_mod.cpp:307 #: pcbnew/class_edge_mod.cpp:303
msgid "TimeStamp" msgid "TimeStamp"
msgstr "TimeStamp" msgstr "TimeStamp"
#: pcbnew/class_edge_mod.cpp:309 #: pcbnew/class_edge_mod.cpp:305
msgid "Mod Layer" msgid "Mod Layer"
msgstr "Couche Mod." msgstr "Couche Mod."
#: pcbnew/class_edge_mod.cpp:312 #: pcbnew/class_edge_mod.cpp:308
msgid "Seg Layer" msgid "Seg Layer"
msgstr "Couche Seg." msgstr "Couche Seg."
...@@ -3475,47 +3474,47 @@ msgstr "Grille %.1f" ...@@ -3475,47 +3474,47 @@ msgstr "Grille %.1f"
msgid "Grid %.3f" msgid "Grid %.3f"
msgstr "Grille %.3f" msgstr "Grille %.3f"
#: pcbnew/dialog_graphic_items_options.cpp:202 #: pcbnew/dialog_graphic_items_options.cpp:203
msgid "Graphics:" msgid "Graphics:"
msgstr "Eléments graphiques;" msgstr "Eléments graphiques;"
#: pcbnew/dialog_graphic_items_options.cpp:208 #: pcbnew/dialog_graphic_items_options.cpp:209
msgid "Graphic segm Width" msgid "Graphic segm Width"
msgstr "Epaisseur segm graphique" msgstr "Epaisseur segm graphique"
#: pcbnew/dialog_graphic_items_options.cpp:225 #: pcbnew/dialog_graphic_items_options.cpp:226
msgid "Board Edges Width" msgid "Board Edges Width"
msgstr "Epaiss. contour pcb" msgstr "Epaiss. contour pcb"
#: pcbnew/dialog_graphic_items_options.cpp:242 #: pcbnew/dialog_graphic_items_options.cpp:243
msgid "Copper Text Width" msgid "Copper Text Width"
msgstr "Epaisseur Texte sur cuivre" msgstr "Epaisseur Texte sur cuivre"
#: pcbnew/dialog_graphic_items_options.cpp:259 #: pcbnew/dialog_graphic_items_options.cpp:260
msgid "Text Size V" msgid "Text Size V"
msgstr "Hauteur texte" msgstr "Hauteur texte"
#: pcbnew/dialog_graphic_items_options.cpp:276 #: pcbnew/dialog_graphic_items_options.cpp:277
msgid "Text Size H" msgid "Text Size H"
msgstr "Largeur texte" msgstr "Largeur texte"
#: pcbnew/dialog_graphic_items_options.cpp:295 #: pcbnew/dialog_graphic_items_options.cpp:296
msgid "Modules:" msgid "Modules:"
msgstr "Modules: " msgstr "Modules: "
#: pcbnew/dialog_graphic_items_options.cpp:301 #: pcbnew/dialog_graphic_items_options.cpp:302
msgid "Edges Module Width" msgid "Edges Module Width"
msgstr "Epaiss. contour module" msgstr "Epaiss. contour module"
#: pcbnew/dialog_graphic_items_options.cpp:321 #: pcbnew/dialog_graphic_items_options.cpp:322
msgid "Text Module Width" msgid "Text Module Width"
msgstr "Epaisseur Texte Module" msgstr "Epaisseur Texte Module"
#: pcbnew/dialog_graphic_items_options.cpp:342 #: pcbnew/dialog_graphic_items_options.cpp:343
msgid "Text Module Size V" msgid "Text Module Size V"
msgstr "Hauteur Texte Module" msgstr "Hauteur Texte Module"
#: pcbnew/dialog_graphic_items_options.cpp:363 #: pcbnew/dialog_graphic_items_options.cpp:364
msgid "Text Module Size H" msgid "Text Module Size H"
msgstr "Largeur Texte Module" msgstr "Largeur Texte Module"
...@@ -3588,19 +3587,19 @@ msgstr "'signal' is a nom de couche réservé" ...@@ -3588,19 +3587,19 @@ msgstr "'signal' is a nom de couche réservé"
msgid "Layer name is a duplicate of another" msgid "Layer name is a duplicate of another"
msgstr "Le nom de la couche est un double d'une autre couche" msgstr "Le nom de la couche est un double d'une autre couche"
#: pcbnew/class_drawsegment.cpp:373 #: pcbnew/class_drawsegment.cpp:375
msgid "Shape" msgid "Shape"
msgstr "Forme" msgstr "Forme"
#: pcbnew/class_drawsegment.cpp:384 #: pcbnew/class_drawsegment.cpp:386
msgid "Angle" msgid "Angle"
msgstr "Angle" msgstr "Angle"
#: pcbnew/class_drawsegment.cpp:387 #: pcbnew/class_drawsegment.cpp:389
msgid "Curve" msgid "Curve"
msgstr "Courbe" msgstr "Courbe"
#: pcbnew/class_drawsegment.cpp:391 #: pcbnew/class_drawsegment.cpp:393
msgid "Segment" msgid "Segment"
msgstr "Segment" msgstr "Segment"
...@@ -3835,152 +3834,152 @@ msgstr "Fichier Netliste:" ...@@ -3835,152 +3834,152 @@ msgstr "Fichier Netliste:"
msgid "ErrType" msgid "ErrType"
msgstr "Type Err" msgstr "Type Err"
#: pcbnew/class_board.cpp:52 #: pcbnew/class_board.cpp:57
msgid "This is the default net class." msgid "This is the default net class."
msgstr "Ceci est la Netclass par défaut" msgstr "Ceci est la Netclass par défaut"
#: pcbnew/class_board.cpp:212 #: pcbnew/class_board.cpp:215
msgid "Front" msgid "Front"
msgstr "Dessus" msgstr "Dessus"
#: pcbnew/class_board.cpp:213 #: pcbnew/class_board.cpp:216
msgid "Inner2" msgid "Inner2"
msgstr "Interne2" msgstr "Interne2"
#: pcbnew/class_board.cpp:214 #: pcbnew/class_board.cpp:217
msgid "Inner3" msgid "Inner3"
msgstr "Interne3" msgstr "Interne3"
#: pcbnew/class_board.cpp:215 #: pcbnew/class_board.cpp:218
msgid "Inner4" msgid "Inner4"
msgstr "Interne4" msgstr "Interne4"
#: pcbnew/class_board.cpp:216 #: pcbnew/class_board.cpp:219
msgid "Inner5" msgid "Inner5"
msgstr "Interne5" msgstr "Interne5"
#: pcbnew/class_board.cpp:217 #: pcbnew/class_board.cpp:220
msgid "Inner6" msgid "Inner6"
msgstr "Interne6" msgstr "Interne6"
#: pcbnew/class_board.cpp:218 #: pcbnew/class_board.cpp:221
msgid "Inner7" msgid "Inner7"
msgstr "Interne7" msgstr "Interne7"
#: pcbnew/class_board.cpp:219 #: pcbnew/class_board.cpp:222
msgid "Inner8" msgid "Inner8"
msgstr "Interne8" msgstr "Interne8"
#: pcbnew/class_board.cpp:220 #: pcbnew/class_board.cpp:223
msgid "Inner9" msgid "Inner9"
msgstr "Interne9" msgstr "Interne9"
#: pcbnew/class_board.cpp:221 #: pcbnew/class_board.cpp:224
msgid "Inner10" msgid "Inner10"
msgstr "Interne10" msgstr "Interne10"
#: pcbnew/class_board.cpp:222 #: pcbnew/class_board.cpp:225
msgid "Inner11" msgid "Inner11"
msgstr "Interne11" msgstr "Interne11"
#: pcbnew/class_board.cpp:223 #: pcbnew/class_board.cpp:226
msgid "Inner12" msgid "Inner12"
msgstr "Interne12" msgstr "Interne12"
#: pcbnew/class_board.cpp:224 #: pcbnew/class_board.cpp:227
msgid "Inner13" msgid "Inner13"
msgstr "Interne13" msgstr "Interne13"
#: pcbnew/class_board.cpp:225 #: pcbnew/class_board.cpp:228
msgid "Inner14" msgid "Inner14"
msgstr "Interne14" msgstr "Interne14"
#: pcbnew/class_board.cpp:226 #: pcbnew/class_board.cpp:229
msgid "Inner15" msgid "Inner15"
msgstr "Interne15" msgstr "Interne15"
#: pcbnew/class_board.cpp:227 #: pcbnew/class_board.cpp:230
msgid "Back" msgid "Back"
msgstr "Dessous" msgstr "Dessous"
#: pcbnew/class_board.cpp:228 #: pcbnew/class_board.cpp:231
msgid "Adhes_Back" msgid "Adhes_Back"
msgstr "Adhes_Dessous" msgstr "Adhes_Dessous"
#: pcbnew/class_board.cpp:229 #: pcbnew/class_board.cpp:232
msgid "Adhes_Front" msgid "Adhes_Front"
msgstr "Adhes_Dessus" msgstr "Adhes_Dessus"
#: pcbnew/class_board.cpp:230 #: pcbnew/class_board.cpp:233
msgid "SoldP_Back" msgid "SoldP_Back"
msgstr "SoldP_Dessous" msgstr "SoldP_Dessous"
#: pcbnew/class_board.cpp:231 #: pcbnew/class_board.cpp:234
msgid "SoldP_Front" msgid "SoldP_Front"
msgstr "SoldP_Dessus" msgstr "SoldP_Dessus"
#: pcbnew/class_board.cpp:232 #: pcbnew/class_board.cpp:235
msgid "SilkS_Back" msgid "SilkS_Back"
msgstr "SilkS_Dessous" msgstr "SilkS_Dessous"
#: pcbnew/class_board.cpp:233 #: pcbnew/class_board.cpp:236
msgid "SilkS_Front" msgid "SilkS_Front"
msgstr "Sérigr_Dessus" msgstr "Sérigr_Dessus"
#: pcbnew/class_board.cpp:234 #: pcbnew/class_board.cpp:237
msgid "Mask_Back" msgid "Mask_Back"
msgstr "Masque_Dessous" msgstr "Masque_Dessous"
#: pcbnew/class_board.cpp:235 #: pcbnew/class_board.cpp:238
msgid "Mask_Front" msgid "Mask_Front"
msgstr "Masque_Dessus" msgstr "Masque_Dessus"
#: pcbnew/class_board.cpp:236 #: pcbnew/class_board.cpp:239
msgid "Drawings" msgid "Drawings"
msgstr "Drawings " msgstr "Drawings "
#: pcbnew/class_board.cpp:237 #: pcbnew/class_board.cpp:240
msgid "Comments" msgid "Comments"
msgstr "Commentaires " msgstr "Commentaires "
#: pcbnew/class_board.cpp:238 #: pcbnew/class_board.cpp:241
msgid "Eco1" msgid "Eco1"
msgstr "Eco1 " msgstr "Eco1 "
#: pcbnew/class_board.cpp:239 #: pcbnew/class_board.cpp:242
msgid "Eco2" msgid "Eco2"
msgstr "Eco2 " msgstr "Eco2 "
#: pcbnew/class_board.cpp:240 #: pcbnew/class_board.cpp:243
msgid "PCB_Edges" msgid "PCB_Edges"
msgstr "Contours_PCB" msgstr "Contours_PCB"
#: pcbnew/class_board.cpp:241 #: pcbnew/class_board.cpp:244
msgid "BAD INDEX" msgid "BAD INDEX"
msgstr "BAD INDEX" msgstr "BAD INDEX"
#: pcbnew/class_board.cpp:845 #: pcbnew/class_board.cpp:907
#: pcbnew/class_module.cpp:858 #: pcbnew/class_module.cpp:867
msgid "Pads" msgid "Pads"
msgstr "Pads" msgstr "Pads"
#: pcbnew/class_board.cpp:848 #: pcbnew/class_board.cpp:910
msgid "Vias" msgid "Vias"
msgstr "Vias" msgstr "Vias"
#: pcbnew/class_board.cpp:851 #: pcbnew/class_board.cpp:913
msgid "Nodes" msgid "Nodes"
msgstr "Nodes" msgstr "Nodes"
#: pcbnew/class_board.cpp:854 #: pcbnew/class_board.cpp:916
msgid "Nets" msgid "Nets"
msgstr "Nets" msgstr "Nets"
#: pcbnew/class_board.cpp:862 #: pcbnew/class_board.cpp:924
msgid "Links" msgid "Links"
msgstr "Liens" msgstr "Liens"
#: pcbnew/class_board.cpp:865 #: pcbnew/class_board.cpp:927
msgid "Connect" msgid "Connect"
msgstr "Connect" msgstr "Connect"
...@@ -4487,6 +4486,7 @@ msgstr "" ...@@ -4487,6 +4486,7 @@ msgstr ""
#: pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.cpp:36 #: pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.cpp:36
#: pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.cpp:83 #: pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.cpp:83
#: pcbnew/dialog_design_rules_base.cpp:73
msgid "Add" msgid "Add"
msgstr "Ajouter" msgstr "Ajouter"
...@@ -4505,6 +4505,7 @@ msgstr "Ajouter une nouvelle librairie avant la librairie sélectionnée, et la ...@@ -4505,6 +4505,7 @@ msgstr "Ajouter une nouvelle librairie avant la librairie sélectionnée, et la
#: pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.cpp:46 #: pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.cpp:46
#: pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.cpp:89 #: pcbnew/dialog_pcbnew_config_libs_and_paths_fbp.cpp:89
#: pcbnew/dialog_design_rules_base.cpp:78
msgid "Remove" msgid "Remove"
msgstr "Enlever" msgstr "Enlever"
...@@ -4556,31 +4557,31 @@ msgstr "Prévisualisation" ...@@ -4556,31 +4557,31 @@ msgstr "Prévisualisation"
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/class_module.cpp:839 #: pcbnew/class_module.cpp:848
msgid "Last Change" msgid "Last Change"
msgstr "Last Change" msgstr "Last Change"
#: pcbnew/class_module.cpp:844 #: pcbnew/class_module.cpp:853
msgid "Netlist path" msgid "Netlist path"
msgstr "Chemin Netliste " msgstr "Chemin Netliste "
#: pcbnew/class_module.cpp:865 #: pcbnew/class_module.cpp:874
msgid "Stat" msgid "Stat"
msgstr "Stat" msgstr "Stat"
#: pcbnew/class_module.cpp:875 #: pcbnew/class_module.cpp:884
msgid "No 3D shape" msgid "No 3D shape"
msgstr "Pas de forme 3D" msgstr "Pas de forme 3D"
#: pcbnew/class_module.cpp:876 #: pcbnew/class_module.cpp:885
msgid "3D-Shape" msgid "3D-Shape"
msgstr "Forme 3D" msgstr "Forme 3D"
#: pcbnew/class_module.cpp:878 #: pcbnew/class_module.cpp:887
msgid "Doc: " msgid "Doc: "
msgstr "Doc: " msgstr "Doc: "
#: pcbnew/class_module.cpp:879 #: pcbnew/class_module.cpp:888
msgid "KeyW: " msgid "KeyW: "
msgstr "KeyW: " msgstr "KeyW: "
...@@ -4861,15 +4862,15 @@ msgstr "Le composant avec valeur \"%s\" a une référence vide." ...@@ -4861,15 +4862,15 @@ msgstr "Le composant avec valeur \"%s\" a une référence vide."
msgid "Multiple components have identical reference IDs of \"%s\"." msgid "Multiple components have identical reference IDs of \"%s\"."
msgstr "Multiple composants ont une reference identique \"%s\"." msgstr "Multiple composants ont une reference identique \"%s\"."
#: pcbnew/class_text_mod.cpp:442 #: pcbnew/class_text_mod.cpp:445
msgid "Ref." msgid "Ref."
msgstr "Ref." msgstr "Ref."
#: pcbnew/class_text_mod.cpp:473 #: pcbnew/class_text_mod.cpp:476
msgid " No" msgid " No"
msgstr "Non" msgstr "Non"
#: pcbnew/class_text_mod.cpp:475 #: pcbnew/class_text_mod.cpp:478
msgid " Yes" msgid " Yes"
msgstr "Oui" msgstr "Oui"
...@@ -5001,22 +5002,22 @@ msgstr "Change tous" ...@@ -5001,22 +5002,22 @@ msgstr "Change tous"
msgid "Browse Libs modules" msgid "Browse Libs modules"
msgstr "Liste modules" msgstr "Liste modules"
#: pcbnew/dialog_drc.cpp:183 #: pcbnew/dialog_drc.cpp:184
#: pcbnew/dialog_drc.cpp:257 #: pcbnew/dialog_drc.cpp:258
#, c-format #, c-format
msgid "Report file \"%s\" created" msgid "Report file \"%s\" created"
msgstr "Fichier rapport \"%s\" créé" msgstr "Fichier rapport \"%s\" créé"
#: pcbnew/dialog_drc.cpp:185 #: pcbnew/dialog_drc.cpp:186
#: pcbnew/dialog_drc.cpp:258 #: pcbnew/dialog_drc.cpp:259
msgid "Disk File Report Completed" msgid "Disk File Report Completed"
msgstr "Fichier rapport terminé" msgstr "Fichier rapport terminé"
#: pcbnew/dialog_drc.cpp:278 #: pcbnew/dialog_drc.cpp:279
msgid "DRC report files (.rpt)|*.rpt" msgid "DRC report files (.rpt)|*.rpt"
msgstr "Fichier rapport DRC (.rpt)|*.rpt" msgstr "Fichier rapport DRC (.rpt)|*.rpt"
#: pcbnew/dialog_drc.cpp:284 #: pcbnew/dialog_drc.cpp:285
msgid "Save DRC Report File" msgid "Save DRC Report File"
msgstr "Sauver Fichier Rapport DRC:" msgstr "Sauver Fichier Rapport DRC:"
...@@ -5291,35 +5292,35 @@ msgstr "Créer Fichier " ...@@ -5291,35 +5292,35 @@ msgstr "Créer Fichier "
msgid " error" msgid " error"
msgstr " erreur" msgstr " erreur"
#: pcbnew/class_track.cpp:920 #: pcbnew/class_track.cpp:923
msgid "Track Length" msgid "Track Length"
msgstr "Long. Piste" msgstr "Long. Piste"
#: pcbnew/class_track.cpp:979 #: pcbnew/class_track.cpp:982
msgid "Flags" msgid "Flags"
msgstr "Flags" msgstr "Flags"
#: pcbnew/class_track.cpp:991 #: pcbnew/class_track.cpp:994
msgid "Status" msgid "Status"
msgstr "Status" msgstr "Status"
#: pcbnew/class_track.cpp:1014 #: pcbnew/class_track.cpp:1017
msgid "Diam" msgid "Diam"
msgstr "Diam" msgstr "Diam"
#: pcbnew/class_track.cpp:1025 #: pcbnew/class_track.cpp:1028
msgid "(Specific)" msgid "(Specific)"
msgstr "(Specifique)" msgstr "(Specifique)"
#: pcbnew/class_track.cpp:1027 #: pcbnew/class_track.cpp:1030
msgid "(Default)" msgid "(Default)"
msgstr "(Défaut)" msgstr "(Défaut)"
#: pcbnew/class_track.cpp:1040 #: pcbnew/class_track.cpp:1043
msgid "Net Class" msgid "Net Class"
msgstr "Classe d'Equipot" msgstr "Classe d'Equipot"
#: pcbnew/class_track.cpp:1047 #: pcbnew/class_track.cpp:1050
msgid "Segment Length" msgid "Segment Length"
msgstr "Long. Segment" msgstr "Long. Segment"
...@@ -5351,37 +5352,21 @@ msgstr "Impossible de dragger ce segment: trop de segments connectés" ...@@ -5351,37 +5352,21 @@ msgstr "Impossible de dragger ce segment: trop de segments connectés"
msgid "Unable to drag this segment: two collinear segments" msgid "Unable to drag this segment: two collinear segments"
msgstr "Impossible de dragger ce segment: 2 segments alignés" msgstr "Impossible de dragger ce segment: 2 segments alignés"
#: pcbnew/build_BOM_from_board.cpp:33 #: pcbnew/layer_widget.cpp:360
msgid "Comma separated value files (*.csv)|*.csv" msgid "Left click to select, middle click for color change, right click for menu"
msgstr "Fichiers \"Comma separated value\" (*.csv)|*.csv" msgstr "Cliquer sur bouton gauche pour selectionner, du milieu pour changer la couleur, droit pour le menu"
#: pcbnew/build_BOM_from_board.cpp:67
msgid "Save Bill of Materials"
msgstr "Sauver Liste du Materiel"
#: 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 #: pcbnew/layer_widget.cpp:376
msgid "Quantity" msgid "Enable this for visibility"
msgstr "Quantité" msgstr "Activer ceci pour activer la visibilité"
#: pcbnew/build_BOM_from_board.cpp:91 #: pcbnew/layer_widget.cpp:395
msgid "Designation" msgid "Middle click for color change"
msgstr "Designation" msgstr "Clicquer sur bouton du milieu pour changer la couleur"
#: pcbnew/build_BOM_from_board.cpp:92 #: pcbnew/layer_widget.cpp:486
msgid "Supplier and ref" msgid "Render"
msgstr "Fournisseur et ref" msgstr "Autres"
#: pcbnew/zones_by_polygon_fill_functions.cpp:130 #: pcbnew/zones_by_polygon_fill_functions.cpp:130
msgid "No Net" msgid "No Net"
...@@ -5920,19 +5905,19 @@ msgstr "Lire Fichier Projet" ...@@ -5920,19 +5905,19 @@ msgstr "Lire Fichier Projet"
msgid "File %s not found" msgid "File %s not found"
msgstr "Fichier %s non trouvé" msgstr "Fichier %s non trouvé"
#: pcbnew/pcbnew_config.cpp:210 #: pcbnew/pcbnew_config.cpp:213
msgid "Save Project File" msgid "Save Project File"
msgstr "Sauver Fichier Projet" msgstr "Sauver Fichier Projet"
#: pcbnew/class_netinfo_item.cpp:132 #: pcbnew/class_netinfo_item.cpp:133
msgid "Net Name" msgid "Net Name"
msgstr "Nom Equipot" msgstr "Nom Equipot"
#: pcbnew/class_netinfo_item.cpp:135 #: pcbnew/class_netinfo_item.cpp:136
msgid "Net Code" msgid "Net Code"
msgstr "Net Code" msgstr "Net Code"
#: pcbnew/class_netinfo_item.cpp:167 #: pcbnew/class_netinfo_item.cpp:168
msgid "Net Length" msgid "Net Length"
msgstr "Long. Net" msgstr "Long. Net"
...@@ -5969,6 +5954,38 @@ msgstr "Fichier placement côté cuivre:" ...@@ -5969,6 +5954,38 @@ msgstr "Fichier placement côté cuivre:"
msgid "Module count" msgid "Module count"
msgstr "Nb Modules" msgstr "Nb Modules"
#: pcbnew/build_BOM_from_board.cpp:33
msgid "Comma separated value files (*.csv)|*.csv"
msgstr "Fichiers \"Comma separated value\" (*.csv)|*.csv"
#: pcbnew/build_BOM_from_board.cpp:67
msgid "Save Bill of Materials"
msgstr "Sauver Liste du Materiel"
#: 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 "Quantity"
msgstr "Quantité"
#: 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/menubar_pcbframe.cpp:39 #: pcbnew/menubar_pcbframe.cpp:39
msgid "&New\tCtrl+N" msgid "&New\tCtrl+N"
msgstr "&Nouveau\tCtrl+N" msgstr "&Nouveau\tCtrl+N"
...@@ -6290,7 +6307,7 @@ msgid "Setting libraries, directories and others..." ...@@ -6290,7 +6307,7 @@ msgid "Setting libraries, directories and others..."
msgstr "Sélectionner les librairies, répertoires et autres" msgstr "Sélectionner les librairies, répertoires et autres"
#: pcbnew/menubar_pcbframe.cpp:398 #: pcbnew/menubar_pcbframe.cpp:398
#: pcbnew/dialog_general_options.cpp:275 #: pcbnew/dialog_general_options.cpp:273
msgid "Hide &Layers Manager" msgid "Hide &Layers Manager"
msgstr "Cacher le &Gestionnaire de Couches" msgstr "Cacher le &Gestionnaire de Couches"
...@@ -6805,7 +6822,7 @@ msgstr "Sauver Options" ...@@ -6805,7 +6822,7 @@ msgstr "Sauver Options"
msgid "Generate drill file" msgid "Generate drill file"
msgstr "Créer Fichier de perçage" msgstr "Créer Fichier de perçage"
#: pcbnew/dialog_general_options.cpp:278 #: pcbnew/dialog_general_options.cpp:276
msgid "Show &Layers Manager" msgid "Show &Layers Manager"
msgstr "Affiche le &Gestionnaire de Couches" msgstr "Affiche le &Gestionnaire de Couches"
...@@ -6837,15 +6854,15 @@ msgstr "Change Pads du Module" ...@@ -6837,15 +6854,15 @@ msgstr "Change Pads du Module"
msgid "Change Pads on Same Modules" msgid "Change Pads on Same Modules"
msgstr "Change Pads des Modules id." msgstr "Change Pads des Modules id."
#: pcbnew/dialog_pad_properties.cpp:479 #: pcbnew/dialog_pad_properties.cpp:482
msgid "Incorrect value for pad drill: pad drill bigger than pad size" msgid "Incorrect value for pad drill: pad drill bigger than pad size"
msgstr "Valeur incorrecte pour diamètre de perçage: perçage plus grand que la taille du pad" msgstr "Valeur incorrecte pour diamètre de perçage: perçage plus grand que la taille du pad"
#: pcbnew/dialog_pad_properties.cpp:485 #: pcbnew/dialog_pad_properties.cpp:488
msgid "Incorrect value for pad offset" msgid "Incorrect value for pad offset"
msgstr "Valeur incorrecte pour offset du pad" msgstr "Valeur incorrecte pour offset du pad"
#: pcbnew/dialog_pad_properties.cpp:579 #: pcbnew/dialog_pad_properties.cpp:582
msgid "Unknown netname, no change" msgid "Unknown netname, no change"
msgstr "Net inconnu, pas de changement" msgstr "Net inconnu, pas de changement"
...@@ -6871,7 +6888,7 @@ msgstr "" ...@@ -6871,7 +6888,7 @@ msgstr ""
"Plan de perçage: trop de diamètres différents pour tracer 1 symbole par diamètre (max 13)\n" "Plan de perçage: trop de diamètres différents pour tracer 1 symbole par diamètre (max 13)\n"
"Le tracé utilise des cercles pour quelques valeurs " "Le tracé utilise des cercles pour quelques valeurs "
#: pcbnew/editrack-part2.cpp:107 #: pcbnew/editrack-part2.cpp:73
msgid "Drc error, canceled" msgid "Drc error, canceled"
msgstr "Erreur DRC, annulation" msgstr "Erreur DRC, annulation"
...@@ -6908,43 +6925,43 @@ msgstr " *" ...@@ -6908,43 +6925,43 @@ msgstr " *"
msgid "Disable design rule checking" msgid "Disable design rule checking"
msgstr "Désactive le contrôle des règles de conception" msgstr "Désactive le contrôle des règles de conception"
#: pcbnew/toolbars_update_user_interface.cpp:220 #: pcbnew/toolbars_update_user_interface.cpp:219
msgid "Hide board ratsnest" msgid "Hide board ratsnest"
msgstr "Ne pas montrer le chevelu général" msgstr "Ne pas montrer le chevelu général"
#: pcbnew/toolbars_update_user_interface.cpp:227 #: pcbnew/toolbars_update_user_interface.cpp:226
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/toolbars_update_user_interface.cpp:228 #: pcbnew/toolbars_update_user_interface.cpp:227
msgid "Show module ratsnest" msgid "Show module ratsnest"
msgstr "Montrer le chevelu du module" msgstr "Montrer le chevelu du module"
#: pcbnew/toolbars_update_user_interface.cpp:235 #: pcbnew/toolbars_update_user_interface.cpp:234
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/toolbars_update_user_interface.cpp:236 #: pcbnew/toolbars_update_user_interface.cpp:235
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/toolbars_update_user_interface.cpp:244 #: pcbnew/toolbars_update_user_interface.cpp:243
msgid "Show pads in fill mode" msgid "Show pads in fill mode"
msgstr "Afficher pads en mode plein" msgstr "Afficher pads en mode plein"
#: pcbnew/toolbars_update_user_interface.cpp:252 #: pcbnew/toolbars_update_user_interface.cpp:251
msgid "Show vias in fill mode" msgid "Show vias in fill mode"
msgstr "Afficher vias en mode plein" msgstr "Afficher vias en mode plein"
#: pcbnew/toolbars_update_user_interface.cpp:260 #: pcbnew/toolbars_update_user_interface.cpp:259
msgid "Show tracks in fill mode" msgid "Show tracks in fill mode"
msgstr "Afficher pistes en mode plein" msgstr "Afficher pistes en mode plein"
#: pcbnew/toolbars_update_user_interface.cpp:266 #: pcbnew/toolbars_update_user_interface.cpp:265
msgid "Normal contrast display mode" msgid "Normal contrast display mode"
msgstr "Mode d'affichage contraste normal" msgstr "Mode d'affichage contraste normal"
#: pcbnew/toolbars_update_user_interface.cpp:267 #: pcbnew/toolbars_update_user_interface.cpp:266
msgid "High contrast display mode" msgid "High contrast display mode"
msgstr "Mode d'affichage haut contraste" msgstr "Mode d'affichage haut contraste"
...@@ -7094,19 +7111,19 @@ msgstr "Labels" ...@@ -7094,19 +7111,19 @@ msgstr "Labels"
msgid "Hierar." msgid "Hierar."
msgstr "Hiérar." msgstr "Hiérar."
#: eeschema/eelayer.cpp:243 #: eeschema/eelayer.cpp:239
msgid "White" msgid "White"
msgstr "Blanc" msgstr "Blanc"
#: eeschema/eelayer.cpp:244 #: eeschema/eelayer.cpp:240
msgid "Black" msgid "Black"
msgstr "Noir" msgstr "Noir"
#: eeschema/eelayer.cpp:247 #: eeschema/eelayer.cpp:243
msgid "Background Color:" msgid "Background Color:"
msgstr "Couleur du Fond:" msgstr "Couleur du Fond:"
#: eeschema/eelayer.cpp:279 #: eeschema/eelayer.cpp:275
msgid "Apply" msgid "Apply"
msgstr "Appliquer" msgstr "Appliquer"
...@@ -9813,39 +9830,31 @@ msgid "Text Shape:" ...@@ -9813,39 +9830,31 @@ msgid "Text Shape:"
msgstr "Aspect Texte:" msgstr "Aspect Texte:"
#: eeschema/dialog_bodygraphictext_properties_base.cpp:82 #: eeschema/dialog_bodygraphictext_properties_base.cpp:82
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:56
msgid "Align left" msgid "Align left"
msgstr "Alignement à gauche" msgstr "Alignement à gauche"
#: eeschema/dialog_bodygraphictext_properties_base.cpp:82 #: eeschema/dialog_bodygraphictext_properties_base.cpp:82
#: eeschema/dialog_bodygraphictext_properties_base.cpp:88 #: eeschema/dialog_bodygraphictext_properties_base.cpp:88
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:56
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:69
msgid "Align center" msgid "Align center"
msgstr "Alignement au centre" msgstr "Alignement au centre"
#: eeschema/dialog_bodygraphictext_properties_base.cpp:82 #: eeschema/dialog_bodygraphictext_properties_base.cpp:82
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:56
msgid "Align right" msgid "Align right"
msgstr "Alignement à droite" msgstr "Alignement à droite"
#: eeschema/dialog_bodygraphictext_properties_base.cpp:84 #: eeschema/dialog_bodygraphictext_properties_base.cpp:84
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:58
msgid "Horiz. Justify" msgid "Horiz. Justify"
msgstr "Justification Horiz." msgstr "Justification Horiz."
#: eeschema/dialog_bodygraphictext_properties_base.cpp:88 #: eeschema/dialog_bodygraphictext_properties_base.cpp:88
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:69
msgid "Align bottom" msgid "Align bottom"
msgstr "Alignement en bas" msgstr "Alignement en bas"
#: eeschema/dialog_bodygraphictext_properties_base.cpp:88 #: eeschema/dialog_bodygraphictext_properties_base.cpp:88
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:69
msgid "Align top" msgid "Align top"
msgstr "Alignement au sommet" msgstr "Alignement au sommet"
#: eeschema/dialog_bodygraphictext_properties_base.cpp:90 #: eeschema/dialog_bodygraphictext_properties_base.cpp:90
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:71
msgid "Vert. Justify" msgid "Vert. Justify"
msgstr "Vert. Justifié" msgstr "Vert. Justifié"
...@@ -10426,6 +10435,9 @@ msgstr "Taille du te&xte:" ...@@ -10426,6 +10435,9 @@ msgstr "Taille du te&xte:"
#: eeschema/dialog_sch_sheet_props_base.cpp:42 #: eeschema/dialog_sch_sheet_props_base.cpp:42
#: eeschema/dialog_sch_sheet_props_base.cpp:63 #: eeschema/dialog_sch_sheet_props_base.cpp:63
#: eeschema/dialog_lib_edit_pin_base.cpp:41
#: eeschema/dialog_lib_edit_pin_base.cpp:64
#: eeschema/dialog_lib_edit_pin_base.cpp:87
msgid "units" msgid "units"
msgstr "unités" msgstr "unités"
...@@ -11000,19 +11012,19 @@ msgstr "Ouvrir la documentation de cvpcb" ...@@ -11000,19 +11012,19 @@ msgstr "Ouvrir la documentation de cvpcb"
msgid "About cvpcb schematic to pcb converter" msgid "About cvpcb schematic to pcb converter"
msgstr "Au sujet de Cvpcb, schématique vers pcb interface" msgstr "Au sujet de Cvpcb, schématique vers pcb interface"
#: cvpcb/cvpcb.cpp:29 #: cvpcb/cvpcb.cpp:32
msgid "Kicad retroannotation files (*.stf)|*.stf" msgid "Kicad retroannotation files (*.stf)|*.stf"
msgstr "Fichiers de retroannotaion Kicad (*.stf)|*.stf" msgstr "Fichiers de retroannotaion Kicad (*.stf)|*.stf"
#: cvpcb/cvpcb.cpp:30 #: cvpcb/cvpcb.cpp:33
msgid "Kicad footprint alias files (*.equ)|*.equ" msgid "Kicad footprint alias files (*.equ)|*.equ"
msgstr "Fichiers alias modules Kicad (*.equ)|*.equ" msgstr "Fichiers alias modules Kicad (*.equ)|*.equ"
#: cvpcb/cvpcb.cpp:94 #: cvpcb/cvpcb.cpp:97
msgid "Cvpcb is already running, Continue?" msgid "Cvpcb is already running, Continue?"
msgstr "Cvpcb est en cours d'exécution. Continuer ?" msgstr "Cvpcb est en cours d'exécution. Continuer ?"
#: cvpcb/cvpcb.cpp:136 #: cvpcb/cvpcb.cpp:139
msgid " [no file]" msgid " [no file]"
msgstr " [pas de fichier]" msgstr " [pas de fichier]"
...@@ -11797,20 +11809,20 @@ msgstr "Ext. Fichiers Gerber" ...@@ -11797,20 +11809,20 @@ msgstr "Ext. Fichiers Gerber"
msgid "D code File Ext:" msgid "D code File Ext:"
msgstr "Ext. Fichiers DCodes:" msgstr "Ext. Fichiers DCodes:"
#: gerbview/set_color.cpp:251 #: gerbview/set_color.cpp:247
#: gerbview/set_color.cpp:277 #: gerbview/set_color.cpp:273
msgid "Show None" msgid "Show None"
msgstr "Rien Afficher" msgstr "Rien Afficher"
#: gerbview/set_color.cpp:260 #: gerbview/set_color.cpp:256
msgid "Show All" msgid "Show All"
msgstr "Tout Afficher" msgstr "Tout Afficher"
#: gerbview/set_color.cpp:272 #: gerbview/set_color.cpp:268
msgid "Switch on all of the Gerber layers" msgid "Switch on all of the Gerber layers"
msgstr "Affiche toutes les couches Gerber" msgstr "Affiche toutes les couches Gerber"
#: gerbview/set_color.cpp:280 #: gerbview/set_color.cpp:276
msgid "Switch off all of the Gerber layers" msgid "Switch off all of the Gerber layers"
msgstr "N'affiche pas les couches Gerber" msgstr "N'affiche pas les couches Gerber"
...@@ -11836,11 +11848,11 @@ msgstr "Les données courante seront perdues ?" ...@@ -11836,11 +11848,11 @@ msgstr "Les données courante seront perdues ?"
msgid "Delete layer %d?" msgid "Delete layer %d?"
msgstr "Effacer couche %d" msgstr "Effacer couche %d"
#: gerbview/gerbview.cpp:37 #: gerbview/gerbview.cpp:40
msgid "GerbView project files (.cnf)|*.cnf" msgid "GerbView project files (.cnf)|*.cnf"
msgstr "Fichiers projet GerbView (.cnf)|*.cnf" msgstr "Fichiers projet GerbView (.cnf)|*.cnf"
#: gerbview/gerbview.cpp:90 #: gerbview/gerbview.cpp:91
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 ?"
...@@ -12316,11 +12328,11 @@ msgstr "Catalan" ...@@ -12316,11 +12328,11 @@ msgstr "Catalan"
msgid "Dutch" msgid "Dutch"
msgstr "Hollandais" msgstr "Hollandais"
#: common/edaappl.cpp:800 #: common/edaappl.cpp:816
msgid "Language" msgid "Language"
msgstr "Langue" msgstr "Langue"
#: common/edaappl.cpp:801 #: common/edaappl.cpp:817
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!)"
...@@ -12352,23 +12364,23 @@ msgstr "Fichiers \"Portable document format\" (*.pdf)|*.pdf" ...@@ -12352,23 +12364,23 @@ msgstr "Fichiers \"Portable document format\" (*.pdf)|*.pdf"
msgid "All files (*)|*" msgid "All files (*)|*"
msgstr "Tous les fichiers (*)|*" msgstr "Tous les fichiers (*)|*"
#: common/common.cpp:217 #: common/common.cpp:228
msgid " (\"):" msgid " (\"):"
msgstr " (\"):" msgstr " (\"):"
#: common/common.cpp:239 #: common/common.cpp:250
msgid "inches" msgid "inches"
msgstr "Pouces" msgstr "Pouces"
#: common/common.cpp:247 #: common/common.cpp:258
msgid "centimeters" msgid "centimeters"
msgstr "centimètres" msgstr "centimètres"
#: common/common.cpp:250 #: common/common.cpp:261
msgid "Unknown" msgid "Unknown"
msgstr "Inconnu" msgstr "Inconnu"
#: common/common.cpp:328 #: common/common.cpp:339
msgid " \"" msgid " \""
msgstr " \"" msgstr " \""
...@@ -12376,22 +12388,6 @@ msgstr " \"" ...@@ -12376,22 +12388,6 @@ msgstr " \""
msgid "??" msgid "??"
msgstr "??" msgstr "??"
#: common/get_component_dialog.cpp:69
msgid "History list:"
msgstr "Historique:"
#: common/get_component_dialog.cpp:86
msgid "Search by Keyword"
msgstr "Chercher par Mot Clé"
#: common/get_component_dialog.cpp:92
msgid "List All"
msgstr "Liste tous"
#: common/get_component_dialog.cpp:98
msgid "Select by Browser"
msgstr "Sélection par Viewer"
#: common/dsnlexer.cpp:167 #: common/dsnlexer.cpp:167
msgid "in file" msgid "in file"
msgstr "dans le fichier" msgstr "dans le fichier"
...@@ -12430,6 +12426,22 @@ msgstr "Fichier d'aide %s non trouvé" ...@@ -12430,6 +12426,22 @@ 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/get_component_dialog.cpp:70
msgid "History list:"
msgstr "Historique:"
#: common/get_component_dialog.cpp:87
msgid "Search by Keyword"
msgstr "Chercher par Mot Clé"
#: common/get_component_dialog.cpp:93
msgid "List All"
msgstr "Liste tous"
#: common/get_component_dialog.cpp:99
msgid "Select by Browser"
msgstr "Sélection par Viewer"
#: common/dialog_load_error.cpp:7 #: common/dialog_load_error.cpp:7
msgid "Load Error!" msgid "Load Error!"
msgstr "Erreur de Chargement!" msgstr "Erreur de Chargement!"
...@@ -12865,87 +12877,87 @@ msgstr "Editeur de Règles de Conception" ...@@ -12865,87 +12877,87 @@ msgstr "Editeur de Règles de Conception"
msgid "Global Edition of Tracks and Vias" msgid "Global Edition of Tracks and Vias"
msgstr "Edition Globale de Pistes et Vias" msgstr "Edition Globale de Pistes et Vias"
#: eeschema/eelayer.h:35 #: eeschema/eelayer.h:31
msgid "EESchema Colors" msgid "EESchema Colors"
msgstr "Couleurs dans EESchema" msgstr "Couleurs dans EESchema"
#: eeschema/eelayer.h:73 #: eeschema/eelayer.h:69
msgid "Wire" msgid "Wire"
msgstr "Fil" msgstr "Fil"
#: eeschema/eelayer.h:79 #: eeschema/eelayer.h:75
msgid "Bus" msgid "Bus"
msgstr "Bus" msgstr "Bus"
#: eeschema/eelayer.h:91 #: eeschema/eelayer.h:87
msgid "Label" msgid "Label"
msgstr "Label" msgstr "Label"
#: eeschema/eelayer.h:97 #: eeschema/eelayer.h:93
msgid "GlobLabel" msgid "GlobLabel"
msgstr "Lab Global" msgstr "Lab Global"
#: eeschema/eelayer.h:103 #: eeschema/eelayer.h:99
msgid "Netname" msgid "Netname"
msgstr "NetName" msgstr "NetName"
#: eeschema/eelayer.h:109 #: eeschema/eelayer.h:105
msgid "Notes" msgid "Notes"
msgstr "Notes" msgstr "Notes"
#: eeschema/eelayer.h:115 #: eeschema/eelayer.h:111
msgid "NoConn" msgid "NoConn"
msgstr "Non Conn" msgstr "Non Conn"
#: eeschema/eelayer.h:128 #: eeschema/eelayer.h:124
msgid "Body Bg" msgid "Body Bg"
msgstr "Body Bg" msgstr "Body Bg"
#: eeschema/eelayer.h:140 #: eeschema/eelayer.h:136
msgid "PinNum" msgid "PinNum"
msgstr "Num Pin" msgstr "Num Pin"
#: eeschema/eelayer.h:146 #: eeschema/eelayer.h:142
msgid "PinNam" msgid "PinNam"
msgstr "Nom Pin" msgstr "Nom Pin"
#: eeschema/eelayer.h:177 #: eeschema/eelayer.h:173
msgid "Sheetfile" msgid "Sheetfile"
msgstr "Fichier feuille" msgstr "Fichier feuille"
#: eeschema/eelayer.h:183 #: eeschema/eelayer.h:179
msgid "SheetName" msgid "SheetName"
msgstr "Nom feuille" msgstr "Nom feuille"
#: eeschema/eelayer.h:189 #: eeschema/eelayer.h:185
msgid "SheetLabel (Pin Sheet)" msgid "SheetLabel (Pin Sheet)"
msgstr "Label de feuille ( Pin de Feuille)" msgstr "Label de feuille ( Pin de Feuille)"
#: eeschema/eelayer.h:195 #: eeschema/eelayer.h:191
msgid "Hierarchical Label" msgid "Hierarchical Label"
msgstr "Label Hiérarchique" msgstr "Label Hiérarchique"
#: eeschema/eelayer.h:201 #: eeschema/eelayer.h:197
msgid "Erc Warning" msgid "Erc Warning"
msgstr "ERC Warning" msgstr "ERC Warning"
#: eeschema/eelayer.h:207 #: eeschema/eelayer.h:203
msgid "Erc Error" msgid "Erc Error"
msgstr "ERC Erreur" msgstr "ERC Erreur"
#: eeschema/eelayer.h:259 #: eeschema/eelayer.h:255
msgid "Device" msgid "Device"
msgstr "Composant" msgstr "Composant"
#: eeschema/eelayer.h:265 #: eeschema/eelayer.h:261
msgid "Sheets" msgid "Sheets"
msgstr "Feuilles" msgstr "Feuilles"
#: eeschema/eelayer.h:271 #: eeschema/eelayer.h:267
msgid "Erc Mark" msgid "Erc Mark"
msgstr "Marqueur ERC" msgstr "Marqueur ERC"
#: eeschema/eelayer.h:277 #: eeschema/eelayer.h:273
msgid "Other" msgid "Other"
msgstr "Autre" msgstr "Autre"
...@@ -13013,151 +13025,151 @@ msgstr "Liste du Matériel" ...@@ -13013,151 +13025,151 @@ msgstr "Liste du Matériel"
msgid "Component Builder" msgid "Component Builder"
msgstr "Générateur de Composant" msgstr "Générateur de Composant"
#: gerbview/set_color.h:38 #: gerbview/set_color.h:35
msgid "GerbView Layer Colors:" msgid "GerbView Layer Colors:"
msgstr "Gerbview: Couleur des couches" msgstr "Gerbview: Couleur des couches"
#: gerbview/set_color.h:80 #: gerbview/set_color.h:77
msgid "Layers 1-16" msgid "Layers 1-16"
msgstr "Couches 1-16" msgstr "Couches 1-16"
#: gerbview/set_color.h:86 #: gerbview/set_color.h:83
msgid "Layer 1" msgid "Layer 1"
msgstr "Couche 1" msgstr "Couche 1"
#: gerbview/set_color.h:93 #: gerbview/set_color.h:90
msgid "Layer 2" msgid "Layer 2"
msgstr "Couche 2" msgstr "Couche 2"
#: gerbview/set_color.h:100 #: gerbview/set_color.h:97
msgid "Layer 3" msgid "Layer 3"
msgstr "Couche 3" msgstr "Couche 3"
#: gerbview/set_color.h:107 #: gerbview/set_color.h:104
msgid "Layer 4" msgid "Layer 4"
msgstr "Couche 4" msgstr "Couche 4"
#: gerbview/set_color.h:114 #: gerbview/set_color.h:111
msgid "Layer 5" msgid "Layer 5"
msgstr "Couche 5" msgstr "Couche 5"
#: gerbview/set_color.h:121 #: gerbview/set_color.h:118
msgid "Layer 6" msgid "Layer 6"
msgstr "Couche 6" msgstr "Couche 6"
#: gerbview/set_color.h:128 #: gerbview/set_color.h:125
msgid "Layer 7" msgid "Layer 7"
msgstr "Couche 7" msgstr "Couche 7"
#: gerbview/set_color.h:135 #: gerbview/set_color.h:132
msgid "Layer 8" msgid "Layer 8"
msgstr "Couche 8" msgstr "Couche 8"
#: gerbview/set_color.h:142 #: gerbview/set_color.h:139
msgid "Layer 9" msgid "Layer 9"
msgstr "Couche 9" msgstr "Couche 9"
#: gerbview/set_color.h:149 #: gerbview/set_color.h:146
msgid "Layer 10" msgid "Layer 10"
msgstr "Couche 10" msgstr "Couche 10"
#: gerbview/set_color.h:156 #: gerbview/set_color.h:153
msgid "Layer 11" msgid "Layer 11"
msgstr "Couche 11" msgstr "Couche 11"
#: gerbview/set_color.h:163 #: gerbview/set_color.h:160
msgid "Layer 12" msgid "Layer 12"
msgstr "Couche 12" msgstr "Couche 12"
#: gerbview/set_color.h:170 #: gerbview/set_color.h:167
msgid "Layer 13" msgid "Layer 13"
msgstr "Couche 13" msgstr "Couche 13"
#: gerbview/set_color.h:177 #: gerbview/set_color.h:174
msgid "Layer 14" msgid "Layer 14"
msgstr "Couche 14" msgstr "Couche 14"
#: gerbview/set_color.h:184 #: gerbview/set_color.h:181
msgid "Layer 15" msgid "Layer 15"
msgstr "Couche 15" msgstr "Couche 15"
#: gerbview/set_color.h:191 #: gerbview/set_color.h:188
msgid "Layer 16" msgid "Layer 16"
msgstr "Couche 16" msgstr "Couche 16"
#: gerbview/set_color.h:199 #: gerbview/set_color.h:196
msgid "Layers 17-32" msgid "Layers 17-32"
msgstr "Couches 17-32" msgstr "Couches 17-32"
#: gerbview/set_color.h:205 #: gerbview/set_color.h:202
msgid "Layer 17" msgid "Layer 17"
msgstr "Couche 17" msgstr "Couche 17"
#: gerbview/set_color.h:212 #: gerbview/set_color.h:209
msgid "Layer 18" msgid "Layer 18"
msgstr "Couche 18" msgstr "Couche 18"
#: gerbview/set_color.h:219 #: gerbview/set_color.h:216
msgid "Layer 19" msgid "Layer 19"
msgstr "Couche 19" msgstr "Couche 19"
#: gerbview/set_color.h:226 #: gerbview/set_color.h:223
msgid "Layer 20" msgid "Layer 20"
msgstr "Couche 20" msgstr "Couche 20"
#: gerbview/set_color.h:233 #: gerbview/set_color.h:230
msgid "Layer 21" msgid "Layer 21"
msgstr "Couche 21" msgstr "Couche 21"
#: gerbview/set_color.h:240 #: gerbview/set_color.h:237
msgid "Layer 22" msgid "Layer 22"
msgstr "Couche 22" msgstr "Couche 22"
#: gerbview/set_color.h:247 #: gerbview/set_color.h:244
msgid "Layer 23" msgid "Layer 23"
msgstr "Couche 23" msgstr "Couche 23"
#: gerbview/set_color.h:254 #: gerbview/set_color.h:251
msgid "Layer 24" msgid "Layer 24"
msgstr "Couche 24" msgstr "Couche 24"
#: gerbview/set_color.h:261 #: gerbview/set_color.h:258
msgid "Layer 25" msgid "Layer 25"
msgstr "Couche 25" msgstr "Couche 25"
#: gerbview/set_color.h:268 #: gerbview/set_color.h:265
msgid "Layer 26" msgid "Layer 26"
msgstr "Couche 26" msgstr "Couche 26"
#: gerbview/set_color.h:275 #: gerbview/set_color.h:272
msgid "Layer 27" msgid "Layer 27"
msgstr "Couche 26" msgstr "Couche 26"
#: gerbview/set_color.h:282 #: gerbview/set_color.h:279
msgid "Layer 28" msgid "Layer 28"
msgstr "Couche 28" msgstr "Couche 28"
#: gerbview/set_color.h:289 #: gerbview/set_color.h:286
msgid "Layer 29" msgid "Layer 29"
msgstr "Couche 29" msgstr "Couche 29"
#: gerbview/set_color.h:296 #: gerbview/set_color.h:293
msgid "Layer 30" msgid "Layer 30"
msgstr "Couche 30" msgstr "Couche 30"
#: gerbview/set_color.h:303 #: gerbview/set_color.h:300
msgid "Layer 31" msgid "Layer 31"
msgstr "Couche 31" msgstr "Couche 31"
#: gerbview/set_color.h:310 #: gerbview/set_color.h:307
msgid "Layer 32" msgid "Layer 32"
msgstr "Couche 32" msgstr "Couche 32"
#: gerbview/set_color.h:318 #: gerbview/set_color.h:315
msgid "Others" msgid "Others"
msgstr "Autres" msgstr "Autres"
#: gerbview/set_color.h:332 #: gerbview/set_color.h:329
msgid "D codes id." msgid "D codes id."
msgstr "DCodes id." msgstr "DCodes id."
......
pcbnew/class_board.cpp
View file @ a61b48ec
...@@ -432,12 +432,6 @@ void BOARD::SetElementVisibility( int aPCB_VISIBLE, bool isEnabled ) ...@@ -432,12 +432,6 @@ void BOARD::SetElementVisibility( int aPCB_VISIBLE, bool isEnabled )
{ {
switch( aPCB_VISIBLE ) switch( aPCB_VISIBLE )
{ {
case GRID_VISIBLE:
m_PcbFrame->m_Draw_Grid = isEnabled;
GetBoardDesignSettings()->SetElementVisibility( aPCB_VISIBLE, isEnabled );
break;
case RATSNEST_VISIBLE: case RATSNEST_VISIBLE:
GetBoardDesignSettings()->SetElementVisibility( aPCB_VISIBLE, isEnabled ); GetBoardDesignSettings()->SetElementVisibility( aPCB_VISIBLE, isEnabled );
// we must clear or set the CH_VISIBLE flags to hide/show ratsnet // we must clear or set the CH_VISIBLE flags to hide/show ratsnet
...@@ -478,10 +472,8 @@ int BOARD::GetVisibleElementColor( int aPCB_VISIBLE ) ...@@ -478,10 +472,8 @@ int BOARD::GetVisibleElementColor( int aPCB_VISIBLE )
case PAD_FR_VISIBLE: case PAD_FR_VISIBLE:
case PAD_BK_VISIBLE: case PAD_BK_VISIBLE:
case RATSNEST_VISIBLE: case RATSNEST_VISIBLE:
color = GetColorsSettings()->GetItemColor( aPCB_VISIBLE );
break;
case GRID_VISIBLE: case GRID_VISIBLE:
color = g_GridColor; color = GetColorsSettings()->GetItemColor( aPCB_VISIBLE );
break; break;
default: default:
...@@ -505,15 +497,9 @@ void BOARD::SetVisibleElementColor( int aPCB_VISIBLE, int aColor ) ...@@ -505,15 +497,9 @@ void BOARD::SetVisibleElementColor( int aPCB_VISIBLE, int aColor )
case ANCHOR_VISIBLE: case ANCHOR_VISIBLE:
case PAD_FR_VISIBLE: case PAD_FR_VISIBLE:
case PAD_BK_VISIBLE: case PAD_BK_VISIBLE:
case GRID_VISIBLE:
GetColorsSettings()->SetItemColor( aPCB_VISIBLE, aColor ); GetColorsSettings()->SetItemColor( aPCB_VISIBLE, aColor );
break; break;
case RATSNEST_VISIBLE:
GetColorsSettings()->SetItemColor( aPCB_VISIBLE, aColor );
break;
case GRID_VISIBLE:
g_GridColor = aColor;
break;
default: default:
wxLogDebug( wxT( "BOARD::SetVisibleElementColor(): bad arg %d" ), aPCB_VISIBLE ); wxLogDebug( wxT( "BOARD::SetVisibleElementColor(): bad arg %d" ), aPCB_VISIBLE );
......
pcbnew/modeditoptions.cpp
View file @ a61b48ec
...@@ -22,7 +22,7 @@ void WinEDA_ModuleEditFrame::OnSelectOptionToolbar( wxCommandEvent& event ) ...@@ -22,7 +22,7 @@ void WinEDA_ModuleEditFrame::OnSelectOptionToolbar( wxCommandEvent& event )
switch( id ) switch( id )
{ {
case ID_TB_OPTIONS_SHOW_GRID: case ID_TB_OPTIONS_SHOW_GRID:
m_Draw_Grid = m_OptionsToolBar->GetToolState( id ); SetGridVisibility( m_OptionsToolBar->GetToolState( id ) );
DrawPanel->Refresh( ); DrawPanel->Refresh( );
break; break;
......
pcbnew/moduleframe.cpp
View file @ a61b48ec
...@@ -363,9 +363,9 @@ void WinEDA_ModuleEditFrame::SetToolbars() ...@@ -363,9 +363,9 @@ void WinEDA_ModuleEditFrame::SetToolbars()
_( "Display polar coordinates" ) ); _( "Display polar coordinates" ) );
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID, m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID,
m_Draw_Grid ); IsGridVisible( ) );
m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_GRID, m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_GRID,
m_Draw_Grid ? IsGridVisible( ) ?
_( "Hide grid" ) : _( "Hide grid" ) :
_( "Show grid" ) ); _( "Show grid" ) );
......
pcbnew/pcbframe.cpp
View file @ a61b48ec
...@@ -844,10 +844,6 @@ void WinEDA_PcbFrame::LoadSettings() ...@@ -844,10 +844,6 @@ void WinEDA_PcbFrame::LoadSettings()
config->Read( PCB_MAGNETIC_TRACKS_OPT, &g_MagneticTrackOption ); config->Read( PCB_MAGNETIC_TRACKS_OPT, &g_MagneticTrackOption );
config->Read( SHOW_MICROWAVE_TOOLS, &m_show_microwave_tools ); config->Read( SHOW_MICROWAVE_TOOLS, &m_show_microwave_tools );
config->Read( SHOW_LAYER_MANAGER_TOOLS, &m_show_layer_manager_tools ); config->Read( SHOW_LAYER_MANAGER_TOOLS, &m_show_layer_manager_tools );
// Copy grid visibility (set by LoadSetting() in visibility items list:
GetBoard()->SetElementVisibility(GRID_VISIBLE, m_Draw_Grid);
} }
...@@ -872,6 +868,40 @@ void WinEDA_PcbFrame::SaveSettings() ...@@ -872,6 +868,40 @@ void WinEDA_PcbFrame::SaveSettings()
} }
/** Function IsGridVisible() , virtual
* @return true if the grid must be shown
*/
bool WinEDA_PcbFrame::IsGridVisible()
{
return IsElementVisible(GRID_VISIBLE);
}
/** Function SetGridVisibility() , virtual
* It may be overloaded by derived classes
* if you want to store/retrieve the grid visiblity in configuration.
* @param aVisible = true if the grid must be shown
*/
void WinEDA_PcbFrame::SetGridVisibility(bool aVisible)
{
SetElementVisibility(GRID_VISIBLE, aVisible);
}
/** Function GetGridColor() , virtual
* @return the color of the grid
*/
int WinEDA_PcbFrame::GetGridColor()
{
return GetBoard()->GetVisibleElementColor( GRID_VISIBLE );
}
/** Function SetGridColor() , virtual
* @param aColor = the new color of the grid
*/
void WinEDA_PcbFrame::SetGridColor(int aColor)
{
GetBoard()->SetVisibleElementColor( GRID_VISIBLE, aColor );
}
/* Return true if a microvia can be put on board /* Return true if a microvia can be put on board
* A microvia ia a small via restricted to 2 near neighbour layers * A microvia ia a small via restricted to 2 near neighbour layers
* because its is hole is made by laser which can penetrate only one layer * because its is hole is made by laser which can penetrate only one layer
......
pcbnew/pcbnew_config.h
View file @ a61b48ec
...@@ -579,14 +579,6 @@ static PARAM_CFG_SETCOLOR ColorViaMicroViaCfg // Buried Via Color ...@@ -579,14 +579,6 @@ static PARAM_CFG_SETCOLOR ColorViaMicroViaCfg // Buried Via Color
CYAN CYAN
); );
static PARAM_CFG_SETCOLOR ColorpcbGrilleCfg
(
INSETUP,
wxT( "CoPcbGr" ),
&g_GridColor,
DARKGRAY
);
static PARAM_CFG_SETCOLOR ColorCheveluCfg static PARAM_CFG_SETCOLOR ColorCheveluCfg
( (
INSETUP, INSETUP,
...@@ -795,7 +787,6 @@ PARAM_CFG_BASE* ParamCfgList[] = ...@@ -795,7 +787,6 @@ PARAM_CFG_BASE* ParamCfgList[] =
&ColorViaThroughCfg, &ColorViaThroughCfg,
&ColorViaBlindBuriedCfg, &ColorViaBlindBuriedCfg,
&ColorViaMicroViaCfg, &ColorViaMicroViaCfg,
&ColorpcbGrilleCfg,
&ColorCheveluCfg, &ColorCheveluCfg,
&HPGLpenNumCfg, &HPGLpenNumCfg,
&HPGLdiamCfg, &HPGLdiamCfg,
......
pcbnew/tool_modedit.cpp
View file @ a61b48ec
...@@ -201,7 +201,7 @@ void WinEDA_ModuleEditFrame::ReCreateOptToolbar() ...@@ -201,7 +201,7 @@ void WinEDA_ModuleEditFrame::ReCreateOptToolbar()
m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString, m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString,
wxBitmap( grid_xpm ), wxBitmap( grid_xpm ),
_( "Hide grid" ), wxITEM_CHECK ); _( "Hide grid" ), wxITEM_CHECK );
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID, m_Draw_Grid ); m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID,IsGridVisible() );
m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_POLAR_COORD, wxEmptyString, m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_POLAR_COORD, wxEmptyString,
wxBitmap( polar_coord_xpm ), wxBitmap( polar_coord_xpm ),
......
pcbnew/toolbars_update_user_interface.cpp
View file @ a61b48ec
...@@ -203,9 +203,9 @@ void WinEDA_PcbFrame::SetToolbars() ...@@ -203,9 +203,9 @@ void WinEDA_PcbFrame::SetToolbars()
_( "Display rectangular coordinates" ) : _( "Display rectangular coordinates" ) :
_( "Display polar coordinates" ) ); _( "Display polar coordinates" ) );
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID, GetBoard()->IsElementVisible(GRID_VISIBLE) ); m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID, IsGridVisible( ) );
m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_GRID, m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_GRID,
GetBoard()->IsElementVisible(GRID_VISIBLE) ? IsGridVisible( ) ?
_( "Hide grid" ) : _( "Hide grid" ) :
_( "Show grid" ) ); _( "Show grid" ) );
......
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