diff --git a/pcbnew/widgets/appearance_controls.cpp b/pcbnew/widgets/appearance_controls.cpp index 712acafca4..397b1063bd 100644 --- a/pcbnew/widgets/appearance_controls.cpp +++ b/pcbnew/widgets/appearance_controls.cpp @@ -428,8 +428,6 @@ APPEARANCE_CONTROLS::APPEARANCE_CONTROLS( PCB_BASE_FRAME* aParent, wxWindow* aFo m_frame->GetToolManager()->RunAction( PCB_ACTIONS::flipBoard, true ); } ); - m_paneLayerDisplay->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - m_toggleGridRenderer = new GRID_BITMAP_TOGGLE_RENDERER( KiBitmap( visibility_xpm ), KiBitmap( visibility_off_xpm ) ); @@ -502,26 +500,6 @@ wxSize APPEARANCE_CONTROLS::GetBestSize() const } -void APPEARANCE_CONTROLS::OnLayerDisplayPaneChanged( wxCollapsiblePaneEvent& event ) -{ - // Because wxWidgets is broken and will not properly lay these out automatically - Freeze(); - m_panelLayers->Fit(); - m_sizerOuter->Layout(); - Thaw(); -} - - -void APPEARANCE_CONTROLS::OnNetDisplayPaneChanged( wxCollapsiblePaneEvent& event ) -{ - // Because wxWidgets is broken and will not properly lay these out automatically - Freeze(); - m_panelNetsAndClasses->Fit(); - m_sizerOuter->Layout(); - Thaw(); -} - - void APPEARANCE_CONTROLS::OnNotebookPageChanged( wxNotebookEvent& aEvent ) { // Work around wxMac issue where the notebook pages are blank @@ -564,7 +542,7 @@ void APPEARANCE_CONTROLS::OnSetFocus( wxFocusEvent& aEvent ) wxPostEvent( btn, evt ); } #endif - + passOnFocus(); aEvent.Skip(); } @@ -775,21 +753,17 @@ void APPEARANCE_CONTROLS::OnColorThemeChanged() void APPEARANCE_CONTROLS::OnLayerChanged() { - const wxColour normalColor = m_panelLayers->GetBackgroundColour(); - static wxColour highlightColor = wxSystemSettings::GetColour( wxSYS_COLOUR_SCROLLBAR ); + for( const std::pair& pair : m_layerSettingsMap ) + { + pair.second->ctl_panel->SetBackgroundColour( m_layerPanelColour ); + pair.second->ctl_indicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::OFF ); + } - PCB_LAYER_ID current = m_frame->GetActiveLayer(); + wxColour highlightColor = m_layerPanelColour.ChangeLightness( 160 ); + PCB_LAYER_ID current = m_frame->GetActiveLayer(); + APPEARANCE_SETTING* newSetting = m_layerSettingsMap[ current ]; - wxASSERT( m_layerSettingsMap.count( current ) ); - wxASSERT( m_layerSettingsMap.count( m_currentLayer ) ); - - APPEARANCE_SETTING* oldSetting = m_layerSettingsMap.at( m_currentLayer ); - APPEARANCE_SETTING* newSetting = m_layerSettingsMap.at( current ); - - oldSetting->ctl_panel->SetBackgroundColour( normalColor ); newSetting->ctl_panel->SetBackgroundColour( highlightColor ); - - oldSetting->ctl_indicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::OFF ); newSetting->ctl_indicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::ON ); m_currentLayer = current; @@ -995,21 +969,26 @@ void APPEARANCE_CONTROLS::rebuildLayers() wxBoxSizer* sizer = new wxBoxSizer( wxHORIZONTAL ); panel->SetSizer( sizer ); + m_layerPanelColour = panel->GetBackgroundColour().ChangeLightness( 110 ); + panel->SetBackgroundColour( m_layerPanelColour ); + aSetting->visible = visible[layer]; // TODO(JE) consider restyling this indicator INDICATOR_ICON* indicator = new INDICATOR_ICON( panel, *m_iconProvider, - ROW_ICON_PROVIDER::STATE::OFF, layer ); + ROW_ICON_PROVIDER::STATE::OFF, + layer ); COLOR_SWATCH* swatch = new COLOR_SWATCH( panel, COLOR4D::UNSPECIFIED, layer, bgColor, theme->GetColor( layer ), SWATCH_SMALL ); - swatch->SetToolTip( _( "Left double click or middle click for color change, " + swatch->SetToolTip( _( "Double click or middle click for color change, " "right click for menu" ) ); - BITMAP_TOGGLE* btn_visible = - new BITMAP_TOGGLE( panel, layer, KiBitmap( visibility_xpm ), - KiBitmap( visibility_off_xpm ), aSetting->visible ); + BITMAP_TOGGLE* btn_visible = new BITMAP_TOGGLE( panel, layer, + KiBitmap( visibility_xpm ), + KiBitmap( visibility_off_xpm ), + aSetting->visible ); btn_visible->SetToolTip( _( "Show or hide this layer" ) ); wxStaticText* label = new wxStaticText( panel, layer, aSetting->label ); @@ -1053,8 +1032,8 @@ void APPEARANCE_CONTROLS::rebuildLayers() isVisible, true ); } ); - swatch->Bind( COLOR_SWATCH_CHANGED, - &APPEARANCE_CONTROLS::OnColorSwatchChanged, this ); + swatch->Bind( COLOR_SWATCH_CHANGED, &APPEARANCE_CONTROLS::OnColorSwatchChanged, + this ); auto rightClickHandler = [&]( wxMouseEvent& aEvent ) @@ -1158,6 +1137,7 @@ void APPEARANCE_CONTROLS::rebuildLayers() } m_layersOuterSizer->AddSpacer( 10 ); + m_windowLayers->SetBackgroundColour( m_layerPanelColour ); m_windowLayers->Layout(); } diff --git a/pcbnew/widgets/appearance_controls.h b/pcbnew/widgets/appearance_controls.h index be126945e2..c4f3ebf6c1 100644 --- a/pcbnew/widgets/appearance_controls.h +++ b/pcbnew/widgets/appearance_controls.h @@ -248,10 +248,6 @@ public: protected: - void OnLayerDisplayPaneChanged( wxCollapsiblePaneEvent& event ) override; - - void OnNetDisplayPaneChanged( wxCollapsiblePaneEvent& event ) override; - void OnNotebookPageChanged( wxNotebookEvent& event ) override; void OnSetFocus( wxFocusEvent& aEvent ) override; @@ -335,6 +331,8 @@ private: int m_pointSize; + wxColour m_layerPanelColour; + enum POPUP_ID { ID_CHANGE_COLOR = wxID_HIGHEST, @@ -410,8 +408,6 @@ private: void passOnFocus(); void idleFocusHandler( wxIdleEvent& aEvent ); - - void updateNetsDataViewToolTip( wxMouseEvent& aEvent ); }; #endif diff --git a/pcbnew/widgets/appearance_controls_base.cpp b/pcbnew/widgets/appearance_controls_base.cpp index 6294916361..306630763c 100644 --- a/pcbnew/widgets/appearance_controls_base.cpp +++ b/pcbnew/widgets/appearance_controls_base.cpp @@ -23,49 +23,46 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_windowLayers = new wxScrolledCanvas( m_panelLayers, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL ); m_panelLayersSizer->Add( m_windowLayers, 1, wxEXPAND, 5 ); - m_paneLayerDisplay = new wxCollapsiblePane( m_panelLayers, wxID_ANY, wxT("Layer Display Options"), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE|wxCP_NO_TLW_RESIZE ); - m_paneLayerDisplay->Collapse( true ); - wxBoxSizer* bSizer121; bSizer121 = new wxBoxSizer( wxVERTICAL ); - m_staticText13 = new wxStaticText( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Non-active layers:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText13 = new wxStaticText( m_panelLayers, wxID_ANY, wxT("Non-active layers:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText13->Wrap( -1 ); - bSizer121->Add( m_staticText13, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + bSizer121->Add( m_staticText13, 0, wxEXPAND|wxBOTTOM, 2 ); wxBoxSizer* bSizer19; bSizer19 = new wxBoxSizer( wxHORIZONTAL ); - m_rbHighContrastNormal = new wxRadioButton( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Normal"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_rbHighContrastNormal = new wxRadioButton( m_panelLayers, wxID_ANY, wxT("Normal"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); m_rbHighContrastNormal->SetValue( true ); m_rbHighContrastNormal->SetToolTip( wxT("Non-active layers will be shown in full color") ); - bSizer19->Add( m_rbHighContrastNormal, 0, wxRIGHT|wxLEFT, 5 ); + bSizer19->Add( m_rbHighContrastNormal, 0, wxRIGHT, 8 ); - m_rbHighContrastDim = new wxRadioButton( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Dim"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rbHighContrastDim = new wxRadioButton( m_panelLayers, wxID_ANY, wxT("Dim"), wxDefaultPosition, wxDefaultSize, 0 ); m_rbHighContrastDim->SetToolTip( wxT("Non-active layers will be dimmed") ); - bSizer19->Add( m_rbHighContrastDim, 0, wxRIGHT|wxLEFT, 5 ); + bSizer19->Add( m_rbHighContrastDim, 0, wxRIGHT, 14 ); - m_rbHighContrastOff = new wxRadioButton( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Hide"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rbHighContrastOff = new wxRadioButton( m_panelLayers, wxID_ANY, wxT("Hide"), wxDefaultPosition, wxDefaultSize, 0 ); m_rbHighContrastOff->SetToolTip( wxT("Non-active layers will be hidden") ); - bSizer19->Add( m_rbHighContrastOff, 0, wxRIGHT|wxLEFT, 5 ); + bSizer19->Add( m_rbHighContrastOff, 0, wxRIGHT, 5 ); bSizer121->Add( bSizer19, 0, wxEXPAND, 5 ); - m_staticline5 = new wxStaticLine( m_paneLayerDisplay->GetPane(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizer121->Add( m_staticline5, 0, wxEXPAND | wxALL, 5 ); - - m_cbFlipBoard = new wxCheckBox( m_paneLayerDisplay->GetPane(), wxID_ANY, wxT("Flip board view"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer121->Add( m_cbFlipBoard, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_staticline5 = new wxStaticLine( m_panelLayers, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bSizer121->Add( m_staticline5, 0, wxEXPAND|wxTOP, 5 ); - m_paneLayerDisplay->GetPane()->SetSizer( bSizer121 ); - m_paneLayerDisplay->GetPane()->Layout(); - bSizer121->Fit( m_paneLayerDisplay->GetPane() ); - m_panelLayersSizer->Add( m_paneLayerDisplay, 0, wxBOTTOM|wxTOP|wxEXPAND, 5 ); + bSizer121->Add( 0, 3, 1, wxEXPAND, 5 ); + + m_cbFlipBoard = new wxCheckBox( m_panelLayers, wxID_ANY, wxT("Flip board view"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer121->Add( m_cbFlipBoard, 0, wxRIGHT, 5 ); + + + m_panelLayersSizer->Add( bSizer121, 0, wxEXPAND|wxTOP, 5 ); m_panelLayers->SetSizer( m_panelLayersSizer ); @@ -189,45 +186,39 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_netsTabSplitter->SplitHorizontally( m_panelNets, m_panelNetclasses, 300 ); bSizer16->Add( m_netsTabSplitter, 1, wxEXPAND, 5 ); - m_paneNetDisplay = new wxCollapsiblePane( m_panelNetsAndClasses, wxID_ANY, wxT("Net Display Options"), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE|wxCP_NO_TLW_RESIZE ); - m_paneNetDisplay->Collapse( true ); - wxBoxSizer* bSizerNetDisplay; bSizerNetDisplay = new wxBoxSizer( wxVERTICAL ); - m_staticTextNetDsplayTitle = new wxStaticText( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("Net colors:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextNetDsplayTitle = new wxStaticText( m_panelNetsAndClasses, wxID_ANY, wxT("Apply net and netclass colors to:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextNetDsplayTitle->Wrap( -1 ); m_staticTextNetDsplayTitle->SetToolTip( wxT("Choose when to show net and netclass colors") ); - bSizerNetDisplay->Add( m_staticTextNetDsplayTitle, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizerNetDisplay->Add( m_staticTextNetDsplayTitle, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 2 ); wxBoxSizer* bSizer191; bSizer191 = new wxBoxSizer( wxHORIZONTAL ); - m_rbNetColorAll = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("All"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_rbNetColorAll = new wxRadioButton( m_panelNetsAndClasses, wxID_ANY, wxT("All"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); m_rbNetColorAll->SetToolTip( wxT("Net and netclass colors are shown on all copper items") ); - bSizer191->Add( m_rbNetColorAll, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizer191->Add( m_rbNetColorAll, 0, wxRIGHT, 16 ); - m_rbNetColorRatsnest = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("Ratsnest"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rbNetColorRatsnest = new wxRadioButton( m_panelNetsAndClasses, wxID_ANY, wxT("Ratsnest"), wxDefaultPosition, wxDefaultSize, 0 ); m_rbNetColorRatsnest->SetValue( true ); m_rbNetColorRatsnest->SetToolTip( wxT("Net and netclass colors are shown on the ratsnest only") ); - bSizer191->Add( m_rbNetColorRatsnest, 0, wxBOTTOM|wxLEFT, 5 ); + bSizer191->Add( m_rbNetColorRatsnest, 0, wxRIGHT, 8 ); - m_rbNetColorOff = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("None"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rbNetColorOff = new wxRadioButton( m_panelNetsAndClasses, wxID_ANY, wxT("None"), wxDefaultPosition, wxDefaultSize, 0 ); m_rbNetColorOff->SetToolTip( wxT("Net and netclass colors are not shown") ); - bSizer191->Add( m_rbNetColorOff, 0, wxBOTTOM|wxLEFT, 5 ); + bSizer191->Add( m_rbNetColorOff, 0, 0, 5 ); bSizerNetDisplay->Add( bSizer191, 0, wxEXPAND, 5 ); - m_paneNetDisplay->GetPane()->SetSizer( bSizerNetDisplay ); - m_paneNetDisplay->GetPane()->Layout(); - bSizerNetDisplay->Fit( m_paneNetDisplay->GetPane() ); - bSizer16->Add( m_paneNetDisplay, 0, wxEXPAND|wxTOP, 5 ); + bSizer16->Add( bSizerNetDisplay, 0, wxEXPAND|wxTOP, 5 ); m_panelNetsAndClasses->SetSizer( bSizer16 ); @@ -255,7 +246,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID bPresetsLabels->Add( presetsHotkey, 0, wxTOP|wxRIGHT|wxLEFT, 2 ); - bPresets->Add( bPresetsLabels, 1, wxEXPAND, 5 ); + bPresets->Add( bPresetsLabels, 1, wxEXPAND|wxTOP, 3 ); wxString m_cbLayerPresetsChoices[] = { wxT("All Layers"), wxT("(unsaved)") }; int m_cbLayerPresetsNChoices = sizeof( m_cbLayerPresetsChoices ) / sizeof( wxString ); @@ -282,8 +273,6 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_notebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( APPEARANCE_CONTROLS_BASE::OnNotebookPageChanged ), NULL, this ); m_notebook->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); m_panelLayers->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); - m_paneLayerDisplay->Connect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnLayerDisplayPaneChanged ), NULL, this ); - m_paneLayerDisplay->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); m_cbFlipBoard->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::OnFlipBoardChecked ), NULL, this ); m_panelObjects->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); m_panelNetsAndClasses->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); @@ -293,8 +282,6 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_netsGrid->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( APPEARANCE_CONTROLS_BASE::OnNetGridRightClick ), NULL, this ); m_netsGrid->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); m_panelNetclasses->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); - m_paneNetDisplay->Connect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnNetDisplayPaneChanged ), NULL, this ); - m_paneNetDisplay->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); m_cbLayerPresets->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::onLayerPresetChanged ), NULL, this ); } @@ -306,8 +293,6 @@ APPEARANCE_CONTROLS_BASE::~APPEARANCE_CONTROLS_BASE() m_notebook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( APPEARANCE_CONTROLS_BASE::OnNotebookPageChanged ), NULL, this ); m_notebook->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); m_panelLayers->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); - m_paneLayerDisplay->Disconnect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnLayerDisplayPaneChanged ), NULL, this ); - m_paneLayerDisplay->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); m_cbFlipBoard->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::OnFlipBoardChecked ), NULL, this ); m_panelObjects->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); m_panelNetsAndClasses->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); @@ -317,8 +302,6 @@ APPEARANCE_CONTROLS_BASE::~APPEARANCE_CONTROLS_BASE() m_netsGrid->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( APPEARANCE_CONTROLS_BASE::OnNetGridRightClick ), NULL, this ); m_netsGrid->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); m_panelNetclasses->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); - m_paneNetDisplay->Disconnect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnNetDisplayPaneChanged ), NULL, this ); - m_paneNetDisplay->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( APPEARANCE_CONTROLS_BASE::OnSetFocus ), NULL, this ); m_cbLayerPresets->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::onLayerPresetChanged ), NULL, this ); } diff --git a/pcbnew/widgets/appearance_controls_base.fbp b/pcbnew/widgets/appearance_controls_base.fbp index 4afe6764f1..13a93bc5aa 100644 --- a/pcbnew/widgets/appearance_controls_base.fbp +++ b/pcbnew/widgets/appearance_controls_base.fbp @@ -240,459 +240,408 @@ 5 - wxBOTTOM|wxTOP|wxEXPAND + wxEXPAND|wxTOP 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Layer Display Options - - 0 - - - 0 + - 1 - m_paneLayerDisplay - 1 - - - protected - 1 - - Resizable - 1 - - wxCP_DEFAULT_STYLE|wxCP_NO_TLW_RESIZE - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnLayerDisplayPaneChanged - OnSetFocus - - - bSizer121 - wxVERTICAL - none - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Non-active layers: - 0 - - 0 - - - 0 - - 1 - m_staticText13 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - + bSizer121 + wxVERTICAL + none + + 2 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Non-active layers: + 0 + + 0 + + + 0 + + 1 + m_staticText13 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 - - 5 - wxEXPAND - 0 - - - bSizer19 - wxHORIZONTAL - none - - 5 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Normal - - 0 - - - 0 - - 1 - m_rbHighContrastNormal - 1 - - - protected - 1 - - Resizable - 1 - - wxRB_GROUP - ; ; forward_declare - 0 - Non-active layers will be shown in full color - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - + + + 5 + wxEXPAND + 0 + + + bSizer19 + wxHORIZONTAL + none + + 8 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Normal + + 0 + + + 0 + + 1 + m_rbHighContrastNormal + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + ; ; forward_declare + 0 + Non-active layers will be shown in full color + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + - - 5 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Dim - - 0 - - - 0 - - 1 - m_rbHighContrastDim - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Non-active layers will be dimmed - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - + + + 14 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Dim + + 0 + + + 0 + + 1 + m_rbHighContrastDim + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Non-active layers will be dimmed + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + - - 5 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Hide - - 0 - - - 0 - - 1 - m_rbHighContrastOff - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Non-active layers will be hidden - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - + + + 5 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Hide + + 0 + + + 0 + + 1 + m_rbHighContrastOff + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Non-active layers will be hidden + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + - - 5 - wxEXPAND | wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline5 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - + + + 5 + wxEXPAND|wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline5 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Flip board view - - 0 - - - 0 - - 1 - m_cbFlipBoard - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnFlipBoardChecked - + + + 5 + wxEXPAND + 1 + + 3 + protected + 0 + + + + 5 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Flip board view + + 0 + + + 0 + + 1 + m_cbFlipBoard + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnFlipBoardChecked @@ -830,7 +779,7 @@ Nets 0 - + 1 1 1 @@ -882,16 +831,16 @@ wxTAB_TRAVERSAL OnSetFocus - + bSizer16 wxVERTICAL none - + 5 wxEXPAND 1 - + 1 1 1 @@ -948,8 +897,8 @@ - - + + 1 1 1 @@ -1001,16 +950,16 @@ wxTAB_TRAVERSAL OnSetFocus - + bSizer192 wxVERTICAL none - + 5 wxEXPAND 0 - + bSizer17 wxHORIZONTAL @@ -1214,11 +1163,11 @@ - + 5 wxALL|wxEXPAND 1 - + 1 1 1 @@ -1309,8 +1258,8 @@ - - + + 1 1 1 @@ -1362,16 +1311,16 @@ wxTAB_TRAVERSAL OnSetFocus - + bSizerNetClasses wxVERTICAL none - + 5 wxEXPAND 0 - + bSizer20 wxHORIZONTAL @@ -1581,336 +1530,275 @@ - + 5 wxEXPAND|wxTOP 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Net Display Options - - 0 - - - 0 + - 1 - m_paneNetDisplay - 1 - - - protected - 1 - - Resizable - 1 - - wxCP_DEFAULT_STYLE|wxCP_NO_TLW_RESIZE - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnNetDisplayPaneChanged - OnSetFocus - - - bSizerNetDisplay - wxVERTICAL - none - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Net colors: - 0 - - 0 - - - 0 - - 1 - m_staticTextNetDsplayTitle - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Choose when to show net and netclass colors - - - - -1 - + bSizerNetDisplay + wxVERTICAL + none + + 2 + wxEXPAND|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Apply net and netclass colors to: + 0 + + 0 + + + 0 + + 1 + m_staticTextNetDsplayTitle + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Choose when to show net and netclass colors + + + + -1 - - 5 - wxEXPAND - 0 - - - bSizer191 - wxHORIZONTAL - none - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - All - - 0 - - - 0 - - 1 - m_rbNetColorAll - 1 - - - protected - 1 - - Resizable - 1 - - wxRB_GROUP - ; ; forward_declare - 0 - Net and netclass colors are shown on all copper items - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - + + + 5 + wxEXPAND + 0 + + + bSizer191 + wxHORIZONTAL + none + + 16 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + All + + 0 + + + 0 + + 1 + m_rbNetColorAll + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + ; ; forward_declare + 0 + Net and netclass colors are shown on all copper items + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + - - 5 - wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Ratsnest - - 0 - - - 0 - - 1 - m_rbNetColorRatsnest - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Net and netclass colors are shown on the ratsnest only - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - + + + 8 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Ratsnest + + 0 + + + 0 + + 1 + m_rbNetColorRatsnest + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Net and netclass colors are shown on the ratsnest only + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + - - 5 - wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - None - - 0 - - - 0 - - 1 - m_rbNetColorOff - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Net and netclass colors are not shown - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - + + + 5 + + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + None + + 0 + + + 0 + + 1 + m_rbNetColorOff + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Net and netclass colors are not shown + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + @@ -1941,8 +1829,8 @@ wxVERTICAL none - 5 - wxEXPAND + 3 + wxEXPAND|wxTOP 1 diff --git a/pcbnew/widgets/appearance_controls_base.h b/pcbnew/widgets/appearance_controls_base.h index 7271e328ed..5bbdfbd9d2 100644 --- a/pcbnew/widgets/appearance_controls_base.h +++ b/pcbnew/widgets/appearance_controls_base.h @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -49,7 +48,6 @@ class APPEARANCE_CONTROLS_BASE : public wxPanel wxPanel* m_panelLayers; wxBoxSizer* m_panelLayersSizer; wxScrolledCanvas* m_windowLayers; - wxCollapsiblePane* m_paneLayerDisplay; wxStaticText* m_staticText13; wxRadioButton* m_rbHighContrastNormal; wxRadioButton* m_rbHighContrastDim; @@ -71,7 +69,6 @@ class APPEARANCE_CONTROLS_BASE : public wxPanel wxBitmapButton* m_btnConfigureNetClasses; wxScrolledWindow* m_netclassScrolledWindow; wxBoxSizer* m_netclassOuterSizer; - wxCollapsiblePane* m_paneNetDisplay; wxStaticText* m_staticTextNetDsplayTitle; wxRadioButton* m_rbNetColorAll; wxRadioButton* m_rbNetColorRatsnest; @@ -84,12 +81,10 @@ class APPEARANCE_CONTROLS_BASE : public wxPanel virtual void OnSetFocus( wxFocusEvent& event ) { event.Skip(); } virtual void OnSize( wxSizeEvent& event ) { event.Skip(); } virtual void OnNotebookPageChanged( wxNotebookEvent& event ) { event.Skip(); } - virtual void OnLayerDisplayPaneChanged( wxCollapsiblePaneEvent& event ) { event.Skip(); } virtual void OnFlipBoardChecked( wxCommandEvent& event ) { event.Skip(); } virtual void OnNetGridClick( wxGridEvent& event ) { event.Skip(); } virtual void OnNetGridDoubleClick( wxGridEvent& event ) { event.Skip(); } virtual void OnNetGridRightClick( wxGridEvent& event ) { event.Skip(); } - virtual void OnNetDisplayPaneChanged( wxCollapsiblePaneEvent& event ) { event.Skip(); } virtual void onLayerPresetChanged( wxCommandEvent& event ) { event.Skip(); }