X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b98a2524ef29bad7a644bfd329e335d6db3bde8..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/generic/filedlgg.cpp?ds=sidebyside diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index ca936c346b..a39f76d034 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -1,4 +1,4 @@ -///////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// // Name: filedlgg.cpp // Purpose: wxGenericFileDialog // Author: Robert Roebling @@ -23,7 +23,7 @@ #if wxUSE_FILEDLG // NOTE : it probably also supports MAC, untested -#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) +#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) #error wxGenericFileDialog currently only supports Unix, win32 and DOS #endif @@ -43,6 +43,7 @@ #include "wx/imaglist.h" #include "wx/dir.h" #include "wx/artprov.h" +#include "wx/settings.h" #include "wx/file.h" // for wxS_IXXX constants only #include "wx/filedlg.h" // wxOPEN, wxSAVE... #include "wx/generic/filedlgg.h" @@ -82,7 +83,7 @@ // ---------------------------------------------------------------------------- static -int wxFileDataNameCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long data) { wxFileData *fd1 = (wxFileData*)data1; wxFileData *fd2 = (wxFileData*)data2; @@ -94,7 +95,7 @@ int wxFileDataNameCompare( long data1, long data2, long data) } static -int wxFileDataSizeCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataSizeCompare( long data1, long data2, long data) { wxFileData *fd1 = (wxFileData*)data1; wxFileData *fd2 = (wxFileData*)data2; @@ -108,7 +109,7 @@ int wxFileDataSizeCompare( long data1, long data2, long data) } static -int wxFileDataTypeCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataTypeCompare( long data1, long data2, long data) { wxFileData *fd1 = (wxFileData*)data1; wxFileData *fd2 = (wxFileData*)data2; @@ -122,7 +123,7 @@ int wxFileDataTypeCompare( long data1, long data2, long data) } static -int wxFileDataTimeCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data) { wxFileData *fd1 = (wxFileData*)data1; wxFileData *fd2 = (wxFileData*)data2; @@ -134,11 +135,11 @@ int wxFileDataTimeCompare( long data1, long data2, long data) return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data); } -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__OS2__) #define IsTopMostDir(dir) (dir == wxT("/")) #endif -#if defined(__DOS__) || defined(__WINDOWS__) +#if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__) #define IsTopMostDir(dir) (dir.IsEmpty()) #endif @@ -154,17 +155,6 @@ extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, w // wxFileData //----------------------------------------------------------------------------- -wxFileData::wxFileData( const wxFileData& fileData ) -{ - m_fileName = fileData.GetFileName(); - m_filePath = fileData.GetFilePath(); - m_size = fileData.GetSize(); - m_dateTime = fileData.GetDateTime(); - m_permissions = fileData.GetPermissions(); - m_type = fileData.GetType(); - m_image = GetImageId(); -} - wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id ) { m_fileName = fileName; @@ -175,6 +165,17 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file ReadData(); } +void wxFileData::Copy( const wxFileData& fileData ) +{ + m_fileName = fileData.GetFileName(); + m_filePath = fileData.GetFilePath(); + m_size = fileData.GetSize(); + m_dateTime = fileData.GetDateTime(); + m_permissions = fileData.GetPermissions(); + m_type = fileData.GetType(); + m_image = GetImageId(); +} + void wxFileData::ReadData() { if (IsDrive()) @@ -183,7 +184,7 @@ void wxFileData::ReadData() return; } -#if defined(__DOS__) || defined(__WINDOWS__) +#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) // c:\.. is a drive don't stat it if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5)) { @@ -195,7 +196,7 @@ void wxFileData::ReadData() wxStructStat buff; -#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS)) +#if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS)) lstat( m_filePath.fn_str(), &buff ); m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0; #else // no lstat() @@ -208,13 +209,16 @@ void wxFileData::ReadData() // try to get a better icon if (m_image == wxFileIconsTable::file) { - if (IsExe()) + if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND) + { + m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.'))); + } else if (IsExe()) + { m_image = wxFileIconsTable::executable; - else if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND) - m_image = wxTheFileIconsTable->GetIconID(m_fileName.AfterLast(wxT('.'))); + } } - m_size = buff.st_size; + m_size = (long)buff.st_size; m_dateTime = buff.st_mtime; @@ -250,7 +254,7 @@ wxString wxFileData::GetFileType() const return _(""); else if (IsDrive()) return _(""); - else if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND) + else if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND) return m_fileName.AfterLast(wxT('.')); return wxEmptyString; @@ -343,8 +347,9 @@ void wxFileData::MakeItem( wxListItem &item ) if (IsLink()) { - wxColour *dg = wxTheColourDatabase->FindColour( _T("MEDIUM GREY") ); - item.SetTextColour(*dg); + wxColour dg = wxTheColourDatabase->Find( _T("MEDIUM GREY") ); + if ( dg.Ok() ) + item.SetTextColour(dg); } item.m_data = (long)this; } @@ -356,15 +361,16 @@ void wxFileData::MakeItem( wxListItem &item ) IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl) BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl) - EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem) - EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit) - EVT_LIST_COL_CLICK(-1, wxFileCtrl::OnListColClick) + EVT_LIST_DELETE_ITEM(wxID_ANY, wxFileCtrl::OnListDeleteItem) + EVT_LIST_DELETE_ALL_ITEMS(wxID_ANY, wxFileCtrl::OnListDeleteAllItems) + EVT_LIST_END_LABEL_EDIT(wxID_ANY, wxFileCtrl::OnListEndLabelEdit) + EVT_LIST_COL_CLICK(wxID_ANY, wxFileCtrl::OnListColClick) END_EVENT_TABLE() wxFileCtrl::wxFileCtrl() { - m_showHidden = FALSE; + m_showHidden = false; m_sort_foward = 1; m_sort_field = wxFileData::FileList_Name; } @@ -470,7 +476,7 @@ void wxFileCtrl::UpdateItem(const wxListItem &item) fd->ReadData(); SetItemText(item, fd->GetFileName()); - SetItemImage(item, fd->GetImageId(), fd->GetImageId()); + SetItemImage(item, fd->GetImageId()); if (GetWindowStyleFlag() & wxLC_REPORT) { @@ -487,15 +493,13 @@ void wxFileCtrl::UpdateFiles() wxBusyCursor bcur; // this may take a while... - FreeAllItemsData(); DeleteAllItems(); - wxFileData *fd = (wxFileData *) NULL; wxListItem item; item.m_itemId = 0; item.m_col = 0; -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__WXPM__) +#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__) if ( IsTopMostDir(m_dirName) ) { wxArrayString names, paths; @@ -504,9 +508,11 @@ void wxFileCtrl::UpdateFiles() for (n=0; nRead(wxT("/wxWindows/wxFileDialog/ViewStyle"), &ms_lastViewStyle); @@ -874,13 +903,6 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, m_path += defaultFile; m_filterExtension = wxEmptyString; - // interpret wildcards - wxArrayString wildDescriptions, wildFilters; - if ( !ParseWildcard(m_wildCard, wildDescriptions, wildFilters) ) - { - wxFAIL_MSG( wxT("Wrong file type description") ); - } - // layout bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); @@ -892,14 +914,14 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, wxBitmapButton *but; but = new wxBitmapButton(this, ID_LIST_MODE, - wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_BUTTON)); #if wxUSE_TOOLTIPS but->SetToolTip( _("View files as a list view") ); #endif buttonsizer->Add( but, 0, wxALL, 5 ); but = new wxBitmapButton(this, ID_REPORT_MODE, - wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_BUTTON)); #if wxUSE_TOOLTIPS but->SetToolTip( _("View files as a detailed view") ); #endif @@ -908,7 +930,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, buttonsizer->Add( 30, 5, 1 ); m_upDirButton = new wxBitmapButton(this, ID_UP_DIR, - wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_BUTTON)); #if wxUSE_TOOLTIPS m_upDirButton->SetToolTip( _("Go to parent directory") ); #endif @@ -916,7 +938,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, #ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS... but = new wxBitmapButton(this, ID_PARENT_DIR, - wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON)); #if wxUSE_TOOLTIPS but->SetToolTip( _("Go to home directory") ); #endif @@ -926,7 +948,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, #endif //!__DOS__ m_newDirButton = new wxBitmapButton(this, ID_NEW_DIR, - wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_BUTTON)); #if wxUSE_TOOLTIPS m_newDirButton->SetToolTip( _("Create new directory") ); #endif @@ -939,8 +961,8 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL ); if (is_pda) - staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 ); - m_static = new wxStaticText( this, -1, m_dir ); + staticsizer->Add( new wxStaticText( this, wxID_ANY, _("Current directory:") ), 0, wxRIGHT, 10 ); + m_static = new wxStaticText( this, wxID_ANY, m_dir ); staticsizer->Add( m_static, 1 ); mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 ); @@ -949,7 +971,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, style2 |= wxLC_SINGLE_SEL; m_list = new wxFileCtrl( this, ID_LIST_CTRL, - wildFilters[0], ms_lastShowHidden, + _T(""), ms_lastShowHidden, wxDefaultPosition, wxSize(540,200), style2); @@ -958,23 +980,18 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, // PDAs have a different screen layout mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); - wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL ); - m_choice = new wxChoice( this, ID_CHOICE ); - choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 5 ); - mainsizer->Add( choicesizer, 0, wxEXPAND ); - wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL ); m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER ); textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 ); mainsizer->Add( textsizer, 0, wxEXPAND ); - m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") ); - m_check->SetValue( ms_lastShowHidden ); - textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 ); + m_check = NULL; + m_choice = new wxChoice( this, ID_CHOICE ); + textsizer->Add( m_choice, 1, wxCENTER|wxALL, 5 ); buttonsizer = new wxBoxSizer( wxHORIZONTAL ); - buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 ); - buttonsizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 5 ); + buttonsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxALL, 5 ); + buttonsizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 5 ); mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT ); } else @@ -984,7 +1001,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL ); m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER ); textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); - textsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); + textsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); mainsizer->Add( textsizer, 0, wxEXPAND ); wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL ); @@ -993,17 +1010,13 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") ); m_check->SetValue( ms_lastShowHidden ); choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 ); - choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 ); + choicesizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 10 ); mainsizer->Add( choicesizer, 0, wxEXPAND ); } - for (size_t n=0; nAppend( wildDescriptions[n], (void*) new wxString( wildFilters[n] ) ); - } - SetFilterIndex( 0 ); + SetWildcard(wildCard); - SetAutoLayout( TRUE ); + SetAutoLayout( true ); SetSizer( mainsizer ); mainsizer->Fit( this ); @@ -1016,7 +1029,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, wxGenericFileDialog::~wxGenericFileDialog() { - if (wxConfig::Get(FALSE)) + if (wxConfig::Get(false)) { wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), ms_lastViewStyle); @@ -1040,6 +1053,18 @@ int wxGenericFileDialog::ShowModal() return wxDialog::ShowModal(); } +bool wxGenericFileDialog::Show( bool show ) +{ + if (show) + { + m_list->GoToDir(m_dir); + UpdateControls(); + m_text->SetValue(m_fileName); + } + + return wxDialog::Show( show ); +} + void wxGenericFileDialog::DoSetFilterIndex(int filterindex) { wxString *str = (wxString*) m_choice->GetClientData( filterindex ); @@ -1057,6 +1082,25 @@ void wxGenericFileDialog::DoSetFilterIndex(int filterindex) } } +void wxGenericFileDialog::SetWildcard(const wxString& wildCard) +{ + wxFileDialogBase::SetWildcard(wildCard); + + wxArrayString wildDescriptions, wildFilters; + const size_t count = wxParseCommonDialogsFilter(m_wildCard, + wildDescriptions, + wildFilters); + wxCHECK_RET( count, wxT("wxFileDialog: bad wildcard string") ); + + m_choice->Clear(); + for ( size_t n = 0; n < count; n++ ) + { + m_choice->Append( wildDescriptions[n], new wxString( wildFilters[n] ) ); + } + + SetFilterIndex( 0 ); +} + void wxGenericFileDialog::SetFilterIndex( int filterindex ) { m_choice->SetSelection( filterindex ); @@ -1086,7 +1130,7 @@ void wxGenericFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) GetEventHandler()->ProcessEvent( cevent ); } -static bool ignoreChanges = FALSE; +static bool ignoreChanges = false; void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) ) { @@ -1118,9 +1162,9 @@ void wxGenericFileDialog::OnSelected( wxListEvent &event ) dir += filename; if (wxDirExists(dir)) return; - ignoreChanges = TRUE; + ignoreChanges = true; m_text->SetValue( filename ); - ignoreChanges = FALSE; + ignoreChanges = false; } void wxGenericFileDialog::HandleAction( const wxString &fn ) @@ -1355,9 +1399,9 @@ void wxGenericFileDialog::UpdateControls() bool enable = !IsTopMostDir(dir); m_upDirButton->Enable(enable); -#if defined(__DOS__) || defined(__WINDOWS__) +#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) m_newDirButton->Enable(enable); -#endif // defined(__DOS__) || defined(__WINDOWS__) +#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) } #ifdef USE_GENERIC_FILEDIALOG