diff --git a/eeschema/dialogs/panel_eeschema_display_options_base.fbp b/eeschema/dialogs/panel_eeschema_display_options_base.fbp index a5d6ba7fbc..b75c8bcce3 100644 --- a/eeschema/dialogs/panel_eeschema_display_options_base.fbp +++ b/eeschema/dialogs/panel_eeschema_display_options_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 1 PanelEeschemaDisplayOptions - + . - + 1 1 1 @@ -29,57 +29,57 @@ 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + PANEL_EESCHEMA_DISPLAY_OPTIONS_BASE - + -1,-1 ; forward_declare - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bPanelSizer wxHORIZONTAL none @@ -88,7 +88,7 @@ wxEXPAND|wxLEFT 1 - + m_galOptionsSizer wxVERTICAL protected @@ -99,7 +99,7 @@ wxEXPAND|wxRIGHT|wxLEFT 1 - + bRightColumn wxVERTICAL none @@ -110,12 +110,12 @@ wxID_ANY Dimensions - + sbSizer2 wxVERTICAL 1 none - + 5 wxBOTTOM|wxRIGHT|wxEXPAND @@ -124,7 +124,7 @@ 3 wxBOTH 1 - + 0 -1,-1 fgSizer32 @@ -141,78 +141,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY &Bus thickness: - + 0 - - + + 0 - + 1 m_busWidthLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -224,86 +224,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_busWidthCtrl 1 - - + + protected 1 - + Resizable 1 - + wxSP_ARROW_KEYS|wxSP_WRAP - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -315,78 +315,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY mils - + 0 - - + + 0 - + 1 m_busWidthUnits 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -398,78 +398,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY &Line thickness: - + 0 - - + + 0 - + 1 m_lineWidthLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -481,86 +481,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_lineWidthCtrl 1 - - + + protected 1 - + Resizable 1 - + wxSP_ARROW_KEYS|wxSP_WRAP - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -572,78 +572,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY mils - + 0 - - + + 0 - + 1 m_lineWidthUnits 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -655,78 +655,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Junction size: - + 0 - - + + 0 - + 1 m_jctSizeLabel 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -738,86 +738,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_jctSizeCtrl 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -829,78 +829,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY mils - + 0 - - + + 0 - + 1 m_jctSizeUnits 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -914,18 +914,18 @@ wxID_ANY Annotations - + sbSizer1 wxVERTICAL 1 none - + 5 wxEXPAND|wxRIGHT 0 - + bSizer6 wxHORIZONTAL none @@ -938,78 +938,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Symbol unit notation: - + 0 - - + + 0 - + 1 m_staticText26 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1021,83 +1021,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "A" ".A" "-A" "_A" ".1" "-1" "_1" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_choiceSeparatorRefId 1 - - + + protected 1 - + Resizable 0 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1121,83 +1121,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY S&how hidden pins - + 0 - - + + 0 - + 1 m_checkShowHiddenPins 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1209,83 +1209,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Show page limi&ts - + 0 - - + + 0 - + 1 m_checkPageLimits 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eeschema/dialogs/panel_eeschema_settings_base.cpp b/eeschema/dialogs/panel_eeschema_settings_base.cpp index 839d93f76d..a4d75e1e9c 100644 --- a/eeschema/dialogs/panel_eeschema_settings_base.cpp +++ b/eeschema/dialogs/panel_eeschema_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -13,14 +13,14 @@ BEGIN_EVENT_TABLE( PANEL_EESCHEMA_SETTINGS_BASE, wxPanel ) EVT_CHOICE( wxID_ANY, PANEL_EESCHEMA_SETTINGS_BASE::_wxFB_OnChooseUnits ) END_EVENT_TABLE() -PANEL_EESCHEMA_SETTINGS_BASE::PANEL_EESCHEMA_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +PANEL_EESCHEMA_SETTINGS_BASE::PANEL_EESCHEMA_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bPanelSizer; bPanelSizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bLeftColumn; bLeftColumn = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizer3; fgSizer3 = new wxFlexGridSizer( 0, 3, 3, 0 ); fgSizer3->AddGrowableCol( 0 ); @@ -28,97 +28,97 @@ PANEL_EESCHEMA_SETTINGS_BASE::PANEL_EESCHEMA_SETTINGS_BASE( wxWindow* parent, wx fgSizer3->AddGrowableCol( 2 ); fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText2 = new wxStaticText( this, wxID_ANY, _("&Measurement units:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); fgSizer3->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - + wxString m_choiceUnitsChoices[] = { _("inches"), _("millimeters") }; int m_choiceUnitsNChoices = sizeof( m_choiceUnitsChoices ) / sizeof( wxString ); m_choiceUnits = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitsNChoices, m_choiceUnitsChoices, 0 ); m_choiceUnits->SetSelection( 0 ); fgSizer3->Add( m_choiceUnits, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - - + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 3 ); - + m_textSizeLabel = new wxStaticText( this, wxID_ANY, _("Def&ault text size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textSizeLabel->Wrap( -1 ); fgSizer3->Add( m_textSizeLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - + m_textSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP ); fgSizer3->Add( m_textSizeCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM, 10 ); - + m_textSizeUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_textSizeUnits->Wrap( -1 ); fgSizer3->Add( m_textSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_hPitchLabel = new wxStaticText( this, wxID_ANY, _("&Horizontal pitch of repeated items:"), wxDefaultPosition, wxDefaultSize, 0 ); m_hPitchLabel->Wrap( -1 ); fgSizer3->Add( m_hPitchLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 10 ); - + m_hPitchCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP ); fgSizer3->Add( m_hPitchCtrl, 0, wxEXPAND|wxTOP, 5 ); - + m_hPitchUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_hPitchUnits->Wrap( -1 ); fgSizer3->Add( m_hPitchUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_vPitchLabel = new wxStaticText( this, wxID_ANY, _("&Vertical pitch of repeated items:"), wxDefaultPosition, wxDefaultSize, 0 ); m_vPitchLabel->Wrap( -1 ); fgSizer3->Add( m_vPitchLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - + m_vPitchCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP ); fgSizer3->Add( m_vPitchCtrl, 0, wxEXPAND, 5 ); - + m_vPitchUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_vPitchUnits->Wrap( -1 ); fgSizer3->Add( m_vPitchUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_staticText16 = new wxStaticText( this, wxID_ANY, _("&Increment of repeated labels:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText16->Wrap( -1 ); fgSizer3->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - + m_spinRepeatLabel = new wxSpinCtrl( this, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -10, 10, 1 ); fgSizer3->Add( m_spinRepeatLabel, 0, wxEXPAND|wxBOTTOM, 5 ); - - + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 3 ); - - + + bLeftColumn->Add( fgSizer3, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizer9; bSizer9 = new wxBoxSizer( wxVERTICAL ); - + m_checkHVOrientation = new wxCheckBox( this, wxID_ANY, _("&Restrict buses and wires to H and V orientation"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer9->Add( m_checkHVOrientation, 0, wxEXPAND|wxALL, 5 ); - + m_footprintPreview = new wxCheckBox( this, wxID_ANY, _("Show footprint previews in symbol chooser"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer9->Add( m_footprintPreview, 0, wxALL, 5 ); - - + + bLeftColumn->Add( bSizer9, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - + wxStaticBoxSizer* sbSizer1; sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Symbol Field Automatic Placement") ), wxVERTICAL ); - + m_checkAutoplaceFields = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("A&utomatically place symbol fields"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer1->Add( m_checkAutoplaceFields, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + sbSizer1->Add( m_checkAutoplaceFields, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + m_checkAutoplaceJustify = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("A&llow field autoplace to change justification"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer1->Add( m_checkAutoplaceJustify, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_checkAutoplaceAlign = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Al&ways align autoplaced fields to the 50 mil grid"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer1->Add( m_checkAutoplaceAlign, 0, wxEXPAND|wxALL, 5 ); - - + + bLeftColumn->Add( sbSizer1, 0, wxTOP|wxEXPAND, 5 ); - - + + bPanelSizer->Add( bLeftColumn, 0, wxRIGHT|wxLEFT, 5 ); - - + + this->SetSizer( bPanelSizer ); this->Layout(); bPanelSizer->Fit( this ); diff --git a/eeschema/dialogs/panel_eeschema_settings_base.fbp b/eeschema/dialogs/panel_eeschema_settings_base.fbp index 37af128a30..57b847a4f1 100644 --- a/eeschema/dialogs/panel_eeschema_settings_base.fbp +++ b/eeschema/dialogs/panel_eeschema_settings_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ panel_eeschema_settings_base 1000 none + 1 PanelEeschemaSettingsBase @@ -48,36 +49,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bPanelSizer @@ -141,6 +112,7 @@ 0 wxID_ANY &Measurement units: + 0 0 @@ -166,29 +138,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -253,30 +202,7 @@ - OnChooseUnits - - - - - - - - - - - - - - - - - - - - - - @@ -322,6 +248,7 @@ 0 wxID_ANY Def&ault text size: + 0 0 @@ -347,29 +274,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -434,33 +338,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -496,6 +373,7 @@ 0 wxID_ANY mils + 0 0 @@ -521,29 +399,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -579,6 +434,7 @@ 0 wxID_ANY &Horizontal pitch of repeated items: + 0 0 @@ -604,29 +460,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -691,33 +524,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -753,6 +559,7 @@ 0 wxID_ANY mils + 0 0 @@ -778,29 +585,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -836,6 +620,7 @@ 0 wxID_ANY &Vertical pitch of repeated items: + 0 0 @@ -861,29 +646,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -948,33 +710,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1010,6 +745,7 @@ 0 wxID_ANY mils + 0 0 @@ -1035,29 +771,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1093,6 +806,7 @@ 0 wxID_ANY &Increment of repeated labels: + 0 0 @@ -1118,29 +832,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1203,32 +894,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1314,30 +979,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1402,30 +1043,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1442,10 +1059,9 @@ wxVERTICAL 1 none - 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -1505,30 +1121,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1593,30 +1185,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1681,30 +1249,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eeschema/dialogs/panel_eeschema_settings_base.h b/eeschema/dialogs/panel_eeschema_settings_base.h index dca10837c9..106eb30afe 100644 --- a/eeschema/dialogs/panel_eeschema_settings_base.h +++ b/eeschema/dialogs/panel_eeschema_settings_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __PANEL_EESCHEMA_SETTINGS_BASE_H__ -#define __PANEL_EESCHEMA_SETTINGS_BASE_H__ +#pragma once #include #include @@ -30,15 +29,15 @@ /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_EESCHEMA_SETTINGS_BASE /////////////////////////////////////////////////////////////////////////////// -class PANEL_EESCHEMA_SETTINGS_BASE : public wxPanel +class PANEL_EESCHEMA_SETTINGS_BASE : public wxPanel { DECLARE_EVENT_TABLE() private: - + // Private event handlers void _wxFB_OnChooseUnits( wxCommandEvent& event ){ OnChooseUnits( event ); } - - + + protected: wxStaticText* m_staticText2; wxChoice* m_choiceUnits; @@ -58,16 +57,15 @@ class PANEL_EESCHEMA_SETTINGS_BASE : public wxPanel wxCheckBox* m_checkAutoplaceFields; wxCheckBox* m_checkAutoplaceJustify; wxCheckBox* m_checkAutoplaceAlign; - + // Virtual event handlers, overide them in your derived class virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - PANEL_EESCHEMA_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); + + PANEL_EESCHEMA_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_EESCHEMA_SETTINGS_BASE(); - + }; -#endif //__PANEL_EESCHEMA_SETTINGS_BASE_H__