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

"Show Datasheet" button: Resolve env-vars (like ${KIPRJMOD}) if appears. 

This way, the datasheets can be stored within the project dir, and referred as ${KIPRJMOD}/relative/path/to/datasheet.
This commit is contained in:
Cheng Sheng 2017-05-31 23:34:31 +02:00 committed by Wayne Stambaugh
parent 79823d573a
commit 521e18ddbd
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS.txt
View File

@ -38,6 +38,8 @@ Chris Pavlina <pavlina.chris[at]gmail-dot-com>
Simon Richter <Simon.Richter[at]hogyros-dot-de> Simon Richter <Simon.Richter[at]hogyros-dot-de>
Mario Luzeiro <mrluzeiro[at]ua-dot-pt> Mario Luzeiro <mrluzeiro[at]ua-dot-pt>
Mateusz Skowroński <skowri[at]gmail-dot-com> Mateusz Skowroński <skowri[at]gmail-dot-com>
Cheng Sheng <chengsheng[at]google-dot-com>
Google Inc.
See also CHANGELOG.txt for contributors. See also CHANGELOG.txt for contributors.

16
eeschema/dialogs/dialog_edit_component_in_schematic.cpp
View File

@ -27,6 +27,7 @@
#include <wx/tooltip.h> #include <wx/tooltip.h>
#include <wx/hyperlink.h> #include <wx/hyperlink.h>
#include <wx/url.h>
#include <fctsys.h> #include <fctsys.h>
#include <pgm_base.h> #include <pgm_base.h>
@ -51,6 +52,8 @@
#include <netlist_exporter_pspice.h> #include <netlist_exporter_pspice.h>
#endif /* KICAD_SPICE */ #endif /* KICAD_SPICE */
#include "common.h"
/** /**
* class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC * class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC
@ -554,6 +557,18 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::deleteFieldButtonHandler( wxCommandEven
m_skipCopyFromPanel = false; m_skipCopyFromPanel = false;
} }
static wxString resolveUriByEnvVars( const wxString& aUri )
{
// URL-like URI: return as is.
wxURL url( aUri );
if( url.GetError() == wxURL_NOERR )
{
return aUri;
}
// Otherwise, the path points to a local file. Resolve environment
// variables if any.
return ExpandEnvVarSubstitutions( aUri );
}
void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::showButtonHandler( wxCommandEvent& event ) void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::showButtonHandler( wxCommandEvent& event )
{ {
@ -562,6 +577,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::showButtonHandler( wxCommandEvent& even
if( fieldNdx == DATASHEET ) if( fieldNdx == DATASHEET )
{ {
wxString datasheet_uri = fieldValueTextCtrl->GetValue(); wxString datasheet_uri = fieldValueTextCtrl->GetValue();
datasheet_uri = resolveUriByEnvVars( datasheet_uri );
::wxLaunchDefaultBrowser( datasheet_uri ); ::wxLaunchDefaultBrowser( datasheet_uri );
} }
else if( fieldNdx == FOOTPRINT ) else if( fieldNdx == FOOTPRINT )