X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/267a7108512069169a855457d027cd68fed5bf2e..8fd0d89b7dc8ed4ed7e460ddc9b61ae4a0e63c3e:/src/generic/dirctrlg.cpp diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 173eb12a0e..4ff52eddb7 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -48,11 +48,15 @@ #ifdef __WXMSW__ #include + +#ifndef __GNUWIN32__ #include #include #include #endif +#endif + #ifdef __BORLANDC__ #include "dos.h" #endif @@ -293,7 +297,7 @@ static const int ID_CANCEL = 1003; static const int ID_NEW = 1004; //static const int ID_CHECK = 1005; -#ifdef __WXMSW__ +#if defined(__WXMSW__) static bool wxIsDriveAvailable(const wxString dirName) { #ifdef __WIN32__ @@ -306,6 +310,9 @@ static bool wxIsDriveAvailable(const wxString dirName) 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 = _chdrive( thisDrive ) ; @@ -315,6 +322,7 @@ static bool wxIsDriveAvailable(const wxString dirName) { success = FALSE; } +#endif } #ifdef __WIN32__ (void) SetErrorMode(errorMode); @@ -338,7 +346,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; } @@ -353,31 +362,6 @@ void wxDirItemDataEx::SetNewDirName( wxString path ) m_name = wxFileNameFromPath( path ); } -bool wxDirItemDataEx::HasSubDirs() -{ - if (m_path.IsEmpty()) - return TRUE; - - // On WIN32, must check if this volume is mounted or - // we get an error dialog for e.g. drive a: -#ifdef __WIN32__ - if (!wxIsDriveAvailable(m_path)) - return FALSE; -#endif - - wxString search = m_path; - - if (m_path.Last() != wxFILE_SEP_PATH) - { - search += wxString(wxFILE_SEP_PATH); - } - search += wxT("*"); - - wxLogNull log; - wxString path = wxFindFirstFile( search, wxDIR ); - return (bool)(!path.IsNull()); -} - //----------------------------------------------------------------------------- // wxGenericDirCtrl //----------------------------------------------------------------------------- @@ -414,7 +398,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; @@ -708,8 +692,8 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) if (!wxIsDriveAvailable(dirName)) { data->m_isExpanded = FALSE; - wxMessageBox(wxT("Sorry, this drive is not available.")); - return; + //wxMessageBox(wxT("Sorry, this drive is not available.")); + return; } #endif @@ -843,7 +827,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& long cookie; wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie); - while (childId != 0) + while (childId.IsOk()) { wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId); @@ -885,15 +869,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) @@ -906,7 +890,7 @@ 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); @@ -1179,13 +1163,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 ); @@ -1197,7 +1189,9 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, 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 @@ -1211,10 +1205,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(); @@ -1236,15 +1233,127 @@ void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& event) void wxGenericDirDialog::OnOK(wxCommandEvent& 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 ); }