From 076f07c6831a5c89b3a9b847b5451762311d70a5 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Thu, 7 Feb 2019 21:48:41 +0000 Subject: [PATCH] Be more forgiving of large fonts in grids. --- common/widgets/wx_grid.cpp | 15 +- common/widgets/wx_grid.h | 7 + ...og_edit_footprint_for_BoardEditor_base.cpp | 30 +- ...og_edit_footprint_for_BoardEditor_base.fbp | 1572 ++++++++++++++++- ...alog_edit_footprint_for_fp_editor_base.cpp | 30 +- ...alog_edit_footprint_for_fp_editor_base.fbp | 8 +- ...log_global_edit_text_and_graphics_base.cpp | 8 +- ...log_global_edit_text_and_graphics_base.fbp | 2 +- ...ialog_global_edit_tracks_and_vias_base.cpp | 14 +- ...ialog_global_edit_tracks_and_vias_base.fbp | 118 +- .../dialog_global_edit_tracks_and_vias_base.h | 2 +- .../dialogs/panel_setup_netclasses_base.cpp | 22 +- .../dialogs/panel_setup_netclasses_base.fbp | 6 +- .../panel_setup_text_and_graphics_base.cpp | 14 +- .../panel_setup_text_and_graphics_base.fbp | 4 +- .../panel_setup_tracks_and_vias_base.cpp | 16 +- .../panel_setup_tracks_and_vias_base.fbp | 10 +- 17 files changed, 1596 insertions(+), 282 deletions(-) diff --git a/common/widgets/wx_grid.cpp b/common/widgets/wx_grid.cpp index 998d68a201..13256480b3 100644 --- a/common/widgets/wx_grid.cpp +++ b/common/widgets/wx_grid.cpp @@ -23,6 +23,7 @@ #include #include +#include #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 ) diff --git a/common/widgets/wx_grid.h b/common/widgets/wx_grid.h index 3a67bf4a89..292381abf6 100644 --- a/common/widgets/wx_grid.h +++ b/common/widgets/wx_grid.h @@ -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. diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp index 9a616df6b5..0950d8bcf0 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp @@ -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 ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp index b77dc0652f..1156812729 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -53,7 +53,41 @@ + + + + + + + + + + + + + + + OnInitDlg + + + + + + + + + + + + + + + + + + + OnUpdateUI @@ -117,6 +151,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + General @@ -172,6 +231,29 @@ wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + m_PanelPropertiesBoxSizer @@ -189,6 +271,7 @@ wxVERTICAL 1 none + 5 wxEXPAND|wxBOTTOM @@ -215,12 +298,12 @@ wxALIGN_TOP 0 1 - wxALIGN_CENTER - 22 + wxALIGN_CENTRE + 24 "Text Items" "Show" "Width" "Height" "Thickness" "Italic" "Layer" "Orientation" "Keep Upright" "X Offset" "Y Offset" wxALIGN_CENTER 11 - 116,53,90,90,90,53,106,90,90,90,90 + 124,60,110,110,110,60,110,110,110,110,110 1 0 @@ -251,7 +334,7 @@ 0 - 724,140 + 800,140 1 m_itemsGrid 1 @@ -262,9 +345,9 @@ Resizable wxALIGN_LEFT - 80 + 100 "Reference" "Value" - wxALIGN_CENTER + wxALIGN_CENTRE 2 1 @@ -275,7 +358,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnGridSize + @@ -323,10 +460,9 @@ 0 0 + wxID_ANY Add Field - - 0 0 @@ -341,9 +477,8 @@ protected 1 - - Resizable + 1 @@ -358,6 +493,29 @@ OnAddField + + + + + + + + + + + + + + + + + + + + + + + @@ -406,10 +564,9 @@ 0 0 + wxID_ANY Delete Field - - 0 0 @@ -424,9 +581,8 @@ protected 1 - - Resizable + 1 @@ -441,6 +597,29 @@ OnDeleteField + + + + + + + + + + + + + + + + + + + + + + + @@ -524,7 +703,6 @@ 0 wxID_ANY Position X: - 0 0 @@ -550,6 +728,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -614,6 +815,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -649,7 +877,6 @@ 0 wxID_ANY unit - 0 0 @@ -675,6 +902,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -710,7 +960,6 @@ 0 wxID_ANY Position Y: - 0 0 @@ -736,6 +985,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -800,6 +1072,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -835,7 +1134,6 @@ 0 wxID_ANY unit - 0 0 @@ -861,6 +1159,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -887,6 +1208,7 @@ wxVERTICAL 1 none + 5 wxEXPAND @@ -967,7 +1289,30 @@ + + + + + + + + + + + + + + + + + ModuleOrientEvent + + + + + + @@ -1035,7 +1380,30 @@ + + + + + + + + + + + + + + + + + ModuleOrientEvent + + + + + + @@ -1103,7 +1471,30 @@ + + + + + + + + + + + + + + + + + ModuleOrientEvent + + + + + + @@ -1171,7 +1562,30 @@ + + + + + + + + + + + + + + + + + ModuleOrientEvent + + + + + + @@ -1239,7 +1653,30 @@ + + + + + + + + + + + + + + + + + ModuleOrientEvent + + + + + + @@ -1307,7 +1744,33 @@ + + + OnOtherOrientation + + + + + + + + + + + + + + + + + + + + + + + @@ -1356,7 +1819,6 @@ 0 wxID_ANY Board side: - 0 0 @@ -1382,6 +1844,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -1446,6 +1931,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1525,6 +2034,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1539,6 +2072,7 @@ wxVERTICAL 1 protected + 5 wxEXPAND @@ -1581,7 +2115,6 @@ 0 wxID_ANY Allow 90 degree rotated placement: - 0 0 @@ -1607,6 +2140,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -1672,6 +2228,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1728,7 +2327,6 @@ 0 wxID_ANY Allow 180 degree rotated placement: - 0 0 @@ -1754,6 +2352,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -1819,6 +2440,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1860,7 +2524,6 @@ - 1 0 @@ -1877,14 +2540,11 @@ 1 1 - 0 0 ID_MODULE_PROPERTIES_UPDATE Update Footprint from Library... - - 0 0 @@ -1899,8 +2559,6 @@ protected 1 - - Resizable 1 @@ -1916,6 +2574,29 @@ UpdateModule + + + + + + + + + + + + + + + + + + + + + + + @@ -1933,7 +2614,6 @@ - 1 0 @@ -1950,14 +2630,11 @@ 1 1 - 0 0 ID_MODULE_PROPERTIES_EXCHANGE Change Footprint... - - 0 0 @@ -1972,8 +2649,6 @@ protected 1 - - Resizable 1 @@ -1989,6 +2664,29 @@ ExchangeModule + + + + + + + + + + + + + + + + + + + + + + + @@ -2006,7 +2704,6 @@ - 1 0 @@ -2023,14 +2720,11 @@ 1 1 - 0 0 ID_EDIT_FOOTPRINT Edit Footprint... - - 0 0 @@ -2045,8 +2739,6 @@ protected 1 - - Resizable 1 @@ -2062,6 +2754,29 @@ EditFootprint + + + + + + + + + + + + + + + + + + + + + + + @@ -2089,7 +2804,6 @@ - 1 0 @@ -2106,14 +2820,11 @@ 1 1 - 0 0 ID_EDIT_LIBRARY_FOOTPRINT Edit Library Footprint... - - 0 0 @@ -2128,8 +2839,6 @@ protected 1 - - Resizable 1 @@ -2145,6 +2854,29 @@ EditLibraryFootprint + + + + + + + + + + + + + + + + + + + + + + + @@ -2223,6 +2955,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -2287,6 +3043,29 @@ wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + bSizerPanelClearances @@ -2304,6 +3083,7 @@ wxVERTICAL 1 none + 10 wxRIGHT @@ -2337,7 +3117,6 @@ 0 wxID_ANY Set values to 0 to use Board Setup values. - 0 0 @@ -2363,6 +3142,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2398,7 +3200,6 @@ 0 wxID_ANY Positive clearance means area bigger than the pad (usual for mask clearance). - 0 0 @@ -2424,6 +3225,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2459,7 +3283,6 @@ 0 wxID_ANY Negative clearance means area smaller than the pad (usual for paste clearance). - 0 0 @@ -2485,6 +3308,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2536,7 +3382,6 @@ 0 wxID_ANY Pad clearance: - 0 0 @@ -2562,6 +3407,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2626,6 +3494,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2661,7 +3556,6 @@ 0 wxID_ANY unit - 0 0 @@ -2687,6 +3581,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2722,7 +3639,6 @@ 0 wxID_ANY Solder mask clearance: - 0 0 @@ -2748,6 +3664,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2812,6 +3751,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2847,7 +3813,6 @@ 0 wxID_ANY unit - 0 0 @@ -2873,6 +3838,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2908,7 +3896,6 @@ 0 wxID_ANY Solder paste clearance: - 0 0 @@ -2934,6 +3921,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2998,6 +4008,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3033,7 +4070,6 @@ 0 wxID_ANY unit - 0 0 @@ -3059,6 +4095,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -3094,7 +4153,6 @@ 0 wxID_ANY Solder paste ratio clearance: - 0 0 @@ -3120,6 +4178,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -3184,6 +4265,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3219,7 +4327,6 @@ 0 wxID_ANY % - 0 0 @@ -3245,6 +4352,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -3282,7 +4412,6 @@ 0 wxID_ANY Note: solder mask and paste values are used only for pads on copper layers. - 0 0 @@ -3308,6 +4437,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -3324,6 +4476,7 @@ wxHORIZONTAL 1 none + 5 wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT @@ -3357,7 +4510,6 @@ 0 wxID_ANY Pad connection to zones: - 0 0 @@ -3383,6 +4535,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -3447,6 +4622,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -3509,6 +4708,29 @@ wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + bSizerMain3D @@ -3526,6 +4748,7 @@ wxVERTICAL 1 none + 5 wxEXPAND|wxRIGHT @@ -3552,8 +4775,8 @@ wxALIGN_TOP 0 1 - wxALIGN_CENTER - 22 + wxALIGN_CENTRE + 24 "3D Model(s)" "Preview" wxALIGN_CENTER 2 @@ -3601,7 +4824,7 @@ wxALIGN_CENTER 0 - wxALIGN_CENTER + wxALIGN_CENTRE 3 1 @@ -3612,8 +4835,61 @@ + + + + + + + + On3DModelCellChanged + + + + + + + + + + + + + + + + + + + + + + + + + On3DModelSelected + + + + + + + + + + + + + + + + + + + + @@ -3661,10 +4937,9 @@ 0 0 + wxID_ANY Add 3D Model - - 0 0 @@ -3679,9 +4954,8 @@ protected 1 - - Resizable + 1 -1,-1 @@ -3696,6 +4970,29 @@ OnAdd3DRow + + + + + + + + + + + + + + + + + + + + + + + @@ -3734,10 +5031,9 @@ 0 0 + wxID_ANY Browse - - 0 0 @@ -3752,9 +5048,8 @@ protected 1 - - Resizable + 1 -1,-1 @@ -3769,6 +5064,29 @@ OnAdd3DModel + + + + + + + + + + + + + + + + + + + + + + + @@ -3817,10 +5135,9 @@ 0 0 + wxID_ANY Remove 3D Model - - 0 0 @@ -3835,9 +5152,8 @@ protected 1 - - Resizable + 1 -1,-1 @@ -3852,6 +5168,29 @@ OnRemove3DModel + + + + + + + + + + + + + + + + + + + + + + + @@ -3879,7 +5218,6 @@ - 1 0 @@ -3896,14 +5234,11 @@ 1 1 - 0 0 wxID_ANY Configure Paths... - - 0 0 @@ -3918,8 +5253,6 @@ protected 1 - - Resizable 1 @@ -3935,6 +5268,29 @@ Cfg3DPath + + + + + + + + + + + + + + + + + + + + + + + @@ -4015,7 +5371,6 @@ 0 wxID_ANY Library reference: - 0 0 @@ -4041,6 +5396,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -4076,7 +5454,6 @@ 0 wxID_ANY MyLabel - 0 0 @@ -4102,6 +5479,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -4122,6 +5522,14 @@ m_sdbSizerStdButtons protected + + + + + + + + diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp index 8f6964d050..16ea9e6b6a 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp @@ -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; diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp index cfb79e8860..16e4a16749 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp @@ -216,11 +216,11 @@ 0 1 wxALIGN_CENTER - 22 + 24 "Text Items" "Show" "Width" "Height" "Thickness" "Italic" "Layer" "Orientation" "Unconstrained" "X Offset" "Y Offset" wxALIGN_CENTER 11 - 116,53,96,96,96,53,106,80,48,96,96 + 124,60,110,110,110,60,110,110,110,110,110 1 0 @@ -251,7 +251,7 @@ 0 - 724,140 + 800,140 1 m_itemsGrid 1 @@ -262,7 +262,7 @@ Resizable wxALIGN_LEFT - 80 + 100 "Reference" "Value" wxALIGN_CENTER 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 a7a62c2029..77fa25986b 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp @@ -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 ); 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 172b965420..b4d5e609b1 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp @@ -3164,7 +3164,7 @@ wxALIGN_CENTRE 7 - 120,110,95,95,110,50,75 + 120,110,110,110,110,60,80 1 0 diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp index 3b50bfd3a9..2db8f75458 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp @@ -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 ); diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp index a730bec64f..ffc8179d02 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,7 +14,6 @@ dialog_global_edit_tracks_and_vias_base 1000 none - 1 dialog_global_edit_tracks_and_vias_base @@ -55,20 +54,13 @@ - + - - - - - - - @@ -83,23 +75,17 @@ - - - - - - OnUpdateUI @@ -198,14 +184,7 @@ - - - - - - - @@ -293,14 +272,7 @@ - - - - - - - @@ -421,14 +393,7 @@ - - - - - - - @@ -514,14 +479,7 @@ - - - - - - - @@ -618,14 +576,7 @@ - - - - - - - @@ -713,14 +664,7 @@ - - - - - - - OnNetclassFilterSelect @@ -818,14 +762,7 @@ - - - - - - - @@ -914,14 +851,7 @@ - - - - - - - OnLayerFilterSelect @@ -1038,14 +968,7 @@ - - - - - - - @@ -1142,14 +1065,7 @@ - - - - - - - @@ -1237,14 +1153,7 @@ - - - - - - - @@ -1333,14 +1242,7 @@ - - - - - - - @@ -1432,14 +1334,7 @@ - - - - - - - @@ -1496,7 +1391,7 @@ wxALIGN_CENTRE 6 - 95,95,95,95,95,95 + 110,110,110,110,110,110 1 0 @@ -1551,14 +1446,7 @@ wxBORDER_DEFAULT|wxVSCROLL - - - - - - - diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h index 6daadbe145..cb09a09a59 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h @@ -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! diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.cpp b/pcbnew/dialogs/panel_setup_netclasses_base.cpp index 3f168d5b16..9e978eb7b4 100644 --- a/pcbnew/dialogs/panel_setup_netclasses_base.cpp +++ b/pcbnew/dialogs/panel_setup_netclasses_base.cpp @@ -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 ); diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.fbp b/pcbnew/dialogs/panel_setup_netclasses_base.fbp index 3b8fdf4ad5..5900caec76 100644 --- a/pcbnew/dialogs/panel_setup_netclasses_base.fbp +++ b/pcbnew/dialogs/panel_setup_netclasses_base.fbp @@ -103,11 +103,11 @@ 0 1 wxALIGN_CENTER - 22 + 24 "Name" "Clearance" "Track Width" "Via Size" "Via Drill" "uVia Size" "uVia Drill" "dPair Width" "dPair Gap" wxALIGN_CENTER 9 - 120,85,85,85,85,85,85,85,85 + 130,96,96,96,96,96,96,96,96 1 0 @@ -1163,7 +1163,7 @@ 0 1 wxALIGN_CENTER - 22 + 24 "Net" "Net Class" wxALIGN_CENTER 2 diff --git a/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp b/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp index dfc1089207..8c3958c35d 100644 --- a/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp +++ b/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp @@ -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") ); diff --git a/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp b/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp index 072d15ad65..0d4dc3665c 100644 --- a/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp +++ b/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp @@ -202,11 +202,11 @@ 0 1 wxALIGN_CENTRE - 22 + 24 "Line Thickness" "Text Width" "Text Height" "Text Thickness" "Italic" "Keep Upright" wxALIGN_CENTRE 6 - 130,106,106,130,70,116 + 140,140,140,140,80,120 1 0 diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp index bc693609ba..c3f1eeaa82 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp @@ -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") ); diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp index 7cf155c81d..6e95e275d7 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp @@ -215,7 +215,7 @@ 0 1 wxALIGN_CENTRE - 22 + 24 "Width" wxALIGN_CENTRE 1 @@ -580,11 +580,11 @@ 0 1 wxALIGN_CENTRE - 22 + 24 "Size" "Drill" wxALIGN_CENTRE 2 - 110,110 + 125,125 1 0 @@ -945,11 +945,11 @@ 0 1 wxALIGN_CENTRE - 22 + 24 "Width" "Gap" "Via Gap" wxALIGN_CENTRE 3 - 110,110,110 + 125,125,125 1 0