X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d4e4f802f8a165c8d41053d2cd6d33c32b08f79..4a06b34847e04ddaf6c25f9c63f4f072ed427636:/src/generic/dirctrlg.cpp diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index d7ae88204d..273dd24afe 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dirctrlg.h" #endif @@ -22,8 +22,10 @@ #if wxUSE_DIRDLG +#include "wx/generic/dirctrlg.h" + +#include "wx/module.h" #include "wx/utils.h" -#include "wx/dialog.h" #include "wx/button.h" #include "wx/layout.h" #include "wx/msgdlg.h" @@ -40,13 +42,17 @@ #include "wx/tokenzr.h" #include "wx/dir.h" #include "wx/settings.h" +#include "wx/artprov.h" +#include "wx/hash.h" +#include "wx/mimetype.h" +#include "wx/image.h" +#include "wx/choice.h" +#include "wx/filedlg.h" // for wxFileDialogBase::ParseWildcard #if wxUSE_STATLINE #include "wx/statline.h" #endif -#include "wx/generic/dirctrlg.h" - #if defined(__WXMAC__) #include "wx/mac/private.h" // includes mac headers #endif @@ -57,9 +63,10 @@ // FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume // older releases don't, but it should be verified and the checks modified // accordingly. -#if !defined(__WXWINE__) && (!defined(__GNUWIN32__) || \ - (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)) +#if !defined(__GNUWIN32__) || (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) +#if !defined(__WXWINCE__) #include +#endif #include #include #endif @@ -75,7 +82,7 @@ #endif #include #include - +extern bool wxIsDriveAvailable(const wxString& dirName); #endif // __WXPM__ #if defined(__WXMAC__) @@ -95,228 +102,174 @@ #undef GetFirstChild #endif -/* Closed folder */ -static const char * icon1_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 6 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffff00", -"$ c #ffffff", -/* pixels */ -" ", -" @@@@@ ", -" @#+#+#@ ", -" @#+#+#+#@@@@@@ ", -" @$$$$$$$$$$$$@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @@@@@@@@@@@@@@.", -" ..............", -" ", -" "}; +// ---------------------------------------------------------------------------- +// wxGetAvailableDrives, for WINDOWS, DOS, WXPM, MAC, UNIX (returns "/") +// ---------------------------------------------------------------------------- -/* Open folder */ -static const char * icon2_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 6 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffff00", -"$ c #ffffff", -/* pixels */ -" ", -" @@@@@ ", -" @$$$$$@ ", -" @$#+#+#$@@@@@@ ", -" @$+#+#+$$$$$$@.", -" @$#+#+#+#+#+#@.", -"@@@@@@@@@@@@@#@.", -"@$$$$$$$$$$@@+@.", -"@$#+#+#+#+##.@@.", -" @$#+#+#+#+#+.@.", -" @$+#+#+#+#+#.@.", -" @$+#+#+#+##@..", -" @@@@@@@@@@@@@.", -" .............", -" ", -" "}; +size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids) +{ +#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__) -/* File */ -static const char * icon3_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 3 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #ffffff", -/* pixels */ -" ", -" ........ ", -" .++++++.. ", -" .+.+.++.+. ", -" .++++++.... ", -" .+.+.+++++. ", -" .+++++++++. ", -" .+.+.+.+.+. ", -" .+++++++++. ", -" .+.+.+.+.+. ", -" .+++++++++. ", -" .+.+.+.+.+. ", -" .+++++++++. ", -" ........... ", -" ", -" "}; +#ifdef __WXWINCE__ + // No logical drives; return "\" + paths.Add(wxT("\\")); + names.Add(wxT("\\")); + return 1; +#elif defined(__WIN32__) + wxChar driveBuffer[256]; + size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer); + size_t i = 0; + while (i < n) + { + wxString path, name; + path.Printf(wxT("%c:\\"), driveBuffer[i]); + name.Printf(wxT("%c:"), driveBuffer[i]); -/* Computer */ -static const char * icon4_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c #008080", -"@ c Blue", -" ........... ", -" .XXXXXXXXXX.o", -" .OOOOOOOOO..o", -" .OoooooooX..o", -" .Oo+...@+X..o", -" .Oo+XXX.+X..o", -" .Oo+....+X..o", -" .Oo++++++X..o", -" .OXXXXXXXX.oo", -" ..........o.o", -" ...........Xo", -" .XXXXXXXXXX.o", -" .o.o.o.o.o...o", -" .oXoXoXoXoXo.o ", -".XOXXXXXXXXX.o ", -"............o "}; + int imageId = wxFileIconsTable::drive; + int driveType = ::GetDriveType(path); + switch (driveType) + { + case DRIVE_REMOVABLE: + if (path == wxT("a:\\") || path == wxT("b:\\")) + imageId = wxFileIconsTable::floppy; + else + imageId = wxFileIconsTable::removeable; + break; + case DRIVE_CDROM: + imageId = wxFileIconsTable::cdrom; + break; + case DRIVE_REMOTE: + case DRIVE_FIXED: + default: + imageId = wxFileIconsTable::drive; + break; + } -/* Drive */ -static const char * icon5_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c Green", -"@ c #008000", -" ", -" ", -" ", -" ", -" ............. ", -" .XXXXXXXXXXXX.o", -".OOOOOOOOOOOO..o", -".XXXXXXXXX+@X..o", -".XXXXXXXXXXXX..o", -".X..........X..o", -".XOOOOOOOOOOX..o", -"..............o ", -" ooooooooooooo ", -" ", -" ", -" "}; + paths.Add(path); + names.Add(name); + icon_ids.Add(imageId); -/* CD-ROM */ -static const char *icon6_xpm[] = { -"16 16 10 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Yellow", -"O c Blue", -"+ c Black", -"@ c Gray100", -"# c #008080", -"$ c Green", -"% c #008000", -" ... ", -" ..XoX.. ", -" .O.XoXXX+ ", -" ...O.oXXXX+ ", -" .O..X.XXXX+ ", -" ....X.+..XXX+", -" .XXX.+@+.XXX+", -" .X@XX.+.X@@X+", -" .....X...#XX@+ ", -".@@@...XXo.O@X+ ", -".@XXX..XXoXOO+ ", -".@++++..XoX+++ ", -".@$%@@XX+++X.+ ", -".............+ ", -" ++++++++++++ ", -" "}; + while (driveBuffer[i] != wxT('\0')) + i ++; + i ++; + if (driveBuffer[i] == wxT('\0')) + break; + } +#else // !__WIN32__ + int drive; -/* Floppy */ -static const char * icon7_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c Gray100", -"o c #c0c0c0", -"O c Black", -"+ c Cyan", -"@ c Red", -" ......X", -" .ooooooO", -" .+++++OO", -" .++++++O", -" .++++++O", -" .ooooooO", -" .......o....oO", -" .oooooo.o.O.XoO", -".XXXXXXXXOOOOOO ", -".ooooooooo@o..O ", -".ooo....oooo..O ", -".o..OOOO...o..O ", -".oooXXXXoooo..O ", -".............O ", -" OOOOOOOOOOOO ", -" "}; + /* If we can switch to the drive, it exists. */ + for( drive = 1; drive <= 26; drive++ ) + { + wxString path, name; + path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1)); + name.Printf(wxT("%c:"), (char) (drive + 'A' - 1)); -/* Removeable */ -static const char * icon8_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c Red", -"@ c #800000", -" ", -" ", -" ", -" ............. ", -" .XXXXXXXXXXXX.o", -".OOOOOOOOOOOO..o", -".OXXXXXXXXXXX..o", -".O+@.oooooo.X..o", -".OXXOooooooOX..o", -".OXXXOOOOOOXX..o", -".OXXXXXXXXXXX..o", -".O............o ", -" ooooooooooooo ", -" ", -" ", -" "}; + if (wxIsDriveAvailable(path)) + { + paths.Add(path); + names.Add(name); + icon_ids.Add((drive <= 2) ? wxFileIconsTable::floppy : wxFileIconsTable::drive); + } + } +#endif // __WIN32__/!__WIN32__ + +#elif defined(__WXMAC__) +#ifdef __DARWIN__ + FSRef **theVolRefs; + ItemCount theVolCount; + char thePath[FILENAME_MAX]; + + if (FSGetMountedVolumes(&theVolRefs, &theVolCount) == noErr) { + ItemCount index; + ::HLock( (Handle)theVolRefs ) ; + for (index = 0; index < theVolCount; ++index) { + // get the POSIX path associated with the FSRef + if ( FSRefMakePath(&((*theVolRefs)[index]), + (UInt8 *)thePath, sizeof(thePath)) != noErr ) { + continue; + } + // add path separator at end if necessary + wxString path( thePath , wxConvLocal) ; + if (path.Last() != wxFILE_SEP_PATH) { + path += wxFILE_SEP_PATH; + } + // get Mac volume name for display + FSVolumeRefNum vRefNum ; + HFSUniStr255 volumeName ; + + if ( FSGetVRefNum(&((*theVolRefs)[index]), &vRefNum) != noErr ) { + continue; + } + if ( FSGetVInfo(vRefNum, &volumeName, NULL, NULL) != noErr ) { + continue; + } + // get C string from Unicode HFS name + // see: http://developer.apple.com/carbon/tipsandtricks.html + CFStringRef cfstr = CFStringCreateWithCharacters( kCFAllocatorDefault, + volumeName.unicode, + volumeName.length ); + // Do something with str + char *cstr = NewPtr(CFStringGetLength(cfstr) + 1); + if (( cstr == NULL ) || + !CFStringGetCString(cfstr, cstr, CFStringGetLength(cfstr) + 1, + kCFStringEncodingMacRoman)) + { + CFRelease( cstr ); + continue; + } + wxString name( cstr , wxConvLocal ); + DisposePtr( cstr ); + CFRelease( cfstr ); + + GetVolParmsInfoBuffer volParmsInfo; + UInt32 actualSize; + if ( FSGetVolParms(vRefNum, sizeof(volParmsInfo), &volParmsInfo, &actualSize) != noErr ) { + continue; + } + paths.Add(path); + names.Add(name); + + if ( VolIsEjectable(&volParmsInfo) ) + icon_ids.Add(wxFileIconsTable::cdrom); + else + icon_ids.Add(wxFileIconsTable::drive); + } + ::HUnlock( (Handle)theVolRefs ); + ::DisposeHandle( (Handle)theVolRefs ); + } +#else // !__DARWIN__ + FSSpec volume; + short index = 1; + while(1) + { + short actualCount = 0 ; + if (OnLine(&volume, 1, &actualCount, &index ) != noErr || actualCount==0) + { + break; + } + + wxString name = wxMacFSSpec2MacFilename( &volume ); + paths.Add(name + wxFILE_SEP_PATH); + names.Add(name); + icon_ids.Add(wxFileIconsTable::drive); + } +#endif // __DARWIN__ + +#elif defined(__UNIX__) + paths.Add(wxT("/")); + names.Add(wxT("/")); + icon_ids.Add(wxFileIconsTable::computer); +#else + #error "Unsupported platform in wxGenericDirCtrl!" +#endif + return paths.GetCount(); +} + +// ---------------------------------------------------------------------------- +// wxIsDriveAvailable +// ---------------------------------------------------------------------------- #if defined(__DOS__) @@ -342,7 +295,9 @@ bool wxIsDriveAvailable(const wxString& dirName) int setdrive(int drive) { -#if defined(__GNUWIN32__) && \ +#ifdef __WXWINCE__ + return 0; +#elif defined(__GNUWIN32__) && \ (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) return _chdrive(drive); #else @@ -354,11 +309,7 @@ int setdrive(int drive) newdrive[1] = wxT(':'); newdrive[2] = wxT('\0'); #if defined(__WXMSW__) -#ifdef __WIN16__ - if (wxSetWorkingDirectory(newdrive)) -#else if (::SetCurrentDirectory(newdrive)) -#endif #else // VA doesn't know what LPSTR is and has its own set if (DosSetCurrentDir((PSZ)newdrive)) @@ -371,6 +322,9 @@ int setdrive(int drive) bool wxIsDriveAvailable(const wxString& dirName) { +#ifdef __WXWINCE__ + return FALSE; +#else #ifdef __WIN32__ UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); #endif @@ -381,8 +335,7 @@ bool wxIsDriveAvailable(const wxString& dirName) if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':')) { wxString dirNameLower(dirName.Lower()); -#if defined(__WXWINE__) || (defined(__GNUWIN32__) && \ - !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)) +#if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) success = wxPathExists(dirNameLower); #else int currentDrive = _getdrive(); @@ -401,16 +354,15 @@ bool wxIsDriveAvailable(const wxString& dirName) #endif return success; +#endif } #endif // __WINDOWS__ || __WXPM__ + // Function which is called by quick sort. We want to override the default wxArrayString behaviour, // and sort regardless of case. -static int LINKAGEMODE wxDirCtrlStringCompareFunction(const void *first, const void *second) +static int LINKAGEMODE wxDirCtrlStringCompareFunction(wxString* strFirst, wxString* strSecond) { - wxString *strFirst = (wxString *)first; - wxString *strSecond = (wxString *)second; - return strFirst->CmpNoCase(*strSecond); } @@ -476,7 +428,62 @@ bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const // wxGenericDirCtrl //----------------------------------------------------------------------------- + +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxGenericDirCtrlStyle ) + +wxBEGIN_FLAGS( wxGenericDirCtrlStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxNO_BORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY) + wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL) + wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST) + wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS) + +wxEND_FLAGS( wxGenericDirCtrlStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl,"wx/dirctrl.h") + +wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl) + wxHIDE_PROPERTY( Children ) + wxPROPERTY( DefaultPath , wxString , SetDefaultPath , GetDefaultPath , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Filter , wxString , SetFilter , GetFilter ,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxPROPERTY( DefaultFilter , int , SetFilterIndex, GetFilterIndex,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxGenericDirCtrl) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_8( wxGenericDirCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , DefaultPath , + wxPoint , Position , wxSize , Size , long , WindowStyle , wxString , Filter , int , DefaultFilter ) +#else IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrl, wxControl) +#endif BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl) EVT_TREE_ITEM_EXPANDING (-1, wxGenericDirCtrl::OnExpandItem) @@ -515,10 +522,14 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, if ((style & wxDIRCTRL_3D_INTERNAL) == 0) treeStyle |= wxNO_BORDER; + else + treeStyle |= wxBORDER_SUNKEN; long filterStyle = 0; if ((style & wxDIRCTRL_3D_INTERNAL) == 0) filterStyle |= wxNO_BORDER; + else + filterStyle |= wxBORDER_SUNKEN; m_treeCtrl = new wxTreeCtrl(this, wxID_TREECTRL, pos, size, treeStyle); @@ -533,16 +544,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, if (m_filterListCtrl) m_filterListCtrl->FillFilterList(filter, defaultFilter); - m_imageList = new wxImageList(16, 16, TRUE); - m_imageList->Add(wxIcon(icon1_xpm)); - m_imageList->Add(wxIcon(icon2_xpm)); - m_imageList->Add(wxIcon(icon3_xpm)); - m_imageList->Add(wxIcon(icon4_xpm)); - m_imageList->Add(wxIcon(icon5_xpm)); - m_imageList->Add(wxIcon(icon6_xpm)); - m_imageList->Add(wxIcon(icon7_xpm)); - m_imageList->Add(wxIcon(icon8_xpm)); - m_treeCtrl->AssignImageList(m_imageList); + m_treeCtrl->SetImageList(wxTheFileIconsTable->GetSmallImageList()); m_showHidden = FALSE; wxDirItemData* rootData = new wxDirItemData(wxT(""), wxT(""), TRUE); @@ -575,7 +577,6 @@ wxGenericDirCtrl::~wxGenericDirCtrl() void wxGenericDirCtrl::Init() { m_showHidden = FALSE; - m_imageList = NULL; m_currentFilter = 0; m_currentFilterStr = wxEmptyString; // Default: any file m_treeCtrl = NULL; @@ -591,159 +592,29 @@ void wxGenericDirCtrl::ShowHidden( bool show ) SetPath(path); } -void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId) +const wxTreeItemId +wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId) { wxDirItemData *dir_item = new wxDirItemData(path,name,TRUE); - wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item); + wxTreeItemId id = AppendItem( m_rootId, name, imageId, -1, dir_item); m_treeCtrl->SetItemHasChildren(id); + + return id; } void wxGenericDirCtrl::SetupSections() { -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__) - -#ifdef __WIN32__ - wxChar driveBuffer[256]; - size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer); - size_t i = 0; - while (i < n) - { - wxString path, name; - path.Printf(wxT("%c:\\"), driveBuffer[i]); - name.Printf(wxT("(%c:)"), driveBuffer[i]); - - int imageId = 4; - int driveType = ::GetDriveType(path); - switch (driveType) - { - case DRIVE_REMOVABLE: - if (path == wxT("a:\\") || path == wxT("b:\\")) - imageId = 6; // Floppy - else - imageId = 7; - break; - case DRIVE_FIXED: - imageId = 4; - break; - case DRIVE_REMOTE: - imageId = 4; - break; - case DRIVE_CDROM: - imageId = 5; - break; - default: - imageId = 4; - break; - } + wxArrayString paths, names; + wxArrayInt icons; - AddSection(path, name, imageId); + size_t n, count = wxGetAvailableDrives(paths, names, icons); - while (driveBuffer[i] != wxT('\0')) - i ++; - i ++; - if (driveBuffer[i] == wxT('\0')) - break; - } -#else // !__WIN32__ - int drive; - - /* If we can switch to the drive, it exists. */ - for( drive = 1; drive <= 26; drive++ ) + for (n = 0; n < count; n++) { - wxString path, name; - path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1)); - name.Printf(wxT("(%c:)"), (char) (drive + 'A' - 1)); - - if (wxIsDriveAvailable(path)) - { - AddSection(path, name, (drive <= 2) ? 6/*floppy*/ : 4/*disk*/); - } - } -#endif // __WIN32__/!__WIN32__ - -#elif defined(__WXMAC__) -# ifdef __DARWIN__ - FSRef **theVolRefs; - ItemCount theVolCount; - char thePath[FILENAME_MAX]; - - if (FSGetMountedVolumes(&theVolRefs, &theVolCount) == noErr) { - ItemCount index; - ::HLock( (Handle)theVolRefs ) ; - for (index = 0; index < theVolCount; ++index) { - // get the POSIX path associated with the FSRef - if ( FSRefMakePath(&((*theVolRefs)[index]), - (UInt8 *)thePath, sizeof(thePath)) != noErr ) { - continue; - } - // add path separator at end if necessary - wxString path( thePath ) ; - if (path.Last() != wxFILE_SEP_PATH) { - path += wxFILE_SEP_PATH; - } - // get Mac volume name for display - FSVolumeRefNum vRefNum ; - HFSUniStr255 volumeName ; - - if ( FSGetVRefNum(&((*theVolRefs)[index]), &vRefNum) != noErr ) { - continue; - } - if ( FSGetVInfo(vRefNum, &volumeName, NULL, NULL) != noErr ) { - continue; - } - // get C string from Unicode HFS name - // see: http://developer.apple.com/carbon/tipsandtricks.html - CFStringRef cfstr = CFStringCreateWithCharacters( kCFAllocatorDefault, - volumeName.unicode, - volumeName.length ); - // Do something with str - char *cstr = NewPtr(CFStringGetLength(cfstr) + 1); - if (( cstr == NULL ) || - !CFStringGetCString(cfstr, cstr, CFStringGetLength(cfstr) + 1, - kCFStringEncodingMacRoman)) { - CFRelease( cstr ); - continue; - } - wxString name( cstr ) ; - DisposePtr( cstr ) ; - CFRelease( cfstr ); - - GetVolParmsInfoBuffer volParmsInfo; - UInt32 actualSize; - if ( FSGetVolParms(vRefNum, sizeof(volParmsInfo), &volParmsInfo, &actualSize) != noErr ) { - continue; - } - - if ( VolIsEjectable(&volParmsInfo) ) { - AddSection(path, name, 5/*cd-rom*/); - } - else { - AddSection(path, name, 4/*disk*/); - } - } - ::HUnlock( (Handle)theVolRefs ) ; - ::DisposeHandle( (Handle)theVolRefs ) ; - } -# else - FSSpec volume ; - short index = 1 ; - while(1) { - short actualCount = 0 ; - if ( OnLine( &volume , 1 , &actualCount , &index ) != noErr || actualCount == 0 ) { - break ; - } - - wxString name = wxMacFSSpec2MacFilename( &volume ) ; - AddSection(name + wxFILE_SEP_PATH, name, 4/*disk*/); + AddSection(paths[n], names[n], icons[n]); } -# endif /* __DARWIN__ */ -#elif defined(__UNIX__) - AddSection(wxT("/"), wxT("/"), 3/*computer icon*/); -#else - #error "Unsupported platform in wxGenericDirCtrl!" -#endif } void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event) @@ -768,7 +639,9 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event) if ((event.GetLabel().IsEmpty()) || (event.GetLabel() == _(".")) || (event.GetLabel() == _("..")) || - (event.GetLabel().First( wxT("/") ) != wxNOT_FOUND)) + (event.GetLabel().Find(wxT('/')) != wxNOT_FOUND) || + (event.GetLabel().Find(wxT('\\')) != wxNOT_FOUND) || + (event.GetLabel().Find(wxT('|')) != wxNOT_FOUND)) { wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR ); dialog.ShowModal(); @@ -811,7 +684,9 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event) // VS: this is needed because the event handler is called from wxTreeCtrl // ctor when wxTR_HIDE_ROOT was specified - if (m_rootId == 0) + + if (!m_rootId.IsOk()) + m_rootId = m_treeCtrl->GetRootItem(); ExpandDir(parentId); @@ -831,7 +706,7 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId) return; data->m_isExpanded = FALSE; - long cookie; + wxTreeItemIdValue cookie; /* Workaround because DeleteChildren has disapeared (why?) and * CollapseAndReset doesn't work as advertised (deletes parent too) */ child = m_treeCtrl->GetFirstChild(parentId, cookie); @@ -909,7 +784,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) while (d.GetNext(& eachFilename)); } } - dirs.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction); + dirs.Sort(wxDirCtrlStringCompareFunction); // Now do the filenames -- but only if we're allowed to if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0) @@ -932,7 +807,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) while (d.GetNext(& eachFilename)); } } - filenames.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction); + filenames.Sort(wxDirCtrlStringCompareFunction); } // Add the sorted dirs @@ -941,13 +816,15 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) { wxString eachFilename(dirs[i]); path = dirName; - if (path.Last() != wxFILE_SEP_PATH) + if (!wxEndsWithPathSeparator(path)) path += wxString(wxFILE_SEP_PATH); path += eachFilename; wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,TRUE); - wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 0, -1, dir_item); - m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded ); + wxTreeItemId id = AppendItem( parentId, eachFilename, + wxFileIconsTable::folder, -1, dir_item); + m_treeCtrl->SetItemImage( id, wxFileIconsTable::folder_open, + wxTreeItemIcon_Expanded ); // Has this got any children? If so, make it expandable. // (There are two situations when a dir has children: either it @@ -968,12 +845,15 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) { wxString eachFilename(filenames[i]); path = dirName; - if (path.Last() != wxFILE_SEP_PATH) + if (!wxEndsWithPathSeparator(path)) path += wxString(wxFILE_SEP_PATH); path += eachFilename; //path = dirName + wxString(wxT("/")) + eachFilename; wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,FALSE); - (void)m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item); + int image_id = wxFileIconsTable::file; + if (eachFilename.Find(wxT('.')) != wxNOT_FOUND) + image_id = wxTheFileIconsTable->GetIconID(eachFilename.AfterLast(wxT('.'))); + (void) AppendItem( parentId, eachFilename, image_id, -1, dir_item); } } } @@ -1003,7 +883,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& path2.MakeLower(); #endif - long cookie; + wxTreeItemIdValue cookie; wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie); while (childId.IsOk()) { @@ -1012,7 +892,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& if (data && !data->m_path.IsEmpty()) { wxString childPath(data->m_path); - if (childPath.Last() != wxFILE_SEP_PATH) + if (!wxEndsWithPathSeparator(childPath)) childPath += wxString(wxFILE_SEP_PATH); // In MSW and PM, case is not significant @@ -1065,7 +945,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path) if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir) { // Find the first file in this directory - long cookie; + wxTreeItemIdValue cookie; wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie); bool selectedChild = FALSE; while (childId.IsOk()) @@ -1215,41 +1095,11 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin // Parses the global filter, returning the number of filters. // Returns 0 if none or if there's a problem. -// filterStr is in the form: -// -// "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg" +// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg" int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions) { - wxString str(filterStr); - - wxString description, filter; - int pos; - bool finished = FALSE; - do - { - pos = str.Find(wxT('|')); - if (pos == -1) - return 0; // Problem - description = str.Left(pos); - str = str.Mid(pos+1); - pos = str.Find(wxT('|')); - if (pos == -1) - { - filter = str; - finished = TRUE; - } - else - { - filter = str.Left(pos); - str = str.Mid(pos+1); - } - descriptions.Add(description); - filters.Add(filter); - } - while (!finished) ; - - return filters.Count(); + return wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters ); } void wxGenericDirCtrl::DoResize() @@ -1288,6 +1138,26 @@ void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) DoResize(); } +wxTreeItemId wxGenericDirCtrl::AppendItem (const wxTreeItemId & parent, + const wxString & text, + int image, int selectedImage, + wxTreeItemData * data) +{ + wxTreeCtrl *treeCtrl = GetTreeCtrl (); + + wxASSERT (treeCtrl); + + if (treeCtrl) + { + return treeCtrl->AppendItem (parent, text, image, selectedImage, data); + } + else + { + return wxTreeItemId(); + } +} + + //----------------------------------------------------------------------------- // wxDirFilterListCtrl //----------------------------------------------------------------------------- @@ -1343,4 +1213,426 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt } } + +// ---------------------------------------------------------------------------- +// wxFileIconsTable icons +// ---------------------------------------------------------------------------- + +/* Open folder */ +static const char * file_icons_tbl_folder_open_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 6 1", +/* colors */ +" s None c None", +". c #000000", +"+ c #c0c0c0", +"@ c #808080", +"# c #ffff00", +"$ c #ffffff", +/* pixels */ +" ", +" @@@@@ ", +" @$$$$$@ ", +" @$#+#+#$@@@@@@ ", +" @$+#+#+$$$$$$@.", +" @$#+#+#+#+#+#@.", +"@@@@@@@@@@@@@#@.", +"@$$$$$$$$$$@@+@.", +"@$#+#+#+#+##.@@.", +" @$#+#+#+#+#+.@.", +" @$+#+#+#+#+#.@.", +" @$+#+#+#+##@..", +" @@@@@@@@@@@@@.", +" .............", +" ", +" "}; + +/* Computer */ +static const char * file_icons_tbl_computer_xpm[] = { +"16 16 7 1", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c #008080", +"@ c Blue", +" ........... ", +" .XXXXXXXXXX.o", +" .OOOOOOOOO..o", +" .OoooooooX..o", +" .Oo+...@+X..o", +" .Oo+XXX.+X..o", +" .Oo+....+X..o", +" .Oo++++++X..o", +" .OXXXXXXXX.oo", +" ..........o.o", +" ...........Xo", +" .XXXXXXXXXX.o", +" .o.o.o.o.o...o", +" .oXoXoXoXoXo.o ", +".XOXXXXXXXXX.o ", +"............o "}; + +/* Drive */ +static const char * file_icons_tbl_drive_xpm[] = { +"16 16 7 1", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c Green", +"@ c #008000", +" ", +" ", +" ", +" ", +" ............. ", +" .XXXXXXXXXXXX.o", +".OOOOOOOOOOOO..o", +".XXXXXXXXX+@X..o", +".XXXXXXXXXXXX..o", +".X..........X..o", +".XOOOOOOOOOOX..o", +"..............o ", +" ooooooooooooo ", +" ", +" ", +" "}; + +/* CD-ROM */ +static const char *file_icons_tbl_cdrom_xpm[] = { +"16 16 10 1", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Yellow", +"O c Blue", +"+ c Black", +"@ c Gray100", +"# c #008080", +"$ c Green", +"% c #008000", +" ... ", +" ..XoX.. ", +" .O.XoXXX+ ", +" ...O.oXXXX+ ", +" .O..X.XXXX+ ", +" ....X.+..XXX+", +" .XXX.+@+.XXX+", +" .X@XX.+.X@@X+", +" .....X...#XX@+ ", +".@@@...XXo.O@X+ ", +".@XXX..XXoXOO+ ", +".@++++..XoX+++ ", +".@$%@@XX+++X.+ ", +".............+ ", +" ++++++++++++ ", +" "}; + +/* Floppy */ +static const char * file_icons_tbl_floppy_xpm[] = { +"16 16 7 1", +" s None c None", +". c #808080", +"X c Gray100", +"o c #c0c0c0", +"O c Black", +"+ c Cyan", +"@ c Red", +" ......X", +" .ooooooO", +" .+++++OO", +" .++++++O", +" .++++++O", +" .ooooooO", +" .......o....oO", +" .oooooo.o.O.XoO", +".XXXXXXXXOOOOOO ", +".ooooooooo@o..O ", +".ooo....oooo..O ", +".o..OOOO...o..O ", +".oooXXXXoooo..O ", +".............O ", +" OOOOOOOOOOOO ", +" "}; + +/* Removeable */ +static const char * file_icons_tbl_removeable_xpm[] = { +"16 16 7 1", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c Red", +"@ c #800000", +" ", +" ", +" ", +" ............. ", +" .XXXXXXXXXXXX.o", +".OOOOOOOOOOOO..o", +".OXXXXXXXXXXX..o", +".O+@.oooooo.X..o", +".OXXOooooooOX..o", +".OXXXOOOOOOXX..o", +".OXXXXXXXXXXX..o", +".O............o ", +" ooooooooooooo ", +" ", +" ", +" "}; + +// ---------------------------------------------------------------------------- +// wxFileIconsTable & friends +// ---------------------------------------------------------------------------- + +// global instance of a wxFileIconsTable +wxFileIconsTable* wxTheFileIconsTable = (wxFileIconsTable *)NULL; + +// A module to allow icons table cleanup + +class wxFileIconsTableModule: public wxModule +{ +DECLARE_DYNAMIC_CLASS(wxFileIconsTableModule) +public: + wxFileIconsTableModule() {} + bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return TRUE; } + void OnExit() + { + if (wxTheFileIconsTable) + { + delete wxTheFileIconsTable; + wxTheFileIconsTable = NULL; + } + } +}; + +IMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule) + +class wxFileIconEntry : public wxObject +{ +public: + wxFileIconEntry(int i) { id = i; } + + int id; +}; + +wxFileIconsTable::wxFileIconsTable() +{ + m_HashTable = NULL; + m_smallImageList = NULL; +} + +wxFileIconsTable::~wxFileIconsTable() +{ + if (m_HashTable) + { + WX_CLEAR_HASH_TABLE(*m_HashTable); + delete m_HashTable; + } + if (m_smallImageList) delete m_smallImageList; +} + +// delayed initialization - wait until first use (wxArtProv not created yet) +void wxFileIconsTable::Create() +{ + wxCHECK_RET(!m_smallImageList && !m_HashTable, wxT("creating icons twice")); + m_HashTable = new wxHashTable(wxKEY_STRING); + m_smallImageList = new wxImageList(16, 16); + + // folder: + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_CMN_DIALOG)); + // folder_open + m_smallImageList->Add(wxIcon(file_icons_tbl_folder_open_xpm)); + // computer + m_smallImageList->Add(wxIcon(file_icons_tbl_computer_xpm)); + // drive + m_smallImageList->Add(wxIcon(file_icons_tbl_drive_xpm)); + // cdrom + m_smallImageList->Add(wxIcon(file_icons_tbl_cdrom_xpm)); + // floppy + m_smallImageList->Add(wxIcon(file_icons_tbl_floppy_xpm)); + // removeable + m_smallImageList->Add(wxIcon(file_icons_tbl_removeable_xpm)); + // file + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_CMN_DIALOG)); + // executable + if (GetIconID(wxEmptyString, _T("application/x-executable")) == file) + { + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, wxART_CMN_DIALOG)); + delete m_HashTable->Get(_T("exe")); + m_HashTable->Delete(_T("exe")); + m_HashTable->Put(_T("exe"), new wxFileIconEntry(executable)); + } + /* else put into list by GetIconID + (KDE defines application/x-executable for *.exe and has nice icon) + */ +} + +wxImageList *wxFileIconsTable::GetSmallImageList() +{ + if (!m_smallImageList) + Create(); + + return m_smallImageList; +} + +#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 (!m_smallImageList) + Create(); + +#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); + + wxIconLocation iconLoc; + wxIcon ic; + if ( ft && ft->GetIcon(&iconLoc) ) + { + ic = wxIcon(iconLoc); + } + + delete ft; + + if ( !ic.Ok() ) + { + int newid = file; + m_HashTable->Put(extension, new wxFileIconEntry(newid)); + return newid; + } + + wxBitmap tmpBmp; + tmpBmp.CopyFromIcon(ic); + wxImage img = tmpBmp.ConvertToImage(); + + int id = m_smallImageList->GetImageCount(); + if (img.GetWidth() == 16 && img.GetHeight() == 16) + m_smallImageList->Add(wxBitmap(img)); + else + { + if (img.GetWidth() != 32 || img.GetHeight() != 32) + m_smallImageList->Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32))); + else + m_smallImageList->Add(CreateAntialiasedBitmap(img)); + } + m_HashTable->Put(extension, new wxFileIconEntry(id)); + return id; + +#else // !wxUSE_MIMETYPE + + if (extension == wxT("exe")) + return executable; + else + return file; +#endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE +} + #endif // wxUSE_DIRDLG