From b26d1b614e18019f1134ef63faf41b6b25019f20 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Thu, 20 Feb 2014 19:29:31 -0500 Subject: [PATCH] Eeschema: minor component selection dialog improvements. * Manually change fbp file minor version number so dialog could be edited with latest release version of wxFormBuilder. * Give component view panel more weight for improved component view size. * Add padding around dialog button sizer. --- eeschema/dialogs/dialog_choose_component_base.cpp | 10 +++++----- eeschema/dialogs/dialog_choose_component_base.fbp | 10 +++++----- eeschema/dialogs/dialog_choose_component_base.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eeschema/dialogs/dialog_choose_component_base.cpp b/eeschema/dialogs/dialog_choose_component_base.cpp index d144d06f6b..af6b6546f2 100644 --- a/eeschema/dialogs/dialog_choose_component_base.cpp +++ b/eeschema/dialogs/dialog_choose_component_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 8 2014) +// C++ code generated with wxFormBuilder (version Nov 6 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -21,7 +21,7 @@ DIALOG_CHOOSE_COMPONENT_BASE::DIALOG_CHOOSE_COMPONENT_BASE( wxWindow* parent, wx m_searchLabel = new wxStaticText( this, wxID_ANY, wxT("Search"), wxDefaultPosition, wxDefaultSize, 0 ); m_searchLabel->Wrap( -1 ); - bSearchSizer->Add( m_searchLabel, 0, wxALL, 5 ); + bSearchSizer->Add( m_searchLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_searchBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); bSearchSizer->Add( m_searchBox, 1, wxALL, 5 ); @@ -32,7 +32,7 @@ DIALOG_CHOOSE_COMPONENT_BASE::DIALOG_CHOOSE_COMPONENT_BASE( wxWindow* parent, wx m_libraryComponentTree = new wxTreeCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE|wxTR_HIDE_ROOT ); m_libraryComponentTree->SetMinSize( wxSize( -1,50 ) ); - bSizer1->Add( m_libraryComponentTree, 2, wxALL|wxEXPAND, 5 ); + bSizer1->Add( m_libraryComponentTree, 1, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxHORIZONTAL ); @@ -40,7 +40,7 @@ DIALOG_CHOOSE_COMPONENT_BASE::DIALOG_CHOOSE_COMPONENT_BASE( wxWindow* parent, wx m_componentView = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER ); m_componentView->SetMinSize( wxSize( 150,150 ) ); - bSizer3->Add( m_componentView, 2, wxEXPAND | wxALL, 5 ); + bSizer3->Add( m_componentView, 4, wxEXPAND | wxALL, 5 ); m_componentDetails = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE ); m_componentDetails->SetMinSize( wxSize( -1,100 ) ); @@ -60,7 +60,7 @@ DIALOG_CHOOSE_COMPONENT_BASE::DIALOG_CHOOSE_COMPONENT_BASE( wxWindow* parent, wx m_button->AddButton( m_buttonCancel ); m_button->Realize(); - bSizer5->Add( m_button, 0, wxEXPAND, 5 ); + bSizer5->Add( m_button, 0, wxALL|wxEXPAND, 5 ); bSizer1->Add( bSizer5, 0, wxALIGN_RIGHT, 5 ); diff --git a/eeschema/dialogs/dialog_choose_component_base.fbp b/eeschema/dialogs/dialog_choose_component_base.fbp index 3c6686e101..ee169c8e0c 100644 --- a/eeschema/dialogs/dialog_choose_component_base.fbp +++ b/eeschema/dialogs/dialog_choose_component_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -104,7 +104,7 @@ none 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -281,7 +281,7 @@ 5 wxALL|wxEXPAND - 2 + 1 1 1 @@ -392,7 +392,7 @@ 5 wxEXPAND | wxALL - 2 + 4 1 1 @@ -573,7 +573,7 @@ none 5 - wxEXPAND + wxALL|wxEXPAND 0 0 diff --git a/eeschema/dialogs/dialog_choose_component_base.h b/eeschema/dialogs/dialog_choose_component_base.h index d135de8a3a..ad588da058 100644 --- a/eeschema/dialogs/dialog_choose_component_base.h +++ b/eeschema/dialogs/dialog_choose_component_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 8 2014) +// C++ code generated with wxFormBuilder (version Nov 6 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE!