patch for 3D viewer from Emanuel Rumpf and minor other changes

3d-viewer/3d_aux.cpp

@@ -172,6 +172,14 @@ Info_3D_Visu::Info_3D_Visu()
 
     m_Layers = 1;
     m_BoardSettings = NULL;
+	m_Draw3DAxis = TRUE;
+	m_Draw3DModule = TRUE;
+	m_Draw3DPlace = TRUE;
+	m_Draw3DZone = TRUE;
+	m_Draw3DComments = TRUE;
+	m_Draw3DDrawings = TRUE;
+	m_Draw3DEco1 = TRUE;
+	m_Draw3DEco2 = TRUE;
 }
 
 

3d-viewer/3d_canvas.cpp

@@ -83,6 +83,7 @@ Pcb3D_GLCanvas::~Pcb3D_GLCanvas()
 /*************************************/
 {
     ClearLists();
+	m_init = FALSE;
 }
 
 
@@ -92,7 +93,7 @@ void Pcb3D_GLCanvas::ClearLists()
 {
     if( m_gllist > 0 )
         glDeleteLists( m_gllist, 1 );
-    m_init   = FALSE;
+//    m_init   = FALSE;
     m_gllist = 0;
 }
 

3d-viewer/3d_draw.cpp

 //////////////////////////////////////
-
 // Name:        3d_draw.cpp
 //////////////////////////////////////
 
@@ -47,7 +46,8 @@ static void Draw3D_ArcSegment(double startx, double starty,
 				double endx, double endy,double width, double zpos);
 static void Draw3D_CircleSegment(double startx, double starty,
 				double endx, double endy,double width, double zpos);
-
+static int Get3DLayerEnable(int act_layer);
+static GLfloat Get3DLayerSide(int act_layer);
 
 /******************************************/
 void Pcb3D_GLCanvas::Redraw( bool finish )
@@ -122,7 +122,8 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
             g_Parm_3D_Visu.m_LayerZcoord[ii] = g_Parm_3D_Visu.m_Epoxy_Width;
     }
 
-    GLfloat zpos_cu  = 500 * g_Parm_3D_Visu.m_BoardScale;
+    //GLfloat zpos_cu  = 500 * g_Parm_3D_Visu.m_BoardScale;
+	GLfloat zpos_cu  = 10 * g_Parm_3D_Visu.m_BoardScale;
     GLfloat zpos_cmp = g_Parm_3D_Visu.m_Epoxy_Width + zpos_cu;
     g_Parm_3D_Visu.m_LayerZcoord[ADHESIVE_N_CU]    = -zpos_cu * 2;
     g_Parm_3D_Visu.m_LayerZcoord[ADHESIVE_N_CMP]   = zpos_cmp + zpos_cu;
@@ -138,19 +139,21 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
     glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );
 
     /* draw axes */
-    glEnable( GL_COLOR_MATERIAL );
-    SetGLColor( WHITE );
-    glBegin( GL_LINES );
-    glNormal3f( 0.0, 0.0, 1.0 );    // Normal is Z axis
-    glVertex3f( 0.0, 0.0, 0.0 );
-    glVertex3f( 1.0, 0.0, 0.0 );    // X axis
-    glVertex3f( 0.0, 0.0, 0.0 );
-    glVertex3f( 0.0, -1.0, 0.0 );   // Y axis
-    glNormal3f( 1.0, 0.0, 0.0 );    // Normal is Y axis
-    glVertex3f( 0.0, 0.0, 0.0 );
-    glVertex3f( 0.0, 0.0, 0.3 );    // Z axis
-    glEnd();
-
+	if (g_Parm_3D_Visu.m_Draw3DAxis){
+    	glEnable( GL_COLOR_MATERIAL );
+    	SetGLColor( WHITE );
+    	glBegin( GL_LINES );
+    	glNormal3f( 0.0, 0.0, 1.0 );    // Normal is Z axis
+    	glVertex3f( 0.0, 0.0, 0.0 );
+    	glVertex3f( 1.0, 0.0, 0.0 );    // X axis
+    	glVertex3f( 0.0, 0.0, 0.0 );
+    	glVertex3f( 0.0, -1.0, 0.0 );   // Y axis
+    	glNormal3f( 1.0, 0.0, 0.0 );    // Normal is Y axis
+    	glVertex3f( 0.0, 0.0, 0.0 );
+    	glVertex3f( 0.0, 0.0, 0.3 );    // Z axis
+    	glEnd();
+	}
+	
     /* Draw epoxy limits (do not use, works and test in progress) */
 #if 0
     glEnable( GL_FOG );
@@ -198,15 +201,32 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
         else
             Draw3D_Track( pt_piste );
     }
+	if (g_Parm_3D_Visu.m_Draw3DZone){
+		for( pt_piste = pcb->m_Zone; pt_piste != NULL; pt_piste = (TRACK*) pt_piste->Pnext )
+	    {
+			if( pt_piste->Type() == TYPEZONE )
+				Draw3D_Track( pt_piste );
+		}
+	}	
 
     /* Trac des edges */
     EDA_BaseStruct* PtStruct;
     for( PtStruct = pcb->m_Drawings; PtStruct != NULL; PtStruct = PtStruct->Pnext )
     {
-        #define STRUCT ( (DRAWSEGMENT*) PtStruct )
-        if( PtStruct->Type() != TYPEDRAWSEGMENT )
-            continue;
-        Draw3D_DrawSegment( STRUCT );
+        //if( PtStruct->Type() != TYPEDRAWSEGMENT )
+        //    continue;
+		if( PtStruct->Type() == TYPEDRAWSEGMENT )
+		{
+			#undef STRUCT
+			#define STRUCT ( (DRAWSEGMENT*) PtStruct )
+        	Draw3D_DrawSegment( STRUCT );
+		}	
+		if( PtStruct->Type() == TYPETEXTE )
+		{
+			#undef STRUCT
+            #define STRUCT ( (TEXTE_PCB*) PtStruct )
+            Draw3D_DrawText( STRUCT );
+		}
     }
 
     /* trac des modules */
@@ -284,8 +304,11 @@ void Pcb3D_GLCanvas::Draw3D_Via( SEGVIA* via )
             color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[CMP_N];
         if( color & ITEM_NOT_SHOW )
             continue;
-        SetGLColor( color );
+		//SetGLColor( color );	
+		SetGLColor( LIGHTGRAY );
         glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
+        if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale;
+		else 						 zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale;			
         Draw3D_FilledCircle( x, -y, r, hole, zpos );
         if( layer >= top_layer )
             break;
@@ -339,11 +362,75 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment )
     }
     else
     {
-        zpos = g_Parm_3D_Visu.m_LayerZcoord[segment->GetLayer()];
-        Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos );
+		layer = segment->GetLayer();
+		glNormal3f( 0.0, 0.0, Get3DLayerSide(layer) );
+        zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
+		if (Get3DLayerEnable(layer))   
+		{
+			switch( segment->m_Shape )
+			{
+				case S_ARC:
+					Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos);
+					break;
+				case S_CIRCLE:
+					Draw3D_CircleSegment( x, -y, xf, -yf, w, zpos);
+					break;
+				default :
+					Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos);
+					break;
+			}
+		}
     }
 }
 
+/*************************************************************/
+void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
+/*************************************************************/
+{
+    int    layer = text->GetLayer();
+    double x, y, xf, yf;
+    double zpos, w;
+    int    color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
+    int coord[104];
+    int ii, jj, kk, ll, nbpoints;
+	
+	
+	if (Get3DLayerEnable(layer))   
+	{
+		zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
+		glNormal3f( 0.0, 0.0, Get3DLayerSide(layer) );
+	
+		text->CreateDrawData();
+		jj = 5; ii = jj + 1;
+    	while( ii < text->m_TextDrawingsSize )
+		{
+        	nbpoints = text->m_TextDrawings[jj];
+        	if( nbpoints > 50 )
+            	nbpoints = 50;
+
+        	for( kk = 0, ll = 0; (kk < nbpoints) && (ii < text->m_TextDrawingsSize); kk++ )
+        	{
+				coord[ll++] = text->m_TextDrawings[ii++] + text->m_Pos.x;
+            	coord[ll++] = text->m_TextDrawings[ii++] + text->m_Pos.y;
+       		}
+
+        	jj = ii++;
+
+        	for( kk = 0, ll = 0; kk < (nbpoints - 1); kk++, ll += 2 )
+        	{
+		    	SetGLColor( color );
+    			w  =  text->m_Width * g_Parm_3D_Visu.m_BoardScale;
+    			x  =  coord[ll]     * g_Parm_3D_Visu.m_BoardScale;
+    			y  =  coord[ll + 1] * g_Parm_3D_Visu.m_BoardScale;
+    			xf =  coord[ll + 2] * g_Parm_3D_Visu.m_BoardScale;
+    			yf =  coord[ll + 3] * g_Parm_3D_Visu.m_BoardScale;
+
+				//printf("text koordinata x=%d, y=%d, x2=%d, y2=%d\n",x,y,xf,yf);
+				Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos );	
+			}
+		}
+	}	
+}
 
 /*********************************************/
 void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
@@ -373,34 +460,43 @@ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
     }
 
     /* Draw module shape: 3D shape if exists (or module edge if not exists) */
