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

Minor dialog and frame window improvements. 

Drop all uses of wxRAISED_BORDER and wxSUNKEN_BORDER from dialogs and
panels used in main frame windows.

Drop use of wxSP_3DSASH options on all wxSplitterWindow definitions.

Minor dialog alignment and spacing fixes.
This commit is contained in:
Wayne Stambaugh 2018-08-02 13:00:41 -04:00
parent ce3760438c
commit 8e7d6063fd
65 changed files with 70711 additions and 65010 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp
View File

@ -75,7 +75,7 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana
m_FileTree = new wxGenericDirCtrl( this, ID_FILE_TREE, prevModelSelectDir, wxDefaultPosition, m_FileTree = new wxGenericDirCtrl( this, ID_FILE_TREE, prevModelSelectDir, wxDefaultPosition,
wxSize( 300,100 ), wxDIRCTRL_3D_INTERNAL | wxDIRCTRL_EDIT_LABELS wxSize( 300,100 ), wxDIRCTRL_3D_INTERNAL | wxDIRCTRL_EDIT_LABELS
| wxDIRCTRL_SELECT_FIRST | wxDIRCTRL_SHOW_FILTERS|wxSUNKEN_BORDER, wxEmptyString, 0 ); | wxDIRCTRL_SELECT_FIRST | wxDIRCTRL_SHOW_FILTERS | wxBORDER_SIMPLE, wxEmptyString, 0 );
m_FileTree->ShowHidden( false ); m_FileTree->ShowHidden( false );

18
common/dialogs/dialog_configure_paths_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -19,7 +19,7 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi
wxStaticBoxSizer* sbEnvVars; wxStaticBoxSizer* sbEnvVars;
sbEnvVars = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Environment Variables") ), wxVERTICAL ); sbEnvVars = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Environment Variables") ), wxVERTICAL );
m_EnvVars = new wxGrid( sbEnvVars->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER ); m_EnvVars = new wxGrid( sbEnvVars->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE );
// Grid // Grid
m_EnvVars->CreateGrid( 1, 2 ); m_EnvVars->CreateGrid( 1, 2 );
@ -54,12 +54,12 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi
wxBoxSizer* bSizerEnvVarBtns; wxBoxSizer* bSizerEnvVarBtns;
bSizerEnvVarBtns = new wxBoxSizer( wxHORIZONTAL ); bSizerEnvVarBtns = new wxBoxSizer( wxHORIZONTAL );
m_btnAddEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_btnAddEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_btnAddEnvVar->SetMinSize( wxSize( 30,29 ) ); m_btnAddEnvVar->SetMinSize( wxSize( 30,29 ) );
bSizerEnvVarBtns->Add( m_btnAddEnvVar, 0, 0, 5 ); bSizerEnvVarBtns->Add( m_btnAddEnvVar, 0, 0, 5 );
m_btnDeleteEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_btnDeleteEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_btnDeleteEnvVar->SetMinSize( wxSize( 30,29 ) ); m_btnDeleteEnvVar->SetMinSize( wxSize( 30,29 ) );
bSizerEnvVarBtns->Add( m_btnDeleteEnvVar, 0, wxLEFT, 5 ); bSizerEnvVarBtns->Add( m_btnDeleteEnvVar, 0, wxLEFT, 5 );
@ -72,7 +72,7 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi
m_sb3DSearchPaths = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("3D Search Paths") ), wxVERTICAL ); m_sb3DSearchPaths = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("3D Search Paths") ), wxVERTICAL );
m_SearchPaths = new wxGrid( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER ); m_SearchPaths = new wxGrid( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE );
// Grid // Grid
m_SearchPaths->CreateGrid( 1, 3 ); m_SearchPaths->CreateGrid( 1, 3 );
@ -110,22 +110,22 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi
wxBoxSizer* bSizerSearchPathBtns; wxBoxSizer* bSizerSearchPathBtns;
bSizerSearchPathBtns = new wxBoxSizer( wxHORIZONTAL ); bSizerSearchPathBtns = new wxBoxSizer( wxHORIZONTAL );
m_btnAddSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_btnAddSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_btnAddSearchPath->SetMinSize( wxSize( 30,29 ) ); m_btnAddSearchPath->SetMinSize( wxSize( 30,29 ) );
bSizerSearchPathBtns->Add( m_btnAddSearchPath, 0, wxRIGHT, 5 ); bSizerSearchPathBtns->Add( m_btnAddSearchPath, 0, wxRIGHT, 5 );
m_btnDeleteSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_btnDeleteSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_btnDeleteSearchPath->SetMinSize( wxSize( 30,29 ) ); m_btnDeleteSearchPath->SetMinSize( wxSize( 30,29 ) );
bSizerSearchPathBtns->Add( m_btnDeleteSearchPath, 0, wxRIGHT, 10 ); bSizerSearchPathBtns->Add( m_btnDeleteSearchPath, 0, wxRIGHT, 10 );
m_btnMoveUp = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_btnMoveUp = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_btnMoveUp->SetMinSize( wxSize( 30,29 ) ); m_btnMoveUp->SetMinSize( wxSize( 30,29 ) );
bSizerSearchPathBtns->Add( m_btnMoveUp, 0, wxLEFT, 10 ); bSizerSearchPathBtns->Add( m_btnMoveUp, 0, wxLEFT, 10 );
m_btnMoveDown = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_btnMoveDown = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_btnMoveDown->SetMinSize( wxSize( 30,29 ) ); m_btnMoveDown->SetMinSize( wxSize( 30,29 ) );
bSizerSearchPathBtns->Add( m_btnMoveDown, 0, wxLEFT, 5 ); bSizerSearchPathBtns->Add( m_btnMoveDown, 0, wxLEFT, 5 );

2130
common/dialogs/dialog_configure_paths_base.fbp
View File

File diff suppressed because it is too large Load Diff

4
common/dialogs/dialog_configure_paths_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -18,10 +18,10 @@
#include <wx/font.h> #include <wx/font.h>
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/bmpbuttn.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.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/statbox.h> #include <wx/statbox.h>

4
common/dialogs/dialog_list_selector_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -23,7 +23,7 @@ EDA_LIST_DIALOG_BASE::EDA_LIST_DIALOG_BASE( wxWindow* parent, wxWindowID id, con
m_listLabel->Wrap( -1 ); m_listLabel->Wrap( -1 );
bMargins->Add( m_listLabel, 0, wxALL, 5 ); bMargins->Add( m_listLabel, 0, wxALL, 5 );
m_listBox = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxALWAYS_SHOW_SB|wxRAISED_BORDER|wxVSCROLL ); m_listBox = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxALWAYS_SHOW_SB|wxBORDER_SIMPLE|wxVSCROLL );
m_listBox->SetMinSize( wxSize( -1,200 ) ); m_listBox->SetMinSize( wxSize( -1,200 ) );
bMargins->Add( m_listBox, 3, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); bMargins->Add( m_listBox, 3, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

1229
common/dialogs/dialog_list_selector_base.fbp
View File

File diff suppressed because it is too large Load Diff

2
common/dialogs/dialog_list_selector_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!

4
common/widgets/footprint_preview_widget.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2017 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2017-2018 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com> * Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
@ -26,7 +26,7 @@
FOOTPRINT_PREVIEW_WIDGET::FOOTPRINT_PREVIEW_WIDGET( wxWindow* aParent, KIWAY& aKiway ): FOOTPRINT_PREVIEW_WIDGET::FOOTPRINT_PREVIEW_WIDGET( wxWindow* aParent, KIWAY& aKiway ):
wxPanel( aParent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxPanel( aParent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxFULL_REPAINT_ON_RESIZE | wxSUNKEN_BORDER | wxTAB_TRAVERSAL ), wxFULL_REPAINT_ON_RESIZE | wxBORDER_SIMPLE | wxTAB_TRAVERSAL ),
m_prev_panel( nullptr ), m_prev_panel( nullptr ),
m_status_label( nullptr ), m_status_label( nullptr ),
m_sizer( nullptr ) m_sizer( nullptr )

4
common/widgets/lib_tree.cpp
View File

@ -72,7 +72,7 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, LIB_TABLE* aLibTable, LIB_TREE_MODEL_ADAP
// Component tree // Component tree
m_tree_ctrl = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_tree_ctrl = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxDV_SINGLE | wxRAISED_BORDER ); wxDV_SINGLE );
m_adapter->AttachTo( m_tree_ctrl ); m_adapter->AttachTo( m_tree_ctrl );
sizer->Add( m_tree_ctrl, 5, wxLEFT | wxTOP | wxEXPAND, 5 ); sizer->Add( m_tree_ctrl, 5, wxLEFT | wxTOP | wxEXPAND, 5 );
@ -86,7 +86,7 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, LIB_TABLE* aLibTable, LIB_TREE_MODEL_ADAP
m_details_ctrl = new wxHtmlWindow( m_details_ctrl = new wxHtmlWindow(
this, wxID_ANY, wxDefaultPosition, wxSize( html_sz.x, html_sz.y ), this, wxID_ANY, wxDefaultPosition, wxSize( html_sz.x, html_sz.y ),
wxHW_SCROLLBAR_AUTO | wxRAISED_BORDER ); wxHW_SCROLLBAR_AUTO );
sizer->Add( m_details_ctrl, 2, wxLEFT | wxTOP | wxBOTTOM | wxEXPAND, 5 ); sizer->Add( m_details_ctrl, 2, wxLEFT | wxTOP | wxBOTTOM | wxEXPAND, 5 );
} }

2
cvpcb/listboxes.h
View File

@ -36,7 +36,7 @@ class CVPCB_MAINFRAME;
class COMPONENT; class COMPONENT;
class FOOTPRINT_LIST; class FOOTPRINT_LIST;
#define LISTBOX_STYLE ( wxSUNKEN_BORDER | wxLC_NO_HEADER | wxLC_REPORT | wxLC_VIRTUAL | \ #define LISTBOX_STYLE ( wxBORDER_SIMPLE | wxLC_NO_HEADER | wxLC_REPORT | wxLC_VIRTUAL | \
wxVSCROLL | wxHSCROLL ) wxVSCROLL | wxHSCROLL )
/*********************************************************************/ /*********************************************************************/

28
eeschema/dialogs/dialog_choose_component.cpp
View File

