From 16cbd25ed2ae74d42f81b7beca611462286f5db8 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 28 Feb 2019 09:13:33 +0100 Subject: [PATCH] DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE: fix a minor wxWidgets alert. --- ...log_global_edit_text_and_graphics_base.cpp | 226 ++--- ...log_global_edit_text_and_graphics_base.fbp | 911 +----------------- ...ialog_global_edit_text_and_graphics_base.h | 20 +- 3 files changed, 144 insertions(+), 1013 deletions(-) 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 77fa25986b..bf1bc09f9f 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,223 +14,223 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbScope; sbScope = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Scope") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizer3; fgSizer3 = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizer3->AddGrowableCol( 0 ); fgSizer3->AddGrowableCol( 1 ); fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_references = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("Footprint references"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_references, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + fgSizer3->Add( m_references, 0, wxALL, 5 ); + m_boardText = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("PCB text items"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_boardText, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + fgSizer3->Add( m_boardText, 0, wxALL, 5 ); + m_values = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("Footprint values"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_values, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_boardGraphics = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("PCB graphic items"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_boardGraphics, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_otherFields = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("Other footprint fields"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_otherFields, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_footprintGraphics = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("Footprint graphic items"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_footprintGraphics, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + sbScope->Add( fgSizer3, 0, wxEXPAND, 5 ); - - + + bMainSizer->Add( sbScope, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - + wxStaticBoxSizer* sbFilters; sbFilters = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Filters") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizer2; fgSizer2 = new wxFlexGridSizer( 0, 3, 3, 0 ); fgSizer2->AddGrowableCol( 1 ); fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_layerFilterOpt = new wxCheckBox( sbFilters->GetStaticBox(), wxID_ANY, _("Filter items by layer:"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_layerFilterOpt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - - m_layerFilter = new PCB_LAYER_BOX_SELECTOR( sbFilters->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_layerFilter = new PCB_LAYER_BOX_SELECTOR( sbFilters->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer2->Add( m_layerFilter, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT, 5 ); - - + + fgSizer2->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 60 ); - + m_referenceFilterOpt = new wxCheckBox( sbFilters->GetStaticBox(), wxID_ANY, _("Filter items by parent footprint reference:"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_referenceFilterOpt, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + fgSizer2->Add( m_referenceFilterOpt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + m_referenceFilter = new wxTextCtrl( sbFilters->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_referenceFilter, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxLEFT, 5 ); - - + fgSizer2->Add( m_referenceFilter, 0, wxEXPAND|wxLEFT, 5 ); + + fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_footprintFilterOpt = new wxCheckBox( sbFilters->GetStaticBox(), wxID_ANY, _("Filter items by parent footprint identifier:"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_footprintFilterOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + fgSizer2->Add( m_footprintFilterOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + m_footprintFilter = new wxTextCtrl( sbFilters->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_footprintFilter, 0, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); - - + + fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + sbFilters->Add( fgSizer2, 0, wxEXPAND|wxRIGHT, 5 ); - - + + bMainSizer->Add( sbFilters, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - + wxStaticBoxSizer* sbAction; sbAction = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Action") ), wxVERTICAL ); - + m_setToSpecifiedValues = new wxRadioButton( sbAction->GetStaticBox(), ID_SPECIFIED_NET_TO_NETCLASS_VALUES, _("Set to specified values:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_setToSpecifiedValues->SetValue( true ); - sbAction->Add( m_setToSpecifiedValues, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - + m_setToSpecifiedValues->SetValue( true ); + sbAction->Add( m_setToSpecifiedValues, 0, wxBOTTOM|wxRIGHT|wxTOP, 5 ); + m_specifiedValues = new wxPanel( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 0, 5, 3, 0 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_LayerLabel = new wxStaticText( m_specifiedValues, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayerLabel->Wrap( -1 ); fgSizer1->Add( m_LayerLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - - m_LayerCtrl = new PCB_LAYER_BOX_SELECTOR( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_LayerCtrl = new PCB_LAYER_BOX_SELECTOR( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer1->Add( m_LayerCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - + + fgSizer1->Add( 0, 0, 0, wxEXPAND, 5 ); - - + + fgSizer1->Add( 55, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_Visible = new wxCheckBox( m_specifiedValues, wxID_ANY, _("Visible"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); - m_Visible->SetValue(true); + m_Visible->SetValue(true); fgSizer1->Add( m_Visible, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_lineWidthLabel = new wxStaticText( m_specifiedValues, wxID_ANY, _("Line thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_lineWidthLabel->Wrap( -1 ); fgSizer1->Add( m_lineWidthLabel, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_LineWidthCtrl = new wxTextCtrl( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_LineWidthCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_lineWidthUnits = new wxStaticText( m_specifiedValues, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_lineWidthUnits->Wrap( -1 ); fgSizer1->Add( m_lineWidthUnits, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_SizeXlabel = new wxStaticText( m_specifiedValues, wxID_ANY, _("Text width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXlabel->Wrap( -1 ); fgSizer1->Add( m_SizeXlabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - + m_SizeXCtrl = new wxTextCtrl( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXCtrl->SetMinSize( wxSize( 120,-1 ) ); - + fgSizer1->Add( m_SizeXCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_SizeXunit = new wxStaticText( m_specifiedValues, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXunit->Wrap( -1 ); fgSizer1->Add( m_SizeXunit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - - + + fgSizer1->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 20 ); - + m_Italic = new wxCheckBox( m_specifiedValues, wxID_ANY, _("Italic"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); fgSizer1->Add( m_Italic, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_SizeYlabel = new wxStaticText( m_specifiedValues, wxID_ANY, _("Text height:"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYlabel->Wrap( -1 ); fgSizer1->Add( m_SizeYlabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_SizeYCtrl = new wxTextCtrl( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_SizeYCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_SizeYunit = new wxStaticText( m_specifiedValues, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYunit->Wrap( -1 ); fgSizer1->Add( m_SizeYunit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - - + + fgSizer1->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 20 ); - + m_keepUpright = new wxCheckBox( m_specifiedValues, wxID_ANY, _("Keep upright"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); - m_keepUpright->SetValue(true); + m_keepUpright->SetValue(true); fgSizer1->Add( m_keepUpright, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - + m_ThicknessLabel = new wxStaticText( m_specifiedValues, wxID_ANY, _("Text thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThicknessLabel->Wrap( -1 ); fgSizer1->Add( m_ThicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - + m_ThicknessCtrl = new wxTextCtrl( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_ThicknessCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_ThicknessUnit = new wxStaticText( m_specifiedValues, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThicknessUnit->Wrap( -1 ); fgSizer1->Add( m_ThicknessUnit, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - - + + bSizer2->Add( fgSizer1, 1, wxEXPAND|wxTOP, 2 ); - - + + m_specifiedValues->SetSizer( bSizer2 ); m_specifiedValues->Layout(); bSizer2->Fit( m_specifiedValues ); sbAction->Add( m_specifiedValues, 1, wxEXPAND|wxBOTTOM|wxLEFT, 15 ); - + m_setToLayerDefaults = new wxRadioButton( sbAction->GetStaticBox(), ID_ALL_TRACKS_VIAS, _("Set to layer default values:"), wxDefaultPosition, wxDefaultSize, 0 ); sbAction->Add( m_setToLayerDefaults, 0, wxTOP|wxBOTTOM, 5 ); - + m_grid = new wxGrid( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE ); - + // Grid m_grid->CreateGrid( 6, 7 ); m_grid->EnableEditing( false ); m_grid->EnableGridLines( true ); m_grid->EnableDragGridSize( false ); m_grid->SetMargins( 0, 0 ); - + // Columns m_grid->SetColSize( 0, 120 ); m_grid->SetColSize( 1, 110 ); @@ -242,41 +242,41 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_ m_grid->EnableDragColMove( false ); m_grid->EnableDragColSize( false ); m_grid->SetColLabelSize( 0 ); - m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_grid->EnableDragRowSize( false ); m_grid->SetRowLabelSize( 0 ); - m_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_grid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_grid->SetDefaultCellFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE ); + m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); sbAction->Add( m_grid, 0, wxEXPAND|wxLEFT, 15 ); - - + + sbAction->Add( 0, 0, 0, wxEXPAND|wxBOTTOM, 5 ); - - + + bMainSizer->Add( sbAction, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - + bMainSizer->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 5 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); bMainSizer->Fit( this ); - + // Connect Events this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::OnUpdateUI ) ); m_layerFilter->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::OnLayerFilterSelect ), NULL, this ); @@ -293,5 +293,5 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::~DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS m_referenceFilter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::OnReferenceFilterText ), NULL, this ); m_footprintFilter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::OnFootprintFilterText ), NULL, this ); m_grid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::OnSizeNetclassGrid ), 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 b4d5e609b1..3a5df6e879 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_global_edit_text_and_graphics_base 1000 none + 1 dialog_global_edit_text_and_graphics @@ -52,41 +53,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdateUI @@ -105,7 +71,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -124,7 +89,7 @@ 0 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxALL 0 1 @@ -184,35 +149,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxALL 0 1 @@ -272,30 +213,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -360,30 +277,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -448,30 +341,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -536,30 +405,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -634,30 +479,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -676,7 +497,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxRIGHT @@ -755,30 +575,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -844,32 +640,7 @@ - OnLayerFilterSelect - - - - - - - - - - - - - - - - - - - - - - - - @@ -884,7 +655,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -944,35 +715,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxLEFT + wxEXPAND|wxLEFT 0 1 @@ -1032,33 +779,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnReferenceFilterText - - - - @@ -1073,7 +794,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1133,30 +854,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1221,33 +918,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnFootprintFilterText - - - - @@ -1276,10 +947,9 @@ wxVERTICAL 1 none - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + wxBOTTOM|wxRIGHT|wxTOP 0 1 @@ -1339,30 +1009,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1420,29 +1066,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer2 @@ -1497,6 +1120,7 @@ 0 wxID_ANY Layer: + 0 0 @@ -1522,29 +1146,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1610,32 +1211,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1720,30 +1295,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1779,6 +1330,7 @@ 0 wxID_ANY Line thickness: + 0 0 @@ -1804,29 +1356,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1891,33 +1420,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1953,6 +1455,7 @@ 0 wxID_ANY unit + 0 0 @@ -1978,29 +1481,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2106,6 +1586,7 @@ 0 wxID_ANY Text width: + 0 0 @@ -2131,29 +1612,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2218,33 +1676,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2280,6 +1711,7 @@ 0 wxID_ANY unit + 0 0 @@ -2305,29 +1737,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2402,30 +1811,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -2461,6 +1846,7 @@ 0 wxID_ANY Text height: + 0 0 @@ -2486,29 +1872,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2573,33 +1936,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2635,6 +1971,7 @@ 0 wxID_ANY unit + 0 0 @@ -2660,29 +1997,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2757,30 +2071,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -2816,6 +2106,7 @@ 0 wxID_ANY Text thickness: + 0 0 @@ -2841,29 +2132,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2928,33 +2196,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2990,6 +2231,7 @@ 0 wxID_ANY unit + 0 0 @@ -3015,29 +2257,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3107,30 +2326,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -3156,13 +2351,13 @@ ,90,90,11,70,0 wxALIGN_LEFT - wxALIGN_CENTRE + wxALIGN_CENTER 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 7 120,110,110,110,110,60,80 @@ -3205,10 +2400,10 @@ 1 Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 6 1 @@ -3219,61 +2414,7 @@ wxBORDER_SIMPLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnSizeNetclassGrid - @@ -3304,14 +2445,6 @@ m_sdbSizerButtons protected - - - - - - - - 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 8b107691e2..b125260a2a 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE_H__ -#define __DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE_H__ +#pragma once #include #include @@ -42,7 +41,7 @@ class PCB_LAYER_BOX_SELECTOR; class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE : public DIALOG_SHIM { private: - + protected: wxCheckBox* m_references; wxCheckBox* m_boardText; @@ -80,20 +79,19 @@ class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnLayerFilterSelect( wxCommandEvent& event ) { event.Skip(); } virtual void OnReferenceFilterText( wxCommandEvent& event ) { event.Skip(); } virtual void OnFootprintFilterText( wxCommandEvent& event ) { event.Skip(); } virtual void OnSizeNetclassGrid( wxSizeEvent& event ) { event.Skip(); } - - + + 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( -1,-1 ), 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(); - + }; -#endif //__DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE_H__