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

Support printing of kicad_dru files.

This commit is contained in:
Jeff Young 2021-10-15 12:43:38 +01:00
parent 8a8775bed8
commit 1f19c41c29
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
common/gestfich.cpp
View File

@ -228,7 +228,6 @@ void OpenFile( const wxString& file )
bool doPrintFile( const wxString& file, bool aDryRun )
{
wxString ext = wxFileName( file ).GetExt();
wxString application;
#ifdef __WXMSW__
wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension( ext );
@ -253,26 +252,30 @@ bool doPrintFile( const wxString& file, bool aDryRun )
#endif
#ifdef __WXMAC__
wxString app;
if( ext == "ps" || ext == "pdf" )
application = "Preview";
app = "Preview";
else if( ext == "csv" )
application = "Numbers";
else if( ext == "txt" || ext == "rpt" || ext == "pos" || ext == "cmp" || ext == "net" )
application = "TextEdit";
app = "Numbers";
else if( ext == "txt" )
app = "TextEdit";
else if( ext == "rpt" || ext == "pos" || ext == "cmp" || ext == "net" || ext == "kicad_dru" )
app = "TextEdit";
if( !application.IsEmpty() )
if( !app.IsEmpty() )
{
// Use concatenation to avoid double-quote bug in wxWidgets 3.1.5 OSX.
wxString ascript = "osascript -e 'tell application \""
+ EscapeString( application, CTX_QUOTED_STR ) + "\"' "
+ "-e ' set srcFileRef to (open POSIX file \""
+ EscapeString( file, CTX_QUOTED_STR ) + "\")' "
+ "-e ' activate' "
+ "-e ' print srcFileRef print dialog true' "
+ "-e 'end tell' ";
if( !aDryRun )
{
wxString ascript = "osascript ";
ascript += "-e 'tell app \"" + app + "\"' ";
ascript += "-e ' set srcFileRef to (open POSIX file \"" + EscapeString( file, CTX_QUOTED_STR ) + "\")' ";
ascript += "-e ' activate' ";
ascript += "-e ' print srcFileRef print dialog true' ";
ascript += "-e 'end tell' ";
wxExecute( ascript );
}
return true;
}
@ -281,7 +284,8 @@ bool doPrintFile( const wxString& file, bool aDryRun )
#ifdef __WXGTK__
if( ext == "ps" || ext == "pdf"
|| ext == "csv"
|| ext == "txt" || ext == "rpt" || ext == "pos" || ext == "cmp" || ext == "net" )
|| ext == "txt"
|| ext == "rpt" || ext == "pos" || ext == "cmp" || ext == "net" || ext == "kicad_dru" )
{
if( !aDryRun )
{

4
common/launch_ext.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 Jon Evans <jon@craftyjon.com>
* Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@ -25,7 +25,7 @@
void LaunchExternal( const wxString& aPath )
{
#ifdef __WXMAC__
const wchar_t* args[] = { L"open", L"--args", aPath.wc_str() };
const wchar_t* args[] = { L"open", aPath.wc_str(), nullptr };
wxExecute( const_cast<wchar_t**>( args ) );
#else
wxString path( aPath );