solved: eeschema, small problem with fields selections in BOM generation

eeschema/annotate.cpp

@@ -94,17 +94,6 @@ void ReAnnotatePowerSymbolsOnly( void )
 }
 
 
-CmpListStruct* AllocateCmpListStrct( int numcomponents )
-{
-    int            ii = numcomponents * sizeof(CmpListStruct);
-
-    //allocate memory and fill this memory with zeros.
-    CmpListStruct* list = (CmpListStruct*) MyZMalloc( ii );
-
-    return list;
-}
-
-
 /* qsort function to annotate items by their position.
  *  Components are sorted
  *      by reference
@@ -296,7 +285,7 @@ void AnnotateComponents( WinEDA_SchematicFrame* parent,
     if( NbOfCmp == 0 )
         return;
 
-    BaseListeCmp = AllocateCmpListStrct( NbOfCmp );
+    BaseListeCmp = (CmpListStruct*) MyZMalloc( NbOfCmp * sizeof(CmpListStruct) );
 
     /* Second pass : Init data tables */
     if( annotateSchematic )
@@ -712,7 +701,7 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool oneSheetOnly )
 
 
     /* Second pass : create the list of components */
-    ListeCmp = AllocateCmpListStrct( NbOfCmp );
+    ListeCmp = (CmpListStruct*) MyZMalloc( NbOfCmp * sizeof(CmpListStruct) );
 
     if( !oneSheetOnly )
     {

eeschema/build_BOM.cpp

@@ -69,14 +69,14 @@ void WinEDA_Build_BOM_Frame::Create_BOM_Lists( bool aTypeFileIsExport,
     mask += EXT_LIST;
 
     filename = EDA_FileSelector( _( "Bill of materials:" ),
-        wxEmptyString,                              /* Chemin par defaut (ici dir courante) */
-        m_ListFileName,                             /* nom fichier par defaut, et resultat */
-        EXT_LIST,                                   /* extension par defaut */
-        mask,                                       /* Masque d'affichage */
-        this,
-        wxFD_SAVE,
-        TRUE
-    );
+                                 wxEmptyString,     /* Chemin par defaut (ici dir courante) */
+                                 m_ListFileName,    /* nom fichier par defaut, et resultat */
+                                 EXT_LIST,          /* extension par defaut */
+                                 mask,              /* Masque d'affichage */
+                                 this,
+                                 wxFD_SAVE,
+                                 TRUE
+                                 );
     if( filename.IsEmpty() )
         return;
     else
@@ -139,7 +139,7 @@ void WinEDA_Build_BOM_Frame::CreateExportList( const wxString& aFullFileName,
 
         /*  sort component list */
         qsort( aList, itemCount, sizeof( ListComponent ),
-            ( int( * ) ( const void*, const void* ) )ListTriComposantByRef );
+               ( int( * ) ( const void*, const void* ) )ListTriComposantByRef );
 
         if( !aIncludeSubComponents )
             DeleteSubCmp( aList, itemCount );
@@ -200,7 +200,7 @@ void WinEDA_Build_BOM_Frame::GenereListeOfItems( const wxString& aFullFileName,
         /* Tri et impression de la liste des composants */
 
         qsort( list, itemCount, sizeof( ListComponent ),
-            ( int( * ) ( const void*, const void* ) )ListTriComposantByRef );
+               ( int( * ) ( const void*, const void* ) )ListTriComposantByRef );
 
         if( !aIncludeSubComponents )
             DeleteSubCmp( list, itemCount );
@@ -215,7 +215,7 @@ void WinEDA_Build_BOM_Frame::GenereListeOfItems( const wxString& aFullFileName,
         if( m_ListCmpbyValItems->GetValue() )
         {
             qsort( list, itemCount, sizeof( ListComponent ),
-                ( int( * ) ( const void*, const void* ) )ListTriComposantByVal );
+                   ( int( * ) ( const void*, const void* ) )ListTriComposantByVal );
             PrintComponentsListByVal( f, list, itemCount, aIncludeSubComponents );
         }
         MyFree( list );
@@ -242,11 +242,11 @@ void WinEDA_Build_BOM_Frame::GenereListeOfItems( const wxString& aFullFileName,
         if( m_GenListLabelsbySheet->GetValue() )
         {
             qsort( listOfLabels, itemCount, sizeof( ListLabel ),
-                ( int( * ) ( const void*, const void* ) )ListTriGLabelBySheet );
+                   ( int( * ) ( const void*, const void* ) )ListTriGLabelBySheet );
 
             msg.Printf( _(
-                    "\n#Global, Hierarchical Labels and PinSheets ( order = Sheet Number ) count = %d\n" ),
-                itemCount );
+                            "\n#Global, Hierarchical Labels and PinSheets ( order = Sheet Number ) count = %d\n" ),
+                        itemCount );
             fprintf( f, "%s", CONV_TO_UTF8( msg ) );
             PrintListeGLabel( f, listOfLabels, itemCount );
         }
@@ -255,11 +255,11 @@ void WinEDA_Build_BOM_Frame::GenereListeOfItems( const wxString& aFullFileName,
         if( m_GenListLabelsbyVal->GetValue() )
         {
             qsort( listOfLabels, itemCount, sizeof( ListLabel ),
-                ( int( * ) ( const void*, const void* ) )ListTriGLabelByVal );
+                   ( int( * ) ( const void*, const void* ) )ListTriGLabelByVal );
 
             msg.Printf( _(
-                    "\n#Global, Hierarchical Labels and PinSheets ( order = Alphab. ) count = %d\n\n" ),
-                itemCount );
+                            "\n#Global, Hierarchical Labels and PinSheets ( order = Alphab. ) count = %d\n\n" ),
+                        itemCount );
             fprintf( f, "%s", CONV_TO_UTF8( msg ) );
             PrintListeGLabel( f, listOfLabels, itemCount );
         }