-    Struct3D_Master* Struct3D  = m_3D_Drawings;
-    bool             As3dShape = FALSE;
-    glPushMatrix();
-    glTranslatef( m_Pos.x * g_Parm_3D_Visu.m_BoardScale,
-                  -m_Pos.y * g_Parm_3D_Visu.m_BoardScale,
-                  g_Parm_3D_Visu.m_LayerZcoord[m_Layer] );
-    if( m_Orient )
-    {
-        glRotatef( (double) m_Orient / 10, 0.0, 0.0, 1.0 );
-    }
-    if( m_Layer == COPPER_LAYER_N )
-    {
-        glRotatef( 180.0, 0.0, 1.0, 0.0 );
-        glRotatef( 180.0, 0.0, 0.0, 1.0 );
-    }
-    DataScale3D = g_Parm_3D_Visu.m_BoardScale * UNITS3D_TO_UNITSPCB;
-
-    for( ; Struct3D != NULL; Struct3D = (Struct3D_Master*) Struct3D->Pnext )
-    {
-        if( !Struct3D->m_Shape3DName.IsEmpty() )
-        {
-            As3dShape = TRUE;
-            Struct3D->ReadData();
-        }
-    }
-
-    glPopMatrix();
-
+	Struct3D_Master* Struct3D  = m_3D_Drawings;
+	bool    As3dShape = FALSE;
+	bool	Place3D;
+	if ( (Struct3D->m_Shape3DName.Find(wxString(wxT("placa"))) != -1) ||
+	     (Struct3D->m_Shape3DName.Find(wxString(wxT("place"))) != -1) )
+	   Place3D = TRUE;
+	else Place3D = FALSE;   
+	
+	if ( (g_Parm_3D_Visu.m_Draw3DModule && !Place3D) ||
+	     (g_Parm_3D_Visu.m_Draw3DPlace && Place3D) )
+	{	
+    	glPushMatrix();
+    	glTranslatef( m_Pos.x * g_Parm_3D_Visu.m_BoardScale,
+	                  -m_Pos.y * g_Parm_3D_Visu.m_BoardScale,
+    	              g_Parm_3D_Visu.m_LayerZcoord[m_Layer] );
+	    if( m_Orient )
+    	{
+	        glRotatef( (double) m_Orient / 10, 0.0, 0.0, 1.0 );
+    	}
+	    if( m_Layer == COPPER_LAYER_N )
+	    {
+    	    glRotatef( 180.0, 0.0, 1.0, 0.0 );
+        	glRotatef( 180.0, 0.0, 0.0, 1.0 );
+	    }
+    	DataScale3D = g_Parm_3D_Visu.m_BoardScale * UNITS3D_TO_UNITSPCB;
+
+	    for( ; Struct3D != NULL; Struct3D = (Struct3D_Master*) Struct3D->Pnext )
+    	{
+        	if( !Struct3D->m_Shape3DName.IsEmpty() )
+	        {
+    	        As3dShape = TRUE;
+        	    Struct3D->ReadData();
+	        }
+    	}
+    	glPopMatrix();
+	}
+			
     if( !As3dShape )
     {
         EDA_BaseStruct* Struct = m_Drawings;
@@ -546,9 +642,12 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
             color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
             if( color & ITEM_NOT_SHOW )
                 continue;
-            SetGLColor( color );
+            //SetGLColor( color );
+			SetGLColor( LIGHTGRAY );
             glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
             zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
+			if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale;
+			else 						 zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale;
             Draw3D_FilledCircle( x, -y, r, hole, zpos );
         }
 
@@ -591,8 +690,11 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
                 glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
                 if( color & ITEM_NOT_SHOW )
                     continue;
-                SetGLColor( color );
-                zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
+                //SetGLColor( color );
+				SetGLColor( LIGHTGRAY );
+	            zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
+				if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale;
+				else 						 zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale;
                 Draw3D_FilledSegmentWithHole( ox, -oy, fx, -fy, w, drillx, -drilly, hole, zpos );
             }
         }
@@ -662,8 +764,11 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
             glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
             if( color & ITEM_NOT_SHOW )
                 continue;
-            SetGLColor( color );
+            //SetGLColor( color );
+			SetGLColor( LIGHTGRAY );
             zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
+			if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale;
+			else 						 zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale;			
             glBegin( GL_QUAD_STRIP );
             for( ii = 0; ii < 8; ii++ )
             {
@@ -946,3 +1051,40 @@ double x, y, hole, rayon;
 	}
 	glEnd();
 }
+
+/******************************************/
+static int Get3DLayerEnable(int act_layer)
+/******************************************/
+{
+	bool enablelayer;
+
+	enablelayer = TRUE;
+	if (act_layer == DRAW_N && !g_Parm_3D_Visu.m_Draw3DDrawings) 
+		enablelayer = FALSE;
+  	if (act_layer == COMMENT_N && !g_Parm_3D_Visu.m_Draw3DComments)
+  		enablelayer = FALSE; 
+  	if (act_layer == ECO1_N && !g_Parm_3D_Visu.m_Draw3DEco1) 
+		enablelayer = FALSE;
+  	if (act_layer == ECO2_N && !g_Parm_3D_Visu.m_Draw3DEco2)
+		enablelayer = FALSE;
+
+	return enablelayer;
+}
+
+/******************************************/
+static GLfloat Get3DLayerSide(int act_layer)
+/******************************************/
+{
+	GLfloat nZ;
+	nZ = 1.0;
+	if (
+		 (act_layer <= LAST_COPPER_LAYER-1) ||
+		 (act_layer == ADHESIVE_N_CU) ||
+		 (act_layer == SOLDERPASTE_N_CU) ||
+		 (act_layer == SILKSCREEN_N_CU) ||
+		 (act_layer == SOLDERMASK_N_CU)
+	   )  
+		nZ = -1.0;
+	return nZ;	 
+
+}

3d-viewer/3d_frame.cpp

@@ -293,6 +293,38 @@ void WinEDA3D_DrawFrame::Process_Special_Functions( wxCommandEvent& event )
         Set3DBgColor();
         return;
 
+    case ID_MENU3D_AXIS_ONOFF:
+        Set3DAxisOnOff();
+        return;
+
+    case ID_MENU3D_MODULE_ONOFF:
+        Set3DModuleOnOff();
+        return;
+
+    case ID_MENU3D_PLACE_ONOFF:
+        Set3DPlaceOnOff();
+        return;
+
+    case ID_MENU3D_ZONE_ONOFF:
+        Set3DZoneOnOff();
+        return;
+
+    case ID_MENU3D_COMMENTS_ONOFF:
+        Set3DCommentsOnOff();
+        return;
+
+    case ID_MENU3D_DRAWINGS_ONOFF:
+        Set3DDrawingsOnOff();
+        return;
+
+    case ID_MENU3D_ECO1_ONOFF:
+        Set3DEco1OnOff();
+        return;
+
+    case ID_MENU3D_ECO2_ONOFF:
+        Set3DEco2OnOff();
+        return;
+
     default:
         wxMessageBox(
             wxT( "WinEDA3D_DrawFrame::Process_Special_Functions() error: unknown command" ) );
@@ -315,7 +347,6 @@ void WinEDA3D_DrawFrame::NewDisplay()
     m_Canvas->Refresh( true );
 }
 
-
 /******************************************/
 void WinEDA3D_DrawFrame::Set3DBgColor()
 /******************************************/
@@ -339,3 +370,75 @@ void WinEDA3D_DrawFrame::Set3DBgColor()
         NewDisplay();
     }
 }
+
+/******************************************/
+void WinEDA3D_DrawFrame::Set3DAxisOnOff()
+/******************************************/
+{
+	if (g_Parm_3D_Visu.m_Draw3DAxis) g_Parm_3D_Visu.m_Draw3DAxis = FALSE;
+	else							 g_Parm_3D_Visu.m_Draw3DAxis = TRUE;
+	NewDisplay();
+}
+
+/******************************************/
+void WinEDA3D_DrawFrame::Set3DModuleOnOff()
+/******************************************/
+{
+	if (g_Parm_3D_Visu.m_Draw3DModule) g_Parm_3D_Visu.m_Draw3DModule = FALSE;
+	else 							   g_Parm_3D_Visu.m_Draw3DModule = TRUE;	
+	NewDisplay();
+}
+
+/******************************************/
+void WinEDA3D_DrawFrame::Set3DPlaceOnOff()
+/******************************************/
+{
+	if (g_Parm_3D_Visu.m_Draw3DPlace) g_Parm_3D_Visu.m_Draw3DPlace = FALSE;
+	else 							  g_Parm_3D_Visu.m_Draw3DPlace = TRUE;	
+	NewDisplay();
+}
+
+/******************************************/
+void WinEDA3D_DrawFrame::Set3DZoneOnOff()
+/******************************************/
+{
+	if (g_Parm_3D_Visu.m_Draw3DZone) g_Parm_3D_Visu.m_Draw3DZone = FALSE;
+	else 					         g_Parm_3D_Visu.m_Draw3DZone = TRUE;
+	NewDisplay();
+}
+
+/******************************************/
+void WinEDA3D_DrawFrame::Set3DCommentsOnOff()
+/******************************************/
+{
+	if (g_Parm_3D_Visu.m_Draw3DComments) g_Parm_3D_Visu.m_Draw3DComments = FALSE;
+	else 							     g_Parm_3D_Visu.m_Draw3DComments = TRUE;	
+	NewDisplay();
+}
+
+/******************************************/
+void WinEDA3D_DrawFrame::Set3DDrawingsOnOff()
+/******************************************/
+{
+	if (g_Parm_3D_Visu.m_Draw3DDrawings) g_Parm_3D_Visu.m_Draw3DDrawings = FALSE;
+	else 							     g_Parm_3D_Visu.m_Draw3DDrawings = TRUE;	
+	NewDisplay();
+}
+
+/******************************************/
+void WinEDA3D_DrawFrame::Set3DEco1OnOff()
+/******************************************/
+{
+	if (g_Parm_3D_Visu.m_Draw3DEco1) g_Parm_3D_Visu.m_Draw3DEco1 = FALSE;
+	else 							 g_Parm_3D_Visu.m_Draw3DEco1 = TRUE;	
+	NewDisplay();
+}
+
+/******************************************/
+void WinEDA3D_DrawFrame::Set3DEco2OnOff()
+/******************************************/
+{
+	if (g_Parm_3D_Visu.m_Draw3DEco2) g_Parm_3D_Visu.m_Draw3DEco2 = FALSE;
+	else 							 g_Parm_3D_Visu.m_Draw3DEco2 = TRUE;	
+	NewDisplay();
+}

3d-viewer/3d_toolbar.cpp

@@ -120,6 +120,29 @@ void WinEDA3D_DrawFrame::ReCreateMenuBar()
     ADD_MENUITEM( referencesMenu, ID_MENU3D_BGCOLOR_SELECTION,
                   _( "Choose background color" ), palette_xpm );
 
+    ADD_MENUITEM( referencesMenu, ID_MENU3D_AXIS_ONOFF,
+                  _( "Axis On/Off" ), axis3d_front_xpm );
+
+    ADD_MENUITEM( referencesMenu, ID_MENU3D_MODULE_ONOFF,
+                  _( "Module 3D On/Off" ), add_component_xpm );
+
+    ADD_MENUITEM( referencesMenu, ID_MENU3D_PLACE_ONOFF,
+                  _( "PCB place 3D On/off" ), select_w_layer_xpm );
+
+    ADD_MENUITEM( referencesMenu, ID_MENU3D_ZONE_ONOFF,
+                  _( "Zone On/Off" ), add_zone_xpm );
+				  
+    ADD_MENUITEM( referencesMenu, ID_MENU3D_COMMENTS_ONOFF,
+                  _( "Comments On/Off" ), edit_sheet_xpm );
+
+    ADD_MENUITEM( referencesMenu, ID_MENU3D_DRAWINGS_ONOFF,
+                  _( "Drawings On/Off" ), options_text_xpm );
+
+    ADD_MENUITEM( referencesMenu, ID_MENU3D_ECO1_ONOFF,
+                  _( "Eco1 On/Off" ), options_text_xpm );
+
+    ADD_MENUITEM( referencesMenu, ID_MENU3D_ECO2_ONOFF,
+                  _( "Eco2 On/Off" ), options_text_xpm );
 
     SetMenuBar( menuBar );
 }

3d-viewer/3d_viewer.h

@@ -54,6 +54,14 @@ public:
     float m_Rot[4];				/* man rotation of object */
     float m_Zoom;				/* field of view in degrees */
 	S3D_Color m_BgColor;
