From b29ee85b4ab60daf5efa53b96543803bbfe0b2df Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 9 Jul 2024 14:01:17 +0200 Subject: [PATCH] DIALOG_ZONE_MANAGER_BASE: update code to last wxFormbuilder version. - remove specific windows IDs (use wxID_ANY everywhere) to avoid any conflict - add tool-tips - update also PANEL_ZONE_PROPERTIES_BASE - should not create any actual change. --- pcbnew/zone_manager/dialog_zone_manager.cpp | 14 +- pcbnew/zone_manager/dialog_zone_manager.h | 4 +- .../zone_manager/dialog_zone_manager_base.cpp | 15 +- .../zone_manager/dialog_zone_manager_base.fbp | 18 +- .../zone_manager/dialog_zone_manager_base.h | 12 +- pcbnew/zone_manager/pane_zone_viewer.cpp | 2 +- .../panel_zone_properties_base.cpp | 20 +- .../panel_zone_properties_base.fbp | 368 +++++++++--------- .../zone_manager/panel_zone_properties_base.h | 12 +- 9 files changed, 226 insertions(+), 239 deletions(-) diff --git a/pcbnew/zone_manager/dialog_zone_manager.cpp b/pcbnew/zone_manager/dialog_zone_manager.cpp index 03bc6bb1ac..88915431e4 100644 --- a/pcbnew/zone_manager/dialog_zone_manager.cpp +++ b/pcbnew/zone_manager/dialog_zone_manager.cpp @@ -79,7 +79,7 @@ DIALOG_ZONE_MANAGER::DIALOG_ZONE_MANAGER( PCB_BASE_FRAME* aParent, ZONE_SETTINGS m_sizerTop->Add( m_zoneViewer, 1, wxBOTTOM | wxLEFT | wxEXPAND, 10 ); m_checkRepour->SetValue( ZONE_MANAGER_PREFERENCE::GetRepourOnClose() ); - m_zoneViewer->SetId( ZONE_VIEWER ); + //m_zoneViewer->SetId( ZONE_VIEWER ); for( const auto& [k, v] : MODEL_ZONES_OVERVIEW_TABLE::GetColumnNames() ) { @@ -97,11 +97,10 @@ DIALOG_ZONE_MANAGER::DIALOG_ZONE_MANAGER( PCB_BASE_FRAME* aParent, ZONE_SETTINGS m_viewZonesOverview->EnableDragSource( wxDF_UNICODETEXT ); m_viewZonesOverview->EnableDropTarget( wxDF_UNICODETEXT ); - Bind( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, &DIALOG_ZONE_MANAGER::OnBeginDrag, this, - VIEW_ZONE_TABLE ); - Bind( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, &DIALOG_ZONE_MANAGER::OnDropPossible, this, - VIEW_ZONE_TABLE ); - Bind( wxEVT_DATAVIEW_ITEM_DROP, &DIALOG_ZONE_MANAGER::OnDrop, this, VIEW_ZONE_TABLE ); + int id = m_viewZonesOverview->GetId(); + Bind( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, &DIALOG_ZONE_MANAGER::OnBeginDrag, this, id ); + Bind( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, &DIALOG_ZONE_MANAGER::OnDropPossible, this, id ); + Bind( wxEVT_DATAVIEW_ITEM_DROP, &DIALOG_ZONE_MANAGER::OnDrop, this, id ); #endif // wxUSE_DRAG_AND_DROP Bind( wxEVT_BUTTON, &DIALOG_ZONE_MANAGER::OnOk, this, wxID_OK ); @@ -114,13 +113,14 @@ DIALOG_ZONE_MANAGER::DIALOG_ZONE_MANAGER( PCB_BASE_FRAME* aParent, ZONE_SETTINGS { Layout(); }, - ZONE_VIEWER ); + m_zoneViewer->GetId() ); if( m_modelZoneOverviewTable->GetCount() ) SelectZoneTableItem( m_modelZoneOverviewTable->GetItem( 0 ) ); Layout(); m_MainBoxSizer->Fit( this ); + finishDialogSettings(); //NOTE - Works on Windows and MacOS , need further handling in IDLE on Ubuntu FitCanvasToScreen(); diff --git a/pcbnew/zone_manager/dialog_zone_manager.h b/pcbnew/zone_manager/dialog_zone_manager.h index 7e7bc7da1e..d57c0ef33b 100644 --- a/pcbnew/zone_manager/dialog_zone_manager.h +++ b/pcbnew/zone_manager/dialog_zone_manager.h @@ -58,10 +58,10 @@ enum class ZONE_INDEX_MOVEMENT; class DIALOG_ZONE_MANAGER : public DIALOG_ZONE_MANAGER_BASE { - enum + /*enum { ZONE_VIEWER = ID_DIALOG_COPPER_ZONE_BASE + 10, - }; + };*/ public: DIALOG_ZONE_MANAGER( PCB_BASE_FRAME* aParent, ZONE_SETTINGS* aZoneInfo ); diff --git a/pcbnew/zone_manager/dialog_zone_manager_base.cpp b/pcbnew/zone_manager/dialog_zone_manager_base.cpp index f4f2ec0f75..214daba065 100644 --- a/pcbnew/zone_manager/dialog_zone_manager_base.cpp +++ b/pcbnew/zone_manager/dialog_zone_manager_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -35,18 +35,18 @@ DIALOG_ZONE_MANAGER_BASE::DIALOG_ZONE_MANAGER_BASE( wxWindow* parent, wxWindowID searchSizer->Add( 10, 0, 0, wxEXPAND, 5 ); - m_checkName = new wxCheckBox( this, CHECK_NAME, _("Name"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkName = new wxCheckBox( this, wxID_ANY, _("Name"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkName->SetValue(true); searchSizer->Add( m_checkName, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_checkNet = new wxCheckBox( this, CHECK_NET, _("Net"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkNet = new wxCheckBox( this, wxID_ANY, _("Net"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkNet->SetValue(true); searchSizer->Add( m_checkNet, 0, wxALIGN_CENTER_VERTICAL, 5 ); leftColumn->Add( searchSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 3 ); - m_viewZonesOverview = new wxDataViewCtrl( this, VIEW_ZONE_TABLE, wxDefaultPosition, wxSize( -1,240 ), wxDV_HORIZ_RULES|wxDV_SINGLE|wxDV_VERT_RULES ); + m_viewZonesOverview = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition, wxSize( -1,240 ), wxDV_HORIZ_RULES|wxDV_SINGLE|wxDV_VERT_RULES ); m_viewZonesOverview->SetMinSize( wxSize( -1,240 ) ); leftColumn->Add( m_viewZonesOverview, 1, wxEXPAND, 0 ); @@ -80,12 +80,16 @@ DIALOG_ZONE_MANAGER_BASE::DIALOG_ZONE_MANAGER_BASE( wxWindow* parent, wxWindowID m_sizerBottom = new wxBoxSizer( wxHORIZONTAL ); m_checkRepour = new wxCheckBox( this, wxID_ANY, _("Refill zones"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkRepour->SetToolTip( _("Refill zones after changes made on board") ); + m_sizerBottom->Add( m_checkRepour, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 ); m_sizerBottom->Add( 25, 0, 1, wxEXPAND, 5 ); - m_updateDisplayedZones = new wxButton( this, wxID_ANY, _("Update displayed zones"), wxDefaultPosition, wxDefaultSize, 0 ); + m_updateDisplayedZones = new wxButton( this, wxID_ANY, _("Update Displayed Zones"), wxDefaultPosition, wxDefaultSize, 0 ); + m_updateDisplayedZones->SetToolTip( _("Update filled areas shown in dialog, according to the new current settings") ); + m_sizerBottom->Add( m_updateDisplayedZones, 0, wxALL, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); @@ -103,7 +107,6 @@ DIALOG_ZONE_MANAGER_BASE::DIALOG_ZONE_MANAGER_BASE( wxWindow* parent, wxWindowID this->SetSizer( m_MainBoxSizer ); this->Layout(); - m_MainBoxSizer->Fit( this ); // Connect Events this->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_ZONE_MANAGER_BASE::onDialogResize ) ); diff --git a/pcbnew/zone_manager/dialog_zone_manager_base.fbp b/pcbnew/zone_manager/dialog_zone_manager_base.fbp index efa89d62c6..0ab7d367c3 100644 --- a/pcbnew/zone_manager/dialog_zone_manager_base.fbp +++ b/pcbnew/zone_manager/dialog_zone_manager_base.fbp @@ -14,7 +14,7 @@ res UTF-8 dialog_zone_manager_base - 1000 + 6000 1 1 UI @@ -45,12 +45,12 @@ 0 - ID_DIALOG_COPPER_ZONE_BASE + wxID_ANY -1,-1 DIALOG_ZONE_MANAGER_BASE - -1,-1 + 556,369 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Zone Manager @@ -205,7 +205,7 @@ 0 0 - CHECK_NAME + wxID_ANY Name 0 @@ -270,7 +270,7 @@ 0 0 - CHECK_NET + wxID_ANY Net 0 @@ -317,7 +317,7 @@ 0 - VIEW_ZONE_TABLE + wxID_ANY -1,240 m_viewZonesOverview @@ -576,7 +576,7 @@ ; ; forward_declare 0 - + Refill zones after changes made on board wxFILTER_NONE wxDefaultValidator @@ -636,7 +636,7 @@ 0 0 wxID_ANY - Update displayed zones + Update Displayed Zones 0 @@ -661,7 +661,7 @@ ; ; forward_declare 0 - + Update filled areas shown in dialog, according to the new current settings wxFILTER_NONE wxDefaultValidator diff --git a/pcbnew/zone_manager/dialog_zone_manager_base.h b/pcbnew/zone_manager/dialog_zone_manager_base.h index 85695687d2..113598e717 100644 --- a/pcbnew/zone_manager/dialog_zone_manager_base.h +++ b/pcbnew/zone_manager/dialog_zone_manager_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -39,14 +39,6 @@ class DIALOG_ZONE_MANAGER_BASE : public DIALOG_SHIM private: protected: - enum - { - ID_DIALOG_COPPER_ZONE_BASE = 1000, - CHECK_NAME, - CHECK_NET, - VIEW_ZONE_TABLE, - }; - wxBoxSizer* m_MainBoxSizer; wxBoxSizer* m_sizerTop; wxSearchCtrl* m_filterCtrl; @@ -82,7 +74,7 @@ class DIALOG_ZONE_MANAGER_BASE : public DIALOG_SHIM public: - DIALOG_ZONE_MANAGER_BASE( wxWindow* parent, wxWindowID id = ID_DIALOG_COPPER_ZONE_BASE, const wxString& title = _("Zone Manager"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_ZONE_MANAGER_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Zone Manager"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 556,369 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_ZONE_MANAGER_BASE(); diff --git a/pcbnew/zone_manager/pane_zone_viewer.cpp b/pcbnew/zone_manager/pane_zone_viewer.cpp index 9e5d7d5caf..3b34e9fe11 100644 --- a/pcbnew/zone_manager/pane_zone_viewer.cpp +++ b/pcbnew/zone_manager/pane_zone_viewer.cpp @@ -112,7 +112,7 @@ public: }; PANE_ZONE_VIEWER::PANE_ZONE_VIEWER( wxWindow* aParent, PCB_BASE_FRAME* aPcbFrame ) : - wxNotebook( aParent, -1, wxDefaultPosition, wxDefaultSize ), m_pcbFrame( aPcbFrame ) + wxNotebook( aParent, wxID_ANY, wxDefaultPosition, wxDefaultSize ), m_pcbFrame( aPcbFrame ) { Bind( wxEVT_BOOKCTRL_PAGE_CHANGED, &PANE_ZONE_VIEWER::OnNotebook, this ); diff --git a/pcbnew/zone_manager/panel_zone_properties_base.cpp b/pcbnew/zone_manager/panel_zone_properties_base.cpp index 97da354a4c..018f2228d5 100644 --- a/pcbnew/zone_manager/panel_zone_properties_base.cpp +++ b/pcbnew/zone_manager/panel_zone_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! @@ -32,11 +32,11 @@ PANEL_ZONE_PROPERTIES_BASE::PANEL_ZONE_PROPERTIES_BASE( wxWindow* parent, wxWind fgSizer1->Add( m_zoneNameLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - m_tcZoneName = new wxTextCtrl( sbGeneral->GetStaticBox(), EDIT_ZONE_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_tcZoneName, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + m_tcZoneName = new wxTextCtrl( sbGeneral->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_tcZoneName, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - sbGeneral->Add( fgSizer1, 1, wxEXPAND|wxBOTTOM, 5 ); + sbGeneral->Add( fgSizer1, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); bLeftColumn->Add( sbGeneral, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); @@ -66,7 +66,7 @@ PANEL_ZONE_PROPERTIES_BASE::PANEL_ZONE_PROPERTIES_BASE( wxWindow* parent, wxWind m_stBorderHatchPitchText->Wrap( -1 ); gbSizer1->Add( m_stBorderHatchPitchText, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - m_outlineHatchPitchCtrl = new wxTextCtrl( m_ExportableSetupSizer->GetStaticBox(), ID_M_CORNERSMOOTHINGCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_outlineHatchPitchCtrl = new wxTextCtrl( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); gbSizer1->Add( m_outlineHatchPitchCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_outlineHatchUnits = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -82,7 +82,7 @@ PANEL_ZONE_PROPERTIES_BASE::PANEL_ZONE_PROPERTIES_BASE( wxWindow* parent, wxWind wxString m_cornerSmoothingChoiceChoices[] = { _("None"), _("Chamfer"), _("Fillet") }; int m_cornerSmoothingChoiceNChoices = sizeof( m_cornerSmoothingChoiceChoices ) / sizeof( wxString ); - m_cornerSmoothingChoice = new wxChoice( m_ExportableSetupSizer->GetStaticBox(), ID_CORNER_SMOOTHING, wxDefaultPosition, wxDefaultSize, m_cornerSmoothingChoiceNChoices, m_cornerSmoothingChoiceChoices, 0 ); + m_cornerSmoothingChoice = new wxChoice( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cornerSmoothingChoiceNChoices, m_cornerSmoothingChoiceChoices, 0 ); m_cornerSmoothingChoice->SetSelection( 1 ); gbSizer1->Add( m_cornerSmoothingChoice, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); @@ -90,7 +90,7 @@ PANEL_ZONE_PROPERTIES_BASE::PANEL_ZONE_PROPERTIES_BASE( wxWindow* parent, wxWind m_cornerRadiusLabel->Wrap( -1 ); gbSizer1->Add( m_cornerRadiusLabel, wxGBPosition( 5, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - m_cornerRadiusCtrl = new wxTextCtrl( m_ExportableSetupSizer->GetStaticBox(), ID_M_CORNERSMOOTHINGCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_cornerRadiusCtrl = new wxTextCtrl( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); gbSizer1->Add( m_cornerRadiusCtrl, wxGBPosition( 5, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_cornerRadiusUnits = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -156,7 +156,7 @@ PANEL_ZONE_PROPERTIES_BASE::PANEL_ZONE_PROPERTIES_BASE( wxWindow* parent, wxWind wxString m_PadInZoneOptChoices[] = { _("Solid"), _("Thermal reliefs"), _("Reliefs for PTH"), _("None") }; int m_PadInZoneOptNChoices = sizeof( m_PadInZoneOptChoices ) / sizeof( wxString ); - m_PadInZoneOpt = new wxChoice( sbSizer5->GetStaticBox(), ID_M_PADINZONEOPT, wxDefaultPosition, wxDefaultSize, m_PadInZoneOptNChoices, m_PadInZoneOptChoices, 0 ); + m_PadInZoneOpt = new wxChoice( sbSizer5->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PadInZoneOptNChoices, m_PadInZoneOptChoices, 0 ); m_PadInZoneOpt->SetSelection( 0 ); gbSizerSettings->Add( m_PadInZoneOpt, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); @@ -166,7 +166,7 @@ PANEL_ZONE_PROPERTIES_BASE::PANEL_ZONE_PROPERTIES_BASE( wxWindow* parent, wxWind gbSizerSettings->Add( m_antipadLabel, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 ); - m_antipadCtrl = new wxTextCtrl( sbSizer5->GetStaticBox(), wxID_ANTIPAD_SIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_antipadCtrl = new wxTextCtrl( sbSizer5->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_antipadCtrl->SetToolTip( _("Clearance between pads in the same net and filled areas.") ); gbSizerSettings->Add( m_antipadCtrl, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -179,7 +179,7 @@ PANEL_ZONE_PROPERTIES_BASE::PANEL_ZONE_PROPERTIES_BASE( wxWindow* parent, wxWind m_spokeWidthLabel->Wrap( -1 ); gbSizerSettings->Add( m_spokeWidthLabel, wxGBPosition( 5, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 ); - m_spokeWidthCtrl = new wxTextCtrl( sbSizer5->GetStaticBox(), wxID_COPPER_BRIDGE_VALUE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_spokeWidthCtrl = new wxTextCtrl( sbSizer5->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_spokeWidthCtrl->SetToolTip( _("Width of copper in thermal reliefs.") ); gbSizerSettings->Add( m_spokeWidthCtrl, wxGBPosition( 5, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALL, 5 ); diff --git a/pcbnew/zone_manager/panel_zone_properties_base.fbp b/pcbnew/zone_manager/panel_zone_properties_base.fbp index be18b4a85f..374e1c715c 100644 --- a/pcbnew/zone_manager/panel_zone_properties_base.fbp +++ b/pcbnew/zone_manager/panel_zone_properties_base.fbp @@ -1,34 +1,36 @@ - + - C++ - 1 - source_name - 0 - 0 + + 1 + connect + none + + + 0 + 1 res UTF-8 - connect panel_zone_properties_base - 1000 - none - - + 6000 1 + 1 + UI panel_zone_properties_base - . - + 0 + source_name + 1 + 0 + source_name + + + 1 1 - 1 - 1 - 1 - UI - 0 - 1 0 + 0 0 wxAUI_MGR_DEFAULT @@ -82,7 +84,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxEXPAND|wxTOP|wxBOTTOM 1 2 @@ -105,10 +107,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -160,17 +162,17 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -190,11 +192,11 @@ 0 0 - EDIT_ZONE_NAME + wxID_ANY 0 - + 0 0 @@ -267,10 +269,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -335,10 +337,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -400,10 +402,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -468,10 +470,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -533,10 +535,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -556,7 +558,7 @@ 0 0 - ID_M_CORNERSMOOTHINGCTRL + wxID_ANY 0 @@ -601,10 +603,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -666,10 +668,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -728,10 +730,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -793,10 +795,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -817,7 +819,7 @@ 0 0 - ID_CORNER_SMOOTHING + wxID_ANY 0 @@ -861,10 +863,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -926,10 +928,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -949,7 +951,7 @@ 0 0 - ID_M_CORNERSMOOTHINGCTRL + wxID_ANY 0 @@ -994,10 +996,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1101,10 +1103,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1166,10 +1168,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1234,10 +1236,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1299,10 +1301,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1364,10 +1366,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1432,10 +1434,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1497,10 +1499,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1559,10 +1561,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1624,10 +1626,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1648,7 +1650,7 @@ 0 0 - ID_M_PADINZONEOPT + wxID_ANY 0 @@ -1692,10 +1694,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1757,10 +1759,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1780,7 +1782,7 @@ 0 0 - wxID_ANTIPAD_SIZE + wxID_ANY 0 @@ -1825,10 +1827,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1890,10 +1892,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1955,10 +1957,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1978,7 +1980,7 @@ 0 0 - wxID_COPPER_BRIDGE_VALUE + wxID_ANY 0 @@ -2023,10 +2025,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2121,10 +2123,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2186,10 +2188,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2255,10 +2257,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2320,10 +2322,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2347,7 +2349,7 @@ 0 - + 0 0 @@ -2388,10 +2390,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2453,10 +2455,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2518,10 +2520,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2545,7 +2547,7 @@ 0 - + 0 0 @@ -2586,10 +2588,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2651,10 +2653,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2716,10 +2718,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2743,7 +2745,7 @@ 0 - + 0 0 @@ -2784,10 +2786,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2849,10 +2851,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2914,10 +2916,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2980,10 +2982,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3045,10 +3047,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3113,10 +3115,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3175,10 +3177,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3240,10 +3242,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3309,10 +3311,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3374,10 +3376,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3401,7 +3403,7 @@ 0 - + 0 0 @@ -3442,10 +3444,10 @@ 1 1 1 - + 0 - - + 0 + 0 diff --git a/pcbnew/zone_manager/panel_zone_properties_base.h b/pcbnew/zone_manager/panel_zone_properties_base.h index 16c2b4005b..2550e289ec 100644 --- a/pcbnew/zone_manager/panel_zone_properties_base.h +++ b/pcbnew/zone_manager/panel_zone_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! @@ -36,16 +36,6 @@ class PANEL_ZONE_PROPERTIES_BASE : public wxPanel private: protected: - enum - { - EDIT_ZONE_NAME = 1000, - ID_M_CORNERSMOOTHINGCTRL, - ID_CORNER_SMOOTHING, - ID_M_PADINZONEOPT, - wxID_ANTIPAD_SIZE, - wxID_COPPER_BRIDGE_VALUE - }; - wxStaticText* m_zoneNameLabel; wxTextCtrl* m_tcZoneName; wxCheckBox* m_cbLocked;