Fix merge conflict.
This commit is contained in:
parent
c8495d81bb
commit
78b38cc75f
|
@ -377,7 +377,6 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
|
|||
m_cbTeardrops = new wxCheckBox( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Add teardrops on via's track connections"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE );
|
||||
bSizerLeftCol11->Add( m_cbTeardrops, 0, wxBOTTOM|wxRIGHT, 3 );
|
||||
|
||||
wxCheckBox* m_cbTeardropsUseNextTrack;
|
||||
m_cbTeardropsUseNextTrack = new wxCheckBox( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Allow teardrops to span two track segments"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE );
|
||||
m_cbTeardropsUseNextTrack->SetToolTip( _("Allows a teardrop to extend over the first 2 connected track segments if the first track segment is too short to accommodate the best length.") );
|
||||
|
||||
|
|
|
@ -3815,7 +3815,7 @@
|
|||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
<property name="permission">none</property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="pin_button">1</property>
|
||||
<property name="pos"></property>
|
||||
<property name="resize">Resizable</property>
|
||||
|
|
|
@ -110,6 +110,7 @@ class DIALOG_TRACK_VIA_PROPERTIES_BASE : public DIALOG_SHIM
|
|||
wxStaticText* m_staticText85;
|
||||
wxStaticText* m_staticText851;
|
||||
wxCheckBox* m_cbTeardrops;
|
||||
wxCheckBox* m_cbTeardropsUseNextTrack;
|
||||
wxStaticText* m_stHDRatio;
|
||||
wxTextCtrl* m_tcHDRatio;
|
||||
wxStaticText* m_stHDRatioUnits;
|
||||
|
|
Loading…
Reference in New Issue