diff --git a/pcbnew/controle.cpp b/pcbnew/controle.cpp index 16303de3f2..ed7e7b0657 100644 --- a/pcbnew/controle.cpp +++ b/pcbnew/controle.cpp @@ -126,7 +126,7 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay( int aHotKeyCode ) #endif /* Remove redundancies: sometime, zones are found twice, - * because zones can be are filled by overlapping segments (this is a fill option) + * because zones can be filled by overlapping segments (this is a fill option) */ unsigned long timestampzone = 0; diff --git a/pcbnew/dialog_freeroute_exchange_base.cpp b/pcbnew/dialog_freeroute_exchange_base.cpp index 5b410bc598..d62ce87b4d 100644 --- a/pcbnew/dialog_freeroute_exchange_base.cpp +++ b/pcbnew/dialog_freeroute_exchange_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Dec 29 2008) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -54,9 +54,9 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c bLeftSubSizerSizer->Add( bLeftButtonsSizer, 1, wxEXPAND, 5 ); - bLeftSizer->Add( bLeftSubSizerSizer, 1, wxEXPAND, 5 ); + bLeftSizer->Add( bLeftSubSizerSizer, 1, wxALL|wxEXPAND, 5 ); - bUpperSizer->Add( bLeftSizer, 1, wxEXPAND, 5 ); + bUpperSizer->Add( bLeftSizer, 1, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); bUpperSizer->Add( m_staticline2, 0, wxALL|wxEXPAND, 5 ); @@ -98,7 +98,7 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c bRightSizer->Add( bRightSubSizer, 1, wxEXPAND, 5 ); - bUpperSizer->Add( bRightSizer, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bUpperSizer->Add( bRightSizer, 1, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 ); @@ -115,6 +115,7 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events m_ExportDSN->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this ); diff --git a/pcbnew/dialog_freeroute_exchange_base.fbp b/pcbnew/dialog_freeroute_exchange_base.fbp index 1fb816c7a9..f4f705bde6 100644 --- a/pcbnew/dialog_freeroute_exchange_base.fbp +++ b/pcbnew/dialog_freeroute_exchange_base.fbp @@ -1,770 +1,770 @@ - - - - - - C++ - 1 - UTF-8 - connect - dialog_freeroute_exchange_base - 1000 - none - 0 - dialog_freeroute_exchange_base - - . - - 1 - 0 - 0 - - - - - 1 - - - - 0 - wxID_ANY - - - DIALOG_FREEROUTE_BASE - - 631,211 - wxDEFAULT_DIALOG_STYLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bUpperSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - - bLeftSizer - wxVERTICAL - none - - 5 - wxALL - 0 - - - - 1 - - ,90,92,-1,70,0 - 0 - wxID_ANY - Export/Import to/from FreeRoute: - - - m_staticText2 - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bLeftSubSizerSizer - wxHORIZONTAL - none - - 5 - - 0 - - 20 - protected - 20 - - - - 5 - wxEXPAND - 1 - - - bLeftButtonsSizer - wxVERTICAL - none - - 5 - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_staticline2 - protected - - - wxLI_VERTICAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 1 - - - bRightSizer - wxVERTICAL - none - - 5 - wxALL - 0 - - - - 1 - - ,90,92,-1,70,0 - 0 - wxID_ANY - FreeRoute Info: - - - m_staticText3 - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bRightSubSizer - wxHORIZONTAL - none - - 5 - - 0 - - 20 - protected - 20 - - - - 5 - wxEXPAND - 1 - - - bRightButtonsSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - wxID_BUTTON_VISIT - Visit the FreeRouting.net Website with your Browser - - - m_buttonVisit - protected - - - - - - - - - OnVisitButtonClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - FreeRouting.net URL - - - m_staticText1 - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_TEXT_URL - - 0 - - m_FreerouteURLName - protected - - - - - The URL of the FreeRouting.net website - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTextEditFrUrlUpdated - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - wxID_BUTTON_HELP - Help - - - m_buttonHelp - protected - - - - - - - - - OnHelpButtonClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_staticline1 - protected - - - wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - OnCancelButtonClick - - - - OnOKButtonClick - - - - - - - - + + + + + + C++ + 1 + UTF-8 + connect + dialog_freeroute_exchange_base + 1000 + none + 0 + dialog_freeroute_exchange_base + + . + + 1 + 0 + 0 + + + + + 1 + + + + 0 + wxID_ANY + + + DIALOG_FREEROUTE_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bUpperSizer + wxHORIZONTAL + none + + 5 + wxALIGN_TOP|wxALL|wxEXPAND + 1 + + + bLeftSizer + wxVERTICAL + none + + 5 + wxALL + 0 + + + + 1 + + ,90,92,-1,70,0 + 0 + wxID_ANY + Export/Import to/from FreeRoute: + + + m_staticText2 + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 1 + + + bLeftSubSizerSizer + wxHORIZONTAL + none + + 5 + + 0 + + 20 + protected + 20 + + + + 5 + wxEXPAND + 1 + + + bLeftButtonsSizer + wxVERTICAL + none + + 5 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_staticline2 + protected + + + wxLI_VERTICAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_TOP|wxALL|wxEXPAND + 1 + + + bRightSizer + wxVERTICAL + none + + 5 + wxALL + 0 + + + + 1 + + ,90,92,-1,70,0 + 0 + wxID_ANY + FreeRoute Info: + + + m_staticText3 + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bRightSubSizer + wxHORIZONTAL + none + + 5 + + 0 + + 20 + protected + 20 + + + + 5 + wxEXPAND + 1 + + + bRightButtonsSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + + + 0 + 1 + + + 0 + wxID_BUTTON_VISIT + Visit the FreeRouting.net Website with your Browser + + + m_buttonVisit + protected + + + + + + + + + OnVisitButtonClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + FreeRouting.net URL + + + m_staticText1 + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_TEXT_URL + + 0 + + m_FreerouteURLName + protected + + + + + The URL of the FreeRouting.net website + + + + + + + + + + + + + + + + + + + + + + + + + + + OnTextEditFrUrlUpdated + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + + 0 + 1 + + + 0 + wxID_BUTTON_HELP + Help + + + m_buttonHelp + protected + + + + + + + + + OnHelpButtonClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_staticline1 + protected + + + wxLI_HORIZONTAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + OnCancelButtonClick + + + + OnOKButtonClick + + + + + + + + diff --git a/pcbnew/dialog_freeroute_exchange_base.h b/pcbnew/dialog_freeroute_exchange_base.h index 1d68e76854..61dc9b00fa 100644 --- a/pcbnew/dialog_freeroute_exchange_base.h +++ b/pcbnew/dialog_freeroute_exchange_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Dec 29 2008) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -66,7 +66,7 @@ class DIALOG_FREEROUTE_BASE : public wxDialog public: - DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 631,211 ), long style = wxDEFAULT_DIALOG_STYLE ); + DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_FREEROUTE_BASE(); };