Loading CHANGELOG.txt +12 −3 Original line number Original line Diff line number Diff line Loading @@ -5,18 +5,27 @@ Started 2007-June-11 Please add newer entries at the top, list the date and your name with Please add newer entries at the top, list the date and your name with email address. email address. 2009-Feb-24 UPDATE Dick Hollenbeck <dick@softplc.com> ================================================================================ ++pcbnew * dialog boxes calling OnInitDialog are flashing because these functions change the size of controls that are already on screen. This leads to an annoying resize operation. So I renamed OnInitDialog(event) to void init() and call it from the constructors. Did this for dialog_general_options.cpp and dialog_display_options. * dialog_general_options was not setting g_MagneticPadOption and g_MagneticTrackOption 2009-Feb-24 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> 2009-Feb-24 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> ================================================================================ ================================================================================ ++pcbnew: ++pcbnew: bug fix: bug fix: 2628615 Error message after right click into zone 2628615 Error message after right click into zone 2625434 Crash after trying to edit a line/drawing 2625434 Crash after trying to edit a line/drawing ++cvpcb ++cvpcb fix: 2625090 CVpcb - language selection fix: 2625090 CVpcb - language selection 2009-Feb-17 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> 2009-Feb-17 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> ================================================================================ ================================================================================ ++gr_basic.cpp ++gr_basic.cpp Loading pcbnew/dialog_display_options_base.cpp +3 −8 Original line number Original line Diff line number Diff line /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// // C++ code generated with wxFormBuilder (version Apr 16 2008) // C++ code generated with wxFormBuilder (version Feb 8 2009) // http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/ // // // PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE! Loading Loading @@ -69,17 +69,14 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, wxWindow bRModuleSizer->Add( m_OptDisplayPads, 0, wxALL|wxEXPAND, 5 ); bRModuleSizer->Add( m_OptDisplayPads, 0, wxALL|wxEXPAND, 5 ); m_OptDisplayPadClearence = new wxCheckBox( this, wxID_ANY, _("Show Pad Clearance"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadClearence = new wxCheckBox( this, wxID_ANY, _("Show Pad Clearance"), wxDefaultPosition, wxDefaultSize, 0 ); bRModuleSizer->Add( m_OptDisplayPadClearence, 0, wxALL, 5 ); bRModuleSizer->Add( m_OptDisplayPadClearence, 0, wxALL, 5 ); m_OptDisplayPadNumber = new wxCheckBox( this, wxID_ANY, _("Show Pad Number"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNumber = new wxCheckBox( this, wxID_ANY, _("Show Pad Number"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNumber->SetValue(true); m_OptDisplayPadNumber->SetValue(true); bRModuleSizer->Add( m_OptDisplayPadNumber, 0, wxALL, 5 ); bRModuleSizer->Add( m_OptDisplayPadNumber, 0, wxALL, 5 ); m_OptDisplayPadNoConn = new wxCheckBox( this, wxID_ANY, _("Show Pad NoConnect"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNoConn = new wxCheckBox( this, wxID_ANY, _("Show Pad NoConnect"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNoConn->SetValue(true); m_OptDisplayPadNoConn->SetValue(true); bRModuleSizer->Add( m_OptDisplayPadNoConn, 0, wxALL, 5 ); bRModuleSizer->Add( m_OptDisplayPadNoConn, 0, wxALL, 5 ); sMiddleSizer->Add( bRModuleSizer, 0, 0, 5 ); sMiddleSizer->Add( bRModuleSizer, 0, 0, 5 ); Loading Loading @@ -125,7 +122,6 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, wxWindow this->Layout(); this->Layout(); // Connect Events // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DialogDisplayOptions_base::OnInitDialog ) ); m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnOkClick ), NULL, this ); m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnOkClick ), NULL, this ); m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnCancelClick ), NULL, this ); m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnCancelClick ), NULL, this ); } } Loading @@ -133,7 +129,6 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, wxWindow DialogDisplayOptions_base::~DialogDisplayOptions_base() DialogDisplayOptions_base::~DialogDisplayOptions_base() { { // Disconnect Events // Disconnect Events this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DialogDisplayOptions_base::OnInitDialog ) ); m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnOkClick ), NULL, this ); m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnOkClick ), NULL, this ); m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnCancelClick ), NULL, this ); m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnCancelClick ), NULL, this ); } } pcbnew/dialog_display_options_base.fbp +58 −1 Original line number Original line Diff line number Diff line Loading @@ -7,6 +7,7 @@ <property name="disconnect_events">1</property> <property name="disconnect_events">1</property> <property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property> <property name="event_generation">connect</property> <property name="event_generation">connect</property> <property name="event_handler">impl_virtual</property> <property name="file">dialog_display_options_base</property> <property name="file">dialog_display_options_base</property> <property name="first_id">1000</property> <property name="first_id">1000</property> <property name="help_provider">none</property> <property name="help_provider">none</property> Loading Loading @@ -37,6 +38,10 @@ <property name="subclass"></property> <property name="subclass"></property> <property name="title"></property> <property name="title"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading @@ -49,7 +54,7 @@ <event name="OnHibernate"></event> <event name="OnHibernate"></event> <event name="OnIconize"></event> <event name="OnIconize"></event> <event name="OnIdle"></event> <event name="OnIdle"></event> <event name="OnInitDialog">OnInitDialog</event> <event name="OnInitDialog"></event> <event name="OnKeyDown"></event> <event name="OnKeyDown"></event> <event name="OnKeyUp"></event> <event name="OnKeyUp"></event> <event name="OnKillFocus"></event> <event name="OnKillFocus"></event> Loading Loading @@ -112,6 +117,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -166,6 +175,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -220,6 +233,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -297,6 +314,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -351,6 +372,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -419,6 +444,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -471,6 +500,10 @@ <property name="style"></property> <property name="style"></property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -523,6 +556,10 @@ <property name="style"></property> <property name="style"></property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -575,6 +612,10 @@ <property name="style"></property> <property name="style"></property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -654,6 +695,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -708,6 +753,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -772,6 +821,10 @@ <property name="style"></property> <property name="style"></property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -824,6 +877,10 @@ <property name="style"></property> <property name="style"></property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading pcbnew/dialog_display_options_base.h +4 −4 Original line number Original line Diff line number Diff line /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// // C++ code generated with wxFormBuilder (version Apr 16 2008) // C++ code generated with wxFormBuilder (version Feb 8 2009) // http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/ // // // PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE! Loading Loading @@ -58,12 +58,12 @@ class DialogDisplayOptions_base : public wxDialog wxButton* m_buttonCANCEL; wxButton* m_buttonCANCEL; // Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class virtual void OnInitDialog( wxInitDialogEvent& event ){ event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } public: public: DialogDisplayOptions_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 559,303 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DialogDisplayOptions_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 559,303 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DialogDisplayOptions_base(); ~DialogDisplayOptions_base(); Loading pcbnew/dialog_general_options.cpp +72 −65 Original line number Original line Diff line number Diff line Loading @@ -19,6 +19,7 @@ #include "dialog_general_options.h" #include "dialog_general_options.h" #include "dialog_track_options.h" #include "dialog_track_options.h" /***********************************************************************************/ /***********************************************************************************/ Dialog_GeneralOptions::Dialog_GeneralOptions( WinEDA_PcbFrame* parent, wxDC* DC ) : Dialog_GeneralOptions::Dialog_GeneralOptions( WinEDA_PcbFrame* parent, wxDC* DC ) : DialogGeneralOptionsBoardEditor_base( parent ) DialogGeneralOptionsBoardEditor_base( parent ) Loading @@ -26,16 +27,17 @@ Dialog_GeneralOptions::Dialog_GeneralOptions( WinEDA_PcbFrame* parent, wxDC* DC { { m_Parent = parent; m_Parent = parent; m_DC = DC; m_DC = DC; init(); } } /********************************************************************/ /********************************************************************/ void Dialog_GeneralOptions::OnInitDialog( wxInitDialogEvent& event ) void Dialog_GeneralOptions::init() /********************************************************************/ /********************************************************************/ { { SetFont( *g_DialogFont ); SetFont( *g_DialogFont ); SetFocus(); SetFocus(); /* Set display options */ /* Set display options */ m_PolarDisplay->SetSelection( DisplayOpt.DisplayPolarCood ? 1 : 0 ); m_PolarDisplay->SetSelection( DisplayOpt.DisplayPolarCood ? 1 : 0 ); m_UnitsSelection->SetSelection( g_UnitMetric ? 1 : 0 ); m_UnitsSelection->SetSelection( g_UnitMetric ? 1 : 0 ); Loading Loading @@ -120,6 +122,9 @@ void Dialog_GeneralOptions::OnOkClick( wxCommandEvent& event ) m_Parent->DrawPanel->m_AutoPAN_Enable = m_AutoPANOpt->GetValue(); m_Parent->DrawPanel->m_AutoPAN_Enable = m_AutoPANOpt->GetValue(); g_TwoSegmentTrackBuild = m_Track_DoubleSegm_Ctrl->GetValue(); g_TwoSegmentTrackBuild = m_Track_DoubleSegm_Ctrl->GetValue(); g_MagneticPadOption = m_MagneticPadOptCtrl->GetSelection(); g_MagneticTrackOption = m_MagneticTrackOptCtrl->GetSelection(); EndModal( 1 ); EndModal( 1 ); } } Loading @@ -130,10 +135,12 @@ Dialog_Display_Options::Dialog_Display_Options( WinEDA_BasePcbFrame* parent ) : /*******************************************************************************/ /*******************************************************************************/ { { m_Parent = parent; m_Parent = parent; init(); } } /****************************************************************/ /****************************************************************/ void Dialog_Display_Options::OnInitDialog( wxInitDialogEvent& event ) void Dialog_Display_Options::init() /****************************************************************/ /****************************************************************/ { { SetFocus(); SetFocus(); Loading Loading
CHANGELOG.txt +12 −3 Original line number Original line Diff line number Diff line Loading @@ -5,18 +5,27 @@ Started 2007-June-11 Please add newer entries at the top, list the date and your name with Please add newer entries at the top, list the date and your name with email address. email address. 2009-Feb-24 UPDATE Dick Hollenbeck <dick@softplc.com> ================================================================================ ++pcbnew * dialog boxes calling OnInitDialog are flashing because these functions change the size of controls that are already on screen. This leads to an annoying resize operation. So I renamed OnInitDialog(event) to void init() and call it from the constructors. Did this for dialog_general_options.cpp and dialog_display_options. * dialog_general_options was not setting g_MagneticPadOption and g_MagneticTrackOption 2009-Feb-24 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> 2009-Feb-24 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> ================================================================================ ================================================================================ ++pcbnew: ++pcbnew: bug fix: bug fix: 2628615 Error message after right click into zone 2628615 Error message after right click into zone 2625434 Crash after trying to edit a line/drawing 2625434 Crash after trying to edit a line/drawing ++cvpcb ++cvpcb fix: 2625090 CVpcb - language selection fix: 2625090 CVpcb - language selection 2009-Feb-17 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> 2009-Feb-17 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> ================================================================================ ================================================================================ ++gr_basic.cpp ++gr_basic.cpp Loading
pcbnew/dialog_display_options_base.cpp +3 −8 Original line number Original line Diff line number Diff line /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// // C++ code generated with wxFormBuilder (version Apr 16 2008) // C++ code generated with wxFormBuilder (version Feb 8 2009) // http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/ // // // PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE! Loading Loading @@ -69,17 +69,14 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, wxWindow bRModuleSizer->Add( m_OptDisplayPads, 0, wxALL|wxEXPAND, 5 ); bRModuleSizer->Add( m_OptDisplayPads, 0, wxALL|wxEXPAND, 5 ); m_OptDisplayPadClearence = new wxCheckBox( this, wxID_ANY, _("Show Pad Clearance"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadClearence = new wxCheckBox( this, wxID_ANY, _("Show Pad Clearance"), wxDefaultPosition, wxDefaultSize, 0 ); bRModuleSizer->Add( m_OptDisplayPadClearence, 0, wxALL, 5 ); bRModuleSizer->Add( m_OptDisplayPadClearence, 0, wxALL, 5 ); m_OptDisplayPadNumber = new wxCheckBox( this, wxID_ANY, _("Show Pad Number"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNumber = new wxCheckBox( this, wxID_ANY, _("Show Pad Number"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNumber->SetValue(true); m_OptDisplayPadNumber->SetValue(true); bRModuleSizer->Add( m_OptDisplayPadNumber, 0, wxALL, 5 ); bRModuleSizer->Add( m_OptDisplayPadNumber, 0, wxALL, 5 ); m_OptDisplayPadNoConn = new wxCheckBox( this, wxID_ANY, _("Show Pad NoConnect"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNoConn = new wxCheckBox( this, wxID_ANY, _("Show Pad NoConnect"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNoConn->SetValue(true); m_OptDisplayPadNoConn->SetValue(true); bRModuleSizer->Add( m_OptDisplayPadNoConn, 0, wxALL, 5 ); bRModuleSizer->Add( m_OptDisplayPadNoConn, 0, wxALL, 5 ); sMiddleSizer->Add( bRModuleSizer, 0, 0, 5 ); sMiddleSizer->Add( bRModuleSizer, 0, 0, 5 ); Loading Loading @@ -125,7 +122,6 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, wxWindow this->Layout(); this->Layout(); // Connect Events // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DialogDisplayOptions_base::OnInitDialog ) ); m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnOkClick ), NULL, this ); m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnOkClick ), NULL, this ); m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnCancelClick ), NULL, this ); m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnCancelClick ), NULL, this ); } } Loading @@ -133,7 +129,6 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, wxWindow DialogDisplayOptions_base::~DialogDisplayOptions_base() DialogDisplayOptions_base::~DialogDisplayOptions_base() { { // Disconnect Events // Disconnect Events this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DialogDisplayOptions_base::OnInitDialog ) ); m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnOkClick ), NULL, this ); m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnOkClick ), NULL, this ); m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnCancelClick ), NULL, this ); m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogDisplayOptions_base::OnCancelClick ), NULL, this ); } }
pcbnew/dialog_display_options_base.fbp +58 −1 Original line number Original line Diff line number Diff line Loading @@ -7,6 +7,7 @@ <property name="disconnect_events">1</property> <property name="disconnect_events">1</property> <property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property> <property name="event_generation">connect</property> <property name="event_generation">connect</property> <property name="event_handler">impl_virtual</property> <property name="file">dialog_display_options_base</property> <property name="file">dialog_display_options_base</property> <property name="first_id">1000</property> <property name="first_id">1000</property> <property name="help_provider">none</property> <property name="help_provider">none</property> Loading Loading @@ -37,6 +38,10 @@ <property name="subclass"></property> <property name="subclass"></property> <property name="title"></property> <property name="title"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading @@ -49,7 +54,7 @@ <event name="OnHibernate"></event> <event name="OnHibernate"></event> <event name="OnIconize"></event> <event name="OnIconize"></event> <event name="OnIdle"></event> <event name="OnIdle"></event> <event name="OnInitDialog">OnInitDialog</event> <event name="OnInitDialog"></event> <event name="OnKeyDown"></event> <event name="OnKeyDown"></event> <event name="OnKeyUp"></event> <event name="OnKeyUp"></event> <event name="OnKillFocus"></event> <event name="OnKillFocus"></event> Loading Loading @@ -112,6 +117,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -166,6 +175,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -220,6 +233,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -297,6 +314,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -351,6 +372,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -419,6 +444,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -471,6 +500,10 @@ <property name="style"></property> <property name="style"></property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -523,6 +556,10 @@ <property name="style"></property> <property name="style"></property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -575,6 +612,10 @@ <property name="style"></property> <property name="style"></property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -654,6 +695,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -708,6 +753,10 @@ <property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -772,6 +821,10 @@ <property name="style"></property> <property name="style"></property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading Loading @@ -824,6 +877,10 @@ <property name="style"></property> <property name="style"></property> <property name="subclass"></property> <property name="subclass"></property> <property name="tooltip"></property> <property name="tooltip"></property> <property name="validator_data_type"></property> <property name="validator_style">wxFILTER_NONE</property> <property name="validator_type">wxDefaultValidator</property> <property name="validator_variable"></property> <property name="window_extra_style"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_name"></property> <property name="window_style"></property> <property name="window_style"></property> Loading
pcbnew/dialog_display_options_base.h +4 −4 Original line number Original line Diff line number Diff line /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// // C++ code generated with wxFormBuilder (version Apr 16 2008) // C++ code generated with wxFormBuilder (version Feb 8 2009) // http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/ // // // PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE! Loading Loading @@ -58,12 +58,12 @@ class DialogDisplayOptions_base : public wxDialog wxButton* m_buttonCANCEL; wxButton* m_buttonCANCEL; // Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class virtual void OnInitDialog( wxInitDialogEvent& event ){ event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } public: public: DialogDisplayOptions_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 559,303 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DialogDisplayOptions_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 559,303 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DialogDisplayOptions_base(); ~DialogDisplayOptions_base(); Loading
pcbnew/dialog_general_options.cpp +72 −65 Original line number Original line Diff line number Diff line Loading @@ -19,6 +19,7 @@ #include "dialog_general_options.h" #include "dialog_general_options.h" #include "dialog_track_options.h" #include "dialog_track_options.h" /***********************************************************************************/ /***********************************************************************************/ Dialog_GeneralOptions::Dialog_GeneralOptions( WinEDA_PcbFrame* parent, wxDC* DC ) : Dialog_GeneralOptions::Dialog_GeneralOptions( WinEDA_PcbFrame* parent, wxDC* DC ) : DialogGeneralOptionsBoardEditor_base( parent ) DialogGeneralOptionsBoardEditor_base( parent ) Loading @@ -26,16 +27,17 @@ Dialog_GeneralOptions::Dialog_GeneralOptions( WinEDA_PcbFrame* parent, wxDC* DC { { m_Parent = parent; m_Parent = parent; m_DC = DC; m_DC = DC; init(); } } /********************************************************************/ /********************************************************************/ void Dialog_GeneralOptions::OnInitDialog( wxInitDialogEvent& event ) void Dialog_GeneralOptions::init() /********************************************************************/ /********************************************************************/ { { SetFont( *g_DialogFont ); SetFont( *g_DialogFont ); SetFocus(); SetFocus(); /* Set display options */ /* Set display options */ m_PolarDisplay->SetSelection( DisplayOpt.DisplayPolarCood ? 1 : 0 ); m_PolarDisplay->SetSelection( DisplayOpt.DisplayPolarCood ? 1 : 0 ); m_UnitsSelection->SetSelection( g_UnitMetric ? 1 : 0 ); m_UnitsSelection->SetSelection( g_UnitMetric ? 1 : 0 ); Loading Loading @@ -120,6 +122,9 @@ void Dialog_GeneralOptions::OnOkClick( wxCommandEvent& event ) m_Parent->DrawPanel->m_AutoPAN_Enable = m_AutoPANOpt->GetValue(); m_Parent->DrawPanel->m_AutoPAN_Enable = m_AutoPANOpt->GetValue(); g_TwoSegmentTrackBuild = m_Track_DoubleSegm_Ctrl->GetValue(); g_TwoSegmentTrackBuild = m_Track_DoubleSegm_Ctrl->GetValue(); g_MagneticPadOption = m_MagneticPadOptCtrl->GetSelection(); g_MagneticTrackOption = m_MagneticTrackOptCtrl->GetSelection(); EndModal( 1 ); EndModal( 1 ); } } Loading @@ -130,10 +135,12 @@ Dialog_Display_Options::Dialog_Display_Options( WinEDA_BasePcbFrame* parent ) : /*******************************************************************************/ /*******************************************************************************/ { { m_Parent = parent; m_Parent = parent; init(); } } /****************************************************************/ /****************************************************************/ void Dialog_Display_Options::OnInitDialog( wxInitDialogEvent& event ) void Dialog_Display_Options::init() /****************************************************************/ /****************************************************************/ { { SetFocus(); SetFocus(); Loading