@ -77,7 +77,7 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
if( aShowFootprints ) if( aShowFootprints )
{ {
m_hsplitter = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_hsplitter = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxSP_LIVE_UPDATE | wxSP_3DSASH ); wxSP_LIVE_UPDATE );
//Avoid the splitter window being assigned as the Parent to additional windows //Avoid the splitter window being assigned as the Parent to additional windows
m_hsplitter->SetExtraStyle( wxWS_EX_TRANSIENT ); m_hsplitter->SetExtraStyle( wxWS_EX_TRANSIENT );
@ -87,10 +87,10 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
else else
{ {
m_vsplitter = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_vsplitter = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxSP_LIVE_UPDATE | wxSP_3DSASH ); wxSP_LIVE_UPDATE );
m_hsplitter = new wxSplitterWindow( m_vsplitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_hsplitter = new wxSplitterWindow( m_vsplitter, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxSP_LIVE_UPDATE | wxSP_3DSASH ); wxSP_LIVE_UPDATE );
//Avoid the splitter window being assigned as the Parent to additional windows //Avoid the splitter window being assigned as the Parent to additional windows
m_hsplitter->SetExtraStyle( wxWS_EX_TRANSIENT ); m_hsplitter->SetExtraStyle( wxWS_EX_TRANSIENT );
@ -100,7 +100,7 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
detailsPanel->SetSizer( detailsSizer ); detailsPanel->SetSizer( detailsSizer );
details = new wxHtmlWindow( detailsPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, details = new wxHtmlWindow( detailsPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxHW_SCROLLBAR_AUTO | wxRAISED_BORDER ); wxHW_SCROLLBAR_AUTO );
detailsSizer->Add( details, 1, wxEXPAND | wxLEFT | wxRIGHT, 5 ); detailsSizer->Add( details, 1, wxEXPAND | wxLEFT | wxRIGHT, 5 );
detailsPanel->Layout(); detailsPanel->Layout();
detailsSizer->Fit( detailsPanel ); detailsSizer->Fit( detailsPanel );
@ -113,7 +113,7 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
} }
m_tree = new LIB_TREE( m_hsplitter, Prj().SchSymbolLibTable(), aAdapter, m_tree = new LIB_TREE( m_hsplitter, Prj().SchSymbolLibTable(), aAdapter,
LIB_TREE::WIDGETS::ALL, details ); LIB_TREE::WIDGETS::ALL, details );
m_hsplitter->SetSashGravity( 0.8 ); m_hsplitter->SetSashGravity( 0.8 );
m_hsplitter->SetMinimumPaneSize( 20 ); m_hsplitter->SetMinimumPaneSize( 20 );
@ -126,7 +126,7 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
if( aAllowBrowser ) if( aAllowBrowser )
{ {
m_browser_button = new wxButton( this, wxID_ANY, _( "Select with Browser" ) ); m_browser_button = new wxButton( this, wxID_ANY, _( "Select with Browser" ) );
buttonsSizer->Add( m_browser_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 10 ); buttonsSizer->Add( m_browser_button, 0, wxALL, 5 );
} }
auto sdbSizer = new wxStdDialogButtonSizer(); auto sdbSizer = new wxStdDialogButtonSizer();
@ -148,10 +148,12 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
m_symbol_preview->Bind( wxEVT_PAINT, &DIALOG_CHOOSE_COMPONENT::OnSymbolPreviewPaint, this ); m_symbol_preview->Bind( wxEVT_PAINT, &DIALOG_CHOOSE_COMPONENT::OnSymbolPreviewPaint, this );
if( m_browser_button ) if( m_browser_button )
m_browser_button->Bind( wxEVT_COMMAND_BUTTON_CLICKED, &DIALOG_CHOOSE_COMPONENT::OnUseBrowser, this ); m_browser_button->Bind( wxEVT_COMMAND_BUTTON_CLICKED,
&DIALOG_CHOOSE_COMPONENT::OnUseBrowser, this );
if( m_fp_sel_ctrl ) if( m_fp_sel_ctrl )
m_fp_sel_ctrl->Bind( EVT_FOOTPRINT_SELECTED, &DIALOG_CHOOSE_COMPONENT::OnFootprintSelected, this ); m_fp_sel_ctrl->Bind( EVT_FOOTPRINT_SELECTED,
&DIALOG_CHOOSE_COMPONENT::OnFootprintSelected, this );
Layout(); Layout();
@ -181,10 +183,12 @@ DIALOG_CHOOSE_COMPONENT::~DIALOG_CHOOSE_COMPONENT()
m_symbol_preview->Unbind( wxEVT_PAINT, &DIALOG_CHOOSE_COMPONENT::OnSymbolPreviewPaint, this ); m_symbol_preview->Unbind( wxEVT_PAINT, &DIALOG_CHOOSE_COMPONENT::OnSymbolPreviewPaint, this );
if( m_browser_button ) if( m_browser_button )
m_browser_button->Unbind( wxEVT_COMMAND_BUTTON_CLICKED, &DIALOG_CHOOSE_COMPONENT::OnUseBrowser, this ); m_browser_button->Unbind( wxEVT_COMMAND_BUTTON_CLICKED,
&DIALOG_CHOOSE_COMPONENT::OnUseBrowser, this );
if( m_fp_sel_ctrl ) if( m_fp_sel_ctrl )
m_fp_sel_ctrl->Unbind( EVT_FOOTPRINT_SELECTED, &DIALOG_CHOOSE_COMPONENT::OnFootprintSelected, this ); m_fp_sel_ctrl->Unbind( EVT_FOOTPRINT_SELECTED,
&DIALOG_CHOOSE_COMPONENT::OnFootprintSelected, this );
// I am not sure the following two lines are necessary, // I am not sure the following two lines are necessary,
// but they will not hurt anyone // but they will not hurt anyone
@ -205,7 +209,7 @@ wxPanel* DIALOG_CHOOSE_COMPONENT::ConstructRightPanel( wxWindow* aParent )
auto sizer = new wxBoxSizer( wxVERTICAL ); auto sizer = new wxBoxSizer( wxVERTICAL );
m_symbol_preview = new wxPanel( panel, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), m_symbol_preview = new wxPanel( panel, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ),
wxFULL_REPAINT_ON_RESIZE | wxTAB_TRAVERSAL | wxRAISED_BORDER ); wxFULL_REPAINT_ON_RESIZE | wxTAB_TRAVERSAL );
m_symbol_preview->SetLayoutDirection( wxLayout_LeftToRight ); m_symbol_preview->SetLayoutDirection( wxLayout_LeftToRight );
if( m_show_footprints ) if( m_show_footprints )
@ -221,7 +225,7 @@ wxPanel* DIALOG_CHOOSE_COMPONENT::ConstructRightPanel( wxWindow* aParent )
sizer->Add( m_symbol_preview, 1, wxEXPAND | wxTOP | wxBOTTOM | wxRIGHT, 5 ); sizer->Add( m_symbol_preview, 1, wxEXPAND | wxTOP | wxBOTTOM | wxRIGHT, 5 );
if( m_fp_sel_ctrl ) if( m_fp_sel_ctrl )
sizer->Add( m_fp_sel_ctrl, 0, wxEXPAND | wxTOP | wxRIGHT, 5 ); sizer->Add( m_fp_sel_ctrl, 0, wxEXPAND | wxBOTTOM | wxTOP | wxRIGHT, 5 );
sizer->Add( m_fp_preview, 1, wxEXPAND | wxBOTTOM | wxRIGHT, 5 ); sizer->Add( m_fp_preview, 1, wxEXPAND | wxBOTTOM | wxRIGHT, 5 );
} }

