diff --git a/pcbnew/widgets/appearance_controls_base.cpp b/pcbnew/widgets/appearance_controls_base.cpp index e7c0255c56..6f6fc5977e 100644 --- a/pcbnew/widgets/appearance_controls_base.cpp +++ b/pcbnew/widgets/appearance_controls_base.cpp @@ -80,7 +80,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_panelLayers->SetSizer( m_panelLayersSizer ); m_panelLayers->Layout(); m_panelLayersSizer->Fit( m_panelLayers ); - m_notebook->AddPage( m_panelLayers, wxT("Layers"), false ); + m_notebook->AddPage( m_panelLayers, wxT("Layers"), true ); m_panelObjects = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelObjects->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); @@ -213,7 +213,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID wxBoxSizer* bSizer191; bSizer191 = new wxBoxSizer( wxHORIZONTAL ); - m_rbNetColorAll = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("All"), wxDefaultPosition, wxDefaultSize, 0 ); + m_rbNetColorAll = new wxRadioButton( m_paneNetDisplay->GetPane(), 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, 1, wxRIGHT|wxLEFT, 5 ); @@ -224,7 +224,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID bSizer191->Add( m_rbNetColorRatsnest, 1, wxLEFT, 5 ); - m_rbNetColorOff = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("None"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_rbNetColorOff = new wxRadioButton( m_paneNetDisplay->GetPane(), wxID_ANY, wxT("None"), wxDefaultPosition, wxDefaultSize, 0 ); m_rbNetColorOff->SetToolTip( wxT("Net and netclass colors are not shown") ); bSizer191->Add( m_rbNetColorOff, 1, wxLEFT, 5 ); @@ -242,7 +242,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_panelNetsAndClasses->SetSizer( bSizer16 ); m_panelNetsAndClasses->Layout(); bSizer16->Fit( m_panelNetsAndClasses ); - m_notebook->AddPage( m_panelNetsAndClasses, wxT("Nets"), true ); + m_notebook->AddPage( m_panelNetsAndClasses, wxT("Nets"), false ); m_sizerOuter->Add( m_notebook, 1, wxEXPAND, 5 ); @@ -253,8 +253,6 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID int m_cbLayerPresetsNChoices = sizeof( m_cbLayerPresetsChoices ) / sizeof( wxString ); m_cbLayerPresets = new wxChoice( presetsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cbLayerPresetsNChoices, m_cbLayerPresetsChoices, 0 ); m_cbLayerPresets->SetSelection( 1 ); - m_cbLayerPresets->SetToolTip( wxT("Layer presets") ); - presetsSizer->Add( m_cbLayerPresets, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_btnDeletePreset = new wxBitmapButton( presetsSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); diff --git a/pcbnew/widgets/appearance_controls_base.fbp b/pcbnew/widgets/appearance_controls_base.fbp index 3d77bac83c..d310b48d96 100644 --- a/pcbnew/widgets/appearance_controls_base.fbp +++ b/pcbnew/widgets/appearance_controls_base.fbp @@ -115,7 +115,7 @@ Layers - 0 + 1 1 1 @@ -846,7 +846,7 @@ Nets - 1 + 0 1 1 @@ -1631,7 +1631,7 @@ OnNetDisplayPaneChanged - + bSizer1211 wxVERTICAL @@ -1697,11 +1697,11 @@ -1 - + 5 wxEXPAND 0 - + bSizer191 wxHORIZONTAL @@ -1756,7 +1756,7 @@ Resizable 1 - + wxRB_GROUP ; ; forward_declare 0 Net and netclass colors are shown on all copper items @@ -1884,7 +1884,7 @@ Resizable 1 - wxRB_GROUP + ; ; forward_declare 0 Net and netclass colors are not shown