haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separate edge.cuts and courtyards in ModEdit default values. 

Fixes: lp:1788876
* https://bugs.launchpad.net/kicad/+bug/1788876
This commit is contained in:
Jeff Young 2018-09-20 23:29:31 +01:00
parent 04534c83e0
commit 3e45483798
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcbnew/dialogs/panel_modedit_defaults.cpp
View File

@ -46,6 +46,7 @@ enum
ROW_SILK = 0,
ROW_COPPER,
ROW_EDGES,
ROW_COURTYARD,
ROW_OTHERS,
ROW_COUNT
@ -94,7 +95,7 @@ bool PANEL_MODEDIT_DEFAULTS::TransferDataToWindow()
{
SET_MILS_CELL( i, COL_LINE_THICKNESS, m_brdSettings.m_LineThickness[ i ] );
if( i == ROW_EDGES )
if( i == ROW_EDGES || i == ROW_COURTYARD )
{
DISABLE_CELL( i, COL_TEXT_WIDTH );
DISABLE_CELL( i, COL_TEXT_HEIGHT );
@ -168,7 +169,7 @@ bool PANEL_MODEDIT_DEFAULTS::TransferDataFromWindow()
{
m_brdSettings.m_LineThickness[ i ] = getGridValue( i, COL_LINE_THICKNESS );
if( i == ROW_EDGES ) // edges & courtyards only define line thickness
if( i == ROW_EDGES || i == ROW_COURTYARD )
continue;
m_brdSettings.m_TextSize[ i ] =

7
pcbnew/dialogs/panel_modedit_defaults_base.cpp
View File

@ -97,7 +97,7 @@ PANEL_MODEDIT_DEFAULTS_BASE::PANEL_MODEDIT_DEFAULTS_BASE( wxWindow* parent, wxWi
m_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
// Grid
m_grid->CreateGrid( 4, 5 );
m_grid->CreateGrid( 5, 5 );
m_grid->EnableEditing( true );
m_grid->EnableGridLines( true );
m_grid->EnableDragGridSize( false );
@ -124,8 +124,9 @@ PANEL_MODEDIT_DEFAULTS_BASE::PANEL_MODEDIT_DEFAULTS_BASE( wxWindow* parent, wxWi
m_grid->SetRowLabelSize( 125 );
m_grid->SetRowLabelValue( 0, _("Silk Layers") );
m_grid->SetRowLabelValue( 1, _("Copper Layers") );
m_grid->SetRowLabelValue( 2, _("Edges & Courtyards") );
m_grid->SetRowLabelValue( 3, _("Other Layers") );
m_grid->SetRowLabelValue( 2, _("Edge Cuts") );
m_grid->SetRowLabelValue( 3, _("Courtyards") );
m_grid->SetRowLabelValue( 4, _("Other Layers") );
m_grid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
// Label Appearance

4
pcbnew/dialogs/panel_modedit_defaults_base.fbp
View File

@ -1162,10 +1162,10 @@
<property name="resize">Resizable</property>
<property name="row_label_horiz_alignment">wxALIGN_LEFT</property>
<property name="row_label_size">125</property>
<property name="row_label_values">&quot;Silk Layers&quot; &quot;Copper Layers&quot; &quot;Edges &amp; Courtyards&quot; &quot;Other Layers&quot;</property>
<property name="row_label_values">&quot;Silk Layers&quot; &quot;Copper Layers&quot; &quot;Edge Cuts&quot; &quot;Courtyards&quot; &quot;Other Layers&quot;</property>
<property name="row_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="row_sizes"></property>
<property name="rows">4</property>
<property name="rows">5</property>
<property name="show">1</property>
<property name="size"></property>
<property name="subclass">WX_GRID; widgets/wx_grid.h; forward_declare</property>