14
eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -21,7 +21,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE
wxStaticBoxSizer* sbFields; wxStaticBoxSizer* sbFields;
sbFields = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Fields") ), wxVERTICAL ); sbFields = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Fields") ), wxVERTICAL );
m_grid = new WX_GRID( sbFields->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER ); m_grid = new WX_GRID( sbFields->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE );
// Grid // Grid
m_grid->CreateGrid( 4, 11 ); m_grid->CreateGrid( 4, 11 );
@ -74,22 +74,22 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE
wxBoxSizer* bButtonSize; wxBoxSizer* bButtonSize;
bButtonSize = new wxBoxSizer( wxHORIZONTAL ); bButtonSize = new wxBoxSizer( wxHORIZONTAL );
m_bpAdd = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpAdd = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bpAdd->SetMinSize( wxSize( 30,30 ) ); m_bpAdd->SetMinSize( wxSize( 30,30 ) );
bButtonSize->Add( m_bpAdd, 0, wxRIGHT, 5 ); bButtonSize->Add( m_bpAdd, 0, wxRIGHT, 5 );
m_bpDelete = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpDelete = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bpDelete->SetMinSize( wxSize( 30,30 ) ); m_bpDelete->SetMinSize( wxSize( 30,30 ) );
bButtonSize->Add( m_bpDelete, 0, wxRIGHT, 10 ); bButtonSize->Add( m_bpDelete, 0, wxRIGHT, 10 );
m_bpMoveUp = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpMoveUp = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bpMoveUp->SetMinSize( wxSize( 30,30 ) ); m_bpMoveUp->SetMinSize( wxSize( 30,30 ) );
bButtonSize->Add( m_bpMoveUp, 0, wxLEFT, 10 ); bButtonSize->Add( m_bpMoveUp, 0, wxLEFT, 10 );
m_bpMoveDown = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpMoveDown = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bpMoveDown->SetMinSize( wxSize( 30,30 ) ); m_bpMoveDown->SetMinSize( wxSize( 30,30 ) );
bButtonSize->Add( m_bpMoveDown, 0, wxRIGHT|wxLEFT, 5 ); bButtonSize->Add( m_bpMoveDown, 0, wxRIGHT|wxLEFT, 5 );
@ -132,7 +132,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE
bLibraryReferenceSizer->Add( m_libraryNameTextCtrl, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); bLibraryReferenceSizer->Add( m_libraryNameTextCtrl, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
m_buttonBrowseLibrary = new wxBitmapButton( sbSizerLibraryReference->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_buttonBrowseLibrary = new wxBitmapButton( sbSizerLibraryReference->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_buttonBrowseLibrary->SetMinSize( wxSize( 29,29 ) ); m_buttonBrowseLibrary->SetMinSize( wxSize( 29,29 ) );
bLibraryReferenceSizer->Add( m_buttonBrowseLibrary, 0, wxALIGN_CENTER_VERTICAL, 5 ); bLibraryReferenceSizer->Add( m_buttonBrowseLibrary, 0, wxALIGN_CENTER_VERTICAL, 5 );

4014
eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp
View File

File diff suppressed because it is too large Load Diff

4
eeschema/dialogs/dialog_edit_component_in_schematic_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -20,10 +20,10 @@ class WX_GRID;
#include <wx/font.h> #include <wx/font.h>
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/bmpbuttn.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.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/statbox.h> #include <wx/statbox.h>

12
eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -21,7 +21,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE
wxBoxSizer* bSizerFieldsSetup; wxBoxSizer* bSizerFieldsSetup;
bSizerFieldsSetup = new wxBoxSizer( wxVERTICAL ); bSizerFieldsSetup = new wxBoxSizer( wxVERTICAL );
m_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER ); m_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE );
// Grid // Grid
m_grid->CreateGrid( 4, 11 ); m_grid->CreateGrid( 4, 11 );
@ -74,22 +74,22 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE
wxBoxSizer* bButtonSize; wxBoxSizer* bButtonSize;
bButtonSize = new wxBoxSizer( wxHORIZONTAL ); bButtonSize = new wxBoxSizer( wxHORIZONTAL );
m_bpAdd = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpAdd = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bpAdd->SetMinSize( wxSize( 30,29 ) ); m_bpAdd->SetMinSize( wxSize( 30,29 ) );
bButtonSize->Add( m_bpAdd, 0, wxRIGHT, 5 ); bButtonSize->Add( m_bpAdd, 0, wxRIGHT, 5 );
m_bpDelete = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpDelete = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bpDelete->SetMinSize( wxSize( 30,29 ) ); m_bpDelete->SetMinSize( wxSize( 30,29 ) );
bButtonSize->Add( m_bpDelete, 0, wxRIGHT, 10 ); bButtonSize->Add( m_bpDelete, 0, wxRIGHT, 10 );
m_bpMoveUp = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpMoveUp = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bpMoveUp->SetMinSize( wxSize( 30,29 ) ); m_bpMoveUp->SetMinSize( wxSize( 30,29 ) );
bButtonSize->Add( m_bpMoveUp, 0, wxLEFT, 10 ); bButtonSize->Add( m_bpMoveUp, 0, wxLEFT, 10 );
m_bpMoveDown = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpMoveDown = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bpMoveDown->SetMinSize( wxSize( 30,29 ) ); m_bpMoveDown->SetMinSize( wxSize( 30,29 ) );
bButtonSize->Add( m_bpMoveDown, 0, wxRIGHT|wxLEFT, 5 ); bButtonSize->Add( m_bpMoveDown, 0, wxRIGHT|wxLEFT, 5 );

1828
eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp
View File

File diff suppressed because it is too large Load Diff

4
eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -20,10 +20,10 @@ class WX_GRID;
#include <wx/font.h> #include <wx/font.h>
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/bmpbuttn.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.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/statline.h> #include <wx/statline.h>

4
eeschema/dialogs/dialog_erc_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -91,7 +91,7 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
bercSizer->Add( m_textMarkers, 0, wxLEFT|wxRIGHT, 20 ); bercSizer->Add( m_textMarkers, 0, wxLEFT|wxRIGHT, 20 );
m_MarkersList = new ERC_HTML_LISTFRAME( m_PanelERC, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxSUNKEN_BORDER ); m_MarkersList = new ERC_HTML_LISTFRAME( m_PanelERC, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE );
bercSizer->Add( m_MarkersList, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 8 ); bercSizer->Add( m_MarkersList, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 8 );
wxBoxSizer* bbuttonsSizer; wxBoxSizer* bbuttonsSizer;

4070
eeschema/dialogs/dialog_erc_base.fbp
View File

File diff suppressed because it is too large Load Diff

6
eeschema/dialogs/dialog_erc_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -26,11 +26,11 @@ class ERC_HTML_LISTFRAME;
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/statbox.h> #include <wx/statbox.h>
#include <wx/html/htmlwin.h> #include <wx/html/htmlwin.h>
#include <wx/button.h>
#include <wx/panel.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.h> #include <wx/icon.h>
#include <wx/button.h>
#include <wx/panel.h>
#include <wx/notebook.h> #include <wx/notebook.h>
#include <wx/dialog.h> #include <wx/dialog.h>

6
eeschema/dialogs/dialog_fields_editor_global_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -16,7 +16,7 @@ DIALOG_FIELDS_EDITOR_GLOBAL_BASE::DIALOG_FIELDS_EDITOR_GLOBAL_BASE( wxWindow* pa
wxBoxSizer* bMainSizer; wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxVERTICAL ); bMainSizer = new wxBoxSizer( wxVERTICAL );
m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH|wxSP_LIVE_UPDATE ); m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE );
m_splitter1->SetMinimumPaneSize( 200 ); m_splitter1->SetMinimumPaneSize( 200 );
m_leftPanel = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_leftPanel = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
@ -35,7 +35,7 @@ DIALOG_FIELDS_EDITOR_GLOBAL_BASE::DIALOG_FIELDS_EDITOR_GLOBAL_BASE( wxWindow* pa
bGroupSizer->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 ); bGroupSizer->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 );
m_bRefresh = new wxBitmapButton( m_leftPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bRefresh = new wxBitmapButton( m_leftPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bRefresh->SetMinSize( wxSize( 30,30 ) ); m_bRefresh->SetMinSize( wxSize( 30,30 ) );
bGroupSizer->Add( m_bRefresh, 0, wxALIGN_CENTER_VERTICAL, 5 ); bGroupSizer->Add( m_bRefresh, 0, wxALIGN_CENTER_VERTICAL, 5 );

2078
eeschema/dialogs/dialog_fields_editor_global_base.fbp
View File

File diff suppressed because it is too large Load Diff

4
eeschema/dialogs/dialog_fields_editor_global_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -18,10 +18,10 @@
#include <wx/font.h> #include <wx/font.h>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/bmpbuttn.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.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/dataview.h> #include <wx/dataview.h>

4
eeschema/dialogs/dialog_lib_edit_pin_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -157,7 +157,7 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID
bRightSizer->Add( checkboxesSizer, 0, wxEXPAND|wxALL, 5 ); bRightSizer->Add( checkboxesSizer, 0, wxEXPAND|wxALL, 5 );
m_panelShowPin = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); m_panelShowPin = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
m_panelShowPin->SetMinSize( wxSize( 150,150 ) ); m_panelShowPin->SetMinSize( wxSize( 150,150 ) );
bRightSizer->Add( m_panelShowPin, 1, wxEXPAND | wxALL, 5 ); bRightSizer->Add( m_panelShowPin, 1, wxEXPAND | wxALL, 5 );

5953
eeschema/dialogs/dialog_lib_edit_pin_base.fbp
View File

File diff suppressed because it is too large Load Diff

2
eeschema/dialogs/dialog_lib_edit_pin_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!

5
eeschema/dialogs/dialog_netlist.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2013-2017 Jean-Pierre Charras, jp.charras@wanadoo.fr * Copyright (C) 2013-2017 Jean-Pierre Charras, jp.charras@wanadoo.fr
* Copyright (C) 2013 Wayne Stambaugh <stambaughw@gmail.com> * Copyright (C) 2013 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -263,8 +263,7 @@ END_EVENT_TABLE()
NETLIST_PAGE_DIALOG::NETLIST_PAGE_DIALOG( wxNotebook* parent, NETLIST_PAGE_DIALOG::NETLIST_PAGE_DIALOG( wxNotebook* parent,
const wxString& title, const wxString& title,
NETLIST_TYPE_ID id_NetType ) : NETLIST_TYPE_ID id_NetType ) :
wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL )
wxTAB_TRAVERSAL | wxBORDER_SUNKEN )
{ {
m_IdNetType = id_NetType; m_IdNetType = id_NetType;
m_pageNetFmtName = title; m_pageNetFmtName = title;

6
eeschema/dialogs/dialog_rescue_each_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jan 2 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -49,7 +49,7 @@ DIALOG_RESCUE_EACH_BASE::DIALOG_RESCUE_EACH_BASE( wxWindow* parent, wxWindowID i
bSizer6->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bSizer6->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_componentViewOld = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER ); m_componentViewOld = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE );
m_componentViewOld->SetMinSize( wxSize( 150,150 ) ); m_componentViewOld->SetMinSize( wxSize( 150,150 ) );
bSizer6->Add( m_componentViewOld, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bSizer6->Add( m_componentViewOld, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
@ -66,7 +66,7 @@ DIALOG_RESCUE_EACH_BASE::DIALOG_RESCUE_EACH_BASE( wxWindow* parent, wxWindowID i
bSizer7->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bSizer7->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_componentViewNew = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER ); m_componentViewNew = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE );
m_componentViewNew->SetMinSize( wxSize( 150,150 ) ); m_componentViewNew->SetMinSize( wxSize( 150,150 ) );
bSizer7->Add( m_componentViewNew, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bSizer7->Add( m_componentViewNew, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

2054
eeschema/dialogs/dialog_rescue_each_base.fbp
View File

File diff suppressed because it is too large Load Diff

5
eeschema/dialogs/dialog_rescue_each_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jan 2 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -22,6 +22,9 @@
#include <wx/dataview.h> #include <wx/dataview.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/bitmap.h>
#include <wx/image.h>
#include <wx/icon.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/dialog.h> #include <wx/dialog.h>

8
eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -19,7 +19,7 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE
wxBoxSizer* bMargins; wxBoxSizer* bMargins;
bMargins = new wxBoxSizer( wxVERTICAL ); bMargins = new wxBoxSizer( wxVERTICAL );
m_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER ); m_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE );
// Grid // Grid
m_grid->CreateGrid( 0, 2 ); m_grid->CreateGrid( 0, 2 );
@ -52,12 +52,12 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE
wxBoxSizer* bSizer10; wxBoxSizer* bSizer10;
bSizer10 = new wxBoxSizer( wxHORIZONTAL ); bSizer10 = new wxBoxSizer( wxHORIZONTAL );
m_addFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_addFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_addFieldButton->SetMinSize( wxSize( 29,29 ) ); m_addFieldButton->SetMinSize( wxSize( 29,29 ) );
bSizer10->Add( m_addFieldButton, 0, wxTOP|wxRIGHT, 5 ); bSizer10->Add( m_addFieldButton, 0, wxTOP|wxRIGHT, 5 );
m_deleteFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_deleteFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_deleteFieldButton->SetMinSize( wxSize( 29,29 ) ); m_deleteFieldButton->SetMinSize( wxSize( 29,29 ) );
bSizer10->Add( m_deleteFieldButton, 0, wxTOP|wxRIGHT, 5 ); bSizer10->Add( m_deleteFieldButton, 0, wxTOP|wxRIGHT, 5 );

915
eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp
View File

@ -1,440 +1,475 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="13" /> <FileVersion major="1" minor="14" />
<object class="Project" expanded="1"> <object class="Project" expanded="1">
<property name="class_decoration"></property> <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_mode">source_name</property>
<property name="disconnect_php_events">0</property> <property name="disconnect_php_events">0</property>
<property name="disconnect_python_events">0</property> <property name="disconnect_python_events">0</property>
<property name="embedded_files_path">res</property> <property name="embedded_files_path">res</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">panel_eeschema_template_fieldnames_base</property> <property name="file">panel_eeschema_template_fieldnames_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="internationalize">1</property> <property name="indent_with_spaces"></property>
<property name="name">PanelEeschemaTemplateFieldnames</property> <property name="internationalize">1</property>
<property name="namespace"></property> <property name="name">PanelEeschemaTemplateFieldnames</property>
<property name="path">.</property> <property name="namespace"></property>
<property name="precompiled_header"></property> <property name="path">.</property>
<property name="relative_path">1</property> <property name="precompiled_header"></property>
<property name="skip_lua_events">1</property> <property name="relative_path">1</property>
<property name="skip_php_events">1</property> <property name="skip_lua_events">1</property>
<property name="skip_python_events">1</property> <property name="skip_php_events">1</property>
<property name="ui_table">UI</property> <property name="skip_python_events">1</property>
<property name="use_enum">1</property> <property name="ui_table">UI</property>
<property name="use_microsoft_bom">0</property> <property name="use_enum">1</property>
<object class="Panel" expanded="1"> <property name="use_microsoft_bom">0</property>
<property name="aui_managed">0</property> <object class="Panel" expanded="1">
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="aui_managed">0</property>
<property name="bg"></property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="context_help"></property> <property name="bg"></property>
<property name="context_menu">1</property> <property name="context_help"></property>
<property name="enabled">1</property> <property name="context_menu">1</property>
<property name="event_handler">impl_virtual</property> <property name="enabled">1</property>
<property name="fg"></property> <property name="event_handler">impl_virtual</property>
<property name="font"></property> <property name="fg"></property>
<property name="hidden">0</property> <property name="font"></property>
<property name="id">wxID_ANY</property> <property name="hidden">0</property>
<property name="maximum_size"></property> <property name="id">wxID_ANY</property>
<property name="minimum_size"></property> <property name="maximum_size"></property>
<property name="name">PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE</property> <property name="minimum_size"></property>
<property name="pos"></property> <property name="name">PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE</property>
<property name="size">-1,-1</property> <property name="pos"></property>
<property name="subclass">; forward_declare</property> <property name="size">-1,-1</property>
<property name="tooltip"></property> <property name="subclass">; forward_declare</property>
<property name="window_extra_style"></property> <property name="tooltip"></property>
<property name="window_name"></property> <property name="window_extra_style"></property>
<property name="window_style">wxTAB_TRAVERSAL</property> <property name="window_name"></property>
<event name="OnAuiFindManager"></event> <property name="window_style">wxTAB_TRAVERSAL</property>
<event name="OnAuiPaneButton"></event> <event name="OnAuiPaneActivated"></event>
<event name="OnAuiPaneClose"></event> <event name="OnAuiPaneButton"></event>
<event name="OnAuiPaneMaximize"></event> <event name="OnAuiPaneClose"></event>
<event name="OnAuiPaneRestore"></event> <event name="OnAuiPaneMaximize"></event>
<event name="OnAuiRender"></event> <event name="OnAuiPaneRestore"></event>
<event name="OnChar"></event> <event name="OnAuiRender"></event>
<event name="OnEnterWindow"></event> <event name="OnAux1DClick"></event>
<event name="OnEraseBackground"></event> <event name="OnAux1Down"></event>
<event name="OnInitDialog"></event> <event name="OnAux1Up"></event>
<event name="OnKeyDown"></event> <event name="OnAux2DClick"></event>
<event name="OnKeyUp"></event> <event name="OnAux2Down"></event>
<event name="OnKillFocus"></event> <event name="OnAux2Up"></event>
<event name="OnLeaveWindow"></event> <event name="OnChar"></event>
<event name="OnLeftDClick"></event> <event name="OnCharHook"></event>
<event name="OnLeftDown"></event> <event name="OnEnterWindow"></event>
<event name="OnLeftUp"></event> <event name="OnEraseBackground"></event>
<event name="OnMiddleDClick"></event> <event name="OnInitDialog"></event>
<event name="OnMiddleDown"></event> <event name="OnKeyDown"></event>
<event name="OnMiddleUp"></event> <event name="OnKeyUp"></event>
<event name="OnMotion"></event> <event name="OnKillFocus"></event>
<event name="OnMouseEvents"></event> <event name="OnLeaveWindow"></event>
<event name="OnMouseWheel"></event> <event name="OnLeftDClick"></event>
<event name="OnPaint"></event> <event name="OnLeftDown"></event>
<event name="OnRightDClick"></event> <event name="OnLeftUp"></event>
<event name="OnRightDown"></event> <event name="OnMiddleDClick"></event>
<event name="OnRightUp"></event> <event name="OnMiddleDown"></event>
<event name="OnSetFocus"></event> <event name="OnMiddleUp"></event>
<event name="OnSize"></event> <event name="OnMotion"></event>
<event name="OnUpdateUI"></event> <event name="OnMouseEvents"></event>
<object class="wxBoxSizer" expanded="1"> <event name="OnMouseWheel"></event>
<property name="minimum_size"></property> <event name="OnPaint"></event>
<property name="name">bPanelSizer</property> <event name="OnRightDClick"></event>
<property name="orient">wxHORIZONTAL</property> <event name="OnRightDown"></event>
<property name="permission">none</property> <event name="OnRightUp"></event>
<object class="sizeritem" expanded="1"> <event name="OnSetFocus"></event>
<property name="border">10</property> <event name="OnSize"></event>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property> <event name="OnUpdateUI"></event>
<property name="proportion">1</property> <object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property>
<property name="minimum_size"></property> <property name="name">bPanelSizer</property>
<property name="name">bMargins</property> <property name="orient">wxHORIZONTAL</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="0"> <property name="border">10</property>
<property name="border">2</property> <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="flag">wxEXPAND|wxTOP</property> <property name="proportion">1</property>
<property name="proportion">1</property> <object class="wxBoxSizer" expanded="1">
<object class="wxGrid" expanded="0"> <property name="minimum_size"></property>
<property name="BottomDockable">1</property> <property name="name">bMargins</property>
<property name="LeftDockable">1</property> <property name="orient">wxVERTICAL</property>
<property name="RightDockable">1</property> <property name="permission">none</property>
<property name="TopDockable">1</property> <object class="sizeritem" expanded="0">
<property name="aui_layer"></property> <property name="border">2</property>
<property name="aui_name"></property> <property name="flag">wxEXPAND|wxTOP</property>
<property name="aui_position"></property> <property name="proportion">1</property>
<property name="aui_row"></property> <object class="wxGrid" expanded="0">
<property name="autosize_cols">0</property> <property name="BottomDockable">1</property>
<property name="autosize_rows">0</property> <property name="LeftDockable">1</property>
<property name="best_size"></property> <property name="RightDockable">1</property>
<property name="bg"></property> <property name="TopDockable">1</property>
<property name="caption"></property> <property name="aui_layer"></property>
<property name="caption_visible">1</property> <property name="aui_name"></property>
<property name="cell_bg"></property> <property name="aui_position"></property>
<property name="cell_font"></property> <property name="aui_row"></property>
<property name="cell_horiz_alignment">wxALIGN_LEFT</property> <property name="autosize_cols">0</property>
<property name="cell_text"></property> <property name="autosize_rows">0</property>
<property name="cell_vert_alignment">wxALIGN_TOP</property> <property name="best_size"></property>
<property name="center_pane">0</property> <property name="bg"></property>
<property name="close_button">1</property> <property name="caption"></property>
<property name="col_label_horiz_alignment">wxALIGN_CENTRE</property> <property name="caption_visible">1</property>
<property name="col_label_size">22</property> <property name="cell_bg"></property>
<property name="col_label_values">&quot;Name&quot; &quot;Visible&quot;</property> <property name="cell_font"></property>
<property name="col_label_vert_alignment">wxALIGN_CENTRE</property> <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
<property name="cols">2</property> <property name="cell_text"></property>
<property name="column_sizes">300,60</property> <property name="cell_vert_alignment">wxALIGN_TOP</property>
<property name="context_help"></property> <property name="center_pane">0</property>
<property name="context_menu">1</property> <property name="close_button">1</property>
<property name="default_pane">0</property> <property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>
<property name="dock">Dock</property> <property name="col_label_size">22</property>
<property name="dock_fixed">0</property> <property name="col_label_values">&quot;Name&quot; &quot;Visible&quot;</property>
<property name="docking">Left</property> <property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="drag_col_move">0</property> <property name="cols">2</property>
<property name="drag_col_size">1</property> <property name="column_sizes">300,60</property>
<property name="drag_grid_size">0</property> <property name="context_help"></property>
<property name="drag_row_size">1</property> <property name="context_menu">1</property>
<property name="editing">1</property> <property name="default_pane">0</property>
<property name="enabled">1</property> <property name="dock">Dock</property>
<property name="fg"></property> <property name="dock_fixed">0</property>
<property name="floatable">1</property> <property name="docking">Left</property>
<property name="font"></property> <property name="drag_col_move">0</property>
<property name="grid_line_color"></property> <property name="drag_col_size">1</property>
<property name="grid_lines">1</property> <property name="drag_grid_size">0</property>
<property name="gripper">0</property> <property name="drag_row_size">1</property>
<property name="hidden">0</property> <property name="editing">1</property>
<property name="id">wxID_ANY</property> <property name="enabled">1</property>
<property name="label_bg"></property> <property name="fg"></property>
<property name="label_font"></property> <property name="floatable">1</property>
<property name="label_text"></property> <property name="font"></property>
<property name="margin_height">0</property> <property name="grid_line_color"></property>
<property name="margin_width">0</property> <property name="grid_lines">1</property>
<property name="max_size"></property> <property name="gripper">0</property>
<property name="maximize_button">0</property> <property name="hidden">0</property>
<property name="maximum_size"></property> <property name="id">wxID_ANY</property>
<property name="min_size"></property> <property name="label_bg"></property>
<property name="minimize_button">0</property> <property name="label_font"></property>
<property name="minimum_size"></property> <property name="label_text"></property>
<property name="moveable">1</property> <property name="margin_height">0</property>
<property name="name">m_grid</property> <property name="margin_width">0</property>
<property name="pane_border">1</property> <property name="max_size"></property>
<property name="pane_position"></property> <property name="maximize_button">0</property>
<property name="pane_size"></property> <property name="maximum_size"></property>
<property name="permission">protected</property> <property name="min_size"></property>
<property name="pin_button">1</property> <property name="minimize_button">0</property>
<property name="pos"></property> <property name="minimum_size"></property>
<property name="resize">Resizable</property> <property name="moveable">1</property>
<property name="row_label_horiz_alignment">wxALIGN_CENTRE</property> <property name="name">m_grid</property>
<property name="row_label_size">0</property> <property name="pane_border">1</property>
<property name="row_label_values"></property> <property name="pane_position"></property>
<property name="row_label_vert_alignment">wxALIGN_CENTRE</property> <property name="pane_size"></property>
<property name="row_sizes"></property> <property name="permission">protected</property>
<property name="rows">0</property> <property name="pin_button">1</property>
<property name="show">1</property> <property name="pos"></property>
<property name="size"></property> <property name="resize">Resizable</property>
<property name="subclass">WX_GRID; widgets/wx_grid.h; forward_declare</property> <property name="row_label_horiz_alignment">wxALIGN_CENTRE</property>
<property name="toolbar_pane">0</property> <property name="row_label_size">0</property>
<property name="tooltip"></property> <property name="row_label_values"></property>
<property name="window_extra_style"></property> <property name="row_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="window_name"></property> <property name="row_sizes"></property>
<property name="window_style">wxRAISED_BORDER</property> <property name="rows">0</property>
<event name="OnChar"></event> <property name="show">1</property>
<event name="OnEnterWindow"></event> <property name="size"></property>
<event name="OnEraseBackground"></event> <property name="subclass">WX_GRID; widgets/wx_grid.h; forward_declare</property>
<event name="OnGridCellChange"></event> <property name="toolbar_pane">0</property>
<event name="OnGridCellLeftClick"></event> <property name="tooltip"></property>
<event name="OnGridCellLeftDClick"></event> <property name="window_extra_style"></property>
<event name="OnGridCellRightClick"></event> <property name="window_name"></property>
<event name="OnGridCellRightDClick"></event> <property name="window_style">wxBORDER_SIMPLE</property>
<event name="OnGridCmdCellChange"></event> <event name="OnAux1DClick"></event>
<event name="OnGridCmdCellLeftClick"></event> <event name="OnAux1Down"></event>
<event name="OnGridCmdCellLeftDClick"></event> <event name="OnAux1Up"></event>
<event name="OnGridCmdCellRightClick"></event> <event name="OnAux2DClick"></event>
<event name="OnGridCmdCellRightDClick"></event> <event name="OnAux2Down"></event>
<event name="OnGridCmdColSize"></event> <event name="OnAux2Up"></event>
<event name="OnGridCmdEditorCreated"></event> <event name="OnChar"></event>
<event name="OnGridCmdEditorHidden"></event> <event name="OnCharHook"></event>
<event name="OnGridCmdEditorShown"></event> <event name="OnEnterWindow"></event>
<event name="OnGridCmdLabelLeftClick"></event> <event name="OnEraseBackground"></event>
<event name="OnGridCmdLabelLeftDClick"></event> <event name="OnGridCellChange"></event>
<event name="OnGridCmdLabelRightClick"></event> <event name="OnGridCellLeftClick"></event>
<event name="OnGridCmdLabelRightDClick"></event> <event name="OnGridCellLeftDClick"></event>
<event name="OnGridCmdRangeSelect"></event> <event name="OnGridCellRightClick"></event>
<event name="OnGridCmdRowSize"></event> <event name="OnGridCellRightDClick"></event>
<event name="OnGridCmdSelectCell"></event> <event name="OnGridCmdCellChange"></event>
<event name="OnGridColSize"></event> <event name="OnGridCmdCellLeftClick"></event>
<event name="OnGridEditorCreated"></event> <event name="OnGridCmdCellLeftDClick"></event>
<event name="OnGridEditorHidden"></event> <event name="OnGridCmdCellRightClick"></event>
<event name="OnGridEditorShown"></event> <event name="OnGridCmdCellRightDClick"></event>
<event name="OnGridLabelLeftClick"></event> <event name="OnGridCmdColSize"></event>
<event name="OnGridLabelLeftDClick"></event> <event name="OnGridCmdEditorCreated"></event>
<event name="OnGridLabelRightClick"></event> <event name="OnGridCmdEditorHidden"></event>
<event name="OnGridLabelRightDClick"></event> <event name="OnGridCmdEditorShown"></event>
<event name="OnGridRangeSelect"></event> <event name="OnGridCmdLabelLeftClick"></event>
<event name="OnGridRowSize"></event> <event name="OnGridCmdLabelLeftDClick"></event>
<event name="OnGridSelectCell"></event> <event name="OnGridCmdLabelRightClick"></event>
<event name="OnKeyDown"></event> <event name="OnGridCmdLabelRightDClick"></event>
<event name="OnKeyUp"></event> <event name="OnGridCmdRangeSelect"></event>
<event name="OnKillFocus"></event> <event name="OnGridCmdRowSize"></event>
<event name="OnLeaveWindow"></event> <event name="OnGridCmdSelectCell"></event>
<event name="OnLeftDClick"></event> <event name="OnGridColSize"></event>
<event name="OnLeftDown"></event> <event name="OnGridEditorCreated"></event>
<event name="OnLeftUp"></event> <event name="OnGridEditorHidden"></event>
<event name="OnMiddleDClick"></event> <event name="OnGridEditorShown"></event>
<event name="OnMiddleDown"></event> <event name="OnGridLabelLeftClick"></event>
<event name="OnMiddleUp"></event> <event name="OnGridLabelLeftDClick"></event>
<event name="OnMotion"></event> <event name="OnGridLabelRightClick"></event>
<event name="OnMouseEvents"></event> <event name="OnGridLabelRightDClick"></event>
<event name="OnMouseWheel"></event> <event name="OnGridRangeSelect"></event>
<event name="OnPaint"></event> <event name="OnGridRowSize"></event>
<event name="OnRightDClick"></event> <event name="OnGridSelectCell"></event>
<event name="OnRightDown"></event> <event name="OnKeyDown"></event>
<event name="OnRightUp"></event> <event name="OnKeyUp"></event>
<event name="OnSetFocus"></event> <event name="OnKillFocus"></event>
<event name="OnSize">OnSizeGrid</event> <event name="OnLeaveWindow"></event>
<event name="OnUpdateUI"></event> <event name="OnLeftDClick"></event>
</object> <event name="OnLeftDown"></event>
</object> <event name="OnLeftUp"></event>
<object class="sizeritem" expanded="1"> <event name="OnMiddleDClick"></event>
<property name="border">5</property> <event name="OnMiddleDown"></event>
<property name="flag">wxEXPAND</property> <event name="OnMiddleUp"></event>
<property name="proportion">0</property> <event name="OnMotion"></event>
<object class="wxBoxSizer" expanded="1"> <event name="OnMouseEvents"></event>
<property name="minimum_size"></property> <event name="OnMouseWheel"></event>
<property name="name">bSizer10</property> <event name="OnPaint"></event>
<property name="orient">wxHORIZONTAL</property> <event name="OnRightDClick"></event>
<property name="permission">none</property> <event name="OnRightDown"></event>
<object class="sizeritem" expanded="1"> <event name="OnRightUp"></event>
<property name="border">5</property> <event name="OnSetFocus"></event>
<property name="flag">wxTOP|wxRIGHT</property> <event name="OnSize">OnSizeGrid</event>
<property name="proportion">0</property> <event name="OnUpdateUI"></event>
<object class="wxBitmapButton" expanded="1"> </object>
<property name="BottomDockable">1</property> </object>
<property name="LeftDockable">1</property> <object class="sizeritem" expanded="1">
<property name="RightDockable">1</property> <property name="border">5</property>
<property name="TopDockable">1</property> <property name="flag">wxEXPAND</property>
<property name="aui_layer"></property> <property name="proportion">0</property>
<property name="aui_name"></property> <object class="wxBoxSizer" expanded="1">
<property name="aui_position"></property> <property name="minimum_size"></property>
<property name="aui_row"></property> <property name="name">bSizer10</property>
<property name="best_size"></property> <property name="orient">wxHORIZONTAL</property>
<property name="bg"></property> <property name="permission">none</property>
<property name="bitmap"></property> <object class="sizeritem" expanded="1">
<property name="caption"></property> <property name="border">5</property>
<property name="caption_visible">1</property> <property name="flag">wxTOP|wxRIGHT</property>
<property name="center_pane">0</property> <property name="proportion">0</property>
<property name="close_button">1</property> <object class="wxBitmapButton" expanded="1">
<property name="context_help"></property> <property name="BottomDockable">1</property>
<property name="context_menu">1</property> <property name="LeftDockable">1</property>
<property name="default">0</property> <property name="RightDockable">1</property>
<property name="default_pane">0</property> <property name="TopDockable">1</property>
<property name="disabled"></property> <property name="aui_layer"></property>
<property name="dock">Dock</property> <property name="aui_name"></property>
<property name="dock_fixed">0</property> <property name="aui_position"></property>
<property name="docking">Left</property> <property name="aui_row"></property>
<property name="enabled">1</property> <property name="best_size"></property>
<property name="fg"></property> <property name="bg"></property>
<property name="floatable">1</property> <property name="bitmap"></property>
<property name="focus"></property> <property name="caption"></property>
<property name="font"></property> <property name="caption_visible">1</property>
<property name="gripper">0</property> <property name="center_pane">0</property>
<property name="hidden">0</property> <property name="close_button">1</property>
<property name="hover"></property> <property name="context_help"></property>
<property name="id">wxID_ANY</property> <property name="context_menu">1</property>
<property name="label">Add Field</property> <property name="current"></property>
<property name="max_size"></property> <property name="default">0</property>
<property name="maximize_button">0</property> <property name="default_pane">0</property>
<property name="maximum_size"></property> <property name="disabled"></property>
<property name="min_size"></property> <property name="dock">Dock</property>
<property name="minimize_button">0</property> <property name="dock_fixed">0</property>
<property name="minimum_size">29,29</property> <property name="docking">Left</property>
<property name="moveable">1</property> <property name="enabled">1</property>
<property name="name">m_addFieldButton</property> <property name="fg"></property>
<property name="pane_border">1</property> <property name="floatable">1</property>
<property name="pane_position"></property> <property name="focus"></property>
<property name="pane_size"></property> <property name="font"></property>
<property name="permission">protected</property> <property name="gripper">0</property>
<property name="pin_button">1</property> <property name="hidden">0</property>
<property name="pos"></property> <property name="id">wxID_ANY</property>
<property name="resize">Resizable</property> <property name="label">Add Field</property>
<property name="selected"></property> <property name="margins"></property>
<property name="show">1</property> <property name="markup">0</property>
<property name="size"></property> <property name="max_size"></property>
<property name="style">wxBU_AUTODRAW</property> <property name="maximize_button">0</property>
<property name="subclass">; forward_declare</property> <property name="maximum_size"></property>
<property name="toolbar_pane">0</property> <property name="min_size"></property>
<property name="tooltip"></property> <property name="minimize_button">0</property>
<property name="validator_data_type"></property> <property name="minimum_size">29,29</property>
<property name="validator_style">wxFILTER_NONE</property> <property name="moveable">1</property>
<property name="validator_type">wxDefaultValidator</property> <property name="name">m_addFieldButton</property>
<property name="validator_variable"></property> <property name="pane_border">1</property>
<property name="window_extra_style"></property> <property name="pane_position"></property>
<property name="window_name"></property> <property name="pane_size"></property>
<property name="window_style"></property> <property name="permission">protected</property>
<event name="OnButtonClick">OnAddButtonClick</event> <property name="pin_button">1</property>
<event name="OnChar"></event> <property name="pos"></property>
<event name="OnEnterWindow"></event> <property name="position"></property>
<event name="OnEraseBackground"></event> <property name="pressed"></property>
<event name="OnKeyDown"></event> <property name="resize">Resizable</property>
<event name="OnKeyUp"></event> <property name="show">1</property>
<event name="OnKillFocus"></event> <property name="size"></property>
<event name="OnLeaveWindow"></event> <property name="style"></property>
<event name="OnLeftDClick"></event> <property name="subclass">; forward_declare</property>
<event name="OnLeftDown"></event> <property name="toolbar_pane">0</property>
<event name="OnLeftUp"></event> <property name="tooltip"></property>
<event name="OnMiddleDClick"></event> <property name="validator_data_type"></property>
<event name="OnMiddleDown"></event> <property name="validator_style">wxFILTER_NONE</property>
<event name="OnMiddleUp"></event> <property name="validator_type">wxDefaultValidator</property>
<event name="OnMotion"></event> <property name="validator_variable"></property>
<event name="OnMouseEvents"></event> <property name="window_extra_style"></property>
<event name="OnMouseWheel"></event> <property name="window_name"></property>
<event name="OnPaint"></event> <property name="window_style"></property>
<event name="OnRightDClick"></event> <event name="OnAux1DClick"></event>
<event name="OnRightDown"></event> <event name="OnAux1Down"></event>
<event name="OnRightUp"></event> <event name="OnAux1Up"></event>
<event name="OnSetFocus"></event> <event name="OnAux2DClick"></event>
<event name="OnSize"></event> <event name="OnAux2Down"></event>
<event name="OnUpdateUI"></event> <event name="OnAux2Up"></event>
</object> <event name="OnButtonClick">OnAddButtonClick</event>
</object> <event name="OnChar"></event>
<object class="sizeritem" expanded="1"> <event name="OnCharHook"></event>
<property name="border">5</property> <event name="OnEnterWindow"></event>
<property name="flag">wxTOP|wxRIGHT</property> <event name="OnEraseBackground"></event>
<property name="proportion">0</property> <event name="OnKeyDown"></event>
<object class="wxBitmapButton" expanded="1"> <event name="OnKeyUp"></event>
<property name="BottomDockable">1</property> <event name="OnKillFocus"></event>
<property name="LeftDockable">1</property> <event name="OnLeaveWindow"></event>
<property name="RightDockable">1</property> <event name="OnLeftDClick"></event>
<property name="TopDockable">1</property> <event name="OnLeftDown"></event>
<property name="aui_layer"></property> <event name="OnLeftUp"></event>
<property name="aui_name"></property> <event name="OnMiddleDClick"></event>
<property name="aui_position"></property> <event name="OnMiddleDown"></event>
<property name="aui_row"></property> <event name="OnMiddleUp"></event>
<property name="best_size"></property> <event name="OnMotion"></event>
<property name="bg"></property> <event name="OnMouseEvents"></event>
<property name="bitmap"></property> <event name="OnMouseWheel"></event>
<property name="caption"></property> <event name="OnPaint"></event>
<property name="caption_visible">1</property> <event name="OnRightDClick"></event>
<property name="center_pane">0</property> <event name="OnRightDown"></event>
<property name="close_button">1</property> <event name="OnRightUp"></event>
<property name="context_help"></property> <event name="OnSetFocus"></event>
<property name="context_menu">1</property> <event name="OnSize"></event>
<property name="default">0</property> <event name="OnUpdateUI"></event>
<property name="default_pane">0</property> </object>
<property name="disabled"></property> </object>
<property name="dock">Dock</property> <object class="sizeritem" expanded="1">
<property name="dock_fixed">0</property> <property name="border">5</property>
<property name="docking">Left</property> <property name="flag">wxTOP|wxRIGHT</property>
<property name="enabled">1</property> <property name="proportion">0</property>
<property name="fg"></property> <object class="wxBitmapButton" expanded="1">
<property name="floatable">1</property> <property name="BottomDockable">1</property>
<property name="focus"></property> <property name="LeftDockable">1</property>
<property name="font"></property> <property name="RightDockable">1</property>
<property name="gripper">0</property> <property name="TopDockable">1</property>
<property name="hidden">0</property> <property name="aui_layer"></property>
<property name="hover"></property> <property name="aui_name"></property>
<property name="id">wxID_ANY</property> <property name="aui_position"></property>
<property name="label">Delete Field</property> <property name="aui_row"></property>
<property name="max_size"></property> <property name="best_size"></property>
<property name="maximize_button">0</property> <property name="bg"></property>
<property name="maximum_size"></property> <property name="bitmap"></property>
<property name="min_size"></property> <property name="caption"></property>
<property name="minimize_button">0</property> <property name="caption_visible">1</property>
<property name="minimum_size">29,29</property> <property name="center_pane">0</property>
<property name="moveable">1</property> <property name="close_button">1</property>
<property name="name">m_deleteFieldButton</property> <property name="context_help"></property>
<property name="pane_border">1</property> <property name="context_menu">1</property>
<property name="pane_position"></property> <property name="current"></property>
<property name="pane_size"></property> <property name="default">0</property>
<property name="permission">protected</property> <property name="default_pane">0</property>
<property name="pin_button">1</property> <property name="disabled"></property>
<property name="pos"></property> <property name="dock">Dock</property>
<property name="resize">Resizable</property> <property name="dock_fixed">0</property>
<property name="selected"></property> <property name="docking">Left</property>
<property name="show">1</property> <property name="enabled">1</property>
<property name="size"></property> <property name="fg"></property>
<property name="style">wxBU_AUTODRAW</property> <property name="floatable">1</property>
<property name="subclass">; forward_declare</property> <property name="focus"></property>
<property name="toolbar_pane">0</property> <property name="font"></property>
<property name="tooltip"></property> <property name="gripper">0</property>
<property name="validator_data_type"></property> <property name="hidden">0</property>
<property name="validator_style">wxFILTER_NONE</property> <property name="id">wxID_ANY</property>
<property name="validator_type">wxDefaultValidator</property> <property name="label">Delete Field</property>
<property name="validator_variable"></property> <property name="margins"></property>
<property name="window_extra_style"></property> <property name="markup">0</property>
<property name="window_name"></property> <property name="max_size"></property>
<property name="window_style"></property> <property name="maximize_button">0</property>
<event name="OnButtonClick">OnDeleteButtonClick</event> <property name="maximum_size"></property>
<event name="OnChar"></event> <property name="min_size"></property>
<event name="OnEnterWindow"></event> <property name="minimize_button">0</property>
<event name="OnEraseBackground"></event> <property name="minimum_size">29,29</property>
<event name="OnKeyDown"></event> <property name="moveable">1</property>
<event name="OnKeyUp"></event> <property name="name">m_deleteFieldButton</property>
<event name="OnKillFocus"></event> <property name="pane_border">1</property>
<event name="OnLeaveWindow"></event> <property name="pane_position"></property>
<event name="OnLeftDClick"></event> <property name="pane_size"></property>
<event name="OnLeftDown"></event> <property name="permission">protected</property>
<event name="OnLeftUp"></event> <property name="pin_button">1</property>
<event name="OnMiddleDClick"></event> <property name="pos"></property>
<event name="OnMiddleDown"></event> <property name="position"></property>
<event name="OnMiddleUp"></event> <property name="pressed"></property>
<event name="OnMotion"></event> <property name="resize">Resizable</property>
<event name="OnMouseEvents"></event> <property name="show">1</property>
<event name="OnMouseWheel"></event> <property name="size"></property>
<event name="OnPaint"></event> <property name="style"></property>
<event name="OnRightDClick"></event> <property name="subclass">; forward_declare</property>
<event name="OnRightDown"></event> <property name="toolbar_pane">0</property>
<event name="OnRightUp"></event> <property name="tooltip"></property>
<event name="OnSetFocus"></event> <property name="validator_data_type"></property>
<event name="OnSize"></event> <property name="validator_style">wxFILTER_NONE</property>
<event name="OnUpdateUI"></event> <property name="validator_type">wxDefaultValidator</property>
</object> <property name="validator_variable"></property>
</object> <property name="window_extra_style"></property>
</object> <property name="window_name"></property>
</object> <property name="window_style"></property>
</object> <event name="OnAux1DClick"></event>
</object> <event name="OnAux1Down"></event>
</object> <event name="OnAux1Up"></event>
</object> <event name="OnAux2DClick"></event>
</object> <event name="OnAux2Down"></event>
</wxFormBuilder_Project> <event name="OnAux2Up"></event>
<event name="OnButtonClick">OnDeleteButtonClick</event>
<event name="OnChar"></event>
<event name="OnCharHook"></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>
</object>
</object>
</wxFormBuilder_Project>

4
eeschema/dialogs/panel_eeschema_template_fieldnames_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -19,10 +19,10 @@ class WX_GRID;
#include <wx/font.h> #include <wx/font.h>
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/bmpbuttn.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.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/panel.h> #include <wx/panel.h>

2
kicad/mainframe.cpp
View File

@ -82,7 +82,7 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent,
// Add the wxTextCtrl showing all messages from KiCad: // Add the wxTextCtrl showing all messages from KiCad:
m_MessagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, m_MessagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxSUNKEN_BORDER | wxTE_READONLY ); wxTE_MULTILINE | wxTE_READONLY );
RecreateBaseHToolbar(); RecreateBaseHToolbar();
ReCreateMenuBar(); ReCreateMenuBar();

