realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup to table dialogs, take 2.

Browse Source
This commit is contained in:
Jeff Young 2025-02-24 12:20:03 +00:00
parent ddcf3f9855
commit 86e9f47875
3 changed files with 28 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
eeschema/dialogs/dialog_tablecell_properties_base.cpp
View File

@ -82,7 +82,7 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
bSizer18->Add( m_cellTextCtrl, 1, wxEXPAND | wxALL, 5 ); bSizer18->Add( m_cellTextCtrl, 1, wxEXPAND | wxALL, 5 );
bSizer16->Add( bSizer18, 1, wxEXPAND, 5 ); bSizer16->Add( bSizer18, 1, wxEXPAND|wxRIGHT, 10 );
wxBoxSizer* bSizer17; wxBoxSizer* bSizer17;
bSizer17 = new wxBoxSizer( wxVERTICAL ); bSizer17 = new wxBoxSizer( wxVERTICAL );
@ -124,7 +124,7 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
hAlignButtons->Add( m_hAlignRight, 0, wxALIGN_CENTER_VERTICAL, 5 ); hAlignButtons->Add( m_hAlignRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
fgTextStyleSizer->Add( hAlignButtons, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); fgTextStyleSizer->Add( hAlignButtons, 0, wxALIGN_CENTER_VERTICAL, 5 );
vAlignLabel = new wxStaticText( this, wxID_ANY, _("Vertical alignment:"), wxDefaultPosition, wxDefaultSize, 0 ); vAlignLabel = new wxStaticText( this, wxID_ANY, _("Vertical alignment:"), wxDefaultPosition, wxDefaultSize, 0 );
vAlignLabel->Wrap( -1 ); vAlignLabel->Wrap( -1 );
@ -151,10 +151,10 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
vAlignButtons->Add( m_vAlignBottom, 0, wxALIGN_CENTER_VERTICAL, 5 ); 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 );
bSizer13->Add( fgTextStyleSizer, 0, wxBOTTOM|wxEXPAND, 6 ); bSizer13->Add( fgTextStyleSizer, 0, wxEXPAND, 5 );
wxBoxSizer* bMargins; wxBoxSizer* bMargins;
bMargins = new wxBoxSizer( wxVERTICAL ); bMargins = new wxBoxSizer( wxVERTICAL );
@ -170,7 +170,7 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
m_styleLabel = new wxStaticText( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, 0 ); m_styleLabel = new wxStaticText( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, 0 );
m_styleLabel->Wrap( -1 ); m_styleLabel->Wrap( -1 );
gbFontSizer->Add( m_styleLabel, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); gbFontSizer->Add( m_styleLabel, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
wxBoxSizer* bSizer14; wxBoxSizer* bSizer14;
bSizer14 = new wxBoxSizer( wxHORIZONTAL ); bSizer14 = new wxBoxSizer( wxHORIZONTAL );
@ -182,7 +182,7 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
bSizer14->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 45 ); bSizer14->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 45 );
gbFontSizer->Add( bSizer14, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 ); gbFontSizer->Add( bSizer14, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP, 1 );
m_fontLabel = new wxStaticText( this, wxID_ANY, _("Font:"), wxDefaultPosition, wxDefaultSize, 0 ); m_fontLabel = new wxStaticText( this, wxID_ANY, _("Font:"), wxDefaultPosition, wxDefaultSize, 0 );
m_fontLabel->Wrap( -1 ); m_fontLabel->Wrap( -1 );
@ -214,7 +214,7 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
gbFontSizer->AddGrowableCol( 1 ); gbFontSizer->AddGrowableCol( 1 );
bMargins->Add( gbFontSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); bMargins->Add( gbFontSizer, 0, wxEXPAND|wxBOTTOM, 5 );
wxFlexGridSizer* fgColorSizer; wxFlexGridSizer* fgColorSizer;
fgColorSizer = new wxFlexGridSizer( 0, 2, 4, 5 ); fgColorSizer = new wxFlexGridSizer( 0, 2, 4, 5 );
@ -359,16 +359,13 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
bSizer17->Add( bSizer13, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bSizer17->Add( bSizer13, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
bSizer16->Add( bSizer17, 1, wxEXPAND, 5 ); bSizer16->Add( bSizer17, 1, wxEXPAND|wxLEFT, 5 );
bSizer151->Add( bSizer16, 1, wxEXPAND, 5 ); bSizer151->Add( bSizer16, 1, wxEXPAND, 5 );
bMainSizer->Add( bSizer151, 1, wxEXPAND, 5 ); bMainSizer->Add( bSizer151, 1, wxEXPAND|wxLEFT, 5 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bButtons; wxBoxSizer* bButtons;
bButtons = new wxBoxSizer( wxHORIZONTAL ); bButtons = new wxBoxSizer( wxHORIZONTAL );

97
eeschema/dialogs/dialog_tablecell_properties_base.fbp
View File

@ -128,7 +128,7 @@
</object> </object>
<object class="sizeritem" expanded="true"> <object class="sizeritem" expanded="true">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="true"> <object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property> <property name="minimum_size"></property>
@ -145,8 +145,8 @@
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="true"> <object class="sizeritem" expanded="true">
<property name="border">5</property> <property name="border">10</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND|wxRIGHT</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="true"> <object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property> <property name="minimum_size"></property>
@ -287,7 +287,7 @@
</object> </object>
<object class="sizeritem" expanded="true"> <object class="sizeritem" expanded="true">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="true"> <object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property> <property name="minimum_size"></property>
@ -314,8 +314,8 @@
</object> </object>
</object> </object>
<object class="sizeritem" expanded="false"> <object class="sizeritem" expanded="false">
<property name="border">6</property> <property name="border">5</property>
<property name="flag">wxBOTTOM|wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxFlexGridSizer" expanded="false"> <object class="wxFlexGridSizer" expanded="false">
<property name="cols">2</property> <property name="cols">2</property>
@ -393,8 +393,8 @@
</object> </object>
<object class="sizeritem" expanded="false"> <object class="sizeritem" expanded="false">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property> <property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">1</property> <property name="proportion">0</property>
<object class="wxBoxSizer" expanded="false"> <object class="wxBoxSizer" expanded="false">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">hAlignButtons</property> <property name="name">hAlignButtons</property>
@ -688,8 +688,8 @@
</object> </object>
<object class="sizeritem" expanded="false"> <object class="sizeritem" expanded="false">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">1</property> <property name="proportion">0</property>
<object class="wxBoxSizer" expanded="false"> <object class="wxBoxSizer" expanded="false">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">vAlignButtons</property> <property name="name">vAlignButtons</property>
@ -921,11 +921,11 @@
</object> </object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="false"> <object class="sizeritem" expanded="true">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property> <property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="false"> <object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bMargins</property> <property name="name">bMargins</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
@ -942,7 +942,7 @@
</object> </object>
<object class="sizeritem" expanded="false"> <object class="sizeritem" expanded="false">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property> <property name="flag">wxEXPAND|wxBOTTOM</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxGridBagSizer" expanded="false"> <object class="wxGridBagSizer" expanded="false">
<property name="empty_cell_size">-1,5</property> <property name="empty_cell_size">-1,5</property>
@ -956,10 +956,10 @@
<property name="permission">none</property> <property name="permission">none</property>
<property name="vgap">6</property> <property name="vgap">6</property>
<object class="gbsizeritem" expanded="false"> <object class="gbsizeritem" expanded="false">
<property name="border">5</property> <property name="border">1</property>
<property name="colspan">1</property> <property name="colspan">1</property>
<property name="column">0</property> <property name="column">0</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP</property>
<property name="row">3</property> <property name="row">3</property>
<property name="rowspan">1</property> <property name="rowspan">1</property>
<object class="wxStaticText" expanded="false"> <object class="wxStaticText" expanded="false">
@ -1021,10 +1021,10 @@
</object> </object>
</object> </object>
<object class="gbsizeritem" expanded="false"> <object class="gbsizeritem" expanded="false">
<property name="border">5</property> <property name="border">1</property>
<property name="colspan">1</property> <property name="colspan">1</property>
<property name="column">1</property> <property name="column">1</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND|wxTOP</property>
<property name="row">3</property> <property name="row">3</property>
<property name="rowspan">1</property> <property name="rowspan">1</property>
<object class="wxBoxSizer" expanded="false"> <object class="wxBoxSizer" expanded="false">
@ -1505,11 +1505,11 @@
</object> </object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="false"> <object class="sizeritem" expanded="true">
<property name="border">20</property> <property name="border">20</property>
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property> <property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxFlexGridSizer" expanded="false"> <object class="wxFlexGridSizer" expanded="true">
<property name="cols">2</property> <property name="cols">2</property>
<property name="flexible_direction">wxBOTH</property> <property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property> <property name="growablecols"></property>
@ -2839,65 +2839,6 @@
</object> </object>
</object> </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"> <object class="sizeritem" expanded="true">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>

2
eeschema/dialogs/dialog_tablecell_properties_base.h
View File

@ -36,7 +36,6 @@ class WX_INFOBAR;
#include <wx/gbsizer.h> #include <wx/gbsizer.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/simplebook.h> #include <wx/simplebook.h>
#include <wx/statline.h>
#include <wx/dialog.h> #include <wx/dialog.h>
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -84,7 +83,6 @@ class DIALOG_TABLECELL_PROPERTIES_BASE : public DIALOG_SHIM
wxTextCtrl* m_marginLeftCtrl; wxTextCtrl* m_marginLeftCtrl;
wxTextCtrl* m_marginRightCtrl; wxTextCtrl* m_marginRightCtrl;
wxTextCtrl* m_marginBottomCtrl; wxTextCtrl* m_marginBottomCtrl;
wxStaticLine* m_staticline1;
wxButton* m_editTable; wxButton* m_editTable;
wxStdDialogButtonSizer* m_sdbSizer1; wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1OK;