X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/748fcded3c795db266076aac381aa335cc4aa42d..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/generic/dirdlgg.cpp?ds=sidebyside diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp index 0f62d9a1e2..14cf31b5a0 100644 --- a/src/generic/dirdlgg.cpp +++ b/src/generic/dirdlgg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dirdlg.cpp +// Name: src/generic/dirdlgg.cpp // Purpose: wxDirDialog // Author: Harm van der Heijden, Robert Roebling & Julian Smart // Modified by: @@ -9,112 +9,205 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dirdlgg.h" -#endif - - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/defs.h" - #if wxUSE_DIRDLG #ifndef WX_PRECOMP #include "wx/textctrl.h" #include "wx/button.h" + #include "wx/checkbox.h" #include "wx/sizer.h" - #include "wx/statline.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/msgdlg.h" + #include "wx/bmpbuttn.h" #endif -#include "wx/generic/dirctrlg.h" +#include "wx/statline.h" +#include "wx/dirctrl.h" #include "wx/generic/dirdlgg.h" +#include "wx/artprov.h" +#include "wx/menu.h" -//----------------------------------------------------------------------------- -// wxGenericDirDialog -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- static const int ID_DIRCTRL = 1000; static const int ID_TEXTCTRL = 1001; -static const int ID_OK = 1002; -static const int ID_CANCEL = 1003; static const int ID_NEW = 1004; -//static const int ID_CHECK = 1005; +static const int ID_SHOW_HIDDEN = 1005; +static const int ID_GO_HOME = 1006; + +//----------------------------------------------------------------------------- +// wxGenericDirDialog +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxGenericDirDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog) - EVT_BUTTON (wxID_OK, wxGenericDirDialog::OnOK) - 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) + EVT_BUTTON (wxID_OK, wxGenericDirDialog::OnOK) + EVT_BUTTON (ID_NEW, wxGenericDirDialog::OnNew) + EVT_BUTTON (ID_GO_HOME, wxGenericDirDialog::OnGoHome) + EVT_TREE_KEY_DOWN (wxID_ANY, wxGenericDirDialog::OnTreeKeyDown) + EVT_TREE_SEL_CHANGED (wxID_ANY, wxGenericDirDialog::OnTreeSelected) + EVT_TEXT_ENTER (ID_TEXTCTRL, wxGenericDirDialog::OnOK) + EVT_CHECKBOX (ID_SHOW_HIDDEN, wxGenericDirDialog::OnShowHidden) 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) + const wxPoint& pos, const wxSize& sz, + const wxString& name) +{ + Create(parent, title, defaultPath, style, pos, sz, name); +} + +bool wxGenericDirDialog::Create(wxWindow* parent, + const wxString& title, + const wxString& defaultPath, long style, + const wxPoint& pos, + const wxSize& sz, + const wxString& name) { wxBusyCursor cursor; + parent = GetParentForModalDialog(parent, style); + + if (!wxDirDialogBase::Create(parent, title, defaultPath, style, pos, sz, name)) + return false; + m_path = defaultPath; if (m_path == wxT("~")) - wxGetHomeDir( &m_path ); + wxGetHomeDir(&m_path); + if (m_path == wxT(".")) + m_path = wxGetCwd(); wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - // 1) dir ctrl - m_dirCtrl = NULL; // this is neccessary, event handler called from - // wxGenericDirCtrl would crash otherwise! - m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL, - m_path, wxPoint(5, 5), - wxSize(300, 200), - wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER); + // smartphones does not support or do not waste space for wxButtons +#if defined(__SMARTPHONE__) - topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 ); + wxMenu *dirMenu = new wxMenu; + dirMenu->Append(ID_GO_HOME, _("Home")); - // 2) text ctrl - m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition ); - topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 ); + if (!HasFlag(wxDD_DIR_MUST_EXIST)) + { + dirMenu->Append(ID_NEW, _("New directory")); + } -#if wxUSE_STATLINE - // 3) Static line - topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif + dirMenu->AppendCheckItem(ID_SHOW_HIDDEN, _("Show hidden directories")); + dirMenu->AppendSeparator(); + dirMenu->Append(wxID_CANCEL, _("Cancel")); - // 4) Buttons +#else + + // 0) 'New' and 'Home' Buttons wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL ); - wxButton* okButton = new wxButton(this, wxID_OK, _("OK")); - buttonsizer->Add( okButton, 0, wxLEFT|wxRIGHT, 10 ); - wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel")); - buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 ); + + // VS: 'Home directory' concept is unknown to MS-DOS +#if !defined(__DOS__) + wxBitmapButton* homeButton = + new wxBitmapButton(this, ID_GO_HOME, + wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON)); + buttonsizer->Add( homeButton, 0, wxLEFT|wxRIGHT, 10 ); +#endif // I'm not convinced we need a New button, and we tend to get annoying // accidental-editing with label editing enabled. - wxButton* newButton = new wxButton( this, wxID_NEW, _("New...") ); - buttonsizer->Add( newButton, 0, wxLEFT|wxRIGHT, 10 ); + if (!HasFlag(wxDD_DIR_MUST_EXIST)) + { + wxBitmapButton* newButton = + new wxBitmapButton(this, ID_NEW, + wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_BUTTON)); + buttonsizer->Add( newButton, 0, wxRIGHT, 10 ); +#if wxUSE_TOOLTIPS + newButton->SetToolTip(_("Create new directory")); +#endif + } + +#if wxUSE_TOOLTIPS + homeButton->SetToolTip(_("Go to home directory")); +#endif - topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 ); + topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 ); - okButton->SetDefault(); - m_dirCtrl->SetFocus(); +#endif // __SMARTPHONE__/!__SMARTPHONE__ - SetAutoLayout( TRUE ); + // 1) dir ctrl + m_dirCtrl = NULL; // this is necessary, event handler called from + // wxGenericDirCtrl would crash otherwise! + long dirStyle = wxDIRCTRL_DIR_ONLY | wxDEFAULT_CONTROL_BORDER; + +#ifdef __WXMSW__ + if (!HasFlag(wxDD_DIR_MUST_EXIST)) + { + // Only under Windows do we need the wxTR_EDIT_LABEL tree control style + // before we can call EditLabel (required for "New directory") + dirStyle |= wxDIRCTRL_EDIT_LABELS; + } +#endif + + m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL, + m_path, wxDefaultPosition, + wxSize(300, 200), + dirStyle); + + wxSizerFlags flagsBorder2; + flagsBorder2.DoubleBorder(wxTOP | wxLEFT | wxRIGHT); + + topsizer->Add(m_dirCtrl, wxSizerFlags(flagsBorder2).Proportion(1).Expand()); + +#ifndef __SMARTPHONE__ + // TODO: Make this an option depending on a flag? + wxCheckBox * + check = new wxCheckBox(this, ID_SHOW_HIDDEN, _("Show &hidden directories")); + topsizer->Add(check, wxSizerFlags(flagsBorder2).Right()); +#endif // !__SMARTPHONE__ + + // 2) text ctrl + m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition ); + topsizer->Add(m_input, wxSizerFlags(flagsBorder2).Expand()); + + // 3) buttons if any + wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL); + if ( buttonSizer ) + { + topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder()); + } + +#ifdef __SMARTPHONE__ + // overwrite menu set by CreateSeparatedButtonSizer() call above + SetRightMenu(wxID_ANY, _("Options"), dirMenu); +#endif + + m_input->SetFocus(); + + SetAutoLayout( true ); SetSizer( topsizer ); topsizer->SetSizeHints( this ); topsizer->Fit( this ); Centre( wxBOTH ); + + return true; +} + +void wxGenericDirDialog::EndModal(int retCode) +{ + // before proceeding, change the current working directory if user asked so + if (retCode == wxID_OK && HasFlag(wxDD_CHANGE_DIR)) + wxSetWorkingDirectory(m_path); + + wxDialog::EndModal(retCode); } void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) @@ -125,30 +218,36 @@ void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { m_path = m_input->GetValue(); + // Does the path exist? (User may have typed anything in m_input) - if (wxPathExists(m_path)) { + if (wxDirExists(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; - msg.Printf(_("The directory '%s' does not exist\nCreate it now?"), + msg.Printf(_("The directory '%s' does not exist\nCreate it now?"), m_path.c_str()); - wxMessageDialog dialog(this, msg, _("Directory does not exist"), + wxMessageDialog dialog(this, msg, _("Directory does not exist"), wxYES_NO | wxICON_WARNING); - if ( dialog.ShowModal() == wxID_YES ) { + if ( dialog.ShowModal() == wxID_YES ) + { // Okay, let's make it wxLogNull log; - if (wxMkdir(m_path)) { + if (wxMkdir(m_path)) + { // The new dir was created okay. EndModal(wxID_OK); return; } - else { + else + { // Trouble... - msg.Printf(_("Failed to create directory '%s'\n(Do you have the required permissions?)"), + msg.Printf(_("Failed to create directory '%s'\n(Do you have the required permissions?)"), m_path.c_str()); wxMessageDialog errmsg(this, msg, _("Error creating directory"), wxOK | wxICON_ERROR); errmsg.ShowModal(); @@ -180,10 +279,16 @@ void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event ) if (!m_dirCtrl) return; - wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(event.GetItem()); + wxTreeItemId item = event.GetItem(); + + wxDirItemData *data = NULL; + + if(item.IsOk()) + data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(item); + if (data) m_input->SetValue( data->m_path ); -}; +} void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) ) { @@ -193,13 +298,21 @@ void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) ) wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection()); if (data) m_input->SetValue( data->m_path ); -}; +} + +void wxGenericDirDialog::OnShowHidden( wxCommandEvent& event ) +{ + if (!m_dirCtrl) + return; + + m_dirCtrl->ShowHidden( event.GetInt() != 0 ); +} 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())) + (m_dirCtrl->GetTreeCtrl()->GetItemParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem())) { wxMessageDialog msg(this, _("You cannot add a new directory to this section."), _("Create directory"), wxOK | wxICON_INFORMATION ); @@ -207,16 +320,16 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) return; } - wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetParent( id ); + wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetItemParent( id ); wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent ); wxASSERT( data ); wxString new_name( _("NewName") ); wxString path( data->m_path ); - if (path.Last() != wxFILE_SEP_PATH) + if (!wxEndsWithPathSeparator(path)) path += wxFILE_SEP_PATH; path += new_name; - if (wxFileExists(path)) + if (wxDirExists(path)) { // try NewName0, NewName1 etc. int i = 0; @@ -227,11 +340,11 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) new_name += num; path = data->m_path; - if (path.Last() != wxFILE_SEP_PATH) + if (!wxEndsWithPathSeparator(path)) path += wxFILE_SEP_PATH; path += new_name; i++; - } while (wxFileExists(path)); + } while (wxDirExists(path)); } wxLogNull log; @@ -242,7 +355,7 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) return; } - wxDirItemData *new_data = new wxDirItemData( path, new_name, TRUE ); + wxDirItemData *new_data = new wxDirItemData( path, new_name, true ); // TODO: THIS CODE DOESN'T WORK YET. We need to avoid duplication of the first child // of the parent. @@ -251,4 +364,9 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) m_dirCtrl->GetTreeCtrl()->EditLabel( new_id ); } +void wxGenericDirDialog::OnGoHome(wxCommandEvent& WXUNUSED(event)) +{ + SetPath(wxGetUserHome()); +} + #endif // wxUSE_DIRDLG