X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b8985048a57c65d6415dd7c3d6193b3bfaaacdc0..7b70a3257f24daa4d574afd03c82e65631af1f2b:/src/generic/filedlgg.cpp?ds=sidebyside diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index efc8f3e290..6f301a8f23 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -9,15 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "filedlgg.h" #endif @@ -31,7 +23,7 @@ #if wxUSE_FILEDLG // NOTE : it probably also supports MAC, untested -#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) +#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) #error wxGenericFileDialog currently only supports Unix, win32 and DOS #endif @@ -71,6 +63,11 @@ #endif #endif +#ifdef __WINDOWS__ + #include "wx/msw/wrapwin.h" + #include "wx/msw/mslu.h" +#endif + #ifdef __WATCOMC__ #include #endif @@ -85,7 +82,7 @@ // ---------------------------------------------------------------------------- static -int wxFileDataNameCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long data) { wxFileData *fd1 = (wxFileData*)data1; wxFileData *fd2 = (wxFileData*)data2; @@ -97,7 +94,7 @@ int wxFileDataNameCompare( long data1, long data2, long data) } static -int wxFileDataSizeCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataSizeCompare( long data1, long data2, long data) { wxFileData *fd1 = (wxFileData*)data1; wxFileData *fd2 = (wxFileData*)data2; @@ -111,7 +108,7 @@ int wxFileDataSizeCompare( long data1, long data2, long data) } static -int wxFileDataTypeCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataTypeCompare( long data1, long data2, long data) { wxFileData *fd1 = (wxFileData*)data1; wxFileData *fd2 = (wxFileData*)data2; @@ -121,11 +118,11 @@ int wxFileDataTypeCompare( long data1, long data2, long data) if (fd2->IsDir() && !fd1->IsDir()) return data; if (fd1->IsLink() && !fd2->IsLink()) return -data; if (fd2->IsLink() && !fd1->IsLink()) return data; - return data*wxStrcmp( fd1->GetType(), fd2->GetType() ); + return data*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() ); } static -int wxFileDataTimeCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data) { wxFileData *fd1 = (wxFileData*)data1; wxFileData *fd2 = (wxFileData*)data2; @@ -134,14 +131,14 @@ int wxFileDataTimeCompare( long data1, long data2, long data) if (fd1->IsDir() && !fd2->IsDir()) return -data; if (fd2->IsDir() && !fd1->IsDir()) return data; - return fd1->GetTime().IsLaterThan(fd2->GetTime()) ? int(data) : -int(data); + return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data); } -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__OS2__) #define IsTopMostDir(dir) (dir == wxT("/")) #endif -#if defined(__DOS__) || defined(__WINDOWS__) +#if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__) #define IsTopMostDir(dir) (dir.IsEmpty()) #endif @@ -157,6 +154,17 @@ extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, w // wxFileData //----------------------------------------------------------------------------- +wxFileData::wxFileData( const wxFileData& fileData ) +{ + m_fileName = fileData.GetFileName(); + m_filePath = fileData.GetFilePath(); + m_size = fileData.GetSize(); + m_dateTime = fileData.GetDateTime(); + m_permissions = fileData.GetPermissions(); + m_type = fileData.GetType(); + m_image = GetImageId(); +} + wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id ) { m_fileName = fileName; @@ -164,15 +172,20 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file m_type = type; m_image = image_id; + ReadData(); +} + +void wxFileData::ReadData() +{ if (IsDrive()) { m_size = 0; return; } -#if defined(__DOS__) || defined(__WINDOWS__) +#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) // c:\.. is a drive don't stat it - if ((fileName == wxT("..")) && (filePath.length() <= 5)) + if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5)) { m_type = is_drive; m_size = 0; @@ -182,7 +195,7 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file wxStructStat buff; -#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS)) +#if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS)) lstat( m_filePath.fn_str(), &buff ); m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0; #else // no lstat() @@ -217,7 +230,7 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'), buff.st_mode & wxS_IXOTH ? _T('x') : _T('-')); #elif defined(__WIN32__) - DWORD attribs = GetFileAttributes(filePath); + DWORD attribs = GetFileAttributes(m_filePath); if (attribs != (DWORD)-1) { m_permissions.Printf(_T("%c%c%c%c"), @@ -229,7 +242,7 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file #endif } -wxString wxFileData::GetType() const +wxString wxFileData::GetFileType() const { if (IsDir()) return _(""); @@ -290,7 +303,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const break; case FileList_Type: - s = GetType(); + s = GetFileType(); break; case FileList_Time: @@ -330,8 +343,9 @@ void wxFileData::MakeItem( wxListItem &item ) if (IsLink()) { - wxColour *dg = wxTheColourDatabase->FindColour( _T("MEDIUM GREY") ); - item.SetTextColour(*dg); + wxColour dg = wxTheColourDatabase->Find( _T("MEDIUM GREY") ); + if ( dg.Ok() ) + item.SetTextColour(dg); } item.m_data = (long)this; } @@ -449,6 +463,23 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item ) return ret; } +void wxFileCtrl::UpdateItem(const wxListItem &item) +{ + wxFileData *fd = (wxFileData*)GetItemData(item); + wxCHECK_RET(fd, wxT("invalid filedata")); + + fd->ReadData(); + + SetItemText(item, fd->GetFileName()); + SetItemImage(item, fd->GetImageId(), fd->GetImageId()); + + if (GetWindowStyleFlag() & wxLC_REPORT) + { + for (int i = 1; i < wxFileData::FileList_Max; i++) + SetItem( item.m_itemId, i, fd->GetEntry((wxFileData::fileListFieldType)i) ); + } +} + void wxFileCtrl::UpdateFiles() { // don't do anything before ShowModal() call which sets m_dirName @@ -460,12 +491,11 @@ void wxFileCtrl::UpdateFiles() FreeAllItemsData(); DeleteAllItems(); - wxFileData *fd = (wxFileData *) NULL; wxListItem item; item.m_itemId = 0; item.m_col = 0; -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__WXPM__) +#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__) if ( IsTopMostDir(m_dirName) ) { wxArrayString names, paths; @@ -474,7 +504,7 @@ void wxFileCtrl::UpdateFiles() for (n=0; nSetNewName( new_name, event.GetLabel() ); SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); + UpdateItem( event.GetItem() ); EnsureVisible( event.GetItem() ); } else @@ -784,7 +815,7 @@ wxFileCtrl::~wxFileCtrl() #define ID_ACTIVATED (wxID_FILEDLGG + 11) #define ID_CHECK (wxID_FILEDLGG + 12) -IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog,wxDialog) +IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog, wxFileDialogBase) BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog) EVT_BUTTON(ID_LIST_MODE, wxGenericFileDialog::OnList) @@ -811,9 +842,11 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, const wxString& wildCard, long style, const wxPoint& pos ) - : wxDialog( parent, -1, message, pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ) + :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos) { + wxDialog::Create( parent, -1, message, pos, wxDefaultSize, + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ); + if (wxConfig::Get(FALSE)) { wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), @@ -822,15 +855,11 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, &ms_lastShowHidden); } - m_message = message; - m_dialogStyle = style; - if (m_dialogStyle == 0) m_dialogStyle = wxOPEN; if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN)) m_dialogStyle |= wxOPEN; - m_dir = defaultDir; if ((m_dir.empty()) || (m_dir == wxT("."))) { m_dir = wxGetCwd(); @@ -843,34 +872,14 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, m_path = m_dir; m_path += wxFILE_SEP_PATH; m_path += defaultFile; - m_fileName = defaultFile; - m_wildCard = wildCard; - m_filterIndex = 0; m_filterExtension = wxEmptyString; // interpret wildcards - - if (m_wildCard.IsEmpty()) - m_wildCard = _("All files (*)|*"); - - wxStringTokenizer tokens( m_wildCard, wxT("|") ); - wxString firstWild; - wxString firstWildText; - if (tokens.CountTokens() == 1) - { - firstWildText = tokens.GetNextToken(); - firstWild = firstWildText; - } - else + wxArrayString wildDescriptions, wildFilters; + if ( !ParseWildcard(m_wildCard, wildDescriptions, wildFilters) ) { - wxASSERT_MSG( tokens.CountTokens() % 2 == 0, wxT("Wrong file type descripition") ); - firstWildText = tokens.GetNextToken(); - firstWild = tokens.GetNextToken(); + wxFAIL_MSG( wxT("Wrong file type description") ); } - if ( firstWild.Left( 2 ) == wxT("*.") ) - m_filterExtension = firstWild.Mid( 1 ); - if ( m_filterExtension == wxT(".*") ) - m_filterExtension = wxEmptyString; // layout @@ -940,7 +949,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, style2 |= wxLC_SINGLE_SEL; m_list = new wxFileCtrl( this, ID_LIST_CTRL, - firstWild, ms_lastShowHidden, + wildFilters[0], ms_lastShowHidden, wxDefaultPosition, wxSize(540,200), style2); @@ -988,14 +997,11 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, mainsizer->Add( choicesizer, 0, wxEXPAND ); } - m_choice->Append( firstWildText, (void*) new wxString( firstWild ) ); - while (tokens.HasMoreTokens()) + for (size_t n=0; nAppend( firstWildText, (void*) new wxString( firstWild ) ); + m_choice->Append( wildDescriptions[n], (void*) new wxString( wildFilters[n] ) ); } - m_choice->SetSelection( 0 ); + SetFilterIndex( 0 ); SetAutoLayout( TRUE ); SetSizer( mainsizer ); @@ -1124,6 +1130,11 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) if (filename.IsEmpty()) return; if (filename == wxT(".")) return; + // "some/place/" means they want to chdir not try to load "place" + bool want_dir = filename.Last() == wxFILE_SEP_PATH; + if (want_dir) + filename = filename.RemoveLast(); + if (filename == wxT("..")) { m_list->GoToParentDir(); @@ -1141,13 +1152,9 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) return; } - if (filename[0u] == wxT('~')) + if (filename.BeforeFirst(wxT('/')) == wxT("~")) { - filename.Remove( 0, 1 ); - wxString tmp( wxGetUserHome() ); - tmp += wxT('/'); - tmp += filename; - filename = tmp; + filename = wxGetUserHome() + filename.Remove(0, 1); } #endif // __UNIX__ @@ -1178,6 +1185,14 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) return; } + // they really wanted a dir, but it doesn't exist + if (want_dir) + { + wxMessageBox(_("Directory doesn't exist."), _("Error"), + wxOK | wxICON_ERROR ); + return; + } + // append the default extension to the filename if it doesn't have any // // VZ: the logic of testing for !wxFileExists() only for the open file @@ -1185,13 +1200,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) // file without extension as well? if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) ) { - wxString ext; - wxSplitPath(filename, NULL, NULL, &ext); - if ( ext.empty() ) - { - // append the first extension of the filter string - filename += m_filterExtension.BeforeFirst(_T(';')); - } + filename = AppendExtension(filename, m_filterExtension); } // check that the file [doesn't] exist if necessary @@ -1200,8 +1209,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) wxFileExists( filename ) ) { wxString msg; - msg.Printf( _("File '%s' already exists, do you really want to " - "overwrite it?"), filename.c_str() ); + msg.Printf( _("File '%s' already exists, do you really want to overwrite it?"), filename.c_str() ); if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) return; @@ -1222,7 +1230,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) wxString cwd; wxSplitPath(filename, &cwd, NULL, NULL); - if ( cwd != wxGetWorkingDirectory() ) + if ( cwd != wxGetCwd() ) { wxSetWorkingDirectory(cwd); } @@ -1347,161 +1355,15 @@ void wxGenericFileDialog::UpdateControls() bool enable = !IsTopMostDir(dir); m_upDirButton->Enable(enable); -#if defined(__DOS__) || defined(__WINDOWS__) +#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) m_newDirButton->Enable(enable); -#endif // defined(__DOS__) || defined(__WINDOWS__) +#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) } #ifdef USE_GENERIC_FILEDIALOG IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog); -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -// common part of both wxFileSelectorEx() and wxFileSelector() -static wxString -DoSelectFile(const wxChar *title, - const wxChar *defaultDir, - const wxChar *defaultFileName, - const wxChar *defaultExtension, - int *indexDefaultExtension, - const wxChar *filter, - int flags, - wxWindow *parent, - int x, - int y) -{ - // the filter may be either given explicitly or created automatically from - // the default extension - wxString filterReal; - if ( filter ) - { - // the user has specified the filter explicitly, use it - filterReal = filter; - } - else if ( !wxIsEmpty(defaultExtension) ) - { - // create the filter to match the given extension - filterReal << wxT("*.") << defaultExtension; - } - - wxFileDialog fileDialog(parent, - title, - defaultDir, - defaultFileName, - filterReal, - flags, - wxPoint(x, y)); - - wxString path; - if ( fileDialog.ShowModal() == wxID_OK ) - { - path = fileDialog.GetPath(); - if ( indexDefaultExtension ) - { - *indexDefaultExtension = fileDialog.GetFilterIndex(); - } - } - - return path; -} - -wxString -wxFileSelectorEx(const wxChar *title, - const wxChar *defaultDir, - const wxChar *defaultFileName, - int *indexDefaultExtension, - const wxChar *filter, - int flags, - wxWindow *parent, - int x, - int y) -{ - return DoSelectFile(title, - defaultDir, - defaultFileName, - wxT(""), // def ext determined by index - indexDefaultExtension, - filter, - flags, - parent, - x, - y); -} - -wxString -wxFileSelector(const wxChar *title, - const wxChar *defaultDir, - const wxChar *defaultFileName, - const wxChar *defaultExtension, - const wxChar *filter, - int flags, - wxWindow *parent, - int x, - int y) -{ - return DoSelectFile(title, - defaultDir, - defaultFileName, - defaultExtension, - NULL, // not interested in filter index - filter, - flags, - parent, - x, - y); -} - -static wxString GetWildcardString(const wxChar *ext) -{ - wxString wild; - if ( ext ) - { - if ( *ext == wxT('.') ) - ext++; - - wild << _T("*.") << ext; - } - else // no extension specified - { - wild = wxFileSelectorDefaultWildcardStr; - } - - return wild; -} - -wxString wxLoadFileSelector(const wxChar *what, - const wxChar *ext, - const wxChar *nameDef, - wxWindow *parent) -{ - wxString prompt; - if ( what && *what ) - prompt = wxString::Format(_("Load %s file"), what); - else - prompt = _("Load file"); - - return wxFileSelector(prompt, NULL, nameDef, ext, - GetWildcardString(ext), 0, parent); -} - -wxString wxSaveFileSelector(const wxChar *what, - const wxChar *ext, - const wxChar *nameDef, - wxWindow *parent) -{ - wxString prompt; - if ( what && *what ) - prompt = wxString::Format(_("Save %s file"), what); - else - prompt = _("Save file"); - - return wxFileSelector(prompt, NULL, nameDef, ext, - GetWildcardString(ext), 0, parent); -} - #endif // USE_GENERIC_FILEDIALOG #endif // wxUSE_FILEDLG