Revert some dialog changes that lost button sizes.
These are required on MSW. Also back-dates the .fbp file to work on Mac wxFormBuilder.
This commit is contained in:
Jeff Young
parent
d72fdaed29
commit
3c455949fc
|
|
@ -97,6 +97,12 @@ DIALOG_FOOTPRINT_BOARD_EDITOR::DIALOG_FOOTPRINT_BOARD_EDITOR( PCB_EDIT_FRAME* aP
|
|||
m_config->Read( FootprintTextShownColumnsKey, &shownColumns, wxT( "0 1 2 3 4 5 6" ) );
|
||||
m_itemsGrid->ShowHideColumns( shownColumns );
|
||||
|
||||
#ifdef __WXOSX_MAC__
|
||||
// Knock the margins off on Mac
|
||||
m_sizerAP->GetItem( m_sizerAllow90 )->SetFlag( wxEXPAND );
|
||||
m_sizerAP->GetItem( m_sizerAllow180 )->SetFlag( wxEXPAND );
|
||||
#endif
|
||||
|
||||
// Set up the 3D models grid
|
||||
wxGridCellAttr* attr = new wxGridCellAttr;
|
||||
attr->SetRenderer( new wxGridCellBoolRenderer() );
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Aug 2 2018)
|
||||
// C++ code generated with wxFormBuilder (version Dec 30 2017)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||
|
|
@ -176,16 +176,16 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
|
|||
sbOrientationSizer->Add( gbSizer1, 1, wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerLeft->Add( sbOrientationSizer, 0, wxEXPAND|wxALL, 5 );
|
||||
bSizerLeft->Add( sbOrientationSizer, 1, wxEXPAND|wxALL, 5 );
|
||||
|
||||
wxString m_LayerCtrlChoices[] = { _("Front"), _("Back") };
|
||||
int m_LayerCtrlNChoices = sizeof( m_LayerCtrlChoices ) / sizeof( wxString );
|
||||
m_LayerCtrl = new wxRadioBox( m_PanelGeneral, wxID_ANY, _("Board Side"), wxDefaultPosition, wxDefaultSize, m_LayerCtrlNChoices, m_LayerCtrlChoices, 1, wxRA_SPECIFY_COLS );
|
||||
m_LayerCtrl->SetSelection( 0 );
|
||||
bSizerLeft->Add( m_LayerCtrl, 1, wxALL|wxEXPAND, 5 );
|
||||
bSizerLeft->Add( m_LayerCtrl, 0, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerProperties->Add( bSizerLeft, 8, wxEXPAND, 5 );
|
||||
bSizerProperties->Add( bSizerLeft, 1, wxEXPAND, 5 );
|
||||
|
||||
wxBoxSizer* bSizerMiddle;
|
||||
bSizerMiddle = new wxBoxSizer( wxVERTICAL );
|
||||
|
|
@ -196,44 +196,41 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
|
|||
m_AutoPlaceCtrl->SetSelection( 0 );
|
||||
bSizerMiddle->Add( m_AutoPlaceCtrl, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
wxStaticBoxSizer* sbSizerAP;
|
||||
sbSizerAP = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, _("Auto-placement Rules") ), wxVERTICAL );
|
||||
m_sizerAP = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, _("Auto-placement Rules") ), wxVERTICAL );
|
||||
|
||||
wxBoxSizer* bSizerRotOpt;
|
||||
bSizerRotOpt = new wxBoxSizer( wxVERTICAL );
|
||||
m_sizerAllow90 = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_allow90Label = new wxStaticText( sbSizerAP->GetStaticBox(), wxID_ANY, _("Allow 90 degree rotated placement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_allow90Label = new wxStaticText( m_sizerAP->GetStaticBox(), wxID_ANY, _("Allow 90 degree rotated placement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_allow90Label->Wrap( -1 );
|
||||
m_allow90Label->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
|
||||
|
||||
bSizerRotOpt->Add( m_allow90Label, 0, 0, 5 );
|
||||
m_sizerAllow90->Add( m_allow90Label, 0, 0, 5 );
|
||||
|
||||
m_CostRot90Ctrl = new wxSlider( sbSizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
|
||||
bSizerRotOpt->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||
m_CostRot90Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
|
||||
m_sizerAllow90->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
|
||||
sbSizerAP->Add( bSizerRotOpt, 1, wxEXPAND|wxTOP, 5 );
|
||||
m_sizerAP->Add( m_sizerAllow90, 1, wxEXPAND|wxTOP, 5 );
|
||||
|
||||
wxBoxSizer* bSizerMoveOpt;
|
||||
bSizerMoveOpt = new wxBoxSizer( wxVERTICAL );
|
||||
m_sizerAllow180 = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_allow180Label = new wxStaticText( sbSizerAP->GetStaticBox(), wxID_ANY, _("Allow 180 degree rotated placement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_allow180Label = new wxStaticText( m_sizerAP->GetStaticBox(), wxID_ANY, _("Allow 180 degree rotated placement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_allow180Label->Wrap( -1 );
|
||||
m_allow180Label->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
|
||||
|
||||
bSizerMoveOpt->Add( m_allow180Label, 0, 0, 5 );
|
||||
m_sizerAllow180->Add( m_allow180Label, 0, wxTOP, 5 );
|
||||
|
||||
m_CostRot180Ctrl = new wxSlider( sbSizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
|
||||
bSizerMoveOpt->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||
m_CostRot180Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
|
||||
m_sizerAllow180->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
|
||||
sbSizerAP->Add( bSizerMoveOpt, 1, wxEXPAND|wxTOP, 5 );
|
||||
m_sizerAP->Add( m_sizerAllow180, 1, wxEXPAND|wxTOP, 5 );
|
||||
|
||||
|
||||
bSizerMiddle->Add( sbSizerAP, 0, wxEXPAND|wxALL, 5 );
|
||||
bSizerMiddle->Add( m_sizerAP, 0, wxEXPAND|wxALL, 5 );
|
||||
|
||||
|
||||
bSizerProperties->Add( bSizerMiddle, 8, wxEXPAND|wxTOP, 5 );
|
||||
bSizerProperties->Add( bSizerMiddle, 1, wxEXPAND|wxTOP, 5 );
|
||||
|
||||
wxBoxSizer* bSizerRight;
|
||||
bSizerRight = new wxBoxSizer( wxVERTICAL );
|
||||
|
|
@ -242,7 +239,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
|
|||
bButtonsSizer = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_buttonUpdate = new wxButton( m_PanelGeneral, ID_MODULE_PROPERTIES_UPDATE, _("Update Footprint from Library..."), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
bButtonsSizer->Add( m_buttonUpdate, 0, wxEXPAND|wxALL, 5 );
|
||||
bButtonsSizer->Add( m_buttonUpdate, 0, wxALL|wxEXPAND, 5 );
|
||||
|
||||
m_buttonExchange = new wxButton( m_PanelGeneral, ID_MODULE_PROPERTIES_EXCHANGE, _("Change Footprint..."), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
bButtonsSizer->Add( m_buttonExchange, 0, wxEXPAND|wxALL, 5 );
|
||||
|
|
@ -263,7 +260,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
|
|||
bSizerRight->Add( m_AttributsCtrl, 0, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerProperties->Add( bSizerRight, 8, wxEXPAND|wxTOP, 5 );
|
||||
bSizerProperties->Add( bSizerRight, 1, wxEXPAND|wxTOP, 5 );
|
||||
|
||||
|
||||
m_PanelPropertiesBoxSizer->Add( bSizerProperties, 0, wxEXPAND, 5 );
|
||||
|
|
@ -521,6 +518,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
|
|||
|
||||
this->SetSizer( m_GeneralBoxSizer );
|
||||
this->Layout();
|
||||
m_GeneralBoxSizer->Fit( this );
|
||||
|
||||
// Connect Events
|
||||
this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::OnInitDlg ) );
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Aug 2 2018)
|
||||
// C++ code generated with wxFormBuilder (version Dec 30 2017)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||
|
|
@ -21,10 +21,10 @@ class WX_GRID;
|
|||
#include <wx/font.h>
|
||||
#include <wx/grid.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/bmpbuttn.h>
|
||||
#include <wx/bitmap.h>
|
||||
#include <wx/image.h>
|
||||
#include <wx/icon.h>
|
||||
#include <wx/bmpbuttn.h>
|
||||
#include <wx/button.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/statbox.h>
|
||||
|
|
@ -75,8 +75,11 @@ class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE : public DIALOG_SHIM
|
|||
wxTextCtrl* m_OrientValueCtrl;
|
||||
wxRadioBox* m_LayerCtrl;
|
||||
wxRadioBox* m_AutoPlaceCtrl;
|
||||
wxStaticBoxSizer* m_sizerAP;
|
||||
wxBoxSizer* m_sizerAllow90;
|
||||
wxStaticText* m_allow90Label;
|
||||
wxSlider* m_CostRot90Ctrl;
|
||||
wxBoxSizer* m_sizerAllow180;
|
||||
wxStaticText* m_allow180Label;
|
||||
wxSlider* m_CostRot180Ctrl;
|
||||
wxButton* m_buttonUpdate;
|
||||
|
|
@ -139,7 +142,7 @@ class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE : public DIALOG_SHIM
|
|||
|
||||
public:
|
||||
|
||||
DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 697,553 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||
DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||
~DIALOG_FOOTPRINT_BOARD_EDITOR_BASE();
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -94,6 +94,12 @@ DIALOG_FOOTPRINT_FP_EDITOR::DIALOG_FOOTPRINT_FP_EDITOR( FOOTPRINT_EDIT_FRAME* aP
|
|||
m_config->Read( LibFootprintTextShownColumnsKey, &shownColumns, wxT( "0 1 2 3 4 5 6" ) );
|
||||
m_itemsGrid->ShowHideColumns( shownColumns );
|
||||
|
||||
#ifdef __WXOSX_MAC__
|
||||
// Knock the margins off on Mac
|
||||
m_sizerAP->GetItem( m_sizerAllow90 )->SetFlag( wxEXPAND );
|
||||
m_sizerAP->GetItem( m_sizerAllow180 )->SetFlag( wxEXPAND );
|
||||
#endif
|
||||
|
||||
// Set up the 3D models grid
|
||||
wxGridCellAttr* attr = new wxGridCellAttr;
|
||||
attr->SetRenderer( new wxGridCellBoolRenderer() );
|
||||
|
|
@ -175,21 +181,9 @@ DIALOG_FOOTPRINT_FP_EDITOR::~DIALOG_FOOTPRINT_FP_EDITOR()
|
|||
bool DIALOG_FOOTPRINT_FP_EDITOR::TransferDataToWindow()
|
||||
{
|
||||
LIB_ID fpID = m_footprint->GetFPID();
|
||||
wxString libNickname = fpID.GetLibNickname();
|
||||
wxString libPath = wxEmptyString;
|
||||
wxString footprintName = fpID.GetLibItemName();
|
||||
|
||||
try
|
||||
{
|
||||
libPath = Prj().PcbFootprintLibs()->FindRow( libNickname )->GetFullURI( true );
|
||||
}
|
||||
catch( const IO_ERROR& )
|
||||
{
|
||||
// not critical; it's just for the status display
|
||||
}
|
||||
|
||||
m_FootprintNameCtrl->SetValue( footprintName );
|
||||
m_libraryName->SetLabel( wxString::Format( wxT( "%s (%s)" ), libNickname, libPath ) );
|
||||
|
||||
m_DocCtrl->SetValue( m_footprint->GetDescription() );
|
||||
m_KeywordCtrl->SetValue( m_footprint->GetKeywords() );
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Aug 2 2018)
|
||||
// C++ code generated with wxFormBuilder (version Dec 30 2017)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||
|
|
@ -26,7 +26,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
|
|||
wxStaticBoxSizer* sbSizerTexts;
|
||||
sbSizerTexts = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, wxEmptyString ), wxVERTICAL );
|
||||
|
||||
m_itemsGrid = new WX_GRID( sbSizerTexts->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_SIMPLE );
|
||||
m_itemsGrid = new WX_GRID( sbSizerTexts->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSIMPLE_BORDER );
|
||||
|
||||
// Grid
|
||||
m_itemsGrid->CreateGrid( 2, 11 );
|
||||
|
|
@ -81,10 +81,14 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
|
|||
wxBoxSizer* bButtonSize;
|
||||
bButtonSize = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_bpAdd = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bpAdd = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
|
||||
m_bpAdd->SetMinSize( wxSize( 30,29 ) );
|
||||
|
||||
bButtonSize->Add( m_bpAdd, 0, 0, 5 );
|
||||
|
||||
m_bpDelete = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bpDelete = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
|
||||
m_bpDelete->SetMinSize( wxSize( 30,29 ) );
|
||||
|
||||
bButtonSize->Add( m_bpDelete, 0, wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
|
||||
|
|
@ -97,27 +101,18 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
|
|||
m_PanelPropertiesBoxSizer->Add( sbSizerTexts, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
wxFlexGridSizer* fgSizerFPID;
|
||||
fgSizerFPID = new wxFlexGridSizer( 4, 2, 0, 0 );
|
||||
fgSizerFPID = new wxFlexGridSizer( 4, 2, 3, 0 );
|
||||
fgSizerFPID->AddGrowableCol( 1 );
|
||||
fgSizerFPID->SetFlexibleDirection( wxBOTH );
|
||||
fgSizerFPID->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||
|
||||
wxStaticText* staticLibraryLabel;
|
||||
staticLibraryLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, _("Library:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
staticLibraryLabel->Wrap( -1 );
|
||||
fgSizerFPID->Add( staticLibraryLabel, 0, wxALL, 5 );
|
||||
|
||||
m_libraryName = new wxStaticText( m_PanelGeneral, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_libraryName->Wrap( -1 );
|
||||
fgSizerFPID->Add( m_libraryName, 0, wxEXPAND|wxALL, 5 );
|
||||
|
||||
wxStaticText* staticFPNameLabel;
|
||||
staticFPNameLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, _("Footprint name:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
staticFPNameLabel->Wrap( -1 );
|
||||
fgSizerFPID->Add( staticFPNameLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
|
||||
|
||||
m_FootprintNameCtrl = new wxTextCtrl( m_PanelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerFPID->Add( m_FootprintNameCtrl, 0, wxALL|wxEXPAND, 5 );
|
||||
fgSizerFPID->Add( m_FootprintNameCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
wxStaticText* staticDescriptionLabel;
|
||||
staticDescriptionLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, _("Description:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
|
|
@ -125,17 +120,17 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
|
|||
fgSizerFPID->Add( staticDescriptionLabel, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_DocCtrl = new wxTextCtrl( m_PanelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerFPID->Add( m_DocCtrl, 0, wxALL|wxEXPAND, 5 );
|
||||
fgSizerFPID->Add( m_DocCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
staticKeywordsLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, _("Keywords:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
staticKeywordsLabel->Wrap( -1 );
|
||||
fgSizerFPID->Add( staticKeywordsLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||
fgSizerFPID->Add( staticKeywordsLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
m_KeywordCtrl = new wxTextCtrl( m_PanelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerFPID->Add( m_KeywordCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||
fgSizerFPID->Add( m_KeywordCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
|
||||
m_PanelPropertiesBoxSizer->Add( fgSizerFPID, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||
m_PanelPropertiesBoxSizer->Add( fgSizerFPID, 0, wxEXPAND|wxALL, 5 );
|
||||
|
||||
wxBoxSizer* bSizerProperties;
|
||||
bSizerProperties = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
|
@ -144,49 +139,46 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
|
|||
int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString );
|
||||
m_AutoPlaceCtrl = new wxRadioBox( m_PanelGeneral, wxID_ANY, _("Move and Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS );
|
||||
m_AutoPlaceCtrl->SetSelection( 0 );
|
||||
bSizerProperties->Add( m_AutoPlaceCtrl, 1, wxRIGHT|wxLEFT, 5 );
|
||||
bSizerProperties->Add( m_AutoPlaceCtrl, 1, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
wxStaticBoxSizer* sbSizerAP;
|
||||
sbSizerAP = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, _("Auto-placement Rules") ), wxVERTICAL );
|
||||
m_sizerAP = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, _("Auto-placement Rules") ), wxVERTICAL );
|
||||
|
||||
wxBoxSizer* bSizerRotOpt;
|
||||
bSizerRotOpt = new wxBoxSizer( wxVERTICAL );
|
||||
m_sizerAllow90 = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_allow90Label = new wxStaticText( sbSizerAP->GetStaticBox(), wxID_ANY, _("Allow 90 degree rotated placement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_allow90Label = new wxStaticText( m_sizerAP->GetStaticBox(), wxID_ANY, _("Allow 90 degree rotated placement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_allow90Label->Wrap( -1 );
|
||||
m_allow90Label->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
|
||||
|
||||
bSizerRotOpt->Add( m_allow90Label, 0, 0, 5 );
|
||||
m_sizerAllow90->Add( m_allow90Label, 0, 0, 5 );
|
||||
|
||||
m_CostRot90Ctrl = new wxSlider( sbSizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
|
||||
bSizerRotOpt->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||
m_CostRot90Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
|
||||
m_sizerAllow90->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
|
||||
sbSizerAP->Add( bSizerRotOpt, 1, wxEXPAND|wxTOP, 5 );
|
||||
m_sizerAP->Add( m_sizerAllow90, 1, wxEXPAND|wxTOP, 5 );
|
||||
|
||||
wxBoxSizer* bSizerMoveOpt;
|
||||
bSizerMoveOpt = new wxBoxSizer( wxVERTICAL );
|
||||
m_sizerAllow180 = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_allow180Label = new wxStaticText( sbSizerAP->GetStaticBox(), wxID_ANY, _("Allow 180 degree rotated placement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_allow180Label = new wxStaticText( m_sizerAP->GetStaticBox(), wxID_ANY, _("Allow 180 degree rotated placement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_allow180Label->Wrap( -1 );
|
||||
m_allow180Label->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
|
||||
|
||||
bSizerMoveOpt->Add( m_allow180Label, 0, wxTOP, 5 );
|
||||
m_sizerAllow180->Add( m_allow180Label, 0, wxTOP, 5 );
|
||||
|
||||
m_CostRot180Ctrl = new wxSlider( sbSizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
|
||||
bSizerMoveOpt->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||
m_CostRot180Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
|
||||
m_sizerAllow180->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
|
||||
sbSizerAP->Add( bSizerMoveOpt, 1, wxEXPAND|wxTOP, 5 );
|
||||
m_sizerAP->Add( m_sizerAllow180, 1, wxEXPAND|wxTOP, 5 );
|
||||
|
||||
|
||||
bSizerProperties->Add( sbSizerAP, 1, wxEXPAND, 10 );
|
||||
bSizerProperties->Add( m_sizerAP, 1, wxEXPAND|wxTOP, 5 );
|
||||
|
||||
wxString m_AttributsCtrlChoices[] = { _("Through hole"), _("Surface mount"), _("Virtual") };
|
||||
int m_AttributsCtrlNChoices = sizeof( m_AttributsCtrlChoices ) / sizeof( wxString );
|
||||
m_AttributsCtrl = new wxRadioBox( m_PanelGeneral, wxID_ANY, _("Fabrication Attributes"), wxDefaultPosition, wxDefaultSize, m_AttributsCtrlNChoices, m_AttributsCtrlChoices, 1, wxRA_SPECIFY_COLS );
|
||||
m_AttributsCtrl->SetSelection( 1 );
|
||||
bSizerProperties->Add( m_AttributsCtrl, 1, wxRIGHT|wxLEFT, 5 );
|
||||
bSizerProperties->Add( m_AttributsCtrl, 1, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
|
||||
m_PanelPropertiesBoxSizer->Add( bSizerProperties, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
|
||||
|
|
@ -195,7 +187,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
|
|||
m_PanelGeneral->SetSizer( m_PanelPropertiesBoxSizer );
|
||||
m_PanelGeneral->Layout();
|
||||
m_PanelPropertiesBoxSizer->Fit( m_PanelGeneral );
|
||||
m_NoteBook->AddPage( m_PanelGeneral, _("General"), false );
|
||||
m_NoteBook->AddPage( m_PanelGeneral, _("General"), true );
|
||||
m_PanelClearances = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||
wxBoxSizer* bSizerPanelClearances;
|
||||
bSizerPanelClearances = new wxBoxSizer( wxVERTICAL );
|
||||
|
|
@ -318,7 +310,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
|
|||
wxStaticBoxSizer* sbSizer3;
|
||||
sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, wxEmptyString ), wxVERTICAL );
|
||||
|
||||
m_modelsGrid = new wxGrid( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE );
|
||||
m_modelsGrid = new wxGrid( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER );
|
||||
|
||||
// Grid
|
||||
m_modelsGrid->CreateGrid( 3, 2 );
|
||||
|
|
@ -351,16 +343,16 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
|
|||
wxBoxSizer* bSizer3DButtons;
|
||||
bSizer3DButtons = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_button3DShapeAdd = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
|
||||
m_button3DShapeAdd = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,29 ), wxBU_AUTODRAW );
|
||||
bSizer3DButtons->Add( m_button3DShapeAdd, 0, wxTOP|wxBOTTOM, 5 );
|
||||
|
||||
m_button3DShapeBrowse = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
|
||||
m_button3DShapeBrowse = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,29 ), wxBU_AUTODRAW );
|
||||
bSizer3DButtons->Add( m_button3DShapeBrowse, 0, wxALL, 5 );
|
||||
|
||||
|
||||
bSizer3DButtons->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
m_button3DShapeRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
|
||||
m_button3DShapeRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,29 ), wxBU_AUTODRAW );
|
||||
bSizer3DButtons->Add( m_button3DShapeRemove, 0, wxTOP|wxBOTTOM, 5 );
|
||||
|
||||
|
||||
|
|
@ -384,7 +376,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
|
|||
m_Panel3D->SetSizer( bSizerMain3D );
|
||||
m_Panel3D->Layout();
|
||||
bSizerMain3D->Fit( m_Panel3D );
|
||||
m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), true );
|
||||
m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), false );
|
||||
|
||||
m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Aug 2 2018)
|
||||
// C++ code generated with wxFormBuilder (version Dec 30 2017)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||
|
|
@ -21,10 +21,10 @@ class WX_GRID;
|
|||
#include <wx/font.h>
|
||||
#include <wx/grid.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/bmpbuttn.h>
|
||||
#include <wx/bitmap.h>
|
||||
#include <wx/image.h>
|
||||
#include <wx/icon.h>
|
||||
#include <wx/bmpbuttn.h>
|
||||
#include <wx/button.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/statbox.h>
|
||||
|
|
@ -55,14 +55,16 @@ class DIALOG_FOOTPRINT_FP_EDITOR_BASE : public DIALOG_SHIM
|
|||
WX_GRID* m_itemsGrid;
|
||||
wxBitmapButton* m_bpAdd;
|
||||
wxBitmapButton* m_bpDelete;
|
||||
wxStaticText* m_libraryName;
|
||||
wxTextCtrl* m_FootprintNameCtrl;
|
||||
wxTextCtrl* m_DocCtrl;
|
||||
wxStaticText* staticKeywordsLabel;
|
||||
wxTextCtrl* m_KeywordCtrl;
|
||||
wxRadioBox* m_AutoPlaceCtrl;
|
||||
wxStaticBoxSizer* m_sizerAP;
|
||||
wxBoxSizer* m_sizerAllow90;
|
||||
wxStaticText* m_allow90Label;
|
||||
wxSlider* m_CostRot90Ctrl;
|
||||
wxBoxSizer* m_sizerAllow180;
|
||||
wxStaticText* m_allow180Label;
|
||||
wxSlider* m_CostRot180Ctrl;
|
||||
wxRadioBox* m_AttributsCtrl;
|
||||
|
|
|
|||
Loading…
Reference in New Issue