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

* Fix Project templates location under Linux, preserve Windows location

This commit is contained in:
Brian Sidebotham 2014-02-07 18:19:53 +00:00
parent d68940c4d2 775ce3993c
commit 742ee5320e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kicad/prjconfig.cpp
View File

@ -85,12 +85,23 @@ 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 );