From c50ce416f233006ccae8485f69ee7ad1f346df82 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 19 Jan 2025 13:41:23 +0000 Subject: [PATCH] Consistency in panel layout. --- .../panel_eeschema_editing_options_base.cpp | 4 +- .../panel_eeschema_editing_options_base.fbp | 374 +-- .../panel_eeschema_editing_options_base.h | 2 +- .../panel_sym_editing_options_base.cpp | 23 +- .../panel_sym_editing_options_base.fbp | 32 +- pcbnew/dialogs/panel_edit_options.cpp | 15 +- pcbnew/dialogs/panel_edit_options_base.cpp | 272 +- pcbnew/dialogs/panel_edit_options_base.fbp | 2607 +++++++++++------ pcbnew/dialogs/panel_edit_options_base.h | 32 +- .../panel_fp_editor_graphics_defaults.cpp | 2 +- ...panel_fp_editor_graphics_defaults_base.cpp | 2 +- ...panel_fp_editor_graphics_defaults_base.fbp | 2 +- .../dialogs/panel_setup_dimensions_base.cpp | 6 +- .../dialogs/panel_setup_dimensions_base.fbp | 6 +- .../dialogs/panel_setup_text_and_graphics.cpp | 2 +- 15 files changed, 2077 insertions(+), 1304 deletions(-) diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.cpp b/eeschema/dialogs/panel_eeschema_editing_options_base.cpp index c277a8e48e..a021ac1105 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.cpp +++ b/eeschema/dialogs/panel_eeschema_editing_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -163,7 +163,7 @@ PANEL_EESCHEMA_EDITING_OPTIONS_BASE::PANEL_EESCHEMA_EDITING_OPTIONS_BASE( wxWind m_leftClickLabel1 = new wxStaticText( m_pageMac, wxID_ANY, _("Left Click Mouse Commands"), wxDefaultPosition, wxDefaultSize, 0 ); m_leftClickLabel1->Wrap( -1 ); - bSizer10->Add( m_leftClickLabel1, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + bSizer10->Add( m_leftClickLabel1, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 13 ); m_staticline7 = new wxStaticLine( m_pageMac, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizer10->Add( m_staticline7, 0, wxEXPAND|wxBOTTOM, 5 ); diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.fbp b/eeschema/dialogs/panel_eeschema_editing_options_base.fbp index 9117214f35..93cde8e56b 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.fbp +++ b/eeschema/dialogs/panel_eeschema_editing_options_base.fbp @@ -1,34 +1,36 @@ - + - C++ - 1 - source_name - 0 - 0 + + 1 + table + none + + + 0 + 1 res UTF-8 - table panel_eeschema_editing_options_base 1000 - none - - 1 + 1 + UI PanelEeschemaEditingOptionsBase - . - + 0 + source_name + 1 + 0 + source_name + + + 1 1 - 1 - 1 - 1 - UI - 0 - 1 0 + 0 0 wxAUI_MGR_DEFAULT @@ -76,10 +78,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -138,10 +140,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -215,10 +217,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -277,10 +279,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -344,10 +346,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -409,10 +411,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -474,10 +476,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -551,10 +553,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -613,10 +615,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -681,10 +683,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -743,10 +745,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -806,10 +808,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -868,10 +870,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -943,10 +945,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -998,10 +1000,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1059,10 +1061,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1121,10 +1123,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1189,10 +1191,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1267,10 +1269,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1329,10 +1331,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1391,10 +1393,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1453,10 +1455,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1515,10 +1517,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1577,10 +1579,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1645,10 +1647,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1698,7 +1700,7 @@ wxVERTICAL none - 5 + 13 wxTOP|wxRIGHT|wxLEFT|wxEXPAND 0 @@ -1706,10 +1708,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1768,10 +1770,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1836,10 +1838,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1914,10 +1916,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1976,10 +1978,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2038,10 +2040,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2100,10 +2102,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2162,10 +2164,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2224,10 +2226,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2286,10 +2288,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2348,10 +2350,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2430,10 +2432,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2492,10 +2494,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2560,10 +2562,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2625,10 +2627,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2690,10 +2692,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2767,10 +2769,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2829,10 +2831,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2913,10 +2915,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2975,10 +2977,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3002,7 +3004,7 @@ 0 - + 0 0 @@ -3040,10 +3042,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3102,10 +3104,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3164,10 +3166,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3191,7 +3193,7 @@ 0 - + 0 0 @@ -3229,10 +3231,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3291,10 +3293,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3353,10 +3355,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3440,10 +3442,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3502,10 +3504,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3570,10 +3572,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3635,10 +3637,10 @@ 1 1 1 - + 0 - - + 0 + 0 diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.h b/eeschema/dialogs/panel_eeschema_editing_options_base.h index bdbbf5acc0..fe389e4602 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.h +++ b/eeschema/dialogs/panel_eeschema_editing_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/panel_sym_editing_options_base.cpp b/eeschema/dialogs/panel_sym_editing_options_base.cpp index d65c94db30..0b72e0e9bb 100644 --- a/eeschema/dialogs/panel_sym_editing_options_base.cpp +++ b/eeschema/dialogs/panel_sym_editing_options_base.cpp @@ -19,10 +19,10 @@ PANEL_SYM_EDITING_OPTIONS_BASE::PANEL_SYM_EDITING_OPTIONS_BASE( wxWindow* parent m_defaultsLabel = new wxStaticText( this, wxID_ANY, _("Defaults for New Objects"), wxDefaultPosition, wxDefaultSize, 0 ); m_defaultsLabel->Wrap( -1 ); - leftColumn->Add( m_defaultsLabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + leftColumn->Add( m_defaultsLabel, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - leftColumn->Add( m_staticline1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + leftColumn->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 5 ); wxGridBagSizer* gbSizer1; gbSizer1 = new wxGridBagSizer( 2, 0 ); @@ -90,17 +90,17 @@ PANEL_SYM_EDITING_OPTIONS_BASE::PANEL_SYM_EDITING_OPTIONS_BASE( wxWindow* parent gbSizer1->Add( m_pinNameSizeUnits, wxGBPosition( 6, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); - leftColumn->Add( gbSizer1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + leftColumn->Add( gbSizer1, 0, wxEXPAND|wxALL, 5 ); leftColumn->Add( 0, 15, 0, wxEXPAND, 5 ); m_repeatLabel = new wxStaticText( this, wxID_ANY, _("Repeated Items"), wxDefaultPosition, wxDefaultSize, 0 ); m_repeatLabel->Wrap( -1 ); - leftColumn->Add( m_repeatLabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + leftColumn->Add( m_repeatLabel, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - leftColumn->Add( m_staticline2, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + leftColumn->Add( m_staticline2, 0, wxEXPAND|wxBOTTOM, 5 ); wxGridBagSizer* gbSizer2; gbSizer2 = new wxGridBagSizer( 5, 0 ); @@ -129,26 +129,29 @@ PANEL_SYM_EDITING_OPTIONS_BASE::PANEL_SYM_EDITING_OPTIONS_BASE( wxWindow* parent leftColumn->Add( gbSizer2, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - p1mainSizer->Add( leftColumn, 0, wxEXPAND, 5 ); + p1mainSizer->Add( leftColumn, 1, wxEXPAND|wxRIGHT, 5 ); + + + p1mainSizer->Add( 25, 0, 0, 0, 5 ); wxBoxSizer* rightColumn; rightColumn = new wxBoxSizer( wxVERTICAL ); m_generalOption1 = new wxStaticText( this, wxID_ANY, _("General Editing"), wxDefaultPosition, wxDefaultSize, 0 ); m_generalOption1->Wrap( -1 ); - rightColumn->Add( m_generalOption1, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + rightColumn->Add( m_generalOption1, 0, wxLEFT|wxRIGHT|wxTOP, 13 ); m_staticline4 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - rightColumn->Add( m_staticline4, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + rightColumn->Add( m_staticline4, 0, wxEXPAND|wxBOTTOM, 5 ); m_dragPinsWithEdges = new wxCheckBox( this, wxID_ANY, _("Keep pins attached when dragging edges"), wxDefaultPosition, wxDefaultSize, 0 ); - rightColumn->Add( m_dragPinsWithEdges, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + rightColumn->Add( m_dragPinsWithEdges, 0, wxALL, 5 ); rightColumn->Add( 0, 15, 1, wxEXPAND, 5 ); - p1mainSizer->Add( rightColumn, 1, wxEXPAND, 5 ); + p1mainSizer->Add( rightColumn, 1, wxEXPAND|wxRIGHT, 5 ); this->SetSizer( p1mainSizer ); diff --git a/eeschema/dialogs/panel_sym_editing_options_base.fbp b/eeschema/dialogs/panel_sym_editing_options_base.fbp index ac25d64e71..833f66bf5e 100644 --- a/eeschema/dialogs/panel_sym_editing_options_base.fbp +++ b/eeschema/dialogs/panel_sym_editing_options_base.fbp @@ -62,15 +62,15 @@ none 5 - wxEXPAND - 0 + wxEXPAND|wxRIGHT + 1 leftColumn wxVERTICAL none - 5 + 13 wxTOP|wxRIGHT|wxLEFT 0 @@ -133,7 +133,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxBOTTOM 0 1 @@ -192,7 +192,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND|wxALL 0 -1,8 @@ -1273,7 +1273,7 @@ - 5 + 13 wxTOP|wxRIGHT|wxLEFT 0 @@ -1336,7 +1336,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxBOTTOM 0 1 @@ -1744,7 +1744,17 @@ 5 - wxEXPAND + + 0 + + 0 + protected + 25 + + + + 5 + wxEXPAND|wxRIGHT 1 @@ -1752,7 +1762,7 @@ wxVERTICAL none - 5 + 13 wxLEFT|wxRIGHT|wxTOP 0 @@ -1815,7 +1825,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxBOTTOM 0 1 @@ -1874,7 +1884,7 @@ 5 - wxBOTTOM|wxLEFT|wxRIGHT + wxALL 0 1 diff --git a/pcbnew/dialogs/panel_edit_options.cpp b/pcbnew/dialogs/panel_edit_options.cpp index 9d037cd562..0c71a1e7e7 100644 --- a/pcbnew/dialogs/panel_edit_options.cpp +++ b/pcbnew/dialogs/panel_edit_options.cpp @@ -43,6 +43,9 @@ PANEL_EDIT_OPTIONS::PANEL_EDIT_OPTIONS( wxWindow* aParent, UNITS_PROVIDER* aUnit m_rotationAngle.SetUnits( EDA_UNITS::DEGREES ); + m_stHint1->SetFont( KIUI::GetInfoFont( this ).Italic() ); + m_stHint2->SetFont( KIUI::GetInfoFont( this ).Italic() ); + #ifdef __WXOSX_MAC__ m_mouseCmdsOSX->Show( true ); m_mouseCmdsWinLin->Show( false ); @@ -65,7 +68,12 @@ void PANEL_EDIT_OPTIONS::loadPCBSettings( PCBNEW_SETTINGS* aCfg ) m_rotationAngle.SetAngleValue( aCfg->m_RotationAngle ); m_arcEditMode->SetSelection( (int) aCfg->m_ArcEditMode ); m_trackMouseDragCtrl->SetSelection( (int) aCfg->m_TrackDragAction ); - m_boardItemsFlip->SetSelection( static_cast( aCfg->m_FlipDirection ) ); + + if( aCfg->m_FlipDirection == FLIP_DIRECTION::LEFT_RIGHT ) + m_rbFlipLeftRight->SetValue( true ); + else + m_rbFlipTopBottom->SetValue( true ); + m_allowFreePads->SetValue( aCfg->m_AllowFreePads ); m_overrideLocks->SetValue( aCfg->m_LockingOptions.m_sessionSkipPrompts ); m_autoRefillZones->SetValue( aCfg->m_AutoRefillZones ); @@ -152,7 +160,10 @@ bool PANEL_EDIT_OPTIONS::TransferDataFromWindow() cfg->m_RotationAngle = m_rotationAngle.GetAngleValue(); cfg->m_ArcEditMode = (ARC_EDIT_MODE) m_arcEditMode->GetSelection(); cfg->m_TrackDragAction = (TRACK_DRAG_ACTION) m_trackMouseDragCtrl->GetSelection(); - cfg->m_FlipDirection = static_cast( m_boardItemsFlip->GetSelection() ); + + cfg->m_FlipDirection = m_rbFlipLeftRight->GetValue() ? FLIP_DIRECTION::LEFT_RIGHT + : FLIP_DIRECTION::TOP_BOTTOM; + cfg->m_AllowFreePads = m_allowFreePads->GetValue(); cfg->m_LockingOptions.m_sessionSkipPrompts = m_overrideLocks->GetValue(); cfg->m_AutoRefillZones = m_autoRefillZones->GetValue(); diff --git a/pcbnew/dialogs/panel_edit_options_base.cpp b/pcbnew/dialogs/panel_edit_options_base.cpp index 0518cd24c4..5a4345204a 100644 --- a/pcbnew/dialogs/panel_edit_options_base.cpp +++ b/pcbnew/dialogs/panel_edit_options_base.cpp @@ -20,36 +20,40 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bMiddleLeftSizer; bMiddleLeftSizer = new wxBoxSizer( wxVERTICAL ); - wxStaticBoxSizer* bOptionsSizer; - bOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Editing Options") ), wxVERTICAL ); + m_staticText31 = new wxStaticText( this, wxID_ANY, _("Editing Options"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText31->Wrap( -1 ); + bMiddleLeftSizer->Add( m_staticText31, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); + + m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bMiddleLeftSizer->Add( m_staticline3, 0, wxEXPAND|wxBOTTOM, 5 ); wxBoxSizer* bSizerUniversal; bSizerUniversal = new wxBoxSizer( wxVERTICAL ); - m_cbConstrainHV45Mode = new wxCheckBox( bOptionsSizer->GetStaticBox(), wxID_ANY, _("Constrain actions to H, V, 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbConstrainHV45Mode = new wxCheckBox( this, wxID_ANY, _("Constrain actions to H, V, 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerUniversal->Add( m_cbConstrainHV45Mode, 0, wxBOTTOM|wxLEFT, 5 ); wxBoxSizer* bSizerRotationStep; bSizerRotationStep = new wxBoxSizer( wxHORIZONTAL ); - m_rotationAngleLabel = new wxStaticText( bOptionsSizer->GetStaticBox(), wxID_ANY, _("Step for &rotate commands:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rotationAngleLabel = new wxStaticText( this, wxID_ANY, _("Step for &rotate commands:"), wxDefaultPosition, wxDefaultSize, 0 ); m_rotationAngleLabel->Wrap( -1 ); bSizerRotationStep->Add( m_rotationAngleLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_rotationAngleCtrl = new wxTextCtrl( bOptionsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_rotationAngleCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_rotationAngleCtrl->SetToolTip( _("Set increment (in degrees) for context menu and hotkey rotation.") ); m_rotationAngleCtrl->SetMinSize( wxSize( 60,-1 ) ); bSizerRotationStep->Add( m_rotationAngleCtrl, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_rotationAngleUnits = new wxStaticText( bOptionsSizer->GetStaticBox(), wxID_ANY, _("deg"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rotationAngleUnits = new wxStaticText( this, wxID_ANY, _("deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_rotationAngleUnits->Wrap( -1 ); bSizerRotationStep->Add( m_rotationAngleUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); bSizerUniversal->Add( bSizerRotationStep, 0, wxEXPAND, 5 ); - m_arcEditModeLabel = new wxStaticText( bOptionsSizer->GetStaticBox(), wxID_ANY, _("Arc editing mode:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_arcEditModeLabel = new wxStaticText( this, wxID_ANY, _("Arc editing mode:"), wxDefaultPosition, wxDefaultSize, 0 ); m_arcEditModeLabel->Wrap( -1 ); bSizerUniversal->Add( m_arcEditModeLabel, 0, wxLEFT, 5 ); @@ -58,65 +62,69 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i wxString m_arcEditModeChoices[] = { _("Keep center, adjust radius"), _("Keep endpoints or direction of starting point") }; int m_arcEditModeNChoices = sizeof( m_arcEditModeChoices ) / sizeof( wxString ); - m_arcEditMode = new wxChoice( bOptionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_arcEditModeNChoices, m_arcEditModeChoices, 0 ); + m_arcEditMode = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_arcEditModeNChoices, m_arcEditModeChoices, 0 ); m_arcEditMode->SetSelection( 0 ); bSizerUniversal->Add( m_arcEditMode, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bOptionsSizer->Add( bSizerUniversal, 0, wxEXPAND, 5 ); + bMiddleLeftSizer->Add( bSizerUniversal, 0, wxEXPAND|wxALL, 5 ); m_sizerBoardEdit = new wxBoxSizer( wxVERTICAL ); - m_trackMouseDragLabel = new wxStaticText( bOptionsSizer->GetStaticBox(), wxID_ANY, _("Track mouse-drag mode:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_trackMouseDragLabel = new wxStaticText( this, wxID_ANY, _("Track mouse-drag mode:"), wxDefaultPosition, wxDefaultSize, 0 ); m_trackMouseDragLabel->Wrap( -1 ); m_sizerBoardEdit->Add( m_trackMouseDragLabel, 0, wxRIGHT|wxLEFT, 5 ); - m_sizerBoardEdit->Add( 0, 3, 1, wxEXPAND, 5 ); + m_sizerBoardEdit->Add( 0, 3, 0, wxEXPAND, 5 ); wxString m_trackMouseDragCtrlChoices[] = { _("Move"), _("Drag (45 degree mode)"), _("Drag (free angle)") }; int m_trackMouseDragCtrlNChoices = sizeof( m_trackMouseDragCtrlChoices ) / sizeof( wxString ); - m_trackMouseDragCtrl = new wxChoice( bOptionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_trackMouseDragCtrlNChoices, m_trackMouseDragCtrlChoices, 0 ); + m_trackMouseDragCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_trackMouseDragCtrlNChoices, m_trackMouseDragCtrlChoices, 0 ); m_trackMouseDragCtrl->SetSelection( 0 ); m_sizerBoardEdit->Add( m_trackMouseDragCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + wxBoxSizer* bSizerFlip; + bSizerFlip = new wxBoxSizer( wxHORIZONTAL ); + + m_staticText33 = new wxStaticText( this, wxID_ANY, _("Flip board items:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText33->Wrap( -1 ); + bSizerFlip->Add( m_staticText33, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - m_sizerBoardEdit->Add( 0, 3, 1, wxEXPAND, 5 ); + m_rbFlipLeftRight = new wxRadioButton( this, wxID_ANY, _("Left/right"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerFlip->Add( m_rbFlipLeftRight, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 ); - wxString m_boardItemsFlipChoices[] = { _("Left/right"), _("Top/bottom") }; - int m_boardItemsFlipNChoices = sizeof( m_boardItemsFlipChoices ) / sizeof( wxString ); - m_boardItemsFlip = new wxRadioBox( bOptionsSizer->GetStaticBox(), wxID_ANY, _("Board Items Flip"), wxDefaultPosition, wxDefaultSize, m_boardItemsFlipNChoices, m_boardItemsFlipChoices, 1, wxRA_SPECIFY_ROWS ); - m_boardItemsFlip->SetSelection( 0 ); - m_sizerBoardEdit->Add( m_boardItemsFlip, 0, wxALL|wxEXPAND, 5 ); + m_rbFlipTopBottom = new wxRadioButton( this, wxID_ANY, _("Top/bottom"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerFlip->Add( m_rbFlipTopBottom, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 ); - m_sizerBoardEdit->Add( 0, 3, 1, wxEXPAND, 5 ); + m_sizerBoardEdit->Add( bSizerFlip, 1, wxEXPAND, 5 ); - m_allowFreePads = new wxCheckBox( bOptionsSizer->GetStaticBox(), wxID_ANY, _("Allow free pads"), wxDefaultPosition, wxDefaultSize, 0 ); + m_allowFreePads = new wxCheckBox( this, wxID_ANY, _("Allow free pads"), wxDefaultPosition, wxDefaultSize, 0 ); m_allowFreePads->SetToolTip( _("If checked, pads can be moved with respect to the rest of the footprint.") ); - m_sizerBoardEdit->Add( m_allowFreePads, 0, wxBOTTOM|wxLEFT, 5 ); + m_sizerBoardEdit->Add( m_allowFreePads, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); - m_overrideLocks = new wxCheckBox( bOptionsSizer->GetStaticBox(), wxID_ANY, _("Do not prompt for lock overrides for this session"), wxDefaultPosition, wxDefaultSize, 0 ); + m_overrideLocks = new wxCheckBox( this, wxID_ANY, _("Do not prompt for lock overrides for this session"), wxDefaultPosition, wxDefaultSize, 0 ); m_overrideLocks->SetToolTip( _("If checked, no prompt will be shown when attempting to edit locked items. This setting is reset when KiCad restarts.") ); m_sizerBoardEdit->Add( m_overrideLocks, 0, wxBOTTOM|wxLEFT, 5 ); - bOptionsSizer->Add( m_sizerBoardEdit, 0, wxEXPAND|wxTOP, 5 ); + bMiddleLeftSizer->Add( m_sizerBoardEdit, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_staticText32 = new wxStaticText( this, wxID_ANY, _("Left Click Mouse Commands"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText32->Wrap( -1 ); + bMiddleLeftSizer->Add( m_staticText32, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); - bMiddleLeftSizer->Add( bOptionsSizer, 0, wxEXPAND|wxALL, 5 ); + m_staticline4 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bMiddleLeftSizer->Add( m_staticline4, 0, wxEXPAND|wxBOTTOM, 5 ); - m_mouseCmdsWinLin = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Left Click Mouse Commands") ), wxVERTICAL ); + m_mouseCmdsWinLin = new wxBoxSizer( wxVERTICAL ); - m_staticText181 = new wxStaticText( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, _("Left click (and drag) actions depend on 2 modifier keys:\nShift and Ctrl"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText181->Wrap( -1 ); - m_mouseCmdsWinLin->Add( m_staticText181, 0, wxALL, 5 ); - - wxStaticLine* staticline11; - staticline11 = new wxStaticLine( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_mouseCmdsWinLin->Add( staticline11, 0, wxEXPAND|wxBOTTOM, 5 ); + m_stHint1 = new wxStaticText( this, wxID_ANY, _("Left click (and drag) actions depend on 2 modifier keys:\nShift and Ctrl"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stHint1->Wrap( -1 ); + m_mouseCmdsWinLin->Add( m_stHint1, 0, wxALL, 5 ); wxFlexGridSizer* fgSizerCmdsWinLin; fgSizerCmdsWinLin = new wxFlexGridSizer( 0, 2, 8, 0 ); @@ -124,53 +132,53 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i fgSizerCmdsWinLin->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); wxStaticText* staticText61; - staticText61 = new wxStaticText( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, _("Click"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText61 = new wxStaticText( this, wxID_ANY, _("Click"), wxDefaultPosition, wxDefaultSize, 0 ); staticText61->Wrap( -1 ); fgSizerCmdsWinLin->Add( staticText61, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText71; - staticText71 = new wxStaticText( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, _("Select item(s)"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText71 = new wxStaticText( this, wxID_ANY, _("Select item(s)"), wxDefaultPosition, wxDefaultSize, 0 ); staticText71->Wrap( -1 ); fgSizerCmdsWinLin->Add( staticText71, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText611; - staticText611 = new wxStaticText( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, _("Long Click"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText611 = new wxStaticText( this, wxID_ANY, _("Long Click"), wxDefaultPosition, wxDefaultSize, 0 ); staticText611->Wrap( -1 ); fgSizerCmdsWinLin->Add( staticText611, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText711; - staticText711 = new wxStaticText( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, _("Clarify selection from menu"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText711 = new wxStaticText( this, wxID_ANY, _("Clarify selection from menu"), wxDefaultPosition, wxDefaultSize, 0 ); staticText711->Wrap( -1 ); fgSizerCmdsWinLin->Add( staticText711, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText81; - staticText81 = new wxStaticText( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, _("Shift"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText81 = new wxStaticText( this, wxID_ANY, _("Shift"), wxDefaultPosition, wxDefaultSize, 0 ); staticText81->Wrap( -1 ); fgSizerCmdsWinLin->Add( staticText81, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText91; - staticText91 = new wxStaticText( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, _("Add item(s) to selection"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText91 = new wxStaticText( this, wxID_ANY, _("Add item(s) to selection"), wxDefaultPosition, wxDefaultSize, 0 ); staticText91->Wrap( -1 ); fgSizerCmdsWinLin->Add( staticText91, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText121; - staticText121 = new wxStaticText( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, _("Ctrl+Shift"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText121 = new wxStaticText( this, wxID_ANY, _("Ctrl+Shift"), wxDefaultPosition, wxDefaultSize, 0 ); staticText121->Wrap( -1 ); fgSizerCmdsWinLin->Add( staticText121, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText131; - staticText131 = new wxStaticText( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, _("Remove item(s) from selection"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText131 = new wxStaticText( this, wxID_ANY, _("Remove item(s) from selection"), wxDefaultPosition, wxDefaultSize, 0 ); staticText131->Wrap( -1 ); fgSizerCmdsWinLin->Add( staticText131, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText161; - staticText161 = new wxStaticText( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, _("Ctrl"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText161 = new wxStaticText( this, wxID_ANY, _("Ctrl"), wxDefaultPosition, wxDefaultSize, 0 ); staticText161->Wrap( -1 ); fgSizerCmdsWinLin->Add( staticText161, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); wxString m_rbCtrlClickActionChoices[] = { _("Toggle selection"), _("Highlight net (for pads or tracks)") }; int m_rbCtrlClickActionNChoices = sizeof( m_rbCtrlClickActionChoices ) / sizeof( wxString ); - m_rbCtrlClickAction = new wxRadioBox( m_mouseCmdsWinLin->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rbCtrlClickActionNChoices, m_rbCtrlClickActionChoices, 1, wxRA_SPECIFY_COLS ); + m_rbCtrlClickAction = new wxRadioBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rbCtrlClickActionNChoices, m_rbCtrlClickActionChoices, 1, wxRA_SPECIFY_COLS ); m_rbCtrlClickAction->SetSelection( 1 ); fgSizerCmdsWinLin->Add( m_rbCtrlClickAction, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -178,17 +186,13 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i m_mouseCmdsWinLin->Add( fgSizerCmdsWinLin, 1, wxEXPAND|wxTOP, 5 ); - bMiddleLeftSizer->Add( m_mouseCmdsWinLin, 1, wxEXPAND|wxALL, 5 ); - - m_mouseCmdsOSX = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Left Click Mouse Commands") ), wxVERTICAL ); + bMiddleLeftSizer->Add( m_mouseCmdsWinLin, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_staticText1811 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Left click (and drag) actions depend on 3 modifier keys:\nOption, Shift and Cmd"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText1811->Wrap( -1 ); - m_mouseCmdsOSX->Add( m_staticText1811, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_mouseCmdsOSX = new wxBoxSizer( wxVERTICAL ); - wxStaticLine* staticline111; - staticline111 = new wxStaticLine( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_mouseCmdsOSX->Add( staticline111, 0, wxEXPAND|wxBOTTOM, 5 ); + m_stHint2 = new wxStaticText( this, wxID_ANY, _("Left click (and drag) actions depend on 3 modifier keys:\nOption, Shift and Cmd"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stHint2->Wrap( -1 ); + m_mouseCmdsOSX->Add( m_stHint2, 0, wxALL, 5 ); wxFlexGridSizer* fgSizerCmdsOSX; fgSizerCmdsOSX = new wxFlexGridSizer( 0, 2, 8, 0 ); @@ -196,63 +200,63 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i fgSizerCmdsOSX->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); wxStaticText* staticText62; - staticText62 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Click"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText62 = new wxStaticText( this, wxID_ANY, _("Click"), wxDefaultPosition, wxDefaultSize, 0 ); staticText62->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText62, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText72; - staticText72 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Select item(s)"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText72 = new wxStaticText( this, wxID_ANY, _("Select item(s)"), wxDefaultPosition, wxDefaultSize, 0 ); staticText72->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText72, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText162; - staticText162 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Long Click"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText162 = new wxStaticText( this, wxID_ANY, _("Long Click"), wxDefaultPosition, wxDefaultSize, 0 ); staticText162->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText162, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText172; - staticText172 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Clarify selection from menu"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText172 = new wxStaticText( this, wxID_ANY, _("Clarify selection from menu"), wxDefaultPosition, wxDefaultSize, 0 ); staticText172->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText172, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText82; - staticText82 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Shift"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText82 = new wxStaticText( this, wxID_ANY, _("Shift"), wxDefaultPosition, wxDefaultSize, 0 ); staticText82->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText82, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText92; - staticText92 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Add item(s) to selection"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText92 = new wxStaticText( this, wxID_ANY, _("Add item(s) to selection"), wxDefaultPosition, wxDefaultSize, 0 ); staticText92->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText92, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText122; - staticText122 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Shift+Cmd"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText122 = new wxStaticText( this, wxID_ANY, _("Shift+Cmd"), wxDefaultPosition, wxDefaultSize, 0 ); staticText122->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText122, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText132; - staticText132 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Remove item(s) from selection"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText132 = new wxStaticText( this, wxID_ANY, _("Remove item(s) from selection"), wxDefaultPosition, wxDefaultSize, 0 ); staticText132->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText132, 0, wxRIGHT|wxLEFT, 5 ); wxStaticText* staticText142; - staticText142 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Cmd"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText142 = new wxStaticText( this, wxID_ANY, _("Cmd"), wxDefaultPosition, wxDefaultSize, 0 ); staticText142->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText142, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); wxString m_rbCtrlClickActionMacChoices[] = { _("Toggle selection"), _("Highlight net (for pads or tracks)") }; int m_rbCtrlClickActionMacNChoices = sizeof( m_rbCtrlClickActionMacChoices ) / sizeof( wxString ); - m_rbCtrlClickActionMac = new wxRadioBox( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rbCtrlClickActionMacNChoices, m_rbCtrlClickActionMacChoices, 1, wxRA_SPECIFY_COLS ); + m_rbCtrlClickActionMac = new wxRadioBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rbCtrlClickActionMacNChoices, m_rbCtrlClickActionMacChoices, 1, wxRA_SPECIFY_COLS ); m_rbCtrlClickActionMac->SetSelection( 0 ); fgSizerCmdsOSX->Add( m_rbCtrlClickActionMac, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); wxStaticText* staticText102; - staticText102 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Option"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText102 = new wxStaticText( this, wxID_ANY, _("Option"), wxDefaultPosition, wxDefaultSize, 0 ); staticText102->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText102, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); wxStaticText* staticText112; - staticText112 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Clarify selection from menu"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText112 = new wxStaticText( this, wxID_ANY, _("Clarify selection from menu"), wxDefaultPosition, wxDefaultSize, 0 ); staticText112->Wrap( -1 ); fgSizerCmdsOSX->Add( staticText112, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -260,147 +264,175 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i m_mouseCmdsOSX->Add( fgSizerCmdsOSX, 1, wxEXPAND|wxTOP, 5 ); - bMiddleLeftSizer->Add( m_mouseCmdsOSX, 1, wxEXPAND|wxALL, 5 ); + bMiddleLeftSizer->Add( m_mouseCmdsOSX, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); bMargins->Add( bMiddleLeftSizer, 0, wxEXPAND|wxTOP|wxRIGHT, 5 ); + + bMargins->Add( 10, 0, 1, wxEXPAND, 5 ); + m_optionsBook = new wxSimplebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); wxPanel* fpPage; fpPage = new wxPanel( m_optionsBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxBoxSizer* bSizer10; - bSizer10 = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* fpOptionsSizer; + fpOptionsSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticText34 = new wxStaticText( fpPage, wxID_ANY, _("Magnetic Points"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText34->Wrap( -1 ); + fpOptionsSizer->Add( m_staticText34, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); - wxStaticBoxSizer* sbFPMagnets; - sbFPMagnets = new wxStaticBoxSizer( new wxStaticBox( fpPage, wxID_ANY, _("Magnetic Points") ), wxVERTICAL ); + m_staticline5 = new wxStaticLine( fpPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + fpOptionsSizer->Add( m_staticline5, 0, wxEXPAND|wxBOTTOM, 5 ); - m_magneticPads = new wxCheckBox( sbFPMagnets->GetStaticBox(), wxID_ANY, _("Magnetic pads"), wxDefaultPosition, wxDefaultSize, 0 ); + wxBoxSizer* bSizer13; + bSizer13 = new wxBoxSizer( wxVERTICAL ); + + m_magneticPads = new wxCheckBox( fpPage, wxID_ANY, _("Magnetic pads"), wxDefaultPosition, wxDefaultSize, 0 ); m_magneticPads->SetValue(true); - sbFPMagnets->Add( m_magneticPads, 0, wxBOTTOM|wxLEFT, 5 ); + bSizer13->Add( m_magneticPads, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); - m_magneticGraphics = new wxCheckBox( sbFPMagnets->GetStaticBox(), wxID_ANY, _("Magnetic graphics"), wxDefaultPosition, wxDefaultSize, 0 ); - sbFPMagnets->Add( m_magneticGraphics, 0, wxBOTTOM|wxLEFT, 5 ); + m_magneticGraphics = new wxCheckBox( fpPage, wxID_ANY, _("Magnetic graphics"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer13->Add( m_magneticGraphics, 0, wxBOTTOM|wxLEFT, 5 ); - bSizer10->Add( sbFPMagnets, 0, wxEXPAND|wxTOP, 5 ); + fpOptionsSizer->Add( bSizer13, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - fpPage->SetSizer( bSizer10 ); + fpPage->SetSizer( fpOptionsSizer ); fpPage->Layout(); - bSizer10->Fit( fpPage ); + fpOptionsSizer->Fit( fpPage ); m_optionsBook->AddPage( fpPage, _("a page"), false ); wxPanel* pcbPage; pcbPage = new wxPanel( m_optionsBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* pcbOptionsSizer; pcbOptionsSizer = new wxBoxSizer( wxVERTICAL ); - wxStaticBoxSizer* sbMagnets; - sbMagnets = new wxStaticBoxSizer( new wxStaticBox( pcbPage, wxID_ANY, _("Magnetic Points") ), wxVERTICAL ); + stMagneticPtsLabel1 = new wxStaticText( pcbPage, wxID_ANY, _("Magnetic Points"), wxDefaultPosition, wxDefaultSize, 0 ); + stMagneticPtsLabel1->Wrap( -1 ); + pcbOptionsSizer->Add( stMagneticPtsLabel1, 0, wxTOP|wxLEFT, 13 ); + + m_staticline6 = new wxStaticLine( pcbPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + pcbOptionsSizer->Add( m_staticline6, 0, wxEXPAND|wxBOTTOM, 5 ); - wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 0, 2, 5, 0 ); - fgSizer2->SetFlexibleDirection( wxVERTICAL ); - fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxFlexGridSizer* fgMagneticPoints; + fgMagneticPoints = new wxFlexGridSizer( 0, 2, 5, 0 ); + fgMagneticPoints->SetFlexibleDirection( wxVERTICAL ); + fgMagneticPoints->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText2 = new wxStaticText( sbMagnets->GetStaticBox(), wxID_ANY, _("Snap to pads:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText2 = new wxStaticText( pcbPage, wxID_ANY, _("Snap to pads:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); m_staticText2->SetToolTip( _("Capture cursor when the mouse enters a pad area") ); - fgSizer2->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); + fgMagneticPoints->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); wxString m_magneticPadChoiceChoices[] = { _("Never"), _("When routing tracks"), _("Always") }; int m_magneticPadChoiceNChoices = sizeof( m_magneticPadChoiceChoices ) / sizeof( wxString ); - m_magneticPadChoice = new wxChoice( sbMagnets->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_magneticPadChoiceNChoices, m_magneticPadChoiceChoices, 0 ); + m_magneticPadChoice = new wxChoice( pcbPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_magneticPadChoiceNChoices, m_magneticPadChoiceChoices, 0 ); m_magneticPadChoice->SetSelection( 1 ); m_magneticPadChoice->SetToolTip( _("Capture cursor when the mouse enters a pad area") ); - fgSizer2->Add( m_magneticPadChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgMagneticPoints->Add( m_magneticPadChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - m_staticText21 = new wxStaticText( sbMagnets->GetStaticBox(), wxID_ANY, _("Snap to tracks and vias:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText21 = new wxStaticText( pcbPage, wxID_ANY, _("Snap to tracks and vias:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText21->Wrap( -1 ); m_staticText21->SetToolTip( _("Capture cursor when the mouse approaches a track") ); - fgSizer2->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgMagneticPoints->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); wxString m_magneticTrackChoiceChoices[] = { _("Never"), _("When routing tracks"), _("Always") }; int m_magneticTrackChoiceNChoices = sizeof( m_magneticTrackChoiceChoices ) / sizeof( wxString ); - m_magneticTrackChoice = new wxChoice( sbMagnets->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_magneticTrackChoiceNChoices, m_magneticTrackChoiceChoices, 0 ); + m_magneticTrackChoice = new wxChoice( pcbPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_magneticTrackChoiceNChoices, m_magneticTrackChoiceChoices, 0 ); m_magneticTrackChoice->SetSelection( 1 ); m_magneticTrackChoice->SetToolTip( _("Capture cursor when the mouse approaches a track") ); - fgSizer2->Add( m_magneticTrackChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgMagneticPoints->Add( m_magneticTrackChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - m_staticText211 = new wxStaticText( sbMagnets->GetStaticBox(), wxID_ANY, _("Snap to graphics:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText211 = new wxStaticText( pcbPage, wxID_ANY, _("Snap to graphics:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText211->Wrap( -1 ); m_staticText211->SetToolTip( _("Capture cursor when the mouse approaches graphical control points") ); - fgSizer2->Add( m_staticText211, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgMagneticPoints->Add( m_staticText211, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); wxString m_magneticGraphicsChoiceChoices[] = { _("Always"), _("Never") }; int m_magneticGraphicsChoiceNChoices = sizeof( m_magneticGraphicsChoiceChoices ) / sizeof( wxString ); - m_magneticGraphicsChoice = new wxChoice( sbMagnets->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_magneticGraphicsChoiceNChoices, m_magneticGraphicsChoiceChoices, 0 ); + m_magneticGraphicsChoice = new wxChoice( pcbPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_magneticGraphicsChoiceNChoices, m_magneticGraphicsChoiceChoices, 0 ); m_magneticGraphicsChoice->SetSelection( 0 ); m_magneticGraphicsChoice->SetToolTip( _("Capture cursor when the mouse approaches graphical control points") ); - fgSizer2->Add( m_magneticGraphicsChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgMagneticPoints->Add( m_magneticGraphicsChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + + pcbOptionsSizer->Add( fgMagneticPoints, 0, wxEXPAND|wxALL, 5 ); - sbMagnets->Add( fgSizer2, 1, wxEXPAND|wxBOTTOM, 5 ); + pcbOptionsSizer->Add( 0, 5, 0, wxEXPAND, 5 ); - pcbOptionsSizer->Add( sbMagnets, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + stRatsnestLabel = new wxStaticText( pcbPage, wxID_ANY, _("Ratsnest"), wxDefaultPosition, wxDefaultSize, 0 ); + stRatsnestLabel->Wrap( -1 ); + pcbOptionsSizer->Add( stRatsnestLabel, 0, wxTOP|wxLEFT, 13 ); - wxStaticBoxSizer* sbSizer3; - sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( pcbPage, wxID_ANY, _("Ratsnest") ), wxVERTICAL ); + m_staticline7 = new wxStaticLine( pcbPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + pcbOptionsSizer->Add( m_staticline7, 0, wxEXPAND|wxBOTTOM, 5 ); - m_showSelectedRatsnest = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Always show selected ratsnest"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer3->Add( m_showSelectedRatsnest, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + wxBoxSizer* bRatsnest; + bRatsnest = new wxBoxSizer( wxVERTICAL ); - m_OptDisplayCurvedRatsnestLines = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Show ratsnest with curved lines"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer3->Add( m_OptDisplayCurvedRatsnestLines, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_showSelectedRatsnest = new wxCheckBox( pcbPage, wxID_ANY, _("Always show selected ratsnest"), wxDefaultPosition, wxDefaultSize, 0 ); + bRatsnest->Add( m_showSelectedRatsnest, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - wxBoxSizer* bSizer11; - bSizer11 = new wxBoxSizer( wxHORIZONTAL ); + m_OptDisplayCurvedRatsnestLines = new wxCheckBox( pcbPage, wxID_ANY, _("Show ratsnest with curved lines"), wxDefaultPosition, wxDefaultSize, 0 ); + bRatsnest->Add( m_OptDisplayCurvedRatsnestLines, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_ratsnestThicknessLabel = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, _("Ratsnest line thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); + wxBoxSizer* bRatsnestLineThickness; + bRatsnestLineThickness = new wxBoxSizer( wxHORIZONTAL ); + + m_ratsnestThicknessLabel = new wxStaticText( pcbPage, wxID_ANY, _("Ratsnest line thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ratsnestThicknessLabel->Wrap( -1 ); - bSizer11->Add( m_ratsnestThicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bRatsnestLineThickness->Add( m_ratsnestThicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_ratsnestThickness = new wxSpinCtrlDouble( sbSizer3->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0.5, 10, 0.5, 0.5 ); + m_ratsnestThickness = new wxSpinCtrlDouble( pcbPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0.5, 10, 0.5, 0.5 ); m_ratsnestThickness->SetDigits( 1 ); - bSizer11->Add( m_ratsnestThickness, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bRatsnestLineThickness->Add( m_ratsnestThickness, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + + bRatsnest->Add( bRatsnestLineThickness, 1, wxEXPAND, 5 ); - sbSizer3->Add( bSizer11, 1, wxEXPAND, 5 ); + pcbOptionsSizer->Add( bRatsnest, 0, wxEXPAND|wxALL, 5 ); + stMiscellaneousLabel = new wxStaticText( pcbPage, wxID_ANY, _("Miscellaneous"), wxDefaultPosition, wxDefaultSize, 0 ); + stMiscellaneousLabel->Wrap( -1 ); + pcbOptionsSizer->Add( stMiscellaneousLabel, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); - pcbOptionsSizer->Add( sbSizer3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + m_staticline8 = new wxStaticLine( pcbPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + pcbOptionsSizer->Add( m_staticline8, 0, wxEXPAND|wxBOTTOM, 5 ); - wxStaticBoxSizer* sbSizerMisc; - sbSizerMisc = new wxStaticBoxSizer( new wxStaticBox( pcbPage, wxID_ANY, _("Miscellaneous") ), wxVERTICAL ); + wxBoxSizer* bMiscellaneous; + bMiscellaneous = new wxBoxSizer( wxVERTICAL ); - m_escClearsNetHighlight = new wxCheckBox( sbSizerMisc->GetStaticBox(), wxID_ANY, _(" clears net highlighting"), wxDefaultPosition, wxDefaultSize, 0 ); + m_escClearsNetHighlight = new wxCheckBox( pcbPage, wxID_ANY, _(" clears net highlighting"), wxDefaultPosition, wxDefaultSize, 0 ); m_escClearsNetHighlight->SetValue(true); - sbSizerMisc->Add( m_escClearsNetHighlight, 0, wxBOTTOM|wxLEFT, 5 ); + bMiscellaneous->Add( m_escClearsNetHighlight, 0, wxBOTTOM|wxLEFT, 5 ); - m_showPageLimits = new wxCheckBox( sbSizerMisc->GetStaticBox(), wxID_ANY, _("Show page limits"), wxDefaultPosition, wxDefaultSize, 0 ); + m_showPageLimits = new wxCheckBox( pcbPage, wxID_ANY, _("Show page limits"), wxDefaultPosition, wxDefaultSize, 0 ); m_showPageLimits->SetValue(true); m_showPageLimits->SetToolTip( _("Draw an outline to show the sheet size.") ); - sbSizerMisc->Add( m_showPageLimits, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bMiscellaneous->Add( m_showPageLimits, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_cbCourtyardCollisions = new wxCheckBox( sbSizerMisc->GetStaticBox(), wxID_ANY, _("Show courtyard collisions when moving/dragging"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbCourtyardCollisions = new wxCheckBox( pcbPage, wxID_ANY, _("Show courtyard collisions when moving/dragging"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbCourtyardCollisions->SetValue(true); - sbSizerMisc->Add( m_cbCourtyardCollisions, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bMiscellaneous->Add( m_cbCourtyardCollisions, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_autoRefillZones = new wxCheckBox( sbSizerMisc->GetStaticBox(), wxID_ANY, _("Automatically refill zones"), wxDefaultPosition, wxDefaultSize, 0 ); + m_autoRefillZones = new wxCheckBox( pcbPage, wxID_ANY, _("Automatically refill zones"), wxDefaultPosition, wxDefaultSize, 0 ); m_autoRefillZones->SetValue(true); m_autoRefillZones->SetToolTip( _("If checked, zones will be re-filled after each edit operation") ); - sbSizerMisc->Add( m_autoRefillZones, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bMiscellaneous->Add( m_autoRefillZones, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - pcbOptionsSizer->Add( sbSizerMisc, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + pcbOptionsSizer->Add( bMiscellaneous, 1, wxEXPAND|wxALL, 5 ); pcbPage->SetSizer( pcbOptionsSizer ); diff --git a/pcbnew/dialogs/panel_edit_options_base.fbp b/pcbnew/dialogs/panel_edit_options_base.fbp index 7bc40a0226..0d05d57f21 100644 --- a/pcbnew/dialogs/panel_edit_options_base.fbp +++ b/pcbnew/dialogs/panel_edit_options_base.fbp @@ -79,31 +79,214 @@ wxVERTICAL none - 5 - wxEXPAND|wxALL + 13 + wxTOP|wxRIGHT|wxLEFT 0 - + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 wxID_ANY Editing Options + 0 + + 0 + + + 0 + + 1 + m_staticText31 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline3 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND|wxALL + 0 + - bOptionsSizer + bSizerUniversal wxVERTICAL - 1 none + + 5 + wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Constrain actions to H, V, 45 degrees + + 0 + + + 0 + + 1 + m_cbConstrainHV45Mode + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + 5 wxEXPAND 0 - bSizerUniversal - wxVERTICAL + bSizerRotationStep + wxHORIZONTAL none 5 - wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -117,7 +300,6 @@ 1 0 - 0 1 1 @@ -133,7 +315,8 @@ 0 0 wxID_ANY - Constrain actions to H, V, 45 degrees + Step for &rotate commands: + 0 0 @@ -141,7 +324,7 @@ 0 1 - m_cbConstrainHV45Mode + m_rotationAngleLabel 1 @@ -152,223 +335,20 @@ 1 - ; ; forward_declare + 0 - - wxFILTER_NONE - wxDefaultValidator - + -1 - - 5 - wxEXPAND - 0 - - - bSizerRotationStep - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Step for &rotate commands: - 0 - - 0 - - - 0 - - 1 - m_rotationAngleLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 60,-1 - 1 - m_rotationAngleCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Set increment (in degrees) for context menu and hotkey rotation. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - deg - 0 - - 0 - - - 0 - - 1 - m_rotationAngleUnits - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - + 5 - wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -397,16 +377,15 @@ 0 0 wxID_ANY - Arc editing mode: - 0 0 + 0 0 - + 60,-1 1 - m_arcEditModeLabel + m_rotationAngleCtrl 1 @@ -417,30 +396,24 @@ 1 - ; ; forward_declare + 0 - + Set increment (in degrees) for context menu and hotkey rotation. + + wxFILTER_NONE + wxDefaultValidator + + - -1 - - - - 5 - wxEXPAND - 0 - - 3 - protected - 0 - + 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 0 - + 1 1 1 @@ -454,7 +427,6 @@ 1 0 - "Keep center, adjust radius" "Keep endpoints or direction of starting point" 1 1 @@ -470,6 +442,8 @@ 0 0 wxID_ANY + deg + 0 0 @@ -477,7 +451,7 @@ 0 1 - m_arcEditMode + m_rotationAngleUnits 1 @@ -485,36 +459,317 @@ 1 Resizable - 0 1 ; ; forward_declare 0 - - wxFILTER_NONE - wxDefaultValidator - + -1 5 - wxEXPAND|wxTOP + wxLEFT 0 - + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Arc editing mode: + 0 + + 0 + + + 0 - m_sizerBoardEdit - wxVERTICAL - protected - - 5 - wxRIGHT|wxLEFT + 1 + m_arcEditModeLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 3 + protected + 0 + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Keep center, adjust radius" "Keep endpoints or direction of starting point" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_arcEditMode + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + m_sizerBoardEdit + wxVERTICAL + protected + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Track mouse-drag mode: + 0 + + 0 + + + 0 + + 1 + m_trackMouseDragLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 3 + protected + 0 + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Move" "Drag (45 degree mode)" "Drag (free angle)" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_trackMouseDragCtrl + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxEXPAND + 1 + + + bSizerFlip + wxHORIZONTAL + none + + 5 + wxALL|wxALIGN_CENTER_VERTICAL 0 1 @@ -545,7 +800,7 @@ 0 0 wxID_ANY - Track mouse-drag mode: + Flip board items: 0 0 @@ -554,7 +809,7 @@ 0 1 - m_trackMouseDragLabel + m_staticText33 1 @@ -575,20 +830,10 @@ - 5 - wxEXPAND - 1 - - 3 - protected - 0 - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 10 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -602,7 +847,6 @@ 1 0 - "Move" "Drag (45 degree mode)" "Drag (free angle)" 1 1 @@ -618,6 +862,7 @@ 0 0 wxID_ANY + Left/right 0 @@ -625,7 +870,7 @@ 0 1 - m_trackMouseDragCtrl + m_rbFlipLeftRight 1 @@ -633,7 +878,6 @@ 1 Resizable - 0 1 @@ -644,26 +888,17 @@ wxFILTER_NONE wxDefaultValidator + 0 - 5 - wxEXPAND - 1 - - 3 - protected - 0 - - - - 5 - wxALL|wxEXPAND + 10 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -677,7 +912,6 @@ 1 0 - "Left/right" "Top/bottom" 1 1 @@ -693,8 +927,7 @@ 0 0 wxID_ANY - Board Items Flip - 1 + Top/bottom 0 @@ -702,7 +935,7 @@ 0 1 - m_boardItemsFlip + m_rbFlipTopBottom 1 @@ -710,10 +943,9 @@ 1 Resizable - 0 1 - wxRA_SPECIFY_ROWS + ; ; forward_declare 0 @@ -721,146 +953,7 @@ wxFILTER_NONE wxDefaultValidator - - - - - - - 5 - wxEXPAND - 1 - - 3 - protected - 0 - - - - 5 - wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Allow free pads - - 0 - - - 0 - - 1 - m_allowFreePads - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - If checked, pads can be moved with respect to the rest of the footprint. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Do not prompt for lock overrides for this session - - 0 - - - 0 - - 1 - m_overrideLocks - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - If checked, no prompt will be shown when attempting to edit locked items. This setting is reset when KiCad restarts. - - wxFILTER_NONE - wxDefaultValidator - + 0 @@ -868,25 +961,11 @@ - - - - 5 - wxEXPAND|wxALL - 1 - - wxID_ANY - Left Click Mouse Commands - - m_mouseCmdsWinLin - wxVERTICAL - 1 - protected 5 - wxALL + wxTOP|wxBOTTOM|wxLEFT 0 - + 1 1 1 @@ -900,6 +979,7 @@ 1 0 + 0 1 1 @@ -915,8 +995,7 @@ 0 0 wxID_ANY - Left click (and drag) actions depend on 2 modifier keys: Shift and Ctrl - 0 + Allow free pads 0 @@ -924,7 +1003,7 @@ 0 1 - m_staticText181 + m_allowFreePads 1 @@ -935,20 +1014,23 @@ 1 - ; ; forward_declare + 0 - + If checked, pads can be moved with respect to the rest of the footprint. + + wxFILTER_NONE + wxDefaultValidator + - -1 - + 5 - wxEXPAND|wxBOTTOM + wxBOTTOM|wxLEFT 0 - + 1 1 1 @@ -962,6 +1044,7 @@ 1 0 + 0 1 1 @@ -977,6 +1060,7 @@ 0 0 wxID_ANY + Do not prompt for lock overrides for this session 0 @@ -984,33 +1068,231 @@ 0 1 - staticline11 + m_overrideLocks 1 - none + protected 1 Resizable 1 - wxLI_HORIZONTAL - ; ; forward_declare + + 0 - + If checked, no prompt will be shown when attempting to edit locked items. This setting is reset when KiCad restarts. + + wxFILTER_NONE + wxDefaultValidator + - + + + + 13 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Left Click Mouse Commands + 0 + + 0 + + + 0 + + 1 + m_staticText32 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline4 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 1 + + + m_mouseCmdsWinLin + wxVERTICAL + protected + 5 - wxEXPAND|wxTOP - 1 - - 2 - wxBOTH - + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Left click (and drag) actions depend on 2 modifier keys: Shift and Ctrl + 0 + + 0 + + + 0 + + 1 + m_stHint1 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxTOP + 1 + + 2 + wxBOTH + 0 @@ -1650,19 +1932,16 @@ 5 - wxEXPAND|wxALL + wxEXPAND|wxRIGHT|wxLEFT 1 - - wxID_ANY - Left Click Mouse Commands + m_mouseCmdsOSX wxVERTICAL - 1 protected 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxALL 0 1 @@ -1702,7 +1981,7 @@ 0 1 - m_staticText1811 + m_stHint2 1 @@ -1722,65 +2001,6 @@ -1 - - 5 - wxEXPAND|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - staticline111 - 1 - - - none - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - 5 wxEXPAND|wxTOP @@ -2552,6 +2772,16 @@ + + 5 + wxEXPAND + 1 + + 0 + protected + 10 + + 5 wxEXPAND | wxALL @@ -2665,24 +2895,142 @@ wxTAB_TRAVERSAL - bSizer10 + fpOptionsSizer wxVERTICAL none - 5 - wxEXPAND|wxTOP + 13 + wxTOP|wxRIGHT|wxLEFT 0 - + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 wxID_ANY Magnetic Points + 0 + + 0 + + + 0 + + 1 + m_staticText34 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline5 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + - sbFPMagnets + bSizer13 wxVERTICAL - 1 none 5 - wxBOTTOM|wxLEFT + wxTOP|wxBOTTOM|wxLEFT 0 1 @@ -2876,429 +3224,664 @@ wxVERTICAL none - 5 - wxEXPAND|wxTOP|wxBOTTOM + 13 + wxTOP|wxLEFT 0 - + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 wxID_ANY Magnetic Points + 0 + + 0 + + + 0 - sbMagnets - wxVERTICAL - 1 + 1 + stMagneticPtsLabel1 + 1 + + + private + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline6 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + 2 + wxVERTICAL + + + 0 + + fgMagneticPoints + wxFLEX_GROWMODE_SPECIFIED none - + 0 + 5 + 5 - wxEXPAND|wxBOTTOM - 1 - - 2 - wxVERTICAL - - - 0 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Snap to pads: + 0 + + 0 + + + 0 - fgSizer2 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 5 - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Snap to pads: - 0 - - 0 - - - 0 - - 1 - m_staticText2 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Capture cursor when the mouse enters a pad area - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - "Never" "When routing tracks" "Always" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_magneticPadChoice - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - Capture cursor when the mouse enters a pad area - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Snap to tracks and vias: - 0 - - 0 - - - 0 - - 1 - m_staticText21 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Capture cursor when the mouse approaches a track - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - "Never" "When routing tracks" "Always" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_magneticTrackChoice - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - Capture cursor when the mouse approaches a track - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Snap to graphics: - 0 - - 0 - - - 0 - - 1 - m_staticText211 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Capture cursor when the mouse approaches graphical control points - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - "Always" "Never" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_magneticGraphicsChoice - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - Capture cursor when the mouse approaches graphical control points - - wxFILTER_NONE - wxDefaultValidator - - - - - - + 1 + m_staticText2 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Capture cursor when the mouse enters a pad area + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Never" "When routing tracks" "Always" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_magneticPadChoice + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + Capture cursor when the mouse enters a pad area + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Snap to tracks and vias: + 0 + + 0 + + + 0 + + 1 + m_staticText21 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Capture cursor when the mouse approaches a track + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Never" "When routing tracks" "Always" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_magneticTrackChoice + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + Capture cursor when the mouse approaches a track + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Snap to graphics: + 0 + + 0 + + + 0 + + 1 + m_staticText211 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Capture cursor when the mouse approaches graphical control points + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Always" "Never" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_magneticGraphicsChoice + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + Capture cursor when the mouse approaches graphical control points + + wxFILTER_NONE + wxDefaultValidator + + + + 5 - wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND + 0 + + 5 + protected + 0 + + + + 13 + wxTOP|wxLEFT 0 - + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 wxID_ANY Ratsnest + 0 + + 0 + + + 0 + + 1 + stRatsnestLabel + 1 + + + private + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline7 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND|wxALL + 0 + - sbSizer3 + bRatsnest wxVERTICAL - 1 none 5 @@ -3436,7 +4019,7 @@ 1 - bSizer11 + bRatsnestLineThickness wxHORIZONTAL none @@ -3571,16 +4154,134 @@ - 5 - wxEXPAND|wxTOP|wxBOTTOM + 13 + wxTOP|wxRIGHT|wxLEFT 0 - + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 wxID_ANY Miscellaneous + 0 + + 0 + + + 0 + + 1 + stMiscellaneousLabel + 1 + + + private + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline8 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND|wxALL + 1 + - sbSizerMisc + bMiscellaneous wxVERTICAL - 1 none 5 diff --git a/pcbnew/dialogs/panel_edit_options_base.h b/pcbnew/dialogs/panel_edit_options_base.h index d8aa58305f..ce046f8449 100644 --- a/pcbnew/dialogs/panel_edit_options_base.h +++ b/pcbnew/dialogs/panel_edit_options_base.h @@ -12,18 +12,18 @@ #include #include "widgets/resettable_panel.h" #include -#include +#include #include #include #include #include -#include +#include +#include #include #include #include +#include #include -#include -#include #include #include #include @@ -36,8 +36,13 @@ class PANEL_EDIT_OPTIONS_BASE : public RESETTABLE_PANEL { private: + wxStaticText* stMagneticPtsLabel1; + wxStaticText* stRatsnestLabel; + wxStaticText* stMiscellaneousLabel; protected: + wxStaticText* m_staticText31; + wxStaticLine* m_staticline3; wxCheckBox* m_cbConstrainHV45Mode; wxStaticText* m_rotationAngleLabel; wxTextCtrl* m_rotationAngleCtrl; @@ -47,28 +52,37 @@ class PANEL_EDIT_OPTIONS_BASE : public RESETTABLE_PANEL wxBoxSizer* m_sizerBoardEdit; wxStaticText* m_trackMouseDragLabel; wxChoice* m_trackMouseDragCtrl; - wxRadioBox* m_boardItemsFlip; + wxStaticText* m_staticText33; + wxRadioButton* m_rbFlipLeftRight; + wxRadioButton* m_rbFlipTopBottom; wxCheckBox* m_allowFreePads; wxCheckBox* m_overrideLocks; - wxStaticBoxSizer* m_mouseCmdsWinLin; - wxStaticText* m_staticText181; + wxStaticText* m_staticText32; + wxStaticLine* m_staticline4; + wxBoxSizer* m_mouseCmdsWinLin; + wxStaticText* m_stHint1; wxRadioBox* m_rbCtrlClickAction; - wxStaticBoxSizer* m_mouseCmdsOSX; - wxStaticText* m_staticText1811; + wxBoxSizer* m_mouseCmdsOSX; + wxStaticText* m_stHint2; wxRadioBox* m_rbCtrlClickActionMac; wxSimplebook* m_optionsBook; + wxStaticText* m_staticText34; + wxStaticLine* m_staticline5; wxCheckBox* m_magneticPads; wxCheckBox* m_magneticGraphics; + wxStaticLine* m_staticline6; wxStaticText* m_staticText2; wxChoice* m_magneticPadChoice; wxStaticText* m_staticText21; wxChoice* m_magneticTrackChoice; wxStaticText* m_staticText211; wxChoice* m_magneticGraphicsChoice; + wxStaticLine* m_staticline7; wxCheckBox* m_showSelectedRatsnest; wxCheckBox* m_OptDisplayCurvedRatsnestLines; wxStaticText* m_ratsnestThicknessLabel; wxSpinCtrlDouble* m_ratsnestThickness; + wxStaticLine* m_staticline8; wxCheckBox* m_escClearsNetHighlight; wxCheckBox* m_showPageLimits; wxCheckBox* m_cbCourtyardCollisions; diff --git a/pcbnew/dialogs/panel_fp_editor_graphics_defaults.cpp b/pcbnew/dialogs/panel_fp_editor_graphics_defaults.cpp index 7a8dc9366c..0b64d08ce1 100644 --- a/pcbnew/dialogs/panel_fp_editor_graphics_defaults.cpp +++ b/pcbnew/dialogs/panel_fp_editor_graphics_defaults.cpp @@ -85,7 +85,7 @@ PANEL_FP_EDITOR_GRAPHICS_DEFAULTS::PANEL_FP_EDITOR_GRAPHICS_DEFAULTS( m_graphicsGrid->PushEventHandler( new GRID_TRICKS( m_graphicsGrid ) ); - GetSizer()->Add( m_dimensionsPanel.get(), 0, wxEXPAND | wxALL, 5 ); + GetSizer()->Add( m_dimensionsPanel.get(), 0, wxEXPAND, 5 ); } diff --git a/pcbnew/dialogs/panel_fp_editor_graphics_defaults_base.cpp b/pcbnew/dialogs/panel_fp_editor_graphics_defaults_base.cpp index 63574e7bed..327c846248 100644 --- a/pcbnew/dialogs/panel_fp_editor_graphics_defaults_base.cpp +++ b/pcbnew/dialogs/panel_fp_editor_graphics_defaults_base.cpp @@ -82,7 +82,7 @@ PANEL_FP_EDITOR_GRAPHICS_DEFAULTS_BASE::PANEL_FP_EDITOR_GRAPHICS_DEFAULTS_BASE( bSizerMargins->Add( 0, 20, 0, wxEXPAND, 5 ); - bSizerMain->Add( bSizerMargins, 1, wxEXPAND, 5 ); + bSizerMain->Add( bSizerMargins, 0, wxEXPAND, 5 ); this->SetSizer( bSizerMain ); diff --git a/pcbnew/dialogs/panel_fp_editor_graphics_defaults_base.fbp b/pcbnew/dialogs/panel_fp_editor_graphics_defaults_base.fbp index 2ad75cd21f..80c0a3a7da 100644 --- a/pcbnew/dialogs/panel_fp_editor_graphics_defaults_base.fbp +++ b/pcbnew/dialogs/panel_fp_editor_graphics_defaults_base.fbp @@ -63,7 +63,7 @@ 5 wxEXPAND - 1 + 0 bSizerMargins diff --git a/pcbnew/dialogs/panel_setup_dimensions_base.cpp b/pcbnew/dialogs/panel_setup_dimensions_base.cpp index f83b27d332..091c1bb68a 100644 --- a/pcbnew/dialogs/panel_setup_dimensions_base.cpp +++ b/pcbnew/dialogs/panel_setup_dimensions_base.cpp @@ -16,10 +16,10 @@ PANEL_SETUP_DIMENSIONS_BASE::PANEL_SETUP_DIMENSIONS_BASE( wxWindow* parent, wxWi m_staticTextDefPropDim = new wxStaticText( this, wxID_ANY, _("Default Properties for New Dimension Objects"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDefPropDim->Wrap( -1 ); - mainSizer->Add( m_staticTextDefPropDim, 0, wxTOP|wxRIGHT|wxLEFT, 8 ); + mainSizer->Add( m_staticTextDefPropDim, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticline1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + mainSizer->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 5 ); wxGridBagSizer* gbSizer1; gbSizer1 = new wxGridBagSizer( 0, 5 ); @@ -108,7 +108,7 @@ PANEL_SETUP_DIMENSIONS_BASE::PANEL_SETUP_DIMENSIONS_BASE( wxWindow* parent, wxWi gbSizer1->Add( m_dimensionExtensionOffsetUnits, wxGBPosition( 3, 5 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - mainSizer->Add( gbSizer1, 1, wxEXPAND|wxTOP, 5 ); + mainSizer->Add( gbSizer1, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); this->SetSizer( mainSizer ); diff --git a/pcbnew/dialogs/panel_setup_dimensions_base.fbp b/pcbnew/dialogs/panel_setup_dimensions_base.fbp index 02a5db565e..fa193c2cd6 100644 --- a/pcbnew/dialogs/panel_setup_dimensions_base.fbp +++ b/pcbnew/dialogs/panel_setup_dimensions_base.fbp @@ -61,7 +61,7 @@ wxVERTICAL none - 8 + 13 wxTOP|wxRIGHT|wxLEFT 0 @@ -124,7 +124,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxBOTTOM 0 1 @@ -183,7 +183,7 @@ 5 - wxEXPAND|wxTOP + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 diff --git a/pcbnew/dialogs/panel_setup_text_and_graphics.cpp b/pcbnew/dialogs/panel_setup_text_and_graphics.cpp index cdeff85560..cd34112dc1 100644 --- a/pcbnew/dialogs/panel_setup_text_and_graphics.cpp +++ b/pcbnew/dialogs/panel_setup_text_and_graphics.cpp @@ -96,7 +96,7 @@ PANEL_SETUP_TEXT_AND_GRAPHICS::PANEL_SETUP_TEXT_AND_GRAPHICS( wxWindow* aP m_grid->PushEventHandler( new GRID_TRICKS( m_grid ) ); - GetSizer()->Add( m_dimensionsPanel.get(), 0, wxEXPAND | wxALL, 5 ); + GetSizer()->Add( m_dimensionsPanel.get(), 0, wxEXPAND, 5 ); Layout(); m_mainSizer->Fit( this );