26
pcb_calculator/dialogs/pcb_calculator_frame_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -28,7 +28,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
m_menubar = new wxMenuBar( 0 ); m_menubar = new wxMenuBar( 0 );
this->SetMenuBar( m_menubar ); this->SetMenuBar( m_menubar );
m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY ); m_statusBar = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, wxID_ANY );
wxBoxSizer* bmainFrameSizer; wxBoxSizer* bmainFrameSizer;
bmainFrameSizer = new wxBoxSizer( wxVERTICAL ); bmainFrameSizer = new wxBoxSizer( wxVERTICAL );
@ -312,7 +312,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
bSizeLeft->Add( sbSizerTW_Prms, 0, wxALL|wxEXPAND, 5 ); bSizeLeft->Add( sbSizerTW_Prms, 0, wxALL|wxEXPAND, 5 );
m_htmlWinFormulas = new wxHtmlWindow( m_panelTrackWidth, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO|wxSIMPLE_BORDER ); m_htmlWinFormulas = new wxHtmlWindow( m_panelTrackWidth, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE );
m_htmlWinFormulas->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_htmlWinFormulas->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
m_htmlWinFormulas->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_htmlWinFormulas->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
@ -891,7 +891,9 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
wxBoxSizer* bSizerButtons; wxBoxSizer* bSizerButtons;
bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
m_bpButtonAnalyze = new wxBitmapButton( m_panelTransline, wxID_ANY, wxBitmap( arrow_bottom_xpm ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpButtonAnalyze = new wxBitmapButton( m_panelTransline, wxID_ANY, wxBitmap( arrow_bottom_xpm ), wxDefaultPosition, wxDefaultSize, 0 );
m_bpButtonAnalyze->SetBitmap( wxBitmap( arrow_bottom_xpm ) );
bSizerButtons->Add( m_bpButtonAnalyze, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizerButtons->Add( m_bpButtonAnalyze, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_AnalyseButton = new wxButton( m_panelTransline, wxID_ANY, _("Analyze"), wxDefaultPosition, wxDefaultSize, 0 ); m_AnalyseButton = new wxButton( m_panelTransline, wxID_ANY, _("Analyze"), wxDefaultPosition, wxDefaultSize, 0 );
@ -900,7 +902,9 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
m_SynthetizeButton = new wxButton( m_panelTransline, wxID_ANY, _("Synthesize"), wxDefaultPosition, wxDefaultSize, 0 ); m_SynthetizeButton = new wxButton( m_panelTransline, wxID_ANY, _("Synthesize"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerButtons->Add( m_SynthetizeButton, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); bSizerButtons->Add( m_SynthetizeButton, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
m_bpButtonSynthetize = new wxBitmapButton( m_panelTransline, wxID_ANY, wxBitmap( arrow_top_xpm ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpButtonSynthetize = new wxBitmapButton( m_panelTransline, wxID_ANY, wxBitmap( arrow_top_xpm ), wxDefaultPosition, wxDefaultSize, 0 );
m_bpButtonSynthetize->SetBitmap( wxBitmap( arrow_top_xpm ) );
bSizerButtons->Add( m_bpButtonSynthetize, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizerButtons->Add( m_bpButtonSynthetize, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
@ -1038,7 +1042,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
m_panelTransline->SetSizer( bSizeTransline ); m_panelTransline->SetSizer( bSizeTransline );
m_panelTransline->Layout(); m_panelTransline->Layout();
bSizeTransline->Fit( m_panelTransline ); bSizeTransline->Fit( m_panelTransline );
m_Notebook->AddPage( m_panelTransline, _("TransLine"), true ); m_Notebook->AddPage( m_panelTransline, _("TransLine"), false );
m_panelAttenuators = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelAttenuators = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizerAtt; wxBoxSizer* bSizerAtt;
bSizerAtt = new wxBoxSizer( wxHORIZONTAL ); bSizerAtt = new wxBoxSizer( wxHORIZONTAL );
@ -1052,7 +1056,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
m_AttenuatorsSelection->SetSelection( 0 ); m_AttenuatorsSelection->SetSelection( 0 );
bLeftSizerAtt->Add( m_AttenuatorsSelection, 0, wxEXPAND|wxALL, 5 ); bLeftSizerAtt->Add( m_AttenuatorsSelection, 0, wxEXPAND|wxALL, 5 );
m_panelDisplayAttenuator = new wxPanel( m_panelAttenuators, wxID_ANY, wxDefaultPosition, wxSize( 256,256 ), wxSIMPLE_BORDER|wxTAB_TRAVERSAL ); m_panelDisplayAttenuator = new wxPanel( m_panelAttenuators, wxID_ANY, wxDefaultPosition, wxSize( 256,256 ), wxTAB_TRAVERSAL|wxBORDER_SIMPLE );
bLeftSizerAtt->Add( m_panelDisplayAttenuator, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); bLeftSizerAtt->Add( m_panelDisplayAttenuator, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
@ -1115,7 +1119,9 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
m_buttonAlcAtt = new wxButton( m_panelAttenuators, wxID_ANY, _("Calculate"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonAlcAtt = new wxButton( m_panelAttenuators, wxID_ANY, _("Calculate"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerAttButt->Add( m_buttonAlcAtt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizerAttButt->Add( m_buttonAlcAtt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bpButtonCalcAtt = new wxBitmapButton( m_panelAttenuators, wxID_ANY, wxBitmap( arrow_bottom_xpm ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpButtonCalcAtt = new wxBitmapButton( m_panelAttenuators, wxID_ANY, wxBitmap( arrow_bottom_xpm ), wxDefaultPosition, wxDefaultSize, 0 );
m_bpButtonCalcAtt->SetBitmap( wxBitmap( arrow_bottom_xpm ) );
bSizerAttButt->Add( m_bpButtonCalcAtt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizerAttButt->Add( m_bpButtonCalcAtt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
@ -1173,7 +1179,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
m_staticTextAttMsg->Wrap( -1 ); m_staticTextAttMsg->Wrap( -1 );
bMiddleSizerAtt->Add( m_staticTextAttMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bMiddleSizerAtt->Add( m_staticTextAttMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_Attenuator_Messages = new wxHtmlWindow( m_panelAttenuators, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO|wxSUNKEN_BORDER ); m_Attenuator_Messages = new wxHtmlWindow( m_panelAttenuators, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE );
bMiddleSizerAtt->Add( m_Attenuator_Messages, 1, wxALL|wxEXPAND, 5 ); bMiddleSizerAtt->Add( m_Attenuator_Messages, 1, wxALL|wxEXPAND, 5 );
@ -1324,7 +1330,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
m_panelBoardClass->SetSizer( bSizerBoardClass ); m_panelBoardClass->SetSizer( bSizerBoardClass );
m_panelBoardClass->Layout(); m_panelBoardClass->Layout();
bSizerBoardClass->Fit( m_panelBoardClass ); bSizerBoardClass->Fit( m_panelBoardClass );
m_Notebook->AddPage( m_panelBoardClass, _("Board Classes"), false ); m_Notebook->AddPage( m_panelBoardClass, _("Board Classes"), true );
bmainFrameSizer->Add( m_Notebook, 1, wxEXPAND, 5 ); bmainFrameSizer->Add( m_Notebook, 1, wxEXPAND, 5 );

40726
pcb_calculator/dialogs/pcb_calculator_frame_base.fbp
View File

File diff suppressed because it is too large Load Diff

2
pcb_calculator/dialogs/pcb_calculator_frame_base.h
View File

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

8
pcbnew/dialogs/dialog_choose_footprint.cpp
View File

@ -64,10 +64,10 @@ DIALOG_CHOOSE_FOOTPRINT::DIALOG_CHOOSE_FOOTPRINT( PCB_BASE_FRAME* aParent,
wxHtmlWindow* details = nullptr; wxHtmlWindow* details = nullptr;
m_vsplitter = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_vsplitter = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxSP_LIVE_UPDATE | wxSP_3DSASH ); wxSP_LIVE_UPDATE );
m_hsplitter = new wxSplitterWindow( m_vsplitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_hsplitter = new wxSplitterWindow( m_vsplitter, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxSP_LIVE_UPDATE | wxSP_3DSASH ); wxSP_LIVE_UPDATE );
//Avoid the splitter window being assigned as the Parent to additional windows //Avoid the splitter window being assigned as the Parent to additional windows
m_hsplitter->SetExtraStyle( wxWS_EX_TRANSIENT ); m_hsplitter->SetExtraStyle( wxWS_EX_TRANSIENT );
@ -77,7 +77,7 @@ DIALOG_CHOOSE_FOOTPRINT::DIALOG_CHOOSE_FOOTPRINT( PCB_BASE_FRAME* aParent,
detailsPanel->SetSizer( detailsSizer ); detailsPanel->SetSizer( detailsSizer );
details = new wxHtmlWindow( detailsPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, details = new wxHtmlWindow( detailsPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxHW_SCROLLBAR_AUTO | wxRAISED_BORDER ); wxHW_SCROLLBAR_AUTO );
detailsSizer->Add( details, 1, wxEXPAND | wxLEFT | wxRIGHT, 5 ); detailsSizer->Add( details, 1, wxEXPAND | wxLEFT | wxRIGHT, 5 );
detailsPanel->Layout(); detailsPanel->Layout();
detailsSizer->Fit( detailsPanel ); detailsSizer->Fit( detailsPanel );
@ -102,7 +102,7 @@ DIALOG_CHOOSE_FOOTPRINT::DIALOG_CHOOSE_FOOTPRINT( PCB_BASE_FRAME* aParent,
if( aAllowBrowser ) if( aAllowBrowser )
{ {
m_browser_button = new wxButton( this, wxID_ANY, _( "Select with Browser" ) ); m_browser_button = new wxButton( this, wxID_ANY, _( "Select with Browser" ) );
buttonsSizer->Add( m_browser_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 10 ); buttonsSizer->Add( m_browser_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 5 );
} }
auto sdbSizer = new wxStdDialogButtonSizer(); auto sdbSizer = new wxStdDialogButtonSizer();

6
pcbnew/dialogs/dialog_copper_zones_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -11,7 +11,7 @@
BEGIN_EVENT_TABLE( DIALOG_COPPER_ZONE_BASE, DIALOG_SHIM ) BEGIN_EVENT_TABLE( DIALOG_COPPER_ZONE_BASE, DIALOG_SHIM )
EVT_CLOSE( DIALOG_COPPER_ZONE_BASE::_wxFB_OnClose ) EVT_CLOSE( DIALOG_COPPER_ZONE_BASE::_wxFB_OnClose )
EVT_UPDATE_UI( ID_DIALOG_COPPER_ZONE_BASE, DIALOG_COPPER_ZONE_BASE::_wxFB_OnUpdateUI ) EVT_UPDATE_UI( wxID_ANY, DIALOG_COPPER_ZONE_BASE::_wxFB_OnUpdateUI )
EVT_DATAVIEW_ITEM_VALUE_CHANGED( wxID_ANY, DIALOG_COPPER_ZONE_BASE::_wxFB_OnLayerSelection ) EVT_DATAVIEW_ITEM_VALUE_CHANGED( wxID_ANY, DIALOG_COPPER_ZONE_BASE::_wxFB_OnLayerSelection )
EVT_TEXT_ENTER( ID_TEXTCTRL_NETNAMES_FILTER, DIALOG_COPPER_ZONE_BASE::_wxFB_OnRunFiltersButtonClick ) EVT_TEXT_ENTER( ID_TEXTCTRL_NETNAMES_FILTER, DIALOG_COPPER_ZONE_BASE::_wxFB_OnRunFiltersButtonClick )
EVT_TEXT_ENTER( ID_TEXTCTRL_NETNAMES_FILTER, DIALOG_COPPER_ZONE_BASE::_wxFB_OnRunFiltersButtonClick ) EVT_TEXT_ENTER( ID_TEXTCTRL_NETNAMES_FILTER, DIALOG_COPPER_ZONE_BASE::_wxFB_OnRunFiltersButtonClick )
@ -34,7 +34,7 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
wxStaticBoxSizer* sbSizer2; wxStaticBoxSizer* sbSizer2;
sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layer") ), wxVERTICAL ); sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layer") ), wxVERTICAL );
m_layers = new wxDataViewListCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_NO_HEADER|wxSUNKEN_BORDER ); m_layers = new wxDataViewListCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_NO_HEADER|wxBORDER_SIMPLE );
m_layers->SetMinSize( wxSize( 80,-1 ) ); m_layers->SetMinSize( wxSize( 80,-1 ) );
sbSizer2->Add( m_layers, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); sbSizer2->Add( m_layers, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

7154
pcbnew/dialogs/dialog_copper_zones_base.fbp
View File

File diff suppressed because it is too large Load Diff

6
pcbnew/dialogs/dialog_copper_zones_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -23,11 +23,11 @@
#include <wx/listbox.h> #include <wx/listbox.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/button.h>
#include <wx/checkbox.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.h> #include <wx/icon.h>
#include <wx/button.h>
#include <wx/checkbox.h>
#include <wx/statbmp.h> #include <wx/statbmp.h>
#include <wx/choice.h> #include <wx/choice.h>
#include <wx/spinctrl.h> #include <wx/spinctrl.h>

24
pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -26,7 +26,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
wxStaticBoxSizer* sbSizerTexts; wxStaticBoxSizer* sbSizerTexts;
sbSizerTexts = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, wxEmptyString ), wxVERTICAL ); sbSizerTexts = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, wxEmptyString ), wxVERTICAL );
m_itemsGrid = new WX_GRID( sbSizerTexts->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxRAISED_BORDER ); m_itemsGrid = new WX_GRID( sbSizerTexts->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_SIMPLE );
// Grid // Grid
m_itemsGrid->CreateGrid( 2, 11 ); m_itemsGrid->CreateGrid( 2, 11 );
@ -81,12 +81,12 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
wxBoxSizer* bButtonSize; wxBoxSizer* bButtonSize;
bButtonSize = new wxBoxSizer( wxHORIZONTAL ); bButtonSize = new wxBoxSizer( wxHORIZONTAL );
m_bpAdd = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpAdd = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bpAdd->SetMinSize( wxSize( 30,29 ) ); m_bpAdd->SetMinSize( wxSize( 30,29 ) );
bButtonSize->Add( m_bpAdd, 0, 0, 5 ); bButtonSize->Add( m_bpAdd, 0, 0, 5 );
m_bpDelete = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpDelete = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bpDelete->SetMinSize( wxSize( 30,29 ) ); m_bpDelete->SetMinSize( wxSize( 30,29 ) );
bButtonSize->Add( m_bpDelete, 0, wxRIGHT|wxLEFT, 5 ); bButtonSize->Add( m_bpDelete, 0, wxRIGHT|wxLEFT, 5 );
@ -125,7 +125,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
m_XPosUnit = new wxStaticText( m_PanelGeneral, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_XPosUnit = new wxStaticText( m_PanelGeneral, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
m_XPosUnit->Wrap( -1 ); m_XPosUnit->Wrap( -1 );
fgSizerPos->Add( m_XPosUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); fgSizerPos->Add( m_XPosUnit, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
m_YPosLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, _("Position Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_YPosLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, _("Position Y:"), wxDefaultPosition, wxDefaultSize, 0 );
m_YPosLabel->Wrap( -1 ); m_YPosLabel->Wrap( -1 );
@ -136,7 +136,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
m_YPosUnit = new wxStaticText( m_PanelGeneral, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_YPosUnit = new wxStaticText( m_PanelGeneral, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
m_YPosUnit->Wrap( -1 ); m_YPosUnit->Wrap( -1 );
fgSizerPos->Add( m_YPosUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); fgSizerPos->Add( m_YPosUnit, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
bSizerLeft->Add( fgSizerPos, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bSizerLeft->Add( fgSizerPos, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
@ -272,7 +272,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
m_PanelGeneral->SetSizer( m_PanelPropertiesBoxSizer ); m_PanelGeneral->SetSizer( m_PanelPropertiesBoxSizer );
m_PanelGeneral->Layout(); m_PanelGeneral->Layout();
m_PanelPropertiesBoxSizer->Fit( m_PanelGeneral ); m_PanelPropertiesBoxSizer->Fit( m_PanelGeneral );
m_NoteBook->AddPage( m_PanelGeneral, _("General"), false ); m_NoteBook->AddPage( m_PanelGeneral, _("General"), true );
m_PanelClearances = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_PanelClearances = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizerPanelClearances; wxBoxSizer* bSizerPanelClearances;
bSizerPanelClearances = new wxBoxSizer( wxVERTICAL ); bSizerPanelClearances = new wxBoxSizer( wxVERTICAL );
@ -395,7 +395,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
wxStaticBoxSizer* sbSizer3; wxStaticBoxSizer* sbSizer3;
sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, wxEmptyString ), wxVERTICAL ); sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, wxEmptyString ), wxVERTICAL );
m_modelsGrid = new wxGrid( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_modelsGrid = new wxGrid( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE );
// Grid // Grid
m_modelsGrid->CreateGrid( 3, 2 ); m_modelsGrid->CreateGrid( 3, 2 );
@ -428,12 +428,12 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
wxBoxSizer* bSizer3DButtons; wxBoxSizer* bSizer3DButtons;
bSizer3DButtons = new wxBoxSizer( wxHORIZONTAL ); bSizer3DButtons = new wxBoxSizer( wxHORIZONTAL );
m_buttonAdd = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); m_buttonAdd = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
m_buttonAdd->SetMinSize( wxSize( 30,29 ) ); m_buttonAdd->SetMinSize( wxSize( 30,29 ) );
bSizer3DButtons->Add( m_buttonAdd, 0, wxTOP, 5 ); bSizer3DButtons->Add( m_buttonAdd, 0, wxTOP, 5 );
m_buttonBrowse = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); m_buttonBrowse = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
m_buttonBrowse->SetMinSize( wxSize( 30,29 ) ); m_buttonBrowse->SetMinSize( wxSize( 30,29 ) );
bSizer3DButtons->Add( m_buttonBrowse, 0, wxALL, 5 ); bSizer3DButtons->Add( m_buttonBrowse, 0, wxALL, 5 );
@ -441,7 +441,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
bSizer3DButtons->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); bSizer3DButtons->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
m_buttonRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); m_buttonRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
m_buttonRemove->SetMinSize( wxSize( 30,29 ) ); m_buttonRemove->SetMinSize( wxSize( 30,29 ) );
bSizer3DButtons->Add( m_buttonRemove, 0, wxTOP|wxLEFT, 5 ); bSizer3DButtons->Add( m_buttonRemove, 0, wxTOP|wxLEFT, 5 );
@ -467,7 +467,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
m_Panel3D->SetSizer( bSizerMain3D ); m_Panel3D->SetSizer( bSizerMain3D );
m_Panel3D->Layout(); m_Panel3D->Layout();
bSizerMain3D->Fit( m_Panel3D ); bSizerMain3D->Fit( m_Panel3D );
m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), true ); m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), false );
m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );

11459
pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp
View File

File diff suppressed because it is too large Load Diff

4
pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -21,10 +21,10 @@ class WX_GRID;
#include <wx/font.h> #include <wx/font.h>
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/bmpbuttn.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.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/statbox.h> #include <wx/statbox.h>

20
pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -26,7 +26,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
wxStaticBoxSizer* sbSizerTexts; wxStaticBoxSizer* sbSizerTexts;
sbSizerTexts = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, wxEmptyString ), wxVERTICAL ); sbSizerTexts = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, wxEmptyString ), wxVERTICAL );
m_itemsGrid = new WX_GRID( sbSizerTexts->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxRAISED_BORDER ); m_itemsGrid = new WX_GRID( sbSizerTexts->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_SIMPLE );
// Grid // Grid
m_itemsGrid->CreateGrid( 2, 11 ); m_itemsGrid->CreateGrid( 2, 11 );
@ -81,10 +81,10 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
wxBoxSizer* bButtonSize; wxBoxSizer* bButtonSize;
bButtonSize = new wxBoxSizer( wxHORIZONTAL ); bButtonSize = new wxBoxSizer( wxHORIZONTAL );
m_bpAdd = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpAdd = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
bButtonSize->Add( m_bpAdd, 0, 0, 5 ); bButtonSize->Add( m_bpAdd, 0, 0, 5 );
m_bpDelete = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_bpDelete = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
bButtonSize->Add( m_bpDelete, 0, wxRIGHT|wxLEFT, 5 ); bButtonSize->Add( m_bpDelete, 0, wxRIGHT|wxLEFT, 5 );
@ -195,7 +195,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
m_PanelGeneral->SetSizer( m_PanelPropertiesBoxSizer ); m_PanelGeneral->SetSizer( m_PanelPropertiesBoxSizer );
m_PanelGeneral->Layout(); m_PanelGeneral->Layout();
m_PanelPropertiesBoxSizer->Fit( m_PanelGeneral ); m_PanelPropertiesBoxSizer->Fit( m_PanelGeneral );
m_NoteBook->AddPage( m_PanelGeneral, _("General"), true ); m_NoteBook->AddPage( m_PanelGeneral, _("General"), false );
m_PanelClearances = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_PanelClearances = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizerPanelClearances; wxBoxSizer* bSizerPanelClearances;
bSizerPanelClearances = new wxBoxSizer( wxVERTICAL ); bSizerPanelClearances = new wxBoxSizer( wxVERTICAL );
@ -318,7 +318,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
wxStaticBoxSizer* sbSizer3; wxStaticBoxSizer* sbSizer3;
sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, wxEmptyString ), wxVERTICAL ); sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, wxEmptyString ), wxVERTICAL );
m_modelsGrid = new wxGrid( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_modelsGrid = new wxGrid( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE );
// Grid // Grid
m_modelsGrid->CreateGrid( 3, 2 ); m_modelsGrid->CreateGrid( 3, 2 );
@ -351,16 +351,16 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
wxBoxSizer* bSizer3DButtons; wxBoxSizer* bSizer3DButtons;
bSizer3DButtons = new wxBoxSizer( wxHORIZONTAL ); bSizer3DButtons = new wxBoxSizer( wxHORIZONTAL );
m_button3DShapeAdd = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); m_button3DShapeAdd = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
bSizer3DButtons->Add( m_button3DShapeAdd, 0, wxTOP|wxBOTTOM, 5 ); bSizer3DButtons->Add( m_button3DShapeAdd, 0, wxTOP|wxBOTTOM, 5 );
m_button3DShapeBrowse = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); m_button3DShapeBrowse = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
bSizer3DButtons->Add( m_button3DShapeBrowse, 0, wxALL, 5 ); bSizer3DButtons->Add( m_button3DShapeBrowse, 0, wxALL, 5 );
bSizer3DButtons->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); bSizer3DButtons->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
m_button3DShapeRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); m_button3DShapeRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
bSizer3DButtons->Add( m_button3DShapeRemove, 0, wxTOP|wxBOTTOM, 5 ); bSizer3DButtons->Add( m_button3DShapeRemove, 0, wxTOP|wxBOTTOM, 5 );
@ -384,7 +384,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
m_Panel3D->SetSizer( bSizerMain3D ); m_Panel3D->SetSizer( bSizerMain3D );
m_Panel3D->Layout(); m_Panel3D->Layout();
bSizerMain3D->Fit( m_Panel3D ); bSizerMain3D->Fit( m_Panel3D );
m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), false ); m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), true );
m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );

8978
pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp
View File

File diff suppressed because it is too large Load Diff

4
pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -21,10 +21,10 @@ class WX_GRID;
#include <wx/font.h> #include <wx/font.h>
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/bmpbuttn.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.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/statbox.h> #include <wx/statbox.h>

10
pcbnew/dialogs/dialog_fp_plugin_options_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -23,7 +23,7 @@ DIALOG_FP_PLUGIN_OPTIONS_BASE::DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent,
m_grid_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Plugin Options") ), wxVERTICAL ); m_grid_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Plugin Options") ), wxVERTICAL );
m_grid_sizer->SetMinSize( wxSize( 400,300 ) ); m_grid_sizer->SetMinSize( wxSize( 400,300 ) );
m_grid = new wxGrid( m_grid_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxVSCROLL ); m_grid = new wxGrid( m_grid_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxVSCROLL );
// Grid // Grid
m_grid->CreateGrid( 1, 2 ); m_grid->CreateGrid( 1, 2 );
@ -56,10 +56,10 @@ DIALOG_FP_PLUGIN_OPTIONS_BASE::DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent,
wxBoxSizer* bButtonsSizer; wxBoxSizer* bButtonsSizer;
bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); bButtonsSizer = new wxBoxSizer( wxHORIZONTAL );
m_append_button = new wxBitmapButton( m_grid_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); m_append_button = new wxBitmapButton( m_grid_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
bButtonsSizer->Add( m_append_button, 0, wxRIGHT|wxLEFT, 5 ); bButtonsSizer->Add( m_append_button, 0, wxRIGHT|wxLEFT, 5 );
m_delete_button = new wxBitmapButton( m_grid_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); m_delete_button = new wxBitmapButton( m_grid_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
bButtonsSizer->Add( m_delete_button, 0, wxRIGHT, 5 ); bButtonsSizer->Add( m_delete_button, 0, wxRIGHT, 5 );
@ -82,7 +82,7 @@ DIALOG_FP_PLUGIN_OPTIONS_BASE::DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent,
m_options_sizer->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); m_options_sizer->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_html = new wxHtmlWindow( m_options_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxRAISED_BORDER|wxVSCROLL ); m_html = new wxHtmlWindow( m_options_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE|wxVSCROLL );
m_html->SetMinSize( wxSize( 280,100 ) ); m_html->SetMinSize( wxSize( 280,100 ) );
m_options_sizer->Add( m_html, 2, wxALL|wxEXPAND, 5 ); m_options_sizer->Add( m_html, 2, wxALL|wxEXPAND, 5 );

1622
pcbnew/dialogs/dialog_fp_plugin_options_base.fbp
View File

File diff suppressed because it is too large Load Diff

4
pcbnew/dialogs/dialog_fp_plugin_options_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -18,10 +18,10 @@
#include <wx/font.h> #include <wx/font.h>
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/bmpbuttn.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.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/statbox.h> #include <wx/statbox.h>

14
pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -59,7 +59,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
sbFilters = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Filters") ), wxVERTICAL ); sbFilters = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Filters") ), wxVERTICAL );
wxFlexGridSizer* fgSizer2; wxFlexGridSizer* fgSizer2;
fgSizer2 = new wxFlexGridSizer( 0, 3, 2, 0 ); fgSizer2 = new wxFlexGridSizer( 0, 3, 3, 0 );
fgSizer2->AddGrowableCol( 1 ); fgSizer2->AddGrowableCol( 1 );
fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetFlexibleDirection( wxBOTH );
fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -68,7 +68,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
fgSizer2->Add( m_layerFilterOpt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); fgSizer2->Add( m_layerFilterOpt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_layerFilter = new PCB_LAYER_BOX_SELECTOR( sbFilters->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_layerFilter = new PCB_LAYER_BOX_SELECTOR( sbFilters->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
fgSizer2->Add( m_layerFilter, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 2 ); fgSizer2->Add( m_layerFilter, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT, 5 );
fgSizer2->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 100 ); fgSizer2->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 100 );
@ -95,12 +95,12 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
m_setToSpecifiedValues->SetValue( true ); m_setToSpecifiedValues->SetValue( true );
sbAction->Add( m_setToSpecifiedValues, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); sbAction->Add( m_setToSpecifiedValues, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
m_specifiedValues = new wxPanel( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL ); m_specifiedValues = new wxPanel( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer2; wxBoxSizer* bSizer2;
bSizer2 = new wxBoxSizer( wxVERTICAL ); bSizer2 = new wxBoxSizer( wxVERTICAL );
wxFlexGridSizer* fgSizer1; wxFlexGridSizer* fgSizer1;
fgSizer1 = new wxFlexGridSizer( 0, 5, 2, 0 ); fgSizer1 = new wxFlexGridSizer( 0, 5, 3, 0 );
fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetFlexibleDirection( wxBOTH );
fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -109,7 +109,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
fgSizer1->Add( m_LayerLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); fgSizer1->Add( m_LayerLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_LayerCtrl = new PCB_LAYER_BOX_SELECTOR( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_LayerCtrl = new PCB_LAYER_BOX_SELECTOR( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
fgSizer1->Add( m_LayerCtrl, 0, wxLEFT, 2 ); fgSizer1->Add( m_LayerCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );
fgSizer1->Add( 0, 0, 0, wxEXPAND, 10 ); fgSizer1->Add( 0, 0, 0, wxEXPAND, 10 );
@ -213,7 +213,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
m_setToLayerDefaults = new wxRadioButton( sbAction->GetStaticBox(), ID_ALL_TRACKS_VIAS, _("Set to layer default values:"), wxDefaultPosition, wxDefaultSize, 0 ); m_setToLayerDefaults = new wxRadioButton( sbAction->GetStaticBox(), ID_ALL_TRACKS_VIAS, _("Set to layer default values:"), wxDefaultPosition, wxDefaultSize, 0 );
sbAction->Add( m_setToLayerDefaults, 0, wxTOP|wxBOTTOM, 5 ); sbAction->Add( m_setToLayerDefaults, 0, wxTOP|wxBOTTOM, 5 );
m_grid = new wxGrid( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_grid = new wxGrid( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE );
// Grid // Grid
m_grid->CreateGrid( 5, 7 ); m_grid->CreateGrid( 5, 7 );

6502
pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp
View File

File diff suppressed because it is too large Load Diff

2
pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!

210
pcbnew/dialogs/dialog_keepout_area_properties_base.cpp
View File

@ -1,105 +1,105 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 4 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "dialog_keepout_area_properties_base.h" #include "dialog_keepout_area_properties_base.h"
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::DIALOG_KEEPOUT_AREA_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::DIALOG_KEEPOUT_AREA_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
{ {
this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
wxBoxSizer* bMainSizer; wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxVERTICAL ); bMainSizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bUpperSizer; wxBoxSizer* bUpperSizer;
bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bLayersListSizer; wxBoxSizer* bLayersListSizer;
bLayersListSizer = new wxBoxSizer( wxVERTICAL ); bLayersListSizer = new wxBoxSizer( wxVERTICAL );
m_staticTextLayerSelection = new wxStaticText( this, wxID_ANY, _("Layers:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextLayerSelection = new wxStaticText( this, wxID_ANY, _("Layers:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextLayerSelection->Wrap( -1 ); m_staticTextLayerSelection->Wrap( -1 );
bLayersListSizer->Add( m_staticTextLayerSelection, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bLayersListSizer->Add( m_staticTextLayerSelection, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_layers = new wxDataViewListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_NO_HEADER|wxSUNKEN_BORDER ); m_layers = new wxDataViewListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_NO_HEADER|wxBORDER_SIMPLE );
bLayersListSizer->Add( m_layers, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bLayersListSizer->Add( m_layers, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bUpperSizer->Add( bLayersListSizer, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bUpperSizer->Add( bLayersListSizer, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bSizerRight; wxBoxSizer* bSizerRight;
bSizerRight = new wxBoxSizer( wxVERTICAL ); bSizerRight = new wxBoxSizer( wxVERTICAL );
m_cbTracksCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out tracks"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbTracksCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out tracks"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerRight->Add( m_cbTracksCtrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); bSizerRight->Add( m_cbTracksCtrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_cbViasCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out vias"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbViasCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out vias"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerRight->Add( m_cbViasCtrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); bSizerRight->Add( m_cbViasCtrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_cbCopperPourCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out copper pours"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbCopperPourCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out copper pours"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerRight->Add( m_cbCopperPourCtrl, 0, wxALL|wxEXPAND, 5 ); bSizerRight->Add( m_cbCopperPourCtrl, 0, wxALL|wxEXPAND, 5 );
bSizerRight->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); bSizerRight->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_cbConstrainCtrl = new wxCheckBox( this, wxID_ANY, _("Constrain outline to H, V and 45 deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbConstrainCtrl = new wxCheckBox( this, wxID_ANY, _("Constrain outline to H, V and 45 deg"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerRight->Add( m_cbConstrainCtrl, 0, wxALL, 5 ); bSizerRight->Add( m_cbConstrainCtrl, 0, wxALL, 5 );
wxBoxSizer* bSizerLowerRight; wxBoxSizer* bSizerLowerRight;
bSizerLowerRight = new wxBoxSizer( wxHORIZONTAL ); bSizerLowerRight = new wxBoxSizer( wxHORIZONTAL );
m_staticTextStyle = new wxStaticText( this, wxID_ANY, _("Outline display:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextStyle = new wxStaticText( this, wxID_ANY, _("Outline display:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextStyle->Wrap( -1 ); m_staticTextStyle->Wrap( -1 );
bSizerLowerRight->Add( m_staticTextStyle, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); bSizerLowerRight->Add( m_staticTextStyle, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched"), _("Fully hatched") }; wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched"), _("Fully hatched") };
int m_OutlineAppearanceCtrlNChoices = sizeof( m_OutlineAppearanceCtrlChoices ) / sizeof( wxString ); int m_OutlineAppearanceCtrlNChoices = sizeof( m_OutlineAppearanceCtrlChoices ) / sizeof( wxString );
m_OutlineAppearanceCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_OutlineAppearanceCtrlNChoices, m_OutlineAppearanceCtrlChoices, 0 ); m_OutlineAppearanceCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_OutlineAppearanceCtrlNChoices, m_OutlineAppearanceCtrlChoices, 0 );
m_OutlineAppearanceCtrl->SetSelection( 0 ); m_OutlineAppearanceCtrl->SetSelection( 0 );
bSizerLowerRight->Add( m_OutlineAppearanceCtrl, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); bSizerLowerRight->Add( m_OutlineAppearanceCtrl, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
bSizerRight->Add( bSizerLowerRight, 1, wxEXPAND, 5 ); bSizerRight->Add( bSizerLowerRight, 1, wxEXPAND, 5 );
bUpperSizer->Add( bSizerRight, 0, wxEXPAND|wxALL, 10 ); bUpperSizer->Add( bSizerRight, 0, wxEXPAND|wxALL, 10 );
bMainSizer->Add( bUpperSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bMainSizer->Add( bUpperSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bMainSizer->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 );
m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK );
m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL );
m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel );
m_sdbSizerButtons->Realize(); m_sdbSizerButtons->Realize();
bMainSizer->Add( m_sdbSizerButtons, 0, wxEXPAND|wxALL, 5 ); bMainSizer->Add( m_sdbSizerButtons, 0, wxEXPAND|wxALL, 5 );
this->SetSizer( bMainSizer ); this->SetSizer( bMainSizer );
this->Layout(); this->Layout();
bMainSizer->Fit( this ); bMainSizer->Fit( this );
this->Centre( wxBOTH ); this->Centre( wxBOTH );
// Connect Events // Connect Events
m_layers->Connect( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEventHandler( DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::OnLayerSelection ), NULL, this ); m_layers->Connect( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEventHandler( DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::OnLayerSelection ), NULL, this );
m_layers->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::OnSizeLayersList ), NULL, this ); m_layers->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::OnSizeLayersList ), NULL, this );
} }
DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::~DIALOG_KEEPOUT_AREA_PROPERTIES_BASE() DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::~DIALOG_KEEPOUT_AREA_PROPERTIES_BASE()
{ {
// Disconnect Events // Disconnect Events
m_layers->Disconnect( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEventHandler( DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::OnLayerSelection ), NULL, this ); m_layers->Disconnect( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEventHandler( DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::OnLayerSelection ), NULL, this );
m_layers->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::OnSizeLayersList ), NULL, this ); m_layers->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::OnSizeLayersList ), NULL, this );
} }

87
pcbnew/dialogs/dialog_keepout_area_properties_base.fbp
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="13" /> <FileVersion major="1" minor="14" />
<object class="Project" expanded="1"> <object class="Project" expanded="1">
<property name="class_decoration"></property> <property name="class_decoration"></property>
<property name="code_generation">C++</property> <property name="code_generation">C++</property>
@ -14,6 +14,7 @@
<property name="file">dialog_keepout_area_properties_base</property> <property name="file">dialog_keepout_area_properties_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="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">dialog_keepout_areas_properties_base</property> <property name="name">dialog_keepout_areas_properties_base</property>
<property name="namespace"></property> <property name="namespace"></property>
@ -51,16 +52,23 @@
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style">wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER</property> <property name="window_style">wxFULL_REPAINT_ON_RESIZE|wxBORDER_SUNKEN</property>
<event name="OnActivate"></event> <event name="OnActivate"></event>
<event name="OnActivateApp"></event> <event name="OnActivateApp"></event>
<event name="OnAuiFindManager"></event> <event name="OnAuiPaneActivated"></event>
<event name="OnAuiPaneButton"></event> <event name="OnAuiPaneButton"></event>
<event name="OnAuiPaneClose"></event> <event name="OnAuiPaneClose"></event>
<event name="OnAuiPaneMaximize"></event> <event name="OnAuiPaneMaximize"></event>
<event name="OnAuiPaneRestore"></event> <event name="OnAuiPaneRestore"></event>
<event name="OnAuiRender"></event> <event name="OnAuiRender"></event>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnClose"></event> <event name="OnClose"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
@ -75,17 +83,23 @@
<event name="OnLeftDClick"></event> <event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event> <event name="OnLeftDown"></event>
<event name="OnLeftUp"></event> <event name="OnLeftUp"></event>
<event name="OnMaximize"></event>
<event name="OnMiddleDClick"></event> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event> <event name="OnMiddleUp"></event>
<event name="OnMotion"></event> <event name="OnMotion"></event>
<event name="OnMouseEvents"></event> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event> <event name="OnMouseWheel"></event>
<event name="OnMove"></event>
<event name="OnMoveEnd"></event>
<event name="OnMoveStart"></event>
<event name="OnMoving"></event>
<event name="OnPaint"></event> <event name="OnPaint"></event>
<event name="OnRightDClick"></event> <event name="OnRightDClick"></event>
<event name="OnRightDown"></event> <event name="OnRightDown"></event>
<event name="OnRightUp"></event> <event name="OnRightUp"></event>
<event name="OnSetFocus"></event> <event name="OnSetFocus"></event>
<event name="OnShow"></event>
<event name="OnSize"></event> <event name="OnSize"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
@ -144,6 +158,7 @@
<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">Layers:</property> <property name="label">Layers:</property>
<property name="markup">0</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>
@ -169,7 +184,14 @@
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event> <event name="OnKeyDown"></event>
@ -218,8 +240,15 @@
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style">wxSUNKEN_BORDER</property> <property name="window_style">wxBORDER_SIMPLE</property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnDataViewListCtrlColumnHeaderClick"></event> <event name="OnDataViewListCtrlColumnHeaderClick"></event>
<event name="OnDataViewListCtrlColumnHeaderRightClick"></event> <event name="OnDataViewListCtrlColumnHeaderRightClick"></event>
<event name="OnDataViewListCtrlColumnReordered"></event> <event name="OnDataViewListCtrlColumnReordered"></event>
@ -335,7 +364,14 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCheckBox"></event> <event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
@ -423,7 +459,14 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCheckBox"></event> <event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
@ -511,7 +554,14 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCheckBox"></event> <event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
@ -609,7 +659,14 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnCheckBox"></event> <event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
@ -677,6 +734,7 @@
<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">Outline display:</property> <property name="label">Outline display:</property>
<property name="markup">0</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>
@ -702,7 +760,14 @@
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event> <event name="OnKeyDown"></event>
@ -789,7 +854,14 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnChoice"></event> <event name="OnChoice"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
@ -877,7 +949,14 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event> <event name="OnKeyDown"></event>

8
pcbnew/dialogs/dialog_keepout_area_properties_base.h
View File

@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 4 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_KEEPOUT_AREA_PROPERTIES_BASE_H__ #ifndef __DIALOG_KEEPOUT_AREA_PROPERTIES_BASE_H__
@ -11,8 +11,6 @@
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
class DIALOG_SHIM;
#include "dialog_shim.h" #include "dialog_shim.h"
#include <wx/string.h> #include <wx/string.h>
#include <wx/stattext.h> #include <wx/stattext.h>
@ -59,7 +57,7 @@ class DIALOG_KEEPOUT_AREA_PROPERTIES_BASE : public DIALOG_SHIM
public: public:
DIALOG_KEEPOUT_AREA_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Keepout Area Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER ); DIALOG_KEEPOUT_AREA_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Keepout Area Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxBORDER_SUNKEN );
~DIALOG_KEEPOUT_AREA_PROPERTIES_BASE(); ~DIALOG_KEEPOUT_AREA_PROPERTIES_BASE();
}; };

6
pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp
View File

@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 4 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "dialog_non_copper_zones_properties_base.h" #include "dialog_non_copper_zones_properties_base.h"
@ -26,7 +26,7 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE::DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE(
m_staticTextLayerSelection->Wrap( -1 ); m_staticTextLayerSelection->Wrap( -1 );
bSizerLeft->Add( m_staticTextLayerSelection, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bSizerLeft->Add( m_staticTextLayerSelection, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_layers = new wxDataViewListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_NO_HEADER|wxSUNKEN_BORDER ); m_layers = new wxDataViewListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_NO_HEADER|wxBORDER_SIMPLE );
m_layers->SetMinSize( wxSize( -1,200 ) ); m_layers->SetMinSize( wxSize( -1,200 ) );
bSizerLeft->Add( m_layers, 1, wxALL|wxEXPAND, 5 ); bSizerLeft->Add( m_layers, 1, wxALL|wxEXPAND, 5 );

1963
pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp
View File

File diff suppressed because it is too large Load Diff

8
pcbnew/dialogs/dialog_non_copper_zones_properties_base.h
View File

@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 4 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_NON_COPPER_ZONES_PROPERTIES_BASE_H__ #ifndef __DIALOG_NON_COPPER_ZONES_PROPERTIES_BASE_H__
@ -11,8 +11,6 @@
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
class DIALOG_SHIM;
#include "dialog_shim.h" #include "dialog_shim.h"
#include <wx/string.h> #include <wx/string.h>
#include <wx/stattext.h> #include <wx/stattext.h>
@ -59,7 +57,7 @@ class DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE : public DIALOG_SHIM
public: public:
DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Non Copper Zones Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER ); DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Non Copper Zones Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxBORDER_SUNKEN );
~DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE(); ~DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE();
}; };