+	bool m_Draw3DAxis;
+	bool m_Draw3DModule;
+	bool m_Draw3DPlace;
+	bool m_Draw3DZone;
+	bool m_Draw3DComments;
+	bool m_Draw3DDrawings;
+	bool m_Draw3DEco1;
+	bool m_Draw3DEco2;
 	wxPoint m_BoardPos;
 	wxSize m_BoardSize;
 	int m_Layers;
@@ -107,6 +115,8 @@ public:
 	void Draw3D_Track(TRACK * track);
 	void Draw3D_Via(SEGVIA * via);
 	void Draw3D_DrawSegment(DRAWSEGMENT * segment);
+	void Draw3D_DrawText(TEXTE_PCB * text);
+	//int Get3DLayerEnable(int act_layer);
 
 DECLARE_EVENT_TABLE()
 };
@@ -151,6 +161,14 @@ public:
 
 	void NewDisplay();
 	void Set3DBgColor();
+	void Set3DAxisOnOff();
+	void Set3DModuleOnOff();
+	void Set3DPlaceOnOff();
+	void Set3DZoneOnOff();
+	void Set3DCommentsOnOff();
+	void Set3DDrawingsOnOff();
+	void Set3DEco1OnOff();
+	void Set3DEco2OnOff();
 
 DECLARE_EVENT_TABLE()
 };

common/makefile.include

@@ -15,7 +15,7 @@ OBJECTS= \
 		common_plotHPGL_functions.o\
 		hotkeys_basic.o\
 		drawtxt.o \
-		infospgm.o\
+		about_kicad.o\
 		wxwineda.o \
 		string.o \
 		gr_basic.o\

include/id.h

