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

Launch correct default system PDF viewer on Linux. 

The is a bug in the wxMimeTypeManager object that sets the wrong default
PDF viewer on Linux.  Using wxLaunchDefaultApplication resolves the issue.

Remove angle brackets <> from error message as this causes issues with
controls that interpret HTML text.

Remove GetChars() from string formatting functions since it is not
required with wxWidgets 3 or greater.
This commit is contained in:
Fabrizio Tappero 2017-06-07 12:41:04 -04:00 committed by Wayne Stambaugh
parent 32abc273d0
commit 1a30b4fb05
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/gestfich.cpp
View File

@ -2,8 +2,8 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2008-2011 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2008-2017 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -347,21 +347,22 @@ bool OpenPDF( const wxString& file )
wxString command; wxString command;
wxString filename = file; wxString filename = file;
// Quote in case there are spaces in the file name.
AddDelimiterString( filename );
Pgm().ReadPdfBrowserInfos(); Pgm().ReadPdfBrowserInfos();
if( !Pgm().UseSystemPdfBrowser() ) // Run the preferred PDF Browser if( !Pgm().UseSystemPdfBrowser() ) // Run the preferred PDF Browser
{ {
AddDelimiterString( filename );
command = Pgm().GetPdfBrowserName() + wxT( " " ) + filename; command = Pgm().GetPdfBrowserName() + wxT( " " ) + filename;
} }
else else
{ {
wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension( wxT( "pdf" ) ); if( wxLaunchDefaultApplication( file ) )
return true;
if( filetype ) // If launching the system default PDF viewer fails, fall through with empty command
command = filetype->GetOpenCommand( filename ); // string so the error message is displayed.
delete filetype;
} }
if( !command.IsEmpty() ) if( !command.IsEmpty() )
@ -373,15 +374,14 @@ bool OpenPDF( const wxString& file )
else else
{ {
wxString msg; wxString msg;
msg.Printf( _( "Problem while running the PDF viewer\nCommand is '%s'" ), msg.Printf( _( "Problem while running the PDF viewer\nCommand is '%s'" ), command );
GetChars( command ) );
DisplayError( NULL, msg ); DisplayError( NULL, msg );
} }
} }
else else
{ {
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'" ), file );
DisplayError( NULL, msg ); DisplayError( NULL, msg );
} }