Browse Source

Better spacing in dialogs.

Also allows Symbol Properties to be narrower.
master
Jeff Young 2 months ago
parent
commit
0477fb65ec
  1. 14
      eeschema/dialogs/dialog_lib_symbol_properties_base.cpp
  2. 44
      eeschema/dialogs/dialog_lib_symbol_properties_base.fbp
  3. 8
      eeschema/dialogs/dialog_symbol_properties_base.cpp
  4. 8
      eeschema/dialogs/dialog_symbol_properties_base.fbp
  5. 27
      pcbnew/dialogs/panel_display_options_base.cpp
  6. 40
      pcbnew/dialogs/panel_display_options_base.fbp
  7. 2
      pcbnew/dialogs/panel_display_options_base.h

14
eeschema/dialogs/dialog_lib_symbol_properties_base.cpp

@ -41,18 +41,18 @@ DIALOG_LIB_SYMBOL_PROPERTIES_BASE::DIALOG_LIB_SYMBOL_PROPERTIES_BASE( wxWindow*
// Columns
m_grid->SetColSize( 0, 72 );
m_grid->SetColSize( 1, 120 );
m_grid->SetColSize( 1, 8 );
m_grid->SetColSize( 2, 48 );
m_grid->SetColSize( 3, 84 );
m_grid->SetColSize( 4, 70 );
m_grid->SetColSize( 5, 70 );
m_grid->SetColSize( 4, 66 );
m_grid->SetColSize( 5, 66 );
m_grid->SetColSize( 6, 48 );
m_grid->SetColSize( 7, 48 );
m_grid->SetColSize( 8, 84 );
m_grid->SetColSize( 8, 80 );
m_grid->SetColSize( 9, 84 );
m_grid->SetColSize( 10, 84 );
m_grid->SetColSize( 11, 84 );
m_grid->SetColSize( 12, 140 );
m_grid->SetColSize( 12, 10 );
m_grid->SetColSize( 13, 48 );
m_grid->EnableDragColMove( false );
m_grid->EnableDragColSize( true );
@ -282,10 +282,10 @@ DIALOG_LIB_SYMBOL_PROPERTIES_BASE::DIALOG_LIB_SYMBOL_PROPERTIES_BASE( wxWindow*
sbSizerAttributes->Add( 0, 10, 0, wxEXPAND, 5 );
m_excludeFromBomCheckBox = new wxCheckBox( sbSizerAttributes->GetStaticBox(), wxID_ANY, _("Exclude from bill of materials"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizerAttributes->Add( m_excludeFromBomCheckBox, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
sbSizerAttributes->Add( m_excludeFromBomCheckBox, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
m_excludeFromBoardCheckBox = new wxCheckBox( sbSizerAttributes->GetStaticBox(), wxID_ANY, _("Exclude from board"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizerAttributes->Add( m_excludeFromBoardCheckBox, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
sbSizerAttributes->Add( m_excludeFromBoardCheckBox, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
bSizerRightCol->Add( sbSizerAttributes, 1, wxEXPAND|wxALL, 5 );

44
eeschema/dialogs/dialog_lib_symbol_properties_base.fbp

@ -237,7 +237,7 @@
<property name="col_label_values">&quot;Name&quot; &quot;Value&quot; &quot;Show&quot; &quot;Show Name&quot; &quot;H Align&quot; &quot;V Align&quot; &quot;Italic&quot; &quot;Bold&quot; &quot;Text Size&quot; &quot;Orientation&quot; &quot;X Position&quot; &quot;Y Position&quot; &quot;Font&quot; &quot;Color&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">14</property>
<property name="column_sizes">72,120,48,84,70,70,48,48,84,84,84,84,140,48</property>
<property name="column_sizes">72,8,48,84,66,66,48,48,80,84,84,84,10,48</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
@ -1048,16 +1048,16 @@
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizerLeftCol</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="false">
<object class="wxStaticBoxSizer" expanded="true">
<property name="id">wxID_ANY</property>
<property name="label">General</property>
<property name="minimum_size"></property>
@ -1065,11 +1065,11 @@
<property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">4</property>
<property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizerUnitCount</property>
<property name="orient">wxHORIZONTAL</property>
@ -1401,11 +1401,11 @@
<event name="OnCheckBox">onPowerCheckBox</event>
</object>
</object>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer16</property>
<property name="orient">wxHORIZONTAL</property>
@ -1496,16 +1496,16 @@
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizerPinTextCol</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="false">
<object class="wxStaticBoxSizer" expanded="true">
<property name="id">wxID_ANY</property>
<property name="label">Pin Text Options</property>
<property name="minimum_size"></property>
@ -1721,11 +1721,11 @@
<event name="OnCheckBox">OnCheckBox</event>
</object>
</object>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">4</property>
<property name="flag">wxBOTTOM|wxEXPAND|wxTOP</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizerNameOffset</property>
<property name="orient">wxHORIZONTAL</property>
@ -1940,16 +1940,16 @@
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizerRightCol</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="false">
<object class="wxStaticBoxSizer" expanded="true">
<property name="id">wxID_ANY</property>
<property name="label">Attributes</property>
<property name="minimum_size"></property>
@ -2035,7 +2035,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
<property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="false">
<property name="BottomDockable">1</property>
@ -2101,7 +2101,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
<property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="false">
<property name="BottomDockable">1</property>
@ -2178,7 +2178,7 @@
<property name="bitmap"></property>
<property name="label">Footprint Filters</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>
@ -2230,16 +2230,16 @@
<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">bPanelFpFilterBoxSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="false">
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bFpFilterLeftBoxSizer</property>
<property name="orient">wxVERTICAL</property>

8
eeschema/dialogs/dialog_symbol_properties_base.cpp

@ -38,18 +38,18 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent,
// Columns
m_fieldsGrid->SetColSize( 0, 72 );
m_fieldsGrid->SetColSize( 1, 120 );
m_fieldsGrid->SetColSize( 1, 10 );
m_fieldsGrid->SetColSize( 2, 48 );
m_fieldsGrid->SetColSize( 3, 84 );
m_fieldsGrid->SetColSize( 4, 70 );
m_fieldsGrid->SetColSize( 5, 70 );
m_fieldsGrid->SetColSize( 4, 66 );
m_fieldsGrid->SetColSize( 5, 66 );
m_fieldsGrid->SetColSize( 6, 48 );
m_fieldsGrid->SetColSize( 7, 48 );
m_fieldsGrid->SetColSize( 8, 84 );
m_fieldsGrid->SetColSize( 9, 84 );
m_fieldsGrid->SetColSize( 10, 84 );
m_fieldsGrid->SetColSize( 11, 84 );
m_fieldsGrid->SetColSize( 12, 140 );
m_fieldsGrid->SetColSize( 12, 10 );
m_fieldsGrid->SetColSize( 13, 48 );
m_fieldsGrid->EnableDragColMove( false );
m_fieldsGrid->EnableDragColSize( true );

8
eeschema/dialogs/dialog_symbol_properties_base.fbp

@ -181,16 +181,16 @@
<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">generalPageSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="false">
<object class="wxStaticBoxSizer" expanded="true">
<property name="id">wxID_ANY</property>
<property name="label">Fields</property>
<property name="minimum_size"></property>
@ -229,7 +229,7 @@
<property name="col_label_values">&quot;Name&quot; &quot;Value&quot; &quot;Show&quot; &quot;Show Name&quot; &quot;H Align&quot; &quot;V Align&quot; &quot;Italic&quot; &quot;Bold&quot; &quot;Text Size&quot; &quot;Orientation&quot; &quot;X Position&quot; &quot;Y Position&quot; &quot;Font&quot; &quot;Color&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">14</property>
<property name="column_sizes">72,120,48,84,70,70,48,48,84,84,84,84,140,48</property>
<property name="column_sizes">72,10,48,84,66,66,48,48,84,84,84,84,10,48</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>

27
pcbnew/dialogs/panel_display_options_base.cpp

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty)
// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -28,6 +28,9 @@ PANEL_DISPLAY_OPTIONS_BASE::PANEL_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWind
bSizer11->Add( m_galOptionsSizer, 0, wxEXPAND|wxRIGHT, 10 );
bSizer11->Add( 0, 8, 0, 0, 5 );
wxBoxSizer* bSizerPads;
bSizerPads = new wxBoxSizer( wxVERTICAL );
@ -42,7 +45,7 @@ PANEL_DISPLAY_OPTIONS_BASE::PANEL_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWind
bSizerPads->Add( m_OptUseViaColorForNormalTHPadstacks, 0, wxALL, 5 );
bSizerPads->Add( 0, 0, 0, wxEXPAND, 5 );
bSizerPads->Add( 0, 8, 0, wxEXPAND, 5 );
m_clearanceLabel = new wxStaticText( this, wxID_ANY, _("Clearance Outlines"), wxDefaultPosition, wxDefaultSize, 0 );
m_clearanceLabel->Wrap( -1 );
@ -70,7 +73,7 @@ PANEL_DISPLAY_OPTIONS_BASE::PANEL_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWind
gbSizer2->Add( m_OptDisplayPadClearence, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxALL, 5 );
bSizerPads->Add( gbSizer2, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
bSizerPads->Add( gbSizer2, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
bSizerPads->Add( 0, 0, 1, wxEXPAND, 5 );
@ -148,7 +151,7 @@ PANEL_DISPLAY_OPTIONS_BASE::PANEL_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWind
fpEditorPage->SetSizer( fpEditorOptionsSizer );
fpEditorPage->Layout();
fpEditorOptionsSizer->Fit( fpEditorPage );
m_optionsBook->AddPage( fpEditorPage, _("a page"), false );
m_optionsBook->AddPage( fpEditorPage, _("Footprint Editor"), false );
wxPanel* pcbPage;
pcbPage = new wxPanel( m_optionsBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* pcbOptionsSizer;
@ -184,10 +187,10 @@ PANEL_DISPLAY_OPTIONS_BASE::PANEL_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWind
gbSizer1->Add( m_OptDisplayPadNumber, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxALL, 5 );
bMargins->Add( gbSizer1, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
bMargins->Add( gbSizer1, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
bMargins->Add( 0, 0, 0, wxEXPAND, 5 );
bMargins->Add( 0, 8, 0, 0, 5 );
m_staticText4 = new wxStaticText( pcbPage, wxID_ANY, _("Selection && Highlighting"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText4->Wrap( -1 );
@ -204,10 +207,10 @@ PANEL_DISPLAY_OPTIONS_BASE::PANEL_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWind
bSizer9->Add( m_checkForceShowFieldsWhenFPSelected, 0, wxALL, 5 );
bMargins->Add( bSizer9, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
bMargins->Add( bSizer9, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
bMargins->Add( 0, 0, 0, wxEXPAND, 5 );
bMargins->Add( 0, 8, 0, 0, 5 );
m_crossProbingLabel = new wxStaticText( pcbPage, wxID_ANY, _("Cross-probing"), wxDefaultPosition, wxDefaultSize, 0 );
m_crossProbingLabel->Wrap( -1 );
@ -247,19 +250,19 @@ PANEL_DISPLAY_OPTIONS_BASE::PANEL_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWind
bSizer8->Add( m_live3Drefresh, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
bMargins->Add( bSizer8, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
bMargins->Add( bSizer8, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
bMargins->Add( 0, 0, 1, wxEXPAND, 5 );
bMargins->Add( 0, 8, 1, wxEXPAND, 5 );
pcbOptionsSizer->Add( bMargins, 1, wxEXPAND, 5 );
pcbOptionsSizer->Add( bMargins, 0, wxEXPAND, 5 );
pcbPage->SetSizer( pcbOptionsSizer );
pcbPage->Layout();
pcbOptionsSizer->Fit( pcbPage );
m_optionsBook->AddPage( pcbPage, _("a page"), false );
m_optionsBook->AddPage( pcbPage, _("PCB Editor"), true );
bupperSizer->Add( m_optionsBook, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );

40
pcbnew/dialogs/panel_display_options_base.fbp

@ -89,6 +89,16 @@
<property name="permission">protected</property>
</object>
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="spacer" expanded="true">
<property name="height">8</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
@ -289,7 +299,7 @@
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="spacer" expanded="true">
<property name="height">0</property>
<property name="height">8</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
@ -417,7 +427,7 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxGridBagSizer" expanded="false">
<property name="empty_cell_size"></property>
@ -714,9 +724,9 @@
<property name="window_name"></property>
<property name="window_style"></property>
<object class="simplebookpage" expanded="true">
<property name="label">a page</property>
<property name="label">Footprint Editor</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>
@ -1111,8 +1121,8 @@
</object>
</object>
<object class="simplebookpage" expanded="true">
<property name="label">a page</property>
<property name="select">0</property>
<property name="label">PCB Editor</property>
<property name="select">1</property>
<object class="wxPanel" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
@ -1173,7 +1183,7 @@
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bMargins</property>
@ -1302,7 +1312,7 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxGridBagSizer" expanded="true">
<property name="empty_cell_size"></property>
@ -1520,10 +1530,10 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="spacer" expanded="true">
<property name="height">0</property>
<property name="height">8</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
@ -1651,7 +1661,7 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="false">
<property name="minimum_size"></property>
@ -1727,10 +1737,10 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="spacer" expanded="true">
<property name="height">0</property>
<property name="height">8</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
@ -1858,7 +1868,7 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="false">
<property name="minimum_size"></property>
@ -2197,7 +2207,7 @@
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="spacer" expanded="true">
<property name="height">0</property>
<property name="height">8</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>

2
pcbnew/dialogs/panel_display_options_base.h

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty)
// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!

Loading…
Cancel
Save