diff --git a/eeschema/dialog_build_BOM_base.cpp b/eeschema/dialog_build_BOM_base.cpp index 8c28600bf4..85dc116d48 100644 --- a/eeschema/dialog_build_BOM_base.cpp +++ b/eeschema/dialog_build_BOM_base.cpp @@ -48,13 +48,13 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c int m_OutputFormCtrlNChoices = sizeof( m_OutputFormCtrlChoices ) / sizeof( wxString ); m_OutputFormCtrl = new wxRadioBox( this, ID_RADIOBOX_SELECT_FORMAT, _("Output format:"), wxDefaultPosition, wxDefaultSize, m_OutputFormCtrlNChoices, m_OutputFormCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_OutputFormCtrl->SetSelection( 0 ); - sbOptionsSizer->Add( m_OutputFormCtrl, 0, wxALL|wxEXPAND, 5 ); + sbOptionsSizer->Add( m_OutputFormCtrl, 0, wxEXPAND|wxTOP, 5 ); wxString m_OutputSeparatorCtrlChoices[] = { _("Tab"), _(";"), _(",") }; int m_OutputSeparatorCtrlNChoices = sizeof( m_OutputSeparatorCtrlChoices ) / sizeof( wxString ); - m_OutputSeparatorCtrl = new wxRadioBox( this, wxID_ANY, _("Field separator for spreadsheet import:"), wxDefaultPosition, wxDefaultSize, m_OutputSeparatorCtrlNChoices, m_OutputSeparatorCtrlChoices, 1, wxRA_SPECIFY_COLS|wxRA_SPECIFY_ROWS ); + m_OutputSeparatorCtrl = new wxRadioBox( this, wxID_ANY, _("Field separator for spreadsheet import:"), wxDefaultPosition, wxDefaultSize, m_OutputSeparatorCtrlNChoices, m_OutputSeparatorCtrlChoices, 1, wxRA_SPECIFY_ROWS ); m_OutputSeparatorCtrl->SetSelection( 0 ); - sbOptionsSizer->Add( m_OutputSeparatorCtrl, 1, wxALL, 5 ); + sbOptionsSizer->Add( m_OutputSeparatorCtrl, 0, wxEXPAND|wxTOP, 5 ); wxStaticBoxSizer* sbBrowseOptSizer; sbBrowseOptSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL ); @@ -63,9 +63,9 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c sbBrowseOptSizer->Add( m_GetListBrowser, 0, wxALL|wxEXPAND, 5 ); - sbOptionsSizer->Add( sbBrowseOptSizer, 0, wxEXPAND, 5 ); + sbOptionsSizer->Add( sbBrowseOptSizer, 0, wxEXPAND|wxTOP, 5 ); - bMainSizer->Add( sbOptionsSizer, 0, 0, 5 ); + bMainSizer->Add( sbOptionsSizer, 10, wxALL|wxEXPAND, 5 ); wxBoxSizer* bRightSizer; bRightSizer = new wxBoxSizer( wxVERTICAL ); @@ -121,9 +121,9 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c sbUsersFiledsSizer->Add( m_AddAllFields, 0, wxALL, 5 ); - sbFieldsSelectionSizer->Add( sbUsersFiledsSizer, 0, wxEXPAND, 5 ); + sbFieldsSelectionSizer->Add( sbUsersFiledsSizer, 0, wxEXPAND|wxTOP, 5 ); - bRightSizer->Add( sbFieldsSelectionSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 ); + bRightSizer->Add( sbFieldsSelectionSizer, 1, wxEXPAND, 5 ); bRightSizer->Add( 10, 10, 0, 0, 5 ); @@ -139,7 +139,7 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c bRightSizer->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - bMainSizer->Add( bRightSizer, 1, wxRIGHT|wxLEFT, 5 ); + bMainSizer->Add( bRightSizer, 8, wxALL|wxEXPAND, 5 ); this->SetSizer( bMainSizer ); this->Layout(); diff --git a/eeschema/dialog_build_BOM_base.fbp b/eeschema/dialog_build_BOM_base.fbp index c10d4c3bec..88eb434227 100644 --- a/eeschema/dialog_build_BOM_base.fbp +++ b/eeschema/dialog_build_BOM_base.fbp @@ -1,1230 +1,1230 @@ - - - - - - C++ - 1 - UTF-8 - connect - dialog_build_BOM_base - 1000 - none - 1 - dialog_build_BOM_base - - . - - 1 - 1 - 0 - - - - - 1 - - - - 0 - wxID_ANY - - - DIALOG_BUILD_BOM_BASE - - 415,382 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - List of Material - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer - wxHORIZONTAL - none - - 5 - - 0 - - wxID_ANY - Options: - - sbOptionsSizer - wxVERTICAL - none - - - 5 - wxEXPAND - 0 - - wxID_ANY - List items: - - sbListOptionsSizer - wxVERTICAL - none - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Components by reference - - - m_ListCmpbyRefItems - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Sub components (i.e. U2A, U2B ...) - - - m_ListSubCmpItems - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Components by value - - - m_ListCmpbyValItems - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Hierarchy pins by name - - - m_GenListLabelsbyVal - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Hierarchy pins by sheets - - - m_GenListLabelsbySheet - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - "List" "Text for spreadsheet import" - - 1 - - - 0 - ID_RADIOBOX_SELECT_FORMAT - Output format: - 1 - - - m_OutputFormCtrl - protected - - 0 - - wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - OnRadioboxSelectFormatSelected - - - - - - - - - - 5 - wxALL - 1 - - - "Tab" ";" "," - - 1 - - - 0 - wxID_ANY - Field separator for spreadsheet import: - 1 - - - m_OutputSeparatorCtrl - protected - - 0 - - wxRA_SPECIFY_COLS|wxRA_SPECIFY_ROWS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - wxID_ANY - Options: - - sbBrowseOptSizer - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Launch list browser - - - m_GetListBrowser - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxRIGHT|wxLEFT - 1 - - - bRightSizer - wxVERTICAL - none - - 5 - wxALIGN_CENTER_HORIZONTAL|wxBOTTOM - 1 - - wxID_ANY - Fields to add: - - sbFieldsSelectionSizer - wxVERTICAL - none - - - 5 - wxEXPAND - 0 - - wxID_ANY - System Fields: - - sbFixedFieldsSizer - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Footprint - - - m_AddFootprintField - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - wxID_ANY - Users Fields: - - sbUsersFiledsSizer - wxVERTICAL - none - - - 5 - wxEXPAND|wxALL - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Field 1 - - - m_AddField1 - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Field 2 - - - m_AddField2 - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Field 3 - - - m_AddField3 - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Field 4 - - - m_AddField4 - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Field 5 - - - m_AddField5 - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Field 6 - - - m_AddField6 - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Field 7 - - - m_AddField7 - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Field 8 - - - m_AddField8 - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - All existing users fields - - - m_AddAllFields - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - 0 - - 10 - protected - 10 - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL - 0 - - - - 1 - 1 - 170,0,0 - - 0 - wxID_OK - Ok - - - m_buttonOK - protected - - - - - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL - 0 - - - - 0 - 1 - 11,0,202 - - 0 - wxID_CANCEL - Close - - - m_buttonCANCEL - protected - - - - - - - - - OnCancelClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + C++ + 1 + UTF-8 + connect + dialog_build_BOM_base + 1000 + none + 1 + dialog_build_BOM_base + + . + + 1 + 1 + 0 + + + + + 1 + + + + 0 + wxID_ANY + + + DIALOG_BUILD_BOM_BASE + + 415,382 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + + List of Material + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxHORIZONTAL + none + + 5 + wxALL|wxEXPAND + 10 + + wxID_ANY + Options: + + sbOptionsSizer + wxVERTICAL + none + + + 5 + wxEXPAND + 0 + + wxID_ANY + List items: + + sbListOptionsSizer + wxVERTICAL + none + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Components by reference + + + m_ListCmpbyRefItems + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Sub components (i.e. U2A, U2B ...) + + + m_ListSubCmpItems + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Components by value + + + m_ListCmpbyValItems + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Hierarchy pins by name + + + m_GenListLabelsbyVal + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Hierarchy pins by sheets + + + m_GenListLabelsbySheet + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP + 0 + + + "List" "Text for spreadsheet import" + + 1 + + + 0 + ID_RADIOBOX_SELECT_FORMAT + Output format: + 1 + + + m_OutputFormCtrl + protected + + 0 + + wxRA_SPECIFY_COLS + + + + + + + + + + + + + + + + + + + + + + + OnRadioboxSelectFormatSelected + + + + + + + + + + 5 + wxEXPAND|wxTOP + 0 + + + "Tab" ";" "," + + 1 + + + 0 + wxID_ANY + Field separator for spreadsheet import: + 1 + + + m_OutputSeparatorCtrl + protected + + 0 + + wxRA_SPECIFY_ROWS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP + 0 + + wxID_ANY + Options: + + sbBrowseOptSizer + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Launch list browser + + + m_GetListBrowser + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 8 + + + bRightSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + wxID_ANY + Fields to add: + + sbFieldsSelectionSizer + wxVERTICAL + none + + + 5 + wxEXPAND + 0 + + wxID_ANY + System Fields: + + sbFixedFieldsSizer + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Footprint + + + m_AddFootprintField + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP + 0 + + wxID_ANY + Users Fields: + + sbUsersFiledsSizer + wxVERTICAL + none + + + 5 + wxEXPAND|wxALL + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Field 1 + + + m_AddField1 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Field 2 + + + m_AddField2 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Field 3 + + + m_AddField3 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Field 4 + + + m_AddField4 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Field 5 + + + m_AddField5 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Field 6 + + + m_AddField6 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Field 7 + + + m_AddField7 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Field 8 + + + m_AddField8 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + All existing users fields + + + m_AddAllFields + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + 0 + + 10 + protected + 10 + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + 0 + + + + 1 + 1 + 170,0,0 + + 0 + wxID_OK + Ok + + + m_buttonOK + protected + + + + + + + + + OnOkClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + 0 + + + + 0 + 1 + 11,0,202 + + 0 + wxID_CANCEL + Close + + + m_buttonCANCEL + protected + + + + + + + + + OnCancelClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/version.txt b/version.txt index fde4fdd255..ad9db7b84f 100644 --- a/version.txt +++ b/version.txt @@ -1,4 +1,4 @@ release version: 16 feb 2009 files (.zip,.tgz): -kicad-2009-02-16-RC5 +kicad-2009-02-16-RC6