From 0182e454c51c188b85256bc2b37e476880aa5028 Mon Sep 17 00:00:00 2001 From: Chris Pavlina Date: Sun, 19 Feb 2017 19:31:40 -0500 Subject: [PATCH] Adjust component chooser GUI slightly --- eeschema/dialogs/dialog_choose_component.cpp | 1 - .../dialogs/dialog_choose_component_base.cpp | 30 +- .../dialogs/dialog_choose_component_base.fbp | 366 +++++------------- .../dialogs/dialog_choose_component_base.h | 11 +- 4 files changed, 109 insertions(+), 299 deletions(-) diff --git a/eeschema/dialogs/dialog_choose_component.cpp b/eeschema/dialogs/dialog_choose_component.cpp index 90666d2089..a4bc40cd7f 100644 --- a/eeschema/dialogs/dialog_choose_component.cpp +++ b/eeschema/dialogs/dialog_choose_component.cpp @@ -66,7 +66,6 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const #ifndef KICAD_FOOTPRINT_SELECTOR // Footprint chooser isn't implemented yet or isn't selected, don't show it. - m_stFootprint->Hide(); m_chooseFootprint->Hide(); #endif diff --git a/eeschema/dialogs/dialog_choose_component_base.cpp b/eeschema/dialogs/dialog_choose_component_base.cpp index f6bf5f1362..12ce4b9003 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 5 2017) +// C++ code generated with wxFormBuilder (version Feb 6 2017) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -18,19 +18,6 @@ DIALOG_CHOOSE_COMPONENT_BASE::DIALOG_CHOOSE_COMPONENT_BASE( wxWindow* parent, wx wxBoxSizer* bSizerMain; bSizerMain = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bSearchSizer; - bSearchSizer = new wxBoxSizer( wxHORIZONTAL ); - - m_searchLabel = new wxStaticText( this, wxID_ANY, _("Filter:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_searchLabel->Wrap( -1 ); - bSearchSizer->Add( m_searchLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_searchBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); - bSearchSizer->Add( m_searchBox, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - bSizerMain->Add( bSearchSizer, 0, wxEXPAND, 5 ); - m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_LIVE_UPDATE ); m_splitter1->SetSashGravity( 0.9 ); m_splitter1->Connect( wxEVT_IDLE, wxIdleEventHandler( DIALOG_CHOOSE_COMPONENT_BASE::m_splitter1OnIdle ), NULL, this ); @@ -40,6 +27,13 @@ DIALOG_CHOOSE_COMPONENT_BASE::DIALOG_CHOOSE_COMPONENT_BASE( wxWindow* parent, wx wxBoxSizer* bSizer10; bSizer10 = new wxBoxSizer( wxVERTICAL ); + m_searchBox = new wxSearchCtrl( m_panel3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + #ifndef __WXMAC__ + m_searchBox->ShowSearchButton( true ); + #endif + m_searchBox->ShowCancelButton( false ); + bSizer10->Add( m_searchBox, 0, wxALL|wxEXPAND, 5 ); + m_libraryComponentTree = new TWO_COLUMN_TREE_LIST( m_panel3, wxID_ANY, wxDefaultPosition, wxSize( 320,240 ), wxTL_DEFAULT_STYLE ); bSizer10->Add( m_libraryComponentTree, 1, wxEXPAND | wxALL, 5 ); @@ -67,10 +61,6 @@ DIALOG_CHOOSE_COMPONENT_BASE::DIALOG_CHOOSE_COMPONENT_BASE( wxWindow* parent, wx wxBoxSizer* bSizer14; bSizer14 = new wxBoxSizer( wxHORIZONTAL ); - m_stFootprint = new wxStaticText( m_panel4, wxID_ANY, _("Footprint:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stFootprint->Wrap( -1 ); - bSizer14->Add( m_stFootprint, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - wxArrayString m_chooseFootprintChoices; m_chooseFootprint = new wxChoice( m_panel4, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_chooseFootprintChoices, 0 ); m_chooseFootprint->SetSelection( 0 ); @@ -93,7 +83,7 @@ DIALOG_CHOOSE_COMPONENT_BASE::DIALOG_CHOOSE_COMPONENT_BASE( wxWindow* parent, wx m_panel4->Layout(); bSizer11->Fit( m_panel4 ); m_splitter1->SplitVertically( m_panel3, m_panel4, -300 ); - bSizerMain->Add( m_splitter1, 1, wxEXPAND, 5 ); + bSizerMain->Add( m_splitter1, 1, wxALL|wxEXPAND, 5 ); m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); @@ -102,7 +92,7 @@ DIALOG_CHOOSE_COMPONENT_BASE::DIALOG_CHOOSE_COMPONENT_BASE( wxWindow* parent, wx m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); - bSizerMain->Add( m_stdButtons, 0, wxALL|wxEXPAND, 5 ); + bSizerMain->Add( m_stdButtons, 0, wxBOTTOM|wxEXPAND, 10 ); this->SetSizer( bSizerMain ); diff --git a/eeschema/dialogs/dialog_choose_component_base.fbp b/eeschema/dialogs/dialog_choose_component_base.fbp index 5d9a9ef110..88a3443ef3 100644 --- a/eeschema/dialogs/dialog_choose_component_base.fbp +++ b/eeschema/dialogs/dialog_choose_component_base.fbp @@ -93,194 +93,9 @@ bSizerMain wxVERTICAL none - - 5 - wxEXPAND - 0 - - - bSearchSizer - wxHORIZONTAL - none - - 5 - 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 - Filter: - - 0 - - - 0 - - 1 - m_searchLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - -1,-1 - - - 0 - - 1 - m_searchBox - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_ENTER - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - OnInterceptSearchBoxKey - - - - - - - - - - - - - - - - - - - OnSearchBoxChange - OnSearchBoxEnter - - - - - - - 5 - wxEXPAND + wxALL|wxEXPAND 1 1 @@ -446,6 +261,98 @@ bSizer10 wxVERTICAL none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + 0 + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_searchBox + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + OnInterceptSearchBoxKey + + + + + + + + + + + + + + + + + + + + OnSearchBoxChange + OnSearchBoxEnter + + + 5 wxEXPAND | wxALL @@ -808,89 +715,6 @@ bSizer14 wxHORIZONTAL none - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Footprint: - - 0 - - - 0 - - 1 - m_stFootprint - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - 5 wxALL|wxEXPAND @@ -1071,8 +895,8 @@ - 5 - wxALL|wxEXPAND + 10 + wxBOTTOM|wxEXPAND 0 0 diff --git a/eeschema/dialogs/dialog_choose_component_base.h b/eeschema/dialogs/dialog_choose_component_base.h index e8efd6ebae..bcf9209d7a 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 5 2017) +// C++ code generated with wxFormBuilder (version Feb 6 2017) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -16,15 +16,14 @@ class TWO_COLUMN_TREE_LIST; #include "dialog_shim.h" #include -#include +#include #include #include #include #include -#include -#include #include #include +#include #include #include #include @@ -42,15 +41,13 @@ class DIALOG_CHOOSE_COMPONENT_BASE : public DIALOG_SHIM private: protected: - wxStaticText* m_searchLabel; - wxTextCtrl* m_searchBox; wxSplitterWindow* m_splitter1; wxPanel* m_panel3; + wxSearchCtrl* m_searchBox; TWO_COLUMN_TREE_LIST* m_libraryComponentTree; wxHtmlWindow* m_componentDetails; wxPanel* m_panel4; wxPanel* m_componentView; - wxStaticText* m_stFootprint; wxChoice* m_chooseFootprint; wxPanel* m_footprintView; wxStdDialogButtonSizer* m_stdButtons;