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

Altered text buttons to image buttons 

- Used same tooltip messages
- Added "MoveFieldDown" button / function
This commit is contained in:
Oliver Walters 2017-09-04 00:03:56 +10:00 committed by Wayne Stambaugh
parent 04adacdea6
commit f529e3100c
4 changed files with 480 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
View File

@ -44,6 +44,8 @@
#include <dialog_helpers.h> #include <dialog_helpers.h>
#include <sch_validators.h> #include <sch_validators.h>
#include <bitmaps.h>
#include <dialog_edit_libentry_fields_in_lib_base.h> #include <dialog_edit_libentry_fields_in_lib_base.h>
#ifdef KICAD_SPICE #ifdef KICAD_SPICE
#include <dialog_spice_model.h> #include <dialog_spice_model.h>
@ -82,6 +84,7 @@ private:
void deleteFieldButtonHandler( wxCommandEvent& event ) override; void deleteFieldButtonHandler( wxCommandEvent& event ) override;
void moveUpButtonHandler( wxCommandEvent& event ) override; void moveUpButtonHandler( wxCommandEvent& event ) override;
void moveDownButtonHandler( wxCommandEvent& event ) override;
void OnCancelButtonClick( wxCommandEvent& event ) override; void OnCancelButtonClick( wxCommandEvent& event ) override;
void OnOKButtonClick( wxCommandEvent& event ) override; void OnOKButtonClick( wxCommandEvent& event ) override;
void showButtonHandler( wxCommandEvent& event ) override; void showButtonHandler( wxCommandEvent& event ) override;
@ -180,6 +183,12 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB(
#ifndef KICAD_SPICE #ifndef KICAD_SPICE
m_spiceFieldsButton->Show(false); m_spiceFieldsButton->Show(false);
#endif #endif
// Configure button logos
addFieldButton->SetBitmap( KiBitmap( plus_xpm ) );
deleteFieldButton->SetBitmap( KiBitmap( minus_xpm ) );
moveUpButton->SetBitmap( KiBitmap( go_up_xpm ) );
moveDownButton->SetBitmap( KiBitmap( go_down_xpm ) );
} }
@ -412,6 +421,44 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::deleteFieldButtonHandler( wxCommandEven
} }
void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::moveDownButtonHandler( wxCommandEvent& event )
{
unsigned int fieldNdx = getSelectedFieldNdx();
// Ensure there is at least one field after this one
if( fieldNdx >= ( m_FieldsBuf.size() - 1 ) )
{
return;
}
// The first field which can be moved up is the second user field
// so any field which id < MANDATORY_FIELDS cannot be moved down
if( fieldNdx < MANDATORY_FIELDS )
return;
if( !copyPanelToSelectedField() )
return;
// swap the fieldNdx field with the one before it, in both the vector
// and in the fieldListCtrl
LIB_FIELD tmp = m_FieldsBuf[fieldNdx + 1];
m_FieldsBuf[fieldNdx + 1] = m_FieldsBuf[fieldNdx];
setRowItem( fieldNdx + 1, m_FieldsBuf[fieldNdx] );
m_FieldsBuf[fieldNdx + 1].SetId( fieldNdx + 1 );
m_FieldsBuf[fieldNdx] = tmp;
setRowItem( fieldNdx, tmp );
m_FieldsBuf[fieldNdx].SetId( fieldNdx );
updateDisplay( );
m_skipCopyFromPanel = true;
setSelectedFieldNdx( fieldNdx + 1 );
m_skipCopyFromPanel = false;
}
void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB:: moveUpButtonHandler( wxCommandEvent& event ) void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB:: moveUpButtonHandler( wxCommandEvent& event )
{ {
unsigned fieldNdx = getSelectedFieldNdx(); unsigned fieldNdx = getSelectedFieldNdx();
@ -721,6 +768,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::copySelectedFieldToPanel()
// only user defined fields may be moved, and not the top most user defined // only user defined fields may be moved, and not the top most user defined
// field since it would be moving up into the fixed fields, > not >= // field since it would be moving up into the fixed fields, > not >=
moveUpButton->Enable( fieldNdx > MANDATORY_FIELDS ); moveUpButton->Enable( fieldNdx > MANDATORY_FIELDS );
moveDownButton->Enable( ( fieldNdx >= MANDATORY_FIELDS ) && ( fieldNdx < ( m_FieldsBuf.size() - 1 ) ) );
// if fieldNdx == REFERENCE, VALUE, then disable delete button // if fieldNdx == REFERENCE, VALUE, then disable delete button
deleteFieldButton->Enable( fieldNdx >= MANDATORY_FIELDS ); deleteFieldButton->Enable( fieldNdx >= MANDATORY_FIELDS );

48
eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version May 6 2016) // C++ code generated with wxFormBuilder (version Mar 22 2017)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -25,20 +25,34 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE
fieldListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES ); fieldListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES );
bSizerFiledsList->Add( fieldListCtrl, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 6 ); bSizerFiledsList->Add( fieldListCtrl, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 6 );
addFieldButton = new wxButton( this, wxID_ANY, _("Add Field"), wxDefaultPosition, wxDefaultSize, 0 ); wxBoxSizer* bSizer8;
addFieldButton->SetToolTip( _("Add a new custom field") ); bSizer8 = new wxBoxSizer( wxHORIZONTAL );
bSizerFiledsList->Add( addFieldButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); moveUpButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
deleteFieldButton = new wxButton( this, wxID_ANY, _("Clear and Delete Field"), wxDefaultPosition, wxDefaultSize, 0 );
deleteFieldButton->SetToolTip( _("Delete one of the optional fields") );
bSizerFiledsList->Add( deleteFieldButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
moveUpButton = new wxButton( this, wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 );
moveUpButton->SetToolTip( _("Move the selected optional fields up one position") ); moveUpButton->SetToolTip( _("Move the selected optional fields up one position") );
bSizerFiledsList->Add( moveUpButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bSizer8->Add( moveUpButton, 0, wxALL, 5 );
moveDownButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
moveDownButton->SetToolTip( _("Move Move the selected optional fields down one position down") );
bSizer8->Add( moveDownButton, 0, wxALL, 5 );
bSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
deleteFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
deleteFieldButton->SetToolTip( _("Delete one of the optional fields") );
bSizer8->Add( deleteFieldButton, 0, wxALL, 5 );
addFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
addFieldButton->SetToolTip( _("Add a new custom field") );
bSizer8->Add( addFieldButton, 0, wxALL, 5 );
bSizerFiledsList->Add( bSizer8, 0, wxEXPAND, 5 );
m_spiceFieldsButton = new wxButton( this, wxID_ANY, _("Edit Spice model"), wxDefaultPosition, wxDefaultSize, 0 ); m_spiceFieldsButton = new wxButton( this, wxID_ANY, _("Edit Spice model"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerFiledsList->Add( m_spiceFieldsButton, 0, wxALL|wxEXPAND, 5 ); bSizerFiledsList->Add( m_spiceFieldsButton, 0, wxALL|wxEXPAND, 5 );
@ -202,9 +216,10 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE
this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnInitDialog ) ); this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnInitDialog ) );
fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemDeselected ), NULL, this ); fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemDeselected ), NULL, this );
fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemSelected ), NULL, this ); fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemSelected ), NULL, this );
addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this );
deleteFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this );
moveUpButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveUpButtonHandler ), NULL, this ); moveUpButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveUpButtonHandler ), NULL, this );
moveDownButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveDownButtonHandler ), NULL, this );
deleteFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this );
addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this );
m_spiceFieldsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::EditSpiceModel ), NULL, this ); m_spiceFieldsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::EditSpiceModel ), NULL, this );
m_show_datasheet_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::showButtonHandler ), NULL, this ); m_show_datasheet_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::showButtonHandler ), NULL, this );
stdDialogButtonSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCancelButtonClick ), NULL, this ); stdDialogButtonSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCancelButtonClick ), NULL, this );
@ -218,9 +233,10 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::~DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BAS
this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnInitDialog ) ); this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnInitDialog ) );
fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemDeselected ), NULL, this ); fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemDeselected ), NULL, this );
fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemSelected ), NULL, this ); fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemSelected ), NULL, this );
addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this );
deleteFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this );
moveUpButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveUpButtonHandler ), NULL, this ); moveUpButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveUpButtonHandler ), NULL, this );
moveDownButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveDownButtonHandler ), NULL, this );
deleteFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this );
addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this );
m_spiceFieldsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::EditSpiceModel ), NULL, this ); m_spiceFieldsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::EditSpiceModel ), NULL, this );
m_show_datasheet_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::showButtonHandler ), NULL, this ); m_show_datasheet_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::showButtonHandler ), NULL, this );
stdDialogButtonSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCancelButtonClick ), NULL, this ); stdDialogButtonSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCancelButtonClick ), NULL, this );

