// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
#ifdef __GNUG__
#pragma implementation "filedlgg.h"
#endif
if (fd2->IsDir() && !fd1->IsDir()) return data;
if (fd1->IsLink() && !fd2->IsLink()) return -data;
if (fd2->IsLink() && !fd1->IsLink()) return data;
- return data*wxStrcmp( fd1->GetType(), fd2->GetType() );
+ return data*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() );
}
static
if (fd1->IsDir() && !fd2->IsDir()) return -data;
if (fd2->IsDir() && !fd1->IsDir()) return data;
- return fd1->GetTime().IsLaterThan(fd2->GetTime()) ? int(data) : -int(data);
+ return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data);
}
#ifdef __UNIX__
// 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;
m_type = type;
m_image = image_id;
+ ReadData();
+}
+
+void wxFileData::ReadData()
+{
if (IsDrive())
{
m_size = 0;
#endif
}
-wxString wxFileData::GetType() const
+wxString wxFileData::GetFileType() const
{
if (IsDir())
return _("<DIR>");
{
wxString s = m_filePath;
s += wxT(" ");
+
if (IsDir())
- s += wxT("<DIR> ");
+ s += _("<DIR>");
else if (IsLink())
- s += wxT("<LINK> ");
+ s += _("<LINK>");
else if (IsDrive())
+ s += _("<DRIVE>");
+ else // plain file
+ s += wxString::Format( _("%ld bytes"), m_size );
+
+ s += wxT(' ');
+
+ if ( !IsDrive() )
{
- s += wxT("<DRIVE> ");
- return s;
- }
- else
- {
- s += wxString::Format( "%ld", m_size );
- s += wxT(" bytes ");
+ s << GetModificationTime()
+ << wxT(" ")
+ << m_permissions;
}
- s += GetModificationTime();
- s += wxT(" ");
- s += m_permissions;
return s;
};
break;
case FileList_Type:
- s = GetType();
+ s = GetFileType();
break;
case FileList_Time:
return ret;
}
+void wxFileCtrl::UpdateItem(const wxListItem &item)
+{
+ wxFileData *fd = (wxFileData*)GetItemData(item);
+ wxCHECK_RET(fd, wxT("invalid filedata"));
+
+ fd->ReadData();
+
+ SetItemText(item, fd->GetFileName());
+ SetItemImage(item, fd->GetImageId(), fd->GetImageId());
+
+ if (GetWindowStyleFlag() & wxLC_REPORT)
+ {
+ for (int i = 1; i < wxFileData::FileList_Max; i++)
+ SetItem( item.m_itemId, i, fd->GetEntry((wxFileData::fileListFieldType)i) );
+ }
+}
+
void wxFileCtrl::UpdateFiles()
{
// don't do anything before ShowModal() call which sets m_dirName
{
fd->SetNewName( new_name, event.GetLabel() );
SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+ UpdateItem( event.GetItem() );
EnsureVisible( event.GetItem() );
}
else
#define ID_ACTIVATED (wxID_FILEDLGG + 11)
#define ID_CHECK (wxID_FILEDLGG + 12)
-IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog,wxDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog, wxFileDialogBase)
BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
EVT_BUTTON(ID_LIST_MODE, wxGenericFileDialog::OnList)
const wxString& wildCard,
long style,
const wxPoint& pos )
- : wxDialog( parent, -1, message, pos, wxDefaultSize,
- wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
+ :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)
{
+ wxDialog::Create( parent, -1, message, pos, wxDefaultSize,
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER );
+
if (wxConfig::Get(FALSE))
{
wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
&ms_lastShowHidden);
}
- m_message = message;
- m_dialogStyle = style;
-
if (m_dialogStyle == 0)
m_dialogStyle = wxOPEN;
if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
m_dialogStyle |= wxOPEN;
- m_dir = defaultDir;
if ((m_dir.empty()) || (m_dir == wxT(".")))
{
m_dir = wxGetCwd();
m_path = m_dir;
m_path += wxFILE_SEP_PATH;
m_path += defaultFile;
- m_fileName = defaultFile;
- m_wildCard = wildCard;
- m_filterIndex = 0;
m_filterExtension = wxEmptyString;
// interpret wildcards
-
- if (m_wildCard.IsEmpty())
- m_wildCard = _("All files (*)|*");
-
- wxStringTokenizer tokens( m_wildCard, wxT("|") );
- wxString firstWild;
- wxString firstWildText;
- if (tokens.CountTokens() == 1)
+ wxArrayString wildDescriptions, wildFilters;
+ if ( !ParseWildcard(m_wildCard, wildDescriptions, wildFilters) )
{
- firstWildText = tokens.GetNextToken();
- firstWild = firstWildText;
+ wxFAIL_MSG( wxT("Wrong file type descripition") );
}
- else
- {
- wxASSERT_MSG( tokens.CountTokens() % 2 == 0, wxT("Wrong file type descripition") );
- firstWildText = tokens.GetNextToken();
- firstWild = tokens.GetNextToken();
- }
- if ( firstWild.Left( 2 ) == wxT("*.") )
- m_filterExtension = firstWild.Mid( 1 );
- if ( m_filterExtension == wxT(".*") )
- m_filterExtension = wxEmptyString;
// layout
style2 |= wxLC_SINGLE_SEL;
m_list = new wxFileCtrl( this, ID_LIST_CTRL,
- firstWild, ms_lastShowHidden,
+ wildFilters[0], ms_lastShowHidden,
wxDefaultPosition, wxSize(540,200),
style2);
mainsizer->Add( choicesizer, 0, wxEXPAND );
}
- m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
- while (tokens.HasMoreTokens())
+ for (size_t n=0; n<wildFilters.GetCount(); n++)
{
- firstWildText = tokens.GetNextToken();
- firstWild = tokens.GetNextToken();
- m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
+ m_choice->Append( wildDescriptions[n], (void*) new wxString( wildFilters[n] ) );
}
- m_choice->SetSelection( 0 );
+ SetFilterIndex( 0 );
SetAutoLayout( TRUE );
SetSizer( mainsizer );
if (filename.IsEmpty()) return;
if (filename == wxT(".")) return;
+ // "some/place/" means they want to chdir not try to load "place"
+ bool want_dir = filename.Last() == wxFILE_SEP_PATH;
+ if (want_dir)
+ filename = filename.RemoveLast();
+
if (filename == wxT(".."))
{
m_list->GoToParentDir();
return;
}
- if (filename[0u] == wxT('~'))
+ if (filename.BeforeFirst(wxT('/')) == wxT("~"))
{
- filename.Remove( 0, 1 );
- wxString tmp( wxGetUserHome() );
- tmp += wxT('/');
- tmp += filename;
- filename = tmp;
+ filename = wxGetUserHome() + filename.Remove(0, 1);
}
#endif // __UNIX__
return;
}
+ // they really wanted a dir, but it doesn't exist
+ if (want_dir)
+ {
+ wxMessageBox(_("Directory doesn't exist."), _("Error"),
+ wxOK | wxICON_ERROR );
+ return;
+ }
+
// 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
// file without extension as well?
if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) )
{
- wxString ext;
- wxSplitPath(filename, NULL, NULL, &ext);
- if ( ext.empty() )
- {
- // append the first extension of the filter string
- filename += m_filterExtension.BeforeFirst(_T(';'));
- }
+ filename = AppendExtension(filename, m_filterExtension);
}
// check that the file [doesn't] exist if necessary
IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-// common part of both wxFileSelectorEx() and wxFileSelector()
-static wxString
-DoSelectFile(const wxChar *title,
- const wxChar *defaultDir,
- const wxChar *defaultFileName,
- const wxChar *defaultExtension,
- int *indexDefaultExtension,
- const wxChar *filter,
- int flags,
- wxWindow *parent,
- int x,
- int y)
-{
- // the filter may be either given explicitly or created automatically from
- // the default extension
- wxString filterReal;
- if ( filter )
- {
- // the user has specified the filter explicitly, use it
- filterReal = filter;
- }
- else if ( !wxIsEmpty(defaultExtension) )
- {
- // create the filter to match the given extension
- filterReal << wxT("*.") << defaultExtension;
- }
-
- wxFileDialog fileDialog(parent,
- title,
- defaultDir,
- defaultFileName,
- filterReal,
- flags,
- wxPoint(x, y));
-
- wxString path;
- if ( fileDialog.ShowModal() == wxID_OK )
- {
- path = fileDialog.GetPath();
- if ( indexDefaultExtension )
- {
- *indexDefaultExtension = fileDialog.GetFilterIndex();
- }
- }
-
- return path;
-}
-
-wxString
-wxFileSelectorEx(const wxChar *title,
- const wxChar *defaultDir,
- const wxChar *defaultFileName,
- int *indexDefaultExtension,
- const wxChar *filter,
- int flags,
- wxWindow *parent,
- int x,
- int y)
-{
- return DoSelectFile(title,
- defaultDir,
- defaultFileName,
- wxT(""), // def ext determined by index
- indexDefaultExtension,
- filter,
- flags,
- parent,
- x,
- y);
-}
-
-wxString
-wxFileSelector(const wxChar *title,
- const wxChar *defaultDir,
- const wxChar *defaultFileName,
- const wxChar *defaultExtension,
- const wxChar *filter,
- int flags,
- wxWindow *parent,
- int x,
- int y)
-{
- return DoSelectFile(title,
- defaultDir,
- defaultFileName,
- defaultExtension,
- NULL, // not interested in filter index
- filter,
- flags,
- parent,
- x,
- y);
-}
-
-static wxString GetWildcardString(const wxChar *ext)
-{
- wxString wild;
- if ( ext )
- {
- if ( *ext == wxT('.') )
- ext++;
-
- wild << _T("*.") << ext;
- }
- else // no extension specified
- {
- wild = wxFileSelectorDefaultWildcardStr;
- }
-
- return wild;
-}
-
-wxString wxLoadFileSelector(const wxChar *what,
- const wxChar *ext,
- const wxChar *nameDef,
- wxWindow *parent)
-{
- wxString prompt;
- if ( what && *what )
- prompt = wxString::Format(_("Load %s file"), what);
- else
- prompt = _("Load file");
-
- return wxFileSelector(prompt, NULL, nameDef, ext,
- GetWildcardString(ext), 0, parent);
-}
-
-wxString wxSaveFileSelector(const wxChar *what,
- const wxChar *ext,
- const wxChar *nameDef,
- wxWindow *parent)
-{
- wxString prompt;
- if ( what && *what )
- prompt = wxString::Format(_("Save %s file"), what);
- else
- prompt = _("Save file");
-
- return wxFileSelector(prompt, NULL, nameDef, ext,
- GetWildcardString(ext), 0, parent);
-}
-
#endif // USE_GENERIC_FILEDIALOG
#endif // wxUSE_FILEDLG
projects / wxWidgets.git / blobdiff