@@ -852,6 +852,14 @@ enum main_id {
 	ID_MOVE3D_UP,
 	ID_MOVE3D_DOWN,
 	ID_MENU3D_BGCOLOR_SELECTION,
+	ID_MENU3D_AXIS_ONOFF,
+	ID_MENU3D_MODULE_ONOFF,
+	ID_MENU3D_PLACE_ONOFF,
+	ID_MENU3D_ZONE_ONOFF,
+	ID_MENU3D_DRAWINGS_ONOFF,
+	ID_MENU3D_COMMENTS_ONOFF,
+	ID_MENU3D_ECO1_ONOFF,
+	ID_MENU3D_ECO2_ONOFF,
 	ID_3D_UNUSED0,
 	ID_3D_UNUSED1,
 	ID_3D_UNUSED2,

internat/fr/kicad.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kicad\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-05 09:14+0100\n"
-"PO-Revision-Date: 2008-08-05 09:16+0100\n"
+"POT-Creation-Date: 2008-08-12 13:05+0100\n"
+"PO-Revision-Date: 2008-08-12 13:05+0100\n"
 "Last-Translator: \n"
 "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
 "MIME-Version: 1.0\n"
@@ -341,7 +341,7 @@ msgstr "dimension"
 
 #: pcbnew/class_drawsegment.cpp:302
 #: pcbnew/class_marker.cpp:133
-#: pcbnew/class_text_mod.cpp:410
+#: pcbnew/class_text_mod.cpp:503
 #: pcbnew/class_track.cpp:852
 #: pcbnew/class_zone.cpp:608
 msgid "Type"
@@ -361,11 +361,11 @@ msgid "Segment"
 msgstr "Segment"
 
 #: pcbnew/class_drawsegment.cpp:327
-#: pcbnew/class_module.cpp:1121
-#: pcbnew/class_pad.cpp:983
+#: pcbnew/class_module.cpp:1080
+#: pcbnew/class_pad.cpp:993
 #: pcbnew/class_pcb_text.cpp:190
-#: pcbnew/class_text_mod.cpp:420
-#: pcbnew/class_text_mod.cpp:424
+#: pcbnew/class_text_mod.cpp:513
+#: pcbnew/class_text_mod.cpp:517
 #: pcbnew/class_track.cpp:909
 #: pcbnew/class_zone.cpp:637
 msgid "Layer"
@@ -374,7 +374,7 @@ msgstr "Couche"
 #: pcbnew/class_drawsegment.cpp:332
 #: pcbnew/class_edge_mod.cpp:297
 #: pcbnew/class_pcb_text.cpp:204
-#: pcbnew/class_text_mod.cpp:437
+#: pcbnew/class_text_mod.cpp:530
 #: pcbnew/class_track.cpp:932
 msgid "Width"
 msgstr "Epaisseur"
@@ -444,9 +444,9 @@ msgid "Seg"
 msgstr "Seg"
 
 #: pcbnew/class_edge_mod.cpp:286
-#: pcbnew/class_module.cpp:1148
-#: pcbnew/class_pad.cpp:893
-#: pcbnew/class_text_mod.cpp:401
+#: pcbnew/class_module.cpp:1107
+#: pcbnew/class_pad.cpp:903
+#: pcbnew/class_text_mod.cpp:494
 msgid "Module"
 msgstr "Module"
 
@@ -466,73 +466,73 @@ msgstr "Couche Seg."
 msgid "ErrType"
 msgstr "Type Err"
 
-#: pcbnew/class_module.cpp:1111
+#: pcbnew/class_module.cpp:1070
 msgid "Last Change"
 msgstr "Last Change"
 
-#: pcbnew/class_module.cpp:1117
+#: pcbnew/class_module.cpp:1076
 msgid "Netlist path"
 msgstr "Chemin Netliste "
 
-#: pcbnew/class_module.cpp:1141
+#: pcbnew/class_module.cpp:1100
 #: pcbnew/class_track.cpp:893
 msgid "Stat"
 msgstr "Stat"
 
-#: pcbnew/class_module.cpp:1145
-#: pcbnew/class_pad.cpp:1025
+#: pcbnew/class_module.cpp:1104
+#: pcbnew/class_pad.cpp:1035
 #: pcbnew/class_pcb_text.cpp:201
-#: pcbnew/class_text_mod.cpp:434
+#: pcbnew/class_text_mod.cpp:527
 msgid "Orient"
 msgstr "Orient"
 
-#: pcbnew/class_module.cpp:1151
+#: pcbnew/class_module.cpp:1110
 msgid "3D-Shape"
 msgstr "Forme 3D"
 
-#: pcbnew/class_module.cpp:1155
+#: pcbnew/class_module.cpp:1114
 msgid "Doc:  "
 msgstr "Doc: "
 
-#: pcbnew/class_module.cpp:1156
+#: pcbnew/class_module.cpp:1115
 msgid "KeyW: "
 msgstr "KeyW: "
 
-#: pcbnew/class_pad.cpp:810
+#: pcbnew/class_pad.cpp:820
 msgid "Unknown Pad shape"
 msgstr "Forme pad inconnue"
 
-#: pcbnew/class_pad.cpp:896
+#: pcbnew/class_pad.cpp:906
 msgid "RefP"
 msgstr "RefP"
 
-#: pcbnew/class_pad.cpp:996
+#: pcbnew/class_pad.cpp:1006
 #: pcbnew/class_pcb_text.cpp:207
-#: pcbnew/class_text_mod.cpp:440
+#: pcbnew/class_text_mod.cpp:533
 msgid "H Size"
 msgstr "Taille H"
 
-#: pcbnew/class_pad.cpp:1000
+#: pcbnew/class_pad.cpp:1010
 #: pcbnew/class_pcb_text.cpp:210
-#: pcbnew/class_text_mod.cpp:443
+#: pcbnew/class_text_mod.cpp:536
 msgid "V Size"
 msgstr "Taille V"
 
-#: pcbnew/class_pad.cpp:1006
+#: pcbnew/class_pad.cpp:1016
 #: pcbnew/class_track.cpp:924
 #: pcbnew/class_track.cpp:929
 msgid "Drill"
 msgstr "Perçage"
 
-#: pcbnew/class_pad.cpp:1014
+#: pcbnew/class_pad.cpp:1024
 msgid "Drill X / Y"
 msgstr "Perçage X/Y"
 
-#: pcbnew/class_pad.cpp:1029
+#: pcbnew/class_pad.cpp:1039
 msgid "X Pos"
 msgstr "X Pos"
 
-#: pcbnew/class_pad.cpp:1033
+#: pcbnew/class_pad.cpp:1043
 msgid "Y pos"
 msgstr "Y pos"
 
@@ -545,25 +545,25 @@ msgid "PCB Text"
 msgstr "Texte Pcb"
 
 #: pcbnew/class_pcb_text.cpp:194
-#: pcbnew/class_text_mod.cpp:431
+#: pcbnew/class_text_mod.cpp:524
 msgid "Mirror"
 msgstr "Miroir"
 
 #: pcbnew/class_pcb_text.cpp:196
-#: pcbnew/class_text_mod.cpp:414
+#: pcbnew/class_text_mod.cpp:506
 msgid "No"
 msgstr "Non"
 
 #: pcbnew/class_pcb_text.cpp:198
-#: pcbnew/class_text_mod.cpp:416
+#: pcbnew/class_text_mod.cpp:508
 msgid "Yes"
 msgstr "Oui"
 
-#: pcbnew/class_text_mod.cpp:396
+#: pcbnew/class_text_mod.cpp:488
 msgid "Ref."
 msgstr "Ref."
 
-#: pcbnew/class_text_mod.cpp:412
+#: pcbnew/class_text_mod.cpp:509
 msgid "Display"
 msgstr "Affichage"
 
@@ -1225,158 +1225,10 @@ msgid "The URL of the FreeRouting.net website"
 msgstr "L' URL du site FreeRouting.net"
 
 #: pcbnew/dialog_freeroute_exchange.cpp:222
-#: pcbnew/dialog_gendrill.cpp:282
 #: pcbnew/dialog_netlist.cpp:253
 msgid "&Close"
 msgstr "&Fermer"
 
-#: pcbnew/dialog_gendrill.cpp:164
-msgid "Millimeters"
-msgstr "Millimetres"
-
-#: pcbnew/dialog_gendrill.cpp:165
-#: pcbnew/dialog_general_options.cpp:299
-msgid "Inches"
-msgstr "Pouces"
-
-#: pcbnew/dialog_gendrill.cpp:166
-msgid "Drill Units:"
-msgstr "Unités perçage:"
-
-#: pcbnew/dialog_gendrill.cpp:171
-msgid "decimal format"
-msgstr "Format décimal"
-
-#: pcbnew/dialog_gendrill.cpp:172
-msgid "suppress leading zeros"
-msgstr "Suppression zeros de tête"
-
-#: pcbnew/dialog_gendrill.cpp:173
-msgid "suppress trailing zeros"
-msgstr "Suppression zeros de fin"
-
-#: pcbnew/dialog_gendrill.cpp:174
-msgid "keep zeros"
-msgstr "Garder les zéros"
-
-#: pcbnew/dialog_gendrill.cpp:175
-msgid "Zeros Format"
-msgstr "Format des zéros"
-
-#: pcbnew/dialog_gendrill.cpp:180
-msgid "2:3"
-msgstr "2:3"
-
-#: pcbnew/dialog_gendrill.cpp:181
-msgid "2:4"
-msgstr "2:4"
-
-#: pcbnew/dialog_gendrill.cpp:182
-msgid "Precision"
-msgstr "Précision"
-
-#: pcbnew/dialog_gendrill.cpp:187
-msgid "absolute"
-msgstr "Absolu"
-
-#: pcbnew/dialog_gendrill.cpp:188
-msgid "auxiliary axis"
-msgstr "Axe Auxiliaire"
-
-#: pcbnew/dialog_gendrill.cpp:189
-msgid "Drill Origin:"
-msgstr "Origine des coord de percage:"
-
-#: pcbnew/dialog_gendrill.cpp:197
-#: pcbnew/dialog_gendrill.cpp:205
-msgid "None"
-msgstr "Aucun"
-
-#: pcbnew/dialog_gendrill.cpp:198
-msgid "drill sheet (HPGL)"
-msgstr "Plan de perçage (HPGL)"
-
-#: pcbnew/dialog_gendrill.cpp:199
-msgid "drill sheet (PostScript)"
-msgstr "Plan de perçage (Postscript)"
-
-#: pcbnew/dialog_gendrill.cpp:200
-msgid "Drill Sheet:"
-msgstr "Plan de perçage:"
-
-#: pcbnew/dialog_gendrill.cpp:206
-msgid "Drill report"
-msgstr "Rapport de perçage"
-
-#: pcbnew/dialog_gendrill.cpp:207
-msgid "Drill Report:"
-msgstr "Rapport de perçage:"
-
-#: pcbnew/dialog_gendrill.cpp:211
-msgid "HPGL plotter Options:"
-msgstr "Options de Tracé HPGL:"
-
-#: pcbnew/dialog_gendrill.cpp:215
-msgid "Speed (cm/s)"
-msgstr "Vitesse plume ( cm/s )"
-
-#: pcbnew/dialog_gendrill.cpp:221
-msgid "Pen Number"
-msgstr "Numéro de plume"
-
-#: pcbnew/dialog_gendrill.cpp:227
-#: pcbnew/dialog_general_options.cpp:376
-msgid "Options:"
-msgstr "Options :"
-
-#: pcbnew/dialog_gendrill.cpp:231
-msgid "mirror y axis"
-msgstr "Miroir sur axe Y"
-
-#: pcbnew/dialog_gendrill.cpp:235
-msgid "minimal header"
-msgstr "Entête minimal"
-
-#: pcbnew/dialog_gendrill.cpp:242
-msgid "Info:"
-msgstr "Infos:"
-
-#: pcbnew/dialog_gendrill.cpp:246
-msgid "Default Vias Drill:"
-msgstr "Perçage vias par Défaut"
-
-#: pcbnew/dialog_gendrill.cpp:250
-msgid "Via Drill Value"
-msgstr "Perçage des Vias"
-
-#: pcbnew/dialog_gendrill.cpp:253
-msgid "Micro Vias Drill:"
-msgstr "Perçage Micro Via:"
-
-#: pcbnew/dialog_gendrill.cpp:257
-msgid "Micro Via Drill Value"
-msgstr "Valeur Perçage Micro Via"
-
-#: pcbnew/dialog_gendrill.cpp:260
-msgid "Holes Count:"
-msgstr "Nb Trous"
-
-#: pcbnew/dialog_gendrill.cpp:264
-msgid "Pads:"
-msgstr "Pastilles:"
-
-#: pcbnew/dialog_gendrill.cpp:267
-msgid "Through Vias:"
-msgstr "Via Traversantes:"
-
-#: pcbnew/dialog_gendrill.cpp:270
-msgid "Micro Vias:"
-msgstr "Micro Vias:"
-
-#: pcbnew/dialog_gendrill.cpp:273
-msgid "Buried Vias:"
-msgstr "Via Enterrées:"
-
 #: pcbnew/dialog_general_options.cpp:288
 msgid "No Display"
 msgstr "Pas d'affichage"
@@ -1385,6 +1237,10 @@ msgstr "Pas d'affichage"
 msgid "Display Polar Coord"
 msgstr "Affichage coord Polaires"
 
+#: pcbnew/dialog_general_options.cpp:299
+msgid "Inches"
+msgstr "Pouces"
+
 #: pcbnew/dialog_general_options.cpp:300
 msgid "millimeters"
 msgstr "millimetres"
@@ -1417,6 +1273,10 @@ msgstr "Liens max:"
 msgid "Auto Save (minuts):"
 msgstr "Sauveg. Auto (min)"
 
+#: pcbnew/dialog_general_options.cpp:376
+msgid "Options:"
+msgstr "Options :"
+
 #: pcbnew/dialog_general_options.cpp:385
 msgid "Drc ON"
 msgstr "Drc ACTIVE"
@@ -1786,6 +1646,10 @@ msgstr "Via enterrée ou Aveugle"
 msgid "Default Via Type"
 msgstr "Via par Défaut"
 
+#: pcbnew/dialog_track_options.cpp:223
+msgid "Micro Vias:"
+msgstr "Micro Vias:"
+
 #: pcbnew/dialog_track_options.cpp:232
 msgid "Micro Via Size"
 msgstr "Diametre Micro Via"
@@ -2081,14 +1945,6 @@ msgid "GenCAD file:"
 msgstr "Fichier GenCAD:"
 
 #: pcbnew/export_gencad.cpp:83
-#: pcbnew/files.cpp:352
-#: pcbnew/gen_modules_placefile.cpp:128
-#: pcbnew/gen_modules_placefile.cpp:139
-#: pcbnew/gen_modules_placefile.cpp:292
-#: pcbnew/librairi.cpp:308
-#: pcbnew/librairi.cpp:454
-#: pcbnew/librairi.cpp:604
-#: pcbnew/librairi.cpp:808
 msgid "Unable to create "
 msgstr "Impossible de créer "
 
@@ -2194,6 +2050,14 @@ msgstr "Fichier de percage"
 msgid "Unable to create file "
 msgstr "Impossible de créer le fichier "
 
+#: pcbnew/gendrill.cpp:378
+msgid "2:3"
+msgstr "2:3"
+
+#: pcbnew/gendrill.cpp:379
+msgid "2:4"
+msgstr "2:4"
+
 #: pcbnew/gendrill.cpp:384
 msgid "3:2"
 msgstr "3:2"
@@ -2902,22 +2766,27 @@ msgid "Place anchor"
 msgstr "Place Ancre"
 
 #: pcbnew/modedit_onclick.cpp:196
+#: pcbnew/onrightclick.cpp:127
 msgid "End Tool"
 msgstr "Fin Outil"
 
 #: pcbnew/modedit_onclick.cpp:206
+#: pcbnew/onrightclick.cpp:445
 msgid "Cancel Block"
 msgstr "Annuler Bloc"
 
 #: pcbnew/modedit_onclick.cpp:208
+#: pcbnew/onrightclick.cpp:447
 msgid "Zoom Block (drag middle mouse)"
 msgstr "Zoom Bloc (drag bouton du milieu souris)"
 
 #: pcbnew/modedit_onclick.cpp:211
+#: pcbnew/onrightclick.cpp:450
 msgid "Place Block"
 msgstr "Place Bloc"
 
 #: pcbnew/modedit_onclick.cpp:213
+#: pcbnew/onrightclick.cpp:452
 msgid "Copy Block (shift + drag mouse)"
 msgstr "Copie Bloc (shift + drag mouse)"
 
@@ -2926,14 +2795,18 @@ msgid "Mirror Block (alt + drag mouse)"
 msgstr "Bloc Miroir (alt + drag mouse)"
 
 #: pcbnew/modedit_onclick.cpp:217
+#: pcbnew/onrightclick.cpp:456
 msgid "Rotate Block (ctrl + drag mouse)"
 msgstr "Rotation Bloc (ctrl + drag mouse)"
 
 #: pcbnew/modedit_onclick.cpp:219
+#: pcbnew/onrightclick.cpp:458
 msgid "Delete Block (shift+ctrl + drag mouse)"
 msgstr "Effacement Bloc (shift+ctrl + drag mouse)"
 
 #: pcbnew/modedit_onclick.cpp:241
+#: pcbnew/onrightclick.cpp:754
+#: pcbnew/onrightclick.cpp:858
 msgid "Rotate"
 msgstr "Rotation"
 
@@ -2958,14 +2831,17 @@ msgid "Move Pad"
 msgstr "Déplace Pad"
 
 #: pcbnew/modedit_onclick.cpp:263
+#: pcbnew/onrightclick.cpp:793
 msgid "Edit Pad"
 msgstr "Edit Pad"
 
 #: pcbnew/modedit_onclick.cpp:265
+#: pcbnew/onrightclick.cpp:797
 msgid "New Pad Settings"
 msgstr "Nouvelles Caract. Pads"
 
 #: pcbnew/modedit_onclick.cpp:267
+#: pcbnew/onrightclick.cpp:801
 msgid "Export Pad Settings"
 msgstr "Exporte Caract. Pads"
 
@@ -2974,6 +2850,7 @@ msgid "delete Pad"
 msgstr "Supprimer Pad"
 
 #: pcbnew/modedit_onclick.cpp:274
+#: pcbnew/onrightclick.cpp:808
 msgid "Global Pad Settings"
 msgstr "Edition Globale des pads"
 
@@ -3006,6 +2883,9 @@ msgid "Place edge"
 msgstr "Place contour"
 
 #: pcbnew/modedit_onclick.cpp:306
+#: pcbnew/onrightclick.cpp:722
+#: pcbnew/onrightclick.cpp:756
+#: pcbnew/onrightclick.cpp:860
 msgid "Edit"
 msgstr "Editer"
 
@@ -3041,11 +2921,12 @@ msgstr "Editeur de Module: module modifié!  Continuer ?"
 msgid "Footprint name:"
 msgstr "Nom Module: "
 
-#: pcbnew/modules.cpp:291
+#: pcbnew/modules.cpp:305
+#: pcbnew/onrightclick.cpp:728
 msgid "Delete Module"
 msgstr "Supprimer Module"
 
-#: pcbnew/modules.cpp:292
+#: pcbnew/modules.cpp:306
 msgid "Value "
 msgstr "Valeur "
 
@@ -3790,16 +3671,16 @@ msgstr "Mode d'affichage Contraste normal"
 msgid "Hight Contrast Mode Display"
 msgstr "Mode d'affichage Haut Contraste"
 
-#: pcbnew/pcbnew.cpp:42
+#: pcbnew/pcbnew.cpp:43
 msgid "Pcbnew is already running, Continue?"
 msgstr "Pcbnew est est cours d'exécution. Continuer ?"
 
-#: pcbnew/pcbplot.cpp:146
+#: pcbnew/pcbplot.cpp:147
 #: pcbnew/pcbplot.cpp:272
 msgid "Plot"
 msgstr "Tracer"
 
-#: pcbnew/pcbplot.cpp:190
+#: pcbnew/pcbplot.cpp:191
 msgid "Plot Format"
 msgstr "Format de tracé"
 
@@ -4026,33 +3907,6 @@ msgstr "Ne peut pas réouvrir fichier <%s>"
 msgid "Tracks"
 msgstr "Pistes"
 
-#: pcbnew/plot_rtn.cpp:224
-#, c-format
-msgid ""
-"Your BOARD has a bad layer number of %u for module\n"
-" %s's \"reference\" text."
-msgstr ""
-"Votre PCB a un mauvais numero de couche  %u pour le module\n"
-" %s's \"reference\"."
-
-#: pcbnew/plot_rtn.cpp:244
-#, c-format
-msgid ""
-"Your BOARD has a bad layer number of %u for module\n"
-" %s's \"value\" text."
-msgstr ""
-"Votre PCB a un mauvais numero de couche %u pour le module\n"
-" %s's \"valeur\"."
-
-#: pcbnew/plot_rtn.cpp:290
-#, c-format
-msgid ""
-"Your BOARD has a bad layer number of %u for module\n"
-" %s's \"module text\" text of %s."
-msgstr ""
-"Votre PCB a un mauvais numero de couche  %u pour le module\n"
-" %s's \"texte module\" de %s."
-
 #: pcbnew/router.cpp:60
 msgid "Unable to create temporary file "
 msgstr "Impossible de créer le fichier temporaire "
@@ -4267,6 +4121,7 @@ msgid "Delete part in current library"
 msgstr "Supprimer composant en librairie de travail"
 
 #: pcbnew/tool_modedit.cpp:61
+#: pcbnew/xchgmod.cpp:156
 msgid "New Module"
 msgstr "Nouveau Module"
 
@@ -4840,55 +4695,231 @@ msgstr "couche E.C.O.2"
 msgid "Draft layer"
 msgstr "Couche dessin"
 
-#: eeschema/affiche.cpp:22
-msgid "Name"
-msgstr "Nom"
+#: pcbnew/plot_rtn.cpp:224
+#, c-format
+msgid ""
+"Your BOARD has a bad layer number of %u for module\n"
+" %s's \"reference\" text."
+msgstr ""
+"Votre PCB a un mauvais numero de couche  %u pour le module\n"
+" %s's \"reference\"."
 
-#: eeschema/affiche.cpp:23
-msgid "FileName"
-msgstr "Nom Fichier"
+#: pcbnew/plot_rtn.cpp:244
+#, c-format
+msgid ""
+"Your BOARD has a bad layer number of %u for module\n"
+" %s's \"value\" text."
+msgstr ""
+"Votre PCB a un mauvais numero de couche %u pour le module\n"
+" %s's \"valeur\"."
 
-#: eeschema/affiche.cpp:37
-msgid "Ref"
-msgstr "Ref"
+#: pcbnew/plot_rtn.cpp:290
+#, c-format
+msgid ""
+"Your BOARD has a bad layer number of %u for module\n"
+" %s's \"module text\" text of %s."
+msgstr ""
+"Votre PCB a un mauvais numero de couche  %u pour le module\n"
+" %s's \"texte module\" de %s."
 
-#: eeschema/affiche.cpp:41
-msgid "Pwr Symb"
-msgstr "Symb Alim"
+#: pcbnew/dialog_gendrill.cpp:166
+msgid "Millimeters"
+msgstr "Millimetres"
 
-#: eeschema/affiche.cpp:43
-msgid "Val"
-msgstr "Val"
+#: pcbnew/dialog_gendrill.cpp:168
+msgid "Drill Units:"
+msgstr "Unités perçage:"
 
-#: eeschema/affiche.cpp:46
-msgid "RefLib"
-msgstr "RefLib"
+#: pcbnew/dialog_gendrill.cpp:173
+msgid "decimal format"
+msgstr "Format décimal"
 
-#: eeschema/affiche.cpp:49
-msgid "Lib"
-msgstr "Lib"
+#: pcbnew/dialog_gendrill.cpp:174
+msgid "suppress leading zeros"
+msgstr "Suppression zeros de tête"
 
-#: eeschema/affiche.cpp:71
-msgid "PinName"
-msgstr "Nom Pin"
+#: pcbnew/dialog_gendrill.cpp:175
+msgid "suppress trailing zeros"
+msgstr "Suppression zeros de fin"
 
-#: eeschema/affiche.cpp:79
-msgid "PinNum"
-msgstr "Num Pin"
+#: pcbnew/dialog_gendrill.cpp:176
+msgid "keep zeros"
+msgstr "Garder les zéros"
 
-#: eeschema/affiche.cpp:83
-msgid "PinType"
-msgstr "Type Pin"
+#: pcbnew/dialog_gendrill.cpp:177
+msgid "Zeros Format"
+msgstr "Format des zéros"
 
-#: eeschema/affiche.cpp:88
-#: eeschema/affiche.cpp:176
-msgid "no"
-msgstr "non"
+#: pcbnew/dialog_gendrill.cpp:180
+msgid "Choose EXCELLON numbers notation"
+msgstr "Choisir la notation des nombres en format EXCELLON"
 
-#: eeschema/affiche.cpp:90
-#: eeschema/affiche.cpp:178
-msgid "yes"
-msgstr "oui"
+#: pcbnew/dialog_gendrill.cpp:186
+msgid "Precision"
+msgstr "Précision"
+
+#: pcbnew/dialog_gendrill.cpp:189
+msgid "Choose EXCELLON numbers precision"
+msgstr "Choisir la précision des nombres en format EXCELLON"
+
+#: pcbnew/dialog_gendrill.cpp:193
+msgid "absolute"
+msgstr "Absolu"
+
+#: pcbnew/dialog_gendrill.cpp:194
+msgid "auxiliary axis"
+msgstr "Axe Auxiliaire"
+
+#: pcbnew/dialog_gendrill.cpp:195
+msgid "Drill Origin:"
+msgstr "Origine des coord de percage:"
+
+#: pcbnew/dialog_gendrill.cpp:198
+msgid "Choose the coordinate origin: absolute or relative to the auxiliray axis"
+msgstr "Choisir l'origine des coordonnées: absolue ou relative à l'axe auxiliaire"
+
+#: pcbnew/dialog_gendrill.cpp:205
+#: pcbnew/dialog_gendrill.cpp:215
+msgid "None"
+msgstr "Aucun"
+
+#: pcbnew/dialog_gendrill.cpp:206
+msgid "drill sheet (HPGL)"
+msgstr "Plan de perçage (HPGL)"
+
+#: pcbnew/dialog_gendrill.cpp:207
+msgid "drill sheet (PostScript)"
+msgstr "Plan de perçage (Postscript)"
+
+#: pcbnew/dialog_gendrill.cpp:208
+msgid "Drill Sheet:"
+msgstr "Plan de perçage:"
+
+#: pcbnew/dialog_gendrill.cpp:211
+msgid "Creates a drill map in PS or HPGL format"
+msgstr "Créer un plan de perçage en format PS ou HPGL"
+
+#: pcbnew/dialog_gendrill.cpp:216
+msgid "Drill report"
+msgstr "Rapport de perçage"
+
+#: pcbnew/dialog_gendrill.cpp:217
+msgid "Drill Report:"
+msgstr "Rapport de perçage:"
+
+#: pcbnew/dialog_gendrill.cpp:220
+msgid "Creates a plain text report"
+msgstr "Créer un fichier rapport ascii"
+
+#: pcbnew/dialog_gendrill.cpp:223
+msgid "HPGL plotter Options:"
+msgstr "Options de Tracé HPGL:"
+
+#: pcbnew/dialog_gendrill.cpp:227
+msgid "Speed (cm/s)"
+msgstr "Vitesse plume ( cm/s )"
+
+#: pcbnew/dialog_gendrill.cpp:233
+msgid "Pen Number"
+msgstr "Numéro de plume"
+
+#: pcbnew/dialog_gendrill.cpp:243
+msgid "mirror y axis"
+msgstr "Miroir sur axe Y"
+
+#: pcbnew/dialog_gendrill.cpp:247
+msgid "minimal header"
+msgstr "Entête minimal"
+
+#: pcbnew/dialog_gendrill.cpp:250
+msgid "If checked, the EXCELLON header is minimal"
+msgstr "Si activé, l'entête di fichier EXELLON est minimale"
+
+#: pcbnew/dialog_gendrill.cpp:256
+msgid "Info:"
+msgstr "Infos:"
+
+#: pcbnew/dialog_gendrill.cpp:260
+msgid "Default Vias Drill:"
+msgstr "Perçage vias par Défaut"
+
+#: pcbnew/dialog_gendrill.cpp:264
+msgid "Via Drill Value"
+msgstr "Perçage des Vias"
+
+#: pcbnew/dialog_gendrill.cpp:267
+msgid "Micro Vias Drill:"
+msgstr "Perçage Micro Via:"
+
+#: pcbnew/dialog_gendrill.cpp:271
+msgid "Micro Via Drill Value"
+msgstr "Valeur Perçage Micro Via"
+
+#: pcbnew/dialog_gendrill.cpp:274
+msgid "Holes Count:"
+msgstr "Nb Trous"
+
+#: pcbnew/dialog_gendrill.cpp:278
+msgid "Pads:"
+msgstr "Pastilles:"
+
+#: pcbnew/dialog_gendrill.cpp:281
+msgid "Through Vias:"
+msgstr "Via Traversantes:"
+
+#: pcbnew/dialog_gendrill.cpp:287
+msgid "Buried Vias:"
+msgstr "Via Enterrées:"
+
+#: eeschema/affiche.cpp:22
+msgid "Name"
+msgstr "Nom"
+
+#: eeschema/affiche.cpp:23
+msgid "FileName"
+msgstr "Nom Fichier"
+
+#: eeschema/affiche.cpp:37
+msgid "Ref"
+msgstr "Ref"
+
+#: eeschema/affiche.cpp:41
+msgid "Pwr Symb"
+msgstr "Symb Alim"
+
+#: eeschema/affiche.cpp:43
+msgid "Val"
+msgstr "Val"
+
+#: eeschema/affiche.cpp:46
+msgid "RefLib"
+msgstr "RefLib"
+
+#: eeschema/affiche.cpp:49
+msgid "Lib"
+msgstr "Lib"
+
+#: eeschema/affiche.cpp:71
+msgid "PinName"
+msgstr "Nom Pin"
+
+#: eeschema/affiche.cpp:79
+msgid "PinNum"
+msgstr "Num Pin"
+
+#: eeschema/affiche.cpp:83
+msgid "PinType"
+msgstr "Type Pin"
+
+#: eeschema/affiche.cpp:88
+#: eeschema/affiche.cpp:176
+msgid "no"
+msgstr "non"
+
+#: eeschema/affiche.cpp:90
+#: eeschema/affiche.cpp:178
+msgid "yes"
+msgstr "oui"
 
 #: eeschema/affiche.cpp:95
 msgid "Lengh"
@@ -6987,6 +7018,7 @@ msgstr "&Placer"
 
 #: eeschema/netform.cpp:60
 #: eeschema/netform.cpp:278
+#: eeschema/save_schemas.cpp:86
 msgid "Failed to create file "
 msgstr "Impossible de créer le fichier "
 
@@ -7303,11 +7335,13 @@ msgstr "Supprimer Fil"
 
 #: eeschema/onrightclick.cpp:513
 #: eeschema/onrightclick.cpp:545
+#: eeschema/schedit.cpp:201
 msgid "Add Junction"
 msgstr "Ajout jonctions"
 
 #: eeschema/onrightclick.cpp:514
 #: eeschema/onrightclick.cpp:546
+#: eeschema/schedit.cpp:205
 msgid "Add Label"
 msgstr "Ajout Label"
 
@@ -7392,216 +7426,68 @@ msgstr "Miroir Bloc ||"
 msgid "Copy to Clipboard"
 msgstr "Copie dans Presse papier"
 
-#: eeschema/pinedit-dialog.cpp:234
-msgid "Pin Name :"
-msgstr "Nom de la pin :"
-
-#: eeschema/pinedit-dialog.cpp:240
-msgid "Pin Num :"
-msgstr "Num de la pin :"
-
-#: eeschema/pinedit-dialog.cpp:248
-msgid " Pin Options :"
-msgstr "Options pin :"
-
-#: eeschema/pinedit-dialog.cpp:253
-msgid "Pin lenght :"
-msgstr "Longueur pin:"
-
-#: eeschema/pinedit-dialog.cpp:267
-msgid "No Draw"
-msgstr "Invisible"
-
-#: eeschema/pinedit-dialog.cpp:293
-msgid "Pin Orient:"
-msgstr "Pin Orient:"
-
-#: eeschema/pinedit-dialog.cpp:317
 #: eeschema/pinedit.cpp:22
 msgid "line"
 msgstr "Ligne"
 
-#: eeschema/pinedit-dialog.cpp:318
 #: eeschema/pinedit.cpp:22
 msgid "invert"
 msgstr "invert"
 
-#: eeschema/pinedit-dialog.cpp:319
 #: eeschema/pinedit.cpp:22
 msgid "clock"
 msgstr "clock"
 
-#: eeschema/pinedit-dialog.cpp:320
 #: eeschema/pinedit.cpp:22
 msgid "clock inv"
 msgstr "clock inv"
 
-#: eeschema/pinedit-dialog.cpp:321
 #: eeschema/pinedit.cpp:23
 msgid "low in"
 msgstr "low in"
 
-#: eeschema/pinedit-dialog.cpp:322
 #: eeschema/pinedit.cpp:23
 msgid "low clock"
 msgstr "low clock"
 
-#: eeschema/pinedit-dialog.cpp:323
 #: eeschema/pinedit.cpp:23
 msgid "low out"
 msgstr "low out"
 
-#: eeschema/pinedit-dialog.cpp:324
-msgid "Pin Shape:"
-msgstr "Forme Pin:"
-
-#: eeschema/pinedit-dialog.cpp:333
-msgid "3 States"
-msgstr "3 Etats"
-
-#: eeschema/pinedit-dialog.cpp:335
-msgid "Unspecified"
-msgstr "Non specifié"
-
-#: eeschema/pinedit-dialog.cpp:336
-msgid "Power In"
-msgstr "Power In"
-
-#: eeschema/pinedit-dialog.cpp:337
-msgid "Power Out"
-msgstr "Power Out"
-
-#: eeschema/pinedit-dialog.cpp:338
-msgid "Open coll"
-msgstr "Coll ouvert"
-
-#: eeschema/pinedit-dialog.cpp:339
-msgid "Open emit"
-msgstr "Emetteur ouv."
-
-#: eeschema/pinedit-dialog.cpp:340
-msgid "Electrical Type:"
-msgstr "Type électrique:"
-
-#: eeschema/pinedit.cpp:206
+#: eeschema/pinedit.cpp:216
 msgid "Occupied by other pin. Continue?"
 msgstr "Occupé une autre pin, Continuer ?"
 
-#: eeschema/pinedit.cpp:997
+#: eeschema/pinedit.cpp:1007
 #, c-format
 msgid "Duplicate Pin %4.4s (Pin %s loc %d, %d, and Pin %s loc %d, %d)"
 msgstr "Pin dupliquée  %4.4s (Pin %s loc %d, %d, etPin %s loc %d, %d)"
 
-#: eeschema/pinedit.cpp:1003
+#: eeschema/pinedit.cpp:1013
 #, c-format
 msgid "  Part %d"
 msgstr "Composant %d"
 
-#: eeschema/pinedit.cpp:1009
+#: eeschema/pinedit.cpp:1019
 msgid "  Convert"
 msgstr "  Convert"
 
-#: eeschema/pinedit.cpp:1011
+#: eeschema/pinedit.cpp:1021
 msgid "  Normal"
 msgstr "  Normal"
 
-#: eeschema/plothpgl.cpp:222
-msgid "Sheet Size"
-msgstr "Dim. feuille"
-
-#: eeschema/plothpgl.cpp:223
 #: eeschema/plotps.cpp:196
 msgid "Page Size A4"
 msgstr "Feuille A4"
 
-#: eeschema/plothpgl.cpp:224
-msgid "Page Size A3"
-msgstr "Feuille A3"
-
-#: eeschema/plothpgl.cpp:225
-msgid "Page Size A2"
-msgstr "Feuille A2"
-
-#: eeschema/plothpgl.cpp:226
-msgid "Page Size A1"
-msgstr "Feuille A1"
-
-#: eeschema/plothpgl.cpp:227
-msgid "Page Size A0"
-msgstr "Feuille A0"
-
-#: eeschema/plothpgl.cpp:228
 #: eeschema/plotps.cpp:197
 msgid "Page Size A"
 msgstr "Feuille A"
 
-#: eeschema/plothpgl.cpp:229
-msgid "Page Size B"
-msgstr "Feuille B"
-
-#: eeschema/plothpgl.cpp:230
-msgid "Page Size C"
-msgstr "Feuille C"
-
-#: eeschema/plothpgl.cpp:231
-msgid "Page Size D"
-msgstr "Feuille D"
-
-#: eeschema/plothpgl.cpp:232
-msgid "Page Size E"
-msgstr "Feuille E"
-
-#: eeschema/plothpgl.cpp:233
 #: eeschema/plotps.cpp:199
 msgid "Plot page size:"
 msgstr "Format de la feuille:"
 
-#: eeschema/plothpgl.cpp:240
-msgid "Pen control:"
-msgstr "Controle plume"
-
-#: eeschema/plothpgl.cpp:244
-msgid "Pen Width ( mils )"
-msgstr "Epaiss plume (mils)"
-
-#: eeschema/plothpgl.cpp:250
-msgid "Pen Speed ( cm/s )"
-msgstr "Vitesse plume ( cm/s )"
-
-#: eeschema/plothpgl.cpp:262
-msgid "Page offset:"
-msgstr "Offset page:"
-
-#: eeschema/plothpgl.cpp:266
-msgid "Plot Offset X"
-msgstr "Offset de tracé X"
-
-#: eeschema/plothpgl.cpp:272
-msgid "Plot Offset Y"
-msgstr "Offset de tracé Y"
-
-#: eeschema/plothpgl.cpp:283
-#: eeschema/plotps.cpp:242
-msgid "&Plot CURRENT"
-msgstr "&Imprimer courant"
-
-#: eeschema/plothpgl.cpp:287
-#: eeschema/plotps.cpp:249
-msgid "Plot A&LL"
-msgstr "&Tout tracer"
-
-#: eeschema/plothpgl.cpp:298
-msgid "&Accept Offset"
-msgstr "&Accepter Offset"
-
-#: eeschema/plothpgl.cpp:580
-msgid "** Plot End **\n"
-msgstr "** Fin de Tracé **\n"
-
-#: eeschema/plothpgl.cpp:605
-msgid "Plot  "
-msgstr "Trace  "
-
 #: eeschema/plotps.cpp:209
 msgid "Plot Options:"
 msgstr "Options de tracé:"
@@ -7622,6 +7508,14 @@ msgstr "Tracé et Couleurs:"
 msgid "Print Sheet Ref"
 msgstr "Imprimer cartouche"
 
+#: eeschema/plotps.cpp:242
+msgid "&Plot CURRENT"
+msgstr "&Imprimer courant"
+
+#: eeschema/plotps.cpp:249
+msgid "Plot A&LL"
+msgstr "&Tout tracer"
+
 #: eeschema/plotps.cpp:268
 msgid "Messages :"
 msgstr "Messages :"
@@ -8033,6 +7927,229 @@ msgstr "Cmp Courant: <%s>"
 msgid "Library browser"
 msgstr "Visualisateur des librairies"
 
+#: eeschema/plothpgl.cpp:222
+msgid "Sheet Size"
+msgstr "Dim. feuille"
+
+#: eeschema/plothpgl.cpp:224
+msgid "Page Size A3"
+msgstr "Feuille A3"
+
+#: eeschema/plothpgl.cpp:225
+msgid "Page Size A2"
+msgstr "Feuille A2"
+
+#: eeschema/plothpgl.cpp:226
+msgid "Page Size A1"
+msgstr "Feuille A1"
+
+#: eeschema/plothpgl.cpp:227
+msgid "Page Size A0"
+msgstr "Feuille A0"
+
+#: eeschema/plothpgl.cpp:229
+msgid "Page Size B"
+msgstr "Feuille B"
+
+#: eeschema/plothpgl.cpp:230
+msgid "Page Size C"
+msgstr "Feuille C"
+
+#: eeschema/plothpgl.cpp:231
+msgid "Page Size D"
+msgstr "Feuille D"
+
+#: eeschema/plothpgl.cpp:232
+msgid "Page Size E"
+msgstr "Feuille E"
+
+#: eeschema/plothpgl.cpp:240
+msgid "Pen control:"
+msgstr "Controle plume"
+
+#: eeschema/plothpgl.cpp:244
+msgid "Pen Width ( mils )"
+msgstr "Epaiss plume (mils)"
+
+#: eeschema/plothpgl.cpp:250
+msgid "Pen Speed ( cm/s )"
+msgstr "Vitesse plume ( cm/s )"
+
+#: eeschema/plothpgl.cpp:262
+msgid "Page offset:"
+msgstr "Offset page:"
+
+#: eeschema/plothpgl.cpp:266
+msgid "Plot Offset X"
+msgstr "Offset de tracé X"
+
+#: eeschema/plothpgl.cpp:272
+msgid "Plot Offset Y"
+msgstr "Offset de tracé Y"
+
+#: eeschema/plothpgl.cpp:298
+msgid "&Accept Offset"
+msgstr "&Accepter Offset"
+
+#: eeschema/plothpgl.cpp:580
+msgid "** Plot End **\n"
+msgstr "** Fin de Tracé **\n"
+
+#: eeschema/plothpgl.cpp:605
+msgid "Plot  "
+msgstr "Trace  "
+
+#: eeschema/pinedit-dialog.cpp:160
+msgid "Pin Name :"
+msgstr "Nom de la pin :"
+
+#: eeschema/pinedit-dialog.cpp:166
+msgid "Pin Num :"
+msgstr "Num de la pin :"
+
+#: eeschema/pinedit-dialog.cpp:174
+msgid " Pin Options :"
+msgstr "Options pin :"
+
+#: eeschema/pinedit-dialog.cpp:190
+msgid "Pin Lenght"
+msgstr "Longueur Pin"
+
+#: eeschema/pinedit-dialog.cpp:201
+msgid "No Draw"
+msgstr "Invisible"
+
+#: eeschema/pinedit-dialog.cpp:227
+msgid "Pin Orient:"
+msgstr "Pin Orient:"
+
+#: eeschema/pinedit-dialog.cpp:258
+msgid "Pin Shape:"
+msgstr "Forme Pin:"
+
+#: eeschema/pinedit-dialog.cpp:267
+msgid "3 States"
+msgstr "3 Etats"
+
+#: eeschema/pinedit-dialog.cpp:269
+msgid "Unspecified"
+msgstr "Non specifié"
+
+#: eeschema/pinedit-dialog.cpp:270
+msgid "Power In"
+msgstr "Power In"
+
+#: eeschema/pinedit-dialog.cpp:271
+msgid "Power Out"
+msgstr "Power Out"
+
+#: eeschema/pinedit-dialog.cpp:272
+msgid "Open coll"
+msgstr "Coll ouvert"
+
+#: eeschema/pinedit-dialog.cpp:273
+msgid "Open emit"
+msgstr "Emetteur ouv."
+
+#: eeschema/pinedit-dialog.cpp:274
+msgid "Electrical Type:"
+msgstr "Type électrique:"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:141
+msgid "Quick KICAD Library Component Builder"
+msgstr ""
+
+#: eeschema/component_wizard/ki_component_setup.cpp:145
+msgid "Component Features"
+msgstr "Propriétés du Composant"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:153
+msgid "Component Name"
+msgstr "Nom du Composant!"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:156
+#, fuzzy
+msgid "MyComponent"
+msgstr "Composant"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:159
+msgid " Symbol Text Size  "
+msgstr "Taille du Texte"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:162
+#: eeschema/component_wizard/ki_component_setup.cpp:212
+#: eeschema/component_wizard/ki_component_setup.cpp:235
+msgid "50"
+msgstr "50"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:165
+msgid "Parts Count"
+msgstr "Nb Parts"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:168
+msgid "1"
+msgstr "1"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:171
+msgid "Pin Distance"
+msgstr "Distance entre Pins"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:174
+msgid "100"
+msgstr "100"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:177
+msgid "Pin Features"
+msgstr "Propriétés des Pins"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:185
+msgid "Default Pin Format"
+msgstr "Format des Pins par Défaut"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:209
+msgid "Pin Name Text Size"
+msgstr "Taille du Texte Nom de Pin"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:215
+msgid "Default Pin Type"
+msgstr "Type Pin par Défaut"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:221
+msgid "BiDir"
+msgstr "Bidi"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:222
+msgid "Tri-State"
+msgstr "3 états"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:225
+msgid "Power Input"
+msgstr "Power Input"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:226
+msgid "Power Output"
+msgstr "Power Output"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:227
+msgid "Open Colletor"
+msgstr "Coll Ouvert"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:228
+msgid "Open Emitter"
+msgstr "Emetteur Ouv."
+
+#: eeschema/component_wizard/ki_component_setup.cpp:232
+msgid " Pin Number Text Size"
+msgstr "Taille Texte Numéro de Pin"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:241
+msgid "Pin Count"
+msgstr "Nombre de Pins"
+
+#: eeschema/component_wizard/ki_component_setup.cpp:244
+msgid "Component Style"
+msgstr "Style du Composant"
+
 #: cvpcb/autosel.cpp:68
 #, c-format
 msgid "Library: <%s> not found"
@@ -9884,10 +10001,6 @@ msgstr "Propriétés du Texte sur Module"
 msgid "dialog_freeroute_exchange"
 msgstr "dialog_freeroute_exchange"
 
-#: pcbnew/dialog_gendrill.h:50
-msgid "WinEDA_DrillFrame"
-msgstr "WinEDA_DrillFrame"
-
 #: pcbnew/dialog_general_options.h:60
 msgid "General Options"
 msgstr "Options générales"
@@ -10011,6 +10124,10 @@ msgstr "Afficher Modules Cu"
 msgid "Pad properties"
 msgstr "Propriétés des Pads"
 
+#: pcbnew/dialog_gendrill.h:50
+msgid "Drill Files Generation"
+msgstr "Génération Fichiers de Perçagee"
+
 #: eeschema/annotate_dialog.h:52
 msgid "EESchema Annotation"
 msgstr "Annotation des composants"
@@ -10131,10 +10248,6 @@ msgstr "Marqueur ERC"
 msgid "Other"
 msgstr "Autre"
 
-#: eeschema/pinedit-dialog.h:65
-msgid "Pin properties"
-msgstr "Propriétés des Pins"
-
 #: eeschema/plothpgl.h:55
 msgid "EESchema Plot HPGL"
 msgstr "EESchema Tracé HPGL"
@@ -10151,6 +10264,14 @@ msgstr "Propriétés de la feuille"
 msgid "Graphic text properties"
 msgstr "Propriétés du texte"
 
+#: eeschema/pinedit-dialog.h:66
+msgid "Pin properties"
+msgstr "Propriétés des Pins"
+
+#: eeschema/component_wizard/ki_component_setup.h:54
+msgid "Component Builder"
+msgstr "Générateur de Composant"
+
 #: cvpcb/dialog_cvpcb_config.h:49
 msgid "Cvpcb Configuration"
 msgstr "Configuration de Cvpcb"
@@ -10315,6 +10436,8 @@ msgstr "Ajustage opt Page"
 msgid "Create SVG file"
 msgstr "Créer Fichier SVG"
 
+#~ msgid "WinEDA_DrillFrame"
+#~ msgstr "WinEDA_DrillFrame"
 #~ msgid "Spot min"
 #~ msgstr "Spot min"
 #~ msgid "Pen speed (cm/s)"

pcbnew/dialog_gendrill.cpp

 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog_gendrill.cpp
-// Purpose:     
+// Purpose:
 // Author:      jean-pierre Charras
-// Modified by: 
+// Modified by:
 // Created:     13/01/2008 17:26:27
-// RCS-ID:      
+// RCS-ID:
 // Copyright:   License GNU
-// Licence:     
+// Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Generated by DialogBlocks (unregistered), 13/01/2008 17:26:27
@@ -53,7 +53,7 @@ BEGIN_EVENT_TABLE( WinEDA_DrillFrame, wxDialog )
 
     EVT_BUTTON( wxID_OK, WinEDA_DrillFrame::OnOkClick )
 
-    EVT_BUTTON( wxID_CLOSE, WinEDA_DrillFrame::OnCloseClick )
+    EVT_BUTTON( wxID_CANCEL, WinEDA_DrillFrame::OnCancelClick )
 
 ////@end WinEDA_DrillFrame event table entries
 
@@ -139,6 +139,8 @@ void WinEDA_DrillFrame::Init()
     m_ThroughViasInfoMsg = NULL;
     m_MicroViasInfoMsg = NULL;
     m_BuriedViasInfoMsg = NULL;
+    m_OkButton = NULL;
+    m_CancelButton = NULL;
 ////@end WinEDA_DrillFrame member initialisation
 }
 
