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

Be more forgiving of large fonts in grids.

This commit is contained in:
Jeff Young 2019-02-07 21:48:41 +00:00
parent d751fecd8a
commit 076f07c683
17 changed files with 1596 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/widgets/wx_grid.cpp
View File

@ -23,6 +23,7 @@
#include <wx/tokenzr.h>
#include <wx/dc.h>
#include <wx/wx.h>
#include "wx_grid.h"
@ -43,6 +44,16 @@ WX_GRID::~WX_GRID()
}
void WX_GRID::SetColLabelSize( int aHeight )
{
// correct wxFormBuilder height for large fonts
wxFont guiFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
int minHeight = guiFont.GetPixelSize().y + 2 * MIN_GRIDCELL_MARGIN;
wxGrid::SetColLabelSize( std::max( aHeight, minHeight ) );
}
void WX_GRID::SetTable( wxGridTableBase* aTable, bool aTakeOwnership )
{
// wxGrid::SetTable() messes up the column widths from wxFormBuilder so we have to save
@ -54,8 +65,8 @@ void WX_GRID::SetTable( wxGridTableBase* aTable, bool aTakeOwnership )
formBuilderColWidths[ i ] = GetColSize( i );
wxGrid::SetTable( aTable );
// wxGrid::SetTable() may change the number of columns,
// so prevent out-of-bounds access to formBuildColWidths
// wxGrid::SetTable() may change the number of columns, so prevent out-of-bounds access
// to formBuilderColWidths
numberCols = std::min( numberCols, GetNumberCols() );
for( int i = 0; i < numberCols; ++i )

7
common/widgets/wx_grid.h
View File

@ -37,6 +37,13 @@ public:
~WX_GRID() override;
/**
* Hide wxGrid's SetColLabelSize() method with one which makes sure the size is tall
* enough for the system GUI font.
* @param height
*/
void SetColLabelSize( int aHeight );
/**
* Get a tokenized string containing the shown column indexes.
* Tokens are separated by spaces.

30
pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp
View File

@ -36,17 +36,17 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
m_itemsGrid->SetMargins( 0, 0 );
// Columns
m_itemsGrid->SetColSize( 0, 116 );
m_itemsGrid->SetColSize( 1, 53 );
m_itemsGrid->SetColSize( 2, 90 );
m_itemsGrid->SetColSize( 3, 90 );
m_itemsGrid->SetColSize( 4, 90 );
m_itemsGrid->SetColSize( 5, 53 );
m_itemsGrid->SetColSize( 6, 106 );
m_itemsGrid->SetColSize( 7, 90 );
m_itemsGrid->SetColSize( 8, 90 );
m_itemsGrid->SetColSize( 9, 90 );
m_itemsGrid->SetColSize( 10, 90 );
m_itemsGrid->SetColSize( 0, 124 );
m_itemsGrid->SetColSize( 1, 60 );
m_itemsGrid->SetColSize( 2, 110 );
m_itemsGrid->SetColSize( 3, 110 );
m_itemsGrid->SetColSize( 4, 110 );
m_itemsGrid->SetColSize( 5, 60 );
m_itemsGrid->SetColSize( 6, 110 );
m_itemsGrid->SetColSize( 7, 110 );
m_itemsGrid->SetColSize( 8, 110 );
m_itemsGrid->SetColSize( 9, 110 );
m_itemsGrid->SetColSize( 10, 110 );
m_itemsGrid->EnableDragColMove( false );
m_itemsGrid->EnableDragColSize( true );
m_itemsGrid->SetColLabelSize( 22 );
@ -65,7 +65,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
// Rows
m_itemsGrid->EnableDragRowSize( false );
m_itemsGrid->SetRowLabelSize( 80 );
m_itemsGrid->SetRowLabelSize( 100 );
m_itemsGrid->SetRowLabelValue( 0, _("Reference") );
m_itemsGrid->SetRowLabelValue( 1, _("Value") );
m_itemsGrid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
@ -75,8 +75,8 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
// Cell Defaults
m_itemsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
m_itemsGrid->SetMinSize( wxSize( 724,140 ) );
m_itemsGrid->SetMinSize( wxSize( 800,140 ) );
sbSizerTexts->Add( m_itemsGrid, 1, wxEXPAND|wxBOTTOM, 5 );
wxBoxSizer* bButtonSize;
@ -426,7 +426,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
m_modelsGrid->SetColSize( 1, 65 );
m_modelsGrid->EnableDragColMove( false );
m_modelsGrid->EnableDragColSize( false );
m_modelsGrid->SetColLabelSize( 22 );
m_modelsGrid->SetColLabelSize( 26 );
m_modelsGrid->SetColLabelValue( 0, _("3D Model(s)") );
m_modelsGrid->SetColLabelValue( 1, _("Preview") );
m_modelsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

1572
pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp
View File

File diff suppressed because it is too large Load Diff

30
pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp
View File

@ -36,20 +36,20 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
m_itemsGrid->SetMargins( 0, 0 );
// Columns
m_itemsGrid->SetColSize( 0, 116 );
m_itemsGrid->SetColSize( 1, 53 );
m_itemsGrid->SetColSize( 2, 96 );
m_itemsGrid->SetColSize( 3, 96 );
m_itemsGrid->SetColSize( 4, 96 );
m_itemsGrid->SetColSize( 5, 53 );
m_itemsGrid->SetColSize( 6, 106 );
m_itemsGrid->SetColSize( 7, 80 );
m_itemsGrid->SetColSize( 8, 48 );
m_itemsGrid->SetColSize( 9, 96 );
m_itemsGrid->SetColSize( 10, 96 );
m_itemsGrid->SetColSize( 0, 124 );
m_itemsGrid->SetColSize( 1, 60 );
m_itemsGrid->SetColSize( 2, 110 );
m_itemsGrid->SetColSize( 3, 110 );
m_itemsGrid->SetColSize( 4, 110 );
m_itemsGrid->SetColSize( 5, 60 );
m_itemsGrid->SetColSize( 6, 110 );
m_itemsGrid->SetColSize( 7, 110 );
m_itemsGrid->SetColSize( 8, 110 );
m_itemsGrid->SetColSize( 9, 110 );
m_itemsGrid->SetColSize( 10, 110 );
m_itemsGrid->EnableDragColMove( false );
m_itemsGrid->EnableDragColSize( true );
m_itemsGrid->SetColLabelSize( 22 );
m_itemsGrid->SetColLabelSize( 24 );
m_itemsGrid->SetColLabelValue( 0, _("Text Items") );
m_itemsGrid->SetColLabelValue( 1, _("Show") );
m_itemsGrid->SetColLabelValue( 2, _("Width") );
@ -65,7 +65,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
// Rows
m_itemsGrid->EnableDragRowSize( false );
m_itemsGrid->SetRowLabelSize( 80 );
m_itemsGrid->SetRowLabelSize( 100 );
m_itemsGrid->SetRowLabelValue( 0, _("Reference") );
m_itemsGrid->SetRowLabelValue( 1, _("Value") );
m_itemsGrid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
@ -75,8 +75,8 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
// Cell Defaults
m_itemsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
m_itemsGrid->SetMinSize( wxSize( 724,140 ) );
m_itemsGrid->SetMinSize( wxSize( 800,140 ) );
sbSizerTexts->Add( m_itemsGrid, 1, wxEXPAND|wxBOTTOM, 5 );
wxBoxSizer* bButtonSize;

8
pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp
View File

@ -216,11 +216,11 @@
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="col_label_size">22</property>
<property name="col_label_size">24</property>
<property name="col_label_values">&quot;Text Items&quot; &quot;Show&quot; &quot;Width&quot; &quot;Height&quot; &quot;Thickness&quot; &quot;Italic&quot; &quot;Layer&quot; &quot;Orientation&quot; &quot;Unconstrained&quot; &quot;X Offset&quot; &quot;Y Offset&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">11</property>
<property name="column_sizes">116,53,96,96,96,53,106,80,48,96,96</property>
<property name="column_sizes">124,60,110,110,110,60,110,110,110,110,110</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
@ -251,7 +251,7 @@
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">724,140</property>
<property name="minimum_size">800,140</property>
<property name="moveable">1</property>
<property name="name">m_itemsGrid</property>
<property name="pane_border">1</property>
@ -262,7 +262,7 @@
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="row_label_horiz_alignment">wxALIGN_LEFT</property>
<property name="row_label_size">80</property>
<property name="row_label_size">100</property>
<property name="row_label_values">&quot;Reference&quot; &quot;Value&quot;</property>
<property name="row_label_vert_alignment">wxALIGN_CENTER</property>
<property name="row_sizes"></property>

8
pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp
View File

@ -234,11 +234,11 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
// Columns
m_grid->SetColSize( 0, 120 );
m_grid->SetColSize( 1, 110 );
m_grid->SetColSize( 2, 95 );
m_grid->SetColSize( 3, 95 );
m_grid->SetColSize( 2, 110 );
m_grid->SetColSize( 3, 110 );
m_grid->SetColSize( 4, 110 );
m_grid->SetColSize( 5, 50 );
m_grid->SetColSize( 6, 75 );
m_grid->SetColSize( 5, 60 );
m_grid->SetColSize( 6, 80 );
m_grid->EnableDragColMove( false );
m_grid->EnableDragColSize( false );
m_grid->SetColLabelSize( 0 );

2
pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp
View File

@ -3164,7 +3164,7 @@
<property name="col_label_values"></property>
<property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="cols">7</property>
<property name="column_sizes">120,110,95,95,110,50,75</property>
<property name="column_sizes">120,110,110,110,110,60,80</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>

14
pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 2 2018)
// C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -126,12 +126,12 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE
m_netclassGrid->SetMargins( 0, 0 );
// Columns
m_netclassGrid->SetColSize( 0, 95 );
m_netclassGrid->SetColSize( 1, 95 );
m_netclassGrid->SetColSize( 2, 95 );
m_netclassGrid->SetColSize( 3, 95 );
m_netclassGrid->SetColSize( 4, 95 );
m_netclassGrid->SetColSize( 5, 95 );
m_netclassGrid->SetColSize( 0, 110 );
m_netclassGrid->SetColSize( 1, 110 );
m_netclassGrid->SetColSize( 2, 110 );
m_netclassGrid->SetColSize( 3, 110 );
m_netclassGrid->SetColSize( 4, 110 );
m_netclassGrid->SetColSize( 5, 110 );
m_netclassGrid->EnableDragColMove( false );
m_netclassGrid->EnableDragColSize( false );
m_netclassGrid->SetColLabelSize( 0 );

118
pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
<FileVersion major="1" minor="14" />
<FileVersion major="1" minor="13" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
@ -14,7 +14,6 @@
<property name="file">dialog_global_edit_tracks_and_vias_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="indent_with_spaces"></property>
<property name="internationalize">1</property>
<property name="name">dialog_global_edit_tracks_and_vias_base</property>
<property name="namespace"></property>
@ -55,20 +54,13 @@
<property name="window_style"></property>
<event name="OnActivate"></event>
<event name="OnActivateApp"></event>
<event name="OnAuiPaneActivated"></event>
<event name="OnAuiFindManager"></event>
<event name="OnAuiPaneButton"></event>
<event name="OnAuiPaneClose"></event>
<event name="OnAuiPaneMaximize"></event>
<event name="OnAuiPaneRestore"></event>
<event name="OnAuiRender"></event>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnClose"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -83,23 +75,17 @@
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMaximize"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnMove"></event>
<event name="OnMoveEnd"></event>
<event name="OnMoveStart"></event>
<event name="OnMoving"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnShow"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI">OnUpdateUI</event>
<object class="wxBoxSizer" expanded="1">
@ -198,14 +184,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -293,14 +272,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -421,14 +393,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -514,14 +479,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
@ -618,14 +576,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -713,14 +664,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnChoice">OnNetclassFilterSelect</event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -818,14 +762,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -914,14 +851,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCombobox">OnLayerFilterSelect</event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -1038,14 +968,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
@ -1142,14 +1065,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnChoice"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -1237,14 +1153,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnChoice"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -1333,14 +1242,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCombobox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@ -1432,14 +1334,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
@ -1496,7 +1391,7 @@
<property name="col_label_values"></property>
<property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="cols">6</property>
<property name="column_sizes">95,95,95,95,95,95</property>
<property name="column_sizes">110,110,110,110,110,110</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
@ -1551,14 +1446,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_DEFAULT|wxVSCROLL</property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnGridCellChange"></event>

2
pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 2 2018)
// C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!

22
pcbnew/dialogs/panel_setup_netclasses_base.cpp
View File

@ -33,18 +33,18 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
m_netclassGrid->SetMargins( 0, 0 );
// Columns
m_netclassGrid->SetColSize( 0, 120 );
m_netclassGrid->SetColSize( 1, 85 );
m_netclassGrid->SetColSize( 2, 85 );
m_netclassGrid->SetColSize( 3, 85 );
m_netclassGrid->SetColSize( 4, 85 );
m_netclassGrid->SetColSize( 5, 85 );
m_netclassGrid->SetColSize( 6, 85 );
m_netclassGrid->SetColSize( 7, 85 );
m_netclassGrid->SetColSize( 8, 85 );
m_netclassGrid->SetColSize( 0, 130 );
m_netclassGrid->SetColSize( 1, 96 );
m_netclassGrid->SetColSize( 2, 96 );
m_netclassGrid->SetColSize( 3, 96 );
m_netclassGrid->SetColSize( 4, 96 );
m_netclassGrid->SetColSize( 5, 96 );
m_netclassGrid->SetColSize( 6, 96 );
m_netclassGrid->SetColSize( 7, 96 );
m_netclassGrid->SetColSize( 8, 96 );
m_netclassGrid->EnableDragColMove( false );
m_netclassGrid->EnableDragColSize( true );
m_netclassGrid->SetColLabelSize( 22 );
m_netclassGrid->SetColLabelSize( 24 );
m_netclassGrid->SetColLabelValue( 0, _("Name") );
m_netclassGrid->SetColLabelValue( 1, _("Clearance") );
m_netclassGrid->SetColLabelValue( 2, _("Track Width") );
@ -208,7 +208,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
// Columns
m_membershipGrid->EnableDragColMove( false );
m_membershipGrid->EnableDragColSize( true );
m_membershipGrid->SetColLabelSize( 22 );
m_membershipGrid->SetColLabelSize( 24 );
m_membershipGrid->SetColLabelValue( 0, _("Net") );
m_membershipGrid->SetColLabelValue( 1, _("Net Class") );
m_membershipGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

6
pcbnew/dialogs/panel_setup_netclasses_base.fbp
View File

@ -103,11 +103,11 @@
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="col_label_size">22</property>
<property name="col_label_size">24</property>
<property name="col_label_values">&quot;Name&quot; &quot;Clearance&quot; &quot;Track Width&quot; &quot;Via Size&quot; &quot;Via Drill&quot; &quot;uVia Size&quot; &quot;uVia Drill&quot; &quot;dPair Width&quot; &quot;dPair Gap&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">9</property>
<property name="column_sizes">120,85,85,85,85,85,85,85,85</property>
<property name="column_sizes">130,96,96,96,96,96,96,96,96</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
@ -1163,7 +1163,7 @@
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="col_label_size">22</property>
<property name="col_label_size">24</property>
<property name="col_label_values">&quot;Net&quot; &quot;Net Class&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">2</property>

14
pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp
View File

@ -32,15 +32,15 @@ PANEL_SETUP_TEXT_AND_GRAPHICS_BASE::PANEL_SETUP_TEXT_AND_GRAPHICS_BASE( wxWindow
m_grid->SetMargins( 0, 0 );
// Columns
m_grid->SetColSize( 0, 130 );
m_grid->SetColSize( 1, 106 );
m_grid->SetColSize( 2, 106 );
m_grid->SetColSize( 3, 130 );
m_grid->SetColSize( 4, 70 );
m_grid->SetColSize( 5, 116 );
m_grid->SetColSize( 0, 140 );
m_grid->SetColSize( 1, 140 );
m_grid->SetColSize( 2, 140 );
m_grid->SetColSize( 3, 140 );
m_grid->SetColSize( 4, 80 );
m_grid->SetColSize( 5, 120 );
m_grid->EnableDragColMove( false );
m_grid->EnableDragColSize( true );
m_grid->SetColLabelSize( 22 );
m_grid->SetColLabelSize( 24 );
m_grid->SetColLabelValue( 0, _("Line Thickness") );
m_grid->SetColLabelValue( 1, _("Text Width") );
m_grid->SetColLabelValue( 2, _("Text Height") );

4
pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp
View File

@ -202,11 +202,11 @@
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>
<property name="col_label_size">22</property>
<property name="col_label_size">24</property>
<property name="col_label_values">&quot;Line Thickness&quot; &quot;Text Width&quot; &quot;Text Height&quot; &quot;Text Thickness&quot; &quot;Italic&quot; &quot;Keep Upright&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="cols">6</property>
<property name="column_sizes">130,106,106,130,70,116</property>
<property name="column_sizes">140,140,140,140,80,120</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>

16
pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
View File

@ -39,7 +39,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
m_trackWidthsGrid->SetColSize( 0, 125 );
m_trackWidthsGrid->EnableDragColMove( false );
m_trackWidthsGrid->EnableDragColSize( false );
m_trackWidthsGrid->SetColLabelSize( 22 );
m_trackWidthsGrid->SetColLabelSize( 24 );
m_trackWidthsGrid->SetColLabelValue( 0, _("Width") );
m_trackWidthsGrid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
@ -97,11 +97,11 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
m_viaSizesGrid->SetMargins( 0, 0 );
// Columns
m_viaSizesGrid->SetColSize( 0, 110 );
m_viaSizesGrid->SetColSize( 1, 110 );
m_viaSizesGrid->SetColSize( 0, 125 );
m_viaSizesGrid->SetColSize( 1, 125 );
m_viaSizesGrid->EnableDragColMove( false );
m_viaSizesGrid->EnableDragColSize( false );
m_viaSizesGrid->SetColLabelSize( 22 );
m_viaSizesGrid->SetColLabelSize( 24 );
m_viaSizesGrid->SetColLabelValue( 0, _("Size") );
m_viaSizesGrid->SetColLabelValue( 1, _("Drill") );
m_viaSizesGrid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
@ -160,12 +160,12 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
m_diffPairsGrid->SetMargins( 0, 0 );
// Columns
m_diffPairsGrid->SetColSize( 0, 110 );
m_diffPairsGrid->SetColSize( 1, 110 );
m_diffPairsGrid->SetColSize( 2, 110 );
m_diffPairsGrid->SetColSize( 0, 125 );
m_diffPairsGrid->SetColSize( 1, 125 );
m_diffPairsGrid->SetColSize( 2, 125 );
m_diffPairsGrid->EnableDragColMove( false );
m_diffPairsGrid->EnableDragColSize( true );
m_diffPairsGrid->SetColLabelSize( 22 );
m_diffPairsGrid->SetColLabelSize( 24 );
m_diffPairsGrid->SetColLabelValue( 0, _("Width") );
m_diffPairsGrid->SetColLabelValue( 1, _("Gap") );
m_diffPairsGrid->SetColLabelValue( 2, _("Via Gap") );

10
pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
View File

@ -215,7 +215,7 @@
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>
<property name="col_label_size">22</property>
<property name="col_label_size">24</property>
<property name="col_label_values">&quot;Width&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="cols">1</property>
@ -580,11 +580,11 @@
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>
<property name="col_label_size">22</property>
<property name="col_label_size">24</property>
<property name="col_label_values">&quot;Size&quot; &quot;Drill&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="cols">2</property>
<property name="column_sizes">110,110</property>
<property name="column_sizes">125,125</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
@ -945,11 +945,11 @@
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>
<property name="col_label_size">22</property>
<property name="col_label_size">24</property>
<property name="col_label_values">&quot;Width&quot; &quot;Gap&quot; &quot;Via Gap&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="cols">3</property>
<property name="column_sizes">110,110,110</property>
<property name="column_sizes">125,125,125</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>