647
eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp
View File

@ -216,268 +216,397 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property> <property name="flag">wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxButton" expanded="0"> <object class="wxBoxSizer" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Add Field</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="name">bSizer8</property>
<property name="name">addFieldButton</property> <property name="orient">wxHORIZONTAL</property>
<property name="pane_border">1</property> <property name="permission">none</property>
<property name="pane_position"></property> <object class="sizeritem" expanded="1">
<property name="pane_size"></property> <property name="border">5</property>
<property name="permission">protected</property> <property name="flag">wxALL</property>
<property name="pin_button">1</property> <property name="proportion">0</property>
<property name="pos"></property> <object class="wxBitmapButton" expanded="1">
<property name="resize">Resizable</property> <property name="BottomDockable">1</property>
<property name="show">1</property> <property name="LeftDockable">1</property>
<property name="size"></property> <property name="RightDockable">1</property>
<property name="style"></property> <property name="TopDockable">1</property>
<property name="subclass"></property> <property name="aui_layer"></property>
<property name="toolbar_pane">0</property> <property name="aui_name"></property>
<property name="tooltip">Add a new custom field</property> <property name="aui_position"></property>
<property name="validator_data_type"></property> <property name="aui_row"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="best_size"></property>
<property name="validator_type">wxDefaultValidator</property> <property name="bg"></property>
<property name="validator_variable"></property> <property name="bitmap"></property>
<property name="window_extra_style"></property> <property name="caption"></property>
<property name="window_name"></property> <property name="caption_visible">1</property>
<property name="window_style"></property> <property name="center_pane">0</property>
<event name="OnButtonClick">addFieldButtonHandler</event> <property name="close_button">1</property>
<event name="OnChar"></event> <property name="context_help"></property>
<event name="OnEnterWindow"></event> <property name="context_menu">1</property>
<event name="OnEraseBackground"></event> <property name="default">0</property>
<event name="OnKeyDown"></event> <property name="default_pane">0</property>
<event name="OnKeyUp"></event> <property name="disabled"></property>
<event name="OnKillFocus"></event> <property name="dock">Dock</property>
<event name="OnLeaveWindow"></event> <property name="dock_fixed">0</property>
<event name="OnLeftDClick"></event> <property name="docking">Left</property>
<event name="OnLeftDown"></event> <property name="enabled">1</property>
<event name="OnLeftUp"></event> <property name="fg"></property>
<event name="OnMiddleDClick"></event> <property name="floatable">1</property>
<event name="OnMiddleDown"></event> <property name="focus"></property>
<event name="OnMiddleUp"></event> <property name="font"></property>
<event name="OnMotion"></event> <property name="gripper">0</property>
<event name="OnMouseEvents"></event> <property name="hidden">0</property>
<event name="OnMouseWheel"></event> <property name="hover"></property>
<event name="OnPaint"></event> <property name="id">wxID_ANY</property>
<event name="OnRightDClick"></event> <property name="label">MyButton</property>
<event name="OnRightDown"></event> <property name="max_size"></property>
<event name="OnRightUp"></event> <property name="maximize_button">0</property>
<event name="OnSetFocus"></event> <property name="maximum_size"></property>
<event name="OnSize"></event> <property name="min_size"></property>
<event name="OnUpdateUI"></event> <property name="minimize_button">0</property>
</object> <property name="minimum_size"></property>
</object> <property name="moveable">1</property>
<object class="sizeritem" expanded="0"> <property name="name">moveUpButton</property>
<property name="border">5</property> <property name="pane_border">1</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property> <property name="pane_position"></property>
<property name="proportion">0</property> <property name="pane_size"></property>
<object class="wxButton" expanded="0"> <property name="permission">protected</property>
<property name="BottomDockable">1</property> <property name="pin_button">1</property>
<property name="LeftDockable">1</property> <property name="pos"></property>
<property name="RightDockable">1</property> <property name="resize">Resizable</property>
<property name="TopDockable">1</property> <property name="selected"></property>
<property name="aui_layer"></property> <property name="show">1</property>
<property name="aui_name"></property> <property name="size"></property>
<property name="aui_position"></property> <property name="style">wxBU_AUTODRAW</property>
<property name="aui_row"></property> <property name="subclass"></property>
<property name="best_size"></property> <property name="toolbar_pane">0</property>
<property name="bg"></property> <property name="tooltip">Move the selected optional fields up one position</property>
<property name="caption"></property> <property name="validator_data_type"></property>
<property name="caption_visible">1</property> <property name="validator_style">wxFILTER_NONE</property>
<property name="center_pane">0</property> <property name="validator_type">wxDefaultValidator</property>
<property name="close_button">1</property> <property name="validator_variable"></property>
<property name="context_help"></property> <property name="window_extra_style"></property>
<property name="context_menu">1</property> <property name="window_name"></property>
<property name="default">0</property> <property name="window_style"></property>
<property name="default_pane">0</property> <event name="OnButtonClick">moveUpButtonHandler</event>
<property name="dock">Dock</property> <event name="OnChar"></event>
<property name="dock_fixed">0</property> <event name="OnEnterWindow"></event>
<property name="docking">Left</property> <event name="OnEraseBackground"></event>
<property name="enabled">1</property> <event name="OnKeyDown"></event>
<property name="fg"></property> <event name="OnKeyUp"></event>
<property name="floatable">1</property> <event name="OnKillFocus"></event>
<property name="font"></property> <event name="OnLeaveWindow"></event>
<property name="gripper">0</property> <event name="OnLeftDClick"></event>
<property name="hidden">0</property> <event name="OnLeftDown"></event>
<property name="id">wxID_ANY</property> <event name="OnLeftUp"></event>
<property name="label">Clear and Delete Field</property> <event name="OnMiddleDClick"></event>
<property name="max_size"></property> <event name="OnMiddleDown"></event>
<property name="maximize_button">0</property> <event name="OnMiddleUp"></event>
<property name="maximum_size"></property> <event name="OnMotion"></event>
<property name="min_size"></property> <event name="OnMouseEvents"></event>
<property name="minimize_button">0</property> <event name="OnMouseWheel"></event>
<property name="minimum_size"></property> <event name="OnPaint"></event>
<property name="moveable">1</property> <event name="OnRightDClick"></event>
<property name="name">deleteFieldButton</property> <event name="OnRightDown"></event>
<property name="pane_border">1</property> <event name="OnRightUp"></event>
<property name="pane_position"></property> <event name="OnSetFocus"></event>
<property name="pane_size"></property> <event name="OnSize"></event>
<property name="permission">protected</property> <event name="OnUpdateUI"></event>
<property name="pin_button">1</property> </object>
<property name="pos"></property> </object>
<property name="resize">Resizable</property> <object class="sizeritem" expanded="1">
<property name="show">1</property> <property name="border">5</property>
<property name="size"></property> <property name="flag">wxALL</property>
<property name="style"></property> <property name="proportion">0</property>
<property name="subclass"></property> <object class="wxBitmapButton" expanded="1">
<property name="toolbar_pane">0</property> <property name="BottomDockable">1</property>
<property name="tooltip">Delete one of the optional fields</property> <property name="LeftDockable">1</property>
<property name="validator_data_type"></property> <property name="RightDockable">1</property>
<property name="validator_style">wxFILTER_NONE</property> <property name="TopDockable">1</property>
<property name="validator_type">wxDefaultValidator</property> <property name="aui_layer"></property>
<property name="validator_variable"></property> <property name="aui_name"></property>
<property name="window_extra_style"></property> <property name="aui_position"></property>
<property name="window_name"></property> <property name="aui_row"></property>
<property name="window_style"></property> <property name="best_size"></property>
<event name="OnButtonClick">deleteFieldButtonHandler</event> <property name="bg"></property>
<event name="OnChar"></event> <property name="bitmap"></property>
<event name="OnEnterWindow"></event> <property name="caption"></property>
<event name="OnEraseBackground"></event> <property name="caption_visible">1</property>
<event name="OnKeyDown"></event> <property name="center_pane">0</property>
<event name="OnKeyUp"></event> <property name="close_button">1</property>
<event name="OnKillFocus"></event> <property name="context_help"></property>
<event name="OnLeaveWindow"></event> <property name="context_menu">1</property>
<event name="OnLeftDClick"></event> <property name="default">0</property>
<event name="OnLeftDown"></event> <property name="default_pane">0</property>
<event name="OnLeftUp"></event> <property name="disabled"></property>
<event name="OnMiddleDClick"></event> <property name="dock">Dock</property>
<event name="OnMiddleDown"></event> <property name="dock_fixed">0</property>
<event name="OnMiddleUp"></event> <property name="docking">Left</property>
<event name="OnMotion"></event> <property name="enabled">1</property>
<event name="OnMouseEvents"></event> <property name="fg"></property>
<event name="OnMouseWheel"></event> <property name="floatable">1</property>
<event name="OnPaint"></event> <property name="focus"></property>
<event name="OnRightDClick"></event> <property name="font"></property>
<event name="OnRightDown"></event> <property name="gripper">0</property>
<event name="OnRightUp"></event> <property name="hidden">0</property>
<event name="OnSetFocus"></event> <property name="hover"></property>
<event name="OnSize"></event> <property name="id">wxID_ANY</property>
<event name="OnUpdateUI"></event> <property name="label">MyButton</property>
</object> <property name="max_size"></property>
</object> <property name="maximize_button">0</property>
<object class="sizeritem" expanded="0"> <property name="maximum_size"></property>
<property name="border">5</property> <property name="min_size"></property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property> <property name="minimize_button">0</property>
<property name="proportion">0</property> <property name="minimum_size"></property>
<object class="wxButton" expanded="0"> <property name="moveable">1</property>
<property name="BottomDockable">1</property> <property name="name">moveDownButton</property>
<property name="LeftDockable">1</property> <property name="pane_border">1</property>
<property name="RightDockable">1</property> <property name="pane_position"></property>
<property name="TopDockable">1</property> <property name="pane_size"></property>
<property name="aui_layer"></property> <property name="permission">protected</property>
<property name="aui_name"></property> <property name="pin_button">1</property>
<property name="aui_position"></property> <property name="pos"></property>
<property name="aui_row"></property> <property name="resize">Resizable</property>
<property name="best_size"></property> <property name="selected"></property>
<property name="bg"></property> <property name="show">1</property>
<property name="caption"></property> <property name="size"></property>
<property name="caption_visible">1</property> <property name="style">wxBU_AUTODRAW</property>
<property name="center_pane">0</property> <property name="subclass"></property>
<property name="close_button">1</property> <property name="toolbar_pane">0</property>
<property name="context_help"></property> <property name="tooltip">Move Move the selected optional fields down one position down</property>
<property name="context_menu">1</property> <property name="validator_data_type"></property>
<property name="default">0</property> <property name="validator_style">wxFILTER_NONE</property>
<property name="default_pane">0</property> <property name="validator_type">wxDefaultValidator</property>
<property name="dock">Dock</property> <property name="validator_variable"></property>
<property name="dock_fixed">0</property> <property name="window_extra_style"></property>
<property name="docking">Left</property> <property name="window_name"></property>
<property name="enabled">1</property> <property name="window_style"></property>
<property name="fg"></property> <event name="OnButtonClick">moveDownButtonHandler</event>
<property name="floatable">1</property> <event name="OnChar"></event>
<property name="font"></property> <event name="OnEnterWindow"></event>
<property name="gripper">0</property> <event name="OnEraseBackground"></event>
<property name="hidden">0</property> <event name="OnKeyDown"></event>
<property name="id">wxID_ANY</property> <event name="OnKeyUp"></event>
<property name="label">Move Up</property> <event name="OnKillFocus"></event>
<property name="max_size"></property> <event name="OnLeaveWindow"></event>
<property name="maximize_button">0</property> <event name="OnLeftDClick"></event>
<property name="maximum_size"></property> <event name="OnLeftDown"></event>
<property name="min_size"></property> <event name="OnLeftUp"></event>
<property name="minimize_button">0</property> <event name="OnMiddleDClick"></event>
<property name="minimum_size"></property> <event name="OnMiddleDown"></event>
<property name="moveable">1</property> <event name="OnMiddleUp"></event>
<property name="name">moveUpButton</property> <event name="OnMotion"></event>
<property name="pane_border">1</property> <event name="OnMouseEvents"></event>
<property name="pane_position"></property> <event name="OnMouseWheel"></event>
<property name="pane_size"></property> <event name="OnPaint"></event>
<property name="permission">protected</property> <event name="OnRightDClick"></event>
<property name="pin_button">1</property> <event name="OnRightDown"></event>
<property name="pos"></property> <event name="OnRightUp"></event>
<property name="resize">Resizable</property> <event name="OnSetFocus"></event>
<property name="show">1</property> <event name="OnSize"></event>
<property name="size"></property> <event name="OnUpdateUI"></event>
<property name="style"></property> </object>
<property name="subclass"></property> </object>
<property name="toolbar_pane">0</property> <object class="sizeritem" expanded="1">
<property name="tooltip">Move the selected optional fields up one position</property> <property name="border">5</property>
<property name="validator_data_type"></property> <property name="flag">wxEXPAND</property>
<property name="validator_style">wxFILTER_NONE</property> <property name="proportion">1</property>
<property name="validator_type">wxDefaultValidator</property> <object class="spacer" expanded="1">
<property name="validator_variable"></property> <property name="height">0</property>
<property name="window_extra_style"></property> <property name="permission">protected</property>
<property name="window_name"></property> <property name="width">0</property>
<property name="window_style"></property> </object>
<event name="OnButtonClick">moveUpButtonHandler</event> </object>
<event name="OnChar"></event> <object class="sizeritem" expanded="1">
<event name="OnEnterWindow"></event> <property name="border">5</property>
<event name="OnEraseBackground"></event> <property name="flag">wxALL</property>
<event name="OnKeyDown"></event> <property name="proportion">0</property>
<event name="OnKeyUp"></event> <object class="wxBitmapButton" expanded="1">
<event name="OnKillFocus"></event> <property name="BottomDockable">1</property>
<event name="OnLeaveWindow"></event> <property name="LeftDockable">1</property>
<event name="OnLeftDClick"></event> <property name="RightDockable">1</property>
<event name="OnLeftDown"></event> <property name="TopDockable">1</property>
<event name="OnLeftUp"></event> <property name="aui_layer"></property>
<event name="OnMiddleDClick"></event> <property name="aui_name"></property>
<event name="OnMiddleDown"></event> <property name="aui_position"></property>
<event name="OnMiddleUp"></event> <property name="aui_row"></property>
<event name="OnMotion"></event> <property name="best_size"></property>
<event name="OnMouseEvents"></event> <property name="bg"></property>
<event name="OnMouseWheel"></event> <property name="bitmap"></property>
<event name="OnPaint"></event> <property name="caption"></property>
<event name="OnRightDClick"></event> <property name="caption_visible">1</property>
<event name="OnRightDown"></event> <property name="center_pane">0</property>
<event name="OnRightUp"></event> <property name="close_button">1</property>
<event name="OnSetFocus"></event> <property name="context_help"></property>
<event name="OnSize"></event> <property name="context_menu">1</property>
<event name="OnUpdateUI"></event> <property name="default">0</property>
<property name="default_pane">0</property>
<property name="disabled"></property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="focus"></property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="hover"></property>
<property name="id">wxID_ANY</property>
<property name="label">MyButton</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">deleteFieldButton</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="selected"></property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxBU_AUTODRAW</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Delete one of the optional fields</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<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>
<event name="OnButtonClick">deleteFieldButtonHandler</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxBitmapButton" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="bitmap"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="default_pane">0</property>
<property name="disabled"></property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="focus"></property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="hover"></property>
<property name="id">wxID_ANY</property>
<property name="label">MyButton</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">addFieldButton</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="selected"></property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxBU_AUTODRAW</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Add a new custom field</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<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>
<event name="OnButtonClick">addFieldButtonHandler</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<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>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">

