X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23254b138af4bf224b07a9c577db6208742f1c4c..457e5a40e7d49f761887208f1874cb31068a31f1:/src/generic/filedlgg.cpp diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 5312bf6dba..e0525766a1 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -1,5 +1,5 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: filedlgg.cpp +////////////////////////////////////////////////////////////////////////////// +// Name: src/generic/filedlgg.cpp // Purpose: wxGenericFileDialog // Author: Robert Roebling // Modified by: @@ -9,61 +9,55 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#ifdef __GNUG__ -#pragma implementation "filedlgg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_FILEDLG -#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) +// NOTE : it probably also supports MAC, untested +#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) #error wxGenericFileDialog currently only supports Unix, win32 and DOS #endif -#include "wx/checkbox.h" -#include "wx/textctrl.h" -#include "wx/choice.h" -#include "wx/checkbox.h" -#include "wx/stattext.h" -#include "wx/debug.h" -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/msgdlg.h" -#include "wx/sizer.h" -#include "wx/bmpbuttn.h" -#include "wx/tokenzr.h" -#include "wx/mimetype.h" -#include "wx/image.h" -#include "wx/module.h" +#ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #endif + #include "wx/hash.h" + #include "wx/intl.h" + #include "wx/settings.h" + #include "wx/log.h" + #include "wx/msgdlg.h" + #include "wx/bmpbuttn.h" + #include "wx/checkbox.h" + #include "wx/choice.h" + #include "wx/stattext.h" + #include "wx/textctrl.h" + #include "wx/sizer.h" + #include "wx/filedlg.h" // wxFD_OPEN, wxFD_SAVE... +#endif + +#include "wx/longlong.h" #include "wx/config.h" #include "wx/imaglist.h" -#include "wx/dir.h" #include "wx/artprov.h" -#include "wx/hash.h" -#include "wx/file.h" // for wxS_IXXX constants only -#include "wx/filedlg.h" // wxOPEN, wxSAVE... +#include "wx/filefn.h" +#include "wx/filectrl.h" #include "wx/generic/filedlgg.h" +#include "wx/debug.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif -#include -#include +#ifndef __WXWINCE__ + #include + #include +#endif #ifdef __UNIX__ #include @@ -73,1021 +67,145 @@ #endif #endif +#ifdef __WINDOWS__ + #include "wx/msw/mslu.h" +#endif + #ifdef __WATCOMC__ #include #endif +#ifndef __WXWINCE__ #include +#endif + #if defined(__UNIX__) || defined(__DOS__) #include #endif -// ---------------------------------------------------------------------------- -// private classes - icons list management -// ---------------------------------------------------------------------------- - -class wxFileIconEntry : public wxObject -{ -public: - wxFileIconEntry(int i) { id = i; } - - int id; -}; - - -class wxFileIconsTable -{ -public: - wxFileIconsTable(); - - int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString); - wxImageList *GetImageList() { return &m_ImageList; } - -protected: - wxImageList m_ImageList; - wxHashTable m_HashTable; -}; - -static wxFileIconsTable *g_IconsTable = NULL; - -#define FI_FOLDER 0 -#define FI_UNKNOWN 1 -#define FI_EXECUTABLE 2 - -wxFileIconsTable::wxFileIconsTable() : - m_ImageList(16, 16), - m_HashTable(wxKEY_STRING) -{ - m_HashTable.DeleteContents(TRUE); - // FI_FOLDER: - m_ImageList.Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_CMN_DIALOG)); - // FI_UNKNOWN: - m_ImageList.Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_CMN_DIALOG)); - // FI_EXECUTABLE: - if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN) - { - m_ImageList.Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, wxART_CMN_DIALOG)); - m_HashTable.Delete(_T("exe")); - m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE)); - } - /* else put into list by GetIconID - (KDE defines application/x-executable for *.exe and has nice icon) - */ -} - - - -#if wxUSE_MIMETYPE -// VS: we don't need this function w/o wxMimeTypesManager because we'll only have -// one icon and we won't resize it - -static wxBitmap CreateAntialiasedBitmap(const wxImage& img) -{ - wxImage smallimg (16, 16); - unsigned char *p1, *p2, *ps; - unsigned char mr = img.GetMaskRed(), - mg = img.GetMaskGreen(), - mb = img.GetMaskBlue(); - - unsigned x, y; - unsigned sr, sg, sb, smask; - - p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = smallimg.GetData(); - smallimg.SetMaskColour(mr, mr, mr); - - for (y = 0; y < 16; y++) - { - for (x = 0; x < 16; x++) - { - sr = sg = sb = smask = 0; - if (p1[0] != mr || p1[1] != mg || p1[2] != mb) - sr += p1[0], sg += p1[1], sb += p1[2]; - else smask++; - p1 += 3; - if (p1[0] != mr || p1[1] != mg || p1[2] != mb) - sr += p1[0], sg += p1[1], sb += p1[2]; - else smask++; - p1 += 3; - if (p2[0] != mr || p2[1] != mg || p2[2] != mb) - sr += p2[0], sg += p2[1], sb += p2[2]; - else smask++; - p2 += 3; - if (p2[0] != mr || p2[1] != mg || p2[2] != mb) - sr += p2[0], sg += p2[1], sb += p2[2]; - else smask++; - p2 += 3; - - if (smask > 2) - ps[0] = ps[1] = ps[2] = mr; - else - ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2; - ps += 3; - } - p1 += 32 * 3, p2 += 32 * 3; - } - - return wxBitmap(smallimg); -} - -// finds empty borders and return non-empty area of image: -static wxImage CutEmptyBorders(const wxImage& img) -{ - unsigned char mr = img.GetMaskRed(), - mg = img.GetMaskGreen(), - mb = img.GetMaskBlue(); - unsigned char *dt = img.GetData(), *dttmp; - unsigned w = img.GetWidth(), h = img.GetHeight(); - - unsigned top, bottom, left, right, i; - bool empt; - -#define MK_DTTMP(x,y) dttmp = dt + ((x + y * w) * 3) -#define NOEMPTY_PIX(empt) if (dttmp[0] != mr || dttmp[1] != mg || dttmp[2] != mb) {empt = FALSE; break;} - - for (empt = TRUE, top = 0; empt && top < h; top++) - { - MK_DTTMP(0, top); - for (i = 0; i < w; i++, dttmp+=3) - NOEMPTY_PIX(empt) - } - for (empt = TRUE, bottom = h-1; empt && bottom > top; bottom--) - { - MK_DTTMP(0, bottom); - for (i = 0; i < w; i++, dttmp+=3) - NOEMPTY_PIX(empt) - } - for (empt = TRUE, left = 0; empt && left < w; left++) - { - MK_DTTMP(left, 0); - for (i = 0; i < h; i++, dttmp+=3*w) - NOEMPTY_PIX(empt) - } - for (empt = TRUE, right = w-1; empt && right > left; right--) - { - MK_DTTMP(right, 0); - for (i = 0; i < h; i++, dttmp+=3*w) - NOEMPTY_PIX(empt) - } - top--, left--, bottom++, right++; - - return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1)); -} -#endif // wxUSE_MIMETYPE - - - -int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) -{ -#if wxUSE_MIMETYPE - if (!extension.IsEmpty()) - { - wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable.Get(extension); - if (entry) return (entry -> id); - } - - wxFileType *ft = (mime.IsEmpty()) ? - wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) : - wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime); - wxIcon ic; - if (ft == NULL || (!ft -> GetIcon(&ic)) || (!ic.Ok())) - { - int newid = FI_UNKNOWN; - m_HashTable.Put(extension, new wxFileIconEntry(newid)); - return newid; - } - - wxBitmap tmpBmp; - tmpBmp.CopyFromIcon(ic); - wxImage img = tmpBmp.ConvertToImage(); - - delete ft; - - int id = m_ImageList.GetImageCount(); - if (img.GetWidth() == 16 && img.GetHeight() == 16) - m_ImageList.Add(wxBitmap(img)); - else - { - if (img.GetWidth() != 32 || img.GetHeight() != 32) - m_ImageList.Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32))); - else - m_ImageList.Add(CreateAntialiasedBitmap(img)); - } - m_HashTable.Put(extension, new wxFileIconEntry(id)); - return id; - -#else // !wxUSE_MIMETYPE - - if (extension == wxT("exe")) - return FI_EXECUTABLE; - else - return FI_UNKNOWN; -#endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE -} - - - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -static -int wxFileDataNameCompare( long data1, long data2, long data) -{ - wxFileData *fd1 = (wxFileData*)data1; - wxFileData *fd2 = (wxFileData*)data2; - if (fd1->GetName() == wxT("..")) return -data; - if (fd2->GetName() == wxT("..")) return data; - if (fd1->IsDir() && !fd2->IsDir()) return -data; - if (fd2->IsDir() && !fd1->IsDir()) return data; - return data*wxStrcmp( fd1->GetName(), fd2->GetName() ); -} - -static -int wxFileDataTypeCompare( long data1, long data2, long data) -{ - wxFileData *fd1 = (wxFileData*)data1; - wxFileData *fd2 = (wxFileData*)data2; - if (fd1->GetName() == wxT("..")) return -data; - if (fd2->GetName() == wxT("..")) return data; - if (fd1->IsDir() && !fd2->IsDir()) return -data; - if (fd2->IsDir() && !fd1->IsDir()) return data; - if (fd1->IsLink() && !fd2->IsLink()) return -data; - if (fd2->IsLink() && !fd1->IsLink()) return data; - return data*(fd1->GetSize() - fd2->GetSize()); -} - -static -int wxFileDataTimeCompare( long data1, long data2, long data) -{ - wxFileData *fd1 = (wxFileData*)data1; - wxFileData *fd2 = (wxFileData*)data2; - if (fd1->GetName() == wxT("..")) return -data; - if (fd2->GetName() == wxT("..")) return data; - if (fd1->IsDir() && !fd2->IsDir()) return -data; - if (fd2->IsDir() && !fd1->IsDir()) return data; - - int val = fd1->GetYear() - fd2->GetYear(); - if (val) return data*val; - val = fd1->GetMonth() - fd2->GetMonth(); - if (val) return data*val; - val = fd1->GetDay() - fd2->GetDay(); - if (val) return data*val; - val = fd1->GetHour() - fd2->GetHour(); - if (val) return data*val; - val = fd1->GetMinute() - fd2->GetMinute(); - return data*val; -} - -#ifdef __UNIX__ +#if defined(__WXWINCE__) +#define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/")) +#elif (defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)) +#define IsTopMostDir(dir) (dir.empty()) +#else #define IsTopMostDir(dir) (dir == wxT("/")) #endif -#if defined(__DOS__) || defined(__WINDOWS__) -#define IsTopMostDir(dir) (dir.IsEmpty()) -#endif - -#if defined(__DOS__) || defined(__WINDOWS__) -extern bool wxIsDriveAvailable(const wxString& dirName); -#endif - //----------------------------------------------------------------------------- -// wxFileData +// wxGenericFileDialog //----------------------------------------------------------------------------- -wxFileData::wxFileData( const wxString &name, const wxString &fname, fileType type ) -{ - m_name = name; - m_fileName = fname; - m_type = type; - -#if defined(__DOS__) || defined(__WINDOWS__) - // VS: In case the file is root directory of a volume (e.g. "C:"), - // we don't want it stat()ed, since the drive may not be in: - if (name.length() == 2 && name[1u] == wxT(':')) - { - m_type = is_drive; - m_size = 0; - return; - } - - // This is a drive, even if MSW thinks c:\.. is a file - if ((name == wxT("..")) && (fname.length() <= 5)) - { - m_type = is_drive; - m_size = 0; - return; - } -#endif // __DOS__ || __WINDOWS__ - - wxStructStat buff; - -#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS)) - lstat( m_fileName.fn_str(), &buff ); - m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0; -#else // no lstat() - wxStat( m_fileName, &buff ); -#endif - - m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0; - m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0; - - m_size = buff.st_size; - - const struct tm * const t = localtime( &buff.st_mtime ); - m_hour = t->tm_hour; - m_minute = t->tm_min; - m_month = t->tm_mon+1; - m_day = t->tm_mday; - m_year = t->tm_year; - m_year += 1900; - - m_permissions.Printf(_T("%c%c%c"), - buff.st_mode & wxS_IRUSR ? _T('r') : _T('-'), - buff.st_mode & wxS_IWUSR ? _T('w') : _T('-'), - buff.st_mode & wxS_IXUSR ? _T('x') : _T('-')); -} - -wxString wxFileData::GetName() const -{ - return m_name; -} - -wxString wxFileData::GetFullName() const -{ - return m_fileName; -} - -bool wxFileData::IsDir() const -{ - return (m_type & is_dir) != 0; -} -bool wxFileData::IsLink() const -{ - return (m_type & is_link) != 0; -} -bool wxFileData::IsExe() const -{ - return (m_type & is_exe) != 0; -} -bool wxFileData::IsDrive() const -{ - return (m_type & is_drive) != 0; -} - -wxString wxFileData::GetHint() const -{ - wxString s = m_fileName; - s += wxT(" "); - if (IsDir()) - s += wxT(" "); - else if (IsLink()) - s += wxT(" "); - else if (IsDrive()) - { - s += wxT(" "); - return s; - } - else - { - s += LongToString( m_size ); - s += wxT(" bytes "); - } - - s += IntToString( m_day ); - s += wxT("."); - s += IntToString( m_month ); - s += wxT("."); - s += IntToString( m_year ); - s += wxT(" "); - s += IntToString( m_hour ); - s += wxT(":"); - s += IntToString( m_minute ); - s += wxT(" "); - s += m_permissions; - return s; -}; - -wxString wxFileData::GetEntry( fileListFieldType num ) const -{ - wxString s; - switch ( num ) - { - case FileList_Name: - s = m_name; - break; - - case FileList_Type: - if (IsDir()) - s = _(""); - else if (IsLink()) - s = _(""); - else if (IsDrive()) - s = _(""); - else - s.Printf(_T("%ld"), m_size); - break; - - case FileList_Date: - if (!IsDrive()) - s.Printf(_T("%02d.%02d.%d"), m_day, m_month, m_year); - break; - - case FileList_Time: - if (!IsDrive()) - s.Printf(_T("%02d:%02d"), m_hour, m_minute); - break; - -#ifdef __UNIX__ - case FileList_Perm: - s = m_permissions; - break; -#endif // __UNIX__ - - default: - wxFAIL_MSG( _T("unexpected field in wxFileData::GetEntry()") ); - } - - return s; -} - -void wxFileData::SetNewName( const wxString &name, const wxString &fname ) -{ - m_name = name; - m_fileName = fname; -} - -void wxFileData::MakeItem( wxListItem &item ) -{ - item.m_text = m_name; - item.ClearAttributes(); - if (IsExe()) - item.SetTextColour(*wxRED); - if (IsDir()) - item.SetTextColour(*wxBLUE); - - if (IsDir()) - item.m_image = FI_FOLDER; - if (IsDrive()) // FIXME - add icons for drives, see wxDirCtrl - item.m_image = FI_FOLDER; - else if (IsExe()) - item.m_image = FI_EXECUTABLE; - else if (m_name.Find(wxT('.')) != wxNOT_FOUND) - item.m_image = g_IconsTable->GetIconID(m_name.AfterLast(wxT('.'))); - else - item.m_image = FI_UNKNOWN; - - if (IsLink()) - { - wxColour *dg = wxTheColourDatabase->FindColour( _T("MEDIUM GREY") ); - item.SetTextColour(*dg); - } - item.m_data = (long)this; -} - -//----------------------------------------------------------------------------- -// wxFileCtrl -//----------------------------------------------------------------------------- +#define ID_LIST_MODE (wxID_FILEDLGG ) +#define ID_REPORT_MODE (wxID_FILEDLGG + 1) +#define ID_UP_DIR (wxID_FILEDLGG + 2) +#define ID_PARENT_DIR (wxID_FILEDLGG + 3) +#define ID_NEW_DIR (wxID_FILEDLGG + 4) +#define ID_FILE_CTRL (wxID_FILEDLGG + 5) -IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl) +IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog, wxFileDialogBase) -BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl) - EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem) - EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit) - EVT_LIST_COL_CLICK(-1, wxFileCtrl::OnListColClick) +BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog) + EVT_BUTTON(ID_LIST_MODE, wxGenericFileDialog::OnList) + EVT_BUTTON(ID_REPORT_MODE, wxGenericFileDialog::OnReport) + EVT_BUTTON(ID_UP_DIR, wxGenericFileDialog::OnUp) + EVT_BUTTON(ID_PARENT_DIR, wxGenericFileDialog::OnHome) + EVT_BUTTON(ID_NEW_DIR, wxGenericFileDialog::OnNew) + EVT_BUTTON(wxID_OK, wxGenericFileDialog::OnOk) + EVT_FILECTRL_FILEACTIVATED(ID_FILE_CTRL, wxGenericFileDialog::OnFileActivated) + + EVT_UPDATE_UI(ID_UP_DIR, wxGenericFileDialog::OnUpdateButtonsUI) +#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) + EVT_UPDATE_UI(ID_NEW_DIR, wxGenericFileDialog::OnUpdateButtonsUI) +#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) END_EVENT_TABLE() +long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST; +bool wxGenericFileDialog::ms_lastShowHidden = false; -wxFileCtrl::wxFileCtrl() -{ - m_showHidden = FALSE; - m_goToParentControl = NULL; - m_newDirControl = NULL; - m_sort_foward = 1; - m_sort_field = wxFileData::FileList_Name; -} - -wxFileCtrl::wxFileCtrl(wxWindow *win, - wxWindowID id, - const wxString& wild, - bool showHidden, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator &validator, - const wxString &name) - : wxListCtrl(win, id, pos, size, style, validator, name), - m_wild(wild) -{ - if (! g_IconsTable) - g_IconsTable = new wxFileIconsTable; - wxImageList *imageList = g_IconsTable->GetImageList(); - - SetImageList( imageList, wxIMAGE_LIST_SMALL ); - - m_goToParentControl = - m_newDirControl = NULL; - - m_showHidden = showHidden; - - m_sort_foward = 1; - m_sort_field = wxFileData::FileList_Name; - - m_dirName = wxT("*"); - - if (style & wxLC_REPORT) - ChangeToReportMode(); -} - -void wxFileCtrl::ChangeToListMode() -{ - ClearAll(); - SetSingleStyle( wxLC_LIST ); - UpdateFiles(); -} - -void wxFileCtrl::ChangeToReportMode() -{ - ClearAll(); - SetSingleStyle( wxLC_REPORT ); - - int w, h; - GetTextExtent(wxT("CCCCCCCCC"), &w, &h); - - InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, w*2 ); - InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, w ); - InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, w ); - InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, w/2 ); -#ifdef __UNIX__ - InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, (w*12)/9 ); -#endif - - UpdateFiles(); -} - -void wxFileCtrl::ChangeToIconMode() -{ - ClearAll(); - SetSingleStyle( wxLC_ICON ); - UpdateFiles(); -} - -void wxFileCtrl::ShowHidden( bool show ) -{ - m_showHidden = show; - UpdateFiles(); -} - -long wxFileCtrl::Add( wxFileData *fd, wxListItem &item ) -{ - long ret = -1; - item.m_mask = wxLIST_MASK_TEXT + wxLIST_MASK_DATA + wxLIST_MASK_IMAGE; - fd->MakeItem( item ); - long my_style = GetWindowStyleFlag(); - if (my_style & wxLC_REPORT) - { - ret = InsertItem( item ); - for (int i = 1; i < wxFileData::FileList_Max; i++) - SetItem( item.m_itemId, i, fd->GetEntry((wxFileData::fileListFieldType)i) ); - } - else if (my_style & wxLC_LIST) - { - ret = InsertItem( item ); - } - return ret; -} - -void wxFileCtrl::UpdateFiles() -{ - // don't do anything before ShowModal() call which sets m_dirName - if ( m_dirName == wxT("*") ) - return; - - wxBusyCursor bcur; // this may take a while... - - FreeAllItemsData(); - DeleteAllItems(); - - wxFileData *fd = (wxFileData *) NULL; - wxListItem item; - item.m_itemId = 0; - item.m_col = 0; - -#if defined(__DOS__) || defined(__WINDOWS__) - if ( IsTopMostDir(m_dirName) ) - { - // Pseudo-directory with all available drives listed... - for (int drive = 1; drive <= 26; drive++) - { - wxString path; - path.Printf(wxT("%c:\\"), (char)(drive + 'A' - 1)); - if ( wxIsDriveAvailable(path) ) - { - path.RemoveLast(); - fd = new wxFileData(path, path, wxFileData::is_drive); - Add(fd, item); - item.m_itemId++; - } - } - } - else -#endif - { - // Real directory... - if ( !IsTopMostDir(m_dirName) ) - { - wxString p(wxPathOnly(m_dirName)); -#ifdef __UNIX__ - if (p.IsEmpty()) p = wxT("/"); -#endif - fd = new wxFileData( wxT(".."), p, wxFileData::is_dir ); - Add(fd, item); - item.m_itemId++; - } - - wxString dirname(m_dirName); -#if defined(__DOS__) || defined(__WINDOWS__) - if (dirname.length() == 2 && dirname[1u] == wxT(':')) - dirname << wxT('\\'); -#endif - wxDir dir(dirname); - - if ( dir.IsOpened() ) - { - wxString dirPrefix(dirname); - if (dirPrefix.Last() != wxFILE_SEP_PATH) - dirPrefix += wxFILE_SEP_PATH; - - int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0; - - bool cont; - wxString f; - - // Get the directories first (not matched against wildcards): - cont = dir.GetFirst(&f, wxEmptyString, wxDIR_DIRS | hiddenFlag); - while (cont) - { - fd = new wxFileData(f, dirPrefix + f, wxFileData::is_dir); - Add(fd, item); - item.m_itemId++; - cont = dir.GetNext(&f); - } - - // Tokenize the wildcard string, so we can handle more than 1 - // search pattern in a wildcard. - wxStringTokenizer tokenWild(m_wild, wxT(";")); - while ( tokenWild.HasMoreTokens() ) - { - cont = dir.GetFirst(&f, tokenWild.GetNextToken(), - wxDIR_FILES | hiddenFlag); - while (cont) - { - fd = new wxFileData(f, dirPrefix + f, wxFileData::is_file); - Add(fd, item); - item.m_itemId++; - cont = dir.GetNext(&f); - } - } - } - } - - SortItems(m_sort_field, m_sort_foward > 0); - - // Finally, enable/disable context-dependent controls: - if ( m_goToParentControl ) - m_goToParentControl->Enable(!IsTopMostDir(m_dirName)); -#if defined(__DOS__) || defined(__WINDOWS__) - if ( m_newDirControl ) - m_newDirControl->Enable(!IsTopMostDir(m_dirName)); -#endif -} - -void wxFileCtrl::SetWild( const wxString &wild ) -{ - m_wild = wild; - UpdateFiles(); -} - -void wxFileCtrl::MakeDir() -{ - wxString new_name( _("NewName") ); - wxString path( m_dirName ); - path += wxFILE_SEP_PATH; - path += new_name; - if (wxFileExists(path)) - { - // try NewName0, NewName1 etc. - int i = 0; - do { - new_name = _("NewName"); - wxString num; - num.Printf( wxT("%d"), i ); - new_name += num; - - path = m_dirName; - path += wxFILE_SEP_PATH; - path += new_name; - i++; - } while (wxFileExists(path)); - } - - wxLogNull log; - if (!wxMkdir(path)) - { - wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - return; - } - - wxFileData *fd = new wxFileData( new_name, path, wxFileData::is_dir ); - wxListItem item; - item.m_itemId = 0; - item.m_col = 0; - long id = Add( fd, item ); - - if (id != -1) - { - SortItems(m_sort_field, m_sort_foward > 0); - id = FindItem( 0, (long)fd ); - EnsureVisible( id ); - EditLabel( id ); - } -} - -void wxFileCtrl::GoToParentDir() -{ - if (!IsTopMostDir(m_dirName)) - { - size_t len = m_dirName.Len(); - if (wxEndsWithPathSeparator(m_dirName)) - m_dirName.Remove( len-1, 1 ); - wxString fname( wxFileNameFromPath(m_dirName) ); - m_dirName = wxPathOnly( m_dirName ); -#if defined(__DOS__) || defined(__WINDOWS__) - if (!m_dirName.IsEmpty()) - { - if (m_dirName.Last() == wxT('.')) - m_dirName = wxT(""); - } -#elif defined(__UNIX__) - if (m_dirName.IsEmpty()) - m_dirName = wxT("/"); -#endif - UpdateFiles(); - long id = FindItem( 0, fname ); - if (id != -1) - { - SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - EnsureVisible( id ); - } - } -} - -void wxFileCtrl::GoToHomeDir() -{ - wxString s = wxGetUserHome( wxString() ); - GoToDir(s); -} - -void wxFileCtrl::GoToDir( const wxString &dir ) -{ - m_dirName = dir; - UpdateFiles(); - SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - EnsureVisible( 0 ); -} - -void wxFileCtrl::GetDir( wxString &dir ) -{ - dir = m_dirName; -} - -void wxFileCtrl::FreeItemData(const wxListItem& item) +void wxGenericFileDialog::Init() { - wxFileData *fd = (wxFileData*)item.m_data; - delete fd; -} + m_bypassGenericImpl = false; -void wxFileCtrl::OnListDeleteItem( wxListEvent &event ) -{ - FreeItemData(event.m_item); + m_filectrl = NULL; + m_upDirButton = NULL; + m_newDirButton = NULL; } -void wxFileCtrl::FreeAllItemsData() +wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, + const wxString& message, + const wxString& defaultDir, + const wxString& defaultFile, + const wxString& wildCard, + long style, + const wxPoint& pos, + const wxSize& sz, + const wxString& name, + bool bypassGenericImpl ) : wxFileDialogBase() { - wxListItem item; - item.m_mask = wxLIST_MASK_DATA; - - item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL ); - while ( item.m_itemId != -1 ) - { - GetItem( item ); - FreeItemData(item); - item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL ); - } + Init(); + Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name, bypassGenericImpl ); } -void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event ) +bool wxGenericFileDialog::Create( wxWindow *parent, + const wxString& message, + const wxString& defaultDir, + const wxString& defaultFile, + const wxString& wildCard, + long style, + const wxPoint& pos, + const wxSize& sz, + const wxString& name, + bool bypassGenericImpl ) { - wxFileData *fd = (wxFileData*)event.m_item.m_data; - wxASSERT( fd ); - - if ((event.GetLabel().IsEmpty()) || - (event.GetLabel() == _(".")) || - (event.GetLabel() == _("..")) || - (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND)) - { - wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - event.Veto(); - return; - } + m_bypassGenericImpl = bypassGenericImpl; - wxString new_name( wxPathOnly( fd->GetFullName() ) ); - new_name += wxFILE_SEP_PATH; - new_name += event.GetLabel(); + parent = GetParentForModalDialog(parent); - wxLogNull log; - - if (wxFileExists(new_name)) - { - wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - event.Veto(); - } - - if (wxRenameFile(fd->GetFullName(),new_name)) + if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile, + wildCard, style, pos, sz, name)) { - fd->SetNewName( new_name, event.GetLabel() ); - SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - EnsureVisible( event.GetItem() ); + return false; } - else - { - wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - event.Veto(); - } -} - -void wxFileCtrl::OnListColClick( wxListEvent &event ) -{ - int col = event.GetColumn(); - - switch (col) - { - case wxFileData::FileList_Name : - case wxFileData::FileList_Type : - case wxFileData::FileList_Date : - case wxFileData::FileList_Time : break; - default : return; - } - - if ((wxFileData::fileListFieldType)col == m_sort_field) - m_sort_foward = -m_sort_foward; - else - m_sort_field = (wxFileData::fileListFieldType)col; - SortItems(m_sort_field, m_sort_foward > 0); -} - -void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool foward) -{ - m_sort_field = field; - m_sort_foward = foward ? 1 : -1; + if (m_bypassGenericImpl) + return true; - switch (m_sort_field) + if (!wxDialog::Create( parent, wxID_ANY, message, pos, sz, + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | style, name + )) { - case wxFileData::FileList_Name : - { - wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataNameCompare, m_sort_foward); - break; - } - case wxFileData::FileList_Type : - { - wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataTypeCompare, m_sort_foward); - break; - } - case wxFileData::FileList_Date : - case wxFileData::FileList_Time : - { - wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataTimeCompare, m_sort_foward); - break; - } - default : break; + return false; } -} - -wxFileCtrl::~wxFileCtrl() -{ - FreeAllItemsData(); -} - -//----------------------------------------------------------------------------- -// wxGenericFileDialog -//----------------------------------------------------------------------------- - -#define ID_LIST_MODE (wxID_FILEDLGG ) -#define ID_REPORT_MODE (wxID_FILEDLGG + 1) -#define ID_UP_DIR (wxID_FILEDLGG + 5) -#define ID_PARENT_DIR (wxID_FILEDLGG + 6) -#define ID_NEW_DIR (wxID_FILEDLGG + 7) -#define ID_CHOICE (wxID_FILEDLGG + 8) -#define ID_TEXT (wxID_FILEDLGG + 9) -#define ID_LIST_CTRL (wxID_FILEDLGG + 10) -#define ID_ACTIVATED (wxID_FILEDLGG + 11) -#define ID_CHECK (wxID_FILEDLGG + 12) - -IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog,wxDialog) -BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog) - EVT_BUTTON(ID_LIST_MODE, wxGenericFileDialog::OnList) - EVT_BUTTON(ID_REPORT_MODE, wxGenericFileDialog::OnReport) - EVT_BUTTON(ID_UP_DIR, wxGenericFileDialog::OnUp) - EVT_BUTTON(ID_PARENT_DIR, wxGenericFileDialog::OnHome) - EVT_BUTTON(ID_NEW_DIR, wxGenericFileDialog::OnNew) - EVT_BUTTON(wxID_OK, wxGenericFileDialog::OnListOk) - EVT_LIST_ITEM_SELECTED(ID_LIST_CTRL, wxGenericFileDialog::OnSelected) - EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxGenericFileDialog::OnActivated) - EVT_CHOICE(ID_CHOICE,wxGenericFileDialog::OnChoiceFilter) - EVT_TEXT_ENTER(ID_TEXT,wxGenericFileDialog::OnTextEnter) - EVT_TEXT(ID_TEXT,wxGenericFileDialog::OnTextChange) - EVT_CHECKBOX(ID_CHECK,wxGenericFileDialog::OnCheck) -END_EVENT_TABLE() - -long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST; -bool wxGenericFileDialog::ms_lastShowHidden = FALSE; - -wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, - const wxString& message, - const wxString& defaultDir, - const wxString& defaultFile, - const wxString& wildCard, - long style, - const wxPoint& pos ) - : wxDialog( parent, -1, message, pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ) -{ - if (wxConfig::Get(FALSE)) +#if wxUSE_CONFIG + if (wxConfig::Get(false)) { wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), &ms_lastViewStyle); wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"), &ms_lastShowHidden); } +#endif - 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(); + if (m_dir.empty()) + m_dir = wxFILE_SEP_PATH; } - size_t len = m_dir.Len(); + const size_t len = m_dir.length(); if ((len > 1) && (wxEndsWithPathSeparator(m_dir))) m_dir.Remove( len-1, 1 ); 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 - { - wxASSERT_MSG( tokens.CountTokens() % 2 == 0, wxT("Wrong file type descripition") ); - firstWildText = tokens.GetNextToken(); - firstWild = tokens.GetNextToken(); - } - if ( firstWild.Left( 2 ) == wxT("*.") ) - m_filterExtension = firstWild.Mid( 1 ); - if ( m_filterExtension == wxT(".*") ) - m_filterExtension = wxEmptyString; - // layout - - bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); + + const bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); @@ -1096,14 +214,14 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, wxBitmapButton *but; but = new wxBitmapButton(this, ID_LIST_MODE, - wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_BUTTON)); #if wxUSE_TOOLTIPS but->SetToolTip( _("View files as a list view") ); #endif buttonsizer->Add( but, 0, wxALL, 5 ); but = new wxBitmapButton(this, ID_REPORT_MODE, - wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_BUTTON)); #if wxUSE_TOOLTIPS but->SetToolTip( _("View files as a detailed view") ); #endif @@ -1111,17 +229,16 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, buttonsizer->Add( 30, 5, 1 ); - wxWindow *butDirUp = - new wxBitmapButton(this, ID_UP_DIR, - wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG)); + m_upDirButton = new wxBitmapButton(this, ID_UP_DIR, + wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_BUTTON)); #if wxUSE_TOOLTIPS - butDirUp->SetToolTip( _("Go to parent directory") ); + m_upDirButton->SetToolTip( _("Go to parent directory") ); #endif - buttonsizer->Add( butDirUp, 0, wxALL, 5 ); + buttonsizer->Add( m_upDirButton, 0, wxALL, 5 ); #ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS... but = new wxBitmapButton(this, ID_PARENT_DIR, - wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON)); #if wxUSE_TOOLTIPS but->SetToolTip( _("Go to home directory") ); #endif @@ -1130,600 +247,199 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, buttonsizer->Add( 20, 20 ); #endif //!__DOS__ - wxWindow *butNewDir = - new wxBitmapButton(this, ID_NEW_DIR, - wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG)); + m_newDirButton = new wxBitmapButton(this, ID_NEW_DIR, + wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_BUTTON)); #if wxUSE_TOOLTIPS - butNewDir->SetToolTip( _("Create new directory") ); + m_newDirButton->SetToolTip( _("Create new directory") ); #endif - buttonsizer->Add( butNewDir, 0, wxALL, 5 ); + buttonsizer->Add( m_newDirButton, 0, wxALL, 5 ); if (is_pda) mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 ); else mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 ); - wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL ); - if (is_pda) - staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 ); - m_static = new wxStaticText( this, -1, m_dir ); - staticsizer->Add( m_static, 1 ); - mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 ); - - long style2 = ms_lastViewStyle | wxSUNKEN_BORDER; - if ( !(m_dialogStyle & wxMULTIPLE) ) - style2 |= wxLC_SINGLE_SEL; + long style2 = 0; + if ( HasFdFlag(wxFD_MULTIPLE) ) + style2 |= wxFC_MULTIPLE; - m_list = new wxFileCtrl( this, ID_LIST_CTRL, - firstWild, ms_lastShowHidden, - wxDefaultPosition, wxSize(540,200), - style2); + m_filectrl = new wxGenericFileCtrl( this, ID_FILE_CTRL, + m_dir, defaultFile, + wildCard, + style2, + wxDefaultPosition, wxSize(540,200) + ); - m_list->SetNewDirControl(butNewDir); - m_list->SetGoToParentControl(butDirUp); + m_filectrl->ShowHidden( ms_lastShowHidden ); - if (is_pda) + if (ms_lastViewStyle == wxLC_LIST) { - // PDAs have a different screen layout - mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); - - wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL ); - m_choice = new wxChoice( this, ID_CHOICE ); - choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 5 ); - mainsizer->Add( choicesizer, 0, wxEXPAND ); - - wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL ); - m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER ); - textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 ); - mainsizer->Add( textsizer, 0, wxEXPAND ); - - m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") ); - m_check->SetValue( ms_lastShowHidden ); - textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 ); - - buttonsizer = new wxBoxSizer( wxHORIZONTAL ); - buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 ); - buttonsizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 5 ); - mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT ); + m_filectrl->ChangeToListMode(); } - else + else if (ms_lastViewStyle == wxLC_REPORT) { - mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 ); - - wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL ); - m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER ); - textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); - textsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); - mainsizer->Add( textsizer, 0, wxEXPAND ); - - wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL ); - m_choice = new wxChoice( this, ID_CHOICE ); - choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 ); - m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") ); - m_check->SetValue( ms_lastShowHidden ); - choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 ); - choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 ); - mainsizer->Add( choicesizer, 0, wxEXPAND ); + m_filectrl->ChangeToReportMode(); } - m_choice->Append( firstWildText, (void*) new wxString( firstWild ) ); - while (tokens.HasMoreTokens()) + if (is_pda) { - firstWildText = tokens.GetNextToken(); - firstWild = tokens.GetNextToken(); - m_choice->Append( firstWildText, (void*) new wxString( firstWild ) ); + // PDAs have a different screen layout + mainsizer->Add(m_filectrl, wxSizerFlags(1).Expand().HorzBorder()); + + wxSizer *bsizer = CreateButtonSizer(wxOK | wxCANCEL); + if ( bsizer ) + mainsizer->Add(bsizer, wxSizerFlags().Expand().Border()); } - m_choice->SetSelection( 0 ); + else // !is_pda + { + mainsizer->Add(m_filectrl, wxSizerFlags(1).Expand().DoubleHorzBorder()); - SetAutoLayout( TRUE ); + wxBoxSizer *okcancelsizer = new wxBoxSizer( wxHORIZONTAL ); + okcancelsizer->Add(new wxButton(this, wxID_OK), wxSizerFlags().DoubleBorder().Centre()); + okcancelsizer->Add(new wxButton(this, wxID_CANCEL), wxSizerFlags().DoubleBorder().Centre()); + mainsizer->Add(okcancelsizer, wxSizerFlags().Center()); + } + + SetAutoLayout( true ); SetSizer( mainsizer ); - mainsizer->Fit( this ); - mainsizer->SetSizeHints( this ); + if (!is_pda) + { + mainsizer->Fit( this ); + mainsizer->SetSizeHints( this ); - Centre( wxBOTH ); + Centre( wxBOTH ); + } - m_text->SetFocus(); + return true; } wxGenericFileDialog::~wxGenericFileDialog() { - if (wxConfig::Get(FALSE)) - { - wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), - ms_lastViewStyle); - wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), - ms_lastShowHidden); - } - - const int count = m_choice->GetCount(); - for ( int i = 0; i < count; i++ ) + if (!m_bypassGenericImpl) { - delete (wxString *)m_choice->GetClientData(i); +#if wxUSE_CONFIG + if (wxConfig::Get(false)) + { + wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), + ms_lastViewStyle); + wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), + ms_lastShowHidden); + } +#endif } } int wxGenericFileDialog::ShowModal() { - m_list->GoToDir(m_dir); - m_static->SetLabel(m_list->GetDir()); - m_text->SetValue(m_fileName); + m_filectrl->SetDirectory(m_dir); return wxDialog::ShowModal(); } -void wxGenericFileDialog::DoSetFilterIndex(int filterindex) +bool wxGenericFileDialog::Show( bool show ) { - wxString *str = (wxString*) m_choice->GetClientData( filterindex ); - m_list->SetWild( *str ); - m_filterIndex = filterindex; - if ( str->Left(2) == wxT("*.") ) - { - m_filterExtension = str->Mid(1); - if (m_filterExtension == _T(".*")) - m_filterExtension.clear(); - } - else + // Called by ShowModal, so don't repeate the update +#ifndef __WIN32__ + if (show) { - m_filterExtension.clear(); + m_filectrl->SetDirectory(m_dir); } -} - -void wxGenericFileDialog::SetFilterIndex( int filterindex ) -{ - m_choice->SetSelection( filterindex ); - - DoSetFilterIndex(filterindex); -} - -void wxGenericFileDialog::OnChoiceFilter( wxCommandEvent &event ) -{ - DoSetFilterIndex((int)event.GetInt()); -} - -void wxGenericFileDialog::OnCheck( wxCommandEvent &event ) -{ - m_list->ShowHidden( (ms_lastShowHidden = event.GetInt() != 0) ); -} +#endif -void wxGenericFileDialog::OnActivated( wxListEvent &event ) -{ - HandleAction( event.m_item.m_text ); + return wxDialog::Show( show ); } -void wxGenericFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) +void wxGenericFileDialog::SetWildcard(const wxString& wildCard) { - wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); - cevent.SetEventObject( this ); - GetEventHandler()->ProcessEvent( cevent ); + m_filectrl->SetWildcard(wildCard); } -static bool ignoreChanges = FALSE; - -void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) ) -{ - if (!ignoreChanges) - { - // Clear selections. Otherwise when the user types in a value they may - // not get the file whose name they typed. - if (m_list->GetSelectedItemCount() > 0) - { - long item = m_list->GetNextItem(-1, wxLIST_NEXT_ALL, - wxLIST_STATE_SELECTED); - while ( item != -1 ) - { - m_list->SetItemState(item,0, wxLIST_STATE_SELECTED); - item = m_list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - } - } - } -} - -void wxGenericFileDialog::OnSelected( wxListEvent &event ) +void wxGenericFileDialog::SetFilterIndex( int filterindex ) { - wxString filename( event.m_item.m_text ); - if (filename == wxT("..")) return; - - wxString dir; - m_list->GetDir( dir ); - if (!IsTopMostDir(dir)) - dir += wxFILE_SEP_PATH; - dir += filename; - if (wxDirExists(dir)) return; - - ignoreChanges = TRUE; - m_text->SetValue( filename ); - ignoreChanges = FALSE; + m_filectrl->SetFilterIndex(filterindex); } -void wxGenericFileDialog::HandleAction( const wxString &fn ) +void wxGenericFileDialog::OnOk( wxCommandEvent &WXUNUSED(event) ) { - wxString filename( fn ); - wxString dir; - m_list->GetDir( dir ); - if (filename.IsEmpty()) return; - if (filename == wxT(".")) return; - - if (filename == wxT("..")) - { - m_list->GoToParentDir(); - m_list->SetFocus(); - m_static->SetLabel(m_list->GetDir()); - return; - } - -#ifdef __UNIX__ - if (filename == wxT("~")) - { - m_list->GoToHomeDir(); - m_list->SetFocus(); - m_static->SetLabel(m_list->GetDir()); - return; - } - - if (filename[0u] == wxT('~')) - { - filename.Remove( 0, 1 ); - wxString tmp( wxGetUserHome() ); - tmp += wxT('/'); - tmp += filename; - filename = tmp; - } -#endif // __UNIX__ - - if ((filename.Find(wxT('*')) != wxNOT_FOUND) || - (filename.Find(wxT('?')) != wxNOT_FOUND)) - { - if (filename.Find(wxFILE_SEP_PATH) != wxNOT_FOUND) - { - wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR ); - return; - } - m_list->SetWild( filename ); - return; - } - - if (!IsTopMostDir(dir)) - dir += wxFILE_SEP_PATH; - if (!wxIsAbsolutePath(filename)) - { - dir += filename; - filename = dir; - } + wxArrayString selectedFiles; + m_filectrl->GetFilenames(selectedFiles); - if (wxDirExists(filename)) - { - m_list->GoToDir( filename ); - m_static->SetLabel(m_list->GetDir()); + if (selectedFiles.Count() == 0) 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 - // dialog is not entirely clear to me, why don't we allow saving to a - // 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(';')); - } - } - - // check that the file [doesn't] exist if necessary - if ( (m_dialogStyle & wxSAVE) && - (m_dialogStyle & wxOVERWRITE_PROMPT) && - wxFileExists( filename ) ) - { - wxString msg; - msg.Printf( _("File '%s' already exists, do you really want to " - "overwrite it?"), filename.c_str() ); - - if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) - return; - } - else if ( (m_dialogStyle & wxOPEN) && - (m_dialogStyle & wxFILE_MUST_EXIST) && - !wxFileExists(filename) ) - { - wxMessageBox(_("Please choose an existing file."), _("Error"), - wxOK | wxICON_ERROR ); - } - - SetPath( filename ); - // change to the directory where the user went if asked - if ( m_dialogStyle & wxCHANGE_DIR ) + if (selectedFiles.Count() == 1) { - wxString cwd; - wxSplitPath(filename, &cwd, NULL, NULL); - - if ( cwd != wxGetWorkingDirectory() ) - { - wxSetWorkingDirectory(cwd); - } + SetPath( selectedFiles[0] ); } - wxCommandEvent event; - wxDialog::OnOK(event); -} - -void wxGenericFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) ) -{ - HandleAction( m_text->GetValue() ); + EndModal(wxID_OK); } void wxGenericFileDialog::OnList( wxCommandEvent &WXUNUSED(event) ) { - m_list->ChangeToListMode(); + m_filectrl->ChangeToListMode(); ms_lastViewStyle = wxLC_LIST; - m_list->SetFocus(); + m_filectrl->GetFileList()->SetFocus(); } void wxGenericFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) ) { - m_list->ChangeToReportMode(); + m_filectrl->ChangeToReportMode(); ms_lastViewStyle = wxLC_REPORT; - m_list->SetFocus(); + m_filectrl->GetFileList()->SetFocus(); } void wxGenericFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) ) { - m_list->GoToParentDir(); - m_list->SetFocus(); - m_static->SetLabel(m_list->GetDir()); + m_filectrl->GoToParentDir(); + m_filectrl->GetFileList()->SetFocus(); } void wxGenericFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) ) { - m_list->GoToHomeDir(); - m_list->SetFocus(); - m_static->SetLabel(m_list->GetDir()); + m_filectrl->GoToHomeDir(); + m_filectrl->SetFocus(); } void wxGenericFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) ) { - m_list->MakeDir(); + m_filectrl->GetFileList()->MakeDir(); +} + +void wxGenericFileDialog::OnFileActivated( wxFileCtrlEvent &WXUNUSED(event) ) +{ + wxCommandEvent dummy; + OnOk( dummy ); } void wxGenericFileDialog::SetPath( const wxString& path ) { // not only set the full path but also update filename and dir m_path = path; - if ( !path.empty() ) - { - wxString ext; - wxSplitPath(path, &m_dir, &m_fileName, &ext); - if (!ext.empty()) - { - m_fileName += wxT("."); - m_fileName += ext; - } - } + + m_filectrl->SetPath(path); } void wxGenericFileDialog::GetPaths( wxArrayString& paths ) const { - paths.Empty(); - if (m_list->GetSelectedItemCount() == 0) - { - paths.Add( GetPath() ); - return; - } - - paths.Alloc( m_list->GetSelectedItemCount() ); - - wxString dir; - m_list->GetDir( dir ); -#ifdef __UNIX__ - if (dir != wxT("/")) -#endif - dir += wxFILE_SEP_PATH; - - wxListItem item; - item.m_mask = wxLIST_MASK_TEXT; - - item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - while ( item.m_itemId != -1 ) - { - m_list->GetItem( item ); - paths.Add( dir + item.m_text ); - item.m_itemId = m_list->GetNextItem( item.m_itemId, - wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - } + m_filectrl->GetPaths(paths); } void wxGenericFileDialog::GetFilenames(wxArrayString& files) const { - files.Empty(); - if (m_list->GetSelectedItemCount() == 0) - { - files.Add( GetFilename() ); - return; - } - files.Alloc( m_list->GetSelectedItemCount() ); - - wxListItem item; - item.m_mask = wxLIST_MASK_TEXT; - - item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - while ( item.m_itemId != -1 ) - { - m_list->GetItem( item ); - files.Add( item.m_text ); - item.m_itemId = m_list->GetNextItem( item.m_itemId, - wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - } -} - -#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); + m_filectrl->GetFilenames(files); } -wxString wxSaveFileSelector(const wxChar *what, - const wxChar *ext, - const wxChar *nameDef, - wxWindow *parent) +void wxGenericFileDialog::OnUpdateButtonsUI(wxUpdateUIEvent& event) { - 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); + event.Enable( !IsTopMostDir(m_filectrl->GetDirectory()) ); } -// A module to allow icons table cleanup +#ifdef wxHAS_GENERIC_FILEDIALOG -class wxFileDialogGenericModule: public wxModule -{ -DECLARE_DYNAMIC_CLASS(wxFileDialogGenericModule) -public: - wxFileDialogGenericModule() {} - bool OnInit() { return TRUE; } - void OnExit() { if (g_IconsTable) {delete g_IconsTable; g_IconsTable = NULL;} } -}; - -IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule) +IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog) -#endif // USE_GENERIC_FILEDIALOG +#endif // wxHAS_GENERIC_FILEDIALOG #endif // wxUSE_FILEDLG -