Commit 88e50d9d authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Refinements

parent 248343c0

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	

	

	m_staticText11 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 90 degree"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText11 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 90 degree"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText11->Wrap( -1 );

	m_staticText11->Wrap( -1 );

	bSizerRotOpt->Add( m_staticText11, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerRotOpt->Add( m_staticText11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );

	

	

	m_CostRot90Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );

	m_CostRot90Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );

	bSizerRotOpt->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerRotOpt->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
@@ -164,7 +164,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	

	

	m_staticText12 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 180 degree"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText12 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 180 degree"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText12->Wrap( -1 );

	m_staticText12->Wrap( -1 );

	bSizerMoveOpt->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerMoveOpt->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );

	

	

	m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );

	m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );

	bSizerMoveOpt->Add( m_CostRot180Ctrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	bSizerMoveOpt->Add( m_CostRot180Ctrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
@@ -201,7 +201,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_staticTextInfo->Wrap( -1 );

	m_staticTextInfo->Wrap( -1 );

	m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );

	m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );

	

	

	bSizer11->Add( m_staticTextInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );

	bSizer11->Add( m_staticTextInfo, 0, wxALL, 5 );

	

	

	

	

	sbSizerLocalProperties->Add( bSizer11, 0, wxEXPAND, 5 );

	sbSizerLocalProperties->Add( bSizer11, 0, wxEXPAND, 5 );

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp

+3 −3
Original line number Original line Diff line number Diff line
@@ -2181,7 +2181,7 @@ 
                                                            <property name="permission">none</property>

                                                            <property name="permission">none</property>

                                                            <object class="sizeritem" expanded="0">

                                                            <object class="sizeritem" expanded="0">

                                                                <property name="border">5</property>

                                                                <property name="border">5</property>

                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT</property>

                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>

                                                                <property name="proportion">0</property>

                                                                <property name="proportion">0</property>

                                                                <object class="wxStaticText" expanded="0">

                                                                <object class="wxStaticText" expanded="0">

                                                                    <property name="BottomDockable">1</property>

                                                                    <property name="BottomDockable">1</property>
@@ -2383,7 +2383,7 @@ 
                                                            <property name="permission">none</property>

                                                            <property name="permission">none</property>

                                                            <object class="sizeritem" expanded="0">

                                                            <object class="sizeritem" expanded="0">

                                                                <property name="border">5</property>

                                                                <property name="border">5</property>

                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT</property>

                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>

                                                                <property name="proportion">0</property>

                                                                <property name="proportion">0</property>

                                                                <object class="wxStaticText" expanded="0">

                                                                <object class="wxStaticText" expanded="0">

                                                                    <property name="BottomDockable">1</property>

                                                                    <property name="BottomDockable">1</property>
@@ -2781,7 +2781,7 @@ 
                                                            </object>

                                                            </object>

                                                            <object class="sizeritem" expanded="0">

                                                            <object class="sizeritem" expanded="0">

                                                                <property name="border">5</property>

                                                                <property name="border">5</property>

                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND</property>

                                                                <property name="flag">wxALL</property>

                                                                <property name="proportion">0</property>

                                                                <property name="proportion">0</property>

                                                                <object class="wxStaticText" expanded="0">

                                                                <object class="wxStaticText" expanded="0">

                                                                    <property name="BottomDockable">1</property>

                                                                    <property name="BottomDockable">1</property>

pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -105,10 +105,10 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa 
	int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString );

	int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString );

	m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS );

	m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS );

	m_AutoPlaceCtrl->SetSelection( 0 );

	m_AutoPlaceCtrl->SetSelection( 0 );

	bSizerAttrib->Add( m_AutoPlaceCtrl, 1, wxEXPAND|wxALL, 5 );

	bSizerAttrib->Add( m_AutoPlaceCtrl, 1, wxALL|wxEXPAND, 5 );

	

	

	

	

	m_PropRightSizer->Add( bSizerAttrib, 1, wxEXPAND, 5 );

	m_PropRightSizer->Add( bSizerAttrib, 0, wxEXPAND, 5 );

	

	

	wxStaticBoxSizer* sbSizerAutoplace;

	wxStaticBoxSizer* sbSizerAutoplace;

	sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Place") ), wxHORIZONTAL );

	sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Place") ), wxHORIZONTAL );
@@ -118,7 +118,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa 
	

	

	m_staticText11 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 90 degree"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText11 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 90 degree"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText11->Wrap( -1 );

	m_staticText11->Wrap( -1 );

	bSizerRot90->Add( m_staticText11, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );

	bSizerRot90->Add( m_staticText11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );

	

	

	m_CostRot90Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxSize( -1,-1 ), wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );

	m_CostRot90Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxSize( -1,-1 ), wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );

	bSizerRot90->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	bSizerRot90->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
@@ -131,7 +131,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa 
	

	

	m_staticText12 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 180 degree"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText12 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 180 degree"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText12->Wrap( -1 );

	m_staticText12->Wrap( -1 );

	bSizerRot180->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT, 5 );

	bSizerRot180->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );

	

	

	m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );

	m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );

	bSizerRot180->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	bSizerRot180->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
@@ -140,7 +140,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa 
	sbSizerAutoplace->Add( bSizerRot180, 1, 0, 5 );

	sbSizerAutoplace->Add( bSizerRot180, 1, 0, 5 );

	

	

	

	

	m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND|wxALL, 5 );

	m_PropRightSizer->Add( sbSizerAutoplace, 0, wxEXPAND|wxALL, 5 );

	

	

	wxStaticBoxSizer* sbSizer8;

	wxStaticBoxSizer* sbSizer8;

	sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Local Clearance Values") ), wxVERTICAL );

	sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Local Clearance Values") ), wxVERTICAL );
@@ -149,7 +149,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa 
	m_staticTextInfo->Wrap( -1 );

	m_staticTextInfo->Wrap( -1 );

	m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );

	m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );

	

	

	sbSizer8->Add( m_staticTextInfo, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );

	sbSizer8->Add( m_staticTextInfo, 0, wxALL, 5 );

	

	

	wxFlexGridSizer* fgSizer1;

	wxFlexGridSizer* fgSizer1;

	fgSizer1 = new wxFlexGridSizer( 5, 3, 0, 0 );

	fgSizer1 = new wxFlexGridSizer( 5, 3, 0, 0 );

pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp

+6 −6
Original line number Original line Diff line number Diff line
@@ -1370,7 +1370,7 @@ 
                                            <object class="sizeritem" expanded="1">

                                            <object class="sizeritem" expanded="1">

                                                <property name="border">5</property>

                                                <property name="border">5</property>

                                                <property name="flag">wxEXPAND</property>

                                                <property name="flag">wxEXPAND</property>

                                                <property name="proportion">1</property>

                                                <property name="proportion">0</property>

                                                <object class="wxBoxSizer" expanded="1">

                                                <object class="wxBoxSizer" expanded="1">

                                                    <property name="minimum_size"></property>

                                                    <property name="minimum_size"></property>

                                                    <property name="name">bSizerAttrib</property>

                                                    <property name="name">bSizerAttrib</property>
@@ -1468,7 +1468,7 @@ 
                                                    </object>

                                                    </object>

                                                    <object class="sizeritem" expanded="1">

                                                    <object class="sizeritem" expanded="1">

                                                        <property name="border">5</property>

                                                        <property name="border">5</property>

                                                        <property name="flag">wxEXPAND|wxALL</property>

                                                        <property name="flag">wxALL|wxEXPAND</property>

                                                        <property name="proportion">1</property>

                                                        <property name="proportion">1</property>

                                                        <object class="wxRadioBox" expanded="1">

                                                        <object class="wxRadioBox" expanded="1">

                                                            <property name="BottomDockable">1</property>

                                                            <property name="BottomDockable">1</property>
@@ -1561,7 +1561,7 @@ 
                                            <object class="sizeritem" expanded="1">

                                            <object class="sizeritem" expanded="1">

                                                <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">0</property>

                                                <object class="wxStaticBoxSizer" expanded="1">

                                                <object class="wxStaticBoxSizer" expanded="1">

                                                    <property name="id">wxID_ANY</property>

                                                    <property name="id">wxID_ANY</property>

                                                    <property name="label">Auto Place</property>

                                                    <property name="label">Auto Place</property>
@@ -1581,7 +1581,7 @@ 
                                                            <property name="permission">none</property>

                                                            <property name="permission">none</property>

                                                            <object class="sizeritem" expanded="1">

                                                            <object class="sizeritem" expanded="1">

                                                                <property name="border">5</property>

                                                                <property name="border">5</property>

                                                                <property name="flag">wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL</property>

                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>

                                                                <property name="proportion">0</property>

                                                                <property name="proportion">0</property>

                                                                <object class="wxStaticText" expanded="1">

                                                                <object class="wxStaticText" expanded="1">

                                                                    <property name="BottomDockable">1</property>

                                                                    <property name="BottomDockable">1</property>
@@ -1783,7 +1783,7 @@ 
                                                            <property name="permission">none</property>

                                                            <property name="permission">none</property>

                                                            <object class="sizeritem" expanded="1">

                                                            <object class="sizeritem" expanded="1">

                                                                <property name="border">5</property>

                                                                <property name="border">5</property>

                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT</property>

                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>

                                                                <property name="proportion">0</property>

                                                                <property name="proportion">0</property>

                                                                <object class="wxStaticText" expanded="1">

                                                                <object class="wxStaticText" expanded="1">

                                                                    <property name="BottomDockable">1</property>

                                                                    <property name="BottomDockable">1</property>
@@ -1990,7 +1990,7 @@ 
                                                    <event name="OnUpdateUI"></event>

                                                    <event name="OnUpdateUI"></event>

                                                    <object class="sizeritem" expanded="1">

                                                    <object class="sizeritem" expanded="1">

                                                        <property name="border">5</property>

                                                        <property name="border">5</property>

                                                        <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL</property>

                                                        <property name="flag">wxALL</property>

                                                        <property name="proportion">0</property>

                                                        <property name="proportion">0</property>

                                                        <object class="wxStaticText" expanded="1">

                                                        <object class="wxStaticText" expanded="1">

                                                            <property name="BottomDockable">1</property>

                                                            <property name="BottomDockable">1</property>