/////////////////////////////////////////////////////////////////////////////
// Name: dirdlg.cpp
// Purpose: wxDirDialog
-// Author: Harm van der Heijden and Robert Roebling
+// Author: Harm van der Heijden, Robert Roebling & Julian Smart
// Modified by:
// Created: 12/12/98
// RCS-ID: $Id$
-// Copyright: (c) Harm van der Heijden and Robert Roebling
-// Licence: wxWindows licence
+// Copyright: (c) Harm van der Heijden, Robert Roebling, Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "dirdlgg.h"
#endif
+
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_DIRDLG
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/button.h"
-#include "wx/layout.h"
-#include "wx/msgdlg.h"
-#include "wx/textdlg.h"
-#include "wx/filefn.h"
-#include "wx/cmndata.h"
-#include "wx/gdicmn.h"
-#include "wx/intl.h"
-#include "wx/imaglist.h"
-#include "wx/icon.h"
-#include "wx/log.h"
-#include "wx/sizer.h"
-
-#if wxUSE_STATLINE
- #include "wx/statline.h"
+#ifndef WX_PRECOMP
+ #include "wx/textctrl.h"
+ #include "wx/button.h"
+ #include "wx/checkbox.h"
+ #include "wx/sizer.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/msgdlg.h"
#endif
+#include "wx/statline.h"
+#include "wx/generic/dirctrlg.h"
#include "wx/generic/dirdlgg.h"
+#include "wx/artprov.h"
+#include "wx/bmpbuttn.h"
-// If compiled under Windows, this macro can cause problems
-#ifdef GetFirstChild
-#undef GetFirstChild
-#endif
-
-/* XPM */
-static char * icon1_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-" s None c None",
-". c #000000",
-"+ c #c0c0c0",
-"@ c #808080",
-"# c #ffff00",
-"$ c #ffffff",
-/* pixels */
-" ",
-" @@@@@ ",
-" @#+#+#@ ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-" ..............",
-" ",
-" "};
-
-/* XPM */
-static char * icon2_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-" s None c None",
-". c #000000",
-"+ c #c0c0c0",
-"@ c #808080",
-"# c #ffff00",
-"$ c #ffffff",
-/* pixels */
-" ",
-" @@@@@ ",
-" @$$$$$@ ",
-" @$#+#+#$@@@@@@ ",
-" @$+#+#+$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-"@@@@@@@@@@@@@#@.",
-"@$$$$$$$$$$@@+@.",
-"@$#+#+#+#+##.@@.",
-" @$#+#+#+#+#+.@.",
-" @$+#+#+#+#+#.@.",
-" @$+#+#+#+##@..",
-" @@@@@@@@@@@@@.",
-" .............",
-" ",
-" "};
+//-----------------------------------------------------------------------------
+// wxGenericDirDialog
+//-----------------------------------------------------------------------------
static const int ID_DIRCTRL = 1000;
static const int ID_TEXTCTRL = 1001;
static const int ID_OK = 1002;
static const int ID_CANCEL = 1003;
static const int ID_NEW = 1004;
-//static const int ID_CHECK = 1005;
-
-//-----------------------------------------------------------------------------
-// wxDirItemData
-//-----------------------------------------------------------------------------
-
-wxDirItemData::wxDirItemData(wxString& path, wxString& name)
-{
- m_path = path;
- m_name = name;
- /* Insert logic to detect hidden files here
- * In UnixLand we just check whether the first char is a dot
- * For FileNameFromPath read LastDirNameInThisPath ;-) */
- // m_isHidden = (bool)(wxFileNameFromPath(*m_path)[0] == '.');
- m_isHidden = FALSE;
- m_hasSubDirs = HasSubDirs();
-}
-
-wxDirItemData::~wxDirItemData()
-{
-}
-
-void wxDirItemData::SetNewDirName( wxString path )
-{
- m_path = path;
- m_name = wxFileNameFromPath( path );
-}
-
-bool wxDirItemData::HasSubDirs()
-{
- wxString search = m_path + "/*";
- wxLogNull log;
- wxString path = wxFindFirstFile( search, wxDIR );
- return (bool)(!path.IsNull());
-}
-
-//-----------------------------------------------------------------------------
-// wxDirCtrl
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxDirCtrl,wxTreeCtrl)
-
-BEGIN_EVENT_TABLE(wxDirCtrl,wxTreeCtrl)
- EVT_TREE_ITEM_EXPANDING (-1, wxDirCtrl::OnExpandItem)
- EVT_TREE_ITEM_COLLAPSED (-1, wxDirCtrl::OnCollapseItem)
- EVT_TREE_BEGIN_LABEL_EDIT (-1, wxDirCtrl::OnBeginEditItem)
- EVT_TREE_END_LABEL_EDIT (-1, wxDirCtrl::OnEndEditItem)
+static const int ID_SHOW_HIDDEN = 1005;
+static const int ID_GO_HOME = 1006;
+
+BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
+ EVT_CLOSE (wxGenericDirDialog::OnCloseWindow)
+ EVT_BUTTON (wxID_OK, wxGenericDirDialog::OnOK)
+ EVT_BUTTON (ID_NEW, wxGenericDirDialog::OnNew)
+ EVT_BUTTON (ID_GO_HOME, wxGenericDirDialog::OnGoHome)
+ EVT_TREE_KEY_DOWN (-1, wxGenericDirDialog::OnTreeKeyDown)
+ EVT_TREE_SEL_CHANGED (-1, wxGenericDirDialog::OnTreeSelected)
+ EVT_TEXT_ENTER (ID_TEXTCTRL, wxGenericDirDialog::OnOK)
+ EVT_CHECKBOX (ID_SHOW_HIDDEN, wxGenericDirDialog::OnShowHidden)
END_EVENT_TABLE()
-wxDirCtrl::wxDirCtrl(void)
-{
- m_showHidden = FALSE;
-}
-
-wxDirCtrl::wxDirCtrl(wxWindow *parent, const wxWindowID id, const wxString &WXUNUSED(dir),
- const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
- :
- wxTreeCtrl( parent, id, pos, size, style, wxDefaultValidator, name )
+wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
+ const wxString& defaultPath, long style,
+ const wxPoint& pos, const wxSize& sz,
+ const wxString& name):
+ wxDialog(parent, ID_DIRCTRL, title, pos, sz, style, name)
{
- m_imageListNormal = new wxImageList(16, 16, TRUE);
- m_imageListNormal->Add(wxICON(icon1));
- m_imageListNormal->Add(wxICON(icon2));
- SetImageList(m_imageListNormal);
-
- m_showHidden = FALSE;
- m_rootId = AddRoot( _("Sections") );
- SetItemHasChildren(m_rootId);
- Expand(m_rootId); // automatically expand first level
-}
-
-/* Quick macro. Don't worry, I'll #undef it later */
-#define ADD_SECTION(a,b) \
- if (wxPathExists((a))) { m_paths.Add( (a) ); m_names.Add( (b) ); };
+ wxBusyCursor cursor;
-void wxDirCtrl::SetupSections()
-{
- wxString home;
-
- m_paths.Clear();
- m_names.Clear();
- ADD_SECTION(_T("/"), _("The Computer") )
- wxGetHomeDir(&home);
- ADD_SECTION(home, _("My Home") )
- ADD_SECTION(_T("/mnt"), _("Mounted Devices") )
- ADD_SECTION(_T("/usr"), _("User") )
- ADD_SECTION(_T("/usr/local"), _("User Local") )
- ADD_SECTION(_T("/var"), _("Variables") )
- ADD_SECTION(_T("/etc"), _("Etcetera") )
- ADD_SECTION(_T("/tmp"), _("Temporary") )
-}
-#undef ADD_SECTION
-
-void wxDirCtrl::CreateItems(const wxTreeItemId &parent)
-{
- wxTreeItemId id;
- wxDirItemData *dir_item;
-
-// wxASSERT(m_paths.Count() == m_names.Count()); ?
-
- for (unsigned int i=0; i<m_paths.Count(); i++)
- {
- dir_item = new wxDirItemData(m_paths[i],m_names[i]);
- id = AppendItem( parent, m_names[i], 0, 1, dir_item);
- if (dir_item->m_hasSubDirs) SetItemHasChildren(id);
- }
-}
+ m_path = defaultPath;
+ if (m_path == wxT("~"))
+ wxGetHomeDir(&m_path);
+ if (m_path == wxT("."))
+ m_path = wxGetCwd();
-void wxDirCtrl::OnBeginEditItem(wxTreeEvent &event)
-{
- // don't rename the main entry "Sections"
- if (event.GetItem() == m_rootId)
- {
- event.Veto();
- return;
- }
-
- // don't rename the individual sections
- if (GetParent( event.GetItem() ) == m_rootId)
- {
- event.Veto();
- return;
- }
-}
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-void wxDirCtrl::OnEndEditItem(wxTreeEvent &event)
-{
- if ((event.GetLabel().IsEmpty()) ||
- (event.GetLabel() == _(".")) ||
- (event.GetLabel() == _("..")) ||
- (event.GetLabel().First( _T("/") ) != wxNOT_FOUND))
- {
- wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
- dialog.ShowModal();
- event.Veto();
- return;
- }
+ // 0) 'New' and 'Home' Buttons
+ wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL );
- wxTreeItemId id = event.GetItem();
- wxDirItemData *data = (wxDirItemData*)GetItemData( id );
- wxASSERT( data );
-
- wxString new_name( wxPathOnly( data->m_path ) );
- new_name += _T("/");
- new_name += event.GetLabel();
-
- wxLogNull log;
-
- if (wxFileExists(new_name))
- {
- wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR );
- dialog.ShowModal();
- event.Veto();
- }
+ // VS: 'Home directory' concept is unknown to MS-DOS
+#ifndef __DOS__
+ wxBitmapButton* homeButton =
+ new wxBitmapButton(this, ID_GO_HOME,
+ wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG));
+ buttonsizer->Add( homeButton, 0, wxLEFT|wxRIGHT, 10 );
+#endif
- if (wxRenameFile(data->m_path,new_name))
- {
- data->SetNewDirName( new_name );
- }
- else
- {
- wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
- dialog.ShowModal();
- event.Veto();
- }
-}
-
-void wxDirCtrl::OnExpandItem(wxTreeEvent &event)
-{
- if (event.GetItem() == m_rootId)
+ // I'm not convinced we need a New button, and we tend to get annoying
+ // accidental-editing with label editing enabled.
+ if (style & wxDD_NEW_DIR_BUTTON)
{
- SetupSections();
- CreateItems(m_rootId);
- return;
+ wxBitmapButton* newButton =
+ new wxBitmapButton(this, ID_NEW,
+ wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
+ buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
+#if wxUSE_TOOLTIPS
+ newButton->SetToolTip(_("Create new directory"));
+#endif
}
- // This may take a longish time. Go to busy cursor
- wxBeginBusyCursor();
-
- wxDirItemData *data = (wxDirItemData *)GetItemData(event.GetItem());
- wxASSERT(data);
+#if wxUSE_TOOLTIPS
+ homeButton->SetToolTip(_("Go to home directory"));
+#endif
- wxString search,path,filename;
+ topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 );
- m_paths.Clear();
- m_names.Clear();
- search = data->m_path + "/*";
- for (path = wxFindFirstFile( search, wxDIR ); !path.IsNull();
- path=wxFindNextFile() )
- {
- filename = wxFileNameFromPath( path );
- /* Don't add "." and ".." to the tree. I think wxFindNextFile
- * also checks this, but I don't quite understand what happens
- * there. Also wxFindNextFile seems to swallow hidden dirs */
- if ((filename != ".") && (filename != ".."))
- {
- m_paths.Add(path);
- m_names.Add(filename);
- }
- }
+ // 1) dir ctrl
+ m_dirCtrl = NULL; // this is neccessary, event handler called from
+ // wxGenericDirCtrl would crash otherwise!
+ long dirStyle = wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER;
- CreateItems( event.GetItem() );
- SortChildren( event.GetItem() );
-
- wxEndBusyCursor();
-}
-
-void wxDirCtrl::OnCollapseItem(wxTreeEvent &event )
-{
- wxTreeItemId child, parent = event.GetItem();
- long cookie;
- /* Workaround because DeleteChildren has disapeared (why?) and
- * CollapseAndReset doesn't work as advertised (deletes parent too) */
- child = GetFirstChild(parent, cookie);
- while (child.IsOk())
+#ifdef __WXMSW__
+ if (style & wxDD_NEW_DIR_BUTTON)
{
- Delete(child);
- /* Not GetNextChild below, because the cookie mechanism can't
- * handle disappearing children! */
- child = GetFirstChild(parent, cookie);
+ // Only under Windows do we need the wxTR_EDIT_LABEL tree control style
+ // before we can call EditLabel (required for "New directory")
+ dirStyle |= wxDIRCTRL_EDIT_LABELS;
}
-}
+#endif
-//-----------------------------------------------------------------------------
-// wxDirDialog
-//-----------------------------------------------------------------------------
+ m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
+ m_path, wxPoint(5, 5),
+ wxSize(300, 200),
+ dirStyle);
+ topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxDirDialog, wxDialog)
-#else
-IMPLEMENT_DYNAMIC_CLASS( wxDirDialog, wxDialog )
-#endif
-
-BEGIN_EVENT_TABLE( wxDirDialog, wxDialog )
- EVT_TREE_KEY_DOWN (ID_DIRCTRL, wxDirDialog::OnTreeKeyDown)
- EVT_TREE_SEL_CHANGED (ID_DIRCTRL, wxDirDialog::OnTreeSelected)
- EVT_SIZE ( wxDirDialog::OnSize)
- EVT_BUTTON (ID_OK, wxDirDialog::OnOK)
- EVT_BUTTON (ID_CANCEL, wxDirDialog::OnCancel)
- EVT_BUTTON (ID_NEW, wxDirDialog::OnNew)
- EVT_TEXT_ENTER (ID_TEXTCTRL, wxDirDialog::OnOK)
- // EVT_CHECKBOX (ID_CHECK, wxDirDialog::OnCheck)
-END_EVENT_TABLE()
+ // Make the an option depending on a flag?
+ wxCheckBox* check = new wxCheckBox( this, ID_SHOW_HIDDEN, _("Show hidden directories") );
+ topsizer->Add( check, 0, wxLEFT|wxTOP | wxALIGN_RIGHT, 5 );
-wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
- const wxString& defaultPath, long style,
- const wxPoint& pos) :
- wxDialog(parent, -1, message, pos, wxSize(300,300),
- wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
-{
- m_message = message;
- m_dialogStyle = style;
- m_parent = parent;
-
- m_path = defaultPath;
-
- wxBeginBusyCursor();
-
- wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-
- // 1) dir ctrl
- m_dir = new wxDirCtrl( this, ID_DIRCTRL, "/", wxDefaultPosition, wxSize(200,200),
- wxTR_HAS_BUTTONS | wxSUNKEN_BORDER | wxTR_EDIT_LABELS);
- topsizer->Add( m_dir, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
-
// 2) text ctrl
- m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
+ m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
-
- // m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden") );
- // m_check->SetValue(TRUE);
-
+
#if wxUSE_STATLINE
- // 3) static line
+ // 3) Static line
topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
#endif
- // 4) buttons
- wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL );
- m_ok = new wxButton( this, ID_OK, _("OK") );
- buttonsizer->Add( m_ok, 0, wxLEFT|wxRIGHT, 10 );
- m_cancel = new wxButton( this, ID_CANCEL, _("Cancel") );
- buttonsizer->Add( m_cancel, 0, wxLEFT|wxRIGHT, 10 );
- m_new = new wxButton( this, ID_NEW, _("New...") );
- buttonsizer->Add( m_new, 0, wxLEFT|wxRIGHT, 10 );
+ // 4) Buttons
+ buttonsizer = new wxBoxSizer( wxHORIZONTAL );
- topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 );
+ // OK and Cancel button should be at the right bottom
+ wxButton* okButton = new wxButton(this, wxID_OK, _("OK"));
+ buttonsizer->Add( okButton, 0, wxLEFT|wxRIGHT, 10 );
+ wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel"));
+ buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 );
+
+ topsizer->Add( buttonsizer, 0, wxALL | wxALIGN_RIGHT, 10 );
+
+ okButton->SetDefault();
+ m_dirCtrl->SetFocus();
- m_ok->SetDefault();
- m_dir->SetFocus();
-
SetAutoLayout( TRUE );
SetSizer( topsizer );
-
+
topsizer->SetSizeHints( this );
topsizer->Fit( this );
Centre( wxBOTH );
+}
+
+void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+{
+ EndModal(wxID_CANCEL);
+}
+
+void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event))
+{
+ m_path = m_input->GetValue();
+ // Does the path exist? (User may have typed anything in m_input)
+ if (wxPathExists(m_path)) {
+ // OK, path exists, we're done.
+ EndModal(wxID_OK);
+ return;
+ }
+ // Interact with user, find out if the dir is a typo or to be created
+ wxString msg;
+ msg.Printf(_("The directory '%s' does not exist\nCreate it now?"),
+ m_path.c_str());
+ wxMessageDialog dialog(this, msg, _("Directory does not exist"),
+ wxYES_NO | wxICON_WARNING);
+
+ if ( dialog.ShowModal() == wxID_YES ) {
+ // Okay, let's make it
+ wxLogNull log;
+ if (wxMkdir(m_path)) {
+ // The new dir was created okay.
+ EndModal(wxID_OK);
+ return;
+ }
+ else {
+ // Trouble...
+ msg.Printf(_("Failed to create directory '%s'\n(Do you have the required permissions?)"),
+ m_path.c_str());
+ wxMessageDialog errmsg(this, msg, _("Error creating directory"), wxOK | wxICON_ERROR);
+ errmsg.ShowModal();
+ // We still don't have a valid dir. Back to the main dialog.
+ }
+ }
+ // User has answered NO to create dir.
+}
+
+void wxGenericDirDialog::SetPath(const wxString& path)
+{
+ m_dirCtrl->SetPath(path);
+ m_path = path;
+}
- wxEndBusyCursor();
+wxString wxGenericDirDialog::GetPath(void) const
+{
+ return m_path;
}
-int wxDirDialog::ShowModal()
+int wxGenericDirDialog::ShowModal()
{
m_input->SetValue( m_path );
return wxDialog::ShowModal();
}
-void wxDirDialog::OnTreeSelected( wxTreeEvent &event )
+void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event )
{
- wxDirItemData *data = (wxDirItemData*)m_dir->GetItemData(event.GetItem());
- if (data)
+ if (!m_dirCtrl)
+ return;
+
+ wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(event.GetItem());
+ if (data)
m_input->SetValue( data->m_path );
};
-void wxDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
+void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
{
- wxDirItemData *data = (wxDirItemData*)m_dir->GetItemData(m_dir->GetSelection());
- if (data)
+ if (!m_dirCtrl)
+ return;
+
+ wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection());
+ if (data)
m_input->SetValue( data->m_path );
};
-void wxDirDialog::OnOK( wxCommandEvent& WXUNUSED(event) )
+void wxGenericDirDialog::OnShowHidden( wxCommandEvent& event )
{
- m_path = m_input->GetValue();
- // Does the path exist? (User may have typed anything in m_input)
- if (wxPathExists(m_path)) {
- // OK, path exists, we're done.
- EndModal(wxID_OK);
- return;
- }
- // Interact with user, find out if the dir is a typo or to be created
- wxString msg( _("The directory ") );
- msg = msg + m_path;
- msg = msg + _("\ndoes not exist\nCreate it now?") ;
- wxMessageDialog dialog(this, msg, _("Directory does not exist"), wxYES_NO | wxICON_WARNING );
- if ( dialog.ShowModal() == wxID_YES ) {
- // Okay, let's make it
- wxLogNull log;
- if (wxMkdir(m_path)) {
- // The new dir was created okay.
- EndModal(wxID_OK);
- return;
- }
- else {
- // Trouble...
- msg = _("Failed to create directory ")+m_path+
- _("\n(Do you have the required permissions?)");
- wxMessageDialog errmsg(this, msg, _("Error creating directory"), wxOK | wxICON_ERROR);
- errmsg.ShowModal();
- // We still don't have a valid dir. Back to the main dialog.
- }
- }
- // User has answered NO to create dir.
-}
+ if (!m_dirCtrl)
+ return;
-void wxDirDialog::OnCancel( wxCommandEvent& WXUNUSED(event) )
-{
- EndModal(wxID_CANCEL);
+ m_dirCtrl->ShowHidden( event.GetInt() );
}
-void wxDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
+void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
{
- wxTreeItemId id = m_dir->GetSelection();
- if ((id == m_dir->GetRootItem()) ||
- (m_dir->GetParent(id) == m_dir->GetRootItem()))
+ wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection();
+ if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) ||
+ (m_dirCtrl->GetTreeCtrl()->GetParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem()))
{
- wxMessageDialog msg(this, _("You cannot add a new directory to this section."),
- _("Create directory"), wxOK | wxICON_INFORMATION );
+ wxMessageDialog msg(this, _("You cannot add a new directory to this section."),
+ _("Create directory"), wxOK | wxICON_INFORMATION );
msg.ShowModal();
return;
}
- wxTreeItemId parent = m_dir->GetParent( id );
- wxDirItemData *data = (wxDirItemData*)m_dir->GetItemData( parent );
+ wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetParent( id );
+ wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent );
wxASSERT( data );
-
- wxString new_name( _T("NewName") );
+
+ wxString new_name( _("NewName") );
wxString path( data->m_path );
- path += _T( "/" );
+ if (path.Last() != wxFILE_SEP_PATH)
+ path += wxFILE_SEP_PATH;
path += new_name;
if (wxFileExists(path))
{
// try NewName0, NewName1 etc.
int i = 0;
- do {
- new_name = _T("NewName");
- wxString num;
- num.Printf( "%d", i );
- new_name += num;
-
+ do {
+ new_name = _("NewName");
+ wxString num;
+ num.Printf( wxT("%d"), i );
+ new_name += num;
+
path = data->m_path;
- path += _T( "/" );
+ if (path.Last() != wxFILE_SEP_PATH)
+ path += wxFILE_SEP_PATH;
path += new_name;
- i++;
- } while (wxFileExists(path));
+ i++;
+ } while (wxFileExists(path));
}
-
+
wxLogNull log;
- if (!wxMkdir(path))
+ if (!wxMkdir(path))
{
wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
- dialog.ShowModal();
+ dialog.ShowModal();
return;
}
- wxDirItemData *new_data = new wxDirItemData( path, new_name );
- wxTreeItemId new_id = m_dir->AppendItem( parent, new_name, 0, 1, new_data );
- m_dir->EnsureVisible( new_id );
- m_dir->EditLabel( new_id );
+ wxDirItemData *new_data = new wxDirItemData( path, new_name, TRUE );
+
+ // TODO: THIS CODE DOESN'T WORK YET. We need to avoid duplication of the first child
+ // of the parent.
+ wxTreeItemId new_id = m_dirCtrl->GetTreeCtrl()->AppendItem( parent, new_name, 0, 0, new_data );
+ m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id );
+ m_dirCtrl->GetTreeCtrl()->EditLabel( new_id );
}
-/*
-void wxDirDialog::OnCheck( wxCommandEvent& WXUNUSED(event) )
+void wxGenericDirDialog::OnGoHome(wxCommandEvent& WXUNUSED(event))
{
- printf("Checkbox clicked: %s\n", ( m_check->GetValue() ? "on" : "off" ) );
+ SetPath(wxGetUserHome());
}
-*/
-#endif
+#endif // wxUSE_DIRDLG
projects / wxWidgets.git / blobdiff