haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
kicad/eeschema/dialogs/dialog_edit_label_base.cpp

117 lines
5.1 KiB
C++
Raw Normal View History

1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
///////////////////////////////////////////////////////////////////////////
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
// C++ code generated with wxFormBuilder (version Dec 30 2017)
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
// http://www.wxformbuilder.org/
//
Standardize colons in edit label dialog
2018-04-23 18:36:56 +00:00
// PLEASE DO *NOT* EDIT THIS FILE!
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
///////////////////////////////////////////////////////////////////////////
#include "dialog_edit_label_base.h"
///////////////////////////////////////////////////////////////////////////
DIALOG_LABEL_EDITOR_BASE::DIALOG_LABEL_EDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxVERTICAL );
m_textControlSizer = new wxFlexGridSizer( 2, 2, 3, 3 );
m_textControlSizer->AddGrowableCol( 1 );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_textControlSizer->AddGrowableRow( 0 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
m_textControlSizer->SetFlexibleDirection( wxBOTH );
m_textControlSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_staticText1 = new wxStaticText( this, wxID_ANY, _("&Text:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText1->Wrap( -1 );
m_staticText1->SetToolTip( _("Enter the text to be used within the schematic") );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_textControlSizer->Add( m_staticText1, 0, wxALIGN_TOP|wxRIGHT|wxTOP, 3 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
wxBoxSizer* bSizeText;
bSizeText = new wxBoxSizer( wxVERTICAL );
Improvement for label edit dialog in eeschema: - Added wxTE_RICH property to label text controls (allows ctrl+backspace in Windows) - Added numeric validator to text size
2017-03-07 13:32:34 +00:00
m_textLabelSingleLine = new wxTextCtrl( this, wxID_VALUESINGLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER|wxTE_RICH );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_textLabelSingleLine->SetMinSize( wxSize( 360,-1 ) );
Eeschema bus label test bug fixes. (fixes lp:1209424) * Use a regular expression to enforce more stringent bus label testing. * Add validator to edit label dialog to prevent space character from being used in labels.
2013-08-13 23:04:41 +00:00
m_textLabelSingleLine->SetValidator( wxTextValidator( wxFILTER_EXCLUDE_CHAR_LIST, &m_labelText ) );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
bSizeText->Add( m_textLabelSingleLine, 0, wxBOTTOM|wxEXPAND|wxLEFT, 3 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
Don't use wxTE_RICH in label editing dialog Fixes: lp:1742296 * https://bugs.launchpad.net/kicad/+bug/1742296
2018-03-25 02:21:42 +00:00
m_textLabelMultiLine = new wxTextCtrl( this, wxID_VALUEMULTI, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_textLabelMultiLine->SetMinSize( wxSize( 480,72 ) );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
bSizeText->Add( m_textLabelMultiLine, 1, wxBOTTOM|wxEXPAND|wxLEFT, 3 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
m_textControlSizer->Add( bSizeText, 1, wxEXPAND, 3 );
m_SizeTitle = new wxStaticText( this, wxID_ANY, _("&Size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeTitle->Wrap( -1 );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_textControlSizer->Add( m_SizeTitle, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 3 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
wxBoxSizer* bSizeCtrlSizer;
bSizeCtrlSizer = new wxBoxSizer( wxHORIZONTAL );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_TextSizeCtrl = new wxTextCtrl( this, wxID_SIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizeCtrlSizer->Add( m_TextSizeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 3 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
m_staticSizeUnits = new wxStaticText( this, wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticSizeUnits->Wrap( -1 );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
bSizeCtrlSizer->Add( m_staticSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 2 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
m_textControlSizer->Add( bSizeCtrlSizer, 1, wxEXPAND, 3 );
bMainSizer->Add( m_textControlSizer, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 12 );
wxBoxSizer* m_OptionsSizer;
m_OptionsSizer = new wxBoxSizer( wxHORIZONTAL );
wxString m_TextOrientChoices[] = { _("Right"), _("Up"), _("Left"), _("Down") };
int m_TextOrientNChoices = sizeof( m_TextOrientChoices ) / sizeof( wxString );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_TextOrient = new wxRadioBox( this, wxID_ANY, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_TextOrientNChoices, m_TextOrientChoices, 1, wxRA_SPECIFY_COLS );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
m_TextOrient->SetSelection( 0 );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_OptionsSizer->Add( m_TextOrient, 1, wxRIGHT|wxTOP|wxEXPAND, 3 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
Common, 3D viewer, CvPcb, and Eeschema dialog tweaks. Improve dialog layout and fix UI policy issues with all of the dialog boxes in the common, 3D viewer, CvPcb, and Eeschema code paths. Updated the use of component to symbol.
2017-12-26 14:38:45 +00:00
wxString m_TextStyleChoices[] = { _("Normal"), _("Italic"), _("Bold"), _("Bold and italic") };
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
int m_TextStyleNChoices = sizeof( m_TextStyleChoices ) / sizeof( wxString );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_TextStyle = new wxRadioBox( this, wxID_ANY, _("Style"), wxDefaultPosition, wxDefaultSize, m_TextStyleNChoices, m_TextStyleChoices, 1, wxRA_SPECIFY_COLS );
Common, 3D viewer, CvPcb, and Eeschema dialog tweaks. Improve dialog layout and fix UI policy issues with all of the dialog boxes in the common, 3D viewer, CvPcb, and Eeschema code paths. Updated the use of component to symbol.
2017-12-26 14:38:45 +00:00
m_TextStyle->SetSelection( 3 );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_OptionsSizer->Add( m_TextStyle, 1, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 3 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
wxString m_TextShapeChoices[] = { _("Input"), _("Output"), _("Bidirectional"), _("Tri-state"), _("Passive") };
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
int m_TextShapeNChoices = sizeof( m_TextShapeChoices ) / sizeof( wxString );
Switch UNIT_BINDER and DIALOG_SHIM to local units. The general idea is to support user-units inheritance. The UNIT_BINDER allows wrapped controls to inherit units from their parent dialog, while KEYWAY_HOLDER and DIALOG_SHIM allow child KEYWAY_HOLDERs or DIALOG_SHIMs to inherit units from their parent. The GetUserUnits() method signature has to move to KEYWAY_HOLDER rather than KEYWAY_PLAYER (where it makes more sense) as it’s the only common ancestor of KEYWAY_PLAYER and DIALOG_SHIM. As long as we'll be using the UNIT_BINDER more widely, it also makes sense to move evaluation and validation into it. This commit also provides eeschema’s DIALOG_LABEL_EDITOR and pcbnew’s DIALOG_TRACK_VIA_PROPERTIES and DIALOG_SET_GRID as models of how to use the new user-units inheritance, eval, and validation. Fixes: lp:593795 * https://bugs.launchpad.net/kicad/+bug/593795 (cherry picked from commit c8bc53e)
2018-02-03 09:09:53 +00:00
m_TextShape = new wxRadioBox( this, wxID_ANY, _("Shape"), wxDefaultPosition, wxDefaultSize, m_TextShapeNChoices, m_TextShapeChoices, 1, wxRA_SPECIFY_COLS );
m_TextShape->SetSelection( 3 );
m_OptionsSizer->Add( m_TextShape, 1, wxALL|wxLEFT|wxTOP|wxEXPAND, 3 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
bMainSizer->Add( m_OptionsSizer, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 12 );
m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK );
m_sdbSizer1->AddButton( m_sdbSizer1OK );
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
m_sdbSizer1->Realize();
Common, 3D viewer, CvPcb, and Eeschema dialog tweaks. Improve dialog layout and fix UI policy issues with all of the dialog boxes in the common, 3D viewer, CvPcb, and Eeschema code paths. Updated the use of component to symbol.
2017-12-26 14:38:45 +00:00
bMainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 );
1) Add "rules" to base of tree for copying into BZR_HOME/rules. File "rules" has instructional text as comments near top. 2) Convert all text files in repo to LF line ending form. Any checkout done with "rules" in play will convert the working tree to native line ending, while keeping repo as LF line ending.
2013-05-26 04:36:44 +00:00
this->SetSizer( bMainSizer );
this->Layout();
bMainSizer->Fit( this );
// Connect Events
m_textLabelSingleLine->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_LABEL_EDITOR_BASE::OnEnterKey ), NULL, this );
}
DIALOG_LABEL_EDITOR_BASE::~DIALOG_LABEL_EDITOR_BASE()
{
// Disconnect Events
m_textLabelSingleLine->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_LABEL_EDITOR_BASE::OnEnterKey ), NULL, this );
}