From 3dcf04fdb8ff50c64a6015546b60beb7b84cc3b4 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Tue, 17 Jul 2018 13:10:57 -0400 Subject: [PATCH] Apply footprint editor options when dialog OK button is clicked. Fixes lp:1781977 https://bugs.launchpad.net/kicad/+bug/1781977 --- pcbnew/dialogs/dialog_modedit_options.cpp | 45 +- .../dialogs/dialog_modedit_options_base.cpp | 442 +++++++++--------- .../dialogs/dialog_modedit_options_base.fbp | 212 ++++++++- pcbnew/dialogs/dialog_modedit_options_base.h | 171 ++++--- 4 files changed, 533 insertions(+), 337 deletions(-) diff --git a/pcbnew/dialogs/dialog_modedit_options.cpp b/pcbnew/dialogs/dialog_modedit_options.cpp index e7bfdf57fc..c41aa4ea1c 100644 --- a/pcbnew/dialogs/dialog_modedit_options.cpp +++ b/pcbnew/dialogs/dialog_modedit_options.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 1992-2016 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 * modify it under the terms of the GNU General Public License @@ -44,11 +44,8 @@ class DIALOG_MODEDIT_OPTIONS : public DIALOG_MODEDIT_OPTIONS_BASE public: DIALOG_MODEDIT_OPTIONS( FOOTPRINT_EDIT_FRAME* aParent ); -private: - void OnCancelClick( wxCommandEvent& event ) override { EndModal( wxID_CANCEL ); } - void OnOkClick( wxCommandEvent& event ) override; - - void initValues( ); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; }; @@ -57,27 +54,17 @@ DIALOG_MODEDIT_OPTIONS::DIALOG_MODEDIT_OPTIONS( FOOTPRINT_EDIT_FRAME* aParent ) { m_parent = aParent; m_brdSettings = m_parent->GetDesignSettings(); - initValues(); - m_sdbSizer1OK->SetDefault(); GetSizer()->SetSizeHints( this ); - Centre(); } -bool InvokeFPEditorPrefsDlg( FOOTPRINT_EDIT_FRAME* aCaller ) +bool DIALOG_MODEDIT_OPTIONS::TransferDataToWindow() { - DIALOG_MODEDIT_OPTIONS dlg( aCaller ); + if( !wxWindow::TransferDataToWindow() ) + return false; - int ret = dlg.ShowModal(); - - return ret == wxID_OK; -} - - -void DIALOG_MODEDIT_OPTIONS::initValues() -{ EDA_UNITS_T units = g_UserUnit; auto displ_opts = (PCB_DISPLAY_OPTIONS*)m_parent->GetDisplayOptions(); @@ -117,11 +104,16 @@ void DIALOG_MODEDIT_OPTIONS::initValues() m_Segments_45_Only_Ctrl->SetValue( m_parent->Settings().m_use45DegreeGraphicSegments ); m_MagneticPads->SetValue( m_parent->Settings().m_magneticPads == CAPTURE_ALWAYS ); m_dragSelects->SetValue( m_parent->Settings().m_dragSelects ); + + return true; } -void DIALOG_MODEDIT_OPTIONS::OnOkClick( wxCommandEvent& event ) +bool DIALOG_MODEDIT_OPTIONS::TransferDataFromWindow() { + if( !wxWindow::TransferDataFromWindow() ) + return false; + m_brdSettings.m_ModuleSegmentWidth = ValueFromTextCtrl( *m_OptModuleGrLineWidth ); m_brdSettings.m_ModuleTextWidth = ValueFromTextCtrl( *m_OptModuleTextWidth ); m_brdSettings.m_ModuleTextSize.y = ValueFromTextCtrl( *m_OptModuleTextVSize ); @@ -148,6 +140,7 @@ void DIALOG_MODEDIT_OPTIONS::OnOkClick( wxCommandEvent& event ) displ_opts->m_DisplayPolarCood = m_PolarDisplay->GetSelection() != 0; EDA_UNITS_T units = ( m_UnitsSelection->GetSelection() == 0 ) ? INCHES : MILLIMETRES; + if( units != g_UserUnit ) { g_UserUnit = units; @@ -159,5 +152,15 @@ void DIALOG_MODEDIT_OPTIONS::OnOkClick( wxCommandEvent& event ) m_parent->Settings().m_magneticPads = m_MagneticPads->GetValue() ? CAPTURE_ALWAYS : NO_EFFECT; m_parent->Settings().m_dragSelects = m_dragSelects->GetValue(); - EndModal( wxID_OK ); + return true; +} + + +bool InvokeFPEditorPrefsDlg( FOOTPRINT_EDIT_FRAME* aCaller ) +{ + DIALOG_MODEDIT_OPTIONS dlg( aCaller ); + + int ret = dlg.ShowModal(); + + return ret == wxID_OK; } diff --git a/pcbnew/dialogs/dialog_modedit_options_base.cpp b/pcbnew/dialogs/dialog_modedit_options_base.cpp index b832bf1619..5200b9f9be 100644 --- a/pcbnew/dialogs/dialog_modedit_options_base.cpp +++ b/pcbnew/dialogs/dialog_modedit_options_base.cpp @@ -1,225 +1,217 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 20 2018) -// http://www.wxformbuilder.org/ -// -// PLEASE DO *NOT* EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "widgets/text_ctrl_eval.h" - -#include "dialog_modedit_options_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_MODEDIT_OPTIONS_BASE::DIALOG_MODEDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bSizerMain; - bSizerMain = new wxBoxSizer( wxVERTICAL ); - - wxFlexGridSizer* fgSizer3; - fgSizer3 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer3->AddGrowableCol( 0 ); - fgSizer3->SetFlexibleDirection( wxBOTH ); - fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - wxStaticBoxSizer* sbSizerNewGraphicItems; - sbSizerNewGraphicItems = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Default Values for New Graphic Items") ), wxVERTICAL ); - - wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 3, 5, 5 ); - fgSizer1->AddGrowableCol( 1 ); - fgSizer1->SetFlexibleDirection( wxBOTH ); - fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_EdgeModEWidthTitle = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("&Graphic line width:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_EdgeModEWidthTitle->Wrap( -1 ); - fgSizer1->Add( m_EdgeModEWidthTitle, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_OptModuleGrLineWidth = new TEXT_CTRL_EVAL( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_OptModuleGrLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - m_staticTextGrLineUnit = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextGrLineUnit->Wrap( -1 ); - fgSizer1->Add( m_staticTextGrLineUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_TextModWidthTitle = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("&Text line width:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TextModWidthTitle->Wrap( -1 ); - fgSizer1->Add( m_TextModWidthTitle, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_OptModuleTextWidth = new TEXT_CTRL_EVAL( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_OptModuleTextWidth, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - m_staticTextTextWidthUnit = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextTextWidthUnit->Wrap( -1 ); - fgSizer1->Add( m_staticTextTextWidthUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_TextModSizeVTitle = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("Text &height:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TextModSizeVTitle->Wrap( -1 ); - fgSizer1->Add( m_TextModSizeVTitle, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_OptModuleTextVSize = new TEXT_CTRL_EVAL( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_OptModuleTextVSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - m_staticTextTextVSizeUnit = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextTextVSizeUnit->Wrap( -1 ); - fgSizer1->Add( m_staticTextTextVSizeUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_TextModSizeHTitle = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("Text &width:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TextModSizeHTitle->Wrap( -1 ); - fgSizer1->Add( m_TextModSizeHTitle, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_OptModuleTextHSize = new TEXT_CTRL_EVAL( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_OptModuleTextHSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - m_staticTextTextHSizeUnit = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextTextHSizeUnit->Wrap( -1 ); - fgSizer1->Add( m_staticTextTextHSizeUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - - sbSizerNewGraphicItems->Add( fgSizer1, 0, wxEXPAND, 20 ); - - - fgSizer3->Add( sbSizerNewGraphicItems, 0, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* bSizerDisplayOptions; - bSizerDisplayOptions = new wxBoxSizer( wxVERTICAL ); - - wxString m_PolarDisplayChoices[] = { _("Cartesian coordinates"), _("Polar coordinates") }; - int m_PolarDisplayNChoices = sizeof( m_PolarDisplayChoices ) / sizeof( wxString ); - m_PolarDisplay = new wxRadioBox( this, wxID_POLAR_CTRL, _("Coordinates"), wxDefaultPosition, wxDefaultSize, m_PolarDisplayNChoices, m_PolarDisplayChoices, 1, wxRA_SPECIFY_COLS ); - m_PolarDisplay->SetSelection( 0 ); - m_PolarDisplay->SetToolTip( _("Set display of relative (dx/dy) coordinates to Cartesian (rectangular) or polar (angle/distance).") ); - - bSizerDisplayOptions->Add( m_PolarDisplay, 1, wxALL|wxEXPAND, 5 ); - - wxString m_UnitsSelectionChoices[] = { _("Inches"), _("Millimeters") }; - int m_UnitsSelectionNChoices = sizeof( m_UnitsSelectionChoices ) / sizeof( wxString ); - m_UnitsSelection = new wxRadioBox( this, wxID_UNITS, _("Units"), wxDefaultPosition, wxDefaultSize, m_UnitsSelectionNChoices, m_UnitsSelectionChoices, 1, wxRA_SPECIFY_COLS ); - m_UnitsSelection->SetSelection( 0 ); - m_UnitsSelection->SetToolTip( _("Set units used to display dimensions and positions.") ); - - bSizerDisplayOptions->Add( m_UnitsSelection, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - - fgSizer3->Add( bSizerDisplayOptions, 0, wxEXPAND, 5 ); - - wxStaticBoxSizer* sbSizerNewFootprints; - sbSizerNewFootprints = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Default Values for New Footprints") ), wxVERTICAL ); - - wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 0, 4, 5, 5 ); - fgSizer2->AddGrowableCol( 1 ); - fgSizer2->SetFlexibleDirection( wxBOTH ); - fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticTextRef = new wxStaticText( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, _("&Reference:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextRef->Wrap( -1 ); - fgSizer2->Add( m_staticTextRef, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_textCtrlRefText = new wxTextCtrl( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_textCtrlRefText->SetToolTip( _("Default text for reference\nLeave blank to use the footprint name") ); - - fgSizer2->Add( m_textCtrlRefText, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - wxString m_choiceLayerReferenceChoices[] = { _("SilkScreen"), _("Fab. Layer") }; - int m_choiceLayerReferenceNChoices = sizeof( m_choiceLayerReferenceChoices ) / sizeof( wxString ); - m_choiceLayerReference = new wxChoice( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceLayerReferenceNChoices, m_choiceLayerReferenceChoices, 0 ); - m_choiceLayerReference->SetSelection( 0 ); - fgSizer2->Add( m_choiceLayerReference, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - wxString m_choiceVisibleReferenceChoices[] = { _("Visible"), _("Invisible") }; - int m_choiceVisibleReferenceNChoices = sizeof( m_choiceVisibleReferenceChoices ) / sizeof( wxString ); - m_choiceVisibleReference = new wxChoice( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVisibleReferenceNChoices, m_choiceVisibleReferenceChoices, 0 ); - m_choiceVisibleReference->SetSelection( 0 ); - fgSizer2->Add( m_choiceVisibleReference, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_staticTextValue = new wxStaticText( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, _("V&alue:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextValue->Wrap( -1 ); - fgSizer2->Add( m_staticTextValue, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_textCtrlValueText = new wxTextCtrl( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_textCtrlValueText->SetToolTip( _("Default text for value\nLeave blank to use the footprint name") ); - - fgSizer2->Add( m_textCtrlValueText, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - wxString m_choiceLayerValueChoices[] = { _("SilkScreen"), _("Fab. Layer") }; - int m_choiceLayerValueNChoices = sizeof( m_choiceLayerValueChoices ) / sizeof( wxString ); - m_choiceLayerValue = new wxChoice( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceLayerValueNChoices, m_choiceLayerValueChoices, 0 ); - m_choiceLayerValue->SetSelection( 1 ); - fgSizer2->Add( m_choiceLayerValue, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - wxString m_choiceVisibleValueChoices[] = { _("Visible"), _("Invisible") }; - int m_choiceVisibleValueNChoices = sizeof( m_choiceVisibleValueChoices ) / sizeof( wxString ); - m_choiceVisibleValue = new wxChoice( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVisibleValueNChoices, m_choiceVisibleValueChoices, 0 ); - m_choiceVisibleValue->SetSelection( 0 ); - fgSizer2->Add( m_choiceVisibleValue, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - - sbSizerNewFootprints->Add( fgSizer2, 0, wxEXPAND, 20 ); - - m_staticTextInfo = new wxStaticText( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, _("Leave reference and/or value blank to use footprint name."), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextInfo->Wrap( -1 ); - sbSizerNewFootprints->Add( m_staticTextInfo, 0, wxTOP, 5 ); - - - fgSizer3->Add( sbSizerNewFootprints, 0, wxALL|wxEXPAND, 5 ); - - wxStaticBoxSizer* sbSizerEditOptions; - sbSizerEditOptions = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Editing Options") ), wxVERTICAL ); - - m_MagneticPads = new wxCheckBox( sbSizerEditOptions->GetStaticBox(), wxID_ANY, _("Magnetic pads"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizerEditOptions->Add( m_MagneticPads, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - - sbSizerEditOptions->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - - m_Segments_45_Only_Ctrl = new wxCheckBox( sbSizerEditOptions->GetStaticBox(), wxID_SEGMENTS45, _("L&imit graphic lines to 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Segments_45_Only_Ctrl->SetToolTip( _("Force line segment directions to H, V or 45 degrees when drawing on technical layers.") ); - - sbSizerEditOptions->Add( m_Segments_45_Only_Ctrl, 0, wxALL, 5 ); - - m_dragSelects = new wxCheckBox( sbSizerEditOptions->GetStaticBox(), wxID_ANY, _("Prefer selection to dragging"), wxDefaultPosition, wxDefaultSize, 0 ); - m_dragSelects->SetToolTip( _("When enabled and nothing is selected, drag gesture will draw a selection box, even if there are items under the cursor that could be immediately dragged.") ); - - sbSizerEditOptions->Add( m_dragSelects, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - - fgSizer3->Add( sbSizerEditOptions, 0, wxALL|wxEXPAND, 5 ); - - - bSizerMain->Add( fgSizer3, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxBoxSizer* bSizerColumns; - bSizerColumns = new wxBoxSizer( wxHORIZONTAL ); - - - bSizerMain->Add( bSizerColumns, 1, wxEXPAND, 5 ); - - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); - - bSizerMain->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); - - - this->SetSizer( bSizerMain ); - this->Layout(); - bSizerMain->Fit( this ); - - // Connect Events - m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODEDIT_OPTIONS_BASE::OnCancelClick ), NULL, this ); - m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODEDIT_OPTIONS_BASE::OnOkClick ), NULL, this ); -} - -DIALOG_MODEDIT_OPTIONS_BASE::~DIALOG_MODEDIT_OPTIONS_BASE() -{ - // Disconnect Events - m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODEDIT_OPTIONS_BASE::OnCancelClick ), NULL, this ); - m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODEDIT_OPTIONS_BASE::OnOkClick ), NULL, this ); - -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 27 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "widgets/text_ctrl_eval.h" + +#include "dialog_modedit_options_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_MODEDIT_OPTIONS_BASE::DIALOG_MODEDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bSizerMain; + bSizerMain = new wxBoxSizer( wxVERTICAL ); + + wxFlexGridSizer* fgSizer3; + fgSizer3 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer3->AddGrowableCol( 0 ); + fgSizer3->SetFlexibleDirection( wxBOTH ); + fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + wxStaticBoxSizer* sbSizerNewGraphicItems; + sbSizerNewGraphicItems = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Default Values for New Graphic Items") ), wxVERTICAL ); + + wxFlexGridSizer* fgSizer1; + fgSizer1 = new wxFlexGridSizer( 0, 3, 5, 5 ); + fgSizer1->AddGrowableCol( 1 ); + fgSizer1->SetFlexibleDirection( wxBOTH ); + fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_EdgeModEWidthTitle = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("&Graphic line width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_EdgeModEWidthTitle->Wrap( -1 ); + fgSizer1->Add( m_EdgeModEWidthTitle, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_OptModuleGrLineWidth = new TEXT_CTRL_EVAL( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_OptModuleGrLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_staticTextGrLineUnit = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGrLineUnit->Wrap( -1 ); + fgSizer1->Add( m_staticTextGrLineUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_TextModWidthTitle = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("&Text line width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextModWidthTitle->Wrap( -1 ); + fgSizer1->Add( m_TextModWidthTitle, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_OptModuleTextWidth = new TEXT_CTRL_EVAL( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_OptModuleTextWidth, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_staticTextTextWidthUnit = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextTextWidthUnit->Wrap( -1 ); + fgSizer1->Add( m_staticTextTextWidthUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_TextModSizeVTitle = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("Text &height:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextModSizeVTitle->Wrap( -1 ); + fgSizer1->Add( m_TextModSizeVTitle, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_OptModuleTextVSize = new TEXT_CTRL_EVAL( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_OptModuleTextVSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_staticTextTextVSizeUnit = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextTextVSizeUnit->Wrap( -1 ); + fgSizer1->Add( m_staticTextTextVSizeUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_TextModSizeHTitle = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("Text &width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextModSizeHTitle->Wrap( -1 ); + fgSizer1->Add( m_TextModSizeHTitle, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_OptModuleTextHSize = new TEXT_CTRL_EVAL( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_OptModuleTextHSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_staticTextTextHSizeUnit = new wxStaticText( sbSizerNewGraphicItems->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextTextHSizeUnit->Wrap( -1 ); + fgSizer1->Add( m_staticTextTextHSizeUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + + sbSizerNewGraphicItems->Add( fgSizer1, 0, wxEXPAND, 20 ); + + + fgSizer3->Add( sbSizerNewGraphicItems, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* bSizerDisplayOptions; + bSizerDisplayOptions = new wxBoxSizer( wxVERTICAL ); + + wxString m_PolarDisplayChoices[] = { _("Cartesian coordinates"), _("Polar coordinates") }; + int m_PolarDisplayNChoices = sizeof( m_PolarDisplayChoices ) / sizeof( wxString ); + m_PolarDisplay = new wxRadioBox( this, wxID_POLAR_CTRL, _("Coordinates"), wxDefaultPosition, wxDefaultSize, m_PolarDisplayNChoices, m_PolarDisplayChoices, 1, wxRA_SPECIFY_COLS ); + m_PolarDisplay->SetSelection( 0 ); + m_PolarDisplay->SetToolTip( _("Set display of relative (dx/dy) coordinates to Cartesian (rectangular) or polar (angle/distance).") ); + + bSizerDisplayOptions->Add( m_PolarDisplay, 1, wxALL|wxEXPAND, 5 ); + + wxString m_UnitsSelectionChoices[] = { _("Inches"), _("Millimeters") }; + int m_UnitsSelectionNChoices = sizeof( m_UnitsSelectionChoices ) / sizeof( wxString ); + m_UnitsSelection = new wxRadioBox( this, wxID_UNITS, _("Units"), wxDefaultPosition, wxDefaultSize, m_UnitsSelectionNChoices, m_UnitsSelectionChoices, 1, wxRA_SPECIFY_COLS ); + m_UnitsSelection->SetSelection( 0 ); + m_UnitsSelection->SetToolTip( _("Set units used to display dimensions and positions.") ); + + bSizerDisplayOptions->Add( m_UnitsSelection, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + + fgSizer3->Add( bSizerDisplayOptions, 0, wxEXPAND, 5 ); + + wxStaticBoxSizer* sbSizerNewFootprints; + sbSizerNewFootprints = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Default Values for New Footprints") ), wxVERTICAL ); + + wxFlexGridSizer* fgSizer2; + fgSizer2 = new wxFlexGridSizer( 0, 4, 5, 5 ); + fgSizer2->AddGrowableCol( 1 ); + fgSizer2->SetFlexibleDirection( wxBOTH ); + fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_staticTextRef = new wxStaticText( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, _("&Reference:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextRef->Wrap( -1 ); + fgSizer2->Add( m_staticTextRef, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_textCtrlRefText = new wxTextCtrl( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_textCtrlRefText->SetToolTip( _("Default text for reference\nLeave blank to use the footprint name") ); + + fgSizer2->Add( m_textCtrlRefText, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + wxString m_choiceLayerReferenceChoices[] = { _("SilkScreen"), _("Fab. Layer") }; + int m_choiceLayerReferenceNChoices = sizeof( m_choiceLayerReferenceChoices ) / sizeof( wxString ); + m_choiceLayerReference = new wxChoice( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceLayerReferenceNChoices, m_choiceLayerReferenceChoices, 0 ); + m_choiceLayerReference->SetSelection( 0 ); + fgSizer2->Add( m_choiceLayerReference, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + wxString m_choiceVisibleReferenceChoices[] = { _("Visible"), _("Invisible") }; + int m_choiceVisibleReferenceNChoices = sizeof( m_choiceVisibleReferenceChoices ) / sizeof( wxString ); + m_choiceVisibleReference = new wxChoice( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVisibleReferenceNChoices, m_choiceVisibleReferenceChoices, 0 ); + m_choiceVisibleReference->SetSelection( 0 ); + fgSizer2->Add( m_choiceVisibleReference, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_staticTextValue = new wxStaticText( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, _("V&alue:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextValue->Wrap( -1 ); + fgSizer2->Add( m_staticTextValue, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_textCtrlValueText = new wxTextCtrl( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_textCtrlValueText->SetToolTip( _("Default text for value\nLeave blank to use the footprint name") ); + + fgSizer2->Add( m_textCtrlValueText, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + wxString m_choiceLayerValueChoices[] = { _("SilkScreen"), _("Fab. Layer") }; + int m_choiceLayerValueNChoices = sizeof( m_choiceLayerValueChoices ) / sizeof( wxString ); + m_choiceLayerValue = new wxChoice( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceLayerValueNChoices, m_choiceLayerValueChoices, 0 ); + m_choiceLayerValue->SetSelection( 1 ); + fgSizer2->Add( m_choiceLayerValue, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + wxString m_choiceVisibleValueChoices[] = { _("Visible"), _("Invisible") }; + int m_choiceVisibleValueNChoices = sizeof( m_choiceVisibleValueChoices ) / sizeof( wxString ); + m_choiceVisibleValue = new wxChoice( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVisibleValueNChoices, m_choiceVisibleValueChoices, 0 ); + m_choiceVisibleValue->SetSelection( 0 ); + fgSizer2->Add( m_choiceVisibleValue, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + + sbSizerNewFootprints->Add( fgSizer2, 0, wxEXPAND, 20 ); + + m_staticTextInfo = new wxStaticText( sbSizerNewFootprints->GetStaticBox(), wxID_ANY, _("Leave reference and/or value blank to use footprint name."), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextInfo->Wrap( -1 ); + sbSizerNewFootprints->Add( m_staticTextInfo, 0, wxTOP, 5 ); + + + fgSizer3->Add( sbSizerNewFootprints, 0, wxALL|wxEXPAND, 5 ); + + wxStaticBoxSizer* sbSizerEditOptions; + sbSizerEditOptions = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Editing Options") ), wxVERTICAL ); + + m_MagneticPads = new wxCheckBox( sbSizerEditOptions->GetStaticBox(), wxID_ANY, _("Magnetic pads"), wxDefaultPosition, wxDefaultSize, 0 ); + sbSizerEditOptions->Add( m_MagneticPads, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + + sbSizerEditOptions->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + + m_Segments_45_Only_Ctrl = new wxCheckBox( sbSizerEditOptions->GetStaticBox(), wxID_SEGMENTS45, _("L&imit graphic lines to 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Segments_45_Only_Ctrl->SetToolTip( _("Force line segment directions to H, V or 45 degrees when drawing on technical layers.") ); + + sbSizerEditOptions->Add( m_Segments_45_Only_Ctrl, 0, wxALL, 5 ); + + m_dragSelects = new wxCheckBox( sbSizerEditOptions->GetStaticBox(), wxID_ANY, _("Prefer selection to dragging"), wxDefaultPosition, wxDefaultSize, 0 ); + m_dragSelects->SetToolTip( _("When enabled and nothing is selected, drag gesture will draw a selection box, even if there are items under the cursor that could be immediately dragged.") ); + + sbSizerEditOptions->Add( m_dragSelects, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + + fgSizer3->Add( sbSizerEditOptions, 0, wxALL|wxEXPAND, 5 ); + + + bSizerMain->Add( fgSizer3, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + + wxBoxSizer* bSizerColumns; + bSizerColumns = new wxBoxSizer( wxHORIZONTAL ); + + + bSizerMain->Add( bSizerColumns, 1, wxEXPAND, 5 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + + bSizerMain->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); + + + this->SetSizer( bSizerMain ); + this->Layout(); + bSizerMain->Fit( this ); +} + +DIALOG_MODEDIT_OPTIONS_BASE::~DIALOG_MODEDIT_OPTIONS_BASE() +{ +} diff --git a/pcbnew/dialogs/dialog_modedit_options_base.fbp b/pcbnew/dialogs/dialog_modedit_options_base.fbp index 4eafd161b5..2c722d8d68 100644 --- a/pcbnew/dialogs/dialog_modedit_options_base.fbp +++ b/pcbnew/dialogs/dialog_modedit_options_base.fbp @@ -55,13 +55,20 @@ - + + + + + + + + @@ -76,17 +83,23 @@ + + + + + + @@ -172,6 +185,7 @@ 0 wxID_ANY &Graphic line width: + 0 0 @@ -197,7 +211,14 @@ -1 + + + + + + + @@ -284,7 +305,14 @@ + + + + + + + @@ -346,6 +374,7 @@ 0 wxID_ANY unit + 0 0 @@ -371,7 +400,14 @@ -1 + + + + + + + @@ -429,6 +465,7 @@ 0 wxID_ANY &Text line width: + 0 0 @@ -454,7 +491,14 @@ -1 + + + + + + + @@ -541,7 +585,14 @@ + + + + + + + @@ -603,6 +654,7 @@ 0 wxID_ANY unit + 0 0 @@ -628,7 +680,14 @@ -1 + + + + + + + @@ -686,6 +745,7 @@ 0 wxID_ANY Text &height: + 0 0 @@ -711,7 +771,14 @@ -1 + + + + + + + @@ -798,7 +865,14 @@ + + + + + + + @@ -860,6 +934,7 @@ 0 wxID_ANY unit + 0 0 @@ -885,7 +960,14 @@ -1 + + + + + + + @@ -943,6 +1025,7 @@ 0 wxID_ANY Text &width: + 0 0 @@ -968,7 +1051,14 @@ -1 + + + + + + + @@ -1055,7 +1145,14 @@ + + + + + + + @@ -1117,6 +1214,7 @@ 0 wxID_ANY unit + 0 0 @@ -1142,7 +1240,14 @@ -1 + + + + + + + @@ -1244,7 +1349,14 @@ + + + + + + + @@ -1334,7 +1446,14 @@ + + + + + + + @@ -1424,6 +1543,7 @@ 0 wxID_ANY &Reference: + 0 0 @@ -1449,7 +1569,14 @@ -1 + + + + + + + @@ -1536,7 +1663,14 @@ + + + + + + + @@ -1627,7 +1761,14 @@ + + + + + + + @@ -1715,7 +1856,14 @@ + + + + + + + @@ -1774,6 +1922,7 @@ 0 wxID_ANY V&alue: + 0 0 @@ -1799,7 +1948,14 @@ -1 + + + + + + + @@ -1886,7 +2042,14 @@ + + + + + + + @@ -1977,7 +2140,14 @@ + + + + + + + @@ -2065,7 +2235,14 @@ + + + + + + + @@ -2126,6 +2303,7 @@ 0 wxID_ANY Leave reference and/or value blank to use footprint name. + 0 0 @@ -2151,7 +2329,14 @@ -1 + + + + + + + @@ -2253,7 +2438,14 @@ + + + + + + + @@ -2351,7 +2543,14 @@ + + + + + + + @@ -2439,7 +2638,14 @@ + + + + + + + @@ -2497,11 +2703,11 @@ m_sdbSizer1 protected - OnCancelClick + - OnOkClick + diff --git a/pcbnew/dialogs/dialog_modedit_options_base.h b/pcbnew/dialogs/dialog_modedit_options_base.h index fbfd57b7c9..59b8c089cb 100644 --- a/pcbnew/dialogs/dialog_modedit_options_base.h +++ b/pcbnew/dialogs/dialog_modedit_options_base.h @@ -1,88 +1,83 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 20 2018) -// http://www.wxformbuilder.org/ -// -// PLEASE DO *NOT* EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __DIALOG_MODEDIT_OPTIONS_BASE_H__ -#define __DIALOG_MODEDIT_OPTIONS_BASE_H__ - -#include -#include -#include -class TEXT_CTRL_EVAL; - -#include "dialog_shim.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -#define wxID_POLAR_CTRL 1000 -#define wxID_UNITS 1001 -#define wxID_SEGMENTS45 1002 - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_MODEDIT_OPTIONS_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_MODEDIT_OPTIONS_BASE : public DIALOG_SHIM -{ - private: - - protected: - wxStaticText* m_EdgeModEWidthTitle; - TEXT_CTRL_EVAL* m_OptModuleGrLineWidth; - wxStaticText* m_staticTextGrLineUnit; - wxStaticText* m_TextModWidthTitle; - TEXT_CTRL_EVAL* m_OptModuleTextWidth; - wxStaticText* m_staticTextTextWidthUnit; - wxStaticText* m_TextModSizeVTitle; - TEXT_CTRL_EVAL* m_OptModuleTextVSize; - wxStaticText* m_staticTextTextVSizeUnit; - wxStaticText* m_TextModSizeHTitle; - TEXT_CTRL_EVAL* m_OptModuleTextHSize; - wxStaticText* m_staticTextTextHSizeUnit; - wxRadioBox* m_PolarDisplay; - wxRadioBox* m_UnitsSelection; - wxStaticText* m_staticTextRef; - wxTextCtrl* m_textCtrlRefText; - wxChoice* m_choiceLayerReference; - wxChoice* m_choiceVisibleReference; - wxStaticText* m_staticTextValue; - wxTextCtrl* m_textCtrlValueText; - wxChoice* m_choiceLayerValue; - wxChoice* m_choiceVisibleValue; - wxStaticText* m_staticTextInfo; - wxCheckBox* m_MagneticPads; - wxCheckBox* m_Segments_45_Only_Ctrl; - wxCheckBox* m_dragSelects; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DIALOG_MODEDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_MODEDIT_OPTIONS_BASE(); - -}; - -#endif //__DIALOG_MODEDIT_OPTIONS_BASE_H__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 27 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_MODEDIT_OPTIONS_BASE_H__ +#define __DIALOG_MODEDIT_OPTIONS_BASE_H__ + +#include +#include +#include +class TEXT_CTRL_EVAL; + +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +#define wxID_POLAR_CTRL 1000 +#define wxID_UNITS 1001 +#define wxID_SEGMENTS45 1002 + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_MODEDIT_OPTIONS_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_MODEDIT_OPTIONS_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxStaticText* m_EdgeModEWidthTitle; + TEXT_CTRL_EVAL* m_OptModuleGrLineWidth; + wxStaticText* m_staticTextGrLineUnit; + wxStaticText* m_TextModWidthTitle; + TEXT_CTRL_EVAL* m_OptModuleTextWidth; + wxStaticText* m_staticTextTextWidthUnit; + wxStaticText* m_TextModSizeVTitle; + TEXT_CTRL_EVAL* m_OptModuleTextVSize; + wxStaticText* m_staticTextTextVSizeUnit; + wxStaticText* m_TextModSizeHTitle; + TEXT_CTRL_EVAL* m_OptModuleTextHSize; + wxStaticText* m_staticTextTextHSizeUnit; + wxRadioBox* m_PolarDisplay; + wxRadioBox* m_UnitsSelection; + wxStaticText* m_staticTextRef; + wxTextCtrl* m_textCtrlRefText; + wxChoice* m_choiceLayerReference; + wxChoice* m_choiceVisibleReference; + wxStaticText* m_staticTextValue; + wxTextCtrl* m_textCtrlValueText; + wxChoice* m_choiceLayerValue; + wxChoice* m_choiceVisibleValue; + wxStaticText* m_staticTextInfo; + wxCheckBox* m_MagneticPads; + wxCheckBox* m_Segments_45_Only_Ctrl; + wxCheckBox* m_dragSelects; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + + public: + + DIALOG_MODEDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_MODEDIT_OPTIONS_BASE(); + +}; + +#endif //__DIALOG_MODEDIT_OPTIONS_BASE_H__