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

175 lines
8.9 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
///////////////////////////////////////////////////////////////////////////
A few more visual adjustments to the new note text.
2020-05-07 13:49:51 +00:00
// C++ code generated with wxFormBuilder (version Oct 26 2018)
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/
//
Add a nicer bus / net name validator
2019-05-21 02:52:39 +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 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
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* bMainSizer;
bMainSizer = new wxBoxSizer( wxVERTICAL );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
m_textEntrySizer = new wxFlexGridSizer( 5, 2, 1, 3 );
Fix layout issues in Global Label dialog. Fixes: lp:1782904 * https://bugs.launchpad.net/kicad/+bug/1782904
2018-07-22 15:01:24 +00:00
m_textEntrySizer->AddGrowableCol( 1 );
Replace missing growable-row spec. Fixes: lp:1783545 * https://bugs.launchpad.net/kicad/+bug/1783545
2018-07-25 13:40:23 +00:00
m_textEntrySizer->AddGrowableRow( 1 );
Fix layout issues in Global Label dialog. Fixes: lp:1782904 * https://bugs.launchpad.net/kicad/+bug/1782904
2018-07-22 15:01:24 +00:00
m_textEntrySizer->SetFlexibleDirection( wxBOTH );
m_textEntrySizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Another attempt to fix the textbox scrollbars on GTK. Fixes https://gitlab.com/kicad/code/kicad/issues/4207
2020-04-18 20:40:54 +00:00
m_textEntrySizer->SetMinSize( wxSize( 500,-1 ) );
Fix layout issues in Global Label dialog. Fixes: lp:1782904 * https://bugs.launchpad.net/kicad/+bug/1782904
2018-07-22 15:01:24 +00:00
m_labelSingleLine = new wxStaticText( this, wxID_ANY, _("Label:"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelSingleLine->Wrap( -1 );
m_labelSingleLine->SetToolTip( _("Enter the text to be used within the schematic") );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
m_textEntrySizer->Add( m_labelSingleLine, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 2 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add existing label popup to properties dialog. Fixes: lp:1639719 * https://bugs.launchpad.net/kicad/+bug/1639719 Fixes: lp:1778330 * https://bugs.launchpad.net/kicad/+bug/1778330 (cherry picked from commit 14ebff6)
2018-06-27 13:21:26 +00:00
m_valueSingleLine = new wxTextCtrl( this, wxID_VALUESINGLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER|wxTE_RICH );
m_valueSingleLine->SetMinSize( wxSize( 360,-1 ) );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
m_textEntrySizer->Add( m_valueSingleLine, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 2 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Fix layout issues in Global Label dialog. Fixes: lp:1782904 * https://bugs.launchpad.net/kicad/+bug/1782904
2018-07-22 15:01:24 +00:00
m_labelMultiLine = new wxStaticText( this, wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelMultiLine->Wrap( -1 );
Add syntax help for text markup. Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-08 21:16:27 +00:00
m_textEntrySizer->Add( m_labelMultiLine, 0, wxTOP|wxRIGHT, 2 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Remove scrollbars from multi-line text ctrl. Fixes https://gitlab.com/kicad/code/kicad/issues/4207
2020-04-16 19:29:30 +00:00
m_valueMultiLine = new wxStyledTextCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN, wxEmptyString );
Move multi-line editor to Scintilla engine for undo/redo. Also allows cut/copy/paste and better WYSIWYG tab handling. Fixes: lp:1769193 * https://bugs.launchpad.net/kicad/+bug/1769193 Fixes: lp:1769150 * https://bugs.launchpad.net/kicad/+bug/1769150
2019-07-09 11:19:27 +00:00
m_valueMultiLine->SetUseTabs( true );
m_valueMultiLine->SetTabWidth( 4 );
m_valueMultiLine->SetIndent( 4 );
m_valueMultiLine->SetTabIndents( false );
m_valueMultiLine->SetBackSpaceUnIndents( false );
m_valueMultiLine->SetViewEOL( false );
m_valueMultiLine->SetViewWhiteSpace( false );
m_valueMultiLine->SetMarginWidth( 2, 0 );
m_valueMultiLine->SetIndentationGuides( false );
m_valueMultiLine->SetMarginWidth( 1, 0 );
m_valueMultiLine->SetMarginWidth( 0, 0 );
m_valueMultiLine->MarkerDefine( wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS );
m_valueMultiLine->MarkerSetBackground( wxSTC_MARKNUM_FOLDER, wxColour( wxT("BLACK") ) );
m_valueMultiLine->MarkerSetForeground( wxSTC_MARKNUM_FOLDER, wxColour( wxT("WHITE") ) );
m_valueMultiLine->MarkerDefine( wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_BOXMINUS );
m_valueMultiLine->MarkerSetBackground( wxSTC_MARKNUM_FOLDEROPEN, wxColour( wxT("BLACK") ) );
m_valueMultiLine->MarkerSetForeground( wxSTC_MARKNUM_FOLDEROPEN, wxColour( wxT("WHITE") ) );
m_valueMultiLine->MarkerDefine( wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_EMPTY );
m_valueMultiLine->MarkerDefine( wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_BOXPLUS );
m_valueMultiLine->MarkerSetBackground( wxSTC_MARKNUM_FOLDEREND, wxColour( wxT("BLACK") ) );
m_valueMultiLine->MarkerSetForeground( wxSTC_MARKNUM_FOLDEREND, wxColour( wxT("WHITE") ) );
m_valueMultiLine->MarkerDefine( wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BOXMINUS );
m_valueMultiLine->MarkerSetBackground( wxSTC_MARKNUM_FOLDEROPENMID, wxColour( wxT("BLACK") ) );
m_valueMultiLine->MarkerSetForeground( wxSTC_MARKNUM_FOLDEROPENMID, wxColour( wxT("WHITE") ) );
m_valueMultiLine->MarkerDefine( wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_EMPTY );
m_valueMultiLine->MarkerDefine( wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_EMPTY );
m_valueMultiLine->SetSelBackground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) );
m_valueMultiLine->SetSelForeground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
m_textEntrySizer->Add( m_valueMultiLine, 1, wxEXPAND|wxBOTTOM, 2 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Fix layout issues in Global Label dialog. Fixes: lp:1782904 * https://bugs.launchpad.net/kicad/+bug/1782904
2018-07-22 15:01:24 +00:00
m_labelCombo = new wxStaticText( this, wxID_ANY, _("Label:"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelCombo->Wrap( -1 );
m_textEntrySizer->Add( m_labelCombo, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
m_valueCombo = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxTE_PROCESS_ENTER );
Fix layout issues in Global Label dialog. Fixes: lp:1782904 * https://bugs.launchpad.net/kicad/+bug/1782904
2018-07-22 15:01:24 +00:00
m_valueCombo->SetMinSize( wxSize( 360,-1 ) );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
m_textEntrySizer->Add( m_valueCombo, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add existing label popup to properties dialog. Fixes: lp:1639719 * https://bugs.launchpad.net/kicad/+bug/1639719 Fixes: lp:1778330 * https://bugs.launchpad.net/kicad/+bug/1778330 (cherry picked from commit 14ebff6)
2018-06-27 13:21:26 +00:00
m_textSizeLabel = new wxStaticText( this, wxID_ANY, _("Text Size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_textSizeLabel->Wrap( -1 );
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
m_textEntrySizer->Add( m_textSizeLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 6 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
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 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add existing label popup to properties dialog. Fixes: lp:1639719 * https://bugs.launchpad.net/kicad/+bug/1639719 Fixes: lp:1778330 * https://bugs.launchpad.net/kicad/+bug/1778330 (cherry picked from commit 14ebff6)
2018-06-27 13:21:26 +00:00
m_textSizeCtrl = new wxTextCtrl( this, wxID_SIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
bSizeCtrlSizer->Add( m_textSizeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 6 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add note on spacing to Global Label Properties dialog. Also cleans up some of the other notes to have a uniform presentation. Fixes https://gitlab.com/kicad/code/kicad/issues/4323
2020-05-05 19:25:38 +00:00
m_textSizeUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
Add existing label popup to properties dialog. Fixes: lp:1639719 * https://bugs.launchpad.net/kicad/+bug/1639719 Fixes: lp:1778330 * https://bugs.launchpad.net/kicad/+bug/1778330 (cherry picked from commit 14ebff6)
2018-06-27 13:21:26 +00:00
m_textSizeUnits->Wrap( -1 );
Add syntax help for text markup. Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-08 21:16:27 +00:00
bSizeCtrlSizer->Add( m_textSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 6 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add syntax help for text markup. Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-08 21:16:27 +00:00
bSizeCtrlSizer->Add( 0, 0, 1, wxEXPAND, 15 );
Add note on spacing to Global Label Properties dialog. Also cleans up some of the other notes to have a uniform presentation. Fixes https://gitlab.com/kicad/code/kicad/issues/4323
2020-05-05 19:25:38 +00:00
Add syntax help for text markup. Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-08 21:16:27 +00:00
m_formattingHelp = new wxHyperlinkCtrl( this, wxID_ANY, _("Syntax help"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
Remove formbuild URL from hypertext links. Also adds a tooltip. Fixes https://gitlab.com/kicad/code/kicad/issues/6982
2021-01-07 15:11:46 +00:00
m_formattingHelp->SetToolTip( _("Show syntax help window") );
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
bSizeCtrlSizer->Add( m_formattingHelp, 0, wxBOTTOM|wxRIGHT|wxLEFT, 7 );
Add syntax help for text markup. Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-08 21:16:27 +00:00
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
m_textEntrySizer->Add( bSizeCtrlSizer, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 6 );
Add note on spacing to Global Label Properties dialog. Also cleans up some of the other notes to have a uniform presentation. Fixes https://gitlab.com/kicad/code/kicad/issues/4323
2020-05-05 19:25:38 +00:00
A few more visual adjustments to the new note text.
2020-05-07 13:49:51 +00:00
m_note1 = new wxStaticText( this, wxID_ANY, _("Note:"), wxDefaultPosition, wxDefaultSize, 0 );
m_note1->Wrap( -1 );
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
m_textEntrySizer->Add( m_note1, 0, wxTOP|wxRIGHT, 2 );
Add note on spacing to Global Label Properties dialog. Also cleans up some of the other notes to have a uniform presentation. Fixes https://gitlab.com/kicad/code/kicad/issues/4323
2020-05-05 19:25:38 +00:00
Add syntax help for text markup. Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-08 21:16:27 +00:00
m_note2 = new wxStaticText( this, wxID_ANY, _("The margins around the text are controlled by the text offset ratio\nin Schematic Setup > General > Formatting."), wxDefaultPosition, wxDefaultSize, 0 );
A few more visual adjustments to the new note text.
2020-05-07 13:49:51 +00:00
m_note2->Wrap( -1 );
Add syntax help for bus definitions (and upgrade parser to handle them). Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-10 17:38:44 +00:00
m_textEntrySizer->Add( m_note2, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 2 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Fix layout issues in Global Label dialog. Fixes: lp:1782904 * https://bugs.launchpad.net/kicad/+bug/1782904
2018-07-22 15:01:24 +00:00
bMainSizer->Add( m_textEntrySizer, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 12 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
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* m_OptionsSizer;
m_OptionsSizer = new wxBoxSizer( wxHORIZONTAL );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
wxString m_TextOrientChoices[] = { _("Left"), _("Up"), _("Right"), _("Down") };
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_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 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +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 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +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 );
Fix layout issues in Global Label dialog. Fixes: lp:1782904 * https://bugs.launchpad.net/kicad/+bug/1782904
2018-07-22 15:01:24 +00:00
m_OptionsSizer->Add( m_TextShape, 1, wxEXPAND|wxTOP|wxLEFT, 3 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Fix layout issues in Global Label dialog. Fixes: lp:1782904 * https://bugs.launchpad.net/kicad/+bug/1782904
2018-07-22 15:01:24 +00:00
bMainSizer->Add( m_OptionsSizer, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 10 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add note on spacing to Global Label Properties dialog. Also cleans up some of the other notes to have a uniform presentation. Fixes https://gitlab.com/kicad/code/kicad/issues/4323
2020-05-05 19:25:38 +00:00
wxBoxSizer* bSizer4;
bSizer4 = new wxBoxSizer( wxHORIZONTAL );
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_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();
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
Add note on spacing to Global Label Properties dialog. Also cleans up some of the other notes to have a uniform presentation. Fixes https://gitlab.com/kicad/code/kicad/issues/4323
2020-05-05 19:25:38 +00:00
bSizer4->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 );
bMainSizer->Add( bSizer4, 0, wxEXPAND|wxALL, 5 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
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 );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
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
// Connect Events
Add existing label popup to properties dialog. Fixes: lp:1639719 * https://bugs.launchpad.net/kicad/+bug/1639719 Fixes: lp:1778330 * https://bugs.launchpad.net/kicad/+bug/1778330 (cherry picked from commit 14ebff6)
2018-06-27 13:21:26 +00:00
m_valueSingleLine->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_LABEL_EDITOR_BASE::OnEnterKey ), NULL, this );
m_valueCombo->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_LABEL_EDITOR_BASE::OnEnterKey ), NULL, this );
Add syntax help for text markup. Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-08 21:16:27 +00:00
m_formattingHelp->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( DIALOG_LABEL_EDITOR_BASE::OnFormattingHelp ), NULL, this );
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
}
DIALOG_LABEL_EDITOR_BASE::~DIALOG_LABEL_EDITOR_BASE()
{
// Disconnect Events
Add existing label popup to properties dialog. Fixes: lp:1639719 * https://bugs.launchpad.net/kicad/+bug/1639719 Fixes: lp:1778330 * https://bugs.launchpad.net/kicad/+bug/1778330 (cherry picked from commit 14ebff6)
2018-06-27 13:21:26 +00:00
m_valueSingleLine->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_LABEL_EDITOR_BASE::OnEnterKey ), NULL, this );
m_valueCombo->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_LABEL_EDITOR_BASE::OnEnterKey ), NULL, this );
Add syntax help for text markup. Fixes https://gitlab.com/kicad/code/kicad/issues/4233
2020-05-08 21:16:27 +00:00
m_formattingHelp->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( DIALOG_LABEL_EDITOR_BASE::OnFormattingHelp ), NULL, this );
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
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
}