X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..617ec45690c340d059726a09ccfe4bab9a42d82e:/src/generic/filedlgg.cpp
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 265e8cb39e..bd3124e1e1 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -93,7 +93,7 @@ int ListCompare( long data1, long data2, long WXUNUSED(data) )
if (fd2->GetName() == wxT("..")) return 1;
if (fd1->IsDir() && !fd2->IsDir()) return -1;
if (fd2->IsDir() && !fd1->IsDir()) return 1;
- return strcmp( fd1->GetName(), fd2->GetName() );
+ return wxStrcmp( fd1->GetName(), fd2->GetName() );
}
//-----------------------------------------------------------------------------
@@ -108,16 +108,22 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
m_fileName = fname;
struct stat buff;
- stat( m_fileName.GetData(), &buff );
- struct stat lbuff;
- lstat( m_fileName.GetData(), &lbuff );
+ stat( m_fileName.fn_str(), &buff );
+#ifndef __EMX__
+ struct stat lbuff;
+ lstat( m_fileName.fn_str(), &lbuff );
+ m_isLink = S_ISLNK( lbuff.st_mode );
struct tm *t = localtime( &lbuff.st_mtime );
+#else
+ 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_isLink = S_ISLNK( lbuff.st_mode );
m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR );
m_size = buff.st_size;
@@ -127,11 +133,12 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
m_month = t->tm_mon+1;
m_day = t->tm_mday;
m_year = t->tm_year;
+ m_year += 1900;
- m_permissions.sprintf( "%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' : '-') );
+ 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('-')) );
}
wxString wxFileData::GetName() const
@@ -175,30 +182,37 @@ wxString wxFileData::GetEntry( int num )
switch (num)
{
case 0:
+ {
s = m_name;
- break;
+ }
+ break;
case 1:
+ {
if (m_isDir) s = _("
");
else if (m_isLink) s = _("");
else s = LongToString( m_size );
- break;
+ }
+ break;
case 2:
+ {
if (m_day < 10) s = wxT("0"); else s = wxT("");
s += IntToString( m_day );
s += wxT(".");
if (m_month < 10) s += wxT("0");
s += IntToString( m_month );
s += wxT(".");
- if (m_year < 10) s += wxT("0"); // this should happen real soon...
s += IntToString( m_year );
- break;
+ }
+ break;
case 3:
+ {
if (m_hour < 10) s = wxT("0"); else s = wxT("");
s += IntToString( m_hour );
s += wxT(":");
if (m_minute < 10) s += wxT("0");
s += IntToString( m_minute );
break;
+ }
case 4:
s = m_permissions;
break;
@@ -238,14 +252,14 @@ void wxFileData::SetNewName( const wxString &name, const wxString &fname )
void wxFileData::MakeItem( wxListItem &item )
{
item.m_text = m_name;
- item.m_colour = wxBLACK;
- if (IsExe()) item.m_colour = wxRED;
- if (IsDir()) item.m_colour = wxBLUE;
- if (IsDir()) item.m_image = 0; else item.m_image = -1;
+ item.ClearAttributes();
+ if (IsExe()) item.SetTextColour(*wxRED);
+ if (IsDir()) item.SetTextColour(*wxBLUE);
+ item.m_image = IsDir() ? 0 : -1;
if (IsLink())
{
wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" );
- item.m_colour = dg;
+ item.SetTextColour(*dg);
}
item.m_data = (long)this;
}
@@ -333,7 +347,7 @@ void wxFileCtrl::Update()
{
InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 130 );
InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
- InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 55 );
+ InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 65 );
InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );
InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, 120 );
}
@@ -382,6 +396,10 @@ void wxFileCtrl::Update()
}
SortItems( ListCompare, 0 );
+
+ SetColumnWidth( 1, wxLIST_AUTOSIZE );
+ SetColumnWidth( 2, wxLIST_AUTOSIZE );
+ SetColumnWidth( 3, wxLIST_AUTOSIZE );
}
void wxFileCtrl::SetWild( const wxString &wild )
@@ -425,7 +443,7 @@ void wxFileCtrl::MakeDir()
wxListItem item;
item.m_itemId = 0;
item.m_col = 0;
- int id = Add( fd, item );
+ long id = Add( fd, item );
if (id != -1)
{
@@ -444,7 +462,7 @@ void wxFileCtrl::GoToParentDir()
m_dirName = wxPathOnly( m_dirName );
if (m_dirName.IsEmpty()) m_dirName = wxT("/");
Update();
- int id = FindItem( 0, fname );
+ long id = FindItem( 0, fname );
if (id != -1)
{
SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
@@ -537,6 +555,7 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
#define ID_TEXT wxID_FILEDLGG + 9
#define ID_LIST_CTRL wxID_FILEDLGG + 10
#define ID_ACTIVATED wxID_FILEDLGG + 11
+#define ID_CHECK wxID_FILEDLGG + 12
IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
@@ -551,6 +570,7 @@ BEGIN_EVENT_TABLE(wxFileDialog,wxDialog)
EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxFileDialog::OnActivated)
EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoice)
EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter)
+ EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
END_EVENT_TABLE()
wxFileDialog::wxFileDialog(wxWindow *parent,
@@ -566,8 +586,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
m_message = message;
m_dialogStyle = style;
+
+ if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
+ m_dialogStyle |= wxOPEN;
+
m_dir = defaultDir;
- if (m_dir.IsEmpty())
+ if ((m_dir.IsEmpty()) || (m_dir == wxT(".")))
{
char buf[200];
m_dir = getcwd( buf, sizeof(buf) );
@@ -649,8 +673,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
staticsizer->Add( m_static, 1 );
mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
- m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, wxSize(440,180),
- wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
+ if (m_dialogStyle & wxMULTIPLE)
+ m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
+ wxSize(440,180), wxLC_LIST | wxSUNKEN_BORDER );
+ else
+ m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
+ wxSize(440,180), wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
@@ -662,6 +690,9 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
m_choice = new wxChoice( this, ID_CHOICE );
choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
+ m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
+ m_check->SetValue( FALSE );
+ choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
mainsizer->Add( choicesizer, 0, wxEXPAND );
@@ -696,8 +727,15 @@ wxFileDialog::~wxFileDialog()
void wxFileDialog::OnChoice( wxCommandEvent &event )
{
- wxString *str = (wxString*) m_choice->GetClientData( event.GetInt() );
+ int index = (int)event.GetInt();
+ wxString *str = (wxString*) m_choice->GetClientData( index );
m_list->SetWild( *str );
+ m_filterIndex = index;
+}
+
+void wxFileDialog::OnCheck( wxCommandEvent &event )
+{
+ m_list->ShowHidden( event.GetInt() != 0 );
}
void wxFileDialog::OnActivated( wxListEvent &event )
@@ -715,16 +753,16 @@ 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;
-
+
wxString dir;
m_list->GetDir( dir );
if (dir != wxT("/")) dir += wxT("/");
dir += filename;
if (wxDirExists(dir)) return;
-
+
m_text->SetValue( filename );
}
@@ -812,7 +850,7 @@ void wxFileDialog::HandleAction( const wxString &fn )
}
SetPath( filename );
-
+
wxCommandEvent event;
wxDialog::OnOK(event);
}
@@ -873,6 +911,55 @@ void wxFileDialog::SetPath( const wxString& path )
}
}
+void wxFileDialog::GetPaths( wxArrayString& paths ) const
+{
+ paths.Empty();
+ if (m_list->GetSelectedItemCount() == 0)
+ {
+ paths.Add( GetPath() );
+ return;
+ }
+
+ paths.Alloc( m_list->GetSelectedItemCount() );
+
+ wxString dir;
+ m_list->GetDir( dir );
+ if (dir != wxT("/")) dir += wxT("/");
+
+ wxListItem item;
+ item.m_mask = wxLIST_MASK_TEXT;
+
+ item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ 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,
+ wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ }
+}
+
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+ files.Empty();
+ if (m_list->GetSelectedItemCount() == 0)
+ {
+ files.Add( GetFilename() );
+ return;
+ }
+ files.Alloc( m_list->GetSelectedItemCount() );
+
+ wxListItem item;
+ item.m_mask = wxLIST_MASK_TEXT;
+
+ item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ while ( item.m_itemId != -1 ) {
+ m_list->GetItem( item );
+ files.Add( item.m_text );
+ item.m_itemId = m_list->GetNextItem( item.m_itemId + 1,
+ wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ }
+}
+
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------