7
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-20 20:11:41 +00:00

Remove extra divider from Pad Properties.

This commit is contained in:
Jeff Young 2025-03-02 17:22:00 +00:00
parent f5d2b40c9e
commit dc12fdfc33
4 changed files with 9 additions and 75 deletions

View File

@ -270,10 +270,7 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, PAD* aPad
nullptr, this );
if( m_padType->GetSelection() != PTH_DLG_TYPE && m_padType->GetSelection() != NPTH_DLG_TYPE )
{
m_gbSizerHole->Show( false );
m_staticline6->Show( false );
}
// Now all widgets have the size fixed, call FinishDialogSettings
finishDialogSettings();

View File

@ -380,21 +380,18 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind
m_LeftBoxSizer->Add( gbSizerPadOrientation, 0, wxEXPAND, 5 );
m_staticline6 = new wxStaticLine( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
m_LeftBoxSizer->Add( m_staticline6, 0, wxEXPAND|wxTOP|wxBOTTOM, 12 );
wxBoxSizer* bSizer35;
bSizer35 = new wxBoxSizer( wxHORIZONTAL );
m_offsetShapeOpt = new wxCheckBox( m_panelGeneral, wxID_ANY, _("Offset shape from hole"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer35->Add( m_offsetShapeOpt, 0, wxLEFT, 5 );
bSizer35->Add( m_offsetShapeOpt, 0, wxTOP|wxLEFT, 5 );
m_offsetShapeOptLabel = new wxStaticText( m_panelGeneral, wxID_ANY, _(":"), wxDefaultPosition, wxDefaultSize, 0 );
m_offsetShapeOptLabel->Wrap( -1 );
bSizer35->Add( m_offsetShapeOptLabel, 0, wxRIGHT, 5 );
bSizer35->Add( m_offsetShapeOptLabel, 0, wxTOP|wxRIGHT, 5 );
m_LeftBoxSizer->Add( bSizer35, 0, wxEXPAND, 5 );
m_LeftBoxSizer->Add( bSizer35, 0, wxEXPAND|wxTOP, 5 );
m_LeftBoxSizer->Add( 0, 2, 0, wxEXPAND, 5 );

View File

@ -14,7 +14,7 @@
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="file">dialog_pad_properties_base</property>
<property name="first_id">1000</property>
<property name="first_id">10000</property>
<property name="internationalize">1</property>
<property name="lua_skip_events">1</property>
<property name="lua_ui_table">UI</property>
@ -4480,68 +4480,9 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="false">
<property name="border">12</property>
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
<property name="proportion">0</property>
<object class="wxStaticLine" expanded="false">
<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_staticline6</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>
<property name="flag">wxEXPAND|wxTOP</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="false">
<property name="minimum_size"></property>
@ -4550,7 +4491,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxLEFT</property>
<property name="flag">wxTOP|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="false">
<property name="BottomDockable">1</property>
@ -4616,7 +4557,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxRIGHT</property>
<property name="flag">wxTOP|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>

View File

@ -41,8 +41,8 @@ class TEXT_CTRL_EVAL;
///////////////////////////////////////////////////////////////////////////
#define wxID_DIALOG_EDIT_PAD 1000
#define wxID_PADNUMCTRL 1001
#define wxID_DIALOG_EDIT_PAD 10000
#define wxID_PADNUMCTRL 10001
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PAD_PROPERTIES_BASE
@ -123,7 +123,6 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM
wxStaticText* m_PadOrientText;
wxComboBox* m_cb_padrotation;
wxStaticText* m_orientationUnits;
wxStaticLine* m_staticline6;
wxCheckBox* m_offsetShapeOpt;
wxStaticText* m_offsetShapeOptLabel;
wxFlexGridSizer* m_offsetCtrls;