X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b50747ea53f4a9906d572d4bca4e452e66c8dbd5..b30661fdd01159eceffd1a35dcc51b8a4d803854:/src/generic/dirdlgg.cpp diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp index e52fea9d91..f3a8fd5a5c 100644 --- a/src/generic/dirdlgg.cpp +++ b/src/generic/dirdlgg.cpp @@ -26,13 +26,14 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/msgdlg.h" + #include "wx/bmpbuttn.h" #endif #include "wx/statline.h" #include "wx/dirctrl.h" #include "wx/generic/dirdlgg.h" #include "wx/artprov.h" -#include "wx/bmpbuttn.h" +#include "wx/menu.h" // ---------------------------------------------------------------------------- // constants @@ -44,20 +45,6 @@ static const int ID_NEW = 1004; static const int ID_SHOW_HIDDEN = 1005; static const int ID_GO_HOME = 1006; -// --------------------------------------------------------------------------- -// macros -// --------------------------------------------------------------------------- - -/* Macro for avoiding #ifdefs when value have to be different depending on size of - device we display on - take it from something like wxDesktopPolicy in the future - */ - -#if defined(__SMARTPHONE__) - #define wxLARGESMALL(large,small) small -#else - #define wxLARGESMALL(large,small) large -#endif - //----------------------------------------------------------------------------- // wxGenericDirDialog //----------------------------------------------------------------------------- @@ -78,19 +65,25 @@ END_EVENT_TABLE() wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, const wxString& defaultPath, long style, const wxPoint& pos, const wxSize& sz, - const wxString& name): - wxDirDialogBase(parent, title, defaultPath, style, pos, sz, name) + 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) +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); + + if (!wxDirDialogBase::Create(parent, title, defaultPath, style, pos, sz, name)) + return false; + m_path = defaultPath; if (m_path == wxT("~")) wxGetHomeDir(&m_path); @@ -105,7 +98,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent, const wxString& title, wxMenu *dirMenu = new wxMenu; dirMenu->Append(ID_GO_HOME, _("Home")); - if (style & wxDD_NEW_DIR_BUTTON) + if (!HasFlag(wxDD_DIR_MUST_EXIST)) { dirMenu->Append(ID_NEW, _("New directory")); } @@ -129,7 +122,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent, const wxString& title, // I'm not convinced we need a New button, and we tend to get annoying // accidental-editing with label editing enabled. - if (style & wxDD_NEW_DIR_BUTTON) + if (!HasFlag(wxDD_DIR_MUST_EXIST)) { wxBitmapButton* newButton = new wxBitmapButton(this, ID_NEW, @@ -154,7 +147,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent, const wxString& title, long dirStyle = wxDIRCTRL_DIR_ONLY | wxDEFAULT_CONTROL_BORDER; #ifdef __WXMSW__ - if (style & wxDD_NEW_DIR_BUTTON) + 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") @@ -167,32 +160,31 @@ bool wxGenericDirDialog::Create(wxWindow* parent, const wxString& title, wxSize(300, 200), dirStyle); - topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, wxLARGESMALL(10,0) ); + wxSizerFlags flagsBorder2; + flagsBorder2.DoubleBorder(wxTOP | wxLEFT | wxRIGHT); + + topsizer->Add(m_dirCtrl, wxSizerFlags(flagsBorder2).Proportion(1).Expand()); #ifndef __SMARTPHONE__ // Make the an option depending on a flag? - wxCheckBox* check = new wxCheckBox( this, ID_SHOW_HIDDEN, _("Show hidden directories") ); - topsizer->Add( check, 0, wxLEFT|wxRIGHT|wxTOP | wxALIGN_RIGHT, 10 ); + 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, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, wxLARGESMALL(10,0) ); + topsizer->Add(m_input, wxSizerFlags(flagsBorder2).Expand()); // 3) buttons if any - wxSizer *buttonSizer = CreateButtonSizer( wxOK|wxCANCEL , true, wxLARGESMALL(10,0) ); - if(buttonSizer->GetChildren().GetCount() > 0 ) - { - topsizer->Add( buttonSizer, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) ); - } - else + wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL); + if ( buttonSizer ) { - topsizer->AddSpacer( wxLARGESMALL(10,0) ); - delete buttonSizer; + topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder()); } #ifdef __SMARTPHONE__ - // overwrite menu achieved with earlier CreateButtonSizer() call + // overwrite menu set by CreateSeparatedButtonSizer() call above SetRightMenu(wxID_ANY, _("Options"), dirMenu); #endif @@ -209,6 +201,15 @@ bool wxGenericDirDialog::Create(wxWindow* parent, const wxString& title, 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)) { EndModal(wxID_CANCEL); @@ -217,12 +218,15 @@ 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 (wxDirExists(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?"), @@ -230,15 +234,18 @@ void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event)) 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?)"), m_path.c_str());