From 3755b77b926eba654b8162085fe57c200464ba77 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Mon, 6 Jan 2025 14:01:00 -0500 Subject: [PATCH] Dialog string capitalization and layout fixes. --- .../dialogs/dialog_select_3d_model_base.cpp | 2 +- .../dialogs/dialog_select_3d_model_base.fbp | 2 +- common/dialogs/dialog_paste_special_base.cpp | 8 +- common/dialogs/dialog_paste_special_base.fbp | 56 +- common/dialogs/dialog_paste_special_base.h | 3 +- common/dialogs/dialog_rc_job_base.cpp | 4 +- common/dialogs/dialog_rc_job_base.fbp | 4 +- common/dialogs/panel_embedded_files_base.cpp | 2 +- common/dialogs/panel_embedded_files_base.fbp | 2 +- .../dialogs/dialog_change_symbols_base.cpp | 2 +- .../dialogs/dialog_change_symbols_base.fbp | 2 +- .../dialog_design_block_properties_base.cpp | 18 +- .../dialog_design_block_properties_base.fbp | 126 +- .../dialog_design_block_properties_base.h | 3 +- eeschema/dialogs/dialog_sim_command_base.cpp | 2 +- eeschema/dialogs/dialog_sim_command_base.fbp | 2 +- .../dialog_print_using_printer_base.cpp | 6 +- .../dialog_print_using_printer_base.fbp | 1194 +++++++++-------- .../dialog_print_using_printer_base.h | 4 +- kicad/dialogs/dialog_update_notice_base.cpp | 4 +- kicad/dialogs/dialog_update_notice_base.fbp | 4 +- .../dialog_dimension_properties_base.cpp | 2 +- .../dialog_dimension_properties_base.fbp | 2 +- pcbnew/dialogs/dialog_export_odbpp_base.cpp | 4 +- pcbnew/dialogs/dialog_export_odbpp_base.fbp | 12 +- pcbnew/dialogs/dialog_generators_base.cpp | 6 +- pcbnew/dialogs/dialog_generators_base.fbp | 997 +++++++------- pcbnew/dialogs/dialog_generators_base.h | 4 +- ...log_global_edit_text_and_graphics_base.cpp | 1 + ...log_global_edit_text_and_graphics_base.fbp | 2 +- ...ialog_global_edit_text_and_graphics_base.h | 2 +- .../dialogs/dialog_layer_selection_base.cpp | 21 +- .../dialogs/dialog_layer_selection_base.fbp | 122 +- pcbnew/dialogs/dialog_layer_selection_base.h | 7 +- .../dialogs/dialog_text_properties_base.cpp | 2 +- .../dialogs/dialog_text_properties_base.fbp | 2 +- 36 files changed, 1328 insertions(+), 1308 deletions(-) diff --git a/3d-viewer/dialogs/dialog_select_3d_model_base.cpp b/3d-viewer/dialogs/dialog_select_3d_model_base.cpp index 37c7756f39..cba3692a54 100644 --- a/3d-viewer/dialogs/dialog_select_3d_model_base.cpp +++ b/3d-viewer/dialogs/dialog_select_3d_model_base.cpp @@ -79,7 +79,7 @@ DIALOG_SELECT_3D_MODEL_BASE::DIALOG_SELECT_3D_MODEL_BASE( wxWindow* parent, wxWi wxBoxSizer* bSizer6; bSizer6 = new wxBoxSizer( wxHORIZONTAL ); - m_EmbedModelCb = new wxCheckBox( this, wxID_ANY, _("Embed Model"), wxDefaultPosition, wxDefaultSize, 0 ); + m_EmbedModelCb = new wxCheckBox( this, wxID_ANY, _("Embed model"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer6->Add( m_EmbedModelCb, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); diff --git a/3d-viewer/dialogs/dialog_select_3d_model_base.fbp b/3d-viewer/dialogs/dialog_select_3d_model_base.fbp index be5aa1b8c6..767de8f9b1 100644 --- a/3d-viewer/dialogs/dialog_select_3d_model_base.fbp +++ b/3d-viewer/dialogs/dialog_select_3d_model_base.fbp @@ -594,7 +594,7 @@ 0 0 wxID_ANY - Embed Model + Embed model 0 diff --git a/common/dialogs/dialog_paste_special_base.cpp b/common/dialogs/dialog_paste_special_base.cpp index 36d70579a9..de4af71a97 100644 --- a/common/dialogs/dialog_paste_special_base.cpp +++ b/common/dialogs/dialog_paste_special_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf0) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -25,13 +25,13 @@ DIALOG_PASTE_SPECIAL_BASE::DIALOG_PASTE_SPECIAL_BASE( wxWindow* parent, wxWindow m_pasteOptions->SetSelection( 1 ); optionsSizer->Add( m_pasteOptions, 0, wxALL, 5 ); - m_clearNetsCB = new wxCheckBox( this, wxID_ANY, _("Clear Net Assignments"), wxDefaultPosition, wxDefaultSize, 0 ); + m_clearNetsCB = new wxCheckBox( this, wxID_ANY, _("Clear net assignments"), wxDefaultPosition, wxDefaultSize, 0 ); m_clearNetsCB->SetToolTip( _("Remove the net information from all connected items before pasting") ); optionsSizer->Add( m_clearNetsCB, 0, wxALL, 5 ); - m_mainSizer->Add( optionsSizer, 1, wxALL|wxEXPAND, 10 ); + m_mainSizer->Add( optionsSizer, 1, wxALL|wxEXPAND, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); @@ -40,7 +40,7 @@ DIALOG_PASTE_SPECIAL_BASE::DIALOG_PASTE_SPECIAL_BASE( wxWindow* parent, wxWindow m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - m_mainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 6 ); + m_mainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( m_mainSizer ); diff --git a/common/dialogs/dialog_paste_special_base.fbp b/common/dialogs/dialog_paste_special_base.fbp index a335afc656..06f862bf2b 100644 --- a/common/dialogs/dialog_paste_special_base.fbp +++ b/common/dialogs/dialog_paste_special_base.fbp @@ -1,34 +1,36 @@ - + - C++ - 1 - source_name - 0 - 0 + + 1 + connect + none + + + 0 + 0 res UTF-8 - connect dialog_paste_special_base 1000 - none - - 1 + 1 + UI dialog_paste_special - . - + 0 + source_name + 1 + 0 + source_name + + + 1 1 - 1 - 1 - 1 - UI - 0 - 0 0 + 0 0 wxAUI_MGR_DEFAULT @@ -63,7 +65,7 @@ wxVERTICAL none - 10 + 5 wxALL|wxEXPAND 1 @@ -80,10 +82,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -148,10 +150,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -173,7 +175,7 @@ 0 0 wxID_ANY - Clear Net Assignments + Clear net assignments 0 @@ -207,7 +209,7 @@ - 6 + 5 wxALL|wxEXPAND 0 diff --git a/common/dialogs/dialog_paste_special_base.h b/common/dialogs/dialog_paste_special_base.h index d1e2160781..f8ba49ee14 100644 --- a/common/dialogs/dialog_paste_special_base.h +++ b/common/dialogs/dialog_paste_special_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf0) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,7 +24,6 @@ /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_PASTE_SPECIAL_BASE /////////////////////////////////////////////////////////////////////////////// diff --git a/common/dialogs/dialog_rc_job_base.cpp b/common/dialogs/dialog_rc_job_base.cpp index ebb6100c43..d9b2ffac1f 100644 --- a/common/dialogs/dialog_rc_job_base.cpp +++ b/common/dialogs/dialog_rc_job_base.cpp @@ -24,7 +24,7 @@ DIALOG_RC_JOB_BASE::DIALOG_RC_JOB_BASE( wxWindow* parent, wxWindowID id, const w m_staticText18 = new wxStaticText( this, wxID_ANY, _("Format:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText18->Wrap( -1 ); - fgSizer1->Add( m_staticText18, 0, 0, 5 ); + fgSizer1->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_choiceFormatChoices; m_choiceFormat = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceFormatChoices, 0 ); @@ -81,7 +81,7 @@ DIALOG_RC_JOB_BASE::DIALOG_RC_JOB_BASE( wxWindow* parent, wxWindowID id, const w bSizerBottom->Add( m_cbSchParity, 0, wxBOTTOM|wxLEFT, 5 ); - bSizerMain->Add( bSizerBottom, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizerMain->Add( bSizerBottom, 0, wxEXPAND|wxRIGHT, 5 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); diff --git a/common/dialogs/dialog_rc_job_base.fbp b/common/dialogs/dialog_rc_job_base.fbp index 02e2ef38fa..34d79178f7 100644 --- a/common/dialogs/dialog_rc_job_base.fbp +++ b/common/dialogs/dialog_rc_job_base.fbp @@ -82,7 +82,7 @@ 5 5 - + wxALIGN_CENTER_VERTICAL 0 1 @@ -552,7 +552,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT 0 diff --git a/common/dialogs/panel_embedded_files_base.cpp b/common/dialogs/panel_embedded_files_base.cpp index 7da8245cf1..7ff23667f5 100644 --- a/common/dialogs/panel_embedded_files_base.cpp +++ b/common/dialogs/panel_embedded_files_base.cpp @@ -85,7 +85,7 @@ PANEL_EMBEDDED_FILES_BASE::PANEL_EMBEDDED_FILES_BASE( wxWindow* parent, wxWindow wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxVERTICAL ); - m_cbEmbedFonts = new wxCheckBox( this, wxID_ANY, _("Embed Fonts"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbEmbedFonts = new wxCheckBox( this, wxID_ANY, _("Embed fonts"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbEmbedFonts->SetToolTip( _("Store a copy of all fonts used") ); bSizer4->Add( m_cbEmbedFonts, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); diff --git a/common/dialogs/panel_embedded_files_base.fbp b/common/dialogs/panel_embedded_files_base.fbp index e0b168c399..e8369aaad1 100644 --- a/common/dialogs/panel_embedded_files_base.fbp +++ b/common/dialogs/panel_embedded_files_base.fbp @@ -520,7 +520,7 @@ 0 0 wxID_ANY - Embed Fonts + Embed fonts 0 diff --git a/eeschema/dialogs/dialog_change_symbols_base.cpp b/eeschema/dialogs/dialog_change_symbols_base.cpp index 9fed7c9cb4..dc90d9c275 100644 --- a/eeschema/dialogs/dialog_change_symbols_base.cpp +++ b/eeschema/dialogs/dialog_change_symbols_base.cpp @@ -92,7 +92,7 @@ DIALOG_CHANGE_SYMBOLS_BASE::DIALOG_CHANGE_SYMBOLS_BASE( wxWindow* parent, wxWind wxBoxSizer* bSizerUpdate; bSizerUpdate = new wxBoxSizer( wxHORIZONTAL ); - m_updateFieldsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Update/reset Fields") ), wxVERTICAL ); + m_updateFieldsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Update/Reset Fields") ), wxVERTICAL ); wxArrayString m_fieldsBoxChoices; m_fieldsBox = new wxCheckListBox( m_updateFieldsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_fieldsBoxChoices, wxLB_NEEDED_SB ); diff --git a/eeschema/dialogs/dialog_change_symbols_base.fbp b/eeschema/dialogs/dialog_change_symbols_base.fbp index 220b9b4c19..8f767102c9 100644 --- a/eeschema/dialogs/dialog_change_symbols_base.fbp +++ b/eeschema/dialogs/dialog_change_symbols_base.fbp @@ -1032,7 +1032,7 @@ 1 wxID_ANY - Update/reset Fields + Update/Reset Fields m_updateFieldsSizer wxVERTICAL diff --git a/eeschema/dialogs/dialog_design_block_properties_base.cpp b/eeschema/dialogs/dialog_design_block_properties_base.cpp index dacbbff384..bd6d6bff8b 100644 --- a/eeschema/dialogs/dialog_design_block_properties_base.cpp +++ b/eeschema/dialogs/dialog_design_block_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -88,7 +88,7 @@ DIALOG_DESIGN_BLOCK_PROPERTIES_BASE::DIALOG_DESIGN_BLOCK_PROPERTIES_BASE( wxWind bMainSizer->Add( bMargins, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); wxFlexGridSizer* fgProperties; - fgProperties = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgProperties = new wxFlexGridSizer( 0, 2, 5, 0 ); fgProperties->AddGrowableCol( 1 ); fgProperties->AddGrowableRow( 2 ); fgProperties->SetFlexibleDirection( wxBOTH ); @@ -96,27 +96,27 @@ DIALOG_DESIGN_BLOCK_PROPERTIES_BASE::DIALOG_DESIGN_BLOCK_PROPERTIES_BASE( wxWind m_staticTextName = new wxStaticText( this, wxID_ANY, wxT("Name:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextName->Wrap( -1 ); - fgProperties->Add( m_staticTextName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + fgProperties->Add( m_staticTextName, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_textName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgProperties->Add( m_textName, 0, wxEXPAND|wxBOTTOM, 5 ); + fgProperties->Add( m_textName, 0, wxEXPAND, 5 ); m_staticTextKeywords = new wxStaticText( this, wxID_ANY, wxT("Keywords:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextKeywords->Wrap( -1 ); - fgProperties->Add( m_staticTextKeywords, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + fgProperties->Add( m_staticTextKeywords, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_textKeywords = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgProperties->Add( m_textKeywords, 0, wxEXPAND|wxBOTTOM, 5 ); + fgProperties->Add( m_textKeywords, 0, wxEXPAND, 5 ); m_staticTextDescription = new wxStaticText( this, wxID_ANY, wxT("Description:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDescription->Wrap( -1 ); - fgProperties->Add( m_staticTextDescription, 1, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + fgProperties->Add( m_staticTextDescription, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_textDescription = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); - fgProperties->Add( m_textDescription, 0, wxEXPAND|wxBOTTOM, 5 ); + fgProperties->Add( m_textDescription, 0, wxEXPAND, 5 ); - bMainSizer->Add( fgProperties, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); + bMainSizer->Add( fgProperties, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 10 ); m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); diff --git a/eeschema/dialogs/dialog_design_block_properties_base.fbp b/eeschema/dialogs/dialog_design_block_properties_base.fbp index 062e3ed2b5..5c0abb4f49 100644 --- a/eeschema/dialogs/dialog_design_block_properties_base.fbp +++ b/eeschema/dialogs/dialog_design_block_properties_base.fbp @@ -1,34 +1,36 @@ - + - ; C++ - 1 - source_name - 0 - 0 + ; + 1 + connect + none + + + 0 + 0 res UTF-8 - connect dialog_design_block_properties_base 1000 - none - - 0 + 1 + UI dialog_design_block_properties_base - . - + 0 + source_name + 1 + 0 + source_name + + + 1 1 - 1 - 1 - 1 - UI - 0 - 0 0 + 0 0 wxAUI_MGR_DEFAULT @@ -92,10 +94,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 0 @@ -191,10 +193,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -266,10 +268,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -341,10 +343,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -426,10 +428,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -510,7 +512,7 @@ 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 2 @@ -523,20 +525,20 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 5 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -588,17 +590,17 @@ 5 - wxEXPAND|wxBOTTOM + wxEXPAND 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -622,7 +624,7 @@ 0 - + 0 0 @@ -653,17 +655,17 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -715,17 +717,17 @@ 5 - wxEXPAND|wxBOTTOM + wxEXPAND 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -749,7 +751,7 @@ 0 - + 0 0 @@ -780,17 +782,17 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 1 1 1 1 1 - + 0 - - + 0 + 0 @@ -842,17 +844,17 @@ 5 - wxEXPAND|wxBOTTOM + wxEXPAND 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -876,7 +878,7 @@ 0 - + 0 0 diff --git a/eeschema/dialogs/dialog_design_block_properties_base.h b/eeschema/dialogs/dialog_design_block_properties_base.h index 74c312c9b2..8ab5362d9c 100644 --- a/eeschema/dialogs/dialog_design_block_properties_base.h +++ b/eeschema/dialogs/dialog_design_block_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -32,7 +32,6 @@ class WX_GRID; /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_DESIGN_BLOCK_PROPERTIES_BASE /////////////////////////////////////////////////////////////////////////////// diff --git a/eeschema/dialogs/dialog_sim_command_base.cpp b/eeschema/dialogs/dialog_sim_command_base.cpp index 688bd39da6..2aaf22cb2e 100644 --- a/eeschema/dialogs/dialog_sim_command_base.cpp +++ b/eeschema/dialogs/dialog_sim_command_base.cpp @@ -544,7 +544,7 @@ DIALOG_SIM_COMMAND_BASE::DIALOG_SIM_COMMAND_BASE( wxWindow* parent, wxWindowID i bSizer2->Add( m_customTxt, 1, wxALL|wxEXPAND, 5 ); - m_loadDirectives = new wxButton( m_pgCustom, wxID_ANY, _("Load directives from schematic"), wxDefaultPosition, wxDefaultSize, 0 ); + m_loadDirectives = new wxButton( m_pgCustom, wxID_ANY, _("Load Directives from Schematic"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer2->Add( m_loadDirectives, 0, wxALL|wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_sim_command_base.fbp b/eeschema/dialogs/dialog_sim_command_base.fbp index 59ad626757..dffa6353c8 100644 --- a/eeschema/dialogs/dialog_sim_command_base.fbp +++ b/eeschema/dialogs/dialog_sim_command_base.fbp @@ -6388,7 +6388,7 @@ 0 0 wxID_ANY - Load directives from schematic + Load Directives from Schematic 0 diff --git a/eeschema/printing/dialog_print_using_printer_base.cpp b/eeschema/printing/dialog_print_using_printer_base.cpp index 0dd378b7ae..6d9d73049f 100644 --- a/eeschema/printing/dialog_print_using_printer_base.cpp +++ b/eeschema/printing/dialog_print_using_printer_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -57,9 +57,8 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare m_colorTheme = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_colorThemeChoices, 0 ); m_colorTheme->SetSelection( 0 ); m_colorTheme->Enable( false ); - m_colorTheme->SetMinSize( wxSize( 200,-1 ) ); - bSizer4->Add( m_colorTheme, 0, wxLEFT, 25 ); + bSizer4->Add( m_colorTheme, 1, wxEXPAND|wxLEFT|wxRIGHT, 25 ); bleftSizer->Add( bSizer4, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -93,6 +92,7 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_BASE::OnCloseWindow ) ); diff --git a/eeschema/printing/dialog_print_using_printer_base.fbp b/eeschema/printing/dialog_print_using_printer_base.fbp index e3fe613b64..05ae64815d 100644 --- a/eeschema/printing/dialog_print_using_printer_base.fbp +++ b/eeschema/printing/dialog_print_using_printer_base.fbp @@ -1,598 +1,608 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_print_using_printer_base - 1000 - none - - - 1 - dialog_print_schematic - - . - - 1 - 1 - 1 - 1 - UI - 0 - 1 - 0 - - 0 - wxAUI_MGR_DEFAULT - - - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - -1,-1 - DIALOG_PRINT_USING_PRINTER_BASE - - 391,250 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Print - - 0 - - - - OnCloseWindow - + + + C++ + + 1 + connect + none + + + 0 + 1 + res + UTF-8 + dialog_print_using_printer_base + 1000 + 1 + 1 + UI + dialog_print_schematic + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + -1,-1 + DIALOG_PRINT_USING_PRINTER_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Print + + 0 + + + + OnCloseWindow + + + bMainSizer + wxVERTICAL + none + + 10 + wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + 1 + + + bleftSizer + wxVERTICAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Print drawing sheet + + 0 + + + 0 - bMainSizer - wxVERTICAL - none - - 10 - wxEXPAND|wxTOP|wxBOTTOM|wxLEFT - 1 - - - bleftSizer - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Print drawing sheet - - 0 - - - 0 - - 1 - m_checkReference - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Print (or not) the Frame references. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxEXPAND - 0 - - - bSizerOttputMode - wxHORIZONTAL - none - - 30 - wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Output mode: - 0 - - 0 - - - 0 - - 1 - m_staticText1 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 25 - wxLEFT|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Color" "Black and White" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 200,-1 - 1 - m_colorPrint - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnOutputChoice - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Print background color - - 0 - - - 0 - - 1 - m_checkBackgroundColor - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Use a different color theme for printing: - - 0 - - - 0 - - 1 - m_checkUseColorTheme - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnUseColorThemeChecked - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 1 - - - bSizer4 - wxHORIZONTAL - none - - 25 - wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 0 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 200,-1 - 1 - m_colorTheme - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - 10 - wxEXPAND|wxLEFT|wxTOP - 0 - - - bbuttonsSizer - wxHORIZONTAL - none - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Page Setup... - - 0 - - 0 - - - 0 - - 1 - m_buttonPageSetup - 1 - - - protected - 1 - - - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPageSetup - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - OnPrintPreview - - - - + 1 + m_checkReference + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Print (or not) the Frame references. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + 5 + wxEXPAND + 0 + + + bSizerOttputMode + wxHORIZONTAL + none + + 30 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Output mode: + 0 + + 0 + + + 0 + + 1 + m_staticText1 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 25 + wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Color" "Black and White" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 200,-1 + 1 + m_colorPrint + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnOutputChoice + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Print background color + + 0 + + + 0 + + 1 + m_checkBackgroundColor + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Use a different color theme for printing: + + 0 + + + 0 + + 1 + m_checkUseColorTheme + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnUseColorThemeChecked + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 1 + + + bSizer4 + wxHORIZONTAL + none + + 25 + wxEXPAND|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,-1 + 1 + m_colorTheme + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + 10 + wxEXPAND|wxLEFT|wxTOP + 0 + + + bbuttonsSizer + wxHORIZONTAL + none + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Page Setup... + + 0 + + 0 + + + 0 + + 1 + m_buttonPageSetup + 1 + + + protected + 1 + + + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPageSetup + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + OnPrintPreview + + + + + + diff --git a/eeschema/printing/dialog_print_using_printer_base.h b/eeschema/printing/dialog_print_using_printer_base.h index 94cfbb6e57..1bb07c2344 100644 --- a/eeschema/printing/dialog_print_using_printer_base.h +++ b/eeschema/printing/dialog_print_using_printer_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -58,7 +58,7 @@ class DIALOG_PRINT_USING_PRINTER_BASE : public DIALOG_SHIM public: - DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 391,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_PRINT_USING_PRINTER_BASE(); diff --git a/kicad/dialogs/dialog_update_notice_base.cpp b/kicad/dialogs/dialog_update_notice_base.cpp index 3d093867a7..f236e1af21 100644 --- a/kicad/dialogs/dialog_update_notice_base.cpp +++ b/kicad/dialogs/dialog_update_notice_base.cpp @@ -49,7 +49,7 @@ DIALOG_UPDATE_NOTICE_BASE::DIALOG_UPDATE_NOTICE_BASE( wxWindow* parent, wxWindow wxBoxSizer* bButtonSizer; bButtonSizer = new wxBoxSizer( wxHORIZONTAL ); - m_skipBtn = new wxButton( this, wxID_ANY, _("&Skip this version"), wxDefaultPosition, wxDefaultSize, 0 ); + m_skipBtn = new wxButton( this, wxID_ANY, _("&Skip This Version"), wxDefaultPosition, wxDefaultSize, 0 ); m_skipBtn->SetToolTip( _("Ignores the update notice for the announced new version. Additional update notes will be displayed for newer versions.") ); bButtonSizer->Add( m_skipBtn, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); @@ -57,7 +57,7 @@ DIALOG_UPDATE_NOTICE_BASE::DIALOG_UPDATE_NOTICE_BASE( wxWindow* parent, wxWindow bButtonSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - m_btnRemind = new wxButton( this, wxID_ANY, _("&Remind me later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_btnRemind = new wxButton( this, wxID_ANY, _("&Remind Me Later"), wxDefaultPosition, wxDefaultSize, 0 ); m_btnRemind->SetToolTip( _("Close this update notice. The update notice will be shown again when you relaunch KiCad.") ); bButtonSizer->Add( m_btnRemind, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); diff --git a/kicad/dialogs/dialog_update_notice_base.fbp b/kicad/dialogs/dialog_update_notice_base.fbp index cd5f413306..97fdd29b6a 100644 --- a/kicad/dialogs/dialog_update_notice_base.fbp +++ b/kicad/dialogs/dialog_update_notice_base.fbp @@ -334,7 +334,7 @@ 0 0 wxID_ANY - &Skip this version + &Skip This Version 0 @@ -419,7 +419,7 @@ 0 0 wxID_ANY - &Remind me later + &Remind Me Later 0 diff --git a/pcbnew/dialogs/dialog_dimension_properties_base.cpp b/pcbnew/dialogs/dialog_dimension_properties_base.cpp index 4699a00694..7e12d9db17 100644 --- a/pcbnew/dialogs/dialog_dimension_properties_base.cpp +++ b/pcbnew/dialogs/dialog_dimension_properties_base.cpp @@ -169,7 +169,7 @@ DIALOG_DIMENSION_PROPERTIES_BASE::DIALOG_DIMENSION_PROPERTIES_BASE( wxWindow* pa gbSizerFormat->Add( m_lblPrecision, wxGBPosition( 2, 4 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_lblArrowDirection = new wxStaticText( m_sizerFormat->GetStaticBox(), wxID_ANY, _("Arrow Direction:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_lblArrowDirection = new wxStaticText( m_sizerFormat->GetStaticBox(), wxID_ANY, _("Arrow direction:"), wxDefaultPosition, wxDefaultSize, 0 ); m_lblArrowDirection->Wrap( -1 ); gbSizerFormat->Add( m_lblArrowDirection, wxGBPosition( 3, 4 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); diff --git a/pcbnew/dialogs/dialog_dimension_properties_base.fbp b/pcbnew/dialogs/dialog_dimension_properties_base.fbp index 8af1a9cbba..5c5e49534a 100644 --- a/pcbnew/dialogs/dialog_dimension_properties_base.fbp +++ b/pcbnew/dialogs/dialog_dimension_properties_base.fbp @@ -1549,7 +1549,7 @@ 0 0 wxID_ANY - Arrow Direction: + Arrow direction: 0 0 diff --git a/pcbnew/dialogs/dialog_export_odbpp_base.cpp b/pcbnew/dialogs/dialog_export_odbpp_base.cpp index 38edd881e2..66d4855484 100644 --- a/pcbnew/dialogs/dialog_export_odbpp_base.cpp +++ b/pcbnew/dialogs/dialog_export_odbpp_base.cpp @@ -20,7 +20,7 @@ DIALOG_EXPORT_ODBPP_BASE::DIALOG_EXPORT_ODBPP_BASE( wxWindow* parent, wxWindowID bSizerTop = new wxBoxSizer( wxHORIZONTAL ); - m_lblBrdFile = new wxStaticText( this, wxID_ANY, _("Output File:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_lblBrdFile = new wxStaticText( this, wxID_ANY, _("Output file:"), wxDefaultPosition, wxDefaultSize, 0 ); m_lblBrdFile->Wrap( -1 ); bSizerTop->Add( m_lblBrdFile, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -70,7 +70,7 @@ DIALOG_EXPORT_ODBPP_BASE::DIALOG_EXPORT_ODBPP_BASE( wxWindow* parent, wxWindowID fgSizer->Add( m_precision, 0, wxALL|wxEXPAND, 5 ); - m_lblCompress = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Compression Format:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_lblCompress = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Compression format:"), wxDefaultPosition, wxDefaultSize, 0 ); m_lblCompress->Wrap( -1 ); m_lblCompress->SetToolTip( _("Select the format to compress the output ODB++ files") ); diff --git a/pcbnew/dialogs/dialog_export_odbpp_base.fbp b/pcbnew/dialogs/dialog_export_odbpp_base.fbp index 4e1dfb513f..f1af64a5b8 100644 --- a/pcbnew/dialogs/dialog_export_odbpp_base.fbp +++ b/pcbnew/dialogs/dialog_export_odbpp_base.fbp @@ -106,7 +106,7 @@ 0 0 wxID_ANY - Output File: + Output file: 0 0 @@ -286,11 +286,11 @@ bSizer3 wxHORIZONTAL none - + 10 wxEXPAND|wxALL 1 - + wxID_ANY File Format @@ -298,11 +298,11 @@ wxVERTICAL 1 none - + 5 wxEXPAND|wxLEFT 3 - + 2 wxBOTH 0,1 @@ -599,7 +599,7 @@ 0 0 wxID_ANY - Compression Format: + Compression format: 0 0 diff --git a/pcbnew/dialogs/dialog_generators_base.cpp b/pcbnew/dialogs/dialog_generators_base.cpp index d1d9a0d8bb..185c672cc9 100644 --- a/pcbnew/dialogs/dialog_generators_base.cpp +++ b/pcbnew/dialogs/dialog_generators_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -19,7 +19,7 @@ DIALOG_GENERATORS_BASE::DIALOG_GENERATORS_BASE( wxWindow* parent, wxWindowID id, wxBoxSizer* bSizer13; bSizer13 = new wxBoxSizer( wxVERTICAL ); - m_Notebook = new wxNotebook( this, ID_NOTEBOOK1, wxDefaultPosition, wxDefaultSize, 0 ); + m_Notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_Notebook->SetMinSize( wxSize( 640,-1 ) ); m_panelPage1 = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); @@ -48,7 +48,7 @@ DIALOG_GENERATORS_BASE::DIALOG_GENERATORS_BASE( wxWindow* parent, wxWindowID id, m_sizerButtons = new wxBoxSizer( wxHORIZONTAL ); - m_rebuildSelected = new wxButton( this, wxID_ANY, _("Rebuild selected"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rebuildSelected = new wxButton( this, wxID_ANY, _("Rebuild Selected"), wxDefaultPosition, wxDefaultSize, 0 ); m_sizerButtons->Add( m_rebuildSelected, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_rebuildThisType = new wxButton( this, wxID_ANY, _("Rebuild this type"), wxDefaultPosition, wxDefaultSize, 0 ); diff --git a/pcbnew/dialogs/dialog_generators_base.fbp b/pcbnew/dialogs/dialog_generators_base.fbp index 0f09992eb7..2c3199793b 100644 --- a/pcbnew/dialogs/dialog_generators_base.fbp +++ b/pcbnew/dialogs/dialog_generators_base.fbp @@ -1,502 +1,511 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_generators_base - 1000 - none - - - 1 - dialog_generators_base - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT - - - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - -1,-1 - DIALOG_GENERATORS_BASE - - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Generator Objects - - 0 - - - - OnActivateDlg - OnClose - - - m_MainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bSizer13 - wxVERTICAL - none - - 10 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_NOTEBOOK1 - - 0 - - - 0 - 640,-1 - 1 - m_Notebook - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - OnChangingNotebookPage - - - Generators A (%s) - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelPage1 - 1 - - - protected - 1 - - Resizable - 1 - - ; - 0 - - - - wxTAB_TRAVERSAL - - -1,320 - bSizerPage1 - wxVERTICAL - none - - 5 - wxEXPAND|wxALL - 1 - - - - 1 - 1 - - - 0 - wxID_ANY - - - m_dataview1 - protected - - - - ; ; forward_declare - Click on items to highlight them on the board. - - - - - - - 5 - wxEXPAND - 0 - - 8 - protected - 0 - - - - - - - - - - - 5 - wxEXPAND|wxLEFT - 0 - - - m_sizerButtons - wxHORIZONTAL - protected - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Rebuild selected - - 0 - - 0 - - - 0 - - 1 - m_rebuildSelected - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRebuildSelectedClick - - - - 5 - wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 1 - wxID_ANY - Rebuild this type - - 0 - - 0 - - - 0 - - 1 - m_rebuildThisType - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRebuildTypeClick - - - - 5 - wxEXPAND - 1 - - 8 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Rebuild All - - 0 - - 0 - - - 0 - - 1 - m_rebuildAll - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRebuildAllClick - - - - 5 - wxEXPAND|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - - m_sdbSizer - protected - OnCancelClick - + + + C++ + + 1 + connect + none + + + 0 + 0 + res + UTF-8 + dialog_generators_base + 1000 + 1 + 1 + UI + dialog_generators_base + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + -1,-1 + DIALOG_GENERATORS_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Generator Objects + + 0 + + + + OnActivateDlg + OnClose + + + m_MainSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bSizer13 + wxVERTICAL + none + + 10 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 640,-1 + 1 + m_Notebook + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + OnChangingNotebookPage + + + Generators A (%s) + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panelPage1 + 1 + + + protected + 1 + + Resizable + 1 + + ; + 0 + + + + wxTAB_TRAVERSAL + + -1,320 + bSizerPage1 + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 1 + + + + 1 + 0 + 1 + + + 0 + wxID_ANY + + + m_dataview1 + protected + + + + ; ; forward_declare + Click on items to highlight them on the board. + + + + + + 5 + wxEXPAND + 0 + + 8 + protected + 0 + + + + + + + 5 + wxEXPAND|wxLEFT + 0 + + + m_sizerButtons + wxHORIZONTAL + protected + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Rebuild Selected + + 0 + + 0 + + + 0 + + 1 + m_rebuildSelected + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRebuildSelectedClick + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 1 + wxID_ANY + Rebuild this type + + 0 + + 0 + + + 0 + + 1 + m_rebuildThisType + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRebuildTypeClick + + + + 5 + wxEXPAND + 1 + + 8 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Rebuild All + + 0 + + 0 + + + 0 + + 1 + m_rebuildAll + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRebuildAllClick + + + + 5 + wxEXPAND|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + + m_sdbSizer + protected + OnCancelClick + + + + + + diff --git a/pcbnew/dialogs/dialog_generators_base.h b/pcbnew/dialogs/dialog_generators_base.h index 6181b2b3e7..346823bba6 100644 --- a/pcbnew/dialogs/dialog_generators_base.h +++ b/pcbnew/dialogs/dialog_generators_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -28,8 +28,6 @@ /////////////////////////////////////////////////////////////////////////// -#define ID_NOTEBOOK1 1000 - /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_GENERATORS_BASE /////////////////////////////////////////////////////////////////////////////// diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp index 9bfa562e39..4ff9c97c76 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp @@ -322,6 +322,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_ this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events m_footprintDimensions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::onDimensionItemCheckbox ), NULL, this ); diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp index b2ce66e514..12bc779b7a 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp @@ -50,7 +50,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE - 722,678 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Edit Text and Graphic Properties diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h index 0c3f313cde..fd060661fe 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h @@ -101,7 +101,7 @@ class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE : public DIALOG_SHIM public: - DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Text and Graphic Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 722,678 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Text and Graphic Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE(); diff --git a/pcbnew/dialogs/dialog_layer_selection_base.cpp b/pcbnew/dialogs/dialog_layer_selection_base.cpp index cef1580dbc..d0ad177424 100644 --- a/pcbnew/dialogs/dialog_layer_selection_base.cpp +++ b/pcbnew/dialogs/dialog_layer_selection_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -22,7 +22,7 @@ DIALOG_LAYER_SELECTION_BASE::DIALOG_LAYER_SELECTION_BASE( wxWindow* parent, wxWi wxBoxSizer* bSizerUpper; bSizerUpper = new wxBoxSizer( wxHORIZONTAL ); - m_leftGridLayers = new wxGrid( this, ID_LEFT_LIST, wxDefaultPosition, wxDefaultSize, 0 ); + m_leftGridLayers = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid m_leftGridLayers->CreateGrid( 1, 3 ); @@ -51,7 +51,7 @@ DIALOG_LAYER_SELECTION_BASE::DIALOG_LAYER_SELECTION_BASE( wxWindow* parent, wxWi m_leftGridLayers->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); bSizerUpper->Add( m_leftGridLayers, 1, wxALL|wxEXPAND, 5 ); - m_rightGridLayers = new wxGrid( this, ID_RIGHT_LIST, wxDefaultPosition, wxDefaultSize, 0 ); + m_rightGridLayers = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid m_rightGridLayers->CreateGrid( 1, 3 ); @@ -126,7 +126,7 @@ DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE::DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE m_staticTextTopLayer->Wrap( -1 ); bSizerLeft->Add( m_staticTextTopLayer, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - m_leftGridLayers = new wxGrid( this, ID_LEFT_LIST, wxDefaultPosition, wxDefaultSize, 0 ); + m_leftGridLayers = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid m_leftGridLayers->CreateGrid( 1, 3 ); @@ -165,7 +165,7 @@ DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE::DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE m_staticTextBottomLayer->Wrap( -1 ); bSizerRight->Add( m_staticTextBottomLayer, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - m_rightGridLayers = new wxGrid( this, ID_RIGHT_LIST, wxDefaultPosition, wxDefaultSize, 0 ); + m_rightGridLayers = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid m_rightGridLayers->CreateGrid( 1, 3 ); @@ -207,9 +207,9 @@ DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE::DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE bSizerUpper->Add( bSizer7, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxStaticBoxSizer* m_presetsSizer; - m_presetsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Copper layer pair presets") ), wxVERTICAL ); + m_presetsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Copper Layer Pair Presets") ), wxVERTICAL ); - m_presetsGrid = new WX_GRID( m_presetsSizer->GetStaticBox(), ID_LEFT_LIST, wxDefaultPosition, wxDefaultSize, 0 ); + m_presetsGrid = new WX_GRID( m_presetsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid m_presetsGrid->CreateGrid( 0, 4 ); @@ -241,13 +241,13 @@ DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE::DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE // Cell Defaults m_presetsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); - m_presetsSizer->Add( m_presetsGrid, 1, wxALL|wxEXPAND, 0 ); + m_presetsSizer->Add( m_presetsGrid, 1, wxALL|wxEXPAND, 5 ); m_deleteRowButton = new STD_BITMAP_BUTTON( m_presetsSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_presetsSizer->Add( m_deleteRowButton, 0, wxTOP, 5 ); + m_presetsSizer->Add( m_deleteRowButton, 0, wxBOTTOM|wxLEFT|wxTOP, 5 ); - bSizerUpper->Add( m_presetsSizer, 1, wxEXPAND|wxLEFT, 10 ); + bSizerUpper->Add( m_presetsSizer, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); bSizerMain->Add( bSizerUpper, 1, wxALL|wxEXPAND, 5 ); @@ -264,6 +264,7 @@ DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE::DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE this->SetSizer( bSizerMain ); this->Layout(); + bSizerMain->Fit( this ); this->Centre( wxBOTH ); } diff --git a/pcbnew/dialogs/dialog_layer_selection_base.fbp b/pcbnew/dialogs/dialog_layer_selection_base.fbp index 9672f988b4..4f3919c51b 100644 --- a/pcbnew/dialogs/dialog_layer_selection_base.fbp +++ b/pcbnew/dialogs/dialog_layer_selection_base.fbp @@ -1,34 +1,36 @@ - + - C++ - 1 - source_name - 0 - 0 + + 1 + connect + none + + + 0 + 0 res UTF-8 - connect dialog_layer_selection_base 1000 - none - - 1 + 1 + UI dialog_layer_selection_base - . - + 0 + source_name + 1 + 0 + source_name + + + 1 1 - 1 - 1 - 1 - UI - 0 - 0 0 + 0 0 wxAUI_MGR_DEFAULT @@ -81,10 +83,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 0 @@ -124,7 +126,7 @@ 0 0 0 - ID_LEFT_LIST + wxID_ANY @@ -172,10 +174,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 0 @@ -215,7 +217,7 @@ 0 0 0 - ID_RIGHT_LIST + wxID_ANY @@ -277,7 +279,7 @@ DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE - 744,217 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h; forward_declare Select Copper Layer Pair @@ -300,11 +302,11 @@ bSizerUpper wxHORIZONTAL none - + 5 wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerLeft wxVERTICAL @@ -318,10 +320,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -380,10 +382,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 0 @@ -423,7 +425,7 @@ 0 0 0 - ID_LEFT_LIST + wxID_ANY @@ -462,11 +464,11 @@ - + 5 wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizerRight wxVERTICAL @@ -480,10 +482,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -542,10 +544,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 0 @@ -585,7 +587,7 @@ 0 0 0 - ID_RIGHT_LIST + wxID_ANY @@ -642,10 +644,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -710,19 +712,19 @@ - 10 - wxEXPAND|wxLEFT + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 1 wxID_ANY - Copper layer pair presets + Copper Layer Pair Presets m_presetsSizer wxVERTICAL 1 none - 0 + 5 wxALL|wxEXPAND 1 @@ -730,10 +732,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 0 @@ -773,7 +775,7 @@ 1 0 0 - ID_LEFT_LIST + wxID_ANY @@ -812,17 +814,17 @@ 5 - wxTOP + wxBOTTOM|wxLEFT|wxTOP 0 1 1 1 1 - + 0 - - + 0 + 0 0 diff --git a/pcbnew/dialogs/dialog_layer_selection_base.h b/pcbnew/dialogs/dialog_layer_selection_base.h index a92d813cb3..63f1598b71 100644 --- a/pcbnew/dialogs/dialog_layer_selection_base.h +++ b/pcbnew/dialogs/dialog_layer_selection_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -32,9 +32,6 @@ class WX_GRID; /////////////////////////////////////////////////////////////////////////// -#define ID_LEFT_LIST 1000 -#define ID_RIGHT_LIST 1001 - /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_LAYER_SELECTION_BASE /////////////////////////////////////////////////////////////////////////////// @@ -82,7 +79,7 @@ class DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE : public DIALOG_SHIM public: - DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Copper Layer Pair"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 744,217 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Copper Layer Pair"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE(); diff --git a/pcbnew/dialogs/dialog_text_properties_base.cpp b/pcbnew/dialogs/dialog_text_properties_base.cpp index 822c19bf0c..22c3d8946f 100644 --- a/pcbnew/dialogs/dialog_text_properties_base.cpp +++ b/pcbnew/dialogs/dialog_text_properties_base.cpp @@ -265,7 +265,7 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWi wxBoxSizer* bSizerBottom; bSizerBottom = new wxBoxSizer( wxHORIZONTAL ); - m_buttonUpdateTh = new wxButton( this, wxID_ANY, _("Update thickness according to text size"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonUpdateTh = new wxButton( this, wxID_ANY, _("Update Thickness According to Text Size"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonUpdateTh->SetToolTip( _("Set the best text thickness from the text width and height\nNormal text: thickness is size/8\nBold text: thickness is size/5") ); bSizerBottom->Add( m_buttonUpdateTh, 0, wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_text_properties_base.fbp b/pcbnew/dialogs/dialog_text_properties_base.fbp index 0e785e6c0a..39168788d4 100644 --- a/pcbnew/dialogs/dialog_text_properties_base.fbp +++ b/pcbnew/dialogs/dialog_text_properties_base.fbp @@ -3082,7 +3082,7 @@ 0 0 wxID_ANY - Update thickness according to text size + Update Thickness According to Text Size 0