@@ -148,9 +150,9 @@ void WinEDA_DrillFrame::Init()
  */
 
 void WinEDA_DrillFrame::CreateControls()
-{    
+{
 ////@begin WinEDA_DrillFrame content construction
-    // Generated by DialogBlocks, 14/01/2008 08:32:06 (unregistered)
+    // Generated by DialogBlocks, 12/08/2008 13:05:18 (unregistered)
 
     WinEDA_DrillFrame* itemDialog1 = this;
 
@@ -174,6 +176,8 @@ void WinEDA_DrillFrame::CreateControls()
     m_Choice_Zeros_FormatStrings.Add(_("keep zeros"));
     m_Choice_Zeros_Format = new wxRadioBox( itemDialog1, ID_SEL_ZEROS_FMT, _("Zeros Format"), wxDefaultPosition, wxDefaultSize, m_Choice_Zeros_FormatStrings, 1, wxRA_SPECIFY_COLS );
     m_Choice_Zeros_Format->SetSelection(0);
+    if (WinEDA_DrillFrame::ShowToolTips())
+        m_Choice_Zeros_Format->SetToolTip(_("Choose EXCELLON numbers notation"));
     m_LeftBoxSizer->Add(m_Choice_Zeros_Format, 0, wxALIGN_LEFT|wxALL, 5);
 
     wxArrayString m_Choice_PrecisionStrings;
@@ -181,6 +185,8 @@ void WinEDA_DrillFrame::CreateControls()
     m_Choice_PrecisionStrings.Add(_("2:4"));
     m_Choice_Precision = new wxRadioBox( itemDialog1, ID_SEL_PRECISION, _("Precision"), wxDefaultPosition, wxDefaultSize, m_Choice_PrecisionStrings, 1, wxRA_SPECIFY_COLS );
     m_Choice_Precision->SetSelection(0);
+    if (WinEDA_DrillFrame::ShowToolTips())
+        m_Choice_Precision->SetToolTip(_("Choose EXCELLON numbers precision"));
     m_LeftBoxSizer->Add(m_Choice_Precision, 0, wxGROW|wxALL, 5);
 
     wxArrayString m_Choice_Drill_OffsetStrings;
@@ -188,6 +194,8 @@ void WinEDA_DrillFrame::CreateControls()
     m_Choice_Drill_OffsetStrings.Add(_("auxiliary axis"));
     m_Choice_Drill_Offset = new wxRadioBox( itemDialog1, ID_SEL_DRILL_SHEET, _("Drill Origin:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_OffsetStrings, 1, wxRA_SPECIFY_COLS );
     m_Choice_Drill_Offset->SetSelection(0);
+    if (WinEDA_DrillFrame::ShowToolTips())
+        m_Choice_Drill_Offset->SetToolTip(_("Choose the coordinate origin: absolute or relative to the auxiliray axis"));
     m_LeftBoxSizer->Add(m_Choice_Drill_Offset, 0, wxGROW|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
@@ -199,6 +207,8 @@ void WinEDA_DrillFrame::CreateControls()
     m_Choice_Drill_MapStrings.Add(_("drill sheet (PostScript)"));
     m_Choice_Drill_Map = new wxRadioBox( itemDialog1, ID_SEL_DRILL_SHEET, _("Drill Sheet:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_MapStrings, 1, wxRA_SPECIFY_COLS );
     m_Choice_Drill_Map->SetSelection(0);
+    if (WinEDA_DrillFrame::ShowToolTips())
+        m_Choice_Drill_Map->SetToolTip(_("Creates a drill map in PS or HPGL format"));
     itemBoxSizer8->Add(m_Choice_Drill_Map, 0, wxGROW|wxALL, 5);
 
     wxArrayString m_Choice_Drill_ReportStrings;
@@ -206,6 +216,8 @@ void WinEDA_DrillFrame::CreateControls()
     m_Choice_Drill_ReportStrings.Add(_("Drill report"));
     m_Choice_Drill_Report = new wxRadioBox( itemDialog1, ID_SEL_DRILL_REPORT, _("Drill Report:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_ReportStrings, 1, wxRA_SPECIFY_COLS );
     m_Choice_Drill_Report->SetSelection(0);
+    if (WinEDA_DrillFrame::ShowToolTips())
+        m_Choice_Drill_Report->SetToolTip(_("Creates a plain text report"));
     itemBoxSizer8->Add(m_Choice_Drill_Report, 0, wxGROW|wxALL, 5);
 
     wxStaticBox* itemStaticBoxSizer11Static = new wxStaticBox(itemDialog1, wxID_ANY, _("HPGL plotter Options:"));
@@ -234,6 +246,8 @@ void WinEDA_DrillFrame::CreateControls()
 
     m_Check_Minimal = new wxCheckBox( itemDialog1, ID_CHECKBOX3, _("minimal header"), wxDefaultPosition, wxDefaultSize, 0 );
     m_Check_Minimal->SetValue(false);
+    if (WinEDA_DrillFrame::ShowToolTips())
+        m_Check_Minimal->SetToolTip(_("If checked, the EXCELLON header is minimal"));
     itemStaticBoxSizer16->Add(m_Check_Minimal, 0, wxGROW|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxVERTICAL);
@@ -275,13 +289,14 @@ void WinEDA_DrillFrame::CreateControls()
 
     itemBoxSizer19->Add(5, 5, 1, wxGROW|wxALL, 5);
 
-    wxButton* itemButton31 = new wxButton( itemDialog1, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton31->SetForegroundColour(wxColour(156, 1, 5));
-    itemBoxSizer19->Add(itemButton31, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+    m_OkButton = new wxButton( itemDialog1, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_OkButton->SetDefault();
+    m_OkButton->SetForegroundColour(wxColour(156, 1, 5));
+    itemBoxSizer19->Add(m_OkButton, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
-    wxButton* itemButton32 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton32->SetForegroundColour(wxColour(16, 1, 205));
-    itemBoxSizer19->Add(itemButton32, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+    m_CancelButton = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_CancelButton->SetForegroundColour(wxColour(16, 1, 205));
+    itemBoxSizer19->Add(m_CancelButton, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
     // Set validators
     m_Choice_Unit->SetValidator( wxGenericValidator(& s_Unit_Drill_is_Inch) );
@@ -290,6 +305,7 @@ void WinEDA_DrillFrame::CreateControls()
     m_Check_Minimal->SetValidator( wxGenericValidator(& Minimal) );
 ////@end WinEDA_DrillFrame content construction
 
+    SetFocus(); // Under wxGTK: mandatory to close dialog by the ESC key
 	InitDisplayParams();
 }
 
@@ -318,10 +334,10 @@ void WinEDA_DrillFrame::OnOkClick( wxCommandEvent& event )
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
  */
 
-void WinEDA_DrillFrame::OnCloseClick( wxCommandEvent& event )
+void WinEDA_DrillFrame::OnCancelClick( wxCommandEvent& event )
 {
     UpdateConfig();     /* Save drill options: */
-    Close( true );      // true is to force the frame to close
+    event.Skip();       // Process the default cancel event (close dialog)
 }
 
 
@@ -380,6 +396,6 @@ void WinEDA_DrillFrame::OnCloseWindow( wxCloseEvent& event )
 ////@begin wxEVT_CLOSE_WINDOW event handler for ID_WINEDA_DRILLFRAME in WinEDA_DrillFrame.
     // Before editing this code, remove the block markers.
     event.Skip();
-////@end wxEVT_CLOSE_WINDOW event handler for ID_WINEDA_DRILLFRAME in WinEDA_DrillFrame. 
+////@end wxEVT_CLOSE_WINDOW event handler for ID_WINEDA_DRILLFRAME in WinEDA_DrillFrame.
 }
 

pcbnew/dialog_gendrill.h

@@ -47,7 +47,7 @@ class wxBoxSizer;
 #define ID_CHECKBOX2 10011
 #define ID_CHECKBOX3 10012
 #define SYMBOL_WINEDA_DRILLFRAME_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX|wxTAB_TRAVERSAL
-#define SYMBOL_WINEDA_DRILLFRAME_TITLE _("WinEDA_DrillFrame")
+#define SYMBOL_WINEDA_DRILLFRAME_TITLE _("Drill Files Generation")
 #define SYMBOL_WINEDA_DRILLFRAME_IDNAME ID_WINEDA_DRILLFRAME
 #define SYMBOL_WINEDA_DRILLFRAME_SIZE wxSize(400, 300)
 #define SYMBOL_WINEDA_DRILLFRAME_POSITION wxDefaultPosition
@@ -99,8 +99,8 @@ public:
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
     void OnOkClick( wxCommandEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
-    void OnCloseClick( wxCommandEvent& event );
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
+    void OnCancelClick( wxCommandEvent& event );
 
 ////@end WinEDA_DrillFrame event handler declarations
 
@@ -136,6 +136,8 @@ public:
     wxStaticText* m_ThroughViasInfoMsg;
     wxStaticText* m_MicroViasInfoMsg;
     wxStaticText* m_BuriedViasInfoMsg;
+    wxButton* m_OkButton;
+    wxButton* m_CancelButton;
 ////@end WinEDA_DrillFrame member variables
 
 private:

pcbnew/dialog_gendrill.pjd

@@ -128,6 +128,7 @@
         <long name="locked">0</long>
         <string name="template-name">""</string>
         <bool name="dirty">1</bool>
+        <long name="makefile-last-written">-8519680</long>
         <string name="Compiler name">""</string>
         <string name="Build mode">"Debug"</string>
         <string name="Unicode mode">"ANSI"</string>
@@ -169,6 +170,8 @@
         <string name="wxWidgets build command">"%AUTO%"</string>
         <string name="wxWidgets clean command">"%AUTO%"</string>
         <string name="PATH variable">"%AUTO%"</string>
+        <bool name="Suppress source rules">0</bool>
+        <bool name="Enable makefile generation">1</bool>
       </document>
     </document>
   </data>
@@ -219,7 +222,7 @@
           <string name="proxy-Implementation filename">"dialog_gendrill.cpp"</string>
           <string name="proxy-Header filename">"dialog_gendrill.h"</string>
           <string name="proxy-XRC filename">""</string>
-          <string name="proxy-Title">"WinEDA_DrillFrame"</string>
+          <string name="proxy-Title">"Drill Files Generation"</string>
           <bool name="proxy-Centre">1</bool>
           <string name="proxy-Icon">""</string>
           <bool name="proxy-Dialog units">0</bool>
@@ -405,7 +408,7 @@
                 <string name="proxy-Items">"decimal format|suppress leading zeros|suppress trailing zeros|keep zeros"</string>
                 <long name="proxy-Initial value">0</long>
                 <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Tooltip text">"Choose EXCELLON numbers notation"</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
@@ -469,7 +472,7 @@
                 <string name="proxy-Items">"2:3|2:4"</string>
                 <long name="proxy-Initial value">0</long>
                 <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Tooltip text">"Choose EXCELLON numbers precision"</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
@@ -533,7 +536,7 @@
                 <string name="proxy-Items">"absolute|auxiliary axis"</string>
                 <long name="proxy-Initial value">0</long>
                 <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Tooltip text">"Choose the coordinate origin: absolute or relative to the auxiliray axis"</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
@@ -623,7 +626,7 @@
                 <string name="proxy-Items">"None|drill sheet (HPGL)|drill sheet (PostScript)"</string>
                 <long name="proxy-Initial value">0</long>
                 <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Tooltip text">"Creates a drill map in PS or HPGL format"</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
@@ -687,7 +690,7 @@
                 <string name="proxy-Items">"None|Drill report"</string>
                 <long name="proxy-Initial value">0</long>
                 <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Tooltip text">"Creates a plain text report"</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
@@ -1185,7 +1188,7 @@
                     <string name="proxy-Label">"minimal header"</string>
                     <bool name="proxy-Initial value">0</bool>
                     <string name="proxy-Help text">""</string>
-                    <string name="proxy-Tooltip text">""</string>
+                    <string name="proxy-Tooltip text">"If checked, the EXCELLON header is minimal"</string>
                     <string name="proxy-Data variable">"Minimal"</string>
                     <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
                     <string name="proxy-Data source">""</string>
@@ -1860,9 +1863,9 @@
                 <bool name="proxy-Separate files">0</bool>
                 <string name="proxy-Implementation filename">""</string>
                 <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">""</string>
+                <string name="proxy-Member variable name">"m_OkButton"</string>
                 <string name="proxy-Label">"OK"</string>
-                <bool name="proxy-Default">0</bool>
+                <bool name="proxy-Default">1</bool>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
                 <string name="proxy-Data variable">""</string>
@@ -1907,7 +1910,7 @@
                 <string name="proxy-Custom ctor arguments">""</string>
               </document>
               <document>
-                <string name="title">"wxButton: wxID_CLOSE"</string>
+                <string name="title">"wxButton: wxID_CANCEL"</string>
                 <string name="type">"dialog-control-document"</string>
                 <string name="filename">""</string>
                 <string name="icon-name">"dialogcontrol"</string>
@@ -1917,9 +1920,9 @@
                 <long name="locked">0</long>
                 <string name="created">"13/1/2008"</string>
                 <string name="proxy-type">"wbButtonProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCloseClick|NONE||WinEDA_DrillFrame"</string>
-                <string name="proxy-Id name">"wxID_CLOSE"</string>
-                <long name="proxy-Id value">5001</long>
+                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|NONE||WinEDA_DrillFrame"</string>
+                <string name="proxy-Id name">"wxID_CANCEL"</string>
+                <long name="proxy-Id value">5101</long>
                 <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxButton"</string>
                 <string name="proxy-Base class">"wxButton"</string>
@@ -1927,8 +1930,8 @@
                 <bool name="proxy-Separate files">0</bool>
                 <string name="proxy-Implementation filename">""</string>
                 <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">""</string>
-                <string name="proxy-Label">"&amp;Close"</string>
+                <string name="proxy-Member variable name">"m_CancelButton"</string>
+                <string name="proxy-Label">"Cancel"</string>
                 <bool name="proxy-Default">0</bool>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>