#include "wx/config.h"
#include "wx/imaglist.h"
#include "wx/dir.h"
+#include "wx/artprov.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#include <direct.h>
#endif
-# include <time.h>
+#include <time.h>
#include <unistd.h>
-// XPM hack: make the arrays const
-#define static static const
-
-#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"
-
-#undef static
-
//-----------------------------------------------------------------------------
// wxFileData
//-----------------------------------------------------------------------------
-class wxFileData : public wxObject
+class wxFileData
{
public:
- wxFileData() { }
wxFileData( const wxString &name, const wxString &fname );
wxString GetName() const;
wxString GetFullName() const;
bool m_isDir;
bool m_isLink;
bool m_isExe;
-
- DECLARE_DYNAMIC_CLASS(wxFileData);
};
//-----------------------------------------------------------------------------
long style = wxLC_LIST,
const wxValidator &validator = wxDefaultValidator,
const wxString &name = wxT("filelist") );
+ virtual ~wxFileCtrl();
+
void ChangeToListMode();
void ChangeToReportMode();
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();
void SetWild( const wxString &wild );
void GetDir( wxString &dir );
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 SetNewDirControl(wxWindow *ctrl) { m_newDirControl = ctrl; }
private:
+ void FreeItemData(const wxListItem& item);
+ void FreeAllItemsData();
+
wxString m_dirName;
bool m_showHidden;
wxString m_wild;
-
+
wxWindow *m_goToParentControl;
wxWindow *m_newDirControl;
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));
}
p1 += 32 * 3, p2 += 32 * 3;
}
- return small.ConvertToBitmap();
+ return wxBitmap(small);
}
// finds empty borders and return non-empty area of image:
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)
// wxFileData
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFileData,wxObject);
-
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:
// wxFileCtrl
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl);
+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(wxWindow *win, wxWindowID id,
const wxString &dirName, const wxString &wild,
const wxPoint &pos, const wxSize &size,
- long style, const wxValidator &validator,
+ long style, const wxValidator &validator,
const wxString &name)
: wxListCtrl(win, id, pos, size, style, validator, name)
{
- if (! g_IconsTable)
+ if (! g_IconsTable)
g_IconsTable = new wxFileIconsTable;
wxImageList *imageList = g_IconsTable->GetImageList();
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 )
const int noEntries = 4;
#endif
ret = InsertItem( item );
- for (int i = 1; i < noEntries; i++)
+ for (int i = 1; i < noEntries; i++)
SetItem( item.m_itemId, i, fd->GetEntry( i) );
}
else if (my_style & wxLC_LIST)
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)
name_col_width = GetColumnWidth( 0 );
}
+ FreeAllItemsData();
ClearAll();
+
if (my_style & wxLC_REPORT)
{
if (name_col_width < 140) name_col_width = 140;
#if defined(__DOS__) || defined(__WINDOWS__)
if ( IsTopMostDir(m_dirName) )
- {
+ {
// Pseudo-directory with all available drives listed...
for (int drive = 1; drive <= 26; drive++)
{
{
wxString dirPrefix(dirname + wxFILE_SEP_PATH);
int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0;
-
+
bool cont;
wxString f;
cont = dir.GetNext(&f);
}
- // Tokenize the wildcard string, so we can handle more than 1
+ // Tokenize the wildcard string, so we can handle more than 1
// search pattern in a wildcard.
wxStringTokenizer tokenWild(m_wild, wxT(";"));
while ( tokenWild.HasMoreTokens() )
{
- cont = dir.GetFirst(&f, tokenWild.GetNextToken(),
+ cont = dir.GetFirst(&f, tokenWild.GetNextToken(),
wxDIR_FILES | hiddenFlag);
while (cont)
{
SetColumnWidth(2, wxLIST_AUTOSIZE);
SetColumnWidth(3, wxLIST_AUTOSIZE);
}
-
+
// Finally, enable/disable context-dependent controls:
if ( m_goToParentControl )
m_goToParentControl->Enable(!IsTopMostDir(m_dirName));
void wxFileCtrl::SetWild( const wxString &wild )
{
m_wild = wild;
- Update();
+ UpdateFiles();
}
void wxFileCtrl::MakeDir()
wxString fname( wxFileNameFromPath(m_dirName) );
m_dirName = wxPathOnly( m_dirName );
#ifdef __UNIX__
- if (m_dirName.IsEmpty())
+ if (m_dirName.IsEmpty())
m_dirName = wxT("/");
#endif
- Update();
+ UpdateFiles();
long id = FindItem( 0, fname );
if (id != -1)
{
void wxFileCtrl::GoToDir( const wxString &dir )
{
m_dirName = dir;
- Update();
+ UpdateFiles();
SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
EnsureVisible( 0 );
}
dir = m_dirName;
}
-void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
+void wxFileCtrl::FreeItemData(const wxListItem& item)
{
- wxFileData *fd = (wxFileData*)event.m_item.m_data;
+ wxFileData *fd = (wxFileData*)item.m_data;
delete fd;
}
-void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
+void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
+{
+ FreeItemData(event.m_item);
+}
+
+void wxFileCtrl::FreeAllItemsData()
{
wxListItem item;
item.m_mask = wxLIST_MASK_DATA;
while ( item.m_itemId != -1 )
{
GetItem( item );
- wxFileData *fd = (wxFileData*)item.m_data;
- delete fd;
- item.m_data = 0;
- SetItem( item );
+ FreeItemData(item);
item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
}
}
}
}
+wxFileCtrl::~wxFileCtrl()
+{
+ FreeAllItemsData();
+}
+
//-----------------------------------------------------------------------------
// wxFileDialog
//-----------------------------------------------------------------------------
if (wxConfig::Get(FALSE))
{
- wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+ wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
&s_lastViewStyle);
- wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+ wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
&s_lastShowHidden);
}
{
m_dir = wxGetCwd();
}
-
+
size_t len = m_dir.Len();
if ((len > 1) && (m_dir[len-1] == wxFILE_SEP_PATH))
m_dir.Remove( len-1, 1 );
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
buttonsizer->Add( 30, 5, 1 );
- wxWindow *butDirUp =
- 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
butDirUp->SetToolTip( _("Go to parent directory") );
#endif
buttonsizer->Add( butDirUp, 0, wxALL, 5 );
#ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...
- but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) );
+ 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
buttonsizer->Add( 20, 20 );
#endif //!__DOS__
- wxWindow *butNewDir =
- 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
butNewDir->SetToolTip( _("Create new directory") );
#endif
buttonsizer->Add( butNewDir, 0, wxALL, 5 );
- mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
+ if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA)
+ mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 );
+ else
+ mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
- staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
+ if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_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 );
m_list->ShowHidden(s_lastShowHidden);
m_list->SetNewDirControl(butNewDir);
m_list->SetGoToParentControl(butDirUp);
-
- mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
-
- wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
- m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
- textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
- textsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
- mainsizer->Add( textsizer, 0, wxEXPAND );
-
- 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( s_lastShowHidden );
- 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 );
+
+ if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA)
+ {
+ // 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 );
+ m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
+ textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+ textsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+ mainsizer->Add( textsizer, 0, wxEXPAND );
+
+ 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( s_lastShowHidden );
+ 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 );
+ }
m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
while (tokens.HasMoreTokens())
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 );
m_static->SetLabel( dir );
+
+ m_text->SetFocus();
}
void wxFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )
wxString dir;
m_list->GetDir( dir );
#ifdef __UNIX__
- if (dir != wxT("/"))
+ if (dir != wxT("/"))
#endif
dir += wxFILE_SEP_PATH;
projects / wxWidgets.git / blobdiff