X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e673a6a2a0e1b70d9d6d653db08eb9d2508a6c2..2d956b58023a4955313a1c1531bc70a0deb0b831:/src/generic/filedlgg.cpp?ds=sidebyside diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 9d05013d6c..bc618a2345 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -46,6 +46,7 @@ #include "wx/config.h" #include "wx/imaglist.h" #include "wx/dir.h" +#include "wx/artprov.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" @@ -69,37 +70,12 @@ # include #include -#ifndef __DOS__ -#include "wx/generic/home.xpm" -#endif -#include "wx/generic/listview.xpm" -#include "wx/generic/repview.xpm" -#include "wx/generic/new_dir.xpm" -#include "wx/generic/dir_up.xpm" -#include "wx/generic/folder.xpm" -#include "wx/generic/deffile.xpm" -#include "wx/generic/exefile.xpm" - //----------------------------------------------------------------------------- // wxFileData //----------------------------------------------------------------------------- class wxFileData : public wxObject { -private: - wxString m_name; - wxString m_fileName; - long m_size; - int m_hour; - int m_minute; - int m_year; - int m_month; - int m_day; - wxString m_permissions; - bool m_isDir; - bool m_isLink; - bool m_isExe; - public: wxFileData() { } wxFileData( const wxString &name, const wxString &fname ); @@ -115,6 +91,19 @@ public: void SetNewName( const wxString &name, const wxString &fname ); private: + wxString m_name; + wxString m_fileName; + long m_size; + int m_hour; + int m_minute; + int m_year; + int m_month; + int m_day; + wxString m_permissions; + bool m_isDir; + bool m_isLink; + bool m_isExe; + DECLARE_DYNAMIC_CLASS(wxFileData); }; @@ -124,11 +113,6 @@ private: class wxFileCtrl : public wxListCtrl { -private: - wxString m_dirName; - bool m_showHidden; - wxString m_wild; - public: wxFileCtrl(); wxFileCtrl( wxWindow *win, @@ -145,7 +129,7 @@ public: void ChangeToIconMode(); void ShowHidden( bool show = TRUE ); long Add( wxFileData *fd, wxListItem &item ); - void Update(); + void UpdateFiles(); virtual void StatusbarText( wxChar *WXUNUSED(text) ) {}; void MakeDir(); void GoToParentDir(); @@ -156,8 +140,21 @@ public: void OnListDeleteItem( wxListEvent &event ); void OnListDeleteAllItems( wxListEvent &event ); void OnListEndLabelEdit( wxListEvent &event ); + + // Associate commonly used UI controls with wxFileCtrl so that they can be + // disabled when they cannot be used (e.g. can't go to parent directory + // if wxFileCtrl already is in the root dir): + void SetGoToParentControl(wxWindow *ctrl) { m_goToParentControl = ctrl; } + void SetNewDirControl(wxWindow *ctrl) { m_newDirControl = ctrl; } private: + wxString m_dirName; + bool m_showHidden; + wxString m_wild; + + wxWindow *m_goToParentControl; + wxWindow *m_newDirControl; + DECLARE_DYNAMIC_CLASS(wxFileCtrl); DECLARE_EVENT_TABLE() }; @@ -199,11 +196,14 @@ wxFileIconsTable::wxFileIconsTable() : m_HashTable(wxKEY_STRING) { m_HashTable.DeleteContents(TRUE); - m_ImageList.Add(wxBitmap(folder_xpm)); // FI_FOLDER - m_ImageList.Add(wxBitmap(deffile_xpm)); // FI_UNKNOWN + // FI_FOLDER: + m_ImageList.Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_CMN_DIALOG)); + // FI_UNKNOWN: + m_ImageList.Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_CMN_DIALOG)); + // FI_EXECUTABLE: if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN) - { // FI_EXECUTABLE - m_ImageList.Add(wxBitmap(exefile_xpm)); + { + m_ImageList.Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, wxART_CMN_DIALOG)); m_HashTable.Delete(_T("exe")); m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE)); } @@ -263,7 +263,7 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img) p1 += 32 * 3, p2 += 32 * 3; } - return small.ConvertToBitmap(); + return wxBitmap(small); } // finds empty borders and return non-empty area of image: @@ -332,12 +332,12 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) m_HashTable.Put(extension, new wxFileIconEntry(newid)); return newid; } - wxImage img(ic); + wxImage img = ic.ConvertToImage(); delete ft; int id = m_ImageList.GetImageCount(); if (img.GetWidth() == 16 && img.GetHeight() == 16) - m_ImageList.Add(img.ConvertToBitmap()); + m_ImageList.Add(wxBitmap(img)); else { if (img.GetWidth() != 32 || img.GetHeight() != 32) @@ -383,6 +383,10 @@ int ListCompare( long data1, long data2, long WXUNUSED(data) ) #define IsTopMostDir(dir) (dir.IsEmpty()) #endif +#if defined(__DOS__) || defined(__WINDOWS__) +extern bool wxIsDriveAvailable(const wxString& dirName); +#endif + //----------------------------------------------------------------------------- // wxFileData //----------------------------------------------------------------------------- @@ -393,9 +397,21 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) { m_name = name; m_fileName = fname; + +#if defined(__DOS__) || defined(__WINDOWS__) + // VS: In case the file is root directory of a volume (e.g. "C:"), + // we don't want it stat()ed, since the drive may not be in: + if (name.length() == 2 && name[1u] == wxT(':')) + { + m_isDir = TRUE; + m_isExe = m_isLink = FALSE; + m_size = 0; + return; + } +#endif struct stat buff; - stat( m_fileName.fn_str(), &buff ); + wxStat( m_fileName.fn_str(), &buff ); #if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS)) struct stat lbuff; @@ -548,7 +564,7 @@ void wxFileData::MakeItem( wxListItem &item ) else if (IsExe()) item.m_image = FI_EXECUTABLE; else if (m_name.Find(wxT('.')) != wxNOT_FOUND) - item.m_image = g_IconsTable -> GetIconID(m_name.AfterLast(wxT('.'))); + item.m_image = g_IconsTable->GetIconID(m_name.AfterLast(wxT('.'))); else item.m_image = FI_UNKNOWN; @@ -592,38 +608,40 @@ wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id, { if (! g_IconsTable) g_IconsTable = new wxFileIconsTable; - wxImageList *imageList = g_IconsTable -> GetImageList(); + wxImageList *imageList = g_IconsTable->GetImageList(); SetImageList( imageList, wxIMAGE_LIST_SMALL ); + m_goToParentControl = m_newDirControl = NULL; + m_dirName = dirName; m_wild = wild; m_showHidden = FALSE; - Update(); + UpdateFiles(); } void wxFileCtrl::ChangeToListMode() { SetSingleStyle( wxLC_LIST ); - Update(); + UpdateFiles(); } void wxFileCtrl::ChangeToReportMode() { SetSingleStyle( wxLC_REPORT ); - Update(); + UpdateFiles(); } void wxFileCtrl::ChangeToIconMode() { SetSingleStyle( wxLC_ICON ); - Update(); + UpdateFiles(); } void wxFileCtrl::ShowHidden( bool show ) { m_showHidden = show; - Update(); + UpdateFiles(); } long wxFileCtrl::Add( wxFileData *fd, wxListItem &item ) @@ -650,8 +668,10 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item ) return ret; } -void wxFileCtrl::Update() +void wxFileCtrl::UpdateFiles() { + wxBusyCursor bcur; // this may take a while... + long my_style = GetWindowStyleFlag(); int name_col_width = 0; if (my_style & wxLC_REPORT) @@ -678,15 +698,21 @@ void wxFileCtrl::Update() item.m_col = 0; #if defined(__DOS__) || defined(__WINDOWS__) - if ( m_dirName.IsEmpty() ) + if ( IsTopMostDir(m_dirName) ) { // Pseudo-directory with all available drives listed... - fd = new wxFileData( wxT("C:"), "C:" ); - Add( fd, item ); - item.m_itemId++; - fd = new wxFileData( wxT("D:"), "D:" ); - Add( fd, item ); - item.m_itemId++; + for (int drive = 1; drive <= 26; drive++) + { + wxString path; + path.Printf(wxT("%c:\\"), (char)(drive + 'A' - 1)); + if ( wxIsDriveAvailable(path) ) + { + path.RemoveLast(); + fd = new wxFileData(path, path); + Add(fd, item); + item.m_itemId++; + } + } } else #endif @@ -754,12 +780,20 @@ void wxFileCtrl::Update() SetColumnWidth(2, wxLIST_AUTOSIZE); SetColumnWidth(3, wxLIST_AUTOSIZE); } + + // Finally, enable/disable context-dependent controls: + if ( m_goToParentControl ) + m_goToParentControl->Enable(!IsTopMostDir(m_dirName)); +#if defined(__DOS__) || defined(__WINDOWS__) + if ( m_newDirControl ) + m_newDirControl->Enable(!IsTopMostDir(m_dirName)); +#endif } void wxFileCtrl::SetWild( const wxString &wild ) { m_wild = wild; - Update(); + UpdateFiles(); } void wxFileCtrl::MakeDir() @@ -821,7 +855,7 @@ void wxFileCtrl::GoToParentDir() if (m_dirName.IsEmpty()) m_dirName = wxT("/"); #endif - Update(); + UpdateFiles(); long id = FindItem( 0, fname ); if (id != -1) { @@ -840,7 +874,7 @@ void wxFileCtrl::GoToHomeDir() void wxFileCtrl::GoToDir( const wxString &dir ) { m_dirName = dir; - Update(); + UpdateFiles(); SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); EnsureVisible( 0 ); } @@ -959,7 +993,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxPoint& pos ) : wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ) { - wxBeginBusyCursor(); + wxBusyCursor bcur; if (wxConfig::Get(FALSE)) { @@ -1025,13 +1059,15 @@ wxFileDialog::wxFileDialog(wxWindow *parent, wxBitmapButton *but; - but = new wxBitmapButton( this, ID_LIST_MODE, wxBitmap( listview_xpm ) ); + but = new wxBitmapButton(this, ID_LIST_MODE, + wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG)); #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, wxBitmap( repview_xpm ) ); + but = new wxBitmapButton(this, ID_REPORT_MODE, + wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_CMN_DIALOG)); #if wxUSE_TOOLTIPS but->SetToolTip( _("View files as a detailed view") ); #endif @@ -1039,14 +1075,17 @@ wxFileDialog::wxFileDialog(wxWindow *parent, buttonsizer->Add( 30, 5, 1 ); - but = new wxBitmapButton( this, ID_UP_DIR, wxBitmap( dir_up_xpm ) ); + wxWindow *butDirUp = + new wxBitmapButton(this, ID_UP_DIR, + wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG)); #if wxUSE_TOOLTIPS - but->SetToolTip( _("Go to parent directory") ); + butDirUp->SetToolTip( _("Go to parent directory") ); #endif - buttonsizer->Add( but, 0, wxALL, 5 ); + buttonsizer->Add( butDirUp, 0, wxALL, 5 ); -#ifndef __DOS__ // VS: Home directory is senseless in MS-DOS... - but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) ); +#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)); #if wxUSE_TOOLTIPS but->SetToolTip( _("Go to home directory") ); #endif @@ -1055,16 +1094,24 @@ wxFileDialog::wxFileDialog(wxWindow *parent, buttonsizer->Add( 20, 20 ); #endif //!__DOS__ - but = new wxBitmapButton( this, ID_NEW_DIR, wxBitmap(new_dir_xpm) ); + wxWindow *butNewDir = + new wxBitmapButton(this, ID_NEW_DIR, + wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG)); #if wxUSE_TOOLTIPS - but->SetToolTip( _("Create new directory") ); + butNewDir->SetToolTip( _("Create new directory") ); #endif - buttonsizer->Add( but, 0, wxALL, 5 ); + buttonsizer->Add( butNewDir, 0, wxALL, 5 ); +#ifdef __WXX11__ + mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 ); +#else mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 ); +#endif wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL ); +#ifndef __WXX11__ staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 ); +#endif m_static = new wxStaticText( this, -1, m_dir ); staticsizer->Add( m_static, 1 ); mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 ); @@ -1075,7 +1122,34 @@ wxFileDialog::wxFileDialog(wxWindow *parent, else m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL ); - m_list -> ShowHidden(s_lastShowHidden); + m_list->ShowHidden(s_lastShowHidden); + m_list->SetNewDirControl(butNewDir); + m_list->SetGoToParentControl(butDirUp); + +#ifdef __WXX11__ + // 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( s_lastShowHidden ); + textsizer->Add( m_check, 0, 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 ); + mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT ); + +#else mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 ); wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL ); @@ -1093,6 +1167,8 @@ wxFileDialog::wxFileDialog(wxWindow *parent, choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 ); mainsizer->Add( choicesizer, 0, wxEXPAND ); +#endif + m_choice->Append( firstWildText, (void*) new wxString( firstWild ) ); while (tokens.HasMoreTokens()) { @@ -1116,8 +1192,6 @@ wxFileDialog::wxFileDialog(wxWindow *parent, else */ m_text->SetFocus(); - - wxEndBusyCursor(); } wxFileDialog::~wxFileDialog() @@ -1165,8 +1239,6 @@ void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) void wxFileDialog::OnSelected( wxListEvent &event ) { - if (FindFocus() != m_list) return; - wxString filename( event.m_item.m_text ); if (filename == wxT("..")) return; @@ -1331,6 +1403,8 @@ void wxFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) ) wxString dir; m_list->GetDir( dir ); m_static->SetLabel( dir ); + + m_text->SetFocus(); } void wxFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )