X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eaf40b230e00a249af2cc9e3b06406b3a64fd167..cd378f94bec1edc0f991ee55b02bfe3084de94e0:/src/generic/filedlgg.cpp diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index ea76456652..41e6ad08d0 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -36,7 +36,7 @@ #include "wx/image.h" #include "wx/module.h" #include "wx/config.h" - +#include "wx/imaglist.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" @@ -46,8 +46,10 @@ #include #include #include -#include -#include +#ifndef __VMS +# include +#endif +# include #include #include "wx/generic/home.xpm" @@ -65,26 +67,24 @@ class wxFileIconEntry : public wxObject { - public: - wxFileIconEntry(int i) { id = i; } - - int id; +public: + wxFileIconEntry(int i) { id = i; } + + int id; }; class wxFileIconsTable { - public: +public: + wxFileIconsTable(); - wxFileIconsTable(); - - int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString); - wxImageList *GetImageList() { return &m_ImageList; } + int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString); + wxImageList *GetImageList() { return &m_ImageList; } - protected: - wxImageList m_ImageList; - wxHashTable m_HashTable; - wxMimeTypesManager m_Mime; +protected: + wxImageList m_ImageList; + wxHashTable m_HashTable; }; static wxFileIconsTable *g_IconsTable = NULL; @@ -95,15 +95,14 @@ static wxFileIconsTable *g_IconsTable = NULL; wxFileIconsTable::wxFileIconsTable() : m_ImageList(16, 16), - m_HashTable(wxKEY_STRING), - m_Mime() + m_HashTable(wxKEY_STRING) { m_HashTable.DeleteContents(TRUE); m_ImageList.Add(wxBitmap(folder_xpm)); // FI_FOLDER m_ImageList.Add(wxBitmap(deffile_xpm)); // FI_UNKNOWN - if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN) + if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN) { // FI_EXECUTABLE - m_ImageList.Add(wxBitmap(exefile_xpm)); + m_ImageList.Add(wxBitmap(exefile_xpm)); m_HashTable.Delete(_T("exe")); m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE)); } @@ -118,16 +117,16 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img) { wxImage small(16, 16); unsigned char *p1, *p2, *ps; - unsigned char mr = img.GetMaskRed(), - mg = img.GetMaskGreen(), + unsigned char mr = img.GetMaskRed(), + mg = img.GetMaskGreen(), mb = img.GetMaskBlue(); - + unsigned x, y; unsigned sr, sg, sb, smask; - + p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = small.GetData(); small.SetMaskColour(mr, mr, mr); - + for (y = 0; y < 16; y++) { for (x = 0; x < 16; x++) @@ -149,8 +148,8 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img) sr += p2[0], sg += p2[1], sb += p2[2]; else smask++; p2 += 3; - - if (smask > 2) + + if (smask > 2) ps[0] = ps[1] = ps[2] = mr; else ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2; @@ -158,11 +157,57 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img) } p1 += 32 * 3, p2 += 32 * 3; } - + return small.ConvertToBitmap(); } +// finds empty borders and return non-empty area of image: +static wxImage CutEmptyBorders(const wxImage& img) +{ + unsigned char mr = img.GetMaskRed(), + mg = img.GetMaskGreen(), + mb = img.GetMaskBlue(); + unsigned char *dt = img.GetData(), *dttmp; + unsigned w = img.GetWidth(), h = img.GetHeight(); + + unsigned top, bottom, left, right, i; + bool empt; + +#define MK_DTTMP(x,y) dttmp = dt + ((x + y * w) * 3) +#define NOEMPTY_PIX(empt) if (dttmp[0] != mr || dttmp[1] != mg || dttmp[2] != mb) {empt = FALSE; break;} + + for (empt = TRUE, top = 0; empt && top < h; top++) + { + MK_DTTMP(0, top); + for (i = 0; i < w; i++, dttmp+=3) + NOEMPTY_PIX(empt) + } + for (empt = TRUE, bottom = h-1; empt && bottom > top; bottom--) + { + MK_DTTMP(0, bottom); + for (i = 0; i < w; i++, dttmp+=3) + NOEMPTY_PIX(empt) + } + for (empt = TRUE, left = 0; empt && left < w; left++) + { + MK_DTTMP(left, 0); + for (i = 0; i < h; i++, dttmp+=3*w) + NOEMPTY_PIX(empt) + } + for (empt = TRUE, right = w-1; empt && right > left; right--) + { + MK_DTTMP(right, 0); + for (i = 0; i < h; i++, dttmp+=3*w) + NOEMPTY_PIX(empt) + } + top--, left--, bottom++, right++; + + return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1)); +} + + + int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) { if (!extension.IsEmpty()) @@ -171,11 +216,11 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) if (entry) return (entry -> id); } - wxFileType *ft = (mime.IsEmpty()) ? - m_Mime.GetFileTypeFromExtension(extension) : - m_Mime.GetFileTypeFromMimeType(mime); + wxFileType *ft = (mime.IsEmpty()) ? + wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) : + wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime); wxIcon ic; - if (ft == NULL || (!ft -> GetIcon(&ic))) + if (ft == NULL || (!ft -> GetIcon(&ic)) || (!ic.Ok())) { int newid = FI_UNKNOWN; m_HashTable.Put(extension, new wxFileIconEntry(newid)); @@ -183,15 +228,16 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) } wxImage img(ic); delete ft; - + int id = m_ImageList.GetImageCount(); if (img.GetWidth() == 16 && img.GetHeight() == 16) m_ImageList.Add(img.ConvertToBitmap()); else { if (img.GetWidth() != 32 || img.GetHeight() != 32) - img.Rescale(32, 32); - m_ImageList.Add(CreateAntialiasedBitmap(img)); + m_ImageList.Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32))); + else + m_ImageList.Add(CreateAntialiasedBitmap(img)); } m_HashTable.Put(extension, new wxFileIconEntry(id)); return id; @@ -229,7 +275,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) struct stat buff; stat( m_fileName.fn_str(), &buff ); -#ifndef __EMX__ +#if !defined( __EMX__ ) && !defined(__VMS) struct stat lbuff; lstat( m_fileName.fn_str(), &lbuff ); m_isLink = S_ISLNK( lbuff.st_mode ); @@ -374,10 +420,10 @@ void wxFileData::MakeItem( wxListItem &item ) item.ClearAttributes(); if (IsExe()) item.SetTextColour(*wxRED); if (IsDir()) item.SetTextColour(*wxBLUE); - + if (IsDir()) item.m_image = FI_FOLDER; - else if (IsExe()) + 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('.'))); @@ -400,11 +446,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl); BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl) EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem) + EVT_LIST_DELETE_ALL_ITEMS(-1, wxFileCtrl::OnListDeleteAllItems) EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit) END_EVENT_TABLE() - wxFileCtrl::wxFileCtrl() { m_dirName = wxT("/"); @@ -479,7 +525,7 @@ void wxFileCtrl::Update() if (GetColumnCount() > 0) name_col_width = GetColumnWidth( 0 ); } - + ClearAll(); if (my_style & wxLC_REPORT) { @@ -511,7 +557,7 @@ void wxFileCtrl::Update() res = wxFileNameFromPath( f ); fd = new wxFileData( res, f ); wxString s = fd->GetName(); - if (m_showHidden || (s[0] != wxT('.'))) + if (m_showHidden || (s[0u] != wxT('.'))) { Add( fd, item ); item.m_itemId++; @@ -526,7 +572,7 @@ void wxFileCtrl::Update() res = wxFileNameFromPath( f ); fd = new wxFileData( res, f ); wxString s = fd->GetName(); - if (m_showHidden || (s[0] != wxT('.'))) + if (m_showHidden || (s[0u] != wxT('.'))) { Add( fd, item ); item.m_itemId++; @@ -536,9 +582,12 @@ void wxFileCtrl::Update() SortItems( ListCompare, 0 ); - SetColumnWidth( 1, wxLIST_AUTOSIZE ); - SetColumnWidth( 2, wxLIST_AUTOSIZE ); - SetColumnWidth( 3, wxLIST_AUTOSIZE ); + if (my_style & wxLC_REPORT) + { + SetColumnWidth( 1, wxLIST_AUTOSIZE ); + SetColumnWidth( 2, wxLIST_AUTOSIZE ); + SetColumnWidth( 3, wxLIST_AUTOSIZE ); + } } void wxFileCtrl::SetWild( const wxString &wild ) @@ -638,6 +687,23 @@ void wxFileCtrl::OnListDeleteItem( wxListEvent &event ) delete fd; } +void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) ) +{ + wxListItem item; + item.m_mask = wxLIST_MASK_DATA; + + item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL ); + while ( item.m_itemId != -1 ) + { + GetItem( item ); + wxFileData *fd = (wxFileData*)item.m_data; + delete fd; + item.m_data = 0; + SetItem( item ); + item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL ); + } +} + void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event ) { wxFileData *fd = (wxFileData*)event.m_item.m_data; @@ -828,10 +894,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent, if (m_dialogStyle & wxMULTIPLE) m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, - wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER ); + wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER ); else m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, - wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL ); + wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL ); m_list -> ShowHidden(s_lastShowHidden); mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 ); @@ -864,12 +930,14 @@ wxFileDialog::wxFileDialog(wxWindow *parent, mainsizer->Fit( this ); mainsizer->SetSizeHints( this ); - + Centre( wxBOTH ); +/* if (m_fileName.IsEmpty()) m_list->SetFocus(); else +*/ m_text->SetFocus(); wxEndBusyCursor(); @@ -958,7 +1026,7 @@ void wxFileDialog::HandleAction( const wxString &fn ) return; } - if (filename[0] == wxT('~')) + if (filename[0u] == wxT('~')) { filename.Remove( 0, 1 ); wxString tmp( wxGetUserHome() ); @@ -980,7 +1048,7 @@ void wxFileDialog::HandleAction( const wxString &fn ) } if (dir != wxT("/")) dir += wxT("/"); - if (filename[0] != wxT('/')) + if (filename[0u] != wxT('/')) { dir += filename; filename = dir; @@ -1029,6 +1097,18 @@ void wxFileDialog::HandleAction( const wxString &fn ) SetPath( filename ); + // change to the directory where the user went if asked + if ( m_dialogStyle & wxCHANGE_DIR ) + { + wxString cwd; + wxSplitPath(filename, &cwd, NULL, NULL); + + if ( cwd != wxGetWorkingDirectory() ) + { + wxSetWorkingDirectory(cwd); + } + } + wxCommandEvent event; wxDialog::OnOK(event); } @@ -1110,10 +1190,11 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const item.m_mask = wxLIST_MASK_TEXT; item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - while ( item.m_itemId != -1 ) { + while ( item.m_itemId != -1 ) + { m_list->GetItem( item ); paths.Add( dir + item.m_text ); - item.m_itemId = m_list->GetNextItem( item.m_itemId + 1, + item.m_itemId = m_list->GetNextItem( item.m_itemId, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); } } @@ -1132,10 +1213,11 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const item.m_mask = wxLIST_MASK_TEXT; item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - while ( item.m_itemId != -1 ) { + while ( item.m_itemId != -1 ) + { m_list->GetItem( item ); files.Add( item.m_text ); - item.m_itemId = m_list->GetNextItem( item.m_itemId + 1, + item.m_itemId = m_list->GetNextItem( item.m_itemId, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); } } @@ -1192,19 +1274,17 @@ wxString wxFileSelector( const wxChar *title, } } -wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent ) +wxString wxLoadFileSelector( const wxChar *what, const wxChar *ext, const wxChar *default_name, wxWindow *parent ) { - wxChar *ext = (wxChar *)extension; + wxString prompt = wxString::Format(_("Load %s file"), what); - wxChar prompt[50]; - wxString str = _("Load %s file"); - wxSprintf(prompt, str, what); + if (*ext == wxT('.')) + ext++; - if (*ext == wxT('.')) ext++; - wxChar wild[60]; - wxSprintf(wild, wxT("*.%s"), ext); + wxString wild = wxString::Format(_T("*.%s"), ext); - return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent); + return wxFileSelector(prompt, (const wxChar *) NULL, default_name, + ext, wild, 0, parent); } wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name, @@ -1212,15 +1292,15 @@ wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const w { wxChar *ext = (wxChar *)extension; - wxChar prompt[50]; - wxString str = _("Save %s file"); - wxSprintf(prompt, str, what); + wxString prompt = wxString::Format(_("Save %s file"), what); + + if (*ext == wxT('.')) + ext++; - if (*ext == wxT('.')) ext++; - wxChar wild[60]; - wxSprintf(wild, wxT("*.%s"), ext); + wxString wild = wxString::Format(_T("*.%s"), ext); - return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent); + return wxFileSelector(prompt, (const wxChar *) NULL, default_name, + ext, wild, 0, parent); }