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

wildcard strings update 

Replace a few other cases where we used Windows-only or *nix specific
wildcard strings
This commit is contained in:
Seth Hillbrand 2019-01-05 20:23:13 -08:00
parent 02a1bf1de6
commit 3b54a44540
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp
View File

@ -111,7 +111,7 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana
if( !filter.empty() ) if( !filter.empty() )
m_FileTree->SetFilter( filter ); m_FileTree->SetFilter( filter );
else else
m_FileTree->SetFilter( wxT( "*.*" ) ); m_FileTree->SetFilter( wxFileSelectorDefaultWildcardStr );
if( prevModelWildcard >= 0 && prevModelWildcard < (int)fl->size() ) if( prevModelWildcard >= 0 && prevModelWildcard < (int)fl->size() )
m_FileTree->SetFilterIndex( prevModelWildcard ); m_FileTree->SetFilterIndex( prevModelWildcard );
@ -123,7 +123,7 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana
} }
else else
{ {
m_FileTree->SetFilter( wxT( "*.*" ) ); m_FileTree->SetFilter( wxFileSelectorDefaultWildcardStr );
prevModelWildcard = 0; prevModelWildcard = 0;
m_FileTree->SetFilterIndex( 0 ); m_FileTree->SetFilterIndex( 0 );
} }

5
eeschema/dialogs/dialog_bom.cpp
View File

@ -354,7 +354,7 @@ void DIALOG_BOM::installPluginsList()
pluginPath.AssignDir( dir.GetName() ); pluginPath.AssignDir( dir.GetName() );
wxString fileName; wxString fileName;
bool cont = dir.GetFirst( &fileName, "*", wxDIR_FILES ); bool cont = dir.GetFirst( &fileName, wxFileSelectorDefaultWildcardStr, wxDIR_FILES );
while( cont ) while( cont )
{ {
@ -546,7 +546,8 @@ wxString DIALOG_BOM::choosePlugin()
} }
wxString fullFileName = EDA_FILE_SELECTOR( _( "Plugin files:" ), lastPath, wxEmptyString, wxString fullFileName = EDA_FILE_SELECTOR( _( "Plugin files:" ), lastPath, wxEmptyString,
wxEmptyString, "*", this, wxFD_OPEN, true ); wxEmptyString, wxFileSelectorDefaultWildcardStr,
this, wxFD_OPEN, true );
return fullFileName; return fullFileName;
} }

5
eeschema/dialogs/dialog_netlist.cpp
View File

@ -834,9 +834,8 @@ void NETLIST_DIALOG_ADD_PLUGIN::OnOKClick( wxCommandEvent& event )
void NETLIST_DIALOG_ADD_PLUGIN::OnBrowsePlugins( wxCommandEvent& event ) void NETLIST_DIALOG_ADD_PLUGIN::OnBrowsePlugins( wxCommandEvent& event )
{ {
wxString FullFileName, Mask, Path; wxString FullFileName, Path;
Mask = wxT( "*" );
#ifndef __WXMAC__ #ifndef __WXMAC__
Path = Pgm().GetExecutablePath(); Path = Pgm().GetExecutablePath();
#else #else
@ -846,7 +845,7 @@ void NETLIST_DIALOG_ADD_PLUGIN::OnBrowsePlugins( wxCommandEvent& event )
Path, Path,
FullFileName, FullFileName,
wxEmptyString, wxEmptyString,
Mask, wxFileSelectorDefaultWildcardStr,
this, this,
wxFD_OPEN, wxFD_OPEN,
true true

2
kicad/files-io.cpp
View File

@ -86,7 +86,7 @@ void KICAD_MANAGER_FRAME::OnUnarchiveFiles( wxCommandEvent& event )
zipfilesys.ChangePathTo( zipfiledlg.GetPath() + wxT( "#zip:" ), true ); zipfilesys.ChangePathTo( zipfiledlg.GetPath() + wxT( "#zip:" ), true );
wxFSFile* zipfile = NULL; wxFSFile* zipfile = NULL;
wxString localfilename = zipfilesys.FindFirst( wxT( "*.*" ) ); wxString localfilename = zipfilesys.FindFirst( wxFileSelectorDefaultWildcardStr );
while( !localfilename.IsEmpty() ) while( !localfilename.IsEmpty() )
{ {

2
pcbnew/microwave.cpp
View File

@ -497,7 +497,7 @@ void MWAVE_POLYGONAL_SHAPE_DLG::OnOkClick( wxCommandEvent& event )
void MWAVE_POLYGONAL_SHAPE_DLG::ReadDataShapeDescr( wxCommandEvent& event ) void MWAVE_POLYGONAL_SHAPE_DLG::ReadDataShapeDescr( wxCommandEvent& event )
{ {
static wxString lastpath; // To remember the last open path during a session static wxString lastpath; // To remember the last open path during a session
wxString mask = wxT( "*.*" ); wxString mask = wxFileSelectorDefaultWildcardStr;
wxString FullFileName = EDA_FILE_SELECTOR( _( "Read descr shape file" ), wxString FullFileName = EDA_FILE_SELECTOR( _( "Read descr shape file" ),
lastpath, FullFileName, lastpath, FullFileName,