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

Remove string translation wrappers used in commit 94891b75. 

Translating internal file name and path strings will almost certainly
result in a bug on MacOS.
This commit is contained in:
Wayne Stambaugh 2018-06-18 12:14:10 -04:00
parent ba3f2b30ee
commit 52734058a7
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/dialogs/dialog_export_step.cpp
View File

@ -249,17 +249,19 @@ void DIALOG_EXPORT_STEP::onExportButton( wxCommandEvent& aEvent )
double yOrg = 0.0; double yOrg = 0.0;
wxFileName appK2S( wxStandardPaths::Get().GetExecutablePath() ); wxFileName appK2S( wxStandardPaths::Get().GetExecutablePath() );
#ifdef __WXMAC__
#ifdef __WXMAC__
// On macOS, we have standalone applications inside the main bundle, so we handle that here: // On macOS, we have standalone applications inside the main bundle, so we handle that here:
if( appK2S.GetPath().find( _("/Contents/Applications/pcbnew.app/Contents/MacOS") ) != wxNOT_FOUND ) if( appK2S.GetPath().find( "/Contents/Applications/pcbnew.app/Contents/MacOS" ) != wxNOT_FOUND )
{ {
appK2S.AppendDir( _("..")); appK2S.AppendDir( ".." );
appK2S.AppendDir( _("..")); appK2S.AppendDir( ".." );
appK2S.AppendDir( _("..")); appK2S.AppendDir( ".." );
appK2S.AppendDir( _("..")); appK2S.AppendDir( ".." );
appK2S.AppendDir( _("MacOS")); e appK2S.AppendDir( "MacOS" );
} }
#endif #endif
appK2S.SetName( "kicad2step" ); appK2S.SetName( "kicad2step" );
wxString cmdK2S = "\""; wxString cmdK2S = "\"";

9
pcbnew/pcb_edit_frame.cpp
View File

@ -517,14 +517,17 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
// disable Export STEP item if kicad2step does not exist // disable Export STEP item if kicad2step does not exist
wxString strK2S = Pgm().GetExecutablePath(); wxString strK2S = Pgm().GetExecutablePath();
#ifdef __WXMAC__
if (strK2S.find( _("pcbnew.app") ) != wxNOT_FOUND ) #ifdef __WXMAC__
if (strK2S.find( "pcbnew.app" ) != wxNOT_FOUND )
{ {
// On macOS, we have standalone applications inside the main bundle, so we handle that here: // On macOS, we have standalone applications inside the main bundle, so we handle that here:
strK2S += "../../"; strK2S += "../../";
} }
strK2S += "Contents/MacOS/"; strK2S += "Contents/MacOS/";
#endif #endif
wxFileName appK2S( strK2S, "kicad2step" ); wxFileName appK2S( strK2S, "kicad2step" );
#ifdef _WIN32 #ifdef _WIN32