From 67d98658bc720f51b12e2706fd846a8a335dc37d Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 29 Nov 2010 16:05:01 +0100 Subject: [PATCH] minor cleanup. minor enhancements. Finish file housekeeping. add Bug 682586 fix from Mark van Doesburg. --- common/projet_config.cpp | 8 +- cvpcb/autosel.cpp | 4 +- cvpcb/cvframe.cpp | 4 - .../dialogs/dialog_print_using_printer.cpp | 10 +- eeschema/eeschema_config.cpp | 8 +- eeschema/schframe.cpp | 2 +- gerbview/class_gerber_draw_item.h | 6 +- include/wxEeschemaStruct.h | 6 +- pcbnew/CMakeLists.txt | 18 +- .../dialog_freeroute_exchange.cpp | 31 +- .../{ => dialogs}/dialog_freeroute_exchange.h | 1 - .../dialog_freeroute_exchange_base.cpp | 0 .../dialog_freeroute_exchange_base.fbp | 938 +++++++++--------- .../dialog_freeroute_exchange_base.h | 0 .../dialog_freeroute_exchange_help.html | 0 pcbnew/gendrill.cpp | 2 +- 16 files changed, 513 insertions(+), 525 deletions(-) rename pcbnew/{ => dialogs}/dialog_freeroute_exchange.cpp (83%) rename pcbnew/{ => dialogs}/dialog_freeroute_exchange.h (95%) rename pcbnew/{ => dialogs}/dialog_freeroute_exchange_base.cpp (100%) rename pcbnew/{ => dialogs}/dialog_freeroute_exchange_base.fbp (70%) rename pcbnew/{ => dialogs}/dialog_freeroute_exchange_base.h (100%) rename pcbnew/{ => dialogs}/dialog_freeroute_exchange_help.html (100%) diff --git a/common/projet_config.cpp b/common/projet_config.cpp index a2beb3003a..e4a5dc4d0f 100644 --- a/common/projet_config.cpp +++ b/common/projet_config.cpp @@ -741,13 +741,13 @@ void PARAM_CFG_LIBNAME_LIST::SaveParam( wxConfigBase* aConfig ) wxArrayString* libname_list = m_Pt_param; unsigned indexlib = 0; - wxString cle_config; + wxString configkey; for( ; indexlib < libname_list->GetCount(); indexlib++ ) { - cle_config = m_Ident; + configkey = m_Ident; // We use indexlib+1 because first lib name is LibName1 - cle_config << (indexlib + 1); - aConfig->Write( cle_config, libname_list->Item( indexlib ) ); + configkey << (indexlib + 1); + aConfig->Write( configkey, libname_list->Item( indexlib ) ); } } diff --git a/cvpcb/autosel.cpp b/cvpcb/autosel.cpp index 3d522188ac..bd300317af 100644 --- a/cvpcb/autosel.cpp +++ b/cvpcb/autosel.cpp @@ -140,7 +140,7 @@ found in the default search paths." ), BOOST_FOREACH( COMPONENT& component, m_components ) { - m_ListCmp->SetSelection( ii, true ); + m_ListCmp->SetSelection( ii++, true ); if( !component.m_Module.IsEmpty() ) continue; @@ -169,7 +169,5 @@ any of the project footprint libraries." ), this ); } } - - ii += 1; } } diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp index 1f00830749..8e9856c902 100644 --- a/cvpcb/cvframe.cpp +++ b/cvpcb/cvframe.cpp @@ -355,8 +355,6 @@ void WinEDA_CvpcbFrame::ToFirstNA( wxCommandEvent& event ) ii++; } - - wxBell(); m_ListCmp->SetSelection( selection ); } @@ -384,8 +382,6 @@ void WinEDA_CvpcbFrame::ToPreviousNA( wxCommandEvent& event ) } ii--; } - - wxBell(); m_ListCmp->SetSelection( selection ); } diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp index b172cfc66f..7959b4426c 100644 --- a/eeschema/dialogs/dialog_print_using_printer.cpp +++ b/eeschema/dialogs/dialog_print_using_printer.cpp @@ -92,7 +92,7 @@ DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( WinEDA_SchematicFrame* a { wxASSERT( aParent != NULL ); - m_checkReference->SetValue( aParent->GetShowSheetReference() ); + m_checkReference->SetValue( aParent->GetPrintSheetReference() ); m_checkMonochrome->SetValue( aParent->GetPrintMonochrome() ); } @@ -138,7 +138,7 @@ void DIALOG_PRINT_USING_PRINTER::OnCloseWindow( wxCloseEvent& event ) } parent->SetPrintMonochrome( m_checkMonochrome->IsChecked() ); - parent->SetShowSheetReference( m_checkReference->IsChecked() ); + parent->SetPrintSheetReference( m_checkReference->IsChecked() ); EndDialog( wxID_CANCEL ); } @@ -165,7 +165,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintPreview( wxCommandEvent& event ) WinEDA_SchematicFrame* parent = GetParent(); parent->SetPrintMonochrome( m_checkMonochrome->IsChecked() ); - parent->SetShowSheetReference( m_checkReference->IsChecked() ); + parent->SetPrintSheetReference( m_checkReference->IsChecked() ); // Pass two printout objects: for preview, and possible printing. wxString title = _( "Preview" ); @@ -194,7 +194,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintButtonClick( wxCommandEvent& event ) WinEDA_SchematicFrame* parent = GetParent(); parent->SetPrintMonochrome( m_checkMonochrome->IsChecked() ); - parent->SetShowSheetReference( m_checkReference->IsChecked() ); + parent->SetPrintSheetReference( m_checkReference->IsChecked() ); wxPrintDialogData printDialogData( parent->GetPageSetupData().GetPrintData() ); printDialogData.SetMaxPage( g_RootSheet->CountSheets() ); @@ -333,7 +333,7 @@ void SCH_PRINTOUT::DrawPage() panel->m_ClipBox.SetOrigin( wxPoint( 0, 0 ) ); panel->m_ClipBox.SetSize( wxSize( 0x7FFFFF0, 0x7FFFFF0 ) ); - bool printReference = parent->GetShowSheetReference(); + bool printReference = parent->GetPrintSheetReference(); if( printReference ) { diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp index 16db74dfab..b4a983a137 100644 --- a/eeschema/eeschema_config.cpp +++ b/eeschema/eeschema_config.cpp @@ -342,10 +342,6 @@ PARAM_CFG_ARRAY& WinEDA_SchematicFrame::GetProjectFileParameters( void ) &g_DefaultTextLabelSize, DEFAULT_SIZE_TEXT, 0, 1000 ) ); - m_projectFileParams.push_back( new PARAM_CFG_BOOL( wxT( "PrintMonochrome" ), - &m_printMonochrome, true ) ); - m_projectFileParams.push_back( new PARAM_CFG_BOOL( wxT( "ShowSheetReferenceAndTitleBlock" ), - &m_showSheetReference, true ) ); return m_projectFileParams; } @@ -542,6 +538,10 @@ PARAM_CFG_ARRAY& WinEDA_SchematicFrame::GetConfigurationSettings( void ) m_configSettings.push_back( new PARAM_CFG_SETCOLOR( true, wxT( "ColorErcE" ), &g_LayerDescr.LayerColor[LAYER_ERC_ERR], RED ) ); + m_configSettings.push_back( new PARAM_CFG_BOOL( true, wxT( "PrintMonochrome" ), + &m_printMonochrome, true ) ); + m_configSettings.push_back( new PARAM_CFG_BOOL( true, wxT( "PrintSheetReferenceAndTitleBlock" ), + &m_printSheetReference, true ) ); return m_configSettings; } diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index 3e9226eaad..159337332a 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -168,7 +168,7 @@ WinEDA_SchematicFrame::WinEDA_SchematicFrame( wxWindow* father, m_previewPosition = wxDefaultPosition; m_previewSize = wxDefaultSize; m_printMonochrome = true; - m_showSheetReference = true; + m_printSheetReference = true; m_HotkeysZoomAndGridList = s_Schematic_Hokeys_Descr; m_dlgFindReplace = NULL; m_findReplaceData = new wxFindReplaceData( wxFR_DOWN ); diff --git a/gerbview/class_gerber_draw_item.h b/gerbview/class_gerber_draw_item.h index 86d369024e..3035cde51c 100644 --- a/gerbview/class_gerber_draw_item.h +++ b/gerbview/class_gerber_draw_item.h @@ -1,6 +1,6 @@ -/*******************************************************************/ -/* class_gerber_draw_item.h: definitions relatives to tracks, vias and zones */ -/*******************************************************************/ +/*****************************/ +/* class_gerber_draw_item.h */ +/*****************************/ #ifndef CLASS_GERBER_DRAW_ITEM_H #define CLASS_GERBER_DRAW_ITEM_H diff --git a/include/wxEeschemaStruct.h b/include/wxEeschemaStruct.h index 4185aa305c..724febb55f 100644 --- a/include/wxEeschemaStruct.h +++ b/include/wxEeschemaStruct.h @@ -85,7 +85,7 @@ private: wxPoint m_printDialogPosition; wxSize m_printDialogSize; bool m_printMonochrome; ///< Print monochrome instead of grey scale. - bool m_showSheetReference; + bool m_printSheetReference; DIALOG_SCH_FIND* m_dlgFindReplace; wxPoint m_findDialogPosition; wxSize m_findDialogSize; @@ -343,8 +343,8 @@ public: bool GetPrintMonochrome() { return m_printMonochrome; } void SetPrintMonochrome( bool aMonochrome ) { m_printMonochrome = aMonochrome; } - bool GetShowSheetReference() { return m_showSheetReference; } - void SetShowSheetReference( bool aShow ) { m_showSheetReference = aShow; } + bool GetPrintSheetReference() { return m_printSheetReference; } + void SetPrintSheetReference( bool aShow ) { m_printSheetReference = aShow; } void SVG_Print( wxCommandEvent& event ); // Plot functions: diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 0f256c1856..1e917df105 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -41,8 +41,8 @@ set(PCBNEW_DIALOGS dialogs/dialog_edit_module_text_base.cpp dialogs/dialog_exchange_modules_base.cpp dialogs/dialog_export_3Dfiles_base.cpp - dialog_freeroute_exchange.cpp - dialog_freeroute_exchange_base.cpp + dialogs/dialog_freeroute_exchange.cpp + dialogs/dialog_freeroute_exchange_base.cpp dialogs/dialog_gendrill.cpp dialogs/dialog_gendrill_base.cpp dialogs/dialog_general_options.cpp @@ -232,17 +232,17 @@ endif(APPLE) add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dialog_freeroute_exchange_help_html.h COMMAND ${CMAKE_COMMAND} - -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialog_freeroute_exchange_help.html - -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialog_freeroute_exchange_help_html.h + -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html + -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help_html.h -P ${CMAKE_MODULE_PATH}/Html2C.cmake - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_freeroute_exchange_help.html - COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/dialog_freeroute_exchange_help_html.h - from ${CMAKE_CURRENT_SOURCE_DIR}/dialog_freeroute_exchange_help.html" + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html + COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help_html.h + from ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html" ) -set_source_files_properties( dialog_freeroute_exchange.cpp +set_source_files_properties( dialogs/dialog_freeroute_exchange.cpp PROPERTIES - OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_freeroute_exchange_help_html.h + OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help_html.h ) ### diff --git a/pcbnew/dialog_freeroute_exchange.cpp b/pcbnew/dialogs/dialog_freeroute_exchange.cpp similarity index 83% rename from pcbnew/dialog_freeroute_exchange.cpp rename to pcbnew/dialogs/dialog_freeroute_exchange.cpp index 969fcfaef5..23616bc32c 100644 --- a/pcbnew/dialog_freeroute_exchange.cpp +++ b/pcbnew/dialogs/dialog_freeroute_exchange.cpp @@ -5,6 +5,7 @@ #include "fctsys.h" #include "appl_wxstruct.h" #include "common.h" +#include "confirm.h" #include "gestfich.h" #include "pcbnew.h" #include "wxPcbStruct.h" @@ -71,30 +72,30 @@ void DIALOG_FREEROUTE::OnHelpButtonClick( wxCommandEvent& event ) help_Dlg.ShowModal(); } -/*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_CREATE_EXPORT_DSN_FILE +/* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_CREATE_EXPORT_DSN_FILE */ - void DIALOG_FREEROUTE::OnExportButtonClick( wxCommandEvent& event ) { m_Parent->ExportToSpecctra( event ); } -/*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_IMPORT_FREEROUTE_DSN_FILE +/* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_IMPORT_FREEROUTE_DSN_FILE */ - void DIALOG_FREEROUTE::OnImportButtonClick( wxCommandEvent& event ) { m_Parent->ImportSpecctraSession( event ); + + /* Connectivity inf must be rebuild. + * because for large board it can take some time, this is made only on demand + */ + if( IsOK( this, _("Do you want to rebuild connectivity data ?" ) ) ) + m_Parent->Compile_Ratsnest( NULL, true ); } -/*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RUN_FREEROUTE +/* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RUN_FREEROUTE */ - void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event ) { wxString FullFileName = FindKicadFile( wxT( "freeroute.jnlp" ) ); @@ -115,10 +116,8 @@ void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event ) } -/*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON +/* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON */ - void DIALOG_FREEROUTE::OnVisitButtonClick( wxCommandEvent& event ) { wxString command = m_FreerouteURLName->GetValue(); @@ -127,10 +126,8 @@ void DIALOG_FREEROUTE::OnVisitButtonClick( wxCommandEvent& event ) } -/*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE +/* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE */ - void DIALOG_FREEROUTE::OnCancelButtonClick( wxCommandEvent& event ) { EndModal(wxID_CANCEL); @@ -149,10 +146,8 @@ void DIALOG_FREEROUTE::OnOKButtonClick( wxCommandEvent& event ) } -/*! - * wxEVT_COMMAND_TEXT_UPDATED event handler for ID_TEXT_EDIT_FR_URL +/* wxEVT_COMMAND_TEXT_UPDATED event handler for ID_TEXT_EDIT_FR_URL */ - void DIALOG_FREEROUTE::OnTextEditFrUrlUpdated( wxCommandEvent& event ) { m_FreeRouteSetupChanged = true; diff --git a/pcbnew/dialog_freeroute_exchange.h b/pcbnew/dialogs/dialog_freeroute_exchange.h similarity index 95% rename from pcbnew/dialog_freeroute_exchange.h rename to pcbnew/dialogs/dialog_freeroute_exchange.h index 384b8653ea..a4850f98e6 100644 --- a/pcbnew/dialog_freeroute_exchange.h +++ b/pcbnew/dialogs/dialog_freeroute_exchange.h @@ -2,7 +2,6 @@ // Name: dialog_freeroute_exchange.h ///////////////////////////////////////////////////////////////////////////// -// Generated by DialogBlocks (unregistered), 14/03/2008 09:19:27 #ifndef _DIALOG_FREEROUTE_EXCHANGE_H_ #define _DIALOG_FREEROUTE_EXCHANGE_H_ diff --git a/pcbnew/dialog_freeroute_exchange_base.cpp b/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp similarity index 100% rename from pcbnew/dialog_freeroute_exchange_base.cpp rename to pcbnew/dialogs/dialog_freeroute_exchange_base.cpp diff --git a/pcbnew/dialog_freeroute_exchange_base.fbp b/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp similarity index 70% rename from pcbnew/dialog_freeroute_exchange_base.fbp rename to pcbnew/dialogs/dialog_freeroute_exchange_base.fbp index bd5e272f8a..72ac33d808 100644 --- a/pcbnew/dialog_freeroute_exchange_base.fbp +++ b/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 UTF-8 @@ -12,66 +12,66 @@ none 1 dialog_freeroute_exchange_base - + . - + 1 0 0 - - - + + + 1 - - - + + + 0 wxID_ANY - - + + DIALOG_FREEROUTE_BASE - + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -80,7 +80,7 @@ wxEXPAND 1 - + bUpperSizer wxHORIZONTAL none @@ -89,7 +89,7 @@ wxALIGN_TOP|wxALL|wxEXPAND 1 - + bLeftSizer wxVERTICAL none @@ -98,50 +98,50 @@ wxALL 0 - - + + 1 - + ,90,92,-1,70,0 0 wxID_ANY Export/Import to/from FreeRoute: - - + + m_staticText2 protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -149,13 +149,13 @@ wxALL|wxEXPAND 1 - + bLeftSubSizerSizer wxHORIZONTAL none 5 - + 0 20 @@ -168,7 +168,7 @@ wxEXPAND 1 - + bLeftButtonsSizer wxVERTICAL none @@ -177,51 +177,51 @@ wxALL|wxEXPAND 0 - - + + 0 1 - - + + 0 ID_BUTTON_EXPORT_DSN Export a Specctra Design (*.dsn) File - - + + m_ExportDSN protected - - - - + + + + Export a Specctra DSN file (to FreeRouter) - - - + + + OnExportButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -229,51 +229,51 @@ wxALL|wxEXPAND 0 - - + + 0 1 - - + + 0 wxID_BUTTON_LAUNCH Launch FreeRouter via Java Web Start - - + + m_buttonLaunchFreeroute protected - - - - + + + + Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found) - - - + + + OnLaunchButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -281,51 +281,51 @@ wxALL|wxEXPAND 0 - - + + 0 1 - - + + 0 wxID_BUTTON_IMPORT Back Import the Specctra Session (*.ses) File - - + + m_buttonImport protected - - - - + + + + Merge a session file created by FreeRouter with the current board. - - - + + + OnImportButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -339,48 +339,48 @@ wxALL|wxEXPAND 0 - - + + 1 - - + + 0 wxID_ANY - - + + m_staticline2 protected - - + + wxLI_VERTICAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -388,7 +388,7 @@ wxALIGN_TOP|wxALL|wxEXPAND 1 - + bRightSizer wxVERTICAL none @@ -397,50 +397,50 @@ wxALL 0 - - + + 1 - + ,90,92,-1,70,0 0 wxID_ANY FreeRoute Info: - - + + m_staticText3 protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -448,13 +448,13 @@ wxEXPAND 1 - + bRightSubSizer wxHORIZONTAL none 5 - + 0 20 @@ -467,7 +467,7 @@ wxEXPAND 1 - + bRightButtonsSizer wxVERTICAL none @@ -476,51 +476,51 @@ wxALL|wxEXPAND 0 - - + + 0 1 - - + + 0 wxID_BUTTON_VISIT Visit the FreeRouting.net Website with your Browser - - + + m_buttonVisit protected - - - - - - - - + + + + + + + + OnVisitButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -528,50 +528,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY FreeRouting.net URL - - + + m_staticText1 protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -579,54 +579,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_TEXT_URL - + 0 - + m_FreerouteURLName protected - - - - + + + + The URL of the FreeRouting.net website - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + OnTextEditFrUrlUpdated - - - - + + + + @@ -634,51 +634,51 @@ wxALL|wxEXPAND 0 - - + + 0 1 - - + + 0 wxID_BUTTON_HELP Help - - + + m_buttonHelp protected - - - - - - - - + + + + + + + + OnHelpButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -694,48 +694,48 @@ wxEXPAND|wxALL 0 - - + + 1 - - + + 0 wxID_ANY - - + + m_staticline1 protected - - + + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -751,17 +751,17 @@ 1 0 0 - + m_sdbSizer1 protected - + OnCancelButtonClick - - - + + + OnOKButtonClick - - + + diff --git a/pcbnew/dialog_freeroute_exchange_base.h b/pcbnew/dialogs/dialog_freeroute_exchange_base.h similarity index 100% rename from pcbnew/dialog_freeroute_exchange_base.h rename to pcbnew/dialogs/dialog_freeroute_exchange_base.h diff --git a/pcbnew/dialog_freeroute_exchange_help.html b/pcbnew/dialogs/dialog_freeroute_exchange_help.html similarity index 100% rename from pcbnew/dialog_freeroute_exchange_help.html rename to pcbnew/dialogs/dialog_freeroute_exchange_help.html diff --git a/pcbnew/gendrill.cpp b/pcbnew/gendrill.cpp index 83e77be592..82c16cc7f9 100644 --- a/pcbnew/gendrill.cpp +++ b/pcbnew/gendrill.cpp @@ -31,7 +31,7 @@ /** * @info for EXCELLON format, see: - * http://www.excellon.com/applicationengineering/manuals/program.htm + * http://www.excellon.com/manuals/program.htm * and the CNC-7 manual. */