18
eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version May 6 2016) // C++ code generated with wxFormBuilder (version Mar 22 2017)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -20,6 +20,10 @@ class DIALOG_SHIM;
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/bitmap.h>
#include <wx/image.h>
#include <wx/icon.h>
#include <wx/bmpbuttn.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/radiobox.h> #include <wx/radiobox.h>
@ -42,9 +46,10 @@ class DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE : public DIALOG_SHIM
protected: protected:
wxListCtrl* fieldListCtrl; wxListCtrl* fieldListCtrl;
wxButton* addFieldButton; wxBitmapButton* moveUpButton;
wxButton* deleteFieldButton; wxBitmapButton* moveDownButton;
wxButton* moveUpButton; wxBitmapButton* deleteFieldButton;
wxBitmapButton* addFieldButton;
wxButton* m_spiceFieldsButton; wxButton* m_spiceFieldsButton;
wxRadioBox* m_FieldHJustifyCtrl; wxRadioBox* m_FieldHJustifyCtrl;
wxRadioBox* m_FieldVJustifyCtrl; wxRadioBox* m_FieldVJustifyCtrl;
@ -75,9 +80,10 @@ class DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE : public DIALOG_SHIM
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); } virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); } virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
virtual void addFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void deleteFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void moveUpButtonHandler( wxCommandEvent& event ) { event.Skip(); } virtual void moveUpButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void moveDownButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void deleteFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void addFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void EditSpiceModel( wxCommandEvent& event ) { event.Skip(); } virtual void EditSpiceModel( wxCommandEvent& event ) { event.Skip(); }
virtual void showButtonHandler( wxCommandEvent& event ) { event.Skip(); } virtual void showButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }