haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove confirmation for De Morgan (and spell his name right). 

Fixes https://gitlab.com/kicad/code/kicad/issues/9483
This commit is contained in:
Jeff Young 2021-10-29 20:27:24 +01:00
parent ffddefc532
commit b967610e05
15 changed files with 132 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/dialogs/dialog_lib_new_symbol_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -73,7 +73,7 @@ DIALOG_LIB_NEW_SYMBOL_BASE::DIALOG_LIB_NEW_SYMBOL_BASE( wxWindow* parent, wxWind
bSizer17->Add( m_checkLockItems, 0, wxRIGHT|wxLEFT, 5 ); bSizer17->Add( m_checkLockItems, 0, wxRIGHT|wxLEFT, 5 );
m_checkHasConversion = new wxCheckBox( this, wxID_ANY, _("Create symbol with alternate body style (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkHasConversion = new wxCheckBox( this, wxID_ANY, _("Create symbol with alternate body style (De Morgan)"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer17->Add( m_checkHasConversion, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bSizer17->Add( m_checkHasConversion, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_checkIsPowerSymbol = new wxCheckBox( this, wxID_ANY, _("Create symbol as power symbol"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkIsPowerSymbol = new wxCheckBox( this, wxID_ANY, _("Create symbol as power symbol"), wxDefaultPosition, wxDefaultSize, 0 );

4
eeschema/dialogs/dialog_lib_new_symbol_base.fbp
View File

@ -14,7 +14,6 @@
<property name="file">dialog_lib_new_symbol_base</property> <property name="file">dialog_lib_new_symbol_base</property>
<property name="first_id">1000</property> <property name="first_id">1000</property>
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="image_path_wrapper_function_name"></property>
<property name="indent_with_spaces"></property> <property name="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">dialog_lib_new_symbol_base</property> <property name="name">dialog_lib_new_symbol_base</property>
@ -26,7 +25,6 @@
<property name="skip_php_events">1</property> <property name="skip_php_events">1</property>
<property name="skip_python_events">1</property> <property name="skip_python_events">1</property>
<property name="ui_table">UI</property> <property name="ui_table">UI</property>
<property name="use_array_enum">0</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">
@ -693,7 +691,7 @@
<property name="gripper">0</property> <property name="gripper">0</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">Create symbol with alternate body style (DeMorgan)</property> <property name="label">Create symbol with alternate body style (De Morgan)</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>

2
eeschema/dialogs/dialog_lib_new_symbol_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!

2
eeschema/dialogs/dialog_lib_shape_properties_base.cpp
View File

@ -45,7 +45,7 @@ DIALOG_LIB_SHAPE_PROPERTIES_BASE::DIALOG_LIB_SHAPE_PROPERTIES_BASE( wxWindow* pa
m_checkApplyToAllUnits = new wxCheckBox( this, wxID_ANY, _("Common to all &units in symbol"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkApplyToAllUnits = new wxCheckBox( this, wxID_ANY, _("Common to all &units in symbol"), wxDefaultPosition, wxDefaultSize, 0 );
dlgBorderSizer->Add( m_checkApplyToAllUnits, 0, wxALL, 3 ); dlgBorderSizer->Add( m_checkApplyToAllUnits, 0, wxALL, 3 );
m_checkApplyToAllConversions = new wxCheckBox( this, wxID_ANY, _("Common to all body &styles (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkApplyToAllConversions = new wxCheckBox( this, wxID_ANY, _("Common to all body &styles (De Morgan)"), wxDefaultPosition, wxDefaultSize, 0 );
dlgBorderSizer->Add( m_checkApplyToAllConversions, 0, wxALL, 3 ); dlgBorderSizer->Add( m_checkApplyToAllConversions, 0, wxALL, 3 );

2
eeschema/dialogs/dialog_lib_shape_properties_base.fbp
View File

@ -427,7 +427,7 @@
<property name="gripper">0</property> <property name="gripper">0</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">Common to all body &amp;styles (DeMorgan)</property> <property name="label">Common to all body &amp;styles (De Morgan)</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>

13
eeschema/dialogs/dialog_lib_symbol_properties.cpp
View File

@ -272,20 +272,19 @@ bool DIALOG_LIB_SYMBOL_PROPERTIES::Validate()
} }
} }
/*
* Confirm destructive actions.
*/
if( m_SelNumberOfUnits->GetValue() < m_libEntry->GetUnitCount() ) if( m_SelNumberOfUnits->GetValue() < m_libEntry->GetUnitCount() )
{ {
if( !IsOK( this, _( "Delete extra units from symbol?" ) ) ) if( !IsOK( this, _( "Delete extra units from symbol?" ) ) )
return false; return false;
} }
if( m_AsConvertButt->GetValue() && !m_libEntry->HasConversion() ) if( !m_AsConvertButt->GetValue() && m_libEntry->HasConversion() )
{ {
if( !IsOK( this, _( "Add new pins for alternate body style (DeMorgan) to symbol?" ) ) ) if( !IsOK( this, _( "Delete alternate body style (De Morgan) from symbol?" ) ) )
return false;
}
else if( !m_AsConvertButt->GetValue() && m_libEntry->HasConversion() )
{
if( !IsOK( this, _( "Delete alternate body style (DeMorgan) draw items from symbol?" ) ) )
return false; return false;
} }

2
eeschema/dialogs/dialog_lib_symbol_properties_base.cpp
View File

@ -165,7 +165,7 @@ DIALOG_LIB_SYMBOL_PROPERTIES_BASE::DIALOG_LIB_SYMBOL_PROPERTIES_BASE( wxWindow*
wxStaticBoxSizer* sbSizerSymbol; wxStaticBoxSizer* sbSizerSymbol;
sbSizerSymbol = new wxStaticBoxSizer( new wxStaticBox( m_PanelBasic, wxID_ANY, _("Symbol") ), wxVERTICAL ); sbSizerSymbol = new wxStaticBoxSizer( new wxStaticBox( m_PanelBasic, wxID_ANY, _("Symbol") ), wxVERTICAL );
m_AsConvertButt = new wxCheckBox( sbSizerSymbol->GetStaticBox(), wxID_ANY, _("Has alternate body style (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); m_AsConvertButt = new wxCheckBox( sbSizerSymbol->GetStaticBox(), wxID_ANY, _("Has alternate body style (De Morgan)"), wxDefaultPosition, wxDefaultSize, 0 );
m_AsConvertButt->SetToolTip( _("Check this option if the symbol has an alternate body style (De Morgan)") ); m_AsConvertButt->SetToolTip( _("Check this option if the symbol has an alternate body style (De Morgan)") );
sbSizerSymbol->Add( m_AsConvertButt, 0, wxRIGHT|wxLEFT, 5 ); sbSizerSymbol->Add( m_AsConvertButt, 0, wxRIGHT|wxLEFT, 5 );

2
eeschema/dialogs/dialog_lib_symbol_properties_base.fbp
View File

@ -1200,7 +1200,7 @@
<property name="gripper">0</property> <property name="gripper">0</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">Has alternate body style (DeMorgan)</property> <property name="label">Has alternate body style (De Morgan)</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>

3
eeschema/dialogs/dialog_pin_properties.cpp
View File

@ -203,7 +203,7 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN
m_alternatesTurndown->Collapse(); m_alternatesTurndown->Collapse();
m_alternatesTurndown->Disable(); m_alternatesTurndown->Disable();
m_alternatesTurndown->SetToolTip( m_alternatesTurndown->SetToolTip(
_( "Alternate pin assignments are not available for DeMorgan symbols." ) ); _( "Alternate pin assignments are not available for De Morgan symbols." ) );
} }
// Set special attributes // Set special attributes
@ -221,6 +221,7 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN
m_addAlternate->SetBitmap( KiBitmap( BITMAPS::small_plus ) ); m_addAlternate->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_deleteAlternate->SetBitmap( KiBitmap( BITMAPS::small_trash ) ); m_deleteAlternate->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_addAlternate->GetParent()->Layout();
m_sdbSizerButtonsOK->SetDefault(); m_sdbSizerButtonsOK->SetDefault();
SetInitialFocus( m_textPinName ); SetInitialFocus( m_textPinName );

18
eeschema/dialogs/dialog_pin_properties_base.cpp
View File

@ -167,7 +167,7 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind
m_checkApplyToAllParts = new wxCheckBox( this, wxID_ANY, _("Common to all &units in symbol"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkApplyToAllParts = new wxCheckBox( this, wxID_ANY, _("Common to all &units in symbol"), wxDefaultPosition, wxDefaultSize, 0 );
checkboxesSizer->Add( m_checkApplyToAllParts, 0, wxBOTTOM, 3 ); checkboxesSizer->Add( m_checkApplyToAllParts, 0, wxBOTTOM, 3 );
m_checkApplyToAllConversions = new wxCheckBox( this, wxID_ANY, _("Common to all body &styles (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkApplyToAllConversions = new wxCheckBox( this, wxID_ANY, _("Common to all body &styles (De Morgan)"), wxDefaultPosition, wxDefaultSize, 0 );
checkboxesSizer->Add( m_checkApplyToAllConversions, 0, wxBOTTOM, 3 ); checkboxesSizer->Add( m_checkApplyToAllConversions, 0, wxBOTTOM, 3 );
@ -204,6 +204,9 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind
wxBoxSizer* bAlternatesSizer; wxBoxSizer* bAlternatesSizer;
bAlternatesSizer = new wxBoxSizer( wxVERTICAL ); bAlternatesSizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bRightMargin;
bRightMargin = new wxBoxSizer( wxVERTICAL );
m_alternatesGrid = new WX_GRID( m_alternatesTurndown->GetPane(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_alternatesGrid = new WX_GRID( m_alternatesTurndown->GetPane(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
// Grid // Grid
@ -236,13 +239,16 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind
m_alternatesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_alternatesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
m_alternatesGrid->SetMinSize( wxSize( -1,100 ) ); m_alternatesGrid->SetMinSize( wxSize( -1,100 ) );
bAlternatesSizer->Add( m_alternatesGrid, 1, wxEXPAND|wxRIGHT, 5 ); bRightMargin->Add( m_alternatesGrid, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
bAlternatesSizer->Add( bRightMargin, 1, wxEXPAND|wxRIGHT, 5 );
wxBoxSizer* bButtonSizer; wxBoxSizer* bButtonSizer;
bButtonSizer = new wxBoxSizer( wxHORIZONTAL ); bButtonSizer = new wxBoxSizer( wxHORIZONTAL );
m_addAlternate = new wxBitmapButton( m_alternatesTurndown->GetPane(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_addAlternate = new wxBitmapButton( m_alternatesTurndown->GetPane(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
bButtonSizer->Add( m_addAlternate, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); bButtonSizer->Add( m_addAlternate, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
bButtonSizer->Add( 20, 0, 0, wxALIGN_CENTER_VERTICAL, 5 ); bButtonSizer->Add( 20, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
@ -251,19 +257,19 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind
bButtonSizer->Add( m_deleteAlternate, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); bButtonSizer->Add( m_deleteAlternate, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
bAlternatesSizer->Add( bButtonSizer, 0, wxEXPAND|wxTOP, 5 ); bAlternatesSizer->Add( bButtonSizer, 0, wxTOP, 5 );
m_alternatesTurndown->GetPane()->SetSizer( bAlternatesSizer ); m_alternatesTurndown->GetPane()->SetSizer( bAlternatesSizer );
m_alternatesTurndown->GetPane()->Layout(); m_alternatesTurndown->GetPane()->Layout();
bAlternatesSizer->Fit( m_alternatesTurndown->GetPane() ); bAlternatesSizer->Fit( m_alternatesTurndown->GetPane() );
bLowerSizer->Add( m_alternatesTurndown, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); bLowerSizer->Add( m_alternatesTurndown, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
mainSizer->Add( bLowerSizer, 1, wxEXPAND|wxLEFT, 5 ); mainSizer->Add( bLowerSizer, 1, wxEXPAND|wxLEFT, 5 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
mainSizer->Add( m_staticline1, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); mainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtons = new wxStdDialogButtonSizer();
m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK );

185
eeschema/dialogs/dialog_pin_properties_base.fbp
View File

@ -2059,7 +2059,7 @@
<property name="gripper">0</property> <property name="gripper">0</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">Common to all body &amp;styles (DeMorgan)</property> <property name="label">Common to all body &amp;styles (De Morgan)</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
@ -2301,7 +2301,7 @@
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">10</property> <property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property> <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxCollapsiblePane" expanded="1"> <object class="wxCollapsiblePane" expanded="1">
@ -2371,93 +2371,104 @@
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND|wxRIGHT</property> <property name="flag">wxEXPAND|wxRIGHT</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxGrid" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="BottomDockable">1</property> <property name="minimum_size"></property>
<property name="LeftDockable">1</property> <property name="name">bRightMargin</property>
<property name="RightDockable">1</property> <property name="orient">wxVERTICAL</property>
<property name="TopDockable">1</property> <property name="permission">none</property>
<property name="aui_layer"></property> <object class="sizeritem" expanded="1">
<property name="aui_name"></property> <property name="border">5</property>
<property name="aui_position"></property> <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="aui_row"></property> <property name="proportion">1</property>
<property name="autosize_cols">0</property> <object class="wxGrid" expanded="1">
<property name="autosize_rows">0</property> <property name="BottomDockable">1</property>
<property name="best_size"></property> <property name="LeftDockable">1</property>
<property name="bg"></property> <property name="RightDockable">1</property>
<property name="caption"></property> <property name="TopDockable">1</property>
<property name="caption_visible">1</property> <property name="aui_layer"></property>
<property name="cell_bg"></property> <property name="aui_name"></property>
<property name="cell_font"></property> <property name="aui_position"></property>
<property name="cell_horiz_alignment">wxALIGN_LEFT</property> <property name="aui_row"></property>
<property name="cell_text"></property> <property name="autosize_cols">0</property>
<property name="cell_vert_alignment">wxALIGN_TOP</property> <property name="autosize_rows">0</property>
<property name="center_pane">0</property> <property name="best_size"></property>
<property name="close_button">1</property> <property name="bg"></property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property> <property name="caption"></property>
<property name="col_label_size">22</property> <property name="caption_visible">1</property>
<property name="col_label_values">&quot;Alternate Pin Name&quot; &quot;Electrical Type&quot; &quot;Graphic Style&quot;</property> <property name="cell_bg"></property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property> <property name="cell_font"></property>
<property name="cols">3</property> <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
<property name="column_sizes">260,140,140</property> <property name="cell_text"></property>
<property name="context_help"></property> <property name="cell_vert_alignment">wxALIGN_TOP</property>
<property name="context_menu">1</property> <property name="center_pane">0</property>
<property name="default_pane">0</property> <property name="close_button">1</property>
<property name="dock">Dock</property> <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="dock_fixed">0</property> <property name="col_label_size">22</property>
<property name="docking">Left</property> <property name="col_label_values">&quot;Alternate Pin Name&quot; &quot;Electrical Type&quot; &quot;Graphic Style&quot;</property>
<property name="drag_col_move">0</property> <property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="drag_col_size">0</property> <property name="cols">3</property>
<property name="drag_grid_size">0</property> <property name="column_sizes">260,140,140</property>
<property name="drag_row_size">0</property> <property name="context_help"></property>
<property name="editing">1</property> <property name="context_menu">1</property>
<property name="enabled">1</property> <property name="default_pane">0</property>
<property name="fg"></property> <property name="dock">Dock</property>
<property name="floatable">1</property> <property name="dock_fixed">0</property>
<property name="font"></property> <property name="docking">Left</property>
<property name="grid_line_color"></property> <property name="drag_col_move">0</property>
<property name="grid_lines">1</property> <property name="drag_col_size">0</property>
<property name="gripper">0</property> <property name="drag_grid_size">0</property>
<property name="hidden">0</property> <property name="drag_row_size">0</property>
<property name="id">wxID_ANY</property> <property name="editing">1</property>
<property name="label_bg"></property> <property name="enabled">1</property>
<property name="label_font"></property> <property name="fg"></property>
<property name="label_text"></property> <property name="floatable">1</property>
<property name="margin_height">0</property> <property name="font"></property>
<property name="margin_width">0</property> <property name="grid_line_color"></property>
<property name="max_size"></property> <property name="grid_lines">1</property>
<property name="maximize_button">0</property> <property name="gripper">0</property>
<property name="maximum_size"></property> <property name="hidden">0</property>
<property name="min_size"></property> <property name="id">wxID_ANY</property>
<property name="minimize_button">0</property> <property name="label_bg"></property>
<property name="minimum_size">-1,100</property> <property name="label_font"></property>
<property name="moveable">1</property> <property name="label_text"></property>
<property name="name">m_alternatesGrid</property> <property name="margin_height">0</property>
<property name="pane_border">1</property> <property name="margin_width">0</property>
<property name="pane_position"></property> <property name="max_size"></property>
<property name="pane_size"></property> <property name="maximize_button">0</property>
<property name="permission">protected</property> <property name="maximum_size"></property>
<property name="pin_button">1</property> <property name="min_size"></property>
<property name="pos"></property> <property name="minimize_button">0</property>
<property name="resize">Resizable</property> <property name="minimum_size">-1,100</property>
<property name="row_label_horiz_alignment">wxALIGN_CENTER</property> <property name="moveable">1</property>
<property name="row_label_size">0</property> <property name="name">m_alternatesGrid</property>
<property name="row_label_values"></property> <property name="pane_border">1</property>
<property name="row_label_vert_alignment">wxALIGN_CENTER</property> <property name="pane_position"></property>
<property name="row_sizes"></property> <property name="pane_size"></property>
<property name="rows">1</property> <property name="permission">protected</property>
<property name="show">1</property> <property name="pin_button">1</property>
<property name="size"></property> <property name="pos"></property>
<property name="subclass">WX_GRID; widgets/wx_grid.h; forward_declare</property> <property name="resize">Resizable</property>
<property name="toolbar_pane">0</property> <property name="row_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="tooltip"></property> <property name="row_label_size">0</property>
<property name="window_extra_style"></property> <property name="row_label_values"></property>
<property name="window_name"></property> <property name="row_label_vert_alignment">wxALIGN_CENTER</property>
<property name="window_style"></property> <property name="row_sizes"></property>
<property name="rows">1</property>
<property name="show">1</property>
<property name="size"></property>
<property name="subclass">WX_GRID; widgets/wx_grid.h; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP</property> <property name="flag">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> <property name="minimum_size"></property>
@ -2466,7 +2477,7 @@
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxBitmapButton" expanded="1"> <object class="wxBitmapButton" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -2629,7 +2640,7 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property> <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticLine" expanded="1"> <object class="wxStaticLine" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>

2
eeschema/dialogs/dialog_symbol_properties.cpp
View File

@ -331,7 +331,7 @@ DIALOG_SYMBOL_PROPERTIES::DIALOG_SYMBOL_PROPERTIES( SCH_EDIT_FRAME* aParent,
// free-form alternate assignments as well. (We won't know how to map the alternates // free-form alternate assignments as well. (We won't know how to map the alternates
// back and forth when the conversion is changed.) // back and forth when the conversion is changed.)
m_pinTablePage->Disable(); m_pinTablePage->Disable();
m_pinTablePage->SetToolTip( _( "Alternate pin assignments are not available for DeMorgan " m_pinTablePage->SetToolTip( _( "Alternate pin assignments are not available for De Morgan "
"symbols." ) ); "symbols." ) );
} }
else else

2
eeschema/dialogs/dialog_symbol_properties_base.cpp
View File

@ -134,7 +134,7 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent,
gbSizer1->Add( m_unitChoice, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxLEFT|wxRIGHT, 5 ); gbSizer1->Add( m_unitChoice, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxLEFT|wxRIGHT, 5 );
m_cbAlternateSymbol = new wxCheckBox( sbGeneralProps->GetStaticBox(), wxID_ANY, _("Alternate symbol (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbAlternateSymbol = new wxCheckBox( sbGeneralProps->GetStaticBox(), wxID_ANY, _("Alternate symbol (De Morgan)"), wxDefaultPosition, wxDefaultSize, 0 );
m_cbAlternateSymbol->SetToolTip( _("Use the alternate shape of this symbol.\nFor gates, this is the \"De Morgan\" conversion") ); m_cbAlternateSymbol->SetToolTip( _("Use the alternate shape of this symbol.\nFor gates, this is the \"De Morgan\" conversion") );
gbSizer1->Add( m_cbAlternateSymbol, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); gbSizer1->Add( m_cbAlternateSymbol, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

2
eeschema/dialogs/dialog_symbol_properties_base.fbp
View File

@ -808,7 +808,7 @@
<property name="gripper">0</property> <property name="gripper">0</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">Alternate symbol (DeMorgan)</property> <property name="label">Alternate symbol (De Morgan)</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>

6
eeschema/tools/ee_actions.cpp
View File

@ -450,17 +450,17 @@ TOOL_ACTION EE_ACTIONS::assignNetclass( "eeschema.InteractiveEdit.assignNetclass
TOOL_ACTION EE_ACTIONS::toggleDeMorgan( "eeschema.InteractiveEdit.toggleDeMorgan", TOOL_ACTION EE_ACTIONS::toggleDeMorgan( "eeschema.InteractiveEdit.toggleDeMorgan",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "DeMorgan Conversion" ), _( "Switch between DeMorgan representations" ), _( "De Morgan Conversion" ), _( "Switch between De Morgan representations" ),
BITMAPS::morgan2 ); BITMAPS::morgan2 );
TOOL_ACTION EE_ACTIONS::showDeMorganStandard( "eeschema.InteractiveEdit.showDeMorganStandard", TOOL_ACTION EE_ACTIONS::showDeMorganStandard( "eeschema.InteractiveEdit.showDeMorganStandard",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "DeMorgan Standard" ), _( "Switch to standard DeMorgan representation" ), _( "De Morgan Standard" ), _( "Switch to standard De Morgan representation" ),
BITMAPS::morgan1 ); BITMAPS::morgan1 );
TOOL_ACTION EE_ACTIONS::showDeMorganAlternate( "eeschema.InteractiveEdit.showDeMorganAlternate", TOOL_ACTION EE_ACTIONS::showDeMorganAlternate( "eeschema.InteractiveEdit.showDeMorganAlternate",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "DeMorgan Alternate" ), _( "Switch to alternate DeMorgan representation" ), _( "De Morgan Alternate" ), _( "Switch to alternate De Morgan representation" ),
BITMAPS::morgan2 ); BITMAPS::morgan2 );
TOOL_ACTION EE_ACTIONS::toLabel( "eeschema.InteractiveEdit.toLabel", TOOL_ACTION EE_ACTIONS::toLabel( "eeschema.InteractiveEdit.toLabel",