X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51a58d8b4bb58b66ec84dc94c56fe328d77c904a..aaf765a54931a3add43bcf68cec8c80f0b66b18a:/src/generic/dirctrlg.cpp?ds=sidebyside diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 33a6be8d05..7df3852fe2 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "dirctrl.h" +#pragma implementation "dirctrlg.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -20,13 +20,14 @@ #pragma hdrstop #endif -#include "wx/defs.h" +#if wxUSE_DIRDLG #include "wx/utils.h" #include "wx/dialog.h" #include "wx/button.h" #include "wx/layout.h" #include "wx/msgdlg.h" +#include "wx/textctrl.h" #include "wx/textdlg.h" #include "wx/filefn.h" #include "wx/cmndata.h" @@ -38,6 +39,7 @@ #include "wx/sizer.h" #include "wx/tokenzr.h" #include "wx/dir.h" +#include "wx/settings.h" #if wxUSE_STATLINE #include "wx/statline.h" @@ -46,17 +48,39 @@ #include "wx/generic/dirctrlg.h" #ifdef __WXMSW__ +#include + +#ifndef __GNUWIN32__ #include #include #include #endif +#endif + +#ifdef __WXPM__ + +#define INCL_BASE +#include +#include +#include +#include + +#endif // __WXPM__ + +#if defined(__WXMAC__) +# include "MoreFilesExtras.h" +#endif + +#ifdef __BORLANDC__ +#include "dos.h" +#endif + // If compiled under Windows, this macro can cause problems #ifdef GetFirstChild #undef GetFirstChild #endif -#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW /* Closed folder */ static char * icon1_xpm[] = { /* width height ncolors chars_per_pixel */ @@ -120,9 +144,9 @@ static char * icon3_xpm[] = { /* width height ncolors chars_per_pixel */ "16 16 3 1", /* colors */ -" s None c None", -". c #000000", -"+ c #ffffff", +" s None c None", +". c #000000", +"+ c #ffffff", /* pixels */ " ", " ........ ", @@ -144,13 +168,13 @@ static char * icon3_xpm[] = { /* Computer */ static 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", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c #008080", +"@ c Blue", " ........... ", " .XXXXXXXXXX.o", " .OOOOOOOOO..o", @@ -171,13 +195,13 @@ static char * icon4_xpm[] = { /* Drive */ static 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", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c Green", +"@ c #008000", " ", " ", " ", @@ -198,16 +222,16 @@ static char * icon5_xpm[] = { /* CD-ROM */ static 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", +" 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+ ", @@ -228,13 +252,13 @@ static char *icon6_xpm[] = { /* Floppy */ static 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", +" s None c None", +". c #808080", +"X c Gray100", +"o c #c0c0c0", +"O c Black", +"+ c Cyan", +"@ c Red", " ......X", " .ooooooO", " .+++++OO", @@ -255,13 +279,13 @@ static char * icon7_xpm[] = { /* Removeable */ static 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", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c Red", +"@ c #800000", " ", " ", " ", @@ -278,7 +302,6 @@ static char * icon8_xpm[] = { " ", " ", " "}; -#endif // !wxMSW static const int ID_DIRCTRL = 1000; static const int ID_TEXTCTRL = 1001; @@ -287,6 +310,75 @@ static const int ID_CANCEL = 1003; static const int ID_NEW = 1004; //static const int ID_CHECK = 1005; +#if defined(__WXMSW__) || defined(__WXPM__) +int setdrive(int drive) +{ + wxChar newdrive[3]; + + if (drive < 1 || drive > 31) + return -1; + newdrive[0] = (wxChar)(wxT('A') + drive - 1); + 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)) +#endif + return 0; + else + return -1; +} + +static bool wxIsDriveAvailable(const wxString dirName) +{ +#ifdef __WIN32__ + UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); +#endif + bool success = TRUE; + + // Check if this is a root directory and if so, + // whether the drive is avaiable. + if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':')) + { + wxString dirNameLower(dirName.Lower()); +#if defined(__GNUWIN32__) + success = wxPathExists(dirNameLower); +#else + int currentDrive = _getdrive(); + int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ; + int err = setdrive( thisDrive ) ; + setdrive( currentDrive ); + + if (err == -1) + { + success = FALSE; + } +#endif + } +#ifdef __WIN32__ + (void) SetErrorMode(errorMode); +#endif + + return success; +} +#endif + +// 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) +{ + wxString *strFirst = (wxString *)first; + wxString *strSecond = (wxString *)second; + + return strFirst->CmpNoCase(*strSecond); +} + //----------------------------------------------------------------------------- // wxDirItemDataEx //----------------------------------------------------------------------------- @@ -301,7 +393,8 @@ wxDirItemDataEx::wxDirItemDataEx(const wxString& path, const wxString& name, * For FileNameFromPath read LastDirNameInThisPath ;-) */ // m_isHidden = (bool)(wxFileNameFromPath(*m_path)[0] == '.'); m_isHidden = FALSE; - m_hasSubDirs = HasSubDirs(); + // m_hasSubDirs is no longer needed + m_hasSubDirs = TRUE; // HasSubDirs(); m_isExpanded = FALSE; m_isDir = isDir; } @@ -316,14 +409,6 @@ void wxDirItemDataEx::SetNewDirName( wxString path ) m_name = wxFileNameFromPath( path ); } -bool wxDirItemDataEx::HasSubDirs() -{ - wxString search = m_path + wxT("/*"); - wxLogNull log; - wxString path = wxFindFirstFile( search, wxDIR ); - return (bool)(!path.IsNull()); -} - //----------------------------------------------------------------------------- // wxGenericDirCtrl //----------------------------------------------------------------------------- @@ -360,7 +445,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, Init(); - long treeStyle = wxTR_HAS_BUTTONS; + long treeStyle = wxTR_HAS_BUTTONS ; // | wxTR_EDIT_LABELS; if ((style & wxDIRCTRL_3D_INTERNAL) == 0) treeStyle |= wxNO_BORDER; @@ -382,7 +467,6 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, m_filterListCtrl->FillFilterList(filter, defaultFilter); m_imageList = new wxImageList(16, 16, TRUE); -#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW m_imageList->Add(wxIcon(icon1_xpm)); m_imageList->Add(wxIcon(icon2_xpm)); m_imageList->Add(wxIcon(icon3_xpm)); @@ -391,18 +475,6 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, m_imageList->Add(wxIcon(icon6_xpm)); m_imageList->Add(wxIcon(icon7_xpm)); m_imageList->Add(wxIcon(icon8_xpm)); -#elif defined(__WXMSW__) - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CLOSED_FOLDER"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_OPEN_FOLDER"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_COMPUTER"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_DRIVE"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CDROM"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FLOPPY"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_REMOVEABLE"), wxBITMAP_TYPE_RESOURCE)); -#else -#error "Sorry, we don't have icons available for this platforms." -#endif m_treeCtrl->SetImageList(m_imageList); m_showHidden = FALSE; @@ -410,7 +482,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, wxString rootName; -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) rootName = _("Computer"); #else rootName = _("Sections"); @@ -439,7 +511,6 @@ void wxGenericDirCtrl::Init() { m_showHidden = FALSE; m_imageList = NULL; - m_rootId = 0; m_currentFilter = 0; m_currentFilterStr = wxEmptyString; // Default: any file m_treeCtrl = NULL; @@ -450,13 +521,13 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in { wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,name,TRUE); -#ifdef __WXMSW__ - // Windows: sections are displayed as drives +#if defined(__WXMSW__) || defined(__WXPM__) + // Windows and OS/2: sections are displayed as drives wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item); #else // Unix: sections are displayed as folders wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, 0, -1, dir_item); - SetItemImage( id, 1, wxTreeItemIcon_Expanded ); + m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded ); #endif // TODO: other operating systems. @@ -465,9 +536,9 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in void wxGenericDirCtrl::SetupSections() { -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) -#ifdef __WIN32__ +# ifdef __WIN32__ wxChar driveBuffer[256]; size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer); size_t i = 0; @@ -509,13 +580,10 @@ void wxGenericDirCtrl::SetupSections() if (driveBuffer[i] == wxT('\0')) break; } -#else +# else int drive; int currentDrive; - /* Save current drive. */ - currentDrive = _getdrive(); - /* If we can switch to the drive, it exists. */ for( drive = 1; drive <= 26; drive++ ) { @@ -523,28 +591,33 @@ void wxGenericDirCtrl::SetupSections() path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1)); name.Printf(wxT("(%c:)"), (char) (drive + 'a' - 1)); - if( !_chdrive( drive ) ) + if (wxIsDriveAvailable(path)) { - + AddSection(path, name); } } - - /* Restore original drive.*/ - _chdrive( currentDrive ); -#endif - +# endif +#elif defined(__WXMAC__) + 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, 0); + } #else - wxString home; - AddSection(wxT("/"), _("The Computer"), 0) - wxGetHomeDir(&home); - AddSection(home, _("My Home"), 0 ) - AddSection(wxT("/mnt"), _("Mounted Devices"), 0 ) - AddSection(wxT("/usr/local"), _("User Local"), 0 ) - AddSection(wxT("/usr"), _("User"), 0 ) - AddSection(wxT("/var"), _("Variables"), 0 ) - AddSection(wxT("/etc"), _("Etcetera"), 0 ) - AddSection(wxT("/tmp"), _("Temporary"), 0 ) + AddSection(wxT("/"), _("The Computer"), 0); + AddSection(wxGetHomeDir(), _("My Home"), 0 ); + AddSection(wxT("/mnt"), _("Mounted Devices"), 0 ); + AddSection(wxT("/usr/local"), _("User Local"), 0 ); + AddSection(wxT("/usr"), _("User"), 0 ); + AddSection(wxT("/var"), _("Variables"), 0 ); + AddSection(wxT("/etc"), _("Etcetera"), 0 ); + AddSection(wxT("/tmp"), _("Temporary"), 0 ); #endif } @@ -583,7 +656,7 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event) wxASSERT( data ); wxString new_name( wxPathOnly( data->m_path ) ); - new_name += wxT("/"); + new_name += wxString(wxFILE_SEP_PATH); new_name += event.GetLabel(); wxLogNull log; @@ -657,29 +730,21 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxString dirName(data->m_path); -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) // Check if this is a root directory and if so, // whether the drive is avaiable. - if (dirName.Len() == 3 && dirName[1] == wxT(':')) + if (!wxIsDriveAvailable(dirName)) { - int currentDrive = _getdrive(); - int thisDrive = (int) (dirName[0] - 'a' + 1) ; - int err = _chdrive( thisDrive ) ; - _chdrive( currentDrive ); - - if (err == -1) - { - data->m_isExpanded = FALSE; - wxMessageBox(wxT("Sorry, this drive is not available.")); - return; - } + data->m_isExpanded = FALSE; + //wxMessageBox(wxT("Sorry, this drive is not available.")); + return; } #endif // This may take a longish time. Go to busy cursor wxBusyCursor busy; -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) if (dirName.Last() == ':') dirName += wxString(wxFILE_SEP_PATH); #endif @@ -690,6 +755,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxDir d; wxString eachFilename; + wxLogNull log; d.Open(dirName); if (d.IsOpened()) @@ -706,13 +772,15 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) while (d.GetNext(& eachFilename)) ; } } - dirs.Sort(); + dirs.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction); // Now do the filenames -- but only if we're allowed to if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0) { + wxLogNull log; + d.Open(dirName); - + if (d.IsOpened()) { if (d.GetFirst(& eachFilename, m_currentFilterStr, wxDIR_FILES)) @@ -727,7 +795,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) while (d.GetNext(& eachFilename)) ; } } - filenames.Sort(); + filenames.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction); } // Add the sorted dirs @@ -743,7 +811,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,TRUE); wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 0, -1, dir_item); m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded ); - + // Has this got any children? If so, make it expandable. int options = wxDIR_DEFAULT; if (GetWindowStyle() & wxDIRCTRL_DIR_ONLY) // If only showing dirs, then we specify dirs only here @@ -751,14 +819,18 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) options = wxDIR_DIRS; } - wxDir dir2(path); - wxString str; - // Have to test for wxDIR_DIRS separately in case m_currentFilterStr is non-empty and - // and filters out any directories - if (dir2.GetFirst(& str, m_currentFilterStr, options) || dir2.GetFirst(& str, wxEmptyString, wxDIR_DIRS)) + wxLogNull log; + wxDir dir2; + if (dir2.Open(path)) { - m_treeCtrl->SetItemHasChildren(id); - } + wxString str; + // Have to test for wxDIR_DIRS separately in case m_currentFilterStr is non-empty and + // and filters out any directories + if (dir2.GetFirst(& str, m_currentFilterStr, options) || dir2.GetFirst(& str, wxEmptyString, wxDIR_DIRS)) + { + m_treeCtrl->SetItemHasChildren(id); + } + } } // Add the sorted filenames @@ -773,7 +845,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) path += eachFilename; //path = dirName + wxString(wxT("/")) + eachFilename; wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,FALSE); - wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item); + (void)m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item); } } } @@ -784,36 +856,36 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& path, bool& done) { wxString path2(path); - + // Make sure all separators are as per the current platform path2.Replace(wxT("\\"), wxString(wxFILE_SEP_PATH)); path2.Replace(wxT("/"), wxString(wxFILE_SEP_PATH)); - + // Append a separator to foil bogus substring matching path2 += wxString(wxFILE_SEP_PATH); - - // In MSW, case is not significant -#ifdef __WXMSW__ + + // In MSW or PM, case is not significant +#if defined(__WXMSW__) || defined(__WXPM__) path2.MakeLower(); #endif - + long cookie; wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie); - while (childId != 0) + while (childId.IsOk()) { wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId); - + if (data && data->m_path != "") { wxString childPath(data->m_path); if (childPath.Last() != wxFILE_SEP_PATH) childPath += wxString(wxFILE_SEP_PATH); - - // In MSW, case is not significant -#ifdef __WXMSW__ + + // In MSW and PM, case is not significant +#if defined(__WXMSW__) || defined(__WXPM__) childPath.MakeLower(); #endif - + if (childPath.Len() <= path2.Len()) { wxString path3 = path2.Mid(0, childPath.Len()); @@ -827,10 +899,11 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& } } } - + childId = m_treeCtrl->GetNextChild(childId, cookie); } - return 0; + wxTreeItemId invalid; + return invalid; } // Try to expand as much of the given path as possible, @@ -840,15 +913,15 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path) bool done = FALSE; wxTreeItemId id = FindChild(m_rootId, path, done); wxTreeItemId lastId = id; // The last non-zero id - while ((id > 0) && !done) + while (id.IsOk() && !done) { ExpandDir(id); id = FindChild(id, path, done); - if (id != 0) + if (id.IsOk()) lastId = id; } - if (lastId > 0) + if (lastId.IsOk()) { wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(lastId); if (data->m_isDir) @@ -861,10 +934,10 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path) long cookie; wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie); bool selectedChild = FALSE; - while (childId != 0) + while (childId.IsOk()) { wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId); - + if (data && data->m_path != "" && !data->m_isDir) { m_treeCtrl->SelectItem(childId); @@ -941,7 +1014,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayStri wxString dirName(data->m_path); -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) if (dirName.Last() == ':') dirName += wxString(wxFILE_SEP_PATH); #endif @@ -949,6 +1022,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayStri wxDir d; wxString eachFilename; + wxLogNull log; d.Open(dirName); if (d.IsOpened()) @@ -1001,8 +1075,8 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin description = descriptions[n]; return TRUE; } - else - return FALSE; + + return FALSE; } // Parses the global filter, returning the number of filters. @@ -1067,7 +1141,7 @@ void wxGenericDirCtrl::DoResize() } -void wxGenericDirCtrl::OnSize(wxSizeEvent &event) +void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) { DoResize(); } @@ -1096,12 +1170,12 @@ void wxDirFilterListCtrl::Init() m_dirCtrl = NULL; } -void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& event) +void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event)) { int sel = GetSelection(); wxString currentPath = m_dirCtrl->GetPath(); - + m_dirCtrl->SetFilterIndex(sel); // If the filter has changed, the view is out of date, so @@ -1133,13 +1207,21 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog) EVT_BUTTON(wxID_OK, wxGenericDirDialog::OnOK) + EVT_BUTTON(wxID_NEW, wxGenericDirDialog::OnNew) + EVT_BUTTON (wxID_NEW, wxGenericDirDialog::OnNew) EVT_CLOSE(wxGenericDirDialog::OnCloseWindow) + EVT_TREE_KEY_DOWN (-1, wxGenericDirDialog::OnTreeKeyDown) + EVT_TREE_SEL_CHANGED (-1, wxGenericDirDialog::OnTreeSelected) + EVT_TEXT_ENTER (ID_TEXTCTRL, wxGenericDirDialog::OnOK) END_EVENT_TABLE() wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, const wxString& defaultPath, long style, const wxPoint& pos, const wxSize& sz, const wxString& name): wxDialog(parent, ID_DIRCTRL, title, pos, sz, style, name) { + m_dirCtrl = NULL; + m_path = defaultPath; + wxBusyCursor cursor; wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); @@ -1147,11 +1229,13 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, // 1) dir ctrl m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL, defaultPath, wxPoint(5, 5), - wxSize(300, 200), wxDIRCTRL_DIR_ONLY); + wxSize(300, 200), wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER); topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 ); - // 2) TODO: text control for entering path? + // 2) text ctrl + m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition ); + topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 ); #if wxUSE_STATLINE // 3) Static line @@ -1165,10 +1249,13 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel")); buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 ); -/* TODO: new directory button - wxButton* newButton = new wxButton( this, ID_NEW, _("New...") ); + // I'm not convinced we need a New button, and we tend to get annoying + // accidental-editing with label editing enabled. +#if 0 + wxButton* newButton = new wxButton( this, wxID_NEW, _("New...") ); buttonsizer->Add( newButton, 0, wxLEFT|wxRIGHT, 10 ); -*/ +#endif + topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 ); okButton->SetDefault(); @@ -1183,22 +1270,136 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, Centre( wxBOTH ); } -void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& event) +void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { EndModal(wxID_CANCEL); } -void wxGenericDirDialog::OnOK(wxCommandEvent& event) +void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { - EndModal(wxID_OK); + m_path = m_input->GetValue(); + // Does the path exist? (User may have typed anything in m_input) + if (wxPathExists(m_path)) { + // OK, path exists, we're done. + EndModal(wxID_OK); + return; + } + // Interact with user, find out if the dir is a typo or to be created + wxString msg( _("The directory ") ); + msg = msg + m_path; + msg = msg + _("\ndoes not exist\nCreate it now?") ; + wxMessageDialog dialog(this, msg, _("Directory does not exist"), wxYES_NO | wxICON_WARNING ); + if ( dialog.ShowModal() == wxID_YES ) { + // Okay, let's make it + wxLogNull log; + if (wxMkdir(m_path)) { + // The new dir was created okay. + EndModal(wxID_OK); + return; + } + else { + // Trouble... + msg = _("Failed to create directory ")+m_path+ + _("\n(Do you have the required permissions?)"); + wxMessageDialog errmsg(this, msg, _("Error creating directory"), wxOK | wxICON_ERROR); + errmsg.ShowModal(); + // We still don't have a valid dir. Back to the main dialog. + } + } + // User has answered NO to create dir. } void wxGenericDirDialog::SetPath(const wxString& path) { m_dirCtrl->SetPath(path); + m_path = path; } wxString wxGenericDirDialog::GetPath(void) const { - return m_dirCtrl->GetPath(); + return m_path; +} + +int wxGenericDirDialog::ShowModal() +{ + //m_input->SetValue( m_path ); + return wxDialog::ShowModal(); +} + +void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event ) +{ + if (!m_dirCtrl) + return; + + wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData(event.GetItem()); + if (data) + m_input->SetValue( data->m_path ); +}; + +void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) ) +{ + if (!m_dirCtrl) + return; + + wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection()); + if (data) + m_input->SetValue( data->m_path ); +}; + +void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) +{ + wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection(); + if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) || + (m_dirCtrl->GetTreeCtrl()->GetParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem())) + { + wxMessageDialog msg(this, _("You cannot add a new directory to this section."), + _("Create directory"), wxOK | wxICON_INFORMATION ); + msg.ShowModal(); + return; + } + + wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetParent( id ); + wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent ); + wxASSERT( data ); + + wxString new_name( wxT("NewName") ); + wxString path( data->m_path ); + if (path.Last() != wxFILE_SEP_PATH) + path += wxFILE_SEP_PATH; + path += new_name; + if (wxFileExists(path)) + { + // try NewName0, NewName1 etc. + int i = 0; + do { + new_name = wxT("NewName"); + wxString num; + num.Printf( wxT("%d"), i ); + new_name += num; + + path = data->m_path; + if (path.Last() != wxFILE_SEP_PATH) + 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; + } + + wxDirItemDataEx *new_data = new wxDirItemDataEx( path, new_name, TRUE ); + + // TODO: THIS CODE DOESN'T WORK YET. We need to avoid duplication of the first child + // of the parent. + wxTreeItemId new_id = m_dirCtrl->GetTreeCtrl()->AppendItem( parent, new_name, 0, 0, new_data ); + m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id ); + m_dirCtrl->GetTreeCtrl()->EditLabel( new_id ); } + +#endif // wxUSE_DIRDLG