From 03e2b60e13da5012c0a71c557f848ec76ec42d3e Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 22 Dec 2024 11:25:05 +0000 Subject: [PATCH] Use STD_BITMAP_BUTTON for correct sizing. Also provide button names for screen readers. Also layout dialog to match Symbol Properties. --- .../dialog_design_block_properties_base.cpp | 99 +- .../dialog_design_block_properties_base.fbp | 1314 ++++++++--------- .../dialog_design_block_properties_base.h | 29 +- 3 files changed, 706 insertions(+), 736 deletions(-) diff --git a/eeschema/dialogs/dialog_design_block_properties_base.cpp b/eeschema/dialogs/dialog_design_block_properties_base.cpp index 58c1cf54b8..a62022709e 100644 --- a/eeschema/dialogs/dialog_design_block_properties_base.cpp +++ b/eeschema/dialogs/dialog_design_block_properties_base.cpp @@ -1,10 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf-dirty) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// +#include "widgets/std_bitmap_button.h" #include "widgets/wx_grid.h" #include "dialog_design_block_properties_base.h" @@ -18,51 +19,8 @@ DIALOG_DESIGN_BLOCK_PROPERTIES_BASE::DIALOG_DESIGN_BLOCK_PROPERTIES_BASE( wxWind wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - wxStaticBoxSizer* sbSizerGeneral; - sbSizerGeneral = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("General") ), wxVERTICAL ); - - wxFlexGridSizer* fgProperties; - fgProperties = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgProperties->AddGrowableCol( 1 ); - fgProperties->AddGrowableRow( 2 ); - fgProperties->SetFlexibleDirection( wxBOTH ); - fgProperties->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticTextName = new wxStaticText( sbSizerGeneral->GetStaticBox(), wxID_ANY, wxT("Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextName->Wrap( -1 ); - fgProperties->Add( m_staticTextName, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_textName = new wxTextCtrl( sbSizerGeneral->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgProperties->Add( m_textName, 0, wxALL|wxEXPAND, 5 ); - - m_staticTextKeywords = new wxStaticText( sbSizerGeneral->GetStaticBox(), wxID_ANY, wxT("Keywords:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextKeywords->Wrap( -1 ); - fgProperties->Add( m_staticTextKeywords, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_textKeywords = new wxTextCtrl( sbSizerGeneral->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgProperties->Add( m_textKeywords, 0, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* bSizer3; - bSizer3 = new wxBoxSizer( wxVERTICAL ); - - m_staticTextDescription = new wxStaticText( sbSizerGeneral->GetStaticBox(), wxID_ANY, wxT("Description:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextDescription->Wrap( -1 ); - bSizer3->Add( m_staticTextDescription, 1, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer3->Add( 0, 0, 3, wxEXPAND, 5 ); - - - fgProperties->Add( bSizer3, 1, wxEXPAND, 5 ); - - m_textDescription = new wxTextCtrl( sbSizerGeneral->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); - fgProperties->Add( m_textDescription, 0, wxALL|wxEXPAND, 5 ); - - - sbSizerGeneral->Add( fgProperties, 1, wxEXPAND, 5 ); - - - bMainSizer->Add( sbSizerGeneral, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + wxBoxSizer* bMargins; + bMargins = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbFields; sbFields = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Default Fields") ), wxVERTICAL ); @@ -97,34 +55,68 @@ DIALOG_DESIGN_BLOCK_PROPERTIES_BASE::DIALOG_DESIGN_BLOCK_PROPERTIES_BASE( wxWind m_fieldsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_fieldsGrid->SetMinSize( wxSize( -1,180 ) ); - sbFields->Add( m_fieldsGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + sbFields->Add( m_fieldsGrid, 1, wxEXPAND|wxBOTTOM, 5 ); wxBoxSizer* bButtonSizer; bButtonSizer = new wxBoxSizer( wxHORIZONTAL ); - m_bpAdd = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bpAdd = new STD_BITMAP_BUTTON( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bButtonSizer->Add( m_bpAdd, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_bpMoveUp = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bpMoveUp = new STD_BITMAP_BUTTON( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bButtonSizer->Add( m_bpMoveUp, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_bpMoveDown = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bpMoveDown = new STD_BITMAP_BUTTON( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bButtonSizer->Add( m_bpMoveDown, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); bButtonSizer->Add( 20, 0, 0, wxEXPAND, 10 ); - m_bpDelete = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bpDelete = new STD_BITMAP_BUTTON( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bButtonSizer->Add( m_bpDelete, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); bButtonSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - sbFields->Add( bButtonSizer, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + sbFields->Add( bButtonSizer, 0, wxEXPAND, 5 ); - bMainSizer->Add( sbFields, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bMargins->Add( sbFields, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + + + bMainSizer->Add( bMargins, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + + wxFlexGridSizer* fgProperties; + fgProperties = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgProperties->AddGrowableCol( 1 ); + fgProperties->AddGrowableRow( 2 ); + fgProperties->SetFlexibleDirection( wxBOTH ); + fgProperties->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + 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 ); + + m_textName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgProperties->Add( m_textName, 0, wxEXPAND|wxBOTTOM, 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 ); + + m_textKeywords = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgProperties->Add( m_textKeywords, 0, wxEXPAND|wxBOTTOM, 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 ); + + m_textDescription = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); + fgProperties->Add( m_textDescription, 0, wxEXPAND|wxBOTTOM, 5 ); + + + bMainSizer->Add( fgProperties, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); @@ -138,6 +130,7 @@ DIALOG_DESIGN_BLOCK_PROPERTIES_BASE::DIALOG_DESIGN_BLOCK_PROPERTIES_BASE( wxWind this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); this->Centre( wxBOTH ); diff --git a/eeschema/dialogs/dialog_design_block_properties_base.fbp b/eeschema/dialogs/dialog_design_block_properties_base.fbp index 1fbed19c59..d4db74d8b8 100644 --- a/eeschema/dialogs/dialog_design_block_properties_base.fbp +++ b/eeschema/dialogs/dialog_design_block_properties_base.fbp @@ -48,7 +48,7 @@ DIALOG_DESIGN_BLOCK_PROPERTIES_BASE - 551,637 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h; forward_declare Design Block Properties @@ -64,37 +64,30 @@ none 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 0 - - wxID_ANY - General + wxEXPAND|wxRIGHT|wxLEFT + 1 + - sbSizerGeneral + bMargins wxVERTICAL - 1 none 5 - wxEXPAND + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 - - 2 - wxBOTH - 1 - 2 - 0 + + wxID_ANY + Default Fields - fgProperties - wxFLEX_GROWMODE_SPECIFIED + sbFields + wxVERTICAL + 1 none - 0 - 0 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - + wxEXPAND|wxBOTTOM + 1 + 1 1 1 @@ -103,12 +96,25 @@ + 0 + 0 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER 0 1 + wxALIGN_CENTER + 22 + "Name" "Value" + wxALIGN_CENTER + 2 + 150,300 1 0 @@ -116,23 +122,33 @@ 0 Left 0 + 0 + 1 + 0 + 1 + 1 1 1 + + 1 0 0 wxID_ANY - Name: - 0 + + + + 0 + 0 0 0 - + -1,180 1 - m_staticTextName + m_fieldsGrid 1 @@ -140,224 +156,37 @@ 1 Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 1 1 - - ; ; forward_declare + WX_GRID; widgets/wx_grid.h; forward_declare 0 - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_textName - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Keywords: - 0 - - 0 - - - 0 - - 1 - m_staticTextKeywords - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_textKeywords - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - + OnSizeGrid 5 wxEXPAND - 1 + 0 - bSizer3 - wxVERTICAL + bButtonSizer + wxHORIZONTAL none 5 - wxALIGN_RIGHT|wxALL - 1 - + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + 1 1 1 @@ -366,15 +195,20 @@ + 0 + 1 0 1 1 + + 0 0 + Dock 0 Left @@ -382,11 +216,13 @@ 1 1 + 0 0 wxID_ANY - Description: + Add field + 0 0 @@ -395,30 +231,271 @@ 0 1 - m_staticTextDescription + m_bpAdd 1 protected 1 + + Resizable 1 - ; ; forward_declare + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare 0 + + wxFILTER_NONE + wxDefaultValidator + - -1 + OnAddField + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move field up + + 0 + + 0 + + + 0 + + 1 + m_bpMoveUp + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnMoveFieldUp + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move field down + + 0 + + 0 + + + 0 + + 1 + m_bpMoveDown + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnMoveFieldDown + + + + 10 + wxEXPAND + 0 + + 0 + protected + 20 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Delete field + + 0 + + 0 + + + 0 + + 1 + m_bpDelete + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnDeleteField 5 wxEXPAND - 3 + 1 0 protected @@ -427,92 +504,31 @@ - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_textDescription - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_MULTILINE - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 1 - - wxID_ANY - Default Fields + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 2 + wxBOTH + 1 + 2 + 0 - sbFields - wxVERTICAL - 1 + fgProperties + wxFLEX_GROWMODE_SPECIFIED none + 0 + 0 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 1 - + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + 0 + 1 1 1 @@ -521,25 +537,12 @@ - 0 - 0 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER 0 1 - wxALIGN_CENTER - 22 - "Name" "Value" - wxALIGN_CENTER - 2 - 150,300 1 0 @@ -547,33 +550,23 @@ 0 Left 0 - 0 - 1 - 0 - 1 - 1 1 1 - - 1 0 0 wxID_ANY - - - - 0 - 0 + Name: + 0 0 0 - -1,180 + 1 - m_fieldsGrid + m_staticTextName 1 @@ -581,352 +574,335 @@ 1 Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 1 - WX_GRID; widgets/wx_grid.h; forward_declare + + ; ; forward_declare 0 - OnSizeGrid + -1 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxBOTTOM 0 - + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 - bButtonSizer - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - MyButton - - 0 - - 0 - - - 0 - - 1 - m_bpAdd - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnAddField - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - MyButton - - 0 - - 0 - - - 0 - - 1 - m_bpMoveUp - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnMoveFieldUp - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - MyButton - - 0 - - 0 - - - 0 - - 1 - m_bpMoveDown - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnMoveFieldDown - - - - 10 - wxEXPAND - 0 - - 0 - protected - 20 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - MyButton - - 0 - - 0 - - - 0 - - 1 - m_bpDelete - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnDeleteField - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - + 1 + m_textName + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Keywords: + 0 + + 0 + + + 0 + + 1 + m_staticTextKeywords + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_textKeywords + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Description: + 0 + + 0 + + + 0 + + 1 + m_staticTextDescription + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_textDescription + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_MULTILINE + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + diff --git a/eeschema/dialogs/dialog_design_block_properties_base.h b/eeschema/dialogs/dialog_design_block_properties_base.h index b9773d1fac..74c312c9b2 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-dirty) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,24 +9,25 @@ #include #include +class STD_BITMAP_BUTTON; class WX_GRID; #include "dialog_shim.h" -#include -#include -#include -#include #include #include -#include -#include -#include +#include +#include #include +#include #include #include #include #include #include +#include +#include +#include +#include #include /////////////////////////////////////////////////////////////////////////// @@ -40,17 +41,17 @@ class DIALOG_DESIGN_BLOCK_PROPERTIES_BASE : public DIALOG_SHIM private: protected: + WX_GRID* m_fieldsGrid; + STD_BITMAP_BUTTON* m_bpAdd; + STD_BITMAP_BUTTON* m_bpMoveUp; + STD_BITMAP_BUTTON* m_bpMoveDown; + STD_BITMAP_BUTTON* m_bpDelete; wxStaticText* m_staticTextName; wxTextCtrl* m_textName; wxStaticText* m_staticTextKeywords; wxTextCtrl* m_textKeywords; wxStaticText* m_staticTextDescription; wxTextCtrl* m_textDescription; - WX_GRID* m_fieldsGrid; - wxBitmapButton* m_bpAdd; - wxBitmapButton* m_bpMoveUp; - wxBitmapButton* m_bpMoveDown; - wxBitmapButton* m_bpDelete; wxStdDialogButtonSizer* m_stdButtons; wxButton* m_stdButtonsOK; wxButton* m_stdButtonsCancel; @@ -66,7 +67,7 @@ class DIALOG_DESIGN_BLOCK_PROPERTIES_BASE : public DIALOG_SHIM public: - DIALOG_DESIGN_BLOCK_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Design Block Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 551,637 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_DESIGN_BLOCK_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Design Block Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_DESIGN_BLOCK_PROPERTIES_BASE();