realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve spacing, add colons to labels as necessary.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/20322
This commit is contained in:
Jeff Young 2025-07-28 13:56:16 +01:00
parent 51e244d7d4
commit 8de16736d3
3 changed files with 107 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
pcbnew/dialogs/dialog_shape_properties.cpp
View File

@ -755,8 +755,7 @@ private:
static void AddXYPointToSizer( EDA_DRAW_FRAME& aFrame, wxGridBagSizer& aSizer, int row, int col,
const wxString aName, bool aRelative,
std::vector<BOUND_CONTROL>& aBoundCtrls )
const wxString& aName, bool aRelative, std::vector<BOUND_CONTROL>& aBoundCtrls )
{
// Name
// X [Ctrl] mm
@ -770,14 +769,13 @@ static void AddXYPointToSizer( EDA_DRAW_FRAME& aFrame, wxGridBagSizer& aSizer, i
for( size_t coord = 0; coord < 2; ++coord )
{
wxStaticText* label =
new wxStaticText( parent, wxID_ANY, coord == 0 ? _( "X" ) : _( "Y" ) );
wxStaticText* label = new wxStaticText( parent, wxID_ANY, coord == 0 ? _( "X:" ) : _( "Y:" ) );
aSizer.Add( label, wxGBPosition( row, col ), wxDefaultSpan,
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT, 5 );
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT, col > 0 ? 20 : 5 );
wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, "" );
aSizer.Add( ctrl, wxGBPosition( row, col + 1 ), wxDefaultSpan,
wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 5 );
wxEXPAND | wxALIGN_CENTER_VERTICAL, 5 );
wxStaticText* units = new wxStaticText( parent, wxID_ANY, _( "mm" ) );
aSizer.Add( units, wxGBPosition( row, col + 2 ), wxDefaultSpan,
@ -786,11 +784,9 @@ static void AddXYPointToSizer( EDA_DRAW_FRAME& aFrame, wxGridBagSizer& aSizer, i
auto binder = std::make_unique<UNIT_BINDER>( &aFrame, label, ctrl, units );
if( aRelative )
binder->SetCoordType( coord == 0 ? ORIGIN_TRANSFORMS::REL_X_COORD
: ORIGIN_TRANSFORMS::REL_Y_COORD );
binder->SetCoordType( coord == 0 ? ORIGIN_TRANSFORMS::REL_X_COORD : ORIGIN_TRANSFORMS::REL_Y_COORD );
else
binder->SetCoordType( coord == 0 ? ORIGIN_TRANSFORMS::ABS_X_COORD
: ORIGIN_TRANSFORMS::ABS_Y_COORD );
binder->SetCoordType( coord == 0 ? ORIGIN_TRANSFORMS::ABS_X_COORD : ORIGIN_TRANSFORMS::ABS_Y_COORD );
aBoundCtrls.push_back( BOUND_CONTROL{ std::move( binder ), ctrl } );
row++;
@ -802,19 +798,19 @@ static void AddXYPointToSizer( EDA_DRAW_FRAME& aFrame, wxGridBagSizer& aSizer, i
void AddFieldToSizer( EDA_DRAW_FRAME& aFrame, wxGridBagSizer& aSizer, int row, int col,
const wxString aName, ORIGIN_TRANSFORMS::COORD_TYPES_T aCoordType,
const wxString& aName, ORIGIN_TRANSFORMS::COORD_TYPES_T aCoordType,
bool aIsAngle, std::vector<BOUND_CONTROL>& aBoundCtrls )
{
// Name [Ctrl] mm
// Name: [Ctrl] mm
wxWindow* parent = aSizer.GetContainingWindow();
wxStaticText* label = new wxStaticText( parent, wxID_ANY, aName );
wxStaticText* label = new wxStaticText( parent, wxID_ANY, aName + wxS( ":" ) );
aSizer.Add( label, wxGBPosition( row, col ), wxDefaultSpan,
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT, 5 );
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT, col > 0 ? 20 : 5 );
wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY );
aSizer.Add( ctrl, wxGBPosition( row, col + 1 ), wxDefaultSpan,
wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 5 );
wxEXPAND | wxALIGN_CENTER_VERTICAL, 5 );
wxStaticText* units = new wxStaticText( parent, wxID_ANY, _( "mm" ) );
aSizer.Add( units, wxGBPosition( row, col + 2 ), wxDefaultSpan,
@ -840,12 +836,12 @@ static std::map<SHAPE_T, int> s_lastTabForShape;
DIALOG_SHAPE_PROPERTIES::DIALOG_SHAPE_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, PCB_SHAPE* aShape ):
DIALOG_SHAPE_PROPERTIES_BASE( aParent ),
m_parent( aParent ),
m_item( aShape ),
m_thickness( aParent, m_thicknessLabel, m_thicknessCtrl, m_thicknessUnits ),
m_solderMaskMargin( aParent, m_solderMaskMarginLabel, m_solderMaskMarginCtrl, m_solderMaskMarginUnit ),
m_workingCopy( *m_item )
DIALOG_SHAPE_PROPERTIES_BASE( aParent ),
m_parent( aParent ),
m_item( aShape ),
m_thickness( aParent, m_thicknessLabel, m_thicknessCtrl, m_thicknessUnits ),
m_solderMaskMargin( aParent, m_solderMaskMarginLabel, m_solderMaskMarginCtrl, m_solderMaskMarginUnit ),
m_workingCopy( *m_item )
{
SetTitle( wxString::Format( GetTitle(), m_item->GetFriendlyName() ) );
m_hash_key = TO_UTF8( GetTitle() );
@ -857,19 +853,20 @@ DIALOG_SHAPE_PROPERTIES::DIALOG_SHAPE_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent,
// use. Constructing on-demand would work fine too.
std::set<int> shownPages;
const auto showPage = [&]( wxSizer& aMainSizer, bool aSelect = false )
{
// Get the parent of the sizer, which is the panel
wxWindow* page = aMainSizer.GetContainingWindow();
wxCHECK( page, /* void */ );
page->Layout();
const auto showPage =
[&]( wxSizer& aMainSizer, bool aSelect = false )
{
// Get the parent of the sizer, which is the panel
wxWindow* page = aMainSizer.GetContainingWindow();
wxCHECK( page, /* void */ );
page->Layout();
const int pageIdx = m_notebookShapeDefs->FindPage( page );
shownPages.insert( pageIdx );
const int pageIdx = m_notebookShapeDefs->FindPage( page );
shownPages.insert( pageIdx );
if( aSelect )
m_notebookShapeDefs->SetSelection( pageIdx );
};
if( aSelect )
m_notebookShapeDefs->SetSelection( pageIdx );
};
switch( m_item->GetShape() )
{

30
pcbnew/dialogs/dialog_shape_properties_base.cpp
View File

@ -23,7 +23,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer18;
bSizer18 = new wxBoxSizer( wxVERTICAL );
m_gbsRectangleByCorners = new wxGridBagSizer( 0, 0 );
m_gbsRectangleByCorners = new wxGridBagSizer( 4, 5 );
m_gbsRectangleByCorners->SetFlexibleDirection( wxBOTH );
m_gbsRectangleByCorners->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -39,7 +39,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer19;
bSizer19 = new wxBoxSizer( wxVERTICAL );
m_gbsRectangleByCornerSize = new wxGridBagSizer( 0, 0 );
m_gbsRectangleByCornerSize = new wxGridBagSizer( 4, 5 );
m_gbsRectangleByCornerSize->SetFlexibleDirection( wxBOTH );
m_gbsRectangleByCornerSize->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -55,7 +55,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer20;
bSizer20 = new wxBoxSizer( wxVERTICAL );
m_gbsRectangleByCenterSize = new wxGridBagSizer( 0, 0 );
m_gbsRectangleByCenterSize = new wxGridBagSizer( 4, 5 );
m_gbsRectangleByCenterSize->SetFlexibleDirection( wxBOTH );
m_gbsRectangleByCenterSize->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -71,7 +71,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer6;
bSizer6 = new wxBoxSizer( wxVERTICAL );
m_gbsLineByEnds = new wxGridBagSizer( 0, 0 );
m_gbsLineByEnds = new wxGridBagSizer( 4, 5 );
m_gbsLineByEnds->SetFlexibleDirection( wxBOTH );
m_gbsLineByEnds->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -87,7 +87,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer7;
bSizer7 = new wxBoxSizer( wxVERTICAL );
m_gbsLineByLengthAngle = new wxGridBagSizer( 0, 0 );
m_gbsLineByLengthAngle = new wxGridBagSizer( 4, 5 );
m_gbsLineByLengthAngle->SetFlexibleDirection( wxBOTH );
m_gbsLineByLengthAngle->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -103,7 +103,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer71;
bSizer71 = new wxBoxSizer( wxVERTICAL );
m_gbsLineByStartMid = new wxGridBagSizer( 0, 0 );
m_gbsLineByStartMid = new wxGridBagSizer( 4, 5 );
m_gbsLineByStartMid->SetFlexibleDirection( wxBOTH );
m_gbsLineByStartMid->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -119,7 +119,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer8;
bSizer8 = new wxBoxSizer( wxVERTICAL );
m_gbsArcByCSA = new wxGridBagSizer( 0, 0 );
m_gbsArcByCSA = new wxGridBagSizer( 4, 5 );
m_gbsArcByCSA->SetFlexibleDirection( wxBOTH );
m_gbsArcByCSA->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -135,7 +135,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer9;
bSizer9 = new wxBoxSizer( wxVERTICAL );
m_gbsArcBySME = new wxGridBagSizer( 0, 0 );
m_gbsArcBySME = new wxGridBagSizer( 4, 5 );
m_gbsArcBySME->SetFlexibleDirection( wxBOTH );
m_gbsArcBySME->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -151,7 +151,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer10;
bSizer10 = new wxBoxSizer( wxVERTICAL );
m_gbsCircleCenterRadius = new wxGridBagSizer( 0, 0 );
m_gbsCircleCenterRadius = new wxGridBagSizer( 4, 5 );
m_gbsCircleCenterRadius->SetFlexibleDirection( wxBOTH );
m_gbsCircleCenterRadius->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -167,7 +167,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer11;
bSizer11 = new wxBoxSizer( wxVERTICAL );
m_gbsCircleCenterPoint = new wxGridBagSizer( 0, 0 );
m_gbsCircleCenterPoint = new wxGridBagSizer( 4, 5 );
m_gbsCircleCenterPoint->SetFlexibleDirection( wxBOTH );
m_gbsCircleCenterPoint->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -183,7 +183,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
wxBoxSizer* bSizer4;
bSizer4 = new wxBoxSizer( wxVERTICAL );
m_gbsBezier = new wxGridBagSizer( 0, 0 );
m_gbsBezier = new wxGridBagSizer( 4, 5 );
m_gbsBezier->SetFlexibleDirection( wxBOTH );
m_gbsBezier->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -274,14 +274,18 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx
m_upperSizer->Add( bSizer14, 1, wxEXPAND, 5 );
wxFlexGridSizer* fgSizer2;
fgSizer2 = new wxFlexGridSizer( 0, 4, 0, 0 );
fgSizer2->AddGrowableCol( 2 );
fgSizer2 = new wxFlexGridSizer( 0, 5, 0, 0 );
fgSizer2->AddGrowableCol( 1 );
fgSizer2->AddGrowableCol( 3 );
fgSizer2->SetFlexibleDirection( wxBOTH );
fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_hasSolderMask = new wxCheckBox( this, wxID_ANY, _("Solder mask"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer2->Add( m_hasSolderMask, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
fgSizer2->Add( 10, 0, 1, wxEXPAND, 5 );
m_solderMaskMarginLabel = new wxStaticText( this, wxID_ANY, _("Expansion:"), wxDefaultPosition, wxDefaultSize, 0 );
m_solderMaskMarginLabel->Wrap( -1 );
fgSizer2->Add( m_solderMaskMarginLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );

112
pcbnew/dialogs/dialog_shape_properties_base.fbp
View File

@ -122,11 +122,11 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<object class="notebookpage" expanded="false">
<object class="notebookpage" expanded="true">
<property name="bitmap">Load From File; </property>
<property name="label">By Corners</property>
<property name="select">0</property>
<object class="wxPanel" expanded="false">
<object class="wxPanel" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -178,7 +178,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer18</property>
<property name="orient">wxVERTICAL</property>
@ -192,22 +192,22 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsRectangleByCorners</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
</object>
</object>
<object class="notebookpage" expanded="false">
<object class="notebookpage" expanded="true">
<property name="bitmap"></property>
<property name="label">By Corner and Size</property>
<property name="select">0</property>
<object class="wxPanel" expanded="false">
<object class="wxPanel" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -259,7 +259,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer19</property>
<property name="orient">wxVERTICAL</property>
@ -273,22 +273,22 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsRectangleByCornerSize</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
</object>
</object>
<object class="notebookpage" expanded="false">
<object class="notebookpage" expanded="true">
<property name="bitmap"></property>
<property name="label">By Center and Size</property>
<property name="select">1</property>
<object class="wxPanel" expanded="false">
<object class="wxPanel" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -340,7 +340,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer20</property>
<property name="orient">wxVERTICAL</property>
@ -354,12 +354,12 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsRectangleByCenterSize</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
@ -435,22 +435,22 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsLineByEnds</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
</object>
</object>
<object class="notebookpage" expanded="false">
<object class="notebookpage" expanded="true">
<property name="bitmap"></property>
<property name="label">By Length and Angle</property>
<property name="select">0</property>
<object class="wxPanel" expanded="false">
<object class="wxPanel" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -502,7 +502,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer7</property>
<property name="orient">wxVERTICAL</property>
@ -516,12 +516,12 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsLineByLengthAngle</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
@ -597,22 +597,22 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsLineByStartMid</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
</object>
</object>
<object class="notebookpage" expanded="false">
<object class="notebookpage" expanded="true">
<property name="bitmap"></property>
<property name="label">By Center/Start/Angle</property>
<property name="select">0</property>
<object class="wxPanel" expanded="false">
<object class="wxPanel" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -664,7 +664,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer8</property>
<property name="orient">wxVERTICAL</property>
@ -678,22 +678,22 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsArcByCSA</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
</object>
</object>
<object class="notebookpage" expanded="false">
<object class="notebookpage" expanded="true">
<property name="bitmap"></property>
<property name="label">By Start/Mid/End</property>
<property name="select">0</property>
<object class="wxPanel" expanded="false">
<object class="wxPanel" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -745,7 +745,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer9</property>
<property name="orient">wxVERTICAL</property>
@ -759,22 +759,22 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsArcBySME</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
</object>
</object>
<object class="notebookpage" expanded="false">
<object class="notebookpage" expanded="true">
<property name="bitmap"></property>
<property name="label">By Center/Radius</property>
<property name="select">0</property>
<object class="wxPanel" expanded="false">
<object class="wxPanel" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -826,7 +826,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer10</property>
<property name="orient">wxVERTICAL</property>
@ -840,22 +840,22 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsCircleCenterRadius</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
</object>
</object>
<object class="notebookpage" expanded="false">
<object class="notebookpage" expanded="true">
<property name="bitmap"></property>
<property name="label">By Center/Point</property>
<property name="select">0</property>
<object class="wxPanel" expanded="false">
<object class="wxPanel" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -907,7 +907,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer11</property>
<property name="orient">wxVERTICAL</property>
@ -921,22 +921,22 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsCircleCenterPoint</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
</object>
</object>
<object class="notebookpage" expanded="false">
<object class="notebookpage" expanded="true">
<property name="bitmap"></property>
<property name="label">Bezier Control Points</property>
<property name="select">0</property>
<object class="wxPanel" expanded="false">
<object class="wxPanel" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -988,7 +988,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer4</property>
<property name="orient">wxVERTICAL</property>
@ -1002,12 +1002,12 @@
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
<property name="name">m_gbsBezier</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="vgap">0</property>
<property name="vgap">4</property>
</object>
</object>
</object>
@ -1977,9 +1977,9 @@
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxFlexGridSizer" expanded="true">
<property name="cols">4</property>
<property name="cols">5</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols">2</property>
<property name="growablecols">1,3</property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="minimum_size"></property>
@ -2054,6 +2054,16 @@
<event name="OnCheckBox">onTechLayersChanged</event>
</object>
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="spacer" expanded="true">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">10</property>
</object>
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>