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

Partially reverts d877f041 

Based on discussion in https://gitlab.com/kicad/code/kicad/-/merge_requests/1029
we will keep the original behavior.  The new routines to get stock paths
are still useful (possibly in scripting) and are kept
This commit is contained in:
Seth Hillbrand 2021-12-06 16:14:36 -08:00
parent 73b39e836d
commit 84cdc9701f
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eeschema/dialogs/panel_sym_lib_table.cpp
View File

@ -218,6 +218,9 @@ PANEL_SYM_LIB_TABLE::PANEL_SYM_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, P
EESCHEMA_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>(); EESCHEMA_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>();
if( cfg->m_lastSymbolLibDir.IsEmpty() )
cfg->m_lastSymbolLibDir = PATHS::GetDefaultUserSymbolsPath();
m_lastProjectLibDir = m_project->GetProjectPath(); m_lastProjectLibDir = m_project->GetProjectPath();
auto setupGrid = auto setupGrid =

3
eeschema/eeschema_settings.cpp
View File

@ -29,7 +29,6 @@
#include <symbol_editor_settings.h> #include <symbol_editor_settings.h>
#include <macros.h> #include <macros.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <paths.h>
#include <settings/common_settings.h> #include <settings/common_settings.h>
#include <settings/json_settings_internals.h> #include <settings/json_settings_internals.h>
#include <settings/parameters.h> #include <settings/parameters.h>
@ -399,7 +398,7 @@ EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() :
&m_LibViewPanel.show_pin_electrical_type, true ) ); &m_LibViewPanel.show_pin_electrical_type, true ) );
m_params.emplace_back( new PARAM<wxString>( "system.last_symbol_lib_dir", m_params.emplace_back( new PARAM<wxString>( "system.last_symbol_lib_dir",
&m_lastSymbolLibDir, PATHS::GetStockSymbolsPath() ) ); &m_lastSymbolLibDir, "" ) );
// Migrations // Migrations

3
pcbnew/dialogs/panel_fp_lib_table.cpp
View File

@ -377,6 +377,9 @@ PANEL_FP_LIB_TABLE::PANEL_FP_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent,
*/ */
PCBNEW_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>(); PCBNEW_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>();
if( cfg->m_lastFootprintLibDir.IsEmpty() )
cfg->m_lastFootprintLibDir = PATHS::GetDefaultUserFootprintsPath();
m_lastProjectLibDir = m_projectBasePath; m_lastProjectLibDir = m_projectBasePath;
auto setupGrid = auto setupGrid =

5
pcbnew/pcbnew_settings.cpp
View File

@ -28,7 +28,6 @@
#include <layer_ids.h> #include <layer_ids.h>
#include <pcbnew_settings.h> #include <pcbnew_settings.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <paths.h>
#include <router/pns_routing_settings.h> #include <router/pns_routing_settings.h>
#include <settings/common_settings.h> #include <settings/common_settings.h>
#include <settings/nested_settings.h> #include <settings/nested_settings.h>
@ -512,10 +511,10 @@ PCBNEW_SETTINGS::PCBNEW_SETTINGS()
addParamsForWindow( &m_FootprintWizard, "footprint_wizard" ); addParamsForWindow( &m_FootprintWizard, "footprint_wizard" );
m_params.emplace_back( new PARAM<wxString>( "system.last_footprint_lib_dir", m_params.emplace_back( new PARAM<wxString>( "system.last_footprint_lib_dir",
&m_lastFootprintLibDir, PATHS::GetStockFootprintsPath() ) ); &m_lastFootprintLibDir, "" ) );
m_params.emplace_back( new PARAM<wxString>( "system.last_footprint3d_dir", m_params.emplace_back( new PARAM<wxString>( "system.last_footprint3d_dir",
&m_lastFootprint3dDir, PATHS::GetStock3dmodelsPath() ) ); &m_lastFootprint3dDir, "" ) );
registerMigration( 0, 1, registerMigration( 0, 1,
[&]() [&]()