4
pcbnew/dialogs/panel_setup_layers_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -67,7 +67,7 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i
leftSizer->Add( gbSizer1, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); leftSizer->Add( gbSizer1, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
m_LayersListPanel = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL ); m_LayersListPanel = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxVSCROLL );
m_LayersListPanel->SetScrollRate( 0, 5 ); m_LayersListPanel->SetScrollRate( 0, 5 );
wxBoxSizer* bSizer9; wxBoxSizer* bSizer9;
bSizer9 = new wxBoxSizer( wxVERTICAL ); bSizer9 = new wxBoxSizer( wxVERTICAL );

29055
pcbnew/dialogs/panel_setup_layers_base.fbp
View File

File diff suppressed because it is too large Load Diff

2
pcbnew/dialogs/panel_setup_layers_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!

10
pcbnew/dialogs/panel_setup_netclasses_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -23,7 +23,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
sbSizerUpper = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Net Classes") ), wxVERTICAL ); sbSizerUpper = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Net Classes") ), wxVERTICAL );
sbSizerUpper->SetMinSize( wxSize( -1,220 ) ); sbSizerUpper->SetMinSize( wxSize( -1,220 ) );
m_netclassGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL ); m_netclassGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL );
// Grid // Grid
m_netclassGrid->CreateGrid( 1, 9 ); m_netclassGrid->CreateGrid( 1, 9 );
@ -73,12 +73,12 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
wxBoxSizer* buttonBoxSizer; wxBoxSizer* buttonBoxSizer;
buttonBoxSizer = new wxBoxSizer( wxHORIZONTAL ); buttonBoxSizer = new wxBoxSizer( wxHORIZONTAL );
m_addButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); m_addButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
m_addButton->SetMinSize( wxSize( 30,29 ) ); m_addButton->SetMinSize( wxSize( 30,29 ) );
buttonBoxSizer->Add( m_addButton, 0, wxRIGHT, 5 ); buttonBoxSizer->Add( m_addButton, 0, wxRIGHT, 5 );
m_removeButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); m_removeButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
m_removeButton->SetMinSize( wxSize( 30,29 ) ); m_removeButton->SetMinSize( wxSize( 30,29 ) );
buttonBoxSizer->Add( m_removeButton, 0, 0, 10 ); buttonBoxSizer->Add( m_removeButton, 0, 0, 10 );
@ -192,7 +192,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
wxBoxSizer* bRight; wxBoxSizer* bRight;
bRight = new wxBoxSizer( wxVERTICAL ); bRight = new wxBoxSizer( wxVERTICAL );
m_membershipGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER ); m_membershipGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE );
// Grid // Grid
m_membershipGrid->CreateGrid( 0, 2 ); m_membershipGrid->CreateGrid( 0, 2 );

3364
pcbnew/dialogs/panel_setup_netclasses_base.fbp
View File

File diff suppressed because it is too large Load Diff

4
pcbnew/dialogs/panel_setup_netclasses_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2018) // C++ code generated with wxFormBuilder (version Aug 2 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -19,10 +19,10 @@ class WX_GRID;
#include <wx/font.h> #include <wx/font.h>
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/bmpbuttn.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.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/statbox.h> #include <wx/statbox.h>