X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9cedab372ea48d9f5fd7423646f6d51d8b3f906f..cfcc39321282c5877cbb45248bb8004ced24516b:/src/generic/filedlgg.cpp diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 6a94ee3f86..0fdf57d687 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -30,8 +30,8 @@ #if wxUSE_FILEDLG -#if !defined(__UNIX__) && !defined(__DOS__) -#error wxFileDialog currently only supports Unix and DOS +#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) +#error wxFileDialog currently only supports Unix, win32 and DOS #endif #include "wx/checkbox.h" @@ -76,7 +76,9 @@ #endif #include +#if defined(__UNIX__) || defined(__DOS__) #include +#endif // ---------------------------------------------------------------------------- // constants @@ -140,6 +142,7 @@ class wxFileCtrl : public wxListCtrl public: wxFileCtrl(); wxFileCtrl( wxWindow *win, + wxStaticText *labelDir, wxWindowID id, const wxString &wild, bool showHidden, @@ -183,6 +186,9 @@ private: wxWindow *m_goToParentControl; wxWindow *m_newDirControl; + // the label showing the current directory + wxStaticText *m_labelDir; + DECLARE_DYNAMIC_CLASS(wxFileCtrl); DECLARE_EVENT_TABLE() }; @@ -248,7 +254,7 @@ wxFileIconsTable::wxFileIconsTable() : static wxBitmap CreateAntialiasedBitmap(const wxImage& img) { - wxImage small(16, 16); + wxImage smallimg (16, 16); unsigned char *p1, *p2, *ps; unsigned char mr = img.GetMaskRed(), mg = img.GetMaskGreen(), @@ -257,8 +263,8 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img) unsigned x, y; unsigned sr, sg, sb, smask; - p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = small.GetData(); - small.SetMaskColour(mr, mr, mr); + p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = smallimg.GetData(); + smallimg.SetMaskColour(mr, mr, mr); for (y = 0; y < 16; y++) { @@ -291,7 +297,7 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img) p1 += 32 * 3, p2 += 32 * 3; } - return wxBitmap(small); + return wxBitmap(smallimg); } // finds empty borders and return non-empty area of image: @@ -360,7 +366,16 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) m_HashTable.Put(extension, new wxFileIconEntry(newid)); return newid; } +#ifdef __WIN32__ + wxBitmap myBitmap (ic.GetWidth(), ic.GetHeight() ) ; + wxMemoryDC memDC; + memDC.SelectObject( myBitmap ); + memDC.DrawIcon(ic,0,0); + memDC.SelectObject( wxNullBitmap ); + wxImage img = myBitmap.ConvertToImage(); +#else wxImage img = ic.ConvertToImage(); +#endif delete ft; int id = m_ImageList.GetImageCount(); @@ -392,7 +407,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) // ---------------------------------------------------------------------------- static -int ListCompare( long data1, long data2, long WXUNUSED(data) ) +int ListCompare( long data1, long data2, long WXUNUSED(data)) { wxFileData *fd1 = (wxFileData*)data1 ; wxFileData *fd2 = (wxFileData*)data2 ; @@ -430,33 +445,29 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) if (name.length() == 2 && name[1u] == wxT(':')) { m_isDir = TRUE; - m_isExe = m_isLink = FALSE; + m_isExe = + m_isLink = FALSE; m_size = 0; return; } -#endif +#endif // __DOS__ || __WINDOWS__ wxStructStat buff; - wxStat( m_fileName, &buff ); #if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS)) - struct stat lbuff; - lstat( m_fileName.fn_str(), &lbuff ); - m_isLink = S_ISLNK( lbuff.st_mode ); - struct tm *t = localtime( &lbuff.st_mtime ); -#else + lstat( m_fileName.fn_str(), &buff ); + m_isLink = S_ISLNK( buff.st_mode ); +#else // no lstat() + wxStat( m_fileName, &buff ); m_isLink = FALSE; - struct tm *t = localtime( &buff.st_mtime ); #endif -// struct passwd *user = getpwuid( buff.st_uid ); -// struct group *grp = getgrgid( buff.st_gid ); - - m_isDir = S_ISDIR( buff.st_mode ); - m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR ); + m_isDir = (buff.st_mode & S_IFDIR) != 0; + m_isExe = (buff.st_mode & wxS_IXUSR) != 0; m_size = buff.st_size; + const struct tm * const t = localtime( &buff.st_mtime ); m_hour = t->tm_hour; m_minute = t->tm_min; m_month = t->tm_mon+1; @@ -464,21 +475,10 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) m_year = t->tm_year; m_year += 1900; - char buffer[10]; - sprintf( buffer, "%c%c%c", - ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? 'r' : '-'), - ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? 'w' : '-'), - ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? 'x' : '-') ); -#if wxUSE_UNICODE - m_permissions = wxConvUTF8.cMB2WC( buffer ); -#else - m_permissions = buffer; -#endif - -// m_permissions.sprintf( wxT("%c%c%c"), -// ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')), -// ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? wxT('w') : wxT('-')), -// ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? wxT('x') : wxT('-')) ); + m_permissions.Printf(_T("%c%c%c"), + buff.st_mode & wxS_IRUSR ? _T('r') : _T('-'), + buff.st_mode & wxS_IWUSR ? _T('w') : _T('-'), + buff.st_mode & wxS_IXUSR ? _T('x') : _T('-')); } wxString wxFileData::GetName() const @@ -494,13 +494,13 @@ wxString wxFileData::GetFullName() const wxString wxFileData::GetHint() const { wxString s = m_fileName; - s += " "; - if (m_isDir) s += _(" "); - else if (m_isLink) s += _(" "); + s += wxT(" "); + if (m_isDir) s += wxT(" "); + else if (m_isLink) s += wxT(" "); else { s += LongToString( m_size ); - s += _(" bytes "); + s += wxT(" bytes "); } s += IntToString( m_day ); s += wxT("."); @@ -605,6 +605,7 @@ wxFileCtrl::wxFileCtrl() } wxFileCtrl::wxFileCtrl(wxWindow *win, + wxStaticText *labelDir, wxWindowID id, const wxString& wild, bool showHidden, @@ -625,6 +626,8 @@ wxFileCtrl::wxFileCtrl(wxWindow *win, m_goToParentControl = m_newDirControl = NULL; + m_labelDir = labelDir; + m_showHidden = showHidden; } @@ -673,6 +676,10 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item ) void wxFileCtrl::UpdateFiles() { + // don't do anything before ShowModal() call which sets m_dirName + if ( m_dirName.empty() ) + return; + wxBusyCursor bcur; // this may take a while... long my_style = GetWindowStyleFlag(); @@ -777,7 +784,7 @@ void wxFileCtrl::UpdateFiles() } } - SortItems(ListCompare, 0); + SortItems((wxListCtrlCompare)ListCompare, 0); if ( my_style & wxLC_REPORT ) { @@ -840,7 +847,7 @@ void wxFileCtrl::MakeDir() if (id != -1) { - SortItems( ListCompare, 0 ); + SortItems( (wxListCtrlCompare) ListCompare, 0 ); id = FindItem( 0, (long)fd ); EnsureVisible( id ); EditLabel( id ); @@ -867,6 +874,8 @@ void wxFileCtrl::GoToParentDir() SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); EnsureVisible( id ); } + + m_labelDir->SetLabel(m_dirName); } } @@ -882,6 +891,8 @@ void wxFileCtrl::GoToDir( const wxString &dir ) UpdateFiles(); SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); EnsureVisible( 0 ); + + m_labelDir->SetLabel(dir); } void wxFileCtrl::GetDir( wxString &dir ) @@ -988,8 +999,9 @@ BEGIN_EVENT_TABLE(wxFileDialog,wxDialog) EVT_BUTTON(wxID_OK, wxFileDialog::OnListOk) EVT_LIST_ITEM_SELECTED(ID_LIST_CTRL, wxFileDialog::OnSelected) EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxFileDialog::OnActivated) - EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoice) + EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoiceFilter) EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter) + EVT_TEXT(ID_TEXT,wxFileDialog::OnTextChange) EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck) END_EVENT_TABLE() @@ -1061,9 +1073,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent, } if ( firstWild.Left( 2 ) == wxT("*.") ) m_filterExtension = firstWild.Mid( 1 ); - if ( m_filterExtension == ".*" ) m_filterExtension = wxEmptyString; + if ( m_filterExtension == wxT(".*") ) + m_filterExtension = wxEmptyString; // layout + + bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); @@ -1114,30 +1129,31 @@ wxFileDialog::wxFileDialog(wxWindow *parent, #endif buttonsizer->Add( butNewDir, 0, wxALL, 5 ); - if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA) + if (is_pda) mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 ); else mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 ); wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL ); - if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA) + if (is_pda) staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 ); m_static = new wxStaticText( this, -1, m_dir ); staticsizer->Add( m_static, 1 ); mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 ); - long style = ms_lastViewStyle | wxSUNKEN_BORDER; + long style2 = ms_lastViewStyle | wxSUNKEN_BORDER; if ( !(m_dialogStyle & wxMULTIPLE) ) - style |= wxLC_SINGLE_SEL; + style2 |= wxLC_SINGLE_SEL; - m_list = new wxFileCtrl( this, ID_LIST_CTRL, firstWild, ms_lastShowHidden, + m_list = new wxFileCtrl( this, m_static, ID_LIST_CTRL, + firstWild, ms_lastShowHidden, wxDefaultPosition, wxSize(540,200), - style); + style2); m_list->SetNewDirControl(butNewDir); m_list->SetGoToParentControl(butDirUp); - if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA) + if (is_pda) { // PDAs have a different screen layout mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); @@ -1215,31 +1231,38 @@ wxFileDialog::~wxFileDialog() int wxFileDialog::ShowModal() { m_list->GoToDir(m_dir); + m_text->SetValue(m_fileName); return wxDialog::ShowModal(); } +void wxFileDialog::DoSetFilterIndex(int filterindex) +{ + wxString *str = (wxString*) m_choice->GetClientData( filterindex ); + m_list->SetWild( *str ); + m_filterIndex = filterindex; + if ( str->Left(2) == wxT("*.") ) + { + m_filterExtension = str->Mid(2); + if (m_filterExtension == _T("*")) + m_filterExtension.clear(); + } + else + { + m_filterExtension.clear(); + } +} + void wxFileDialog::SetFilterIndex( int filterindex ) { m_choice->SetSelection( filterindex ); - wxCommandEvent event; - event.SetInt( filterindex ); - OnChoice( event ); + + DoSetFilterIndex(filterindex); } -void wxFileDialog::OnChoice( wxCommandEvent &event ) +void wxFileDialog::OnChoiceFilter( wxCommandEvent &event ) { - int index = (int)event.GetInt(); - wxString *str = (wxString*) m_choice->GetClientData( index ); - m_list->SetWild( *str ); - m_filterIndex = index; - if ( str -> Left( 2 ) == wxT("*.") ) - { - m_filterExtension = str -> Mid( 1 ); - if (m_filterExtension == ".*") m_filterExtension = wxEmptyString; - } - else - m_filterExtension = wxEmptyString; + DoSetFilterIndex((int)event.GetInt()); } void wxFileDialog::OnCheck( wxCommandEvent &event ) @@ -1259,6 +1282,27 @@ void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) GetEventHandler()->ProcessEvent( cevent ); } +static bool ignoreChanges = FALSE; + +void wxFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) ) +{ + if (!ignoreChanges) + { + // Clear selections. Otherwise when the user types in a value they may + // not get the file whose name they typed. + if (m_list->GetSelectedItemCount() > 0) + { + long item = m_list->GetNextItem(-1, wxLIST_NEXT_ALL, + wxLIST_STATE_SELECTED); + while ( item != -1 ) + { + m_list->SetItemState(item,0, wxLIST_STATE_SELECTED); + item = m_list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + } + } + } +} + void wxFileDialog::OnSelected( wxListEvent &event ) { wxString filename( event.m_item.m_text ); @@ -1271,7 +1315,9 @@ void wxFileDialog::OnSelected( wxListEvent &event ) dir += filename; if (wxDirExists(dir)) return; + ignoreChanges = TRUE; m_text->SetValue( filename ); + ignoreChanges = FALSE; } void wxFileDialog::HandleAction( const wxString &fn ) @@ -1286,8 +1332,6 @@ void wxFileDialog::HandleAction( const wxString &fn ) { m_list->GoToParentDir(); m_list->SetFocus(); - m_list->GetDir( dir ); - m_static->SetLabel( dir ); return; } @@ -1296,8 +1340,6 @@ void wxFileDialog::HandleAction( const wxString &fn ) { m_list->GoToHomeDir(); m_list->SetFocus(); - m_list->GetDir( dir ); - m_static->SetLabel( dir ); return; } @@ -1334,42 +1376,43 @@ void wxFileDialog::HandleAction( const wxString &fn ) if (wxDirExists(filename)) { m_list->GoToDir( filename ); - m_list->GetDir( dir ); - m_static->SetLabel( dir ); return; } - - if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) ) + // append the default extension to the filename if it doesn't have any + // + // VZ: the logic of testing for !wxFileExists() only for the open file + // dialog is not entirely clear to me, why don't we allow saving to a + // file without extension as well? + if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) ) { - if (filename.Find( wxT('.') ) == wxNOT_FOUND || - filename.AfterLast( wxT('.') ).Find( wxFILE_SEP_PATH ) != wxNOT_FOUND) - filename << m_filterExtension; - if (wxFileExists( filename )) + wxString ext; + wxSplitPath(filename, NULL, NULL, &ext); + if ( ext.empty() ) { - wxString msg; - msg.Printf( _("File '%s' already exists, do you really want to " - "overwrite it?"), filename.c_str() ); - - if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) - return; + // append the first extension of the filter string + filename += m_filterExtension.BeforeFirst(_T(';')); } } - else if ( m_dialogStyle & wxOPEN ) + + // check that the file [doesn't] exist if necessary + if ( (m_dialogStyle & wxSAVE) && + (m_dialogStyle & wxOVERWRITE_PROMPT) && + wxFileExists( filename ) ) { - if ( !wxFileExists( filename ) ) - if (filename.Find( wxT('.') ) == wxNOT_FOUND || - filename.AfterLast( wxT('.') ).Find( wxFILE_SEP_PATH ) != wxNOT_FOUND) - filename << m_filterExtension; + wxString msg; + msg.Printf( _("File '%s' already exists, do you really want to " + "overwrite it?"), filename.c_str() ); - if ( m_dialogStyle & wxFILE_MUST_EXIST ) - { - if ( !wxFileExists( filename ) ) - { - wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK | wxICON_ERROR ); - return; - } - } + if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) + return; + } + else if ( (m_dialogStyle & wxOPEN) && + (m_dialogStyle & wxFILE_MUST_EXIST) && + !wxFileExists(filename) ) + { + wxMessageBox(_("Please choose an existing file."), _("Error"), + wxOK | wxICON_ERROR ); } SetPath( filename ); @@ -1413,20 +1456,12 @@ void wxFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) ) { m_list->GoToParentDir(); m_list->SetFocus(); - wxString dir; - m_list->GetDir( dir ); - m_static->SetLabel( dir ); } void wxFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) ) { m_list->GoToHomeDir(); m_list->SetFocus(); - wxString dir; - m_list->GetDir( dir ); - m_static->SetLabel( dir ); - - m_text->SetFocus(); } void wxFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )