Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made SetDirectory() work, minor code cleanup (much is left to do)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-09-07 19:24:45 +00:00
parent 5b636c67e2
commit 9cedab372e
2 changed files with 132 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/generic/filedlgg.h
View File

@@ -49,14 +49,14 @@ public:
wxFileDialog(wxWindow *parent, wxFileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr, const wxString& message = wxFileSelectorPromptStr,
const wxString& defaultDir = "", const wxString& defaultDir = _T(""),
const wxString& defaultFile = "", const wxString& defaultFile = _T(""),
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = 0, long style = 0,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
virtual ~wxFileDialog(); virtual ~wxFileDialog();
void SetMessage(const wxString& message) { m_message = message; } void SetMessage(const wxString& message) { SetTitle(message); }
void SetPath(const wxString& path); void SetPath(const wxString& path);
void SetDirectory(const wxString& dir) { m_dir = dir; } void SetDirectory(const wxString& dir) { m_dir = dir; }
void SetFilename(const wxString& name) { m_fileName = name; } void SetFilename(const wxString& name) { m_fileName = name; }
@@ -76,6 +76,11 @@ public:
void GetPaths(wxArrayString& paths) const; void GetPaths(wxArrayString& paths) const;
void GetFilenames(wxArrayString& files) const; void GetFilenames(wxArrayString& files) const;
// implementation only from now on
// -------------------------------
virtual int ShowModal();
void OnSelected( wxListEvent &event ); void OnSelected( wxListEvent &event );
void OnActivated( wxListEvent &event ); void OnActivated( wxListEvent &event );
void OnList( wxCommandEvent &event ); void OnList( wxCommandEvent &event );
@@ -109,8 +114,9 @@ private:
DECLARE_DYNAMIC_CLASS(wxFileDialog) DECLARE_DYNAMIC_CLASS(wxFileDialog)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
static long s_lastViewStyle; // list or report? // these variables are preserved between wxFileDialog calls
static bool s_lastShowHidden; static long ms_lastViewStyle; // list or report?
static bool ms_lastShowHidden; // did we show hidden files?
}; };
// File selector - backward compatibility // File selector - backward compatibility
@@ -154,3 +160,4 @@ wxSaveFileSelector(const wxChar *what,
#endif #endif
// _WX_DIRDLGG_H_ // _WX_DIRDLGG_H_

242
src/generic/filedlgg.cpp
View File

@@ -9,6 +9,14 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "filedlgg.h" #pragma implementation "filedlgg.h"
#endif #endif
@@ -70,6 +78,23 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// the list ctrl fields in report view
enum FileListField
{
FileList_Name,
FileList_Type,
FileList_Date,
FileList_Time,
#ifdef __UNIX__
FileList_Perm,
#endif // __UNIX__
FileList_Max
};
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxFileData // wxFileData
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -81,11 +106,13 @@ public:
wxString GetName() const; wxString GetName() const;
wxString GetFullName() const; wxString GetFullName() const;
wxString GetHint() const; wxString GetHint() const;
wxString GetEntry( int num ); wxString GetEntry( FileListField num ) const;
bool IsDir();
bool IsLink(); bool IsDir() const { return m_isDir; }
bool IsExe(); bool IsLink() const { return m_isLink; }
long GetSize(); bool IsExe() const { return m_isExe; }
long GetSize() const { return m_size; }
void MakeItem( wxListItem &item ); void MakeItem( wxListItem &item );
void SetNewName( const wxString &name, const wxString &fname ); void SetNewName( const wxString &name, const wxString &fname );
@@ -114,8 +141,8 @@ public:
wxFileCtrl(); wxFileCtrl();
wxFileCtrl( wxWindow *win, wxFileCtrl( wxWindow *win,
wxWindowID id, wxWindowID id,
const wxString &dirName,
const wxString &wild, const wxString &wild,
bool showHidden,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLC_LIST, long style = wxLC_LIST,
@@ -489,73 +516,45 @@ wxString wxFileData::GetHint() const
return s; return s;
}; };
wxString wxFileData::GetEntry( int num ) wxString wxFileData::GetEntry( FileListField num ) const
{ {
wxString s; wxString s;
switch (num) switch ( num )
{ {
case 0: case FileList_Name:
{
s = m_name; s = m_name;
}
break;
case 1:
{
if (m_isDir) s = _("<DIR>");
else if (m_isLink) s = _("<LINK>");
else s = LongToString( m_size );
}
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(".");
s += IntToString( m_year );
}
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; break;
}
case 4: case FileList_Type:
if (m_isDir)
s = _("<DIR>");
else if (m_isLink)
s = _("<LINK>");
else
s.Printf(_T("%ld"), m_size);
break;
case FileList_Date:
s.Printf(_T("%02d.%02d.%d"), m_day, m_month, m_year);
break;
case FileList_Time:
s.Printf(_T("%02d:%02d"), m_hour, m_minute);
break;
#ifdef __UNIX__
case FileList_Perm:
s = m_permissions; s = m_permissions;
break; break;
#endif // __UNIX__
default: default:
s = wxT("No entry"); wxFAIL_MSG( _T("unexpected field in wxFileData::GetEntry()") );
break;
} }
return s; return s;
} }
bool wxFileData::IsDir()
{
return m_isDir;
}
bool wxFileData::IsExe()
{
return m_isExe;
}
bool wxFileData::IsLink()
{
return m_isLink;
}
long wxFileData::GetSize()
{
return m_size;
}
void wxFileData::SetNewName( const wxString &name, const wxString &fname ) void wxFileData::SetNewName( const wxString &name, const wxString &fname )
{ {
m_name = name; m_name = name;
@@ -566,8 +565,10 @@ void wxFileData::MakeItem( wxListItem &item )
{ {
item.m_text = m_name; item.m_text = m_name;
item.ClearAttributes(); item.ClearAttributes();
if (IsExe()) item.SetTextColour(*wxRED); if (IsExe())
if (IsDir()) item.SetTextColour(*wxBLUE); item.SetTextColour(*wxRED);
if (IsDir())
item.SetTextColour(*wxBLUE);
if (IsDir()) if (IsDir())
item.m_image = FI_FOLDER; item.m_image = FI_FOLDER;
@@ -580,7 +581,7 @@ void wxFileData::MakeItem( wxListItem &item )
if (IsLink()) if (IsLink())
{ {
wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" ); wxColour *dg = wxTheColourDatabase->FindColour( _T("MEDIUM GREY") );
item.SetTextColour(*dg); item.SetTextColour(*dg);
} }
item.m_data = (long)this; item.m_data = (long)this;
@@ -600,20 +601,20 @@ END_EVENT_TABLE()
wxFileCtrl::wxFileCtrl() wxFileCtrl::wxFileCtrl()
{ {
#if defined(__UNIX__)
m_dirName = wxT("/");
#elif defined(__DOS__)
m_dirName = wxT("");
#endif
m_showHidden = FALSE; m_showHidden = FALSE;
} }
wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id, wxFileCtrl::wxFileCtrl(wxWindow *win,
const wxString &dirName, const wxString &wild, wxWindowID id,
const wxPoint &pos, const wxSize &size, const wxString& wild,
long style, const wxValidator &validator, bool showHidden,
const wxPoint& pos,
const wxSize& size,
long style,
const wxValidator &validator,
const wxString &name) const wxString &name)
: wxListCtrl(win, id, pos, size, style, validator, name) : wxListCtrl(win, id, pos, size, style, validator, name),
m_wild(wild)
{ {
if (! g_IconsTable) if (! g_IconsTable)
g_IconsTable = new wxFileIconsTable; g_IconsTable = new wxFileIconsTable;
@@ -621,12 +622,10 @@ wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id,
SetImageList( imageList, wxIMAGE_LIST_SMALL ); SetImageList( imageList, wxIMAGE_LIST_SMALL );
m_goToParentControl = m_newDirControl = NULL; m_goToParentControl =
m_newDirControl = NULL;
m_dirName = dirName; m_showHidden = showHidden;
m_wild = wild;
m_showHidden = FALSE;
UpdateFiles();
} }
void wxFileCtrl::ChangeToListMode() void wxFileCtrl::ChangeToListMode()
@@ -661,14 +660,9 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
long my_style = GetWindowStyleFlag(); long my_style = GetWindowStyleFlag();
if (my_style & wxLC_REPORT) if (my_style & wxLC_REPORT)
{ {
#ifdef __UNIX__
const int noEntries = 5;
#else
const int noEntries = 4;
#endif
ret = InsertItem( item ); ret = InsertItem( item );
for (int i = 1; i < noEntries; i++) for (int i = 1; i < FileList_Max; i++)
SetItem( item.m_itemId, i, fd->GetEntry( i) ); SetItem( item.m_itemId, i, fd->GetEntry((FileListField)i) );
} }
else if (my_style & wxLC_LIST) else if (my_style & wxLC_LIST)
{ {
@@ -999,32 +993,32 @@ BEGIN_EVENT_TABLE(wxFileDialog,wxDialog)
EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck) EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
END_EVENT_TABLE() END_EVENT_TABLE()
long wxFileDialog::s_lastViewStyle = wxLC_LIST; long wxFileDialog::ms_lastViewStyle = wxLC_LIST;
bool wxFileDialog::s_lastShowHidden = FALSE; bool wxFileDialog::ms_lastShowHidden = FALSE;
wxFileDialog::wxFileDialog(wxWindow *parent, wxFileDialog::wxFileDialog(wxWindow *parent,
const wxString& message, const wxString& message,
const wxString& defaultDir, const wxString& defaultDir,
const wxString& defaultFile, const wxString& defaultFile,
const wxString& wildCard, const wxString& wildCard,
long style, long style,
const wxPoint& pos ) : const wxPoint& pos )
wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ) : wxDialog( parent, -1, message, pos, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
{ {
wxBusyCursor bcur;
if (wxConfig::Get(FALSE)) if (wxConfig::Get(FALSE))
{ {
wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
&s_lastViewStyle); &ms_lastViewStyle);
wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"), wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
&s_lastShowHidden); &ms_lastShowHidden);
} }
m_message = message; m_message = message;
m_dialogStyle = style; m_dialogStyle = style;
if (m_dialogStyle == 0) m_dialogStyle = wxOPEN; if (m_dialogStyle == 0)
m_dialogStyle = wxOPEN;
if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN)) if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
m_dialogStyle |= wxOPEN; m_dialogStyle |= wxOPEN;
@@ -1132,13 +1126,14 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
staticsizer->Add( m_static, 1 ); staticsizer->Add( m_static, 1 );
mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 ); mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
if (m_dialogStyle & wxMULTIPLE) long style = ms_lastViewStyle | wxSUNKEN_BORDER;
m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, if ( !(m_dialogStyle & wxMULTIPLE) )
wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER ); style |= wxLC_SINGLE_SEL;
else
m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, m_list = new wxFileCtrl( this, ID_LIST_CTRL, firstWild, ms_lastShowHidden,
wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL ); wxDefaultPosition, wxSize(540,200),
m_list->ShowHidden(s_lastShowHidden); style);
m_list->SetNewDirControl(butNewDir); m_list->SetNewDirControl(butNewDir);
m_list->SetGoToParentControl(butDirUp); m_list->SetGoToParentControl(butDirUp);
@@ -1158,7 +1153,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
mainsizer->Add( textsizer, 0, wxEXPAND ); mainsizer->Add( textsizer, 0, wxEXPAND );
m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") ); m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
m_check->SetValue( s_lastShowHidden ); m_check->SetValue( ms_lastShowHidden );
textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 ); textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
buttonsizer = new wxBoxSizer( wxHORIZONTAL ); buttonsizer = new wxBoxSizer( wxHORIZONTAL );
@@ -1180,7 +1175,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
m_choice = new wxChoice( this, ID_CHOICE ); m_choice = new wxChoice( this, ID_CHOICE );
choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 ); choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") ); m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
m_check->SetValue( s_lastShowHidden ); m_check->SetValue( ms_lastShowHidden );
choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 ); choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 ); choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
mainsizer->Add( choicesizer, 0, wxEXPAND ); mainsizer->Add( choicesizer, 0, wxEXPAND );
@@ -1203,12 +1198,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
Centre( wxBOTH ); Centre( wxBOTH );
/* m_text->SetFocus();
if (m_fileName.IsEmpty())
m_list->SetFocus();
else
*/
m_text->SetFocus();
} }
wxFileDialog::~wxFileDialog() wxFileDialog::~wxFileDialog()
@@ -1216,12 +1206,19 @@ wxFileDialog::~wxFileDialog()
if (wxConfig::Get(FALSE)) if (wxConfig::Get(FALSE))
{ {
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
s_lastViewStyle); ms_lastViewStyle);
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
s_lastShowHidden); ms_lastShowHidden);
} }
} }
int wxFileDialog::ShowModal()
{
m_list->GoToDir(m_dir);
return wxDialog::ShowModal();
}
void wxFileDialog::SetFilterIndex( int filterindex ) void wxFileDialog::SetFilterIndex( int filterindex )
{ {
m_choice->SetSelection( filterindex ); m_choice->SetSelection( filterindex );
@@ -1247,7 +1244,7 @@ void wxFileDialog::OnChoice( wxCommandEvent &event )
void wxFileDialog::OnCheck( wxCommandEvent &event ) void wxFileDialog::OnCheck( wxCommandEvent &event )
{ {
m_list->ShowHidden( (s_lastShowHidden = event.GetInt() != 0) ); m_list->ShowHidden( (ms_lastShowHidden = event.GetInt() != 0) );
} }
void wxFileDialog::OnActivated( wxListEvent &event ) void wxFileDialog::OnActivated( wxListEvent &event )
@@ -1401,14 +1398,14 @@ void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) ) void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
{ {
m_list->ChangeToListMode(); m_list->ChangeToListMode();
s_lastViewStyle = wxLC_LIST; ms_lastViewStyle = wxLC_LIST;
m_list->SetFocus(); m_list->SetFocus();
} }
void wxFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) ) void wxFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )
{ {
m_list->ChangeToReportMode(); m_list->ChangeToReportMode();
s_lastViewStyle = wxLC_REPORT; ms_lastViewStyle = wxLC_REPORT;
m_list->SetFocus(); m_list->SetFocus();
} }
@@ -1441,11 +1438,11 @@ void wxFileDialog::SetPath( const wxString& path )
{ {
// not only set the full path but also update filename and dir // not only set the full path but also update filename and dir
m_path = path; m_path = path;
if ( !!path ) if ( !path.empty() )
{ {
wxString ext; wxString ext;
wxSplitPath(path, &m_dir, &m_fileName, &ext); wxSplitPath(path, &m_dir, &m_fileName, &ext);
if (!ext.IsEmpty()) if (!ext.empty())
{ {
m_fileName += wxT("."); m_fileName += wxT(".");
m_fileName += ext; m_fileName += ext;
@@ -1621,3 +1618,4 @@ public:
IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)
#endif // wxUSE_FILEDLG #endif // wxUSE_FILEDLG