Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Daniel Gehriger <dgehrige@dmtsun.epfl.ch> patch for default extension filter

Browse Source 
handling


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-01-24 00:52:06 +00:00
parent 9a6be59a80
commit 1f2f033145
1 changed files with 106 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
src/msw/filedlg.cpp
View File

@@ -42,9 +42,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#define wxDIALOG_DEFAULT_X 300
#define wxDIALOG_DEFAULT_Y 300
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxFileDialog, wxDialog) IMPLEMENT_CLASS(wxFileDialog, wxDialog)
#endif #endif
@@ -54,58 +51,66 @@ char *wxFileSelector(const char *title,
const char *defaultExtension, const char *filter, int flags, const char *defaultExtension, const char *filter, int flags,
wxWindow *parent, int x, int y) wxWindow *parent, int x, int y)
{ {
// In the original implementation, defaultExtension is passed to the lpstrDefExt member // In the original implementation, defaultExtension is passed to the
// of OPENFILENAME. This extension, if non-NULL, is appended to the filename if the user // lpstrDefExt member of OPENFILENAME. This extension, if non-NULL, is
// fails to type an extension. // appended to the filename if the user fails to type an extension. The new
// The new implementation (taken from wxFileSelectorEx) appends the extension automatically, // implementation (taken from wxFileSelectorEx) appends the extension
// by looking at the filter specification. In fact this should be better than the // automatically, by looking at the filter specification. In fact this
// native Microsoft implementation because Windows only allows *one* default extension, // should be better than the native Microsoft implementation because
// whereas here we do the right thing depending on the filter the user has chosen. // Windows only allows *one* default extension, whereas here we do the
// right thing depending on the filter the user has chosen.
// If there's a default extension specified but no filter, we create a suitable // If there's a default extension specified but no filter, we create a
// filter. // suitable filter.
wxString filter2(""); wxString filter2;
if ( defaultExtension && !filter ) if ( defaultExtension && !filter )
filter2 = wxString("*.") + wxString(defaultExtension) ; filter2 = wxString("*.") + defaultExtension;
else if ( filter ) else if ( filter )
filter2 = filter; filter2 = filter;
wxString defaultDirString; wxString defaultDirString;
if (defaultDir) if (defaultDir)
defaultDirString = defaultDir; defaultDirString = defaultDir;
else
defaultDirString = "";
wxString defaultFilenameString; wxString defaultFilenameString;
if (defaultFileName) if (defaultFileName)
defaultFilenameString = defaultFileName; defaultFilenameString = defaultFileName;
else
defaultFilenameString = "";
wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y)); wxFileDialog fileDialog(parent, title, defaultDirString,
if(defaultExtension) defaultFilenameString, filter2,
flags, wxPoint(x, y));
if( Strlen(defaultExtension) != 0 )
{ {
unsigned int ii; int filterFind = 1,
int filterFind,filterIndex=0; filterIndex = 0;
filterFind=1;
for(ii=0;ii<filter2.Length();ii++) for( unsigned int i = 0; i < filter2.Len(); i++ )
{ {
if(filter2[ii] == '|') if( filter2.GetChar(i) == '|' )
{ {
unsigned int is=ii++; // save the start index of the new filter
unsigned int is = i++;
filterIndex++; filterIndex++;
for(;ii<filter2.Length();ii++)
if(filter2[ii] == '|') // find the end of the filter
for( ; i < filter2.Len(); i++ )
{
if(filter2[i] == '|')
break; break;
if(ii-is-1 > 0 && is+1 < filter2.Length()) }
if(filter2.Mid(is+1,ii-is-1) == defaultExtension)
if( i-is-1 > 0 && is+1 < filter2.Len() )
{
if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) )
{ {
filterFind = filterIndex; filterFind = filterIndex;
break; break;
} }
} }
} }
}
fileDialog.SetFilterIndex(filterFind); fileDialog.SetFilterIndex(filterFind);
} }
@@ -188,10 +193,6 @@ int wxFileDialog::ShowModal(void)
*fileNameBuffer = '\0'; *fileNameBuffer = '\0';
*titleBuffer = '\0'; *titleBuffer = '\0';
char* filterBuffer = NULL;
char* extension = NULL;
char* theFilter = (char *)(const char *)m_wildCard;
long msw_flags = 0; long msw_flags = 0;
if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) ) if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) )
msw_flags |= OFN_HIDEREADONLY; msw_flags |= OFN_HIDEREADONLY;
@@ -235,37 +236,24 @@ int wxFileDialog::ShowModal(void)
*/ */
//======================================================================= //=======================================================================
if ( !theFilter || (strcmp(theFilter, "") == 0)) theFilter = "*.*"; wxString theFilter = ( Strlen(m_wildCard) == 0 ) ? "*.*" : m_wildCard;
wxString filterBuffer;
int filterBufferLen = 0; if ( !strchr( theFilter, '|' ) ) { // only one filter ==> default text
filterBuffer.Printf(_("Files (%s)|%s"),
if ( !strchr( theFilter, '|' ) ) { // only one filter ==> default text: theFilter.c_str(), theFilter.c_str());
char buffText[] = "Files (%s)|%s";
filterBufferLen = strlen( theFilter )*2 + strlen( buffText ) -4;
filterBuffer = new char[ filterBufferLen +2 ];
if ( filterBuffer ) {
sprintf( filterBuffer, buffText, theFilter, theFilter );
}
} }
else { // more then one filter else { // more then one filter
filterBufferLen = strlen( theFilter ); filterBuffer = theFilter;
filterBuffer = new char[ filterBufferLen +2 ];
if ( filterBuffer ) { for ( unsigned int i = 0; i < filterBuffer.Len(); i++ ) {
strcpy( filterBuffer, theFilter ); if ( filterBuffer.GetChar(i) == '|' ) {
filterBuffer[i] = '\0';
}
} }
} }
if ( filterBuffer ) { // Substituting '|' with '\0' of.lpstrFilter = (LPSTR)(const char *)filterBuffer;
for ( int i = 0; i < filterBufferLen; i++ ) {
if ( filterBuffer[i] == '|' ) { filterBuffer[i] = '\0'; }
}
}
filterBuffer[filterBufferLen+1] = '\0';
of.lpstrFilter = (LPSTR)filterBuffer;
of.nFilterIndex = m_filterIndex; of.nFilterIndex = m_filterIndex;
//=== Setting defaultFileName >>========================================= //=== Setting defaultFileName >>=========================================
@@ -278,10 +266,13 @@ int wxFileDialog::ShowModal(void)
//== Execute FileDialog >>================================================= //== Execute FileDialog >>=================================================
bool success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0) : (GetOpenFileName(&of) != 0); bool success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0)
: (GetOpenFileName(&of) != 0);
if ( success ) if ( success )
{ {
const char* extension = NULL;
//=== Adding the correct extension >>================================= //=== Adding the correct extension >>=================================
m_filterIndex = (int)of.nFilterIndex; m_filterIndex = (int)of.nFilterIndex;
@@ -305,7 +296,7 @@ int wxFileDialog::ShowModal(void)
&& extension[1] != ' ' ) // != "blabla. " && extension[1] != ' ' ) // != "blabla. "
{ {
// now concat extension to the fileName: // now concat extension to the fileName:
m_fileName = wxString(fileNameBuffer) + wxString(extension); m_fileName = wxString(fileNameBuffer) + extension;
int len = strlen( fileNameBuffer ); int len = strlen( fileNameBuffer );
strncpy( fileNameBuffer + len, extension, MAXPATH - len ); strncpy( fileNameBuffer + len, extension, MAXPATH - len );
@@ -319,50 +310,43 @@ int wxFileDialog::ShowModal(void)
//=== Simulating the wxOVERWRITE_PROMPT >>============================ //=== Simulating the wxOVERWRITE_PROMPT >>============================
if ( (m_dialogStyle & wxOVERWRITE_PROMPT) && ::wxFileExists( fileNameBuffer ) ) if ( (m_dialogStyle & wxOVERWRITE_PROMPT) &&
::wxFileExists( fileNameBuffer ) )
{ {
char questionText[] = "Replace file\n%s?"; wxString messageText;
char* messageText = new char[strlen(questionText)+strlen(fileNameBuffer)-1]; messageText.Printf(_("Replace file '%s'?"), fileNameBuffer);
sprintf( messageText, questionText, fileNameBuffer );
if ( messageText && ( wxMessageBox( (const char *)messageText, m_message, wxYES_NO ) != wxYES ) ) if ( wxMessageBox(messageText, m_message, wxYES_NO ) != wxYES )
{ {
success = FALSE; success = FALSE;
} }
delete[] messageText;
} }
} // END: if ( success ) } // END: if ( success )
delete[] filterBuffer;
return (success ? wxID_OK : wxID_CANCEL) ; return (success ? wxID_OK : wxID_CANCEL) ;
} }
#define wxDIALOG_DEFAULT_X 300
#define wxDIALOG_DEFAULT_Y 300
// Generic file load/save dialog // Generic file load/save dialog
// static inline char * // HP compiler complains
static char * static char *
wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent) wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
{ {
char *ext = (char *)extension;
char prompt[50]; wxString prompt;
wxString str; wxString str;
if (load) if (load)
str = "Load %s file"; str = _("Load %s file");
else else
str = "Save %s file"; str = _("Save %s file");
sprintf(prompt, wxGetTranslation(str), what); prompt.Printf(str, what);
if (*ext == '.') ext++; const char *ext = extension;
char wild[60]; if (*ext == '.')
sprintf(wild, "*.%s", ext); ext++;
wxString wild;
wild.Printf("*.%s", ext);
return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent); return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
} }