#include "wx/module.h"
#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>
-#include "wx/generic/home.xpm"
-#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"
-
//-----------------------------------------------------------------------------
// wxFileData
//-----------------------------------------------------------------------------
-class wxFileData : public wxObject
+class wxFileData
{
-private:
- wxString m_name;
- wxString m_fileName;
- long m_size;
- int m_hour;
- int m_minute;
- int m_year;
- int m_month;
- int m_day;
- wxString m_permissions;
- bool m_isDir;
- bool m_isLink;
- bool m_isExe;
-
public:
- wxFileData() { }
wxFileData( const wxString &name, const wxString &fname );
wxString GetName() const;
wxString GetFullName() const;
void SetNewName( const wxString &name, const wxString &fname );
private:
- DECLARE_DYNAMIC_CLASS(wxFileData);
+ wxString m_name;
+ wxString m_fileName;
+ long m_size;
+ int m_hour;
+ int m_minute;
+ int m_year;
+ int m_month;
+ int m_day;
+ wxString m_permissions;
+ bool m_isDir;
+ bool m_isLink;
+ bool m_isExe;
};
//-----------------------------------------------------------------------------
class wxFileCtrl : public wxListCtrl
{
-private:
- wxString m_dirName;
- bool m_showHidden;
- wxString m_wild;
-
public:
wxFileCtrl();
wxFileCtrl( wxWindow *win,
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 SetGoToParentControl(wxWindow *ctrl) { m_goToParentControl = ctrl; }
+ 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;
+
DECLARE_DYNAMIC_CLASS(wxFileCtrl);
DECLARE_EVENT_TABLE()
};
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));
}
+#if wxUSE_MIMETYPE
+// VS: we don't need this function w/o wxMimeTypesManager because we'll only have
+// one icon and we won't resize it
+
static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
{
wxImage small(16, 16);
p1 += 32 * 3, p2 += 32 * 3;
}
- return small.ConvertToBitmap();
+ return wxBitmap(small);
}
-
// finds empty borders and return non-empty area of image:
static wxImage CutEmptyBorders(const wxImage& img)
{
return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1));
}
+#endif // wxUSE_MIMETYPE
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)
return wxStrcmp( fd1->GetName(), fd2->GetName() );
}
+#ifdef __UNIX__
+#define IsTopMostDir(dir) (dir == wxT("/"))
+#endif
+
+#if defined(__DOS__) || defined(__WINDOWS__)
+#define IsTopMostDir(dir) (dir.IsEmpty())
+#endif
+
+#if defined(__DOS__) || defined(__WINDOWS__)
+extern bool wxIsDriveAvailable(const wxString& dirName);
+#endif
+
//-----------------------------------------------------------------------------
// 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:
+ if (name.length() == 2 && name[1u] == wxT(':'))
+ {
+ m_isDir = TRUE;
+ m_isExe = m_isLink = FALSE;
+ m_size = 0;
+ return;
+ }
+#endif
+
struct stat buff;
- stat( m_fileName.fn_str(), &buff );
+ wxStat( m_fileName.fn_str(), &buff );
#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
struct stat lbuff;
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('.')));
+ item.m_image = g_IconsTable->GetIconID(m_name.AfterLast(wxT('.')));
else
item.m_image = FI_UNKNOWN;
// 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()
{
+#if defined(__UNIX__)
m_dirName = wxT("/");
+#elif defined(__DOS__)
+ m_dirName = wxT("");
+#endif
m_showHidden = FALSE;
}
-wxFileCtrl::wxFileCtrl( wxWindow *win, wxWindowID id,
- const wxString &dirName, const wxString &wild,
- const wxPoint &pos, const wxSize &size,
- long style, const wxValidator &validator, const wxString &name ) :
- wxListCtrl( win, id, pos, size, style, validator, name )
+wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id,
+ const wxString &dirName, const wxString &wild,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxValidator &validator,
+ const wxString &name)
+ : wxListCtrl(win, id, pos, size, style, validator, name)
{
- if (! g_IconsTable) g_IconsTable = new wxFileIconsTable;
- wxImageList *imageList = g_IconsTable -> GetImageList();
+ if (! g_IconsTable)
+ g_IconsTable = new wxFileIconsTable;
+ wxImageList *imageList = g_IconsTable->GetImageList();
SetImageList( imageList, wxIMAGE_LIST_SMALL );
+ m_goToParentControl = m_newDirControl = NULL;
+
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 )
long my_style = GetWindowStyleFlag();
if (my_style & wxLC_REPORT)
{
+#ifdef __UNIX__
+ const int noEntries = 5;
+#else
+ const int noEntries = 4;
+#endif
ret = InsertItem( item );
- for (int i = 1; i < 5; i++) SetItem( item.m_itemId, i, fd->GetEntry( 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;
InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 65 );
InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );
+#ifdef __UNIX__
InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, 120 );
+#endif
}
wxFileData *fd = (wxFileData *) NULL;
wxListItem item;
item.m_itemId = 0;
item.m_col = 0;
- if (m_dirName != wxT("/"))
+#if defined(__DOS__) || defined(__WINDOWS__)
+ if ( IsTopMostDir(m_dirName) )
{
- wxString p( wxPathOnly(m_dirName) );
- if (p.IsEmpty()) p = wxT("/");
- fd = new wxFileData( wxT(".."), p );
- Add( fd, item );
- item.m_itemId++;
+ // Pseudo-directory with all available drives listed...
+ for (int drive = 1; drive <= 26; drive++)
+ {
+ wxString path;
+ path.Printf(wxT("%c:\\"), (char)(drive + 'A' - 1));
+ if ( wxIsDriveAvailable(path) )
+ {
+ path.RemoveLast();
+ fd = new wxFileData(path, path);
+ Add(fd, item);
+ item.m_itemId++;
+ }
+ }
}
-
- wxString res = m_dirName + wxT("/*");
- wxString f( wxFindFirstFile( res.GetData(), wxDIR ) );
- while (!f.IsEmpty())
+ else
+#endif
{
- res = wxFileNameFromPath( f );
- fd = new wxFileData( res, f );
- wxString s = fd->GetName();
- if (m_showHidden || (s[0u] != wxT('.')))
+ // Real directory...
+ if ( !IsTopMostDir(m_dirName) )
{
- Add( fd, item );
+ wxString p(wxPathOnly(m_dirName));
+#ifdef __UNIX__
+ if (p.IsEmpty()) p = wxT("/");
+#endif
+ fd = new wxFileData( wxT(".."), p );
+ Add(fd, item);
item.m_itemId++;
}
- f = wxFindNextFile();
- }
- // Tokenize the wildcard string, so we can handle more than 1
- // search pattern in a wildcard.
- wxStringTokenizer tokenWild( m_wild, ";" );
- while ( tokenWild.HasMoreTokens() )
- {
- res = m_dirName + wxT("/") + tokenWild.GetNextToken();
- f = wxFindFirstFile( res.GetData(), wxFILE );
- while (!f.IsEmpty())
+ wxString dirname(m_dirName);
+#if defined(__DOS__) || defined(__WINDOWS__)
+ if (dirname.length() == 2 && dirname[1u] == wxT(':'))
+ dirname << wxT('\\');
+#endif
+ wxDir dir(dirname);
+
+ if ( dir.IsOpened() )
{
- res = wxFileNameFromPath( f );
- fd = new wxFileData( res, f );
- wxString s = fd->GetName();
- if (m_showHidden || (s[0u] != wxT('.')))
+ wxString dirPrefix(dirname + wxFILE_SEP_PATH);
+ int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0;
+
+ bool cont;
+ wxString f;
+
+ // Get the directories first (not matched against wildcards):
+ cont = dir.GetFirst(&f, wxEmptyString, wxDIR_DIRS | hiddenFlag);
+ while (cont)
{
- Add( fd, item );
+ fd = new wxFileData(f, dirPrefix + f);
+ Add(fd, item);
item.m_itemId++;
+ cont = dir.GetNext(&f);
+ }
+
+ // 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(),
+ wxDIR_FILES | hiddenFlag);
+ while (cont)
+ {
+ fd = new wxFileData(f, dirPrefix + f);
+ Add(fd, item);
+ item.m_itemId++;
+ cont = dir.GetNext(&f);
+ }
}
- f = wxFindNextFile();
}
}
- SortItems( ListCompare, 0 );
+ SortItems(ListCompare, 0);
- if (my_style & wxLC_REPORT)
+ if ( my_style & wxLC_REPORT )
{
- SetColumnWidth( 1, wxLIST_AUTOSIZE );
- SetColumnWidth( 2, wxLIST_AUTOSIZE );
- SetColumnWidth( 3, wxLIST_AUTOSIZE );
+ SetColumnWidth(1, wxLIST_AUTOSIZE);
+ SetColumnWidth(2, wxLIST_AUTOSIZE);
+ SetColumnWidth(3, wxLIST_AUTOSIZE);
}
+
+ // Finally, enable/disable context-dependent controls:
+ if ( m_goToParentControl )
+ m_goToParentControl->Enable(!IsTopMostDir(m_dirName));
+#if defined(__DOS__) || defined(__WINDOWS__)
+ if ( m_newDirControl )
+ m_newDirControl->Enable(!IsTopMostDir(m_dirName));
+#endif
}
void wxFileCtrl::SetWild( const wxString &wild )
{
m_wild = wild;
- Update();
+ UpdateFiles();
}
void wxFileCtrl::MakeDir()
{
- wxString new_name( wxT("NewName") );
+ wxString new_name( _("NewName") );
wxString path( m_dirName );
- path += wxT("/");
+ path += wxFILE_SEP_PATH;
path += new_name;
if (wxFileExists(path))
{
new_name += num;
path = m_dirName;
- path += wxT("/");
+ path += wxFILE_SEP_PATH;
path += new_name;
i++;
} while (wxFileExists(path));
void wxFileCtrl::GoToParentDir()
{
- if (m_dirName != wxT("/"))
+ if (!IsTopMostDir(m_dirName))
{
+ size_t len = m_dirName.Len();
+ if (m_dirName[len-1] == wxFILE_SEP_PATH)
+ m_dirName.Remove( len-1, 1 );
wxString fname( wxFileNameFromPath(m_dirName) );
m_dirName = wxPathOnly( m_dirName );
- if (m_dirName.IsEmpty()) m_dirName = wxT("/");
- Update();
+#ifdef __UNIX__
+ if (m_dirName.IsEmpty())
+ m_dirName = wxT("/");
+#endif
+ UpdateFiles();
long id = FindItem( 0, fname );
if (id != -1)
{
void wxFileCtrl::GoToHomeDir()
{
wxString s = wxGetUserHome( wxString() );
- m_dirName = s;
- Update();
- SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
- EnsureVisible( 0 );
+ GoToDir(s);
}
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 );
}
}
if ((event.GetLabel().IsEmpty()) ||
(event.GetLabel() == _(".")) ||
(event.GetLabel() == _("..")) ||
- (event.GetLabel().First( wxT("/") ) != wxNOT_FOUND))
+ (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))
{
wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
dialog.ShowModal();
}
wxString new_name( wxPathOnly( fd->GetFullName() ) );
- new_name += wxT("/");
+ new_name += wxFILE_SEP_PATH;
new_name += event.GetLabel();
wxLogNull log;
}
}
+wxFileCtrl::~wxFileCtrl()
+{
+ FreeAllItemsData();
+}
+
//-----------------------------------------------------------------------------
// wxFileDialog
//-----------------------------------------------------------------------------
-#define ID_LIST_MODE wxID_FILEDLGG
-#define ID_REPORT_MODE wxID_FILEDLGG + 1
-#define ID_UP_DIR wxID_FILEDLGG + 5
-#define ID_PARENT_DIR wxID_FILEDLGG + 6
-#define ID_NEW_DIR wxID_FILEDLGG + 7
-#define ID_CHOICE wxID_FILEDLGG + 8
-#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
+#define ID_LIST_MODE (wxID_FILEDLGG )
+#define ID_REPORT_MODE (wxID_FILEDLGG + 1)
+#define ID_UP_DIR (wxID_FILEDLGG + 5)
+#define ID_PARENT_DIR (wxID_FILEDLGG + 6)
+#define ID_NEW_DIR (wxID_FILEDLGG + 7)
+#define ID_CHOICE (wxID_FILEDLGG + 8)
+#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)
const wxPoint& pos ) :
wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
{
- wxBeginBusyCursor();
+ wxBusyCursor bcur;
if (wxConfig::Get(FALSE))
{
- wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), &s_lastViewStyle);
- wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ShowHidden"), &s_lastShowHidden);
+ wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+ &s_lastViewStyle);
+ wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+ &s_lastShowHidden);
}
m_message = message;
m_dialogStyle |= wxOPEN;
m_dir = defaultDir;
- if ((m_dir.IsEmpty()) || (m_dir == wxT(".")))
+ if ((m_dir.empty()) || (m_dir == wxT(".")))
{
- char buf[200];
- m_dir = getcwd( buf, sizeof(buf) );
+ m_dir = wxGetCwd();
}
- m_path = defaultDir;
- m_path += wxT("/");
+
+ size_t len = m_dir.Len();
+ if ((len > 1) && (m_dir[len-1] == wxFILE_SEP_PATH))
+ m_dir.Remove( len-1, 1 );
+
+ m_path = m_dir;
+ m_path += wxFILE_SEP_PATH;
m_path += defaultFile;
m_fileName = defaultFile;
m_wildCard = wildCard;
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 );
- but = 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
- but->SetToolTip( _("Go to parent directory") );
+ butDirUp->SetToolTip( _("Go to parent directory") );
#endif
- buttonsizer->Add( but, 0, wxALL, 5 );
+ buttonsizer->Add( butDirUp, 0, wxALL, 5 );
- but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) );
+#ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...
+ 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( but, 0, wxALL, 5);
buttonsizer->Add( 20, 20 );
+#endif //!__DOS__
- but = 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
- but->SetToolTip( _("Create new directory") );
+ butNewDir->SetToolTip( _("Create new directory") );
#endif
- buttonsizer->Add( but, 0, wxALL, 5 );
+ 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 );
if (m_dialogStyle & wxMULTIPLE)
m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
- wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER );
+ wxSize(540,200), 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 );
- m_list -> ShowHidden(s_lastShowHidden);
- 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 );
+ wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
+ m_list->ShowHidden(s_lastShowHidden);
+ m_list->SetNewDirControl(butNewDir);
+ m_list->SetGoToParentControl(butDirUp);
+
+ 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())
else
*/
m_text->SetFocus();
-
- wxEndBusyCursor();
}
wxFileDialog::~wxFileDialog()
{
if (wxConfig::Get(FALSE))
{
- wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), s_lastViewStyle);
- wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), s_lastShowHidden);
+ wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+ s_lastViewStyle);
+ wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+ s_lastShowHidden);
}
}
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("/");
+ if (!IsTopMostDir(dir))
+ dir += wxFILE_SEP_PATH;
dir += filename;
if (wxDirExists(dir)) return;
return;
}
+#ifdef __UNIX__
if (filename == wxT("~"))
{
m_list->GoToHomeDir();
tmp += filename;
filename = tmp;
}
+#endif // __UNIX__
if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
(filename.Find(wxT('?')) != wxNOT_FOUND))
{
- if (filename.Find(wxT('/')) != wxNOT_FOUND)
+ if (filename.Find(wxFILE_SEP_PATH) != wxNOT_FOUND)
{
wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR );
return;
return;
}
- if (dir != wxT("/")) dir += wxT("/");
- if (filename[0u] != wxT('/'))
+ if (!IsTopMostDir(dir))
+ dir += wxFILE_SEP_PATH;
+ if (!wxIsAbsolutePath(filename))
{
dir += filename;
filename = dir;
if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) )
{
if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
- filename.AfterLast( wxT('.') ).Find( wxT('/') ) != wxNOT_FOUND)
+ filename.AfterLast( wxT('.') ).Find( wxFILE_SEP_PATH ) != wxNOT_FOUND)
filename << m_filterExtension;
if (wxFileExists( filename ))
{
{
if ( !wxFileExists( filename ) )
if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
- filename.AfterLast( wxT('.') ).Find( wxT('/') ) != wxNOT_FOUND)
+ filename.AfterLast( wxT('.') ).Find( wxFILE_SEP_PATH ) != wxNOT_FOUND)
filename << m_filterExtension;
if ( m_dialogStyle & wxFILE_MUST_EXIST )
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 );
- if (dir != wxT("/")) dir += wxT("/");
+#ifdef __UNIX__
+ if (dir != wxT("/"))
+#endif
+ dir += wxFILE_SEP_PATH;
wxListItem item;
item.m_mask = wxLIST_MASK_TEXT;
projects / wxWidgets.git / blobdiff