@@ -309,8 +309,8 @@ int BuildComponentsListFromSchematic( ListComponent* aList )
                 aList->m_Unit = DrawLibItem->GetUnitSelection( sheet );
 
                 strncpy( aList->m_Ref,
-                    CONV_TO_UTF8( DrawLibItem->GetRef( sheet ) ),
-                    sizeof( aList->m_Ref ) );
+                        CONV_TO_UTF8( DrawLibItem->GetRef( sheet ) ),
+                        sizeof( aList->m_Ref ) );
 
                 // @todo the above line is probably a bug, because it will not always nul terminate m_Ref.
 
@@ -355,7 +355,7 @@ static int GenListeGLabels( ListLabel* list )
                 {
                     list->m_LabelType = DrawList->Type();
                     snprintf( list->m_SheetPath, sizeof(list->m_SheetPath),
-                        "%s", CONV_TO_UTF8( path ) );
+                             "%s", CONV_TO_UTF8( path ) );
                     list->m_Label = DrawList;
                     list++;
                 }
@@ -371,7 +371,7 @@ static int GenListeGLabels( ListLabel* list )
                     {
                         list->m_LabelType = DRAW_HIERARCHICAL_PIN_SHEET_STRUCT_TYPE;
                         snprintf( list->m_SheetPath, sizeof(list->m_SheetPath),
-                            "%s", CONV_TO_UTF8( path ) );
+                                 "%s", CONV_TO_UTF8( path ) );
                         list->m_Label = SheetLabel;
                         list++;
                     }
@@ -562,9 +562,9 @@ static void DeleteSubCmp( ListComponent* aList, int aItemCount )
  * The component list **MUST** be sorted by reference and by unit number
  */
 {
-    SCH_COMPONENT*  libItem;
-    wxString        oldName;
-    wxString        currName;
+    SCH_COMPONENT* libItem;
+    wxString oldName;
+    wxString currName;
 
 
     for( int ii = 0; ii < aItemCount; ii++ )
@@ -594,7 +594,7 @@ void WinEDA_Build_BOM_Frame::PrintFieldData( FILE* f, SCH_COMPONENT* DrawLibItem
                                              bool CompactForm )
 /*******************************************************************************************/
 {
-    static const wxCheckBox* FieldListCtrl[] = {
+    const wxCheckBox* FieldListCtrl[] = {
         m_AddField1,
         m_AddField2,
         m_AddField3,
@@ -608,13 +608,16 @@ void WinEDA_Build_BOM_Frame::PrintFieldData( FILE* f, SCH_COMPONENT* DrawLibItem
     int ii;
     const wxCheckBox* FieldCtrl = FieldListCtrl[0];
 
-    if( CompactForm )
+    if( m_AddFootprintField->IsChecked() )
     {
-        fprintf( f, "%c%s", s_ExportSeparatorSymbol,
-            CONV_TO_UTF8( DrawLibItem->m_Field[FOOTPRINT].m_Text ) );
+        if( CompactForm )
+        {
+            fprintf( f, "%c%s", s_ExportSeparatorSymbol,
+                    CONV_TO_UTF8( DrawLibItem->m_Field[FOOTPRINT].m_Text ) );
+        }
+        else
+            fprintf( f, "; %-12s", CONV_TO_UTF8( DrawLibItem->m_Field[FOOTPRINT].m_Text ) );
     }
-    else if( m_AddFootprintField->IsChecked() )
-        fprintf( f, "; %-12s", CONV_TO_UTF8( DrawLibItem->m_Field[FOOTPRINT].m_Text ) );
 
     for( ii = FIELD1; ii <= FIELD8; ii++ )
     {
@@ -625,7 +628,7 @@ void WinEDA_Build_BOM_Frame::PrintFieldData( FILE* f, SCH_COMPONENT* DrawLibItem
             continue;
         if( CompactForm )
             fprintf( f, "%c%s", s_ExportSeparatorSymbol,
-                CONV_TO_UTF8( DrawLibItem->m_Field[ii].m_Text ) );
+                    CONV_TO_UTF8( DrawLibItem->m_Field[ii].m_Text ) );
         else
             fprintf( f, "; %-12s", CONV_TO_UTF8( DrawLibItem->m_Field[ii].m_Text ) );
     }
@@ -633,8 +636,11 @@ void WinEDA_Build_BOM_Frame::PrintFieldData( FILE* f, SCH_COMPONENT* DrawLibItem
 
 
 /*********************************************************************************************/
-int WinEDA_Build_BOM_Frame::PrintComponentsListByRef( FILE* f, ListComponent* aList, int aItemCount,
-                                                      bool CompactForm, bool aIncludeSubComponents )
+int WinEDA_Build_BOM_Frame::PrintComponentsListByRef( FILE* f,
+                                                      ListComponent* aList,
+                                                      int aItemCount,
+                                                      bool CompactForm,
+                                                      bool aIncludeSubComponents )
 /*********************************************************************************************/
 
 /* Print the B.O.M sorted by reference
@@ -649,7 +655,7 @@ int WinEDA_Build_BOM_Frame::PrintComponentsListByRef( FILE* f, ListComponent* aL
 
     if( CompactForm )
     {
-        static const wxCheckBox* FieldListCtrl[FIELD8 - FIELD1 + 1] = {
+        const wxCheckBox* FieldListCtrl[FIELD8 - FIELD1 + 1] = {
             m_AddField1,
             m_AddField2,
             m_AddField3,
@@ -666,7 +672,8 @@ int WinEDA_Build_BOM_Frame::PrintComponentsListByRef( FILE* f, ListComponent* aL
         if( aIncludeSubComponents )
             fprintf( f, "%csheet path", s_ExportSeparatorSymbol );
 
-        fprintf( f, "%cfootprint", s_ExportSeparatorSymbol );
+        if( m_AddFootprintField->IsChecked() )
+            fprintf( f, "%cfootprint", s_ExportSeparatorSymbol );
 
         for( ii = FIELD1; ii <= FIELD8; ii++ )
         {
@@ -721,10 +728,10 @@ int WinEDA_Build_BOM_Frame::PrintComponentsListByRef( FILE* f, ListComponent* aL
 
         if( CompactForm )
             fprintf( f, "%s%c%s", CmpName, s_ExportSeparatorSymbol,
-                CONV_TO_UTF8( DrawLibItem->m_Field[VALUE].m_Text ) );
+                    CONV_TO_UTF8( DrawLibItem->m_Field[VALUE].m_Text ) );
         else
             fprintf( f, "| %-10s %-12s", CmpName,
-                CONV_TO_UTF8( DrawLibItem->m_Field[VALUE].m_Text ) );
+                    CONV_TO_UTF8( DrawLibItem->m_Field[VALUE].m_Text ) );
 
         if( aIncludeSubComponents )
         {
@@ -750,17 +757,19 @@ int WinEDA_Build_BOM_Frame::PrintComponentsListByRef( FILE* f, ListComponent* aL
 
 
 /*********************************************************************************************/
-int WinEDA_Build_BOM_Frame::PrintComponentsListByVal( FILE* f, ListComponent* aList, int aItemCount,
+int WinEDA_Build_BOM_Frame::PrintComponentsListByVal( FILE* f,
+                                                      ListComponent* aList,
+                                                      int aItemCount,
                                                       bool aIncludeSubComponents )
 /**********************************************************************************************/
 {
-    int         Multi;
-    wxChar      Unit;
+    int Multi;
+    wxChar Unit;
     EDA_BaseStruct* DrawList;
     SCH_COMPONENT* DrawLibItem;
     EDA_LibComponentStruct* Entry;
-    char        CmpName[80];
-    wxString    msg;
+    char CmpName[80];
+    wxString msg;
 
     msg = _( "\n#Cmp ( order = Value )" );
 

nsis_win_installer/install.nsi

@@ -17,7 +17,7 @@
 
 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-!define PRODUCT_VERSION "2008.01.25"
+!define PRODUCT_VERSION "2008.06.15"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define COMPANY_NAME ""
 !define TRADE_MARKS ""
@@ -118,8 +118,8 @@ Section $(TITLE_SEC01) SEC01
   File /nonfatal "..\doc_conv_orcad_to_kicad_spanish.txt"
   SetOutPath "$INSTDIR\template"
   File /nonfatal /r "..\template\*"
-  SetOutPath "$INSTDIR\winexe"
-  File /r "..\winexe\*"
+  SetOutPath "$INSTDIR\bin"
+  File /r "..\bin\*"
   SetOutPath "$INSTDIR\internat"
   File /r "..\internat\*"
 SectionEnd
@@ -156,9 +156,9 @@ Section -CreateShortcuts
   CreateShortCut "$SMPROGRAMS\KiCad\Home Page.lnk" "$INSTDIR\HomePage.url"
   CreateShortCut "$SMPROGRAMS\KiCad\User Group.lnk" "$INSTDIR\UserGroup.url"
   CreateShortCut "$SMPROGRAMS\KiCad\Uninstall.lnk" "$INSTDIR\uninstaller.exe"
-  CreateShortCut "$SMPROGRAMS\KiCad\KiCad.lnk" "$INSTDIR\winexe\kicad.exe"
+  CreateShortCut "$SMPROGRAMS\KiCad\KiCad.lnk" "$INSTDIR\bin\kicad.exe"
   CreateShortCut "$SMPROGRAMS\KiCad\Wings3D.lnk" "$INSTDIR\Wings3D.url"
-  CreateShortCut "$DESKTOP\KiCad.lnk" "$INSTDIR\winexe\kicad.exe"
+  CreateShortCut "$DESKTOP\KiCad.lnk" "$INSTDIR\bin\kicad.exe"
 SectionEnd
 
 Section -CreateAddRemoveEntry
@@ -167,7 +167,7 @@ Section -CreateAddRemoveEntry
   WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "Publisher" "${COMPANY_NAME}"
   WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninstaller.exe"
   WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
-  WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\winexe\kicad.exe"
+  WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\bin\kicad.exe"
   WriteRegDWORD ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "NoModify" "1"
   WriteRegDWORD ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "NoRepair" "1"
   WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "Comments" "${COMMENTS}"
@@ -221,7 +221,7 @@ Section Uninstall
   RMDir /r "$INSTDIR\library"
   RMDir /r "$INSTDIR\modules"
   RMDir /r "$INSTDIR\template"
-  RMDir /r "$INSTDIR\winexe"
+  RMDir /r "$INSTDIR\bin"
   RMDir /r "$INSTDIR\internat"
   RMDir /r "$INSTDIR\demos"
   RMDir /r "$INSTDIR\tutorial"

pcbnew/pcbframe.cpp

@@ -20,161 +20,159 @@
 
 BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
 
-    COMMON_EVENTS_DRAWFRAME
-    EVT_SOCKET( ID_EDA_SOCKET_EVENT_SERV, WinEDA_PcbFrame::OnSockRequestServer )
-    EVT_SOCKET( ID_EDA_SOCKET_EVENT, WinEDA_PcbFrame::OnSockRequest )
-
-    EVT_KICAD_CHOICEBOX( ID_ON_ZOOM_SELECT, WinEDA_PcbFrame::OnSelectZoom )
-    EVT_KICAD_CHOICEBOX( ID_ON_GRID_SELECT, WinEDA_PcbFrame::OnSelectGrid )
-
-    EVT_CLOSE( WinEDA_PcbFrame::OnCloseWindow )
-    EVT_SIZE( WinEDA_PcbFrame::OnSize )
-
-    EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT,
-                    WinEDA_PcbFrame::Process_Zoom )
-
-    EVT_TOOL( ID_LOAD_FILE, WinEDA_PcbFrame::Files_io )
-    EVT_TOOL( ID_MENU_READ_LAST_SAVED_VERSION_BOARD, WinEDA_PcbFrame::Files_io )
-    EVT_TOOL( ID_MENU_RECOVER_BOARD, WinEDA_PcbFrame::Files_io )
-    EVT_TOOL( ID_NEW_BOARD, WinEDA_PcbFrame::Files_io )
-    EVT_TOOL( ID_SAVE_BOARD, WinEDA_PcbFrame::Files_io )
-    EVT_TOOL( ID_OPEN_MODULE_EDITOR, WinEDA_PcbFrame::Process_Special_Functions )
-
-    EVT_MENU_RANGE( ID_PREFERENCES_FONT_INFOSCREEN, ID_PREFERENCES_FONT_END,
-                    WinEDA_DrawFrame::ProcessFontPreferences )
-
-    // Menu Files:
-
-    EVT_MENU( ID_MAIN_MENUBAR, WinEDA_PcbFrame::Process_Special_Functions )
-
-    EVT_MENU( ID_MENU_LOAD_FILE, WinEDA_PcbFrame::Files_io )
-    EVT_MENU( ID_MENU_NEW_BOARD, WinEDA_PcbFrame::Files_io )
-    EVT_MENU( ID_MENU_SAVE_BOARD, WinEDA_PcbFrame::Files_io )
-    EVT_MENU( ID_MENU_APPEND_FILE, WinEDA_PcbFrame::Files_io )
-    EVT_MENU( ID_MENU_SAVE_BOARD_AS, WinEDA_PcbFrame::Files_io )
-    EVT_MENU( ID_GEN_PLOT, WinEDA_PcbFrame::ToPlotter )
-    EVT_MENU_RANGE( ID_LOAD_FILE_1, ID_LOAD_FILE_10,
-                    WinEDA_PcbFrame::Files_io )
-
-    EVT_MENU( ID_GEN_EXPORT_SPECCTRA, WinEDA_PcbFrame::ExportToSpecctra )
-    EVT_MENU( ID_GEN_EXPORT_FILE_GENCADFORMAT, WinEDA_PcbFrame::ExportToGenCAD )
-    EVT_MENU( ID_GEN_EXPORT_FILE_MODULE_REPORT, WinEDA_PcbFrame::GenModuleReport )
-
-    EVT_MENU( ID_GEN_IMPORT_SPECCTRA_SESSION, WinEDA_PcbFrame::ImportSpecctraSession )
-    EVT_MENU( ID_GEN_IMPORT_SPECCTRA_DESIGN, WinEDA_PcbFrame::ImportSpecctraDesign )
-
-    EVT_MENU( ID_MENU_ARCHIVE_NEW_MODULES, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_MENU( ID_MENU_ARCHIVE_ALL_MODULES, WinEDA_PcbFrame::Process_Special_Functions )
-
-    EVT_MENU( ID_EXIT, WinEDA_PcbFrame::Process_Special_Functions )
-
-    // menu Config
-    EVT_MENU_RANGE(ID_CONFIG_AND_PREFERENCES_START, ID_CONFIG_AND_PREFERENCES_END,
-        WinEDA_PcbFrame::Process_Config)
-
-    EVT_MENU( ID_COLORS_SETUP, WinEDA_PcbFrame::Process_Config )
-    EVT_MENU( ID_OPTIONS_SETUP, WinEDA_PcbFrame::Process_Config )
-    EVT_MENU( ID_PCB_TRACK_SIZE_SETUP, WinEDA_PcbFrame::Process_Config )
-    EVT_MENU( ID_PCB_DRAWINGS_WIDTHS_SETUP, WinEDA_PcbFrame::Process_Config )
-    EVT_MENU( ID_PCB_PAD_SETUP, WinEDA_PcbFrame::Process_Config )
-    EVT_MENU( ID_PCB_LOOK_SETUP, WinEDA_PcbFrame::Process_Config )
-    EVT_MENU( ID_CONFIG_SAVE, WinEDA_PcbFrame::Process_Config )
-    EVT_MENU( ID_CONFIG_READ, WinEDA_PcbFrame::Process_Config )
-
-    EVT_MENU( ID_PCB_USER_GRID_SETUP, WinEDA_PcbFrame::Process_Special_Functions )
-
-    EVT_MENU_RANGE( ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END,
-                    WinEDA_DrawFrame::SetLanguage )
-
-    // menu Postprocess
-    EVT_MENU( ID_PCB_GEN_POS_MODULES_FILE, WinEDA_PcbFrame::GenModulesPosition )
-    EVT_MENU( ID_PCB_GEN_DRILL_FILE, WinEDA_PcbFrame::InstallDrillFrame )
-    EVT_MENU( ID_PCB_GEN_CMP_FILE, WinEDA_PcbFrame::Files_io )
-
-    // menu Miscellaneous
-    EVT_MENU( ID_MENU_LIST_NETS, WinEDA_PcbFrame::Liste_Equipot )
-    EVT_MENU( ID_PCB_GLOBAL_DELETE, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_MENU( ID_MENU_PCB_CLEAN, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_MENU( ID_MENU_PCB_SWAP_LAYERS, WinEDA_PcbFrame::Process_Special_Functions )
-
-    // Menu Help
-    EVT_MENU( ID_GENERAL_HELP, WinEDA_DrawFrame::GetKicadHelp )
-    EVT_MENU( ID_KICAD_ABOUT, WinEDA_PcbFrame::GetKicadAbout )
-
-    // Menu 3D Frame
-    EVT_MENU( ID_MENU_PCB_SHOW_3D_FRAME, WinEDA_PcbFrame::Show3D_Frame )
-
-    // Horizontal toolbar
-    EVT_TOOL( ID_TO_LIBRARY, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_SHEET_SET, WinEDA_DrawFrame::Process_PageSettings )
-    EVT_TOOL( wxID_CUT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( wxID_COPY, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( wxID_PASTE, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_UNDO_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_GEN_PRINT, WinEDA_DrawFrame::ToPrinter )
-    EVT_TOOL( ID_GEN_PLOT, WinEDA_DrawFrame::Process_Special_Functions )
-    EVT_TOOL( ID_FIND_ITEMS, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_GET_NETLIST, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_DRC_CONTROL, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_KICAD_CHOICEBOX( ID_TOOLBARH_PCB_SELECT_LAYER,
-                         WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_KICAD_CHOICEBOX( ID_AUX_TOOLBAR_PCB_TRACK_WIDTH,
-                         WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_KICAD_CHOICEBOX( ID_AUX_TOOLBAR_PCB_VIA_SIZE,
-                         WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_TOOLBARH_PCB_AUTOPLACE, WinEDA_PcbFrame::AutoPlace )
-    EVT_TOOL( ID_TOOLBARH_PCB_AUTOROUTE, WinEDA_PcbFrame::AutoPlace )
-    EVT_TOOL( ID_TOOLBARH_PCB_FREEROUTE_ACCESS, WinEDA_PcbFrame::Access_to_External_Tool )
-
-    // Option toolbar
-    EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END,
-                    WinEDA_PcbFrame::OnSelectOptionToolbar )
-
-    // Vertical toolbar:
-    EVT_TOOL( ID_NO_SELECT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_PCB_HIGHLIGHT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_COMPONENT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_TRACK_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_PCB_ZONES_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_PCB_MIRE_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_PCB_ARC_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_PCB_CIRCLE_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_TEXT_COMMENT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_LINE_COMMENT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_PCB_COTATION_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_PCB_DELETE_ITEM_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_PCB_SHOW_1_RATSNEST_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-    EVT_TOOL( ID_PCB_PLACE_OFFSET_COORD_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
-
-    EVT_TOOL_RANGE( ID_PCB_MUWAVE_START_CMD, ID_PCB_MUWAVE_END_CMD,
-                    WinEDA_PcbFrame::ProcessMuWaveFunctions )
-
-    EVT_TOOL_RCLICKED( ID_TRACK_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
-    EVT_TOOL_RCLICKED( ID_PCB_CIRCLE_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
-    EVT_TOOL_RCLICKED( ID_PCB_ARC_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
-    EVT_TOOL_RCLICKED( ID_TEXT_COMMENT_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
-    EVT_TOOL_RCLICKED( ID_LINE_COMMENT_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
-    EVT_TOOL_RCLICKED( ID_PCB_COTATION_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
-
-    EVT_MENU_RANGE( ID_POPUP_PCB_AUTOPLACE_START_RANGE,
-                    ID_POPUP_PCB_AUTOPLACE_END_RANGE,
-                    WinEDA_PcbFrame::AutoPlace )
-
-    EVT_MENU_RANGE( ID_POPUP_PCB_START_RANGE, ID_POPUP_PCB_END_RANGE,
-                    WinEDA_PcbFrame::Process_Special_Functions )
-
-    // Annulation de commande en cours
-    EVT_MENU_RANGE( ID_POPUP_GENERAL_START_RANGE, ID_POPUP_GENERAL_END_RANGE,
-                    WinEDA_PcbFrame::Process_Special_Functions )
-
-    // PopUp Menus pour Zooms traites dans drawpanel.cpp
+COMMON_EVENTS_DRAWFRAME EVT_SOCKET( ID_EDA_SOCKET_EVENT_SERV, WinEDA_PcbFrame::OnSockRequestServer )
+EVT_SOCKET( ID_EDA_SOCKET_EVENT, WinEDA_PcbFrame::OnSockRequest )
+
+EVT_KICAD_CHOICEBOX( ID_ON_ZOOM_SELECT, WinEDA_PcbFrame::OnSelectZoom )
+EVT_KICAD_CHOICEBOX( ID_ON_GRID_SELECT, WinEDA_PcbFrame::OnSelectGrid )
+
+EVT_CLOSE( WinEDA_PcbFrame::OnCloseWindow )
+EVT_SIZE( WinEDA_PcbFrame::OnSize )
+
+EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT,
+                WinEDA_PcbFrame::Process_Zoom )
+
+EVT_TOOL( ID_LOAD_FILE, WinEDA_PcbFrame::Files_io )
+EVT_TOOL( ID_MENU_READ_LAST_SAVED_VERSION_BOARD, WinEDA_PcbFrame::Files_io )
+EVT_TOOL( ID_MENU_RECOVER_BOARD, WinEDA_PcbFrame::Files_io )
+EVT_TOOL( ID_NEW_BOARD, WinEDA_PcbFrame::Files_io )
+EVT_TOOL( ID_SAVE_BOARD, WinEDA_PcbFrame::Files_io )
+EVT_TOOL( ID_OPEN_MODULE_EDITOR, WinEDA_PcbFrame::Process_Special_Functions )
+
+EVT_MENU_RANGE( ID_PREFERENCES_FONT_INFOSCREEN, ID_PREFERENCES_FONT_END,
+                WinEDA_DrawFrame::ProcessFontPreferences )
+
+// Menu Files:
+
+EVT_MENU( ID_MAIN_MENUBAR, WinEDA_PcbFrame::Process_Special_Functions )
+
+EVT_MENU( ID_MENU_LOAD_FILE, WinEDA_PcbFrame::Files_io )
+EVT_MENU( ID_MENU_NEW_BOARD, WinEDA_PcbFrame::Files_io )
+EVT_MENU( ID_MENU_SAVE_BOARD, WinEDA_PcbFrame::Files_io )
+EVT_MENU( ID_MENU_APPEND_FILE, WinEDA_PcbFrame::Files_io )
+EVT_MENU( ID_MENU_SAVE_BOARD_AS, WinEDA_PcbFrame::Files_io )
+EVT_MENU( ID_GEN_PLOT, WinEDA_PcbFrame::ToPlotter )
+EVT_MENU_RANGE( ID_LOAD_FILE_1, ID_LOAD_FILE_10,
+                WinEDA_PcbFrame::Files_io )
+
+EVT_MENU( ID_GEN_EXPORT_SPECCTRA, WinEDA_PcbFrame::ExportToSpecctra )
+EVT_MENU( ID_GEN_EXPORT_FILE_GENCADFORMAT, WinEDA_PcbFrame::ExportToGenCAD )
+EVT_MENU( ID_GEN_EXPORT_FILE_MODULE_REPORT, WinEDA_PcbFrame::GenModuleReport )
+
+EVT_MENU( ID_GEN_IMPORT_SPECCTRA_SESSION, WinEDA_PcbFrame::ImportSpecctraSession )
+EVT_MENU( ID_GEN_IMPORT_SPECCTRA_DESIGN, WinEDA_PcbFrame::ImportSpecctraDesign )
+
+EVT_MENU( ID_MENU_ARCHIVE_NEW_MODULES, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_MENU( ID_MENU_ARCHIVE_ALL_MODULES, WinEDA_PcbFrame::Process_Special_Functions )
+
+EVT_MENU( ID_EXIT, WinEDA_PcbFrame::Process_Special_Functions )
+
+// menu Config
+EVT_MENU_RANGE( ID_CONFIG_AND_PREFERENCES_START, ID_CONFIG_AND_PREFERENCES_END,
+                WinEDA_PcbFrame::Process_Config )
+
+EVT_MENU( ID_COLORS_SETUP, WinEDA_PcbFrame::Process_Config )
+EVT_MENU( ID_OPTIONS_SETUP, WinEDA_PcbFrame::Process_Config )
+EVT_MENU( ID_PCB_TRACK_SIZE_SETUP, WinEDA_PcbFrame::Process_Config )
+EVT_MENU( ID_PCB_DRAWINGS_WIDTHS_SETUP, WinEDA_PcbFrame::Process_Config )
+EVT_MENU( ID_PCB_PAD_SETUP, WinEDA_PcbFrame::Process_Config )
+EVT_MENU( ID_PCB_LOOK_SETUP, WinEDA_PcbFrame::Process_Config )
+EVT_MENU( ID_CONFIG_SAVE, WinEDA_PcbFrame::Process_Config )
+EVT_MENU( ID_CONFIG_READ, WinEDA_PcbFrame::Process_Config )
+
+EVT_MENU( ID_PCB_USER_GRID_SETUP, WinEDA_PcbFrame::Process_Special_Functions )
+
+EVT_MENU_RANGE( ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END,
+                WinEDA_DrawFrame::SetLanguage )
+
+// menu Postprocess
+EVT_MENU( ID_PCB_GEN_POS_MODULES_FILE, WinEDA_PcbFrame::GenModulesPosition )
+EVT_MENU( ID_PCB_GEN_DRILL_FILE, WinEDA_PcbFrame::InstallDrillFrame )
+EVT_MENU( ID_PCB_GEN_CMP_FILE, WinEDA_PcbFrame::Files_io )
+
+// menu Miscellaneous
+EVT_MENU( ID_MENU_LIST_NETS, WinEDA_PcbFrame::Liste_Equipot )
+EVT_MENU( ID_PCB_GLOBAL_DELETE, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_MENU( ID_MENU_PCB_CLEAN, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_MENU( ID_MENU_PCB_SWAP_LAYERS, WinEDA_PcbFrame::Process_Special_Functions )
+
+// Menu Help
+EVT_MENU( ID_GENERAL_HELP, WinEDA_DrawFrame::GetKicadHelp )
+EVT_MENU( ID_KICAD_ABOUT, WinEDA_PcbFrame::GetKicadAbout )
+
+// Menu 3D Frame
+EVT_MENU( ID_MENU_PCB_SHOW_3D_FRAME, WinEDA_PcbFrame::Show3D_Frame )
+
+// Horizontal toolbar
+EVT_TOOL( ID_TO_LIBRARY, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_SHEET_SET, WinEDA_DrawFrame::Process_PageSettings )
+EVT_TOOL( wxID_CUT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( wxID_COPY, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( wxID_PASTE, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_UNDO_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_GEN_PRINT, WinEDA_DrawFrame::ToPrinter )
+EVT_TOOL( ID_GEN_PLOT, WinEDA_DrawFrame::Process_Special_Functions )
+EVT_TOOL( ID_FIND_ITEMS, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_GET_NETLIST, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_DRC_CONTROL, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_KICAD_CHOICEBOX( ID_TOOLBARH_PCB_SELECT_LAYER,
+                     WinEDA_PcbFrame::Process_Special_Functions )
+EVT_KICAD_CHOICEBOX( ID_AUX_TOOLBAR_PCB_TRACK_WIDTH,
+                     WinEDA_PcbFrame::Process_Special_Functions )
+EVT_KICAD_CHOICEBOX( ID_AUX_TOOLBAR_PCB_VIA_SIZE,
+                     WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_TOOLBARH_PCB_AUTOPLACE, WinEDA_PcbFrame::AutoPlace )
+EVT_TOOL( ID_TOOLBARH_PCB_AUTOROUTE, WinEDA_PcbFrame::AutoPlace )
+EVT_TOOL( ID_TOOLBARH_PCB_FREEROUTE_ACCESS, WinEDA_PcbFrame::Access_to_External_Tool )
+
+// Option toolbar
+EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END,
+                WinEDA_PcbFrame::OnSelectOptionToolbar )
+
+// Vertical toolbar:
+EVT_TOOL( ID_NO_SELECT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_PCB_HIGHLIGHT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_COMPONENT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_TRACK_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_PCB_ZONES_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_PCB_MIRE_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_PCB_ARC_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_PCB_CIRCLE_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_TEXT_COMMENT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_LINE_COMMENT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_PCB_COTATION_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_PCB_DELETE_ITEM_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_PCB_SHOW_1_RATSNEST_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+EVT_TOOL( ID_PCB_PLACE_OFFSET_COORD_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
+
+EVT_TOOL_RANGE( ID_PCB_MUWAVE_START_CMD, ID_PCB_MUWAVE_END_CMD,
+                WinEDA_PcbFrame::ProcessMuWaveFunctions )
+
+EVT_TOOL_RCLICKED( ID_TRACK_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
+EVT_TOOL_RCLICKED( ID_PCB_CIRCLE_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
+EVT_TOOL_RCLICKED( ID_PCB_ARC_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
+EVT_TOOL_RCLICKED( ID_TEXT_COMMENT_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
+EVT_TOOL_RCLICKED( ID_LINE_COMMENT_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
+EVT_TOOL_RCLICKED( ID_PCB_COTATION_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
+
+EVT_MENU_RANGE( ID_POPUP_PCB_AUTOPLACE_START_RANGE,
+                ID_POPUP_PCB_AUTOPLACE_END_RANGE,
+                WinEDA_PcbFrame::AutoPlace )
+
+EVT_MENU_RANGE( ID_POPUP_PCB_START_RANGE, ID_POPUP_PCB_END_RANGE,
+                WinEDA_PcbFrame::Process_Special_Functions )
+
+// Annulation de commande en cours
+EVT_MENU_RANGE( ID_POPUP_GENERAL_START_RANGE, ID_POPUP_GENERAL_END_RANGE,
+                WinEDA_PcbFrame::Process_Special_Functions )
+
+// PopUp Menus pour Zooms traites dans drawpanel.cpp
 
 END_EVENT_TABLE()
 
 
-
 ///////****************************///////////:
 
 /****************/
@@ -184,7 +182,7 @@ END_EVENT_TABLE()
 WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father, WinEDA_App* parent,
                                   const wxString& title,
                                   const wxPoint& pos, const wxSize& size,
-                                  long style) :
+                                  long style ) :
     WinEDA_BasePcbFrame( father, parent, PCB_FRAME, title, pos, size, style )
 {
     m_FrameName                = wxT( "PcbFrame" );
@@ -245,6 +243,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father, WinEDA_App* parent,
     ReCreateOptToolbar();
 }
 
+
 /************************************/
 WinEDA_PcbFrame::~WinEDA_PcbFrame()
 /************************************/
@@ -277,7 +276,7 @@ void WinEDA_PcbFrame::OnCloseWindow( wxCloseEvent& Event )
 
     if( screen )
     {
-        unsigned ii;
+        unsigned        ii;
         wxMessageDialog dialog( this, _( "Board modified, Save before exit ?" ),
                                 _( "Confirmation" ), wxYES_NO | wxCANCEL | wxICON_EXCLAMATION |
                                 wxYES_DEFAULT );
@@ -380,8 +379,10 @@ void WinEDA_PcbFrame::SetToolbars()
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_DRC_OFF,
                                       !Drc_On );
         m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_DRC_OFF, Drc_On ?
-            _( "DRC Off (Disable !!!), Currently: DRC is active" ) :
-            _( "DRC On (Currently: DRC is inactive !!!)" ) );
+                                           _(
+                                               "DRC Off (Disable !!!), Currently: DRC is active" )
+                                           :
+                                           _( "DRC On (Currently: DRC is inactive !!!)" ) );
 
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SELECT_UNIT_MM,
                                       g_UnitMetric == MILLIMETRE ? TRUE : FALSE );
@@ -398,7 +399,7 @@ void WinEDA_PcbFrame::SetToolbars()
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID,
                                       m_Draw_Grid );
         m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_GRID,
-               m_Draw_Grid ? _( "Grid not show" ) : _( "Show Grid" ) );
+                                           m_Draw_Grid ? _( "Grid not show" ) : _( "Show Grid" ) );
 
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SELECT_CURSOR,
                                       g_CursorShape );
@@ -406,23 +407,24 @@ void WinEDA_PcbFrame::SetToolbars()
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_RATSNEST,
                                       g_Show_Ratsnest );
         m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_RATSNEST,
-              g_Show_Ratsnest ?
-              _( "General ratsnest not show" ) : _( "Show General ratsnest" ) );
+                                           g_Show_Ratsnest ?
+                                           _( "General ratsnest not show" ) : _(
+                                               "Show General ratsnest" ) );
 
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_MODULE_RATSNEST,
                                       g_Show_Module_Ratsnest );
         m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_MODULE_RATSNEST,
-            g_Show_Module_Ratsnest ?
-                _( "Module ratsnest not show" ) :
-                _( "Show Module ratsnest" ) );
+                                           g_Show_Module_Ratsnest ?
+                                           _( "Module ratsnest not show" ) :
+                                           _( "Show Module ratsnest" ) );
 
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_AUTO_DEL_TRACK,
                                       g_AutoDeleteOldTrack );
 
         m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_AUTO_DEL_TRACK,
-            g_AutoDeleteOldTrack ?
-                _( "Disable Auto Delete old Track" ) :
-                _( "Enable Auto Delete old Track" ) );
+                                           g_AutoDeleteOldTrack ?
+                                           _( "Disable Auto Delete old Track" ) :
+                                           _( "Enable Auto Delete old Track" ) );
 
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_ZONES,
                                       DisplayOpt.DisplayZones );
@@ -457,7 +459,7 @@ void WinEDA_PcbFrame::SetToolbars()
     {
         wxString msg;
         m_AuxiliaryToolBar->ToggleTool( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH,
-                                      g_DesignSettings.m_UseConnectedTrackWidth );
+                                        g_DesignSettings.m_UseConnectedTrackWidth );
         if( m_SelTrackWidthBox && m_SelTrackWidthBox_Changed )
         {
             m_SelTrackWidthBox_Changed = FALSE;
@@ -472,7 +474,7 @@ void WinEDA_PcbFrame::SetToolbars()
             for( ii = 0; ii < HISTORY_NUMBER; ii++ )
             {
                 if( g_DesignSettings.m_TrackWidthHistory[ii] == 0 )
-                    break;                                                  // Fin de liste
+                    break; // Fin de liste
                 double value = To_User_Unit( g_UnitMetric,
                                              g_DesignSettings.m_TrackWidthHistory[ii],
                                              PCB_INTERNAL_UNIT );
@@ -485,7 +487,7 @@ void WinEDA_PcbFrame::SetToolbars()
                 m_SelTrackWidthBox->Append( msg );
 
                 if( g_DesignSettings.m_TrackWidthHistory[ii] ==
-                        g_DesignSettings.m_CurrentTrackWidth )
+                    g_DesignSettings.m_CurrentTrackWidth )
                     m_SelTrackWidthBox->SetSelection( ii );
             }
         }
@@ -504,7 +506,7 @@ void WinEDA_PcbFrame::SetToolbars()
             for( ii = 0; ii < HISTORY_NUMBER; ii++ )
             {
                 if( g_DesignSettings.m_ViaSizeHistory[ii] == 0 )
-                    break;                                                  // Fin de liste
+                    break; // Fin de liste
 
                 double value = To_User_Unit( g_UnitMetric,
                                              g_DesignSettings.m_ViaSizeHistory[ii],
@@ -556,7 +558,7 @@ void WinEDA_PcbFrame::SetToolbars()
             }
 
             if( kk != ii )
-                m_SelGridBox->SetSelection( ii );   /* User Grid */
+                m_SelGridBox->SetSelection( ii ); /* User Grid */
         }
     }
 
@@ -567,15 +569,16 @@ void WinEDA_PcbFrame::SetToolbars()
     DisplayUnitsMsg();
 }
 
+
 /***********************************************************/
 void WinEDA_PcbFrame::GetKicadAbout( wxCommandEvent& event )
 /**********************************************************/
 {
-    wxString extra_message =
-        wxT("\nPcbnew uses the kbool library \n");
-    extra_message << wxT("version ") << wxT(KBOOL_VERSION)
-       << wxT("\nsee http://boolean.klaasholwerda.nl/bool.html\n");
-    
+    wxString extra_message;
+
+    extra_message << wxT( "\nPcbnew uses the kbool library version " )
+                  << wxT( KBOOL_VERSION )
+                  << wxT( "\nsee http://boolean.klaasholwerda.nl/bool.html\n" );
+
     Print_Kicad_Infos( this, m_AboutTitle, extra_message );
 }
-