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

Kicad: fix 2 issues when a project path or a file has spaces in name.

This commit is contained in:
jean-pierre charras 2011-01-30 16:16:11 +01:00
parent bf5c8f55e1
commit 50706777e7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kicad/files-io.cpp
View File

@ -18,6 +18,7 @@
#include "bitmaps.h" #include "bitmaps.h"
#include "confirm.h" #include "confirm.h"
#include "gestfich.h" #include "gestfich.h"
#include "macros.h"
#include "kicad.h" #include "kicad.h"
#include "prjconfig.h" #include "prjconfig.h"
@ -168,7 +169,8 @@ void WinEDA_MainFrame::OnArchiveFiles( wxCommandEvent& event )
if( ExecuteFile( this, ZIPPER, cmd ) >= 0 ) if( ExecuteFile( this, ZIPPER, cmd ) >= 0 )
{ {
wxString msg; wxString msg;
msg.Printf( _("\nCreate Zip Archive <%s>" ), zip.GetFullName().GetData() ); wxString filename = QuoteFullPath(zip);
msg.Printf( _("\nZip archive <%s> created" ), GetChars( filename ) );
PrintMsg( msg ); PrintMsg( msg );
PrintMsg( wxT( "\n** end **\n" ) ); PrintMsg( wxT( "\n** end **\n" ) );
} }

9
kicad/mainframe.cpp
View File

@ -207,9 +207,10 @@ void WinEDA_MainFrame::OnRunEeschema( wxCommandEvent& event )
void WinEDA_MainFrame::OnRunGerbview( wxCommandEvent& event ) void WinEDA_MainFrame::OnRunGerbview( wxCommandEvent& event )
{ {
wxFileName fn( m_ProjectFileName ); wxFileName fn( m_ProjectFileName );
wxString path = wxT("\"");
path += fn.GetPath( wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME ) + wxT("\"");
ExecuteFile( this, GERBVIEW_EXE, ExecuteFile( this, GERBVIEW_EXE, path );
fn.GetPath( wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME ) );
} }
@ -238,8 +239,10 @@ void WinEDA_MainFrame::OnOpenFileInTextEditor( wxCommandEvent& event )
if( dlg.ShowModal() == wxID_CANCEL ) if( dlg.ShowModal() == wxID_CANCEL )
return; return;
wxString filename = wxT("\"");
filename += dlg.GetPath() + wxT("\"");
if( !dlg.GetPath().IsEmpty() && !wxGetApp().GetEditorName().IsEmpty() ) if( !dlg.GetPath().IsEmpty() && !wxGetApp().GetEditorName().IsEmpty() )
ExecuteFile( this, wxGetApp().GetEditorName(), dlg.GetPath() ); ExecuteFile( this, wxGetApp().GetEditorName(), filename );
} }