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

Consistent terminology.

This commit is contained in:
Jeff Young 2021-04-03 10:30:38 +01:00
parent c5536b2cab
commit 52aea0a2c9
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/project/board_project_settings.h
View File

@ -87,9 +87,9 @@ struct SELECTION_FILTER_OPTIONS
*/ */
enum class HIGH_CONTRAST_MODE enum class HIGH_CONTRAST_MODE
{ {
NORMAL = 0, ///< Non-active layers are shown normally (no high-contrast mode) NORMAL = 0, ///< Inactive layers are shown normally (no high-contrast mode)
DIMMED, ///< Non-active layers are dimmed (old high-contrast mode) DIMMED, ///< Inactive layers are dimmed (old high-contrast mode)
HIDDEN ///< Non-active layers are hidden HIDDEN ///< Inactive layers are hidden
}; };
///< Determine how zones should be displayed. ///< Determine how zones should be displayed.

6
pcbnew/dialogs/panel_setup_layers.cpp
View File

@ -267,8 +267,7 @@ void PANEL_SETUP_LAYERS::setUserDefinedLayerCheckBoxes()
bool state = m_pcb->IsLayerEnabled( layer ); bool state = m_pcb->IsLayerEnabled( layer );
#ifdef HIDE_INACTIVE_LAYERS #ifdef HIDE_INACTIVE_LAYERS
// This code hides non-active copper layers, or redisplays hidden // This code hides inactive copper layers, or redisplays hidden layers which are now needed.
// layers which are now needed.
PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( layer ); PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( layer );
ctl.name->Show( state ); ctl.name->Show( state );
@ -379,8 +378,7 @@ void PANEL_SETUP_LAYERS::setCopperLayerCheckBoxes( int copperCount )
bool state = copperCount > 0; bool state = copperCount > 0;
#ifdef HIDE_INACTIVE_LAYERS #ifdef HIDE_INACTIVE_LAYERS
// This code hides non-active copper layers, or redisplays hidden // This code hides inactive copper layers, or redisplays hidden layers which are now needed.
// layers which are now needed.
PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( layer ); PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( layer );
ctl.name->Show( state ); ctl.name->Show( state );

8
pcbnew/widgets/appearance_controls.cpp
View File

@ -572,7 +572,7 @@ void APPEARANCE_CONTROLS::createControls()
layerDisplayOptionsSizer = new wxBoxSizer( wxVERTICAL ); layerDisplayOptionsSizer = new wxBoxSizer( wxVERTICAL );
m_staticTextContrastModeTitle = new wxStaticText( layerDisplayPane, wxID_ANY, m_staticTextContrastModeTitle = new wxStaticText( layerDisplayPane, wxID_ANY,
_( "Non-active layers:" ), wxDefaultPosition, _( "Inactive layers:" ), wxDefaultPosition,
wxDefaultSize, 0 ); wxDefaultSize, 0 );
m_staticTextContrastModeTitle->Wrap( -1 ); m_staticTextContrastModeTitle->Wrap( -1 );
layerDisplayOptionsSizer->Add( m_staticTextContrastModeTitle, 0, layerDisplayOptionsSizer->Add( m_staticTextContrastModeTitle, 0,
@ -584,19 +584,19 @@ void APPEARANCE_CONTROLS::createControls()
m_rbHighContrastNormal = new wxRadioButton( layerDisplayPane, wxID_ANY, _( "Normal" ), m_rbHighContrastNormal = new wxRadioButton( layerDisplayPane, wxID_ANY, _( "Normal" ),
wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
m_rbHighContrastNormal->SetValue( true ); m_rbHighContrastNormal->SetValue( true );
m_rbHighContrastNormal->SetToolTip( _( "Non-active layers will be shown in full color" ) ); m_rbHighContrastNormal->SetToolTip( _( "Inactive layers will be shown in full color" ) );
contrastModeSizer->Add( m_rbHighContrastNormal, 0, wxRIGHT, 4 ); contrastModeSizer->Add( m_rbHighContrastNormal, 0, wxRIGHT, 4 );
m_rbHighContrastDim = new wxRadioButton( layerDisplayPane, wxID_ANY, _( "Dim" ), m_rbHighContrastDim = new wxRadioButton( layerDisplayPane, wxID_ANY, _( "Dim" ),
wxDefaultPosition, wxDefaultSize, 0 ); wxDefaultPosition, wxDefaultSize, 0 );
m_rbHighContrastDim->SetToolTip( _( "Non-active layers will be dimmed" ) ); m_rbHighContrastDim->SetToolTip( _( "Inactive layers will be dimmed" ) );
contrastModeSizer->Add( m_rbHighContrastDim, 0, wxRIGHT | wxLEFT, 10 ); contrastModeSizer->Add( m_rbHighContrastDim, 0, wxRIGHT | wxLEFT, 10 );
m_rbHighContrastOff = new wxRadioButton( layerDisplayPane, wxID_ANY, _( "Hide" ), m_rbHighContrastOff = new wxRadioButton( layerDisplayPane, wxID_ANY, _( "Hide" ),
wxDefaultPosition, wxDefaultSize, 0 ); wxDefaultPosition, wxDefaultSize, 0 );
m_rbHighContrastOff->SetToolTip( _( "Non-active layers will be hidden" ) ); m_rbHighContrastOff->SetToolTip( _( "Inactive layers will be hidden" ) );
contrastModeSizer->Add( m_rbHighContrastOff, 0, 0, 5 ); contrastModeSizer->Add( m_rbHighContrastOff, 0, 0, 5 );