diff --git a/common/colors_design_settings.cpp b/common/colors_design_settings.cpp index 36ab086d97..46971c0ed7 100644 --- a/common/colors_design_settings.cpp +++ b/common/colors_design_settings.cpp @@ -181,28 +181,21 @@ void COLORS_DESIGN_SETTINGS::setupConfigParams() switch( m_frameType ) { - case FRAME_PCB: break; // no prefix - - case FRAME_PCB_MODULE_EDITOR: - SetConfigPrefix( "ModEdit" ); - break; + case FRAME_GERBER: + case FRAME_PCB: /* no prefix */ break; + case FRAME_CVPCB_DISPLAY: case FRAME_PCB_MODULE_VIEWER: case FRAME_PCB_MODULE_VIEWER_MODAL: case FRAME_PCB_FOOTPRINT_WIZARD: case FRAME_PCB_FOOTPRINT_PREVIEW: - SetConfigPrefix( "fpview_" ); - break; + case FRAME_PCB_MODULE_EDITOR: SetConfigPrefix( "ModEdit" ); break; - case FRAME_PCB_DISPLAY3D: - SetConfigPrefix( "fp3d_" ); - break; + case FRAME_PCB_DISPLAY3D: SetConfigPrefix( "fp3d_" ); break; - default: - break; + default: break; } - wxString fmt( "Color4DPCBLayer_%s" ); for( int i = 0; i < PCB_LAYER_ID_COUNT; ++i ) diff --git a/pcbnew/footprint_preview_panel.cpp b/pcbnew/footprint_preview_panel.cpp index d2f01b4235..9b924101db 100644 --- a/pcbnew/footprint_preview_panel.cpp +++ b/pcbnew/footprint_preview_panel.cpp @@ -21,7 +21,7 @@ #include #include - +#include #include #include #include @@ -261,6 +261,7 @@ FOOTPRINT_PREVIEW_PANEL::FOOTPRINT_PREVIEW_PANEL( KIWAY* aKiway, wxWindow* aPare m_dummyBoard = std::make_unique(); m_colorsSettings = std::make_unique( FRAME_PCB_FOOTPRINT_PREVIEW ); + m_colorsSettings->Load( Kiface().KifaceSettings() ); UseColorScheme( m_colorsSettings.get() ); SyncLayersVisibility( &*m_dummyBoard );