Commit 742ee532 authored by Brian Sidebotham's avatar Brian Sidebotham

* Fix Project templates location under Linux, preserve Windows location

parents d68940c4 775ce399
...@@ -85,13 +85,24 @@ void KICAD_MANAGER_FRAME::CreateNewProject( const wxString aPrjFullFileName, ...@@ -85,13 +85,24 @@ void KICAD_MANAGER_FRAME::CreateNewProject( const wxString aPrjFullFileName,
if( !envStr.EndsWith( sep ) ) if( !envStr.EndsWith( sep ) )
envStr += sep; envStr += sep;
templatePath = envStr + wxT("template") + sep; templatePath = envStr + wxT( "template" ) + sep;
} }
else else
{ {
templatePath = wxPathOnly(wxStandardPaths::Get().GetExecutablePath()) + // The standard path should be in the share directory for kicad. As
// it is normal on Windows to only have the share directory and not
// the kicad sub-directory we fall back to that if the directory
// doesn't exist
templatePath = wxPathOnly( wxStandardPaths::Get().GetExecutablePath() ) +
sep + wxT( ".." ) + sep + wxT( "share" ) + sep + wxT( "kicad" ) +
sep + wxT( "template" ) + sep;
if( !wxDirExists( templatePath.GetFullPath() ) )
{
templatePath = wxPathOnly( wxStandardPaths::Get().GetExecutablePath() ) +
sep + wxT( ".." ) + sep + wxT( "share" ) + sep + wxT( "template" ) + sep; sep + wxT( ".." ) + sep + wxT( "share" ) + sep + wxT( "template" ) + sep;
} }
}
ps->AddPage( _( "System Templates" ), templatePath ); ps->AddPage( _( "System Templates" ), templatePath );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment