Skip to content

K
kicad-source-mirror
Commit 3453e670 authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Eeschema: minor enhancements

parent 69b19f51
Show whitespace changes
Inline Side-by-side
Showing with 479 additions and 426 deletions
eeschema/dialogs/dialog_edit_label.cpp
View file @ 3453e670
...@@ -92,24 +92,18 @@ void DialogLabelEditor::InitDialog() ...@@ -92,24 +92,18 @@ void DialogLabelEditor::InitDialog()
break; break;
} }
unsigned MINTEXTWIDTH = 40; // M's are big characters, a few establish a lot of width int MINTEXTWIDTH = 40; // M's are big characters, a few establish a lot of width
if( m_CurrentText->m_Text.Length() < MINTEXTWIDTH ) int max_len = 0;
{ if ( !multiLine )
wxString textWidth;
textWidth.Append( 'M', MINTEXTWIDTH );
EnsureTextCtrlWidth( m_textLabel, &textWidth );
}
else if ( !multiLine )
{ {
EnsureTextCtrlWidth( m_textLabel ); max_len =m_CurrentText->m_Text.Length();
} }
else else
{ {
// calculate the length of the biggest line // calculate the length of the biggest line
// we cannot use the length of the entire text that has no meaning // we cannot use the length of the entire text that has no meaning
int max_len = 0; int curr_len = MINTEXTWIDTH;
int curr_len = 0;
int imax = m_CurrentText->m_Text.Len(); int imax = m_CurrentText->m_Text.Len();
for( int count = 0; count < imax; count++ ) for( int count = 0; count < imax; count++ )
{ {
...@@ -125,10 +119,13 @@ void DialogLabelEditor::InitDialog() ...@@ -125,10 +119,13 @@ void DialogLabelEditor::InitDialog()
max_len = curr_len; max_len = curr_len;
} }
} }
}
if( max_len < MINTEXTWIDTH )
max_len = MINTEXTWIDTH;
wxString textWidth; wxString textWidth;
textWidth.Append( 'M', max_len ); textWidth.Append( 'M', MINTEXTWIDTH );
EnsureTextCtrlWidth( m_textLabel, &textWidth ); EnsureTextCtrlWidth( m_textLabel, &textWidth );
}
// Set validators // Set validators
m_TextOrient->SetSelection( m_CurrentText->GetSchematicTextOrientation() ); m_TextOrient->SetSelection( m_CurrentText->GetSchematicTextOrientation() );
......
eeschema/dialogs/dialog_edit_label_base.cpp
View file @ 3453e670
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008) // C++ code generated with wxFormBuilder (version Sep 8 2010)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
...@@ -107,4 +107,5 @@ DialogLabelEditor_Base::~DialogLabelEditor_Base() ...@@ -107,4 +107,5 @@ DialogLabelEditor_Base::~DialogLabelEditor_Base()
m_textLabelMultiLine->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DialogLabelEditor_Base::OnEnterKey ), NULL, this ); m_textLabelMultiLine->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DialogLabelEditor_Base::OnEnterKey ), NULL, this );
m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogLabelEditor_Base::OnCancelClick ), NULL, this ); m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogLabelEditor_Base::OnCancelClick ), NULL, this );
m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogLabelEditor_Base::OnOkClick ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogLabelEditor_Base::OnOkClick ), NULL, this );
} }
eeschema/dialogs/dialog_edit_label_base.fbp
View file @ 3453e670
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="10" /> <FileVersion major="1" minor="10" />
<object class="Project" expanded="1"> <object class="Project" expanded="1">
<property name="class_decoration" /> <property name="class_decoration"></property>
<property name="code_generation">C++</property> <property name="code_generation">C++</property>
<property name="disconnect_events">1</property> <property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property>
<property name="disconnect_python_events">0</property>
<property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property>
<property name="event_generation">connect</property> <property name="event_generation">connect</property>
<property name="file">dialog_edit_label_base</property> <property name="file">dialog_edit_label_base</property>
...@@ -12,66 +14,73 @@ ...@@ -12,66 +14,73 @@
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">dialog_edit_label_base</property> <property name="name">dialog_edit_label_base</property>
<property name="namespace" /> <property name="namespace"></property>
<property name="path">.</property> <property name="path">.</property>
<property name="precompiled_header" /> <property name="precompiled_header"></property>
<property name="relative_path">1</property> <property name="relative_path">1</property>
<property name="skip_python_events">1</property>
<property name="use_enum">1</property> <property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property> <property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1"> <object class="Dialog" expanded="1">
<property name="bg" /> <property name="bg"></property>
<property name="center" /> <property name="center"></property>
<property name="context_help" /> <property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="extra_style" /> <property name="event_handler">impl_virtual</property>
<property name="fg" /> <property name="extra_style"></property>
<property name="font" /> <property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">DialogLabelEditor_Base</property> <property name="name">DialogLabelEditor_Base</property>
<property name="pos" /> <property name="pos"></property>
<property name="size">359,347</property> <property name="size">359,347</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="title">Text Editor</property> <property name="title">Text Editor</property>
<property name="tooltip" /> <property name="tooltip"></property>
<property name="window_extra_style" /> <property name="validator_data_type"></property>
<property name="window_name" /> <property name="validator_style">wxFILTER_NONE</property>
<property name="window_style" /> <property name="validator_type">wxDefaultValidator</property>
<event name="OnActivate" /> <property name="validator_variable"></property>
<event name="OnActivateApp" /> <property name="window_extra_style"></property>
<event name="OnChar" /> <property name="window_name"></property>
<event name="OnClose" /> <property name="window_style"></property>
<event name="OnEnterWindow" /> <event name="OnActivate"></event>
<event name="OnEraseBackground" /> <event name="OnActivateApp"></event>
<event name="OnHibernate" /> <event name="OnChar"></event>
<event name="OnIconize" /> <event name="OnClose"></event>
<event name="OnIdle" /> <event name="OnEnterWindow"></event>
<event name="OnInitDialog" /> <event name="OnEraseBackground"></event>
<event name="OnKeyDown" /> <event name="OnHibernate"></event>
<event name="OnKeyUp" /> <event name="OnIconize"></event>
<event name="OnKillFocus" /> <event name="OnIdle"></event>
<event name="OnLeaveWindow" /> <event name="OnInitDialog"></event>
<event name="OnLeftDClick" /> <event name="OnKeyDown"></event>
<event name="OnLeftDown" /> <event name="OnKeyUp"></event>
<event name="OnLeftUp" /> <event name="OnKillFocus"></event>
<event name="OnMiddleDClick" /> <event name="OnLeaveWindow"></event>
<event name="OnMiddleDown" /> <event name="OnLeftDClick"></event>
<event name="OnMiddleUp" /> <event name="OnLeftDown"></event>
<event name="OnMotion" /> <event name="OnLeftUp"></event>
<event name="OnMouseEvents" /> <event name="OnMiddleDClick"></event>
<event name="OnMouseWheel" /> <event name="OnMiddleDown"></event>
<event name="OnPaint" /> <event name="OnMiddleUp"></event>
<event name="OnRightDClick" /> <event name="OnMotion"></event>
<event name="OnRightDown" /> <event name="OnMouseEvents"></event>
<event name="OnRightUp" /> <event name="OnMouseWheel"></event>
<event name="OnSetFocus" /> <event name="OnPaint"></event>
<event name="OnSize" /> <event name="OnRightDClick"></event>
<event name="OnUpdateUI" /> <event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">bMainSizer</property> <property name="name">bMainSizer</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
...@@ -85,7 +94,7 @@ ...@@ -85,7 +94,7 @@
<property name="growablecols">1</property> <property name="growablecols">1</property>
<property name="growablerows">0</property> <property name="growablerows">0</property>
<property name="hgap">3</property> <property name="hgap">3</property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_textControlSizer</property> <property name="name">m_textControlSizer</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property> <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property> <property name="permission">protected</property>
...@@ -96,50 +105,55 @@ ...@@ -96,50 +105,55 @@
<property name="flag">wxRIGHT</property> <property name="flag">wxRIGHT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="1"> <object class="wxStaticText" expanded="1">
<property name="bg" /> <property name="bg"></property>
<property name="context_help" /> <property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">&amp;Text:</property> <property name="label">&amp;Text:</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_staticText1</property> <property name="name">m_staticText1</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pos"></property>
<property name="size" /> <property name="size"></property>
<property name="style" /> <property name="style"></property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip">Enter the text to be used within the schematic</property> <property name="tooltip">Enter the text to be used within the schematic</property>
<property name="window_extra_style" /> <property name="validator_data_type"></property>
<property name="window_name" /> <property name="validator_style">wxFILTER_NONE</property>
<property name="window_style" /> <property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnChar" /> <event name="OnChar"></event>
<event name="OnEnterWindow" /> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground" /> <event name="OnEraseBackground"></event>
<event name="OnKeyDown" /> <event name="OnKeyDown"></event>
<event name="OnKeyUp" /> <event name="OnKeyUp"></event>
<event name="OnKillFocus" /> <event name="OnKillFocus"></event>
<event name="OnLeaveWindow" /> <event name="OnLeaveWindow"></event>
<event name="OnLeftDClick" /> <event name="OnLeftDClick"></event>
<event name="OnLeftDown" /> <event name="OnLeftDown"></event>
<event name="OnLeftUp" /> <event name="OnLeftUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown" /> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp" /> <event name="OnMiddleUp"></event>
<event name="OnMotion" /> <event name="OnMotion"></event>
<event name="OnMouseEvents" /> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel" /> <event name="OnMouseWheel"></event>
<event name="OnPaint" /> <event name="OnPaint"></event>
<event name="OnRightDClick" /> <event name="OnRightDClick"></event>
<event name="OnRightDown" /> <event name="OnRightDown"></event>
<event name="OnRightUp" /> <event name="OnRightUp"></event>
<event name="OnSetFocus" /> <event name="OnSetFocus"></event>
<event name="OnSize" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
...@@ -147,7 +161,7 @@ ...@@ -147,7 +161,7 @@
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size" /> <property name="minimum_size">-1,-1</property>
<property name="name">bSizeText</property> <property name="name">bSizeText</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
...@@ -156,54 +170,59 @@ ...@@ -156,54 +170,59 @@
<property name="flag">wxEXPAND|wxLEFT</property> <property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1"> <object class="wxTextCtrl" expanded="1">
<property name="bg" /> <property name="bg"></property>
<property name="context_help" /> <property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_VALUESINGLE</property> <property name="id">wxID_VALUESINGLE</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="maxlength">0</property> <property name="maxlength">0</property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_textLabelSingleLine</property> <property name="name">m_textLabelSingleLine</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pos"></property>
<property name="size" /> <property name="size"></property>
<property name="style">wxTE_PROCESS_ENTER</property> <property name="style">wxTE_PROCESS_ENTER</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="tooltip"></property>
<property name="value" /> <property name="validator_data_type"></property>
<property name="window_extra_style" /> <property name="validator_style">wxFILTER_NONE</property>
<property name="window_name" /> <property name="validator_type">wxDefaultValidator</property>
<property name="window_style" /> <property name="validator_variable"></property>
<event name="OnChar" /> <property name="value"></property>
<event name="OnEnterWindow" /> <property name="window_extra_style"></property>
<event name="OnEraseBackground" /> <property name="window_name"></property>
<event name="OnKeyDown" /> <property name="window_style"></property>
<event name="OnKeyUp" /> <event name="OnChar"></event>
<event name="OnKillFocus" /> <event name="OnEnterWindow"></event>
<event name="OnLeaveWindow" /> <event name="OnEraseBackground"></event>
<event name="OnLeftDClick" /> <event name="OnKeyDown"></event>
<event name="OnLeftDown" /> <event name="OnKeyUp"></event>
<event name="OnLeftUp" /> <event name="OnKillFocus"></event>
<event name="OnMiddleDClick" /> <event name="OnLeaveWindow"></event>
<event name="OnMiddleDown" /> <event name="OnLeftDClick"></event>
<event name="OnMiddleUp" /> <event name="OnLeftDown"></event>
<event name="OnMotion" /> <event name="OnLeftUp"></event>
<event name="OnMouseEvents" /> <event name="OnMiddleDClick"></event>
<event name="OnMouseWheel" /> <event name="OnMiddleDown"></event>
<event name="OnPaint" /> <event name="OnMiddleUp"></event>
<event name="OnRightDClick" /> <event name="OnMotion"></event>
<event name="OnRightDown" /> <event name="OnMouseEvents"></event>
<event name="OnRightUp" /> <event name="OnMouseWheel"></event>
<event name="OnSetFocus" /> <event name="OnPaint"></event>
<event name="OnSize" /> <event name="OnRightDClick"></event>
<event name="OnText" /> <event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnText"></event>
<event name="OnTextEnter">OnEnterKey</event> <event name="OnTextEnter">OnEnterKey</event>
<event name="OnTextMaxLen" /> <event name="OnTextMaxLen"></event>
<event name="OnTextURL" /> <event name="OnTextURL"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
...@@ -211,54 +230,59 @@ ...@@ -211,54 +230,59 @@
<property name="flag">wxEXPAND|wxLEFT</property> <property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxTextCtrl" expanded="1"> <object class="wxTextCtrl" expanded="1">
<property name="bg" /> <property name="bg"></property>
<property name="context_help" /> <property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_VALUEMULTI</property> <property name="id">wxID_VALUEMULTI</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="maxlength">0</property> <property name="maxlength">0</property>
<property name="minimum_size">-1,60</property> <property name="minimum_size">-1,60</property>
<property name="name">m_textLabelMultiLine</property> <property name="name">m_textLabelMultiLine</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pos"></property>
<property name="size" /> <property name="size"></property>
<property name="style">wxTE_MULTILINE|wxTE_PROCESS_ENTER</property> <property name="style">wxTE_MULTILINE|wxTE_PROCESS_ENTER</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="tooltip"></property>
<property name="value" /> <property name="validator_data_type"></property>
<property name="window_extra_style" /> <property name="validator_style">wxFILTER_NONE</property>
<property name="window_name" /> <property name="validator_type">wxDefaultValidator</property>
<property name="window_style" /> <property name="validator_variable"></property>
<event name="OnChar" /> <property name="value"></property>
<event name="OnEnterWindow" /> <property name="window_extra_style"></property>
<event name="OnEraseBackground" /> <property name="window_name"></property>
<event name="OnKeyDown" /> <property name="window_style"></property>
<event name="OnKeyUp" /> <event name="OnChar"></event>
<event name="OnKillFocus" /> <event name="OnEnterWindow"></event>
<event name="OnLeaveWindow" /> <event name="OnEraseBackground"></event>
<event name="OnLeftDClick" /> <event name="OnKeyDown"></event>
<event name="OnLeftDown" /> <event name="OnKeyUp"></event>
<event name="OnLeftUp" /> <event name="OnKillFocus"></event>
<event name="OnMiddleDClick" /> <event name="OnLeaveWindow"></event>
<event name="OnMiddleDown" /> <event name="OnLeftDClick"></event>
<event name="OnMiddleUp" /> <event name="OnLeftDown"></event>
<event name="OnMotion" /> <event name="OnLeftUp"></event>
<event name="OnMouseEvents" /> <event name="OnMiddleDClick"></event>
<event name="OnMouseWheel" /> <event name="OnMiddleDown"></event>
<event name="OnPaint" /> <event name="OnMiddleUp"></event>
<event name="OnRightDClick" /> <event name="OnMotion"></event>
<event name="OnRightDown" /> <event name="OnMouseEvents"></event>
<event name="OnRightUp" /> <event name="OnMouseWheel"></event>
<event name="OnSetFocus" /> <event name="OnPaint"></event>
<event name="OnSize" /> <event name="OnRightDClick"></event>
<event name="OnText" /> <event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnText"></event>
<event name="OnTextEnter">OnEnterKey</event> <event name="OnTextEnter">OnEnterKey</event>
<event name="OnTextMaxLen" /> <event name="OnTextMaxLen"></event>
<event name="OnTextURL" /> <event name="OnTextURL"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
</object> </object>
...@@ -268,50 +292,55 @@ ...@@ -268,50 +292,55 @@
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="1"> <object class="wxStaticText" expanded="1">
<property name="bg" /> <property name="bg"></property>
<property name="context_help" /> <property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">&amp;Size:</property> <property name="label">&amp;Size:</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_SizeTitle</property> <property name="name">m_SizeTitle</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pos"></property>
<property name="size" /> <property name="size"></property>
<property name="style" /> <property name="style"></property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="tooltip"></property>
<property name="window_extra_style" /> <property name="validator_data_type"></property>
<property name="window_name" /> <property name="validator_style">wxFILTER_NONE</property>
<property name="window_style" /> <property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnChar" /> <event name="OnChar"></event>
<event name="OnEnterWindow" /> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground" /> <event name="OnEraseBackground"></event>
<event name="OnKeyDown" /> <event name="OnKeyDown"></event>
<event name="OnKeyUp" /> <event name="OnKeyUp"></event>
<event name="OnKillFocus" /> <event name="OnKillFocus"></event>
<event name="OnLeaveWindow" /> <event name="OnLeaveWindow"></event>
<event name="OnLeftDClick" /> <event name="OnLeftDClick"></event>
<event name="OnLeftDown" /> <event name="OnLeftDown"></event>
<event name="OnLeftUp" /> <event name="OnLeftUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown" /> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp" /> <event name="OnMiddleUp"></event>
<event name="OnMotion" /> <event name="OnMotion"></event>
<event name="OnMouseEvents" /> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel" /> <event name="OnMouseWheel"></event>
<event name="OnPaint" /> <event name="OnPaint"></event>
<event name="OnRightDClick" /> <event name="OnRightDClick"></event>
<event name="OnRightDown" /> <event name="OnRightDown"></event>
<event name="OnRightUp" /> <event name="OnRightUp"></event>
<event name="OnSetFocus" /> <event name="OnSetFocus"></event>
<event name="OnSize" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
...@@ -319,7 +348,7 @@ ...@@ -319,7 +348,7 @@
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">bSizeCtrlSizer</property> <property name="name">bSizeCtrlSizer</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property> <property name="permission">none</property>
...@@ -328,54 +357,59 @@ ...@@ -328,54 +357,59 @@
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1"> <object class="wxTextCtrl" expanded="1">
<property name="bg" /> <property name="bg"></property>
<property name="context_help" /> <property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_SIZE</property> <property name="id">wxID_SIZE</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="maxlength">0</property> <property name="maxlength">0</property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_TextSize</property> <property name="name">m_TextSize</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pos"></property>
<property name="size" /> <property name="size"></property>
<property name="style" /> <property name="style"></property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="tooltip"></property>
<property name="value" /> <property name="validator_data_type"></property>
<property name="window_extra_style" /> <property name="validator_style">wxFILTER_NONE</property>
<property name="window_name" /> <property name="validator_type">wxDefaultValidator</property>
<property name="window_style" /> <property name="validator_variable"></property>
<event name="OnChar" /> <property name="value"></property>
<event name="OnEnterWindow" /> <property name="window_extra_style"></property>
<event name="OnEraseBackground" /> <property name="window_name"></property>
<event name="OnKeyDown" /> <property name="window_style"></property>
<event name="OnKeyUp" /> <event name="OnChar"></event>
<event name="OnKillFocus" /> <event name="OnEnterWindow"></event>
<event name="OnLeaveWindow" /> <event name="OnEraseBackground"></event>
<event name="OnLeftDClick" /> <event name="OnKeyDown"></event>
<event name="OnLeftDown" /> <event name="OnKeyUp"></event>
<event name="OnLeftUp" /> <event name="OnKillFocus"></event>
<event name="OnMiddleDClick" /> <event name="OnLeaveWindow"></event>
<event name="OnMiddleDown" /> <event name="OnLeftDClick"></event>
<event name="OnMiddleUp" /> <event name="OnLeftDown"></event>
<event name="OnMotion" /> <event name="OnLeftUp"></event>
<event name="OnMouseEvents" /> <event name="OnMiddleDClick"></event>
<event name="OnMouseWheel" /> <event name="OnMiddleDown"></event>
<event name="OnPaint" /> <event name="OnMiddleUp"></event>
<event name="OnRightDClick" /> <event name="OnMotion"></event>
<event name="OnRightDown" /> <event name="OnMouseEvents"></event>
<event name="OnRightUp" /> <event name="OnMouseWheel"></event>
<event name="OnSetFocus" /> <event name="OnPaint"></event>
<event name="OnSize" /> <event name="OnRightDClick"></event>
<event name="OnText" /> <event name="OnRightDown"></event>
<event name="OnTextEnter" /> <event name="OnRightUp"></event>
<event name="OnTextMaxLen" /> <event name="OnSetFocus"></event>
<event name="OnTextURL" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnText"></event>
<event name="OnTextEnter"></event>
<event name="OnTextMaxLen"></event>
<event name="OnTextURL"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
...@@ -383,50 +417,55 @@ ...@@ -383,50 +417,55 @@
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="1"> <object class="wxStaticText" expanded="1">
<property name="bg" /> <property name="bg"></property>
<property name="context_help" /> <property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">units</property> <property name="label">units</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_staticSizeUnits</property> <property name="name">m_staticSizeUnits</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pos"></property>
<property name="size" /> <property name="size"></property>
<property name="style" /> <property name="style"></property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="tooltip"></property>
<property name="window_extra_style" /> <property name="validator_data_type"></property>
<property name="window_name" /> <property name="validator_style">wxFILTER_NONE</property>
<property name="window_style" /> <property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnChar" /> <event name="OnChar"></event>
<event name="OnEnterWindow" /> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground" /> <event name="OnEraseBackground"></event>
<event name="OnKeyDown" /> <event name="OnKeyDown"></event>
<event name="OnKeyUp" /> <event name="OnKeyUp"></event>
<event name="OnKillFocus" /> <event name="OnKillFocus"></event>
<event name="OnLeaveWindow" /> <event name="OnLeaveWindow"></event>
<event name="OnLeftDClick" /> <event name="OnLeftDClick"></event>
<event name="OnLeftDown" /> <event name="OnLeftDown"></event>
<event name="OnLeftUp" /> <event name="OnLeftUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown" /> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp" /> <event name="OnMiddleUp"></event>
<event name="OnMotion" /> <event name="OnMotion"></event>
<event name="OnMouseEvents" /> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel" /> <event name="OnMouseWheel"></event>
<event name="OnPaint" /> <event name="OnPaint"></event>
<event name="OnRightDClick" /> <event name="OnRightDClick"></event>
<event name="OnRightDown" /> <event name="OnRightDown"></event>
<event name="OnRightUp" /> <event name="OnRightUp"></event>
<event name="OnSetFocus" /> <event name="OnSetFocus"></event>
<event name="OnSize" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
</object> </object>
...@@ -438,7 +477,7 @@ ...@@ -438,7 +477,7 @@
<property name="flag">wxEXPAND|wxLEFT|wxRIGHT|wxTOP</property> <property name="flag">wxEXPAND|wxLEFT|wxRIGHT|wxTOP</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_OptionsSizer</property> <property name="name">m_OptionsSizer</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property> <property name="permission">none</property>
...@@ -447,53 +486,58 @@ ...@@ -447,53 +486,58 @@
<property name="flag">wxRIGHT|wxTOP</property> <property name="flag">wxRIGHT|wxTOP</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxRadioBox" expanded="1"> <object class="wxRadioBox" expanded="1">
<property name="bg" /> <property name="bg"></property>
<property name="choices">&quot;Right&quot; &quot;Up&quot; &quot;Left&quot; &quot;Down&quot;</property> <property name="choices">&quot;Right&quot; &quot;Up&quot; &quot;Left&quot; &quot;Down&quot;</property>
<property name="context_help" /> <property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">O&amp;rientation</property> <property name="label">O&amp;rientation</property>
<property name="majorDimension">1</property> <property name="majorDimension">1</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_TextOrient</property> <property name="name">m_TextOrient</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pos"></property>
<property name="selection">0</property> <property name="selection">0</property>
<property name="size" /> <property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="tooltip"></property>
<property name="window_extra_style" /> <property name="validator_data_type"></property>
<property name="window_name" /> <property name="validator_style">wxFILTER_NONE</property>
<property name="window_style" /> <property name="validator_type">wxDefaultValidator</property>
<event name="OnChar" /> <property name="validator_variable"></property>
<event name="OnEnterWindow" /> <property name="window_extra_style"></property>
<event name="OnEraseBackground" /> <property name="window_name"></property>
<event name="OnKeyDown" /> <property name="window_style"></property>
<event name="OnKeyUp" /> <event name="OnChar"></event>
<event name="OnKillFocus" /> <event name="OnEnterWindow"></event>
<event name="OnLeaveWindow" /> <event name="OnEraseBackground"></event>
<event name="OnLeftDClick" /> <event name="OnKeyDown"></event>
<event name="OnLeftDown" /> <event name="OnKeyUp"></event>
<event name="OnLeftUp" /> <event name="OnKillFocus"></event>
<event name="OnMiddleDClick" /> <event name="OnLeaveWindow"></event>
<event name="OnMiddleDown" /> <event name="OnLeftDClick"></event>
<event name="OnMiddleUp" /> <event name="OnLeftDown"></event>
<event name="OnMotion" /> <event name="OnLeftUp"></event>
<event name="OnMouseEvents" /> <event name="OnMiddleDClick"></event>
<event name="OnMouseWheel" /> <event name="OnMiddleDown"></event>
<event name="OnPaint" /> <event name="OnMiddleUp"></event>
<event name="OnRadioBox" /> <event name="OnMotion"></event>
<event name="OnRightDClick" /> <event name="OnMouseEvents"></event>
<event name="OnRightDown" /> <event name="OnMouseWheel"></event>
<event name="OnRightUp" /> <event name="OnPaint"></event>
<event name="OnSetFocus" /> <event name="OnRadioBox"></event>
<event name="OnSize" /> <event name="OnRightDClick"></event>
<event name="OnUpdateUI" /> <event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
...@@ -501,53 +545,58 @@ ...@@ -501,53 +545,58 @@
<property name="flag">wxLEFT|wxRIGHT|wxTOP</property> <property name="flag">wxLEFT|wxRIGHT|wxTOP</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxRadioBox" expanded="1"> <object class="wxRadioBox" expanded="1">
<property name="bg" /> <property name="bg"></property>
<property name="choices">&quot;Normal&quot; &quot;Italic&quot; &quot;Bold&quot; &quot;Bold Italic&quot;</property> <property name="choices">&quot;Normal&quot; &quot;Italic&quot; &quot;Bold&quot; &quot;Bold Italic&quot;</property>
<property name="context_help" /> <property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">St&amp;yle</property> <property name="label">St&amp;yle</property>
<property name="majorDimension">1</property> <property name="majorDimension">1</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_TextStyle</property> <property name="name">m_TextStyle</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pos"></property>
<property name="selection">0</property> <property name="selection">0</property>
<property name="size" /> <property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="tooltip"></property>
<property name="window_extra_style" /> <property name="validator_data_type"></property>
<property name="window_name" /> <property name="validator_style">wxFILTER_NONE</property>
<property name="window_style" /> <property name="validator_type">wxDefaultValidator</property>
<event name="OnChar" /> <property name="validator_variable"></property>
<event name="OnEnterWindow" /> <property name="window_extra_style"></property>
<event name="OnEraseBackground" /> <property name="window_name"></property>
<event name="OnKeyDown" /> <property name="window_style"></property>
<event name="OnKeyUp" /> <event name="OnChar"></event>
<event name="OnKillFocus" /> <event name="OnEnterWindow"></event>
<event name="OnLeaveWindow" /> <event name="OnEraseBackground"></event>
<event name="OnLeftDClick" /> <event name="OnKeyDown"></event>
<event name="OnLeftDown" /> <event name="OnKeyUp"></event>
<event name="OnLeftUp" /> <event name="OnKillFocus"></event>
<event name="OnMiddleDClick" /> <event name="OnLeaveWindow"></event>
<event name="OnMiddleDown" /> <event name="OnLeftDClick"></event>
<event name="OnMiddleUp" /> <event name="OnLeftDown"></event>
<event name="OnMotion" /> <event name="OnLeftUp"></event>
<event name="OnMouseEvents" /> <event name="OnMiddleDClick"></event>
<event name="OnMouseWheel" /> <event name="OnMiddleDown"></event>
<event name="OnPaint" /> <event name="OnMiddleUp"></event>
<event name="OnRadioBox" /> <event name="OnMotion"></event>
<event name="OnRightDClick" /> <event name="OnMouseEvents"></event>
<event name="OnRightDown" /> <event name="OnMouseWheel"></event>
<event name="OnRightUp" /> <event name="OnPaint"></event>
<event name="OnSetFocus" /> <event name="OnRadioBox"></event>
<event name="OnSize" /> <event name="OnRightDClick"></event>
<event name="OnUpdateUI" /> <event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
...@@ -555,53 +604,58 @@ ...@@ -555,53 +604,58 @@
<property name="flag">wxALL|wxLEFT|wxTOP</property> <property name="flag">wxALL|wxLEFT|wxTOP</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxRadioBox" expanded="1"> <object class="wxRadioBox" expanded="1">
<property name="bg" /> <property name="bg"></property>
<property name="choices">&quot;Input&quot; &quot;Output&quot; &quot;Bidirectional&quot; &quot;Tri-State&quot; &quot;Passive&quot;</property> <property name="choices">&quot;Input&quot; &quot;Output&quot; &quot;Bidirectional&quot; &quot;Tri-State&quot; &quot;Passive&quot;</property>
<property name="context_help" /> <property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">S&amp;hape</property> <property name="label">S&amp;hape</property>
<property name="majorDimension">1</property> <property name="majorDimension">1</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_TextShape</property> <property name="name">m_TextShape</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pos"></property>
<property name="selection">0</property> <property name="selection">0</property>
<property name="size" /> <property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="tooltip"></property>
<property name="window_extra_style" /> <property name="validator_data_type"></property>
<property name="window_name" /> <property name="validator_style">wxFILTER_NONE</property>
<property name="window_style" /> <property name="validator_type">wxDefaultValidator</property>
<event name="OnChar" /> <property name="validator_variable"></property>
<event name="OnEnterWindow" /> <property name="window_extra_style"></property>
<event name="OnEraseBackground" /> <property name="window_name"></property>
<event name="OnKeyDown" /> <property name="window_style"></property>
<event name="OnKeyUp" /> <event name="OnChar"></event>
<event name="OnKillFocus" /> <event name="OnEnterWindow"></event>
<event name="OnLeaveWindow" /> <event name="OnEraseBackground"></event>
<event name="OnLeftDClick" /> <event name="OnKeyDown"></event>
<event name="OnLeftDown" /> <event name="OnKeyUp"></event>
<event name="OnLeftUp" /> <event name="OnKillFocus"></event>
<event name="OnMiddleDClick" /> <event name="OnLeaveWindow"></event>
<event name="OnMiddleDown" /> <event name="OnLeftDClick"></event>
<event name="OnMiddleUp" /> <event name="OnLeftDown"></event>
<event name="OnMotion" /> <event name="OnLeftUp"></event>
<event name="OnMouseEvents" /> <event name="OnMiddleDClick"></event>
<event name="OnMouseWheel" /> <event name="OnMiddleDown"></event>
<event name="OnPaint" /> <event name="OnMiddleUp"></event>
<event name="OnRadioBox" /> <event name="OnMotion"></event>
<event name="OnRightDClick" /> <event name="OnMouseEvents"></event>
<event name="OnRightDown" /> <event name="OnMouseWheel"></event>
<event name="OnRightUp" /> <event name="OnPaint"></event>
<event name="OnSetFocus" /> <event name="OnRadioBox"></event>
<event name="OnSize" /> <event name="OnRightDClick"></event>
<event name="OnUpdateUI" /> <event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
</object> </object>
...@@ -619,17 +673,17 @@ ...@@ -619,17 +673,17 @@
<property name="OK">1</property> <property name="OK">1</property>
<property name="Save">0</property> <property name="Save">0</property>
<property name="Yes">0</property> <property name="Yes">0</property>
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">m_sdbSizer1</property> <property name="name">m_sdbSizer1</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<event name="OnApplyButtonClick" /> <event name="OnApplyButtonClick"></event>
<event name="OnCancelButtonClick">OnCancelClick</event> <event name="OnCancelButtonClick">OnCancelClick</event>
<event name="OnContextHelpButtonClick" /> <event name="OnContextHelpButtonClick"></event>
<event name="OnHelpButtonClick" /> <event name="OnHelpButtonClick"></event>
<event name="OnNoButtonClick" /> <event name="OnNoButtonClick"></event>
<event name="OnOKButtonClick">OnOkClick</event> <event name="OnOKButtonClick">OnOkClick</event>
<event name="OnSaveButtonClick" /> <event name="OnSaveButtonClick"></event>
<event name="OnYesButtonClick" /> <event name="OnYesButtonClick"></event>
</object> </object>
</object> </object>
</object> </object>
......
eeschema/dialogs/dialog_edit_label_base.h
View file @ 3453e670
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008) // C++ code generated with wxFormBuilder (version Sep 8 2010)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
...@@ -54,12 +54,13 @@ class DialogLabelEditor_Base : public wxDialog ...@@ -54,12 +54,13 @@ class DialogLabelEditor_Base : public wxDialog
wxButton* m_sdbSizer1Cancel; wxButton* m_sdbSizer1Cancel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnEnterKey( wxCommandEvent& event ){ event.Skip(); } virtual void OnEnterKey( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
public: public:
DialogLabelEditor_Base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 359,347 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DialogLabelEditor_Base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 359,347 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DialogLabelEditor_Base(); ~DialogLabelEditor_Base();
......
eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp
View file @ 3453e670
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
DIALOG_SCH_EDIT_SHEET_PIN_BASE::DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) DIALOG_SCH_EDIT_SHEET_PIN_BASE::DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{ {
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); this->SetSizeHints( wxSize( 350,-1 ), wxDefaultSize );
wxBoxSizer* m_mainSizer; wxBoxSizer* m_mainSizer;
m_mainSizer = new wxBoxSizer( wxVERTICAL ); m_mainSizer = new wxBoxSizer( wxVERTICAL );
...@@ -21,6 +21,7 @@ DIALOG_SCH_EDIT_SHEET_PIN_BASE::DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent ...@@ -21,6 +21,7 @@ DIALOG_SCH_EDIT_SHEET_PIN_BASE::DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent
wxFlexGridSizer* fgSizer1; wxFlexGridSizer* fgSizer1;
fgSizer1 = new wxFlexGridSizer( 4, 3, 0, 0 ); fgSizer1 = new wxFlexGridSizer( 4, 3, 0, 0 );
fgSizer1->AddGrowableCol( 1 );
fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetFlexibleDirection( wxBOTH );
fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
...@@ -85,7 +86,6 @@ DIALOG_SCH_EDIT_SHEET_PIN_BASE::DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent ...@@ -85,7 +86,6 @@ DIALOG_SCH_EDIT_SHEET_PIN_BASE::DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent
this->SetSizer( m_mainSizer ); this->SetSizer( m_mainSizer );
this->Layout(); this->Layout();
m_mainSizer->Fit( this );
this->Centre( wxBOTH ); this->Centre( wxBOTH );
} }
......
eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp
View file @ 3453e670
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size">350,-1</property>
<property name="name">DIALOG_SCH_EDIT_SHEET_PIN_BASE</property> <property name="name">DIALOG_SCH_EDIT_SHEET_PIN_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size"></property> <property name="size">350,189</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="title">Sheet Pin Properties</property> <property name="title">Sheet Pin Properties</property>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<object class="wxFlexGridSizer" expanded="1"> <object class="wxFlexGridSizer" expanded="1">
<property name="cols">3</property> <property name="cols">3</property>
<property name="flexible_direction">wxBOTH</property> <property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property> <property name="growablecols">1</property>
<property name="growablerows"></property> <property name="growablerows"></property>
<property name="hgap">0</property> <property name="hgap">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
......
eeschema/dialogs/dialog_sch_edit_sheet_pin_base.h
View file @ 3453e670
...@@ -52,7 +52,7 @@ class DIALOG_SCH_EDIT_SHEET_PIN_BASE : public wxDialog ...@@ -52,7 +52,7 @@ class DIALOG_SCH_EDIT_SHEET_PIN_BASE : public wxDialog
public: public:
DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Sheet Pin Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Sheet Pin Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,189 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_SCH_EDIT_SHEET_PIN_BASE(); ~DIALOG_SCH_EDIT_SHEET_PIN_BASE();
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment