diff --git a/common/basicframe.cpp b/common/basicframe.cpp index 779a348817..5b7f19d169 100644 --- a/common/basicframe.cpp +++ b/common/basicframe.cpp @@ -113,6 +113,7 @@ void EDA_BASE_FRAME::LoadSettings() config = wxGetApp().m_EDA_Config; + int maximized = 0; if( config ) { text = m_FrameName + wxT( "Pos_x" ); @@ -123,6 +124,8 @@ void EDA_BASE_FRAME::LoadSettings() config->Read( text, &m_FrameSize.x, 600 ); text = m_FrameName + wxT( "Size_y" ); config->Read( text, &m_FrameSize.y, 400 ); + text = m_FrameName + wxT( "Maximized" ); + config->Read( text, &maximized, 0 ); } // Ensure Window title bar is visible @@ -135,6 +138,9 @@ void EDA_BASE_FRAME::LoadSettings() #endif if( m_FramePos.y < Ypos_min ) m_FramePos.y = Ypos_min; + + if( maximized ) + Maximize(); } @@ -166,6 +172,8 @@ void EDA_BASE_FRAME::SaveSettings() config->Write( text, (long) m_FrameSize.x ); text = m_FrameName + wxT( "Size_y" ); config->Write( text, (long) m_FrameSize.y ); + text = m_FrameName + wxT( "Maximized" ); + config->Write( text, IsMaximized() ); } diff --git a/eeschema/dialogs/dialog_lib_edit_pin.cpp b/eeschema/dialogs/dialog_lib_edit_pin.cpp index f95b1bf33d..3364440ee1 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin.cpp +++ b/eeschema/dialogs/dialog_lib_edit_pin.cpp @@ -7,8 +7,11 @@ DIALOG_LIB_EDIT_PIN::DIALOG_LIB_EDIT_PIN( wxWindow* parent ) : DIALOG_LIB_EDIT_PIN_BASE( parent ) { /* Required to make escape key work correctly in wxGTK. */ - m_textName->SetFocus(); - m_sdbSizer1OK->SetDefault(); + SetFocus(); + // Set tab order + m_textPinName-> MoveAfterInTabOrder(this); + m_textPadName-> MoveAfterInTabOrder(m_textPinName); + m_sdbSizerButtonsOK->SetDefault(); } diff --git a/eeschema/dialogs/dialog_lib_edit_pin.h b/eeschema/dialogs/dialog_lib_edit_pin.h index 4162e789b3..1534142f4c 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin.h +++ b/eeschema/dialogs/dialog_lib_edit_pin.h @@ -38,16 +38,16 @@ public: void SetStyle( int style ) { m_choiceStyle->SetSelection( style ); } int GetStyle( void ) { return m_choiceStyle->GetSelection(); } - void SetName( const wxString& name ) { m_textName->SetValue( name ); } - wxString GetName( void ) { return m_textName->GetValue(); } + void SetName( const wxString& name ) { m_textPinName->SetValue( name ); } + wxString GetName( void ) { return m_textPinName->GetValue(); } void SetNameTextSize( const wxString& size ) { - m_textNameTextSize->SetValue( size ); + m_textPinNameTextSize->SetValue( size ); } wxString GetNameTextSize( void ) { - return m_textNameTextSize->GetValue(); + return m_textPinNameTextSize->GetValue(); } void SetNameTextSizeUnits( const wxString& units ) @@ -55,22 +55,22 @@ public: m_staticNameTextSizeUnits->SetLabel( units ); } - void SetNumber( const wxString& number ) + void SetPadName( const wxString& number ) { - m_textNumber->SetValue( number ); + m_textPadName->SetValue( number ); } - wxString GetNumber( void ) { return m_textNumber->GetValue(); } + wxString GetPadName( void ) { return m_textPadName->GetValue(); } - void SetNumberTextSize( const wxString& size ) + void SetPadNameTextSize( const wxString& size ) { - m_textNumberTextSize->SetValue( size ); + m_textPadNameTextSize->SetValue( size ); } - wxString GetNumberTextSize( void ) + wxString GetPadNameTextSize( void ) { - return m_textNumberTextSize->GetValue(); + return m_textPadNameTextSize->GetValue(); } - void SetNumberTextSizeUnits( const wxString& units ) + void SetPadNameTextSizeUnits( const wxString& units ) { m_staticNumberTextSizeUnits->SetLabel( units ); } diff --git a/eeschema/dialogs/dialog_lib_edit_pin_base.cpp b/eeschema/dialogs/dialog_lib_edit_pin_base.cpp index b2b5543d6f..fe4e30c4a0 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_base.cpp +++ b/eeschema/dialogs/dialog_lib_edit_pin_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Nov 17 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -27,53 +27,53 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL ); - m_staticText1 = new wxStaticText( this, wxID_ANY, _("Pin &name:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText1->Wrap( -1 ); - fgSizer1->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + m_staticTextPinName = new wxStaticText( this, wxID_ANY, _("Pin &name:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextPinName->Wrap( -1 ); + fgSizer1->Add( m_staticTextPinName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_textName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_textName, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + m_textPinName = new wxTextCtrl( this, ID_M_TEXTPINNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_textPinName, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); fgSizer1->Add( 0, 0, 1, wxEXPAND, 3 ); - m_staticText2 = new wxStaticText( this, wxID_ANY, _("N&ame text size:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText2->Wrap( -1 ); - fgSizer1->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + m_staticTextNameSize = new wxStaticText( this, wxID_ANY, _("N&ame text size:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextNameSize->Wrap( -1 ); + fgSizer1->Add( m_staticTextNameSize, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_textNameTextSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_textNameTextSize, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + m_textPinNameTextSize = new wxTextCtrl( this, ID_M_TEXTPINNAMETEXTSIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_textPinNameTextSize, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_staticNameTextSizeUnits = new wxStaticText( this, wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticNameTextSizeUnits->Wrap( -1 ); fgSizer1->Add( m_staticNameTextSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_staticText4 = new wxStaticText( this, wxID_ANY, _("Pin n&umber:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText4->Wrap( -1 ); - m_staticText4->SetToolTip( _("Pin number: 1 to 4 ASCII letters and/or digits") ); + m_staticTextPadName = new wxStaticText( this, ID_M_STATICTEXTPADNAME, _("Pin n&umber:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextPadName->Wrap( -1 ); + m_staticTextPadName->SetToolTip( _("Pin number: 1 to 4 ASCII letters and/or digits") ); - fgSizer1->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + fgSizer1->Add( m_staticTextPadName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_textNumber = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_textNumber, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + m_textPadName = new wxTextCtrl( this, ID_M_TEXTPADNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_textPadName, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); fgSizer1->Add( 0, 0, 1, wxEXPAND, 3 ); - m_staticText9 = new wxStaticText( this, wxID_ANY, _("Number te&xt size:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText9->Wrap( -1 ); - fgSizer1->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + m_staticTextPadNameSize = new wxStaticText( this, wxID_ANY, _("Number te&xt size:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextPadNameSize->Wrap( -1 ); + fgSizer1->Add( m_staticTextPadNameSize, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_textNumberTextSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_textNumberTextSize, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + m_textPadNameTextSize = new wxTextCtrl( this, ID_M_TEXTPADNAMETEXTSIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_textPadNameTextSize, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_staticNumberTextSizeUnits = new wxStaticText( this, wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticNumberTextSizeUnits->Wrap( -1 ); fgSizer1->Add( m_staticNumberTextSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_staticText5 = new wxStaticText( this, wxID_ANY, _("&Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText5->Wrap( -1 ); - fgSizer1->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + m_staticTextOrient = new wxStaticText( this, wxID_ANY, _("&Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextOrient->Wrap( -1 ); + fgSizer1->Add( m_staticTextOrient, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_choiceOrientation = new wxBitmapComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer1->Add( m_choiceOrientation, 0, wxALL, 5 ); @@ -81,9 +81,9 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID fgSizer1->Add( 15, 0, 1, wxEXPAND, 3 ); - m_staticText11 = new wxStaticText( this, wxID_ANY, _("&Length:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText11->Wrap( -1 ); - fgSizer1->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + m_staticTextPinLen = new wxStaticText( this, ID_M_STATICTEXTPINLEN, _("&Length:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextPinLen->Wrap( -1 ); + fgSizer1->Add( m_staticTextPinLen, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_textLength = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_textLength, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); @@ -92,11 +92,11 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID m_staticLengthUnits->Wrap( -1 ); fgSizer1->Add( m_staticLengthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_staticText6 = new wxStaticText( this, wxID_ANY, _("&Electrical type:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText6->Wrap( -1 ); - m_staticText6->SetToolTip( _("Used by the ERC.") ); + m_staticTextEType = new wxStaticText( this, wxID_ANY, _("&Electrical type:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextEType->Wrap( -1 ); + m_staticTextEType->SetToolTip( _("Used by the ERC.") ); - fgSizer1->Add( m_staticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + fgSizer1->Add( m_staticTextEType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_choiceElectricalType = new wxBitmapComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer1->Add( m_choiceElectricalType, 0, wxALL, 5 ); @@ -113,9 +113,9 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID fgSizer1->Add( 0, 0, 0, wxEXPAND, 3 ); - m_staticText7 = new wxStaticText( this, wxID_ANY, _("Graphic &Style:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText7->Wrap( -1 ); - fgSizer1->Add( m_staticText7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + m_staticTextGstyle = new wxStaticText( this, wxID_ANY, _("Graphic &Style:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGstyle->Wrap( -1 ); + fgSizer1->Add( m_staticTextGstyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_choiceStyle = new wxBitmapComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer1->Add( m_choiceStyle, 0, wxALL, 5 ); @@ -147,13 +147,13 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID boarderSizer->Add( 0, 5, 0, wxALL|wxEXPAND, 10 ); - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); - boarderSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 0 ); + m_sdbSizerButtons = new wxStdDialogButtonSizer(); + m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); + m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); + m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); + m_sdbSizerButtons->Realize(); + boarderSizer->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 0 ); mainSizer->Add( boarderSizer, 0, wxALL|wxEXPAND, 12 ); diff --git a/eeschema/dialogs/dialog_lib_edit_pin_base.fbp b/eeschema/dialogs/dialog_lib_edit_pin_base.fbp index 3fb3c0b86b..65fc8aa34c 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_base.fbp +++ b/eeschema/dialogs/dialog_lib_edit_pin_base.fbp @@ -22,25 +22,54 @@ 1 0 + 1 + 1 + 1 + 1 + 0 + + + 1 wxBOTH + 0 + 1 1 + 0 + Dock + 0 + Left 1 impl_virtual + 1 + 0 0 wxID_ANY + + 0 + 0 + 1 DIALOG_LIB_EDIT_PIN_BASE + 1 + + + 1 + + Resizable + + 1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER Pin Properties + 0 wxFILTER_NONE @@ -105,23 +134,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Pin &name: + + 0 + 0 - m_staticText1 + 1 + m_staticTextPinName + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -161,23 +218,51 @@ wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 - wxID_ANY + ID_M_TEXTPINNAME + + 0 0 + 0 - m_textName + 1 + m_textPinName + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -231,23 +316,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY N&ame text size: + + 0 + 0 - m_staticText2 + 1 + m_staticTextNameSize + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -287,23 +400,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 - wxID_ANY + ID_M_TEXTPINNAMETEXTSIZE + + 0 0 + 0 - m_textNameTextSize + 1 + m_textPinNameTextSize + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -347,23 +488,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY units + + 0 + 0 -1,-1 + 1 m_staticNameTextSizeUnits + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -403,23 +572,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 - wxID_ANY + ID_M_STATICTEXTPADNAME Pin n&umber: + + 0 + 0 - m_staticText4 + 1 + m_staticTextPadName + 1 + + protected + 1 + + Resizable + + 1 + 0 Pin number: 1 to 4 ASCII letters and/or digits wxFILTER_NONE @@ -459,23 +656,51 @@ wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 - wxID_ANY + ID_M_TEXTPADNAME + + 0 0 + 0 - m_textNumber + 1 + m_textPadName + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -529,23 +754,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Number te&xt size: + + 0 + 0 - m_staticText9 + 1 + m_staticTextPadNameSize + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -585,23 +838,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 - wxID_ANY + ID_M_TEXTPADNAMETEXTSIZE + + 0 0 + 0 - m_textNumberTextSize + 1 + m_textPadNameTextSize + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -645,23 +926,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY units + + 0 + 0 + 1 m_staticNumberTextSizeUnits + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -701,23 +1010,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY &Orientation: + + 0 + 0 - m_staticText5 + 1 + m_staticTextOrient + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -757,23 +1094,51 @@ wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 + 1 m_choiceOrientation + 1 + + protected + 1 + + Resizable + + 1 wxBitmapComboBox; wx/bmpcbox.h + 0 wxFILTER_NONE @@ -826,23 +1191,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 - wxID_ANY + ID_M_STATICTEXTPINLEN &Length: + + 0 + 0 - m_staticText11 + 1 + m_staticTextPinLen + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -882,23 +1275,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 0 + 0 + 1 m_textLength + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -942,23 +1363,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY units + + 0 + 0 + 1 m_staticLengthUnits + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -998,23 +1447,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY &Electrical type: + + 0 + 0 - m_staticText6 + 1 + m_staticTextEType + 1 + + protected + 1 + + Resizable + + 1 + 0 Used by the ERC. wxFILTER_NONE @@ -1054,23 +1531,51 @@ wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 + 1 m_choiceElectricalType + 1 + + protected + 1 + + Resizable + + 1 wxBitmapComboBox; wx/bmpcbox.h + 0 wxFILTER_NONE @@ -1153,23 +1658,51 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Graphic &Style: + + 0 + 0 - m_staticText7 + 1 + m_staticTextGstyle + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1209,23 +1742,51 @@ wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 + 1 m_choiceStyle + 1 + + protected + 1 + + Resizable + + 1 wxBitmapComboBox; wx/bmpcbox.h + 0 wxFILTER_NONE @@ -1309,24 +1870,52 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Add to all &parts in package + + 0 + 0 + 1 m_checkApplyToAllParts + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1366,24 +1955,52 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Add to all alternate &body styles (DeMorgan) + + 0 + 0 + 1 m_checkApplyToAllConversions + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1423,24 +2040,52 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 1 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY &Visible + + 0 + 0 + 1 m_checkShow + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1499,7 +2144,7 @@ 0 0 - m_sdbSizer1 + m_sdbSizerButtons protected diff --git a/eeschema/dialogs/dialog_lib_edit_pin_base.h b/eeschema/dialogs/dialog_lib_edit_pin_base.h index 6e138a7092..4fdbad4acc 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_base.h +++ b/eeschema/dialogs/dialog_lib_edit_pin_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Nov 17 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -40,31 +40,41 @@ class DIALOG_LIB_EDIT_PIN_BASE : public wxDialog protected: - wxStaticText* m_staticText1; - wxTextCtrl* m_textName; - - wxStaticText* m_staticText2; - wxTextCtrl* m_textNameTextSize; + enum + { + ID_M_TEXTPINNAME = 1000, + ID_M_TEXTPINNAMETEXTSIZE, + ID_M_STATICTEXTPADNAME, + ID_M_TEXTPADNAME, + ID_M_TEXTPADNAMETEXTSIZE, + ID_M_STATICTEXTPINLEN, + }; + + wxStaticText* m_staticTextPinName; + wxTextCtrl* m_textPinName; + + wxStaticText* m_staticTextNameSize; + wxTextCtrl* m_textPinNameTextSize; wxStaticText* m_staticNameTextSizeUnits; - wxStaticText* m_staticText4; - wxTextCtrl* m_textNumber; + wxStaticText* m_staticTextPadName; + wxTextCtrl* m_textPadName; - wxStaticText* m_staticText9; - wxTextCtrl* m_textNumberTextSize; + wxStaticText* m_staticTextPadNameSize; + wxTextCtrl* m_textPadNameTextSize; wxStaticText* m_staticNumberTextSizeUnits; - wxStaticText* m_staticText5; + wxStaticText* m_staticTextOrient; wxBitmapComboBox* m_choiceOrientation; - wxStaticText* m_staticText11; + wxStaticText* m_staticTextPinLen; wxTextCtrl* m_textLength; wxStaticText* m_staticLengthUnits; - wxStaticText* m_staticText6; + wxStaticText* m_staticTextEType; wxBitmapComboBox* m_choiceElectricalType; - wxStaticText* m_staticText7; + wxStaticText* m_staticTextGstyle; wxBitmapComboBox* m_choiceStyle; @@ -73,9 +83,9 @@ class DIALOG_LIB_EDIT_PIN_BASE : public wxDialog wxCheckBox* m_checkApplyToAllConversions; wxCheckBox* m_checkShow; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; + wxStdDialogButtonSizer* m_sdbSizerButtons; + wxButton* m_sdbSizerButtonsOK; + wxButton* m_sdbSizerButtonsCancel; // Virtual event handlers, overide them in your derived class virtual void OnCBpartSelection( wxCommandEvent& event ) { event.Skip(); } @@ -83,7 +93,7 @@ class DIALOG_LIB_EDIT_PIN_BASE : public wxDialog public: - DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Pin Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Pin Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_LIB_EDIT_PIN_BASE(); }; diff --git a/eeschema/pinedit.cpp b/eeschema/pinedit.cpp index 4528567c2d..1154bf0297 100644 --- a/eeschema/pinedit.cpp +++ b/eeschema/pinedit.cpp @@ -61,11 +61,11 @@ void LIB_EDIT_FRAME::OnEditPin( wxCommandEvent& event ) pin->m_PinNameSize, m_InternalUnits ) ); dlg.SetNameTextSizeUnits( units ); - dlg.SetNumber( pin->GetNumberString() ); - dlg.SetNumberTextSize( ReturnStringFromValue( g_UserUnit, + dlg.SetPadName( pin->GetNumberString() ); + dlg.SetPadNameTextSize( ReturnStringFromValue( g_UserUnit, pin->m_PinNumSize, m_InternalUnits ) ); - dlg.SetNumberTextSizeUnits( units ); + dlg.SetPadNameTextSizeUnits( units ); dlg.SetLength( ReturnStringFromValue( g_UserUnit, pin->GetLength(), m_InternalUnits ) ); dlg.SetLengthUnits( units ); dlg.SetAddToAllParts( pin->GetUnit() == 0 ); @@ -94,7 +94,7 @@ void LIB_EDIT_FRAME::OnEditPin( wxCommandEvent& event ) /* Save the pin properties to use for the next new pin. */ LastPinNameSize = ReturnValueFromString( g_UserUnit, dlg.GetNameTextSize(), m_InternalUnits ); - LastPinNumSize = ReturnValueFromString( g_UserUnit, dlg.GetNumberTextSize(), m_InternalUnits ); + LastPinNumSize = ReturnValueFromString( g_UserUnit, dlg.GetPadNameTextSize(), m_InternalUnits ); LastPinOrient = LIB_PIN::GetOrientationCode( dlg.GetOrientation() ); LastPinLength = ReturnValueFromString( g_UserUnit, dlg.GetLength(), m_InternalUnits ); LastPinShape = LIB_PIN::GetStyleCode( dlg.GetStyle() ); @@ -106,7 +106,7 @@ void LIB_EDIT_FRAME::OnEditPin( wxCommandEvent& event ) pin->EnableEditMode( true, g_EditPinByPinIsOn ); pin->SetName( dlg.GetName() ); pin->SetNameTextSize( LastPinNameSize ); - pin->SetNumber( dlg.GetNumber() ); + pin->SetNumber( dlg.GetPadName() ); pin->SetNumberTextSize( LastPinNumSize ); pin->SetOrientation( LastPinOrient ); pin->SetLength( LastPinLength ); diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index 08a59064e5..9d51fe36de 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -376,6 +376,9 @@ void SCH_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event ) if( m_LibeditFrame && !m_LibeditFrame->Close() ) // Can close component editor? return; + if( m_ViewlibFrame && !m_ViewlibFrame->Close() ) // Can close component viewer? + return; + SCH_SHEET_LIST SheetList; if( SheetList.IsModified() ) diff --git a/pcbnew/dialogs/dialog_design_rules_base.cpp b/pcbnew/dialogs/dialog_design_rules_base.cpp index 2ccf2c0751..8eac60edcb 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.cpp +++ b/pcbnew/dialogs/dialog_design_rules_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Nov 17 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_design_rules_base.fbp b/pcbnew/dialogs/dialog_design_rules_base.fbp index d611b5bd43..3379fb5233 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.fbp +++ b/pcbnew/dialogs/dialog_design_rules_base.fbp @@ -22,25 +22,54 @@ 1 0 + 1 + 1 + 1 + 1 + 0 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 impl_virtual + 1 + 0 0 wxID_ANY + + 0 + 0 -1,-1 + 1 DIALOG_DESIGN_RULES_BASE + 1 + + + 1 + + Resizable + + 1 777,640 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER Design Rules Editor + 0 wxFILTER_NONE @@ -89,23 +118,51 @@ wxEXPAND|wxRIGHT|wxLEFT 1 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 + 1 m_DRnotebook + 1 + + protected + 1 + + Resizable + + 1 wxNB_TOP + 0 wxFILTER_NONE @@ -144,21 +201,49 @@ Net Classes Editor 1 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 + 1 m_panelNetClassesEditor + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -212,14 +297,23 @@ wxEXPAND 1 + 1 + 1 + 1 + 1 + 0 1 + + 1 wxALIGN_LEFT wxALIGN_TOP + 0 + 1 wxALIGN_CENTRE 40 "Clearance" "Track Width" "Via Dia" "Via Drill" "uVia Dia" "uVia Drill" @@ -228,6 +322,10 @@ 100,120,84,85,81,90 1 + 0 + Dock + 0 + Left 0 1 0 @@ -235,29 +333,44 @@ 1 1 + 1 1 + 0 0 wxID_ANY + 0 0 + 0 + 0 -1,-1 + 1 m_grid + 1 + + protected + 1 + + Resizable + wxALIGN_LEFT 120 "Default" wxALIGN_CENTRE 1 + 1 + 0 Net Class parameters wxFILTER_NONE @@ -337,24 +450,52 @@ wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ADD_NETCLASS Add + + 0 + 0 + 1 m_addButton + 1 + + protected + 1 + + Resizable + + 1 + 0 Add another Net Class wxFILTER_NONE @@ -394,24 +535,52 @@ wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_REMOVE_NETCLASS Remove + + 0 + 0 + 1 m_removeButton + 1 + + protected + 1 + + Resizable + + 1 + 0 Remove the currently select Net Class The default Net Class cannot be removed wxFILTER_NONE @@ -451,24 +620,52 @@ wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Move Up + + 0 + 0 + 1 m_moveUpButton + 1 + + protected + 1 + + Resizable + + 1 + 0 Move the currently selected Net Class up one row wxFILTER_NONE @@ -533,23 +730,51 @@ wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_LEFT_CHOICE_CLICK + + 0 + 0 + 1 m_leftClassChoice + 1 + + protected + 1 + + Resizable + 0 + 1 + 0 wxFILTER_NONE @@ -589,22 +814,50 @@ wxEXPAND|wxTOP 1 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 220,200 + 1 m_leftListCtrl + 1 + + protected + 1 + + Resizable + + 1 wxLC_HRULES|wxLC_REPORT|wxLC_VIRTUAL|wxLC_VRULES NETS_LIST_CTRL; dialog_design_rules_aux_helper_class.h + 0 wxFILTER_NONE @@ -674,24 +927,52 @@ wxALL|wxALIGN_CENTER_HORIZONTAL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_LEFT_TO_RIGHT_COPY <<< + + 0 + 0 + 1 m_buttonRightToLeft + 1 + + protected + 1 + + Resizable + + 1 + 0 Move the selected nets in the right list to the left list wxFILTER_NONE @@ -731,24 +1012,52 @@ wxALL|wxALIGN_CENTER_HORIZONTAL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_RIGHT_TO_LEFT_COPY >>> + + 0 + 0 + 1 m_buttonLeftToRight + 1 + + protected + 1 + + Resizable + + 1 + 0 Move the selected nets in the left list to the right list wxFILTER_NONE @@ -788,24 +1097,52 @@ wxALL|wxALIGN_CENTER_HORIZONTAL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY << Select All + + 0 + 0 + 1 m_buttonLeftSelAll + 1 + + protected + 1 + + Resizable + + 1 + 0 Select all nets in the left list wxFILTER_NONE @@ -845,24 +1182,52 @@ wxALIGN_BOTTOM|wxALL|wxALIGN_CENTER_HORIZONTAL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Select All >> + + 0 + 0 + 1 m_buttonRightSelAll + 1 + + protected + 1 + + Resizable + + 1 + 0 Select all nets in the right list wxFILTER_NONE @@ -913,23 +1278,51 @@ wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_RIGHT_CHOICE_CLICK + + 0 + 0 + 1 m_rightClassChoice + 1 + + protected + 1 + + Resizable + 0 + 1 + 0 wxFILTER_NONE @@ -969,22 +1362,50 @@ wxEXPAND|wxTOP 1 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 220,-1 + 1 m_rightListCtrl + 1 + + protected + 1 + + Resizable + + 1 wxLC_HRULES|wxLC_REPORT|wxLC_VIRTUAL|wxLC_VRULES NETS_LIST_CTRL; dialog_design_rules_aux_helper_class.h + 0 wxFILTER_NONE @@ -1050,21 +1471,49 @@ Global Design Rules 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 + 1 m_panelGolbalDesignRules + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1127,26 +1576,54 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 "Through via" "Blind or buried via" + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Default Via Type + 1 + 0 + 0 + 1 m_OptViaType + 1 + + protected + 1 + + Resizable + 0 + 1 wxRA_SPECIFY_COLS + 0 Select the current via type. Trough via is the usual selection wxFILTER_NONE @@ -1202,23 +1679,51 @@ wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Min via diameter + + 0 + 0 + 1 m_ViaMinTitle + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1258,23 +1763,51 @@ wxEXPAND|wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 0 + 0 + 1 m_SetViasMinSizeCtrl + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1318,23 +1851,51 @@ wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Min via drill dia + + 0 + 0 + 1 m_ViaMinDrillTitle + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1374,23 +1935,51 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 0 + 0 + 1 m_SetViasMinDrillCtrl + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1450,26 +2039,54 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 "Do not allow micro vias" "Allow micro vias" + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Micro Vias: + 1 + 0 + 0 + 1 m_AllowMicroViaCtrl + 1 + + protected + 1 + + Resizable + 0 + 1 wxRA_SPECIFY_COLS + 0 Allows or do not allow use of micro vias They are very small vias only from an external copper layer to its near neightbour wxFILTER_NONE @@ -1525,23 +2142,51 @@ wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Min uvia diameter + + 0 + 0 + 1 m_MicroViaMinSizeTitle + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1581,23 +2226,51 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 6 + 0 + 1 m_SetMicroViasMinSizeCtrl + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1641,23 +2314,51 @@ wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Min uvia drill dia + + 0 + 0 + 1 m_MicroViaMinDrillTitle + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1697,23 +2398,51 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 6 + 0 + 1 m_SetMicroViasMinDrillCtrl + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1789,23 +2518,51 @@ wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Min track width + + 0 + 0 + 1 m_TrackMinWidthTitle + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1845,23 +2602,51 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 0 + 0 + 1 m_SetTrackMinWidthCtrl + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -1911,22 +2696,50 @@ wxEXPAND | wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 + 1 m_staticline1 + 1 + + protected + 1 + + Resizable + + 1 wxLI_HORIZONTAL + 0 wxFILTER_NONE @@ -1965,23 +2778,51 @@ wxALL|wxALIGN_CENTER_HORIZONTAL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Specific via diameters and track widths, which can be used to replace default Netclass values on demand, for arbitrary via or track segments. + + 0 + 0 + 1 m_staticTextInfo + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -2042,23 +2883,51 @@ wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Drill value: a blank or 0 => default Netclass value + + 0 + 0 + 1 m_staticText7 + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -2098,14 +2967,23 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + 0 0 + + 1 wxALIGN_LEFT wxALIGN_TOP + 0 + 1 wxALIGN_CENTRE 30 "Diameter" "Drill" @@ -2114,6 +2992,10 @@ 1 + 0 + Dock + 0 + Left 0 1 0 @@ -2121,29 +3003,44 @@ 1 1 + 1 1 + 0 0 wxID_ANY + 0 0 + 0 + 0 + 1 m_gridViaSizeList + 1 + + protected + 1 + + Resizable + wxALIGN_CENTRE 80 "Via 1" "Via 2" "Via 3" "Via 4" "Via 5" "Via 6" "Via 7" wxALIGN_CENTRE 7 + 1 + 0 wxFILTER_NONE @@ -2228,23 +3125,51 @@ wxALL 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 + 1 m_staticText8 + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -2284,14 +3209,23 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + 0 0 + + 1 wxALIGN_LEFT wxALIGN_TOP + 0 + 1 wxALIGN_CENTRE 30 "Width" @@ -2300,6 +3234,10 @@ 1 + 0 + Dock + 0 + Left 0 1 0 @@ -2307,29 +3245,44 @@ 1 1 + 1 1 + 0 0 wxID_ANY + 0 0 + 0 + 0 + 1 m_gridTrackWidthList + 1 + + protected + 1 + + Resizable + wxALIGN_CENTRE 80 "Track 1" "Track 2" "Track 3" "Track 4" "Track 5" "Track 6" "Track 7" wxALIGN_CENTRE 7 + 1 + 0 wxFILTER_NONE @@ -2421,22 +3374,50 @@ wxEXPAND 1 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + 0 -1,90 + 1 m_MessagesList + 1 + + protected + 1 + + Resizable + + 1 wxHW_SCROLLBAR_AUTO + 0 wxFILTER_NONE @@ -2487,24 +3468,52 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_OK OK + + 0 + 0 + 1 m_buttonOk + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE @@ -2544,24 +3553,52 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_CANCEL Cancel + + 0 + 0 + 1 m_buttonCancel + 1 + + protected + 1 + + Resizable + + 1 + 0 wxFILTER_NONE diff --git a/pcbnew/dialogs/dialog_design_rules_base.h b/pcbnew/dialogs/dialog_design_rules_base.h index 48a36fa5d6..d328755970 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.h +++ b/pcbnew/dialogs/dialog_design_rules_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Nov 17 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -110,7 +110,7 @@ class DIALOG_DESIGN_RULES_BASE : public wxDialog public: - DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Design Rules Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 777,640 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Design Rules Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 777,640 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_DESIGN_RULES_BASE(); };