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

Cleaned up the OpenPDF function, including removing workaround code added in commit 1085 that is no longer required. Added Quotes around the pdf program if a custom one is used in case there are spaces in the file name

This commit is contained in:
Simon Wells 2015-12-31 22:03:47 +13:00
parent 2016e92132
commit c3589b5558
1 changed files with 17 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
common/gestfich.cpp
View File

@ -44,17 +44,11 @@
void AddDelimiterString( wxString& string ) void AddDelimiterString( wxString& string )
{ {
wxString text; if ( string.length() > 0 && !string.StartsWith( wxT( "\"" ) ) )
{
if( !string.StartsWith( wxT( "\"" ) ) ) string.Prepend( "\"" );
text = wxT( "\"" ); string.Append( "\"" );
}
text += string;
if( (text.Last() != '"' ) || (text.length() <= 1) )
text += wxT( "\"" );
string = text;
} }
@ -347,90 +341,34 @@ wxString KicadDatasPath()
} }
bool OpenPDF( const wxString& file ) bool OpenPDF( const wxString& filename )
{ {
wxString command; wxString command;
wxString filename = file;
wxString type;
bool success = false;
Pgm().ReadPdfBrowserInfos(); Pgm().ReadPdfBrowserInfos();
if( !Pgm().UseSystemPdfBrowser() ) // Run the preferred PDF Browser if( !Pgm().UseSystemPdfBrowser() ) // Run the preferred PDF Browser
{ {
AddDelimiterString( filename ); AddDelimiterString( filename );
command = Pgm().GetPdfBrowserName() + wxT( " " ) + filename; command = AddDelimiterString( Pgm().GetPdfBrowserName() ) + wxT( " " ) + filename;
} }
else else
{ {
wxFileType* filetype = NULL; wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension( wxT( "pdf" ) );
wxFileType::MessageParameters params( filename, type ); command = filetype->GetOpenCommand( filename );
filetype = wxTheMimeTypesManager->GetFileTypeFromExtension( wxT( "pdf" ) );
if( filetype )
success = filetype->GetOpenCommand( &command, params );
delete filetype; delete filetype;
#ifndef __WINDOWS__
// Bug ? under linux wxWidgets returns acroread as PDF viewer, even if
// it does not exist.
if( command.StartsWith( wxT( "acroread" ) ) ) // Workaround
success = false;
#endif
if( success && !command.IsEmpty() )
{
success = ProcessExecute( command );
if( success )
return success;
}
success = false;
command.clear();
if( !success )
{
#if !defined(__WINDOWS__)
AddDelimiterString( filename );
// here is a list of PDF viewers candidates
static const wxChar* tries[] =
{
wxT( "/usr/bin/evince" ),
wxT( "/usr/bin/okular" ),
wxT( "/usr/bin/gpdf" ),
wxT( "/usr/bin/konqueror" ),
wxT( "/usr/bin/kpdf" ),
wxT( "/usr/bin/xpdf" ),
wxT( "/usr/bin/open" ), // BSD and OSX file & dir opener
wxT( "/usr/bin/xdg-open" ), // Freedesktop file & dir opener
};
for( unsigned ii = 0; ii<DIM(tries); ii++ )
{
if( wxFileExists( tries[ii] ) )
{
command = tries[ii];
command += wxT( ' ' );
command += filename;
break;
}
}
#endif
}
} }
if( !command.IsEmpty() ) if ( !command.IsEmpty() )
{ {
success = ProcessExecute( command ); if ( ProcessExecute( command ) )
{
if( !success ) return true;
}
else
{ {
wxString msg; wxString msg;
msg.Printf( _( "Problem while running the PDF viewer\nCommand is '%s'" ), msg.Printf( _( "Problem while running the PDF viewer\n Command is '%s'" ),
GetChars( command ) ); GetChars( command ) );
DisplayError( NULL, msg ); DisplayError( NULL, msg );
} }
@ -440,10 +378,9 @@ bool OpenPDF( const wxString& file )
wxString msg; wxString msg;
msg.Printf( _( "Unable to find a PDF viewer for <%s>" ), GetChars( filename ) ); msg.Printf( _( "Unable to find a PDF viewer for <%s>" ), GetChars( filename ) );
DisplayError( NULL, msg ); DisplayError( NULL, msg );
success = false;
} }
return success; return false;
} }