diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp index b8190666cc..e8c911013d 100644 --- a/eeschema/dialogs/dialog_edit_one_field.cpp +++ b/eeschema/dialogs/dialog_edit_one_field.cpp @@ -131,6 +131,11 @@ void DIALOG_EDIT_ONE_FIELD::init() m_PowerComponentValues->Show( true ); m_TextValue->Enable( false ); } + else + { + m_PowerComponentValues->Show( false ); + m_TextValue->Enable( true ); + } m_sdbSizerButtonsOK->SetDefault(); GetSizer()->SetSizeHints( this ); diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.cpp b/eeschema/dialogs/dialog_lib_edit_text_base.cpp index cb00637b62..5ba9cd5f4c 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.cpp +++ b/eeschema/dialogs/dialog_lib_edit_text_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 9 2015) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -36,10 +36,10 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow m_TextValue->SetMaxLength( 0 ); m_TextValue->SetMinSize( wxSize( 200,-1 ) ); - bTextValueOptsSizer->Add( m_TextValue, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bTextValueOptsSizer->Add( m_TextValue, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); m_TextValueSelectButton = new wxButton( this, wxID_ANY, _("Select"), wxDefaultPosition, wxDefaultSize, 0 ); - bTextValueOptsSizer->Add( m_TextValueSelectButton, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); + bTextValueOptsSizer->Add( m_TextValueSelectButton, 0, wxALIGN_CENTER_VERTICAL, 5 ); bTextValueBoxSizer->Add( bTextValueOptsSizer, 1, wxEXPAND, 5 ); @@ -56,10 +56,10 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow m_TextSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TextSize->SetMaxLength( 0 ); - bTextSizeSizer->Add( m_TextSize, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bTextSizeSizer->Add( m_TextSize, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); - bUpperBoxSizer->Add( bTextSizeSizer, 0, 0, 5 ); + bUpperBoxSizer->Add( bTextSizeSizer, 0, wxEXPAND, 5 ); bPropertiesSizer->Add( bUpperBoxSizer, 0, wxEXPAND, 5 ); @@ -115,14 +115,8 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow bPropertiesSizer->Add( bBottomtBoxSizer, 1, wxEXPAND, 5 ); - wxBoxSizer* bRightSizer; - bRightSizer = new wxBoxSizer( wxVERTICAL ); - - bPropertiesSizer->Add( bRightSizer, 0, wxEXPAND, 5 ); - - - bMainSizer->Add( bPropertiesSizer, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 6 ); + bMainSizer->Add( bPropertiesSizer, 1, wxEXPAND, 6 ); m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); @@ -131,11 +125,12 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - bMainSizer->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 12 ); + bMainSizer->Add( m_sdbSizerButtons, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_LIB_EDIT_TEXT_BASE::OnCloseDialog ) ); diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.fbp b/eeschema/dialogs/dialog_lib_edit_text_base.fbp index 66a4b63e68..d48e9be0e4 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.fbp +++ b/eeschema/dialogs/dialog_lib_edit_text_base.fbp @@ -95,7 +95,7 @@ none 6 - wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND 1 @@ -204,9 +204,9 @@ - 0 + 5 wxEXPAND - 0 + 1 bTextValueOptsSizer @@ -214,7 +214,7 @@ none 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND 1 1 @@ -305,7 +305,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM + wxALIGN_CENTER_VERTICAL 0 1 @@ -397,7 +397,7 @@ 5 - + wxEXPAND 0 @@ -406,7 +406,7 @@ none 5 - wxBOTTOM|wxLEFT|wxRIGHT|wxTOP + wxTOP|wxRIGHT|wxLEFT 0 1 @@ -489,7 +489,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1121,194 +1121,94 @@ - + 5 wxALL|wxEXPAND 1 - + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Normal" "Italic" "Bold" "Bold Italic" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 wxID_ANY Style + 1 + + 0 + + + 0 - sbSizer2 - wxVERTICAL - none + 1 + m_TextShapeOpt + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Italics - - 0 - - - 0 - - 1 - m_cbItalics - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - bool - wxFILTER_NONE - wxDefaultValidator - m_italics - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Bold - - 0 - - - 0 - - 1 - m_cbBold - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - bool - wxFILTER_NONE - wxDefaultValidator - m_bold - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1493,22 +1393,11 @@ - - 5 - wxEXPAND - 0 - - - bRightSizer - wxVERTICAL - none - - - 12 - wxALL|wxEXPAND + 5 + wxBOTTOM|wxEXPAND|wxTOP 0 0 diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.h b/eeschema/dialogs/dialog_lib_edit_text_base.h index f026076181..cb1964b7e7 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.h +++ b/eeschema/dialogs/dialog_lib_edit_text_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 9 2015) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -66,7 +66,7 @@ class DIALOG_LIB_EDIT_TEXT_BASE : public DIALOG_SHIM public: - DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Library Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 615,343 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Library Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_LIB_EDIT_TEXT_BASE(); }; diff --git a/eeschema/sch_validators.cpp b/eeschema/sch_validators.cpp index 468f45b077..55a3779f2e 100644 --- a/eeschema/sch_validators.cpp +++ b/eeschema/sch_validators.cpp @@ -81,7 +81,7 @@ bool SCH_FIELD_VALIDATOR::Validate( wxWindow *aParent ) case VALUE: fieldName = _( "value" ); break; case FOOTPRINT: fieldName = _( "footprint" ); break; case DATASHEET: fieldName = _( "data sheet" ); break; - default: fieldName = _( "user definded" ); break; + default: fieldName = _( "user defined" ); break; }; wxString errorMsg;