From 8fd175dd22f47fd06d7f0d656cd01e60af2043dd Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Mon, 24 Feb 2025 11:43:07 +0000
Subject: [PATCH] Minor cleanup to table dialogs.
---
.../dialogs/dialog_table_properties_base.cpp | 8 +-
.../dialogs/dialog_table_properties_base.fbp | 158 +++++++++---------
pcbnew/dialogs/dialog_table_properties_base.h | 2 +-
.../dialog_tablecell_properties_base.cpp | 31 ++--
.../dialog_tablecell_properties_base.fbp | 121 +++-----------
.../dialog_tablecell_properties_base.h | 2 -
6 files changed, 117 insertions(+), 205 deletions(-)
diff --git a/pcbnew/dialogs/dialog_table_properties_base.cpp b/pcbnew/dialogs/dialog_table_properties_base.cpp
index 57938b7367..71de99ae23 100644
--- a/pcbnew/dialogs/dialog_table_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_table_properties_base.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -38,7 +38,7 @@ DIALOG_TABLE_PROPERTIES_BASE::DIALOG_TABLE_PROPERTIES_BASE( wxWindow* parent, wx
m_gridSizer->Add( cellContentsLabel, 0, wxTOP|wxBOTTOM, 3 );
- bColumns->Add( m_gridSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+ bColumns->Add( m_gridSizer, 1, wxEXPAND|wxTOP|wxRIGHT, 5 );
bColumns->Add( 15, 0, 0, wxEXPAND, 5 );
@@ -131,10 +131,10 @@ DIALOG_TABLE_PROPERTIES_BASE::DIALOG_TABLE_PROPERTIES_BASE( wxWindow* parent, wx
bPropertiesSizer->AddGrowableCol( 1 );
- bColumns->Add( bPropertiesSizer, 0, wxEXPAND|wxALL, 5 );
+ bColumns->Add( bPropertiesSizer, 0, wxEXPAND|wxALL, 10 );
- bMainSizer->Add( bColumns, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 );
+ bMainSizer->Add( bColumns, 1, wxEXPAND|wxLEFT, 10 );
wxBoxSizer* bButtons;
bButtons = new wxBoxSizer( wxHORIZONTAL );
diff --git a/pcbnew/dialogs/dialog_table_properties_base.fbp b/pcbnew/dialogs/dialog_table_properties_base.fbp
index 5601f08d84..73f846a1af 100644
--- a/pcbnew/dialogs/dialog_table_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_table_properties_base.fbp
@@ -1,34 +1,36 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<wxFormBuilder_Project>
- <FileVersion major="1" minor="17"/>
+ <FileVersion major="1" minor="18"/>
<object class="Project" expanded="true">
- <property name="class_decoration"></property>
<property name="code_generation">C++</property>
- <property name="disconnect_events">1</property>
- <property name="disconnect_mode">source_name</property>
- <property name="disconnect_php_events">0</property>
- <property name="disconnect_python_events">0</property>
+ <property name="cpp_class_decoration"></property>
+ <property name="cpp_disconnect_events">1</property>
+ <property name="cpp_event_generation">connect</property>
+ <property name="cpp_help_provider">none</property>
+ <property name="cpp_namespace"></property>
+ <property name="cpp_precompiled_header"></property>
+ <property name="cpp_use_array_enum">0</property>
+ <property name="cpp_use_enum">1</property>
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
- <property name="event_generation">connect</property>
<property name="file">dialog_table_properties_base</property>
<property name="first_id">1000</property>
- <property name="help_provider">none</property>
- <property name="image_path_wrapper_function_name"></property>
- <property name="indent_with_spaces"></property>
<property name="internationalize">1</property>
+ <property name="lua_skip_events">1</property>
+ <property name="lua_ui_table">UI</property>
<property name="name">dialog_table_properties_base</property>
- <property name="namespace"></property>
<property name="path">.</property>
- <property name="precompiled_header"></property>
+ <property name="php_disconnect_events">0</property>
+ <property name="php_disconnect_mode">source_name</property>
+ <property name="php_skip_events">1</property>
+ <property name="python_disconnect_events">0</property>
+ <property name="python_disconnect_mode">source_name</property>
+ <property name="python_image_path_wrapper_function_name"></property>
+ <property name="python_indent_with_spaces"></property>
+ <property name="python_skip_events">1</property>
<property name="relative_path">1</property>
- <property name="skip_lua_events">1</property>
- <property name="skip_php_events">1</property>
- <property name="skip_python_events">1</property>
- <property name="ui_table">UI</property>
- <property name="use_array_enum">0</property>
- <property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property>
+ <property name="use_native_eol">0</property>
<object class="Dialog" expanded="true">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
@@ -72,10 +74,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -126,7 +128,7 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">10</property>
- <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
+ <property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
@@ -135,7 +137,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
- <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
+ <property name="flag">wxEXPAND|wxTOP|wxRIGHT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size">600,400</property>
@@ -151,10 +153,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -217,7 +219,7 @@
</object>
</object>
<object class="sizeritem" expanded="true">
- <property name="border">5</property>
+ <property name="border">10</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxGridBagSizer" expanded="true">
@@ -243,10 +245,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -308,10 +310,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -377,10 +379,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -445,10 +447,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -514,10 +516,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -582,10 +584,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -656,10 +658,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -721,10 +723,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -788,10 +790,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -853,10 +855,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -935,10 +937,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1004,10 +1006,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1073,10 +1075,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1147,10 +1149,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1212,10 +1214,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1279,10 +1281,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1344,10 +1346,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
diff --git a/pcbnew/dialogs/dialog_table_properties_base.h b/pcbnew/dialogs/dialog_table_properties_base.h
index 151f6c4f1d..942d93bad3 100644
--- a/pcbnew/dialogs/dialog_table_properties_base.h
+++ b/pcbnew/dialogs/dialog_table_properties_base.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcbnew/dialogs/dialog_tablecell_properties_base.cpp b/pcbnew/dialogs/dialog_tablecell_properties_base.cpp
index f4b61caba2..48a8a02bb3 100644
--- a/pcbnew/dialogs/dialog_tablecell_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_tablecell_properties_base.cpp
@@ -35,7 +35,7 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
m_cellTextLabel = new wxStaticText( this, wxID_ANY, _("Cell contents:"), wxDefaultPosition, wxDefaultSize, 0 );
m_cellTextLabel->Wrap( -1 );
- bSizer8->Add( m_cellTextLabel, 0, wxALL, 5 );
+ bSizer8->Add( m_cellTextLabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_cellTextCtrl = new wxStyledTextCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN, wxEmptyString );
m_cellTextCtrl->SetUseTabs( false );
@@ -67,10 +67,10 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
m_cellTextCtrl->MarkerDefine( wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_EMPTY );
m_cellTextCtrl->SetSelBackground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) );
m_cellTextCtrl->SetSelForeground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
- bSizer8->Add( m_cellTextCtrl, 1, wxEXPAND | wxALL, 5 );
+ bSizer8->Add( m_cellTextCtrl, 1, wxEXPAND | wxALL, 2 );
- bSizer7->Add( bSizer8, 1, wxEXPAND, 5 );
+ bSizer7->Add( bSizer8, 1, wxEXPAND|wxTOP|wxRIGHT, 5 );
wxBoxSizer* bSizer9;
bSizer9 = new wxBoxSizer( wxVERTICAL );
@@ -78,9 +78,6 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
wxBoxSizer* bMargins;
bMargins = new wxBoxSizer( wxVERTICAL );
-
- bMargins->Add( 0, 15, 0, wxEXPAND, 5 );
-
wxFlexGridSizer* fgTextStyleSizer;
fgTextStyleSizer = new wxFlexGridSizer( 0, 2, 5, 5 );
fgTextStyleSizer->SetFlexibleDirection( wxBOTH );
@@ -112,7 +109,7 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
hAlignButtons->Add( m_hAlignRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
- fgTextStyleSizer->Add( hAlignButtons, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+ fgTextStyleSizer->Add( hAlignButtons, 0, wxALIGN_CENTER_VERTICAL, 5 );
vAlignLabel = new wxStaticText( this, wxID_ANY, _("Vertical alignment:"), wxDefaultPosition, wxDefaultSize, 0 );
vAlignLabel->Wrap( -1 );
@@ -139,16 +136,13 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
vAlignButtons->Add( m_vAlignBottom, 0, wxALIGN_CENTER_VERTICAL, 5 );
- fgTextStyleSizer->Add( vAlignButtons, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+ fgTextStyleSizer->Add( vAlignButtons, 0, wxALIGN_CENTER_VERTICAL, 5 );
bMargins->Add( fgTextStyleSizer, 0, wxEXPAND, 5 );
-
- bMargins->Add( 0, 20, 0, wxEXPAND, 5 );
-
wxGridBagSizer* gbFontSizer;
- gbFontSizer = new wxGridBagSizer( 7, 5 );
+ gbFontSizer = new wxGridBagSizer( 3, 5 );
gbFontSizer->SetFlexibleDirection( wxBOTH );
gbFontSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
gbFontSizer->SetEmptyCellSize( wxSize( -1,5 ) );
@@ -165,7 +159,7 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
m_styleLabel = new wxStaticText( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, 0 );
m_styleLabel->Wrap( -1 );
- gbFontSizer->Add( m_styleLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
+ gbFontSizer->Add( m_styleLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP, 6 );
wxBoxSizer* bSizer14;
bSizer14 = new wxBoxSizer( wxHORIZONTAL );
@@ -177,15 +171,15 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
bSizer14->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 45 );
- gbFontSizer->Add( bSizer14, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
+ gbFontSizer->Add( bSizer14, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP, 6 );
gbFontSizer->AddGrowableCol( 1 );
- bMargins->Add( gbFontSizer, 0, wxEXPAND|wxBOTTOM, 1 );
+ bMargins->Add( gbFontSizer, 0, wxEXPAND|wxBOTTOM, 5 );
wxGridBagSizer* gbSizer1;
- gbSizer1 = new wxGridBagSizer( 4, 5 );
+ gbSizer1 = new wxGridBagSizer( 3, 5 );
gbSizer1->SetFlexibleDirection( wxBOTH );
gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
gbSizer1->SetEmptyCellSize( wxSize( -1,8 ) );
@@ -275,10 +269,7 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
bSizer7->Add( bSizer9, 1, wxEXPAND, 5 );
- bMainSizer->Add( bSizer7, 1, wxEXPAND, 5 );
-
- m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+ bMainSizer->Add( bSizer7, 1, wxEXPAND|wxLEFT, 5 );
wxBoxSizer* bButtons;
bButtons = new wxBoxSizer( wxHORIZONTAL );
diff --git a/pcbnew/dialogs/dialog_tablecell_properties_base.fbp b/pcbnew/dialogs/dialog_tablecell_properties_base.fbp
index fecda35d21..89f6ebd82b 100644
--- a/pcbnew/dialogs/dialog_tablecell_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_tablecell_properties_base.fbp
@@ -127,7 +127,7 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
- <property name="flag">wxEXPAND</property>
+ <property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
@@ -136,7 +136,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
- <property name="flag">wxEXPAND</property>
+ <property name="flag">wxEXPAND|wxTOP|wxRIGHT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="false">
<property name="minimum_size"></property>
@@ -145,7 +145,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
- <property name="flag">wxALL</property>
+ <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
@@ -206,7 +206,7 @@
</object>
</object>
<object class="sizeritem" expanded="false">
- <property name="border">5</property>
+ <property name="border">2</property>
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">1</property>
<object class="wxStyledTextCtrl" expanded="false">
@@ -297,17 +297,7 @@
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
- <object class="spacer" expanded="true">
- <property name="height">15</property>
- <property name="permission">protected</property>
- <property name="width">0</property>
- </object>
- </object>
- <object class="sizeritem" expanded="false">
- <property name="border">5</property>
- <property name="flag">wxEXPAND</property>
- <property name="proportion">0</property>
- <object class="wxFlexGridSizer" expanded="false">
+ <object class="wxFlexGridSizer" expanded="true">
<property name="cols">2</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
@@ -381,11 +371,11 @@
<property name="wrap">-1</property>
</object>
</object>
- <object class="sizeritem" expanded="false">
+ <object class="sizeritem" expanded="true">
<property name="border">5</property>
- <property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">1</property>
- <object class="wxBoxSizer" expanded="false">
+ <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+ <property name="proportion">0</property>
+ <object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">hAlignButtons</property>
<property name="orient">wxHORIZONTAL</property>
@@ -678,8 +668,8 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
- <property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">1</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+ <property name="proportion">0</property>
<object class="wxBoxSizer" expanded="false">
<property name="minimum_size"></property>
<property name="name">vAlignButtons</property>
@@ -911,21 +901,11 @@
</object>
</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">0</property>
- <object class="spacer" expanded="false">
- <property name="height">20</property>
- <property name="permission">protected</property>
- <property name="width">0</property>
- </object>
- </object>
- <object class="sizeritem" expanded="false">
- <property name="border">1</property>
<property name="flag">wxEXPAND|wxBOTTOM</property>
<property name="proportion">0</property>
- <object class="wxGridBagSizer" expanded="false">
+ <object class="wxGridBagSizer" expanded="true">
<property name="empty_cell_size">-1,5</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols">1</property>
@@ -935,7 +915,7 @@
<property name="name">gbFontSizer</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
- <property name="vgap">7</property>
+ <property name="vgap">3</property>
<object class="gbsizeritem" expanded="false">
<property name="border">1</property>
<property name="colspan">1</property>
@@ -1070,10 +1050,10 @@
</object>
</object>
<object class="gbsizeritem" expanded="false">
- <property name="border">5</property>
+ <property name="border">6</property>
<property name="colspan">1</property>
<property name="column">0</property>
- <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP</property>
<property name="row">2</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="false">
@@ -1134,14 +1114,14 @@
<property name="wrap">-1</property>
</object>
</object>
- <object class="gbsizeritem" expanded="false">
- <property name="border">5</property>
+ <object class="gbsizeritem" expanded="true">
+ <property name="border">6</property>
<property name="colspan">1</property>
<property name="column">1</property>
- <property name="flag">wxEXPAND</property>
+ <property name="flag">wxEXPAND|wxTOP</property>
<property name="row">2</property>
<property name="rowspan">1</property>
- <object class="wxBoxSizer" expanded="false">
+ <object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizer14</property>
<property name="orient">wxHORIZONTAL</property>
@@ -1294,7 +1274,7 @@
<property name="name">gbSizer1</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
- <property name="vgap">4</property>
+ <property name="vgap">3</property>
<object class="gbsizeritem" expanded="false">
<property name="border">4</property>
<property name="colspan">1</property>
@@ -2328,65 +2308,6 @@
</object>
</object>
</object>
- <object class="sizeritem" expanded="true">
- <property name="border">5</property>
- <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
- <property name="proportion">0</property>
- <object class="wxStaticLine" expanded="true">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer">0</property>
- <property name="aui_name"></property>
- <property name="aui_position">0</property>
- <property name="aui_row">0</property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="drag_accept_files">0</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">m_staticline1</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style">wxLI_HORIZONTAL</property>
- <property name="subclass">; ; forward_declare</property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- </object>
- </object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
diff --git a/pcbnew/dialogs/dialog_tablecell_properties_base.h b/pcbnew/dialogs/dialog_tablecell_properties_base.h
index a07cd5cdf4..7edb37e235 100644
--- a/pcbnew/dialogs/dialog_tablecell_properties_base.h
+++ b/pcbnew/dialogs/dialog_tablecell_properties_base.h
@@ -33,7 +33,6 @@ class WX_INFOBAR;
#include <wx/checkbox.h>
#include <wx/gbsizer.h>
#include <wx/textctrl.h>
-#include <wx/statline.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
@@ -75,7 +74,6 @@ class DIALOG_TABLECELL_PROPERTIES_BASE : public DIALOG_SHIM
wxTextCtrl* m_marginLeftCtrl;
wxTextCtrl* m_marginRightCtrl;
wxTextCtrl* m_marginBottomCtrl;
- wxStaticLine* m_staticline1;
wxButton* m_